Changes for Terraform 2.0 and some clean-up

Author: TomArcherMsft

articles/terraform/terraform-cloud-shell.md

@@ -1,8 +1,9 @@
 ---
 title: Tutorial - Configure Azure Cloud Shell for Terraform
-description: Use Terraform with Azure Cloud Shell to simplify authentication and template configuration.
+description: In this tutorial, you use Terraform with Azure Cloud Shell to simplify authentication and template configuration.
+keywords: azure devops terraform cloud shell
 ms.topic: tutorial
-ms.date: 10/26/2019
+ms.date: 03/09/2020
 ---
 
 # Tutorial: Configure Azure Cloud Shell for Terraform
@@ -26,6 +27,10 @@ Azure Terraform modules require credentials to access and modify Azure resources
 ```hcl
 # Configure the Microsoft Azure Provider
 provider "azurerm" {
+    # The "feature" block is required for AzureRM provider 2.x. 
+    # If you are using version 1.x, the "features" block is not allowed.
+    version = "~>2.0"
+    features {}
 }
 ```
 
@@ -41,4 +46,4 @@ The Azure CLI is available in Cloud Shell and is a great tool for testing config
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Create a small VM cluster using the Module Registry](terraform-create-vm-cluster-module.md)
+> [Create a small VM cluster using the Module Registry](terraform-create-vm-cluster-module.md)

articles/terraform/terraform-create-complete-vm.md

@@ -1,31 +1,21 @@
 ---
-title: Use Terraform to create a complete Linux VM in Azure  
-description: Learn how to use Terraform to create and manage a complete Linux virtual machine environment in Azure
-services: virtual-machines-linux
-documentationcenter: virtual-machines
-author: tomarchermsft
-manager: gwallace
-editor: na
-tags: azure-resource-manager
-ms.assetid: 
-ms.service: virtual-machines-linux
-ms.topic: article
-ms.tgt_pltfrm: vm-linux
-ms.workload: infrastructure
-ms.date: 09/20/2019
-ms.author: tarcher
+title: Quickstart - Use Terraform to create a complete Linux VM in Azure  
+description: In this quickstart, you use Terraform to create and manage a complete Linux virtual machine environment in Azure
+keywords: azure devops terraform linux vm virtual machine
+ms.topic: quickstart
+ms.date: 03/09/2020
 ---
 
-# Create a complete Linux virtual machine infrastructure in Azure with Terraform
+# Quickstart: Create a complete Linux virtual machine infrastructure in Azure with Terraform
 
-Terraform allows you to define and create complete infrastructure deployments in Azure. You build Terraform templates in a human-readable format that create and configure Azure resources in a consistent, reproducible manner. This article shows you how to create a complete Linux environment and supporting resources with Terraform. You can also learn how to [Install and configure Terraform](terraform-install-configure.md).
+Terraform allows you to define and create complete infrastructure deployments in Azure. You build Terraform templates in a human-readable format that create and configure Azure resources in a consistent, reproducible manner. This article shows you how to create a complete Linux environment and supporting resources with Terraform. You can also learn how to [install and configure Terraform](terraform-install-configure.md).
 
 > [!NOTE]
 > For Terraform specific support, please reach out to Terraform directly using one of their community channels:
 >
->	• The [Terraform section](https://discuss.hashicorp.com/c/terraform-core) of the community portal contains questions, use cases, and useful patterns.
+>    * The [Terraform section](https://discuss.hashicorp.com/c/terraform-core) of the community portal contains questions, use cases, and useful patterns.
 >
->	• For provider-related questions please visit the [Terraform Providers](https://discuss.hashicorp.com/c/terraform-providers) section of the community portal.
+>    * For provider-related questions please visit the [Terraform Providers](https://discuss.hashicorp.com/c/terraform-providers) section of the community portal.
 
 
 ## Create Azure connection and resource group
@@ -39,6 +29,11 @@ The `provider` section tells Terraform to use an Azure provider. To get values f
 
 ```hcl
 provider "azurerm" {
+    # The "feature" block is required for AzureRM provider 2.x. 
+    # If you are using version 1.x, the "features" block is not allowed.
+    version = "~>2.0"
+    features {}
+    
     subscription_id = "xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     client_id       = "xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     client_secret   = "xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
@@ -142,7 +137,6 @@ resource "azurerm_network_interface" "myterraformnic" {
     name                        = "myNIC"
     location                    = "eastus"
     resource_group_name         = azurerm_resource_group.myterraformgroup.name
-    network_security_group_id   = azurerm_network_security_group.myterraformnsg.id
 
     ip_configuration {
         name                          = "myNicConfiguration"
@@ -155,6 +149,12 @@ resource "azurerm_network_interface" "myterraformnic" {
         environment = "Terraform Demo"
     }
 }
+
+# Connect the security group to the network interface
+resource "azurerm_network_interface_security_group_association" "example" {
+    network_interface_id      = azurerm_network_interface.myterraformnic.id
+    network_security_group_id = azurerm_network_security_group.myterraformnsg.id
+}
 ```
 
 
@@ -196,18 +196,17 @@ The final step is to create a VM and use all the resources created. The followin
  SSH key data is provided in the *ssh_keys* section. Provide a valid public SSH key in the *key_data* field.
 
 ```hcl
-resource "azurerm_virtual_machine" "myterraformvm" {
+resource "azurerm_linux_virtual_machine" "myterraformvm" {
     name                  = "myVM"
     location              = "eastus"
     resource_group_name   = azurerm_resource_group.myterraformgroup.name
     network_interface_ids = [azurerm_network_interface.myterraformnic.id]
-    vm_size               = "Standard_DS1_v2"
+    size                  = "Standard_DS1_v2"
 
-    storage_os_disk {
+    os_disk {
         name              = "myOsDisk"
         caching           = "ReadWrite"
-        create_option     = "FromImage"
-        managed_disk_type = "Premium_LRS"
+        storage_account_type = "Premium_LRS"
     }
 
     storage_image_reference {
@@ -217,22 +216,17 @@ resource "azurerm_virtual_machine" "myterraformvm" {
         version   = "latest"
     }
 
-    os_profile {
-        computer_name  = "myvm"
-        admin_username = "azureuser"
-    }
-
-    os_profile_linux_config {
-        disable_password_authentication = true
-        ssh_keys {
-            path     = "/home/azureuser/.ssh/authorized_keys"
-            key_data = "ssh-rsa AAAAB3Nz{snip}hwhqT9h"
-        }
+    computer_name  = "myvm"
+    admin_username = "azureuser"
+    disable_password_authentication = true
+        
+    admin_ssh_key {
+        username       = "azureuser"
+        public_key     = file("/home/azureuser/.ssh/authorized_keys")
     }
 
     boot_diagnostics {
-        enabled     = "true"
-        storage_uri = azurerm_storage_account.mystorageaccount.primary_blob_endpoint
+        storage_account_uri = azurerm_storage_account.mystorageaccount.primary_blob_endpoint
     }
 
     tags = {
@@ -248,13 +242,18 @@ To bring all these sections together and see Terraform in action, create a file
 ```hcl
 # Configure the Microsoft Azure Provider
 provider "azurerm" {
+    # The "feature" block is required for AzureRM provider 2.x. 
+    # If you are using version 1.x, the "features" block is not allowed.
+    version = "~>2.0"
+    features {}
+
     subscription_id = "xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     client_id       = "xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     client_secret   = "xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     tenant_id       = "xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 }
 
-# Create a resource group if it doesn’t exist
+# Create a resource group if it doesn't exist
 resource "azurerm_resource_group" "myterraformgroup" {
     name     = "myResourceGroup"
     location = "eastus"
@@ -324,7 +323,6 @@ resource "azurerm_network_interface" "myterraformnic" {
     name                      = "myNIC"
     location                  = "eastus"
     resource_group_name       = azurerm_resource_group.myterraformgroup.name
-    network_security_group_id = azurerm_network_security_group.myterraformnsg.id
 
     ip_configuration {
         name                          = "myNicConfiguration"
@@ -338,6 +336,12 @@ resource "azurerm_network_interface" "myterraformnic" {
     }
 }
 
+# Connect the security group to the network interface
+resource "azurerm_network_interface_security_group_association" "example" {
+    network_interface_id      = azurerm_network_interface.myterraformnic.id
+    network_security_group_id = azurerm_network_security_group.myterraformnsg.id
+}
+
 # Generate random text for a unique storage account name
 resource "random_id" "randomId" {
     keepers = {
@@ -362,43 +366,37 @@ resource "azurerm_storage_account" "mystorageaccount" {
 }
 
 # Create virtual machine
-resource "azurerm_virtual_machine" "myterraformvm" {
+resource "azurerm_linux_virtual_machine" "myterraformvm" {
     name                  = "myVM"
     location              = "eastus"
     resource_group_name   = azurerm_resource_group.myterraformgroup.name
     network_interface_ids = [azurerm_network_interface.myterraformnic.id]
-    vm_size               = "Standard_DS1_v2"
+    size                  = "Standard_DS1_v2"
 
-    storage_os_disk {
+    os_disk {
         name              = "myOsDisk"
         caching           = "ReadWrite"
-        create_option     = "FromImage"
-        managed_disk_type = "Premium_LRS"
+        storage_account_type = "Premium_LRS"
     }
 
-    storage_image_reference {
+    source_image_reference {
         publisher = "Canonical"
         offer     = "UbuntuServer"
         sku       = "16.04.0-LTS"
         version   = "latest"
     }
 
-    os_profile {
-        computer_name  = "myvm"
-        admin_username = "azureuser"
-    }
-
-    os_profile_linux_config {
-        disable_password_authentication = true
-        ssh_keys {
-            path     = "/home/azureuser/.ssh/authorized_keys"
-            key_data = "ssh-rsa AAAAB3Nz{snip}hwhqT9h"
-        }
+    computer_name  = "myvm"
+    admin_username = "azureuser"
+    disable_password_authentication = true
+        
+    admin_ssh_key {
+        username       = "azureuser"
+        public_key     = file("/home/azureuser/.ssh/authorized_keys")
     }
 
     boot_diagnostics {
-        enabled = "true"
-        storage_uri = azurerm_storage_account.mystorageaccount.primary_blob_endpoint
+        storage_account_uri = azurerm_storage_account.mystorageaccount.primary_blob_endpoint
     }
 
     tags = {
@@ -431,8 +429,8 @@ persisted to local or remote state storage.
 
 ...
 
-Note: You didn’t specify an “-out” parameter to save this plan, so when
-“apply” is called, Terraform can’t guarantee this is what will execute.
+Note: You didn't specify an "-out" parameter to save this plan, so when
+"apply" is called, Terraform can't guarantee this is what will execute.
   + azurerm_resource_group.myterraform
       <snip>
   + azurerm_virtual_network.myterraformnetwork
@@ -469,4 +467,5 @@ ssh azureuser@<publicIps>
 ```
 
 ## Next steps
-You have created basic infrastructure in Azure by using Terraform. For more complex scenarios, including examples that use load balancers and virtual machine scale sets, see numerous [Terraform examples for Azure](https://github.com/hashicorp/terraform/tree/master/examples). For an up-to-date list of supported Azure providers, see the [Terraform documentation](https://www.terraform.io/docs/providers/azurerm/index.html).
+> [!div class="nextstepaction"]
+> [Learn more about using Terraform in Azure](/azure/terraform)

articles/terraform/terraform-create-k8s-cluster-with-aks-applicationgateway-ingress.md

@@ -1,8 +1,9 @@
 ---
 title: Tutorial - Create an Application Gateway ingress controller in Azure Kubernetes Service
-description: Tutorial illustrating how to create a Kubernetes Cluster with Azure Kubernetes Service with Application Gateway as ingress controller
+description: In this tutorial, you create a Kubernetes Cluster with Azure Kubernetes Service with Application Gateway as ingress controller
+keywords: azure devops terraform application gateway ingress aks kubernetes
 ms.topic: tutorial
-ms.date: 11/13/2019
+ms.date: 03/09/2020
 ---
 
 # Tutorial: Create an Application Gateway ingress controller in Azure Kubernetes Service
@@ -72,7 +73,10 @@ Create the Terraform configuration file that declares the Azure provider.
 
     ```hcl
     provider "azurerm" {
-        version = "~>1.18"
+      # The "feature" block is required for AzureRM provider 2.x. 
+      # If you are using version 1.x, the "features" block is not allowed.
+      version = "~>2.0"
+      features {}
     }
 
     terraform {
@@ -437,11 +441,10 @@ Create Terraform configuration file that creates all the resources.
         }
       }
 
-      agent_pool_profile {
+      default_node_pool {
         name            = "agentpool"
-        count           = var.aks_agent_count
+        node_count      = var.aks_agent_count
         vm_size         = var.aks_agent_vm_size
-        os_type         = "Linux"
         os_disk_size_gb = var.aks_agent_os_disk_size
         vnet_subnet_id  = data.azurerm_subnet.kubesubnet.id
       }
@@ -767,4 +770,4 @@ az group delete -n <resource-group>
 ## Next steps
 
 > [!div class="nextstepaction"] 
-> [Application Gateway Ingress Controller](https://azure.github.io/application-gateway-kubernetes-ingress/)
+> [Application Gateway Ingress Controller](https://azure.github.io/application-gateway-kubernetes-ingress/)

articles/terraform/terraform-create-k8s-cluster-with-tf-and-aks.md

@@ -1,8 +1,9 @@
 ---
 title: Tutorial - Create a Kubernetes cluster with Azure Kubernetes Service (AKS) using Terraform
-description: Tutorial illustrating how to create a Kubernetes Cluster with Azure Kubernetes Service and Terraform
+description: In this tutorial, you create a Kubernetes Cluster with Azure Kubernetes Service and Terraform
+keywords: azure devops terraform aks kubernetes
 ms.topic: tutorial
-ms.date: 11/07/2019
+ms.date: 03/09/2020
 ---
 
 # Tutorial: Create a Kubernetes cluster with Azure Kubernetes Service using Terraform
@@ -66,7 +67,10 @@ Create the Terraform configuration file that declares the Azure provider.
 
     ```hcl
     provider "azurerm" {
-        version = "~>1.5"
+        # The "feature" block is required for AzureRM provider 2.x. 
+        # If you are using version 1.x, the "features" block is not allowed.
+        version = "~>2.0"
+        features {}
     }
 
     terraform {
@@ -389,4 +393,4 @@ see [Monitor Azure Kubernetes Service health](/azure/azure-monitor/insights/cont
 ## Next steps
 
 > [!div class="nextstepaction"] 
-> [Learn more about using Terraform in Azure](/azure/terraform)
+> [Learn more about using Terraform in Azure](/azure/terraform)

articles/terraform/terraform-create-vm-cluster-module.md

@@ -1,8 +1,9 @@
 ---
 title: Tutorial - Create an Azure VM cluster with Terraform using the Module Registry
-description: Learn how to use Terraform modules to create a Windows virtual machine cluster in Azure
+description: In this tutorial, you use Terraform modules to create a Windows virtual machine cluster in Azure
+keywords: azure devops terraform vm virtual machine cluster module registry
 ms.topic: tutorial
-ms.date: 10/26/2019
+ms.date: 03/09/2020
 ---
 
 # Tutorial: Create an Azure VM cluster with Terraform using the Module Registry
@@ -31,6 +32,8 @@ variable client_id {}
 variable client_secret {}
 
 provider "azurerm" {
+    version = "~>1.40"
+
     subscription_id = "xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     tenant_id = "xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     client_id = "xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
@@ -95,4 +98,4 @@ Run `terraform apply` to provision the VMs on Azure.
 ## Next steps
 
 > [!div class="nextstepaction"] 
-> [Browse the list of Azure Terraform modules](https://registry.terraform.io/modules/Azure)
+> [Browse the list of Azure Terraform modules](https://registry.terraform.io/modules/Azure)