Azure · arnaudlh · Feb 10, 2020 · Feb 3, 2020 · Feb 4, 2020 · Feb 4, 2020
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -30,7 +30,7 @@
 
     // Add the IDs of extensions you want installed when the container is created in the array below.
     "extensions": [
-        "mauve.terraform",
+        "4ops.terraform",
         "mutantdino.resourcemonitor"
     ]
 }
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -6,7 +6,7 @@
   version: '3.7'
   services:
     rover:
-      image: aztfmod/rover:2001.1006
+      image: aztfmod/rover:2002.0320
 
       labels:
         - "caf=Azure CAF"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## v2.0.2002 (February 2020)
+FEATURES:
+* **landingzone_caf_foundations :** adding support for azurerm 1.42 provider, azuread provider 0.7
+* **landingzone_vdc_demo :** adding support for azurerm 1.42 provider, azuread provider 0.7
+* **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:** 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. 

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # Introduction to Azure Cloud Adoption Framework landing zones for Terraform
 
-Microsoft Cloud Adoption Framework for Azure provides you with guidance to adopt Azure. When deploying resources in a new environment, you can leverage landing zones and blueprints to accelerate your deployment. A landing zone is a set of infrastructure components that assembled together deploys a complete environment ready to host an application.
+Microsoft Cloud Adoption Framework for Azure provides you with guidance to adopt Azure. When deploying resources in a new environment, you can leverage landing zones and blueprints to accelerate your deployment. A landing zone is a set of infrastructure components that assembled together will deploy a complete environment ready to host an application.
 
-Feel free to reach out to us on tf-landingzones at microsoft dot com.
+For full details on Cloud Adoption Framework, refer to http://aka.ms/caf. For any idea, bug, please fill in an issue. You can also reach out to us on tf-landingzones at microsoft dot com.
 
 ## Overview
 
@@ -72,16 +72,31 @@ For that we will rely on Azure authentication as completed by Azure Cli, via bro
 rover login
 ```
 
-When you are running rover for the fist time, it will prompt your for the location of the launchpad foundations.
+We recommend that you verify the output of the login and make sure the subscription selected by default is the one you want to work on. If not, you can use the following switch: 
 
 ```bash
-# To deploy the environment
-rover
+az account set --subscription <subscription_GUID>
 ```
 
-Then enter the location chosen for deployment, for instance type southeastasia or westeurope.
+On the first run, you need to use the launchpad to create the foundations for Terraform environment, the launchpad_opensource is the current way to set those foundations.
 
-You can then launch your first landing zone as follow:
+Running the following command: 
+
+```bash
+launchpad /tf/launchpads/launchpad_opensource_light apply
+```
+
+This command will interactively prompt you for *var.location*, asking for the name of a supported Azure region **where you want to deploy the Terraform state and dependencies**. You can specify that in the argument as in the following example:  
+
+```bash
+launchpad /tf/launchpads/launchpad_opensource_light apply -var 'location=westus'
+```
+
+You can then launch your first landing zone!
+
+Please note that each landing zone come with its own deployment settings, which may deploy resources in different region than where you set the foundations.  
+
+You are ready to start:
 
 ```bash
 rover /tf/caf/landingzones/landingzone_caf_foundations plan

diff --git a/landingzones/landingzone_caf_foundations/blueprint_foundations_accounting/main.tf b/landingzones/landingzone_caf_foundations/blueprint_foundations_accounting/main.tf
@@ -2,11 +2,11 @@ data "azurerm_client_config" "current" {
 }
 
 provider "azurerm" {
-  version = "<= 1.40"
+  version = "<= 1.42"
 }
 
 provider "azuread" {
-    version = "<=0.6.0"
+    version = "<=0.7.0"
 }
 
 terraform {

diff --git a/landingzones/landingzone_caf_foundations/blueprint_foundations_governance/main.tf b/landingzones/landingzone_caf_foundations/blueprint_foundations_governance/main.tf
@@ -5,11 +5,11 @@ data "azurerm_subscription" "current" {}
 
 
 provider "azurerm" {
-  version = "<= 1.40"
+  version = "<= 1.42"
 }
 
 provider "azuread" {
-    version = "<=0.6.0"
+    version = "<=0.7.0"
 }
 
 terraform {

diff --git a/landingzones/landingzone_caf_foundations/blueprint_foundations_security/main.tf b/landingzones/landingzone_caf_foundations/blueprint_foundations_security/main.tf
@@ -2,11 +2,11 @@ data "azurerm_client_config" "current" {
 }
 
 provider "azurerm" {
-  version = "<= 1.40"
+  version = "<= 1.42"
 }
 
 provider "azuread" {
-    version = "<=0.6.0"
+    version = "<=0.7.0"
 }
 
 terraform {

diff --git a/landingzones/landingzone_caf_foundations/main.tf b/landingzones/landingzone_caf_foundations/main.tf
@@ -1,5 +1,5 @@
 provider "azurerm" {
-  version = "<=1.40"
+  version = "<=1.42"
 }
 
 terraform {

diff --git a/landingzones/landingzone_vdc_demo/blueprint_networking_shared_egress/main.tf b/landingzones/landingzone_vdc_demo/blueprint_networking_shared_egress/main.tf
@@ -5,7 +5,7 @@ terraform {
 }
 
 provider "azurerm" {
-  version = "<= 1.37"
+  version = "<= 1.42"
 }
 
 data "azurerm_subscription" "current" {

diff --git a/landingzones/landingzone_vdc_demo/blueprint_networking_shared_services.sandpit.auto.tfvars b/landingzones/landingzone_vdc_demo/blueprint_networking_shared_services.sandpit.auto.tfvars
@@ -85,13 +85,13 @@ enable_bastion = true
 bastion_config = {
     name = "azurebastion"
     diagnostics = {
-    log = [
-                #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period] 
-                ["BastionAuditLogs", true, true, 30],
+        log = [
+            #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period] 
+            ["BastionAuditLogs", true, true, 30],
         ]
-    metric = [
+        metric = [
             #    ["AllMetrics", true, true, 30],
-    ]
+        ]
     }
     ip_name = "arnaud-pip-bastion"
     ip_addr = {

diff --git a/landingzones/landingzone_vdc_demo/blueprint_networking_shared_services/main.tf b/landingzones/landingzone_vdc_demo/blueprint_networking_shared_services/main.tf
@@ -5,7 +5,7 @@ terraform {
 }
 
 provider "azurerm" {
-  version = "<= 1.37"
+  version = "<= 1.42"
 }
 
 data "azurerm_subscription" "current" {

diff --git a/landingzones/landingzone_vdc_demo/blueprint_networking_shared_transit/main.tf b/landingzones/landingzone_vdc_demo/blueprint_networking_shared_transit/main.tf
@@ -5,7 +5,7 @@ terraform {
 }
 
 provider "azurerm" {
-  version = "<= 1.37"
+  version = "<= 1.42"
 }
 
 data "azurerm_subscription" "current" {

diff --git a/landingzones/landingzone_vdc_demo/main.tf b/landingzones/landingzone_vdc_demo/main.tf
@@ -1,5 +1,5 @@
 provider "azurerm" {
-  version = "<=1.39"
+  version = "<=1.42"
 }
 
 terraform {