Merge pull request #128 from Azure/AL-ADO

January 2021 Update
Azure · Feb 1, 2021 · bbbd570 · bbbd570
2 parents 13786ae + 8cff352
commit bbbd570
Show file tree

Hide file tree

Showing 34 changed files with 102 additions and 100 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:2012.1109
+      image: aztfmod/rover:2102.0100
       user: vscode
 
       labels:
@@ -17,6 +17,7 @@
         # and the value of "workspaceFolder" in .devcontainer/devcontainer.json
         - ..:/tf/caf
         - volume-caf-vscode:/home/vscode
+        - volume-caf-vscode-bashhistory:/commandhistory
         - ~/.ssh:/tmp/.ssh-localhost:ro
         - /var/run/docker.sock:/var/run/docker.sock
 
@@ -27,3 +28,4 @@
     volume-caf-vscode:
       labels:
         - "caf=Azure CAF"
+    volume-caf-vscode-bashhistory:
diff --git a/.github/workflows/landingzones.yml b/.github/workflows/landingzones.yml
@@ -41,7 +41,7 @@ jobs:
           random_length: ['5']
 
     container:
-      image: aztfmod/rover:2012.1109
+      image: aztfmod/rover:2102.0100
       options: --user 0
 
     steps:
@@ -90,7 +90,7 @@ jobs:
           ]
 
     container:
-      image: aztfmod/rover:2012.1109
+      image: aztfmod/rover:2102.0100
       options: --user 0
 
     steps:
@@ -134,7 +134,7 @@ jobs:
           random_length: ['5']
 
     container:
-      image: aztfmod/rover:2012.1109
+      image: aztfmod/rover:2102.0100
       options: --user 0
 
     steps:
@@ -181,7 +181,7 @@ jobs:
           ]
 
     container:
-      image: aztfmod/rover:2012.1109
+      image: aztfmod/rover:2102.0100
       options: --user 0
 
     steps:
@@ -224,7 +224,7 @@ jobs:
         random_length: ['5']
 
     container:
-      image: aztfmod/rover:2012.1109
+      image: aztfmod/rover:2102.0100
       options: --user 0
 
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 BREAKING CHANGES:
 
-* Iterating on our new key-based iterative model to simplify deployment and maintenance, this is a major refactoring that will bring compatibility with enterprise-scale landing zones and extensible platform for construction sets (solutions and applications) deployed on top of core landing zones. 
+* Iterating on our new key-based iterative model to simplify deployment and maintenance, this is a major refactoring that will bring compatibility with enterprise-scale landing zones and extensible platform for construction sets (solutions and applications) deployed on top of core landing zones.
 
 FEATURES:
 * **added support for azurerm 2.28 :** On all sample landing zones [azurerm provider](https://github.com/terraform-providers/terraform-provider-azurerm/releases/tag/v2.28.0)
@@ -125,21 +125,21 @@ FEATURES:
 * **rover:** rollup upgrade to support workspaces [#15](https://github.com/aztfmod/landingzones/pull/15)
 * **launchpad:** Support for launchpad destroy [#16](
 https://github.com/aztfmod/level0/issues/16)
-* **rover:** Upgrade to rover version 2002.0320 - Supporting: - Terraform 0.12.20 (https://github.com/hashicorp/terraform/releases/tag/v0.12.20) 
+* **rover:** Upgrade to rover version 2002.0320 - Supporting: - Terraform 0.12.20 (https://github.com/hashicorp/terraform/releases/tag/v0.12.20)
 * **rover:** Using "4ops.terraform" extension for improved support of Terraform 0.12 syntax. [#16](https://github.com/aztfmod/landingzones/issues/16)
 
 ## v1.1.1912 (January 2020)
 
 FEATURES:
 
-* **landingzone_caf_foundations :** Major refactoring to support governance, security and accounting. 
+* **landingzone_caf_foundations :** Major refactoring to support governance, security and accounting.
 
 IMPROVEMENTS:
 
-* **rover:** Support for non root containers in Visual Studio Code Development Containers (>v1.40) 
+* **rover:** Support for non root containers in Visual Studio Code Development Containers (>v1.40)
 
 * **rover:** Upgrade to rover version 2001.1006 - Supporting: - Terraform 0.12.19 (https://github.com/hashicorp/terraform/releases/tag/v0.12.19) - azurerm provider 1.40 (https://github.com/terraform-providers/terraform-provider-azurerm/blob/v1.40.0/CHANGELOG.md )
 
-* **rover:** Restructured the folder hierarchy in landing zones to ease integration and development on standard landing zones. 
+* **rover:** Restructured the folder hierarchy in landing zones to ease integration and development on standard landing zones.
 
 * **documentation:** Instructions on rover updates for non root container and Docker volumes cleanup.
diff --git a/landingzones/caf_foundations/dynamic_secrets.tf b/landingzones/caf_foundations/dynamic_secrets.tf
@@ -1,7 +1,7 @@
 
 module dynamic_keyvault_secrets {
   source  = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
-  version = "~>4.21"
+  version = "~>5.1.0"
 
   for_each = try(var.dynamic_keyvault_secrets, {})
 

diff --git a/landingzones/caf_foundations/es_main.tf b/landingzones/caf_foundations/es_main.tf
@@ -2,7 +2,7 @@
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "0.0.7-preview"
+  version = "0.0.8"
 
   root_parent_id = data.azurerm_client_config.current.tenant_id
 

diff --git a/landingzones/caf_foundations/landingzone.tf b/landingzones/caf_foundations/landingzone.tf
@@ -1,6 +1,6 @@
 module "foundations" {
   source  = "aztfmod/caf/azurerm"
-  version = "~>4.21"
+  version = "~>5.1.0"
 
   current_landingzone_key     = var.landingzone.key
   tenant_id                   = var.tenant_id

diff --git a/landingzones/caf_foundations/main.tf b/landingzones/caf_foundations/main.tf
@@ -1,8 +1,8 @@
 terraform {
   required_providers {
     azurerm = {
-      source  = "hashicorp/azurerm"
-      version = "2.40.0"
+      source = "hashicorp/azurerm"
+      version = "~> 2.43"
     }
     azuread = {
       source  = "hashicorp/azuread"

diff --git a/landingzones/caf_foundations/output.tf b/landingzones/caf_foundations/output.tf
@@ -23,9 +23,8 @@ output tfstates {
   sensitive = true
 }
 output keyvaults {
-  value = map(
-    var.landingzone.key,
-    try(module.foundations.keyvaults, {})
-  )
+  value = tomap({
+    (var.landingzone.key) = try(module.foundations.keyvaults, {})
+  })
   sensitive = true
 }
diff --git a/landingzones/caf_launchpad/add-ons/azure_devops/azdo.tf b/landingzones/caf_launchpad/add-ons/azure_devops/azdo.tf
@@ -11,5 +11,5 @@ data "azurerm_key_vault_secret" "pat" {
 }
 
 data "azuredevops_project" "project" {
-  project_name = var.azure_devops.project
+  name = var.azure_devops.project
 }
diff --git a/landingzones/caf_launchpad/add-ons/azure_devops/main.tf b/landingzones/caf_launchpad/add-ons/azure_devops/main.tf
@@ -1,8 +1,8 @@
 terraform {
   required_providers {
     azurerm = {
-      source  = "hashicorp/azurerm"
-      version = "2.40.0"
+      source = "hashicorp/azurerm"
+      version = "~> 2.43"
     }
     azuread = {
       source  = "hashicorp/azuread"
@@ -21,8 +21,8 @@ terraform {
       version = "~> 1.2.0"
     }
     azuredevops = {
-      source  = "terraform-providers/azuredevops"
-      version = "~> 0.0.1"
+      source  = "microsoft/azuredevops"
+      version = "~> 0.1.0"
     }
     tls = {
       source  = "hashicorp/tls"

diff --git a/...ingzones/caf_launchpad/add-ons/azure_devops/scenario/200-contoso_demo/pipeline/rover.yaml b/...ingzones/caf_launchpad/add-ons/azure_devops/scenario/200-contoso_demo/pipeline/rover.yaml
@@ -3,59 +3,59 @@ parameters:
     displayName: 'Timeout in minutes'
     type: number
     default: 60
-  
+
   variables:
   - group: release-global
-    
+
   resources:
     containers:
     - container: rover
       image: $(ROVER_IMAGE)
       options: --user 0:0 -e TF_PLUGIN_CACHE_DIR="/home/$(HOME_FOLDER_USER)/plugin-cache" -e TF_DATA_DIR="/home/$(HOME_FOLDER_USER)"
-  
+
   trigger: none
-  
+
   jobs:
   - job: CAF_Rover
-  
+
     displayName: Azure Landing Zone
-  
+
     pool: $(AGENT_POOL)
-  
+
     continueOnError: false
-  
+
     workspace:
           clean: all
-  
+
     container: rover
-  
+
     timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
-  
+
     steps:
     - checkout: self
-  
+
     - bash: |
         git clone --branch $(LANDINGZONE_BRANCH) https://github.com/Azure/caf-terraform-landingzones.git ${BUILD_REPOSITORY_LOCALPATH}/public 2>/dev/null
-    
+
         az login --identity -u $(msi-resource-id)
-  
+
         /tf/rover/rover.sh -lz ${BUILD_REPOSITORY_LOCALPATH}$(landingZonePath) \
           -tfstate $(tfstateName) \
           -var-folder ${BUILD_REPOSITORY_LOCALPATH}$(configPath) \
           -parallelism=30 \
           -level $(level) \
           -a $(terraformAction) \
           -env $(ENVIRONMENT)
-      
+
       condition: ne(variables['terraformAction'], 'destroy')
       failOnStderr: true
       displayName: 'Terraform $(terraformAction)'
-  
+
     - bash: |
         git clone --branch $(LANDINGZONE_BRANCH) https://github.com/Azure/caf-terraform-landingzones.git ${BUILD_REPOSITORY_LOCALPATH}/public 2>/dev/null
-    
+
         az login --identity -u $(msi-resource-id)
-  
+
         /tf/rover/rover.sh -lz ${BUILD_REPOSITORY_LOCALPATH}$(landingZonePath) \
           -tfstate $(tfstateName) \
           -var-folder ${BUILD_REPOSITORY_LOCALPATH}$(configPath) \
@@ -64,8 +64,7 @@ parameters:
           -a $(terraformAction) \
           -auto-approve \
           -env $(ENVIRONMENT)
-      
+
       condition: eq(variables['terraformAction'], 'destroy')
       failOnStderr: true
       displayName: 'Terraform destroy'
-
diff --git a/landingzones/caf_launchpad/add-ons/azure_devops/solution.tf b/landingzones/caf_launchpad/add-ons/azure_devops/solution.tf
@@ -1,6 +1,6 @@
 module "caf" {
   source  = "aztfmod/caf/azurerm"
-  version = "~>4.21"
+  version = "~>5.1.0"
 
   current_landingzone_key               = var.landingzone.key
   tenant_id                             = var.tenant_id

diff --git a/landingzones/caf_launchpad/add-ons/azure_devops_agent/dynamic_secrets.tf b/landingzones/caf_launchpad/add-ons/azure_devops_agent/dynamic_secrets.tf
@@ -1,7 +1,7 @@
 
 module dynamic_keyvault_secrets {
   source  = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
-  version = "~>4.21"
+  version = "~>5.0.0"
 
   for_each = try(var.dynamic_keyvault_secrets, {})
 

diff --git a/landingzones/caf_launchpad/add-ons/azure_devops_agent/main.tf b/landingzones/caf_launchpad/add-ons/azure_devops_agent/main.tf
@@ -1,8 +1,8 @@
 terraform {
   required_providers {
     azurerm = {
-      source  = "hashicorp/azurerm"
-      version = "2.40.0"
+      source = "hashicorp/azurerm"
+      version = "~> 2.43"
     }
     azuread = {
       source  = "hashicorp/azuread"
@@ -21,8 +21,8 @@ terraform {
       version = "~> 1.2.0"
     }
     azuredevops = {
-      source  = "terraform-providers/azuredevops"
-      version = "~> 0.0.1"
+      source  = "microsoft/azuredevops"
+      version = "~> 0.1.1"
     }
     tls = {
       source  = "hashicorp/tls"

diff --git a/...chpad/add-ons/azure_devops_agent/scenario/200-contoso_demo/level0/storage_accounts.tfvars b/...chpad/add-ons/azure_devops_agent/scenario/200-contoso_demo/level0/storage_accounts.tfvars
@@ -1,6 +1,6 @@
 
 storage_accounts = {
-  # Is used to store the azure devops deployment script to setup the Azure Devops Selfhosted agents 
+  # Is used to store the azure devops deployment script to setup the Azure Devops Selfhosted agents
   scripts_region1 = {
     name                     = "scriptsl0"
     resource_group_key       = "rg1"

diff --git a/...chpad/add-ons/azure_devops_agent/scenario/200-contoso_demo/level1/storage_accounts.tfvars b/...chpad/add-ons/azure_devops_agent/scenario/200-contoso_demo/level1/storage_accounts.tfvars
@@ -1,6 +1,6 @@
 
 storage_accounts = {
-  # Is used to store the azure devops deployment script to setup the Azure Devops Selfhosted agents 
+  # Is used to store the azure devops deployment script to setup the Azure Devops Selfhosted agents
   scripts_region1 = {
     name                     = "scriptsl1"
     resource_group_key       = "rg1"

diff --git a/landingzones/caf_launchpad/add-ons/azure_devops_agent/scripts/devops_runtime_baremetal.sh b/landingzones/caf_launchpad/add-ons/azure_devops_agent/scripts/devops_runtime_baremetal.sh
@@ -89,7 +89,7 @@ for agent_num in $(seq 1 ${num_agent}); do
   cd "$agent_dir"
     echo "moving to $agent_dir"
 
-    cleanup 
+    cleanup
 
     name="${agent_prefix}-${agent_num}"
     echo "installing agent $name"

diff --git a/landingzones/caf_launchpad/add-ons/azure_devops_agent/solution.tf b/landingzones/caf_launchpad/add-ons/azure_devops_agent/solution.tf
@@ -1,6 +1,6 @@
 module "caf" {
   source  = "aztfmod/caf/azurerm"
-  version = "~>4.21"
+  version = "~>5.1.0"
 
   current_landingzone_key     = var.landingzone.key
   tenant_id                   = var.tenant_id

diff --git a/landingzones/caf_launchpad/add-ons/terraform_cloud/main.tf b/landingzones/caf_launchpad/add-ons/terraform_cloud/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 2.40.0"
+      version = "~> 2.40"
     }
     azuread = {
       source  = "hashicorp/azuread"

diff --git a/landingzones/caf_launchpad/dynamic_secrets.tf b/landingzones/caf_launchpad/dynamic_secrets.tf
@@ -1,7 +1,7 @@
 
 module dynamic_keyvault_secrets {
   source  = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
-  version = "~>4.21"
+  version = "~>5.1.0"
 
   for_each = try(var.dynamic_keyvault_secrets, {})
 

diff --git a/landingzones/caf_launchpad/landingzone.tf b/landingzones/caf_launchpad/landingzone.tf
@@ -1,6 +1,6 @@
 module "launchpad" {
   source  = "aztfmod/caf/azurerm"
-  version = "~>4.21"
+  version = "~>5.1.0"
 
   current_landingzone_key = var.landingzone.key
   tenant_id               = var.tenant_id

diff --git a/landingzones/caf_launchpad/main.tf b/landingzones/caf_launchpad/main.tf
@@ -1,8 +1,8 @@
 terraform {
   required_providers {
     azurerm = {
-      source  = "hashicorp/azurerm"
-      version = "2.40.0"
+      source = "hashicorp/azurerm"
+      version = "~> 2.43"
     }
     azuread = {
       source  = "hashicorp/azuread"