Merge pull request #1622 from aztfmod/AL-pipelines-5-6-9

Pipelines feedbacks
aztfmod · May 19, 2023 · b5e5ce8 · b5e5ce8
2 parents 268e4e4 + 7e7035e
commit b5e5ce8
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git 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
@@ -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-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",

diff --git 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/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
     }

diff --git 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
   }
 }
 

diff --git 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