Merge pull request #49822 from mumian/0822-arm-quickstarts

[ARM] update the quickstart-vscode

Author: rmca14

articles/azure-resource-manager/media/resource-manager-tutorial-create-templates-with-dependent-resources/resource-manager-template-public-ip-address-definition.png

@@ -196,7 +196,7 @@ When the Azure resources are no longer needed, clean up the resources you deploy
 
 ## Next steps
 
-In this tutorial, you learned how to generate a template from the Azure portal, and how to deploy the template using the portal. The template used in this Quickstart is a simple template with one Azure resource. When the template is complex, it is easier to use Visual Studio Code or Visual Studio to develop the template.
+In this tutorial, you learned how to generate a template from the Azure portal, and how to deploy the template using the portal. The template used in this Quickstart is a simple template with one Azure resource. When the template is complex, it is easier to use Visual Studio Code or Visual Studio to develop the template. The next quickstart also show you how to deploy templates using Azure PowerShell and Azure Command-line Interface (CLI).
 
 > [!div class="nextstepaction"]
 > [Create templates by using Visual Studio Code](./resource-manager-quickstart-create-templates-use-visual-studio-code.md)

articles/azure-resource-manager/media/resource-manager-tutorial-create-templates-with-dependent-resources/resource-manager-template-storage-account-definition.png

@@ -1,6 +1,6 @@
 ---
 title: Use Visual Studio Code to create Azure Resource Manager template | Microsoft Docs
-description: Use the Azure Resource Manager tools extension to work on Resource Manager templates.
+description: Use Visual Studio Code and the Azure Resource Manager tools extension to work on Resource Manager templates.
 services: azure-resource-manager
 documentationcenter: ''
 author: mumian
@@ -11,11 +11,11 @@ ms.service: azure-resource-manager
 ms.workload: multiple
 ms.tgt_pltfrm: na
 ms.devlang: na
-ms.date: 07/17/2018
+ms.date: 08/24/2018
 ms.topic: quickstart
 ms.author: jgao
 
-#Customer intent: As a developer new to Azure deployment, I want to learn how to create a resource manager template so I can deploy Azure resources.
+#Customer intent: As a developer new to Azure deployment, I want to learn how to create a resource manager template using Visual Studio Code, so I can deploy Azure resources.
 
 ---
 
@@ -88,32 +88,49 @@ To learn how to edit a template using Visual Studio Code, you add one more eleme
 
 ## Deploy the template
 
-There are many methods for deploying templates.  In this quickstart, you use the Cloud shell from the Azure portal. The Cloud shell supports both Azure CLI and Azure PowerShell. The instructions provided here use CLI.
+There are many methods for deploying templates.  In this quickstart, you use Azure Cloud Shell from the Azure portal. Cloud Shell supports both Azure CLI and Azure PowerShell. 
 
 1. Sign in to the [Azure portal](https://portal.azure.com)
 2. Select **Cloud Shell** from the upper right corner as shown in the following image:
 
     ![Azure portal Cloud shell](./media/resource-manager-quickstart-create-templates-use-visual-studio-code/azure-portal-cloud-shell.png)
 
-3. Select the down arrow and then select **Bash** to switch to CLI from PowerShell.
+    Cloud Shell is opened on the bottom of the screen.
+
+3. On the upper left corner of the Cloud shell, it shows either **PowerShell** or **Bash**. To use CLI, you need to open a Bash session. To run PowerShell, you need to open a PowerShell session. To switch, select the down arrow, and then select the interpreter. The following image shows switching from PowerShell to Bash.
 
     ![Azure portal Cloud shell CLI](./media/resource-manager-quickstart-create-templates-use-visual-studio-code/azure-portal-cloud-shell-choose-cli.png)
-4. Select **Restart** to restart the shell.
-5. Select **Upload/download files**, and then select **Upload**.
+
+    Restarting the shell is required when you switch.
+4. Select **Upload/download files**, and then select **Upload**.
 
     ![Azure portal Cloud shell upload file](./media/resource-manager-quickstart-create-templates-use-visual-studio-code/azure-portal-cloud-shell-upload-file.png)
-4. Select the file you saved earlier in the quickstart. The default name is **azuredeploy.json**.
-5. From the Cloud shell, run the **ls** command to verify the file is uploaded successfully. You can also use the **cat** command to verify the template content.
+
+    You must upload the template file before you can deploy it from the shell.
+5. Select the file you saved earlier in the quickstart. The default name is **azuredeploy.json**.
+6. From the Cloud shell, run the **ls** command to verify the file is uploaded successfully. You can also use the **cat** command to verify the template content. The following image shows running the command from Bash.  You use the same commands from a PowerShell session.
 
     ![Azure portal Cloud shell list file](./media/resource-manager-quickstart-create-templates-use-visual-studio-code/azure-portal-cloud-shell-list-file.png)
-6. From the Cloud shell, run the following commands:
+7. From the Cloud shell, run the following commands. Select the tab to show the PowerShell code or the CLI code.
 
+    # [CLI](#tab/CLI)
     ```cli
     az group create --name <ResourceGroupName> --location <AzureLocation>
 
     az group deployment create --name <DeploymentName> --resource-group <ResourceGroupName> --template-file <TemplateFileName>
     ```
-    Here is the screenshot of a sample deployment:
+   
+    # [PowerShell](#tab/PowerShell)
+    
+    ```powershell
+    New-AzureRmResourceGroup -Name <ResourceGroupName> -Location <AzureLocation>
+
+    New-AzureRmResourceGroupDeployment -ResourceGroupName <ResourceGroupName> -TemplateFile <TemplateFileName>
+    ```
+    
+    ---
+
+    The following screenshot shows a sample CLI deployment:
 
     ![Azure portal Cloud shell deploy template](./media/resource-manager-quickstart-create-templates-use-visual-studio-code/azure-portal-cloud-shell-deploy-template.png)
 
@@ -126,11 +143,20 @@ There are many methods for deploying templates.  In this quickstart, you use the
 
     From the screenshot output, the storage account name is *3tqebj3slyfyestandardsa*. 
 
-7. Run the following CLI command to list the newly created storage account:
+7. Run the following CLI or PowerShell command to list the newly created storage account:
 
+    # [CLI](#tab/CLI)
     ```cli
     az storage account show --resource-group <ResourceGroupName> --name <StorageAccountName>
     ```
+   
+    # [PowerShell](#tab/PowerShell)
+    
+    ```powershell
+    Get-AzureRmStorageAccount -ResourceGroupName <ResourceGroupName> -Name <StorageAccountName>
+    ```
+    
+    ---
 
 ## Clean up resources
 
@@ -143,7 +169,7 @@ When the Azure resources are no longer needed, clean up the resources you deploy
 
 ## Next steps
 
-In this tutorial, you learned how to create a template using Visual Studio Code, and how to deploy the template using the Azure portal Cloud shell. In the next tutorial, you learn more about how to develop a template, and how to use template reference.
+The primary focus of this tutorial is to use Visual Studio Code to edit an existing template from Azure Quickstart templates. You also learned how to deploy the template using either CLI or PowerShell from Azure Cloud Shell. The templates from Azure Quickstart templates might not give you everything you need. The next tutorial shows you how to find the information from template reference so you can create an encrypted Azure Storage account.
 
 > [!div class="nextstepaction"]
-> [Create an encrypted Storage account](./resource-manager-tutorial-create-encrypted-storage-accounts.md)
+> [Create an encrypted storage account](./resource-manager-tutorial-create-encrypted-storage-accounts.md)

articles/azure-resource-manager/media/resource-manager-tutorial-create-templates-with-dependent-resources/resource-manager-template-visual-studio-code.png

@@ -11,7 +11,7 @@ ms.service: azure-resource-manager
 ms.workload: multiple
 ms.tgt_pltfrm: na
 ms.devlang: na
-ms.date: 07/20/2018
+ms.date: 08/27/2018
 ms.topic: tutorial
 ms.author: jgao
 
@@ -27,9 +27,7 @@ This tutorial covers the following tasks:
 
 > [!div class="checklist"]
 > * Open a Quickstart template
-> * Understand the template format
-> * Use parameters in template
-> * Use variables in template
+> * Understand the template
 > * Edit the template
 > * Deploy the template
 
@@ -98,7 +96,7 @@ Variables allow you to construct values that can be used throughout your templat
 This template defines one variable *storageAccountName*. In the definition, two template functions are used:
 
 - **concat()**: concatenates strings. For more information, see [concat](./resource-group-template-functions-string.md#concat).
-- **uniqueString()**: creates a deterministic hash string based on the values provided as parameters. Each Azure storage account must have an unique name across of all Azure. This function provides an unique string. For more string functions, see [String functions](./resource-group-template-functions-string.md).
+- **uniqueString()**: creates a deterministic hash string based on the values provided as parameters. Each Azure storage account must have a unique name across of all Azure. This function provides a unique string. For more string functions, see [String functions](./resource-group-template-functions-string.md).
 
 To use the variable defined in the template:
 
@@ -108,10 +106,10 @@ To use the variable defined in the template:
 
 ## Edit the template
 
-To find the storage account encryption-related configuration, you can use the template reference of Azure Storage account.
+The goal of this tutorial is to define a template to create an encrypted storage account.  The sample template only creates a basic unencrypted storage account. To find the encryption-related configuration, you can use the template reference of Azure Storage account.
 
 1. Browse to [Azure Templates](https://docs.microsoft.com/azure/templates/).
-2. From the TOC on the left, select **Reference**->**Storage**->**Storage Accounts**. The page contains the information for defining a Storage Account information.
+2. From the TOC on the left, select **Reference**->**Storage**->**Storage Accounts**. You can also enter **storage** in the **Filter by title** field.  The page contains the schema for defining a Storage Account information.
 3. Explore the encryption-related information.  
 4. Inside the properties element of the storage account resource definition, add the following json:
 
@@ -127,59 +125,17 @@ To find the storage account encryption-related configuration, you can use the te
     ```
     This part enables the encryption function of the blob storage service.
 
-The final resources element looks like:
+From Visual Studio Code, modify the template so that the final resources element looks like:
 
 ![Resource Manager template encrypted storage account resources](./media/resource-manager-tutorial-create-encrypted-storage-accounts/resource-manager-template-encrypted-storage-resources.png)
 
 ## Deploy the template
 
-There are many methods for deploying templates.  In this tutorial, you use the Cloud shell from the Azure portal. The Cloud shell supports both Azure CLI and Azure PowerShell. The instructions provided here use CLI.
+Refer to the [Deploy the template](./resource-manager-quickstart-create-templates-use-visual-studio-code.md#deploy-the-template) section in the Visual Studio Code quickstart for the deployment procedure.
 
-1. Sign in to the [Azure portal](https://portal.azure.com)
-2. Select **Cloud Shell** from the upper right corner as shown in the following image:
+The following screenshot shows the CLI command for listing the newly created storage account, which indicates encryption has been enabled for the blob storage.
 
-    ![Azure portal Cloud shell](./media/resource-manager-tutorial-create-encrypted-storage-accounts/azure-portal-cloud-shell.png)
-
-3. Select the down arrow and then select **Bash** if it is not Bash. You use Azure CLI in this tutorial.
-
-    ![Azure portal Cloud shell CLI](./media/resource-manager-tutorial-create-encrypted-storage-accounts/azure-portal-cloud-shell-choose-cli.png)
-4. Select **Restart** to restart the shell.
-5. Select **Upload/download files**, and then select **Upload**.
-
-    ![Azure portal Cloud shell upload file](./media/resource-manager-tutorial-create-encrypted-storage-accounts/azure-portal-cloud-shell-upload-file.png)
-6. Select the file you saved earlier in the tutorial. The default name is **azuredeploy.json**.
-7. From the Cloud shell, run the **ls** command to verify the file is uploaded successfully. You can also use the **cat** command to verify the template content.
-
-    ![Azure portal Cloud shell list file](./media/resource-manager-tutorial-create-encrypted-storage-accounts/azure-portal-cloud-shell-list-file.png)
-8. From the Cloud shell, run the following commands:
-
-    ```cli
-    az group create --name <ResourceGroupName> --location <AzureLocation>
-
-    az group deployment create --name <DeploymentName> --resource-group <ResourceGroupName> --template-file azuredeploy.json
-    ```
-    Here is the screenshot of a sample deployment:
-
-    ![Azure portal Cloud shell deploy template](./media/resource-manager-tutorial-create-encrypted-storage-accounts/azure-portal-cloud-shell-deploy-template.png)
-
-    On the screenshot, these values are used:
-
-    * **&lt;ResourceGroupName>**: myresourcegroup0719. There are two appearances of the parameter.  Make sure to use the same value.
-    * **&lt;AzureLocation>**: eastus2
-    * **&lt;DeployName>**: mydeployment0719
-    * **&lt;TemplateFile>**: azuredeploy.json
-
-    From the screenshot output, the storage account name is *fhqbfslikdqdsstandardsa*. 
-
-9. Run the following PowerShell command to list the newly created storage account:
-
-    ```cli
-    az storage account show --resource-group <ResourceGroupName> --name <StorageAccountName>
-    ```
-
-    You shall see an output similar to the following screenshot which indicates encryption has been enabled for the blob storage.
-
-    ![Azure resource manager encrypted storage account](./media/resource-manager-tutorial-create-encrypted-storage-accounts/resource-manager-template-encrypted-storage-account.png)
+![Azure Resource Manager encrypted storage account](./media/resource-manager-tutorial-create-encrypted-storage-accounts/resource-manager-template-encrypted-storage-account.png)
 
 ## Clean up resources
 
@@ -192,7 +148,7 @@ When the Azure resources are no longer needed, clean up the resources you deploy
 
 ## Next steps
 
-In this tutorial, you learned how to use template reference to customize an existing template. The template used in this tutorial only contains one Azure resource.  In the next tutorial, you develop a template with multiple resources.  Some of the resources have dependent resources.
+In this tutorial, you learned how to use template reference to customize an existing template. The template used in this tutorial only contains one Azure resource.  In the next tutorial, you develop a template with multiple resources. Some of the resources have dependent resources.
 
 > [!div class="nextstepaction"]
 > [Create multiple resources](./resource-manager-tutorial-create-templates-with-dependent-resources.md)

articles/azure-resource-manager/resource-manager-quickstart-create-templates-use-the-portal.md

@@ -11,7 +11,7 @@ ms.service: azure-resource-manager
 ms.workload: multiple
 ms.tgt_pltfrm: na
 ms.devlang: na
-ms.date: 07/20/2018
+ms.date: 08/27/2018
 ms.topic: tutorial
 ms.author: jgao
 ---
@@ -53,12 +53,27 @@ Azure QuickStart Templates is a repository for Resource Manager templates. Inste
 
 ## Explore the template
 
+When you explore the template in this section, try to answer these questions:
+
+- How many Azure resources defined in this template?
+- One of the resources is an Azure storage account.  Does the definition look like the one used in the last tutorial?
+- Can you find the template references for the resources defined in this template?
+- Can you find the dependencies of the resources?
+
 1. From Visual Studio Code, collapse the elements until you only see the first-level elements and the second-level elements inside **resources**:
 
     ![Visual Studio Code Azure Resource Manager templates](./media/resource-manager-tutorial-create-templates-with-dependent-resources/resource-manager-template-visual-studio-code.png)
 
     There are five resources defined by the template.
-2. Expand the fourth element:
+2. Expand the first resource. It is a storage account. The definition shall be identical to the one used at the begining of the last tutorial.
+
+    ![Visual Studio Code Azure Resource Manager templates storage account definition](./media/resource-manager-tutorial-create-templates-with-dependent-resources/resource-manager-template-storage-account-definition.png)
+
+3. Expand the second resource. The resource type is **Microsoft.Network/publicIPAddresses**. To find the template reference, browse to [template reference](https://docs.microsoft.com/azure/templates/), enter **public ip address** or **public ip addresses** in the **Filter by title** field. Compare the resource definition to the template reference.
+
+    ![Visual Studio Code Azure Resource Manager templates public IP address definition](./media/resource-manager-tutorial-create-templates-with-dependent-resources/resource-manager-template-public-ip-address-definition.png)
+4. Repeat the last step to find the template references for the other resources defined in this template.  Compare the resource definitions to the references.
+5. Expand the fourth resource:
 
     ![Visual Studio Code Azure Resource Manager templates dependson](./media/resource-manager-tutorial-create-templates-with-dependent-resources/resource-manager-template-visual-studio-code-dependson.png)
 
@@ -67,7 +82,7 @@ Azure QuickStart Templates is a repository for Resource Manager templates. Inste
     * publicIPAddress
     * virtualNetwork
 
-3. Expand the fifth element. This resource is a virtual machine. It depends on two other resources:
+6. Expand the fifth resource. This resource is a virtual machine. It depends on two other resources:
 
     * storageAccount
     * networkInterface