From 4d89652476a1c09a434daf6a42ad2a2ccb3cf128 Mon Sep 17 00:00:00 2001 From: Jin Lee Date: Mon, 21 Oct 2024 10:56:46 -0500 Subject: [PATCH] minor cleanup for gha --- .github/workflows/.template.bicep.yml | 4 ++-- .github/workflows/.template.terraform.yml | 2 +- .../terraform-modules/sql-database/README.md | 18 ++++++++++-------- .../sql-database/variables.tf | 6 ++++-- .../terraform-modules/windows-vm-ext/README.md | 8 ++++---- .../terraform-modules/windows-vm-ext/main.tf | 4 ++-- 6 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.github/workflows/.template.bicep.yml b/.github/workflows/.template.bicep.yml index f6e0e979..076bf5a1 100644 --- a/.github/workflows/.template.bicep.yml +++ b/.github/workflows/.template.bicep.yml @@ -46,7 +46,7 @@ jobs: uses: actions/checkout@v4 # Log into Azure via OIDC - - uses: azure/login@v1 + - uses: azure/login@v2 with: client-id: ${{ secrets.AZURE_CLIENT_ID }} tenant-id: ${{ secrets.AZURE_TENANT_ID }} @@ -74,7 +74,7 @@ jobs: uses: actions/checkout@main # Log into Azure via OIDC - - uses: azure/login@v1 + - uses: azure/login@v2 with: client-id: ${{ secrets.AZURE_CLIENT_ID }} tenant-id: ${{ secrets.AZURE_TENANT_ID }} diff --git a/.github/workflows/.template.terraform.yml b/.github/workflows/.template.terraform.yml index 8afc1580..0b2ee65c 100644 --- a/.github/workflows/.template.terraform.yml +++ b/.github/workflows/.template.terraform.yml @@ -7,7 +7,7 @@ on: type: string description: 'Terraform version' required: true - default: '1.3.9' + default: '1.9.7' modulePath: type: string description: 'Path to the Terraform module' diff --git a/scenarios/shared/terraform-modules/sql-database/README.md b/scenarios/shared/terraform-modules/sql-database/README.md index 5e82cdc3..018f0719 100644 --- a/scenarios/shared/terraform-modules/sql-database/README.md +++ b/scenarios/shared/terraform-modules/sql-database/README.md @@ -1,17 +1,19 @@ # sql-database - + ## Requirements -No requirements. +| Name | Version | +|------|---------| +| [azurerm](#requirement\_azurerm) | >=4.0 | ## Providers | Name | Version | |------|---------| -| [azuread](#provider\_azuread) | 2.47.0 | -| [azurecaf](#provider\_azurecaf) | 1.2.27 | -| [azurerm](#provider\_azurerm) | 3.92.0 | +| [azuread](#provider\_azuread) | 3.0.2 | +| [azurecaf](#provider\_azurecaf) | 1.2.28 | +| [azurerm](#provider\_azurerm) | 4.5.0 | ## Modules @@ -34,8 +36,8 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [application\_name](#input\_application\_name) | The name of your application | `string` | n/a | yes | -| [entra\_admin\_group\_name](#input\_entra\_admin\_group\_name) | n/a | `string` | n/a | yes | -| [entra\_admin\_group\_object\_id](#input\_entra\_admin\_group\_object\_id) | n/a | `string` | n/a | yes | +| [entra\_admin\_group\_name](#input\_entra\_admin\_group\_name) | n/a | `string` | `null` | no | +| [entra\_admin\_group\_object\_id](#input\_entra\_admin\_group\_object\_id) | n/a | `string` | `null` | no | | [environment](#input\_environment) | The environment (dev, test, prod...) | `string` | `"dev"` | no | | [global\_settings](#input\_global\_settings) | Global settings for the naming convention module. | `any` | n/a | yes | | [location](#input\_location) | The Azure region where all resources in this example should be created | `string` | `"westus2"` | no | @@ -54,4 +56,4 @@ No modules. | [sql\_db\_connection\_string](#output\_sql\_db\_connection\_string) | n/a | | [sql\_db\_name](#output\_sql\_db\_name) | n/a | | [sql\_server\_name](#output\_sql\_server\_name) | n/a | - + diff --git a/scenarios/shared/terraform-modules/sql-database/variables.tf b/scenarios/shared/terraform-modules/sql-database/variables.tf index 26c4a181..cc5c2667 100644 --- a/scenarios/shared/terraform-modules/sql-database/variables.tf +++ b/scenarios/shared/terraform-modules/sql-database/variables.tf @@ -31,11 +31,13 @@ variable "tenant_id" { } variable "entra_admin_group_object_id" { - type = string + type = string + default = null } variable "entra_admin_group_name" { - type = string + type = string + default = null } variable "private_link_subnet_id" { diff --git a/scenarios/shared/terraform-modules/windows-vm-ext/README.md b/scenarios/shared/terraform-modules/windows-vm-ext/README.md index 55f0d3b0..02b3068f 100644 --- a/scenarios/shared/terraform-modules/windows-vm-ext/README.md +++ b/scenarios/shared/terraform-modules/windows-vm-ext/README.md @@ -1,6 +1,6 @@ # windows-vm-ext - + ## Requirements No requirements. @@ -9,7 +9,7 @@ No requirements. | Name | Version | |------|---------| -| [azurerm](#provider\_azurerm) | 3.59.0 | +| [azurerm](#provider\_azurerm) | n/a | ## Modules @@ -19,7 +19,7 @@ No modules. | Name | Type | |------|------| -| [azurerm_virtual_machine_extension.entra](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/virtual_machine_extension) | resource | +| [azurerm_virtual_machine_extension.aad](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/virtual_machine_extension) | resource | | [azurerm_virtual_machine_extension.install_ssms](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/virtual_machine_extension) | resource | ## Inputs @@ -36,4 +36,4 @@ No modules. ## Outputs No outputs. - + diff --git a/scenarios/shared/terraform-modules/windows-vm-ext/main.tf b/scenarios/shared/terraform-modules/windows-vm-ext/main.tf index 2d0bf743..86dc4d1c 100644 --- a/scenarios/shared/terraform-modules/windows-vm-ext/main.tf +++ b/scenarios/shared/terraform-modules/windows-vm-ext/main.tf @@ -1,5 +1,5 @@ -resource "azurerm_virtual_machine_extension" "entra" { - count = var.enable_microsoft_entra_join ? 1 : 0 +resource "azurerm_virtual_machine_extension" "aad" { + count = var.enable_azure_ad_join ? 1 : 0 name = "aad-login-for-windows" publisher = "Microsoft.Azure.ActiveDirectory"