From d2677fc914cd5845dea2194ed052e7e89da93d06 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Thu, 18 May 2023 08:46:02 +0000 Subject: [PATCH 1/4] Removing as AADB2C not running on SP --- .github/workflows/standalone-scenarios.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/standalone-scenarios.json b/.github/workflows/standalone-scenarios.json index 67fd691349..d868b322ff 100644 --- a/.github/workflows/standalone-scenarios.json +++ b/.github/workflows/standalone-scenarios.json @@ -17,7 +17,6 @@ "automation/102-automation-msi", "automation/103-automation-private-endpoints", "automation/104-automation-schedule-runbook", - "aadb2c/100-simple-aadb2c-directory", "azuread/100-azuread-application-with-sevice-principle-with-builtin-roles", "azuread/100-sevice-principle-with-builtin-roles", "azuread/101-azuread-application-with-service-principle-with-custom-roles", From a287d8c79fe43cbd9eecc61aa660a33b5327f5ee Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Thu, 18 May 2023 08:46:17 +0000 Subject: [PATCH 2/4] prevent_deletion_if_contains_resources false for pipelines --- examples/variables.provider.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/variables.provider.tf b/examples/variables.provider.tf index 80ccfd4f56..97981505d4 100644 --- a/examples/variables.provider.tf +++ b/examples/variables.provider.tf @@ -38,7 +38,7 @@ variable "provider_azurerm_features_log_analytics_workspace" { variable "provider_azurerm_features_resource_group" { default = { - prevent_deletion_if_contains_resources = true + prevent_deletion_if_contains_resources = false } } From cef6f1ee62ca726a4316d51e760ba1b7c9cc25fc Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Thu, 18 May 2023 08:46:35 +0000 Subject: [PATCH 3/4] Rover update --- .devcontainer/docker-compose.yml | 2 +- .github/workflows/standalone-regressor-tf100.yaml | 4 ++-- .github/workflows/standalone-tf100.yaml | 4 ++-- rover_on_ssh_host.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 1ef5bc152a..2dc457aada 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -6,7 +6,7 @@ version: '3.7' services: rover: - image: aztfmod/rover-preview:1.4.4-2304.041231 + image: aztfmod/rover:1.4.6-2305.1807 user: vscode labels: diff --git a/.github/workflows/standalone-regressor-tf100.yaml b/.github/workflows/standalone-regressor-tf100.yaml index 715925cd77..d3004684f9 100644 --- a/.github/workflows/standalone-regressor-tf100.yaml +++ b/.github/workflows/standalone-regressor-tf100.yaml @@ -55,7 +55,7 @@ jobs: matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}} container: - image: aztfmod/rover-preview:1.3.9-2303.090804 + image: aztfmod/rover:1.4.6-2305.1807 options: --user 0 steps: @@ -175,7 +175,7 @@ jobs: needs: [testcases] container: - image: aztfmod/rover-preview:1.3.9-2303.090804 + image: aztfmod/rover:1.4.6-2305.1807 options: --user 0 steps: diff --git a/.github/workflows/standalone-tf100.yaml b/.github/workflows/standalone-tf100.yaml index ee2ba6f107..fa3e7f1914 100644 --- a/.github/workflows/standalone-tf100.yaml +++ b/.github/workflows/standalone-tf100.yaml @@ -51,7 +51,7 @@ jobs: matrix: ${{fromJSON(needs.load_scenarios.outputs.matrix)}} container: - image: aztfmod/rover-preview:1.3.9-2303.090804 + image: aztfmod/rover:1.4.6-2305.1807 options: --user 0 steps: @@ -136,7 +136,7 @@ jobs: needs: [testcases] container: - image: aztfmod/rover-preview:1.3.9-2303.090804 + image: aztfmod/rover:1.4.6-2305.1807 options: --user 0 steps: diff --git a/rover_on_ssh_host.yml b/rover_on_ssh_host.yml index c9a4de3e53..1674019326 100644 --- a/rover_on_ssh_host.yml +++ b/rover_on_ssh_host.yml @@ -11,7 +11,7 @@ version: '3.7' services: rover: - image: aztfmod/rover-preview:1.3.9-2303.090804 + image: aztfmod/rover:1.4.6-2305.1807 user: vscode From 7e7035e2a2485c697783a9efd45ff4c6fee9bbc3 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Thu, 18 May 2023 08:53:44 +0000 Subject: [PATCH 4/4] Optional value for recover_soft_deleted_key_vaults --- examples/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/main.tf b/examples/main.tf index 39b58bb03d..f2bdef52c8 100644 --- a/examples/main.tf +++ b/examples/main.tf @@ -23,7 +23,7 @@ provider "azurerm" { # purge_soft_deleted_keys_on_destroy = var.provider_azurerm_features_keyvault.purge_soft_deleted_keys_on_destroy # purge_soft_deleted_secrets_on_destroy = var.provider_azurerm_features_keyvault.purge_soft_deleted_secrets_on_destroy # recover_soft_deleted_certificates = var.provider_azurerm_features_keyvault.recover_soft_deleted_certificates - recover_soft_deleted_key_vaults = var.provider_azurerm_features_keyvault.recover_soft_deleted_key_vaults + recover_soft_deleted_key_vaults = try(var.provider_azurerm_features_keyvault.recover_soft_deleted_key_vaults, null) # recover_soft_deleted_keys = var.provider_azurerm_features_keyvault.recover_soft_deleted_keys # recover_soft_deleted_secrets = var.provider_azurerm_features_keyvault.recover_soft_deleted_secrets }