Merge pull request #89231 from TomArcherMsft/terraform-code-fences

Terraform - Change code fencing

Author: ktoliver

articles/terraform/index.yml

@@ -11,7 +11,7 @@ metadata:
   ms.topic: landing-page
   author: TomArcherMsft
   ms.author: tarcher
-  ms.date: 09/12/2019
+  ms.date: 09/20/2019
 
 landingContent:
   # Card

articles/terraform/terrafom-quickstart.md

@@ -5,7 +5,7 @@ services: terraform
 author: neilpeterson
 ms.service: azure
 ms.topic: quickstart
-ms.date: 02/04/2019
+ms.date: 09/20/2019
 ms.author: nepeters
 ---
 
@@ -19,7 +19,7 @@ In this section, you will create the configuration for an Azure Cosmos DB instan
 
 Select **try it now** to open up Azure cloud shell. Once open, enter in `code .` to open the cloud shell code editor.
 
-```azurecli-interactive
+```bash
 code .
 ```
 
@@ -29,7 +29,7 @@ This configuration models an Azure resource group, a random integer, and an Azur
 
 Save the file as `main.tf` when done. This operation can be done using the ellipses in the upper right-hand portion of the code editor.
 
-```azurecli-interactive
+```hcl
 resource "azurerm_resource_group" "vote-resource-group" {
   name     = "vote-resource-group"
   location = "westus"
@@ -62,21 +62,21 @@ resource "azurerm_cosmosdb_account" "vote-cosmos-db" {
 
 The [terraform init](https://www.terraform.io/docs/commands/init.html) command initializes the working directory. Run `terraform init` in the cloud shell terminal to prepare for the deployment of the new configuration.
 
-```azurecli-interactive
+```bash
 terraform init
 ```
 
 The [terraform plan](https://www.terraform.io/docs/commands/plan.html) command can be used to validate that the configuration is properly formatted and to visualize what resources will be created, updated, or destroyed. The results can be stored in a file and used at a later time to apply the configuration.
 
 Run `terraform plan` to test the new Terraform configuration.
 
-```azurecli-interactive
+```bash
 terraform plan --out plan.out
 ```
 
 Apply the configuration using [terraform apply](https://www.terraform.io/docs/commands/apply.html) and specifying the name of the plan file. This command deploys the resources in your Azure subscription.
 
-```azurecli-interactive
+```bash
 terraform apply plan.out
 ```
 
@@ -93,7 +93,7 @@ Two environment variables are set, `COSMOS_DB_ENDPOINT` and `COSMOS_DB_MASTERKEY
 
 The configuration also includes an output block, which returns the fully qualified domain name (FQDN) of the container instance.
 
-```azurecli-interactive
+```hcl
 resource "azurerm_container_group" "vote-aci" {
   name                = "vote-aci"
   location            = "${azurerm_resource_group.vote-resource-group.location}"
@@ -129,13 +129,13 @@ output "dns" {
 
 Run `terraform plan` to create the updated plan and visualize the changes to be made. You should see that an Azure Container Instance resource has been added to the configuration.
 
-```azurecli-interactive
+```bash
 terraform plan --out plan.out
 ```
 
 Finally, run `terraform apply` to apply the configuration.
 
-```azurecli-interactive
+```bash
 terraform apply plan.out
 ```
 
@@ -151,7 +151,7 @@ Navigate to the FQDN of the container instance. If everything was correctly conf
 
 When done, the Azure resources and resource group can be removed using the [terraform destroy](https://www.terraform.io/docs/commands/destroy.html) command.
 
-```azurecli-interactive
+```bash
 terraform destroy -auto-approve
 ```
 

articles/terraform/terraform-backend.md

@@ -5,7 +5,7 @@ services: terraform
 author: tomarchermsft
 ms.service: azure
 ms.topic: article
-ms.date: 09/13/2018
+ms.date: 09/20/2019
 ms.author: tarcher
 ---
 
@@ -23,7 +23,7 @@ Terraform includes the concept of a state backend, which is remote storage for T
 
 Before using Azure Storage as a backend, a storage account must be created. The storage account can be created with the Azure portal, PowerShell, the Azure CLI, or Terraform itself. Use the following sample to configure the storage account with the Azure CLI.
 
-```azurecli-interactive
+```azurecli
 #!/bin/bash
 
 RESOURCE_GROUP_NAME=tstate
@@ -62,21 +62,21 @@ Each of these values can be specified in the Terraform configuration file or on
 
 Create an environment variable named `ARM_ACCESS_KEY` with the value of the Azure Storage access key.
 
-```console
+```bash
 export ARM_ACCESS_KEY=<storage access key>
 ```
 
 To further protect the Azure Storage account access key, store it in Azure Key Vault. The environment variable can then be set using a command similar to the following. For more information on Azure Key Vault, see the [Azure Key Vault documentation][azure-key-vault].
 
-```console
+```bash
 export ARM_ACCESS_KEY=$(az keyvault secret show --name terraform-backend-key --vault-name myKeyVault --query value -o tsv)
 ```
 
 To configure Terraform to use the backend, include a *backend* configuration with a type of *azurerm* inside of the Terraform configuration. Add the *storage_account_name*, *container_name*, and *key* values to the configuration block.
 
 The following example configures a Terraform backend and creates an Azure resource group. Replace the values with values from your environment.
 
-```json
+```hcl
 terraform {
   backend "azurerm" {
     storage_account_name  = "tstate09762"

articles/terraform/terraform-cloud-shell.md

@@ -8,7 +8,7 @@ author: tomarchermsft
 manager: jeconnoc
 ms.author: tarcher
 ms.topic: tutorial
-ms.date: 10/19/2017
+ms.date: 09/20/2019
 ---
 
 # Terraform Cloud Shell development 
@@ -28,7 +28,7 @@ Terraform is installed and immediately available in Cloud Shell. Terraform scrip
 
 Azure Terraform modules require credentials to access and make changes to the resources in your Azure subscription. When working in the Cloud Shell, add the following code to your scripts to use Azure Terraform modules in the Cloud Shell:
 
-```tf
+```hcl
 # Configure the Microsoft Azure Provider
 provider "azurerm" {
 }

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

@@ -8,7 +8,7 @@ author: tomarcher
 manager: jeconnoc
 ms.author: tarcher
 ms.topic: tutorial
-ms.date: 1/10/2019
+ms.date: 09/20/2019
 ---
 
 # Create a Kubernetes cluster with Application Gateway ingress controller using Azure Kubernetes Service and Terraform
@@ -33,7 +33,7 @@ In this tutorial, you learn how to perform the following tasks in creating a [Ku
 - **Azure service principal**: Follow the directions in the section of the **Create the service principal** section in the article, [Create an Azure service principal with Azure CLI](/cli/azure/create-an-azure-service-principal-azure-cli?view=azure-cli-latest). Take note of the values for the appId, displayName, and password.
   - Note the Object ID of the Service Principal by running the following command
 
-    ```bash
+    ```azurecli
     az ad sp list --display-name <displayName>
     ```
 
@@ -77,7 +77,7 @@ Create the Terraform configuration file that declares the Azure provider.
 
 1. Paste the following code into the editor:
 
-    ```JSON
+    ```hcl
     provider "azurerm" {
         version = "~>1.18"
     }
@@ -94,17 +94,21 @@ Create the Terraform configuration file that declares the Azure provider.
     ```bash
     :wq
     ```
-   ## Define input variables
-   Create the Terraform configuration file that lists all the variables required for this deployment
-1. In Cloud Shell, create a file named `variables.tf`
+
+## Define input variables
+Create the Terraform configuration file that lists all the variables required for this deployment.
+
+1. In Cloud Shell, create a file named `variables.tf`.
+
     ```bash
     vi variables.tf
     ```
+
 1. Enter insert mode by selecting the I key.
 
-2. Paste the following code into the editor:
+1. Paste the following code into the editor:
     
-    ```JSON
+    ```hcl
     variable "resource_group_name" {
       description = "Name of the resource group already created."
     }
@@ -249,9 +253,9 @@ Create Terraform configuration file that creates all the resources.
 
 1. Paste the following code blocks  into the editor:
 
-    a. Create a locals block for computed variables to reuse
+    a. Create a locals block for computed variables to reuse.
 
-    ```JSON
+    ```hcl
     # # Locals block for hardcoded names. 
     locals {
         backend_address_pool_name      = "${azurerm_virtual_network.test.name}-beap"
@@ -263,8 +267,10 @@ Create Terraform configuration file that creates all the resources.
         app_gateway_subnet_name = "appgwsubnet"
     }
     ```
-    b. Create a data source for Resource group, new User identity
-    ```JSON
+
+    b. Create a data source for Resource group, new User identity.
+
+    ```hcl
     data "azurerm_resource_group" "rg" {
       name = "${var.resource_group_name}"
     }
@@ -279,8 +285,10 @@ Create Terraform configuration file that creates all the resources.
       tags = "${var.tags}"
     }
     ```
-    c. Create base networking resources
-   ```JSON
+
+    c. Create base networking resources.
+
+    ```hcl
     resource "azurerm_virtual_network" "test" {
       name                = "${var.virtual_network_name}"
       location            = "${data.azurerm_resource_group.rg.location}"
@@ -323,8 +331,10 @@ Create Terraform configuration file that creates all the resources.
       tags = "${var.tags}"
     }
     ```
-    d. Create Application Gateway resource
-    ```JSON
+
+    d. Create Application Gateway resource.
+
+    ```hcl
     resource "azurerm_application_gateway" "network" {
       name                = "${var.app_gateway_name}"
       resource_group_name = "${data.azurerm_resource_group.rg.name}"
@@ -388,8 +398,10 @@ Create Terraform configuration file that creates all the resources.
       depends_on = ["azurerm_virtual_network.test", "azurerm_public_ip.test"]
     }
     ```
-    e. Create role assignments
-    ```JSON
+
+    e. Create role assignments.
+
+    ```hcl
     resource "azurerm_role_assignment" "ra1" {
       scope                = "${data.azurerm_subnet.kubesubnet.id}"
       role_definition_name = "Network Contributor"
@@ -419,8 +431,10 @@ Create Terraform configuration file that creates all the resources.
       depends_on           = ["azurerm_user_assigned_identity.testIdentity", "azurerm_application_gateway.network"]
     }
     ```
-    f. Create the Kubernetes cluster
-    ```JSON
+
+    f. Create the Kubernetes cluster.
+
+    ```hcl
     resource "azurerm_kubernetes_cluster" "k8s" {
       name       = "${var.aks_name}"
       location   = "${data.azurerm_resource_group.rg.location}"
@@ -497,7 +511,7 @@ Create Terraform configuration file that creates all the resources.
 
 1. Paste the following code into the editor:
 
-    ```JSON
+    ```hcl
     output "client_key" {
         value = "${azurerm_kubernetes_cluster.k8s.kube_config.0.client_key}"
     }
@@ -554,7 +568,7 @@ Terraform tracks state locally via the `terraform.tfstate` file. This pattern wo
 
 1. In Cloud Shell, create a container in your Azure storage account (replace the &lt;YourAzureStorageAccountName> and &lt;YourAzureStorageAccountAccessKey> placeholders with the appropriate values for your Azure storage account).
 
-    ```bash
+    ```azurecli
     az storage container create -n tfstate --account-name <YourAzureStorageAccountName> --account-key <YourAzureStorageAccountKey>
     ```
 
@@ -582,7 +596,7 @@ In this section, you see how to use the `terraform init` command to create the r
 
 1. Paste the following variables created earlier into the editor:
 
-    ```JSON
+    ```hcl
       resource_group_name = <Name of the Resource Group already created>
 
       location = <Location of the Resource Group>

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

@@ -8,7 +8,7 @@ author: tomarchermsft
 manager: jeconnoc
 ms.author: tarcher
 ms.topic: tutorial
-ms.date: 12/04/2018
+ms.date: 09/20/2019
 ---
 
 # Create a Kubernetes cluster with Azure Kubernetes Service and Terraform
@@ -69,7 +69,7 @@ Create the Terraform configuration file that declares the Azure provider.
 
 1. Paste the following code into the editor:
 
-    ```JSON
+    ```hcl
     provider "azurerm" {
         version = "~>1.5"
     }
@@ -100,7 +100,7 @@ Create the Terraform configuration file that declares the resources for the Kube
 
 1. Paste the following code into the editor:
 
-    ```JSON
+    ```hcl
     resource "azurerm_resource_group" "k8s" {
         name     = "${var.resource_group_name}"
         location = "${var.location}"
@@ -197,7 +197,7 @@ Create the Terraform configuration file that declares the resources for the Kube
 
 1. Paste the following code into the editor:
 
-    ```JSON
+    ```hcl
     variable "client_id" {}
     variable "client_secret" {}
 
@@ -261,7 +261,7 @@ Create the Terraform configuration file that declares the resources for the Kube
 
 1. Paste the following code into the editor:
 
-    ```JSON
+    ```hcl
     output "client_key" {
         value = "${azurerm_kubernetes_cluster.k8s.kube_config.0.client_key}"
     }
@@ -318,7 +318,7 @@ Terraform tracks state locally via the `terraform.tfstate` file. This pattern wo
 
 1. In Cloud Shell, create a container in your Azure storage account (replace the <YourAzureStorageAccountName> and <YourAzureStorageAccountAccessKey> placeholders with the appropriate values for your Azure storage account).
 
-    ```bash
+    ```azurecli
     az storage container create -n tfstate --account-name <YourAzureStorageAccountName> --account-key <YourAzureStorageAccountKey>
     ```
 

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

@@ -8,7 +8,7 @@ author: tomarchermsft
 manager: jeconnoc
 ms.author: tarcher
 ms.topic: tutorial
-ms.date: 10/19/2017
+ms.date: 09/20/2019
 ---
 
 # Create a VM cluster with Terraform using the Module Registry
@@ -30,7 +30,7 @@ For more information on Terraform, see the [Terraform documentation](https://www
 
  Review [Install Terraform and configure access to Azure](/azure/virtual-machines/linux/terraform-install-configure) to create an Azure service principal. Use this service principal to populate a new file `azureProviderAndCreds.tf` in an empty directory with the following code:
 
-```tf
+```hcl
 variable subscription_id {}
 variable tenant_id {}
 variable client_id {}
@@ -48,7 +48,7 @@ provider "azurerm" {
 
 Create a new Terraform template named `main.tf` with the following code:
 
-```tf
+```hcl
 module mycompute {
     source = "Azure/compute/azurerm"
     resource_group_name = "myResourceGroup"