azd-templates-freshness-pass

Author: alexwolfmsft

learn-pr/azure/build-first-azd-template/includes/2-create-template-structure.md

@@ -6,24 +6,33 @@ The Azure Developer CLI (`azd`) assists you with building new templates for your
     azd init
     ```
 
-1. The command output displays a list of starter templates and full sample app options. The starter templates include the essential folder structure, starter infrastructure as code files, and other boilerplate configuration files to get started building templates. The full sample templates also include placeholder application code and the files needed to deploy them. For this module, you'll learn to build your own template rather than modifying existing app code, so choose the **Starter - Bicep** option from the list. The Azure Developer CLI also supports [using Terraform](/azure/developer/azure-developer-cli/use-terraform-for-azd) if you prefer that option. Terraform support is currently in alpha and must be [manually enabled](/azure/developer/azure-developer-cli/use-terraform-for-azd).
+1. The command output displays three different choices for initializing an `azd` template:
+
+- **Use code in the current directory**: Analyzes your app code to create and configure certain template assets for you.
+- **Select a template**: Choose an existing starter template that includes the essential folder structure, starter infrastructure as code files, and other boilerplate configuration files to streamline building templates.
+- **Create a minimal project**: Generates the minimum configuration files to get started.
+
+    Read more about these different choices in the [Create Azure Developer CLI templates overview](/azure/developer/azure-developer-cli/make-azd-compatible) documentation.
+
+1. Choose the **Select a template** option and `azd` displays a pre-configured list of available templates.
+1. Search for **Starter** and then select the **Starter - Bicep** option from the results list. The Azure Developer CLI also supports [using Terraform](/azure/developer/azure-developer-cli/use-terraform-for-azd) if you prefer that option. Terraform support is currently in alpha and must be [manually enabled](/azure/developer/azure-developer-cli/use-terraform-for-azd).
 
 1. When prompted for an environment name, enter *azdlearn* or a name of your choosing. The environment name influences the naming of provisioned resources in Azure.
 
 1. A set of folders is created inside of the current directory:
 
     :::image type="content" source="../media/template-structure.png" alt-text="The starter template structure.":::
-    
+
 > [!NOTE]
 > You may have noticed the `azd init` command also provides a project template called **Minimal**, which contains the simplest possible template structure. However, the **Starter - Bicep** template you selected includes additional scaffolding code that is very useful but still technology agnostic, so it's often a great choice for getting started.
 
 The generated folders provide all of the essential building blocks of an `azd` template:
 
-* **.azdo** - A folder containing the starter `.yml` configuration files for CI/CD with Azure Pipelines.
-* **.azure** - A folder containing essential settings for the template's Azure environment, such as the environment name.
-* **.devcontainer** - A folder containing configuration files used to run the template in a dev container environment.
-* **.github** - A folder containing a starter `.yml` configuration template to set up a CI/CD pipeline through GitHub actions.
-* **infra** - A folder containing starter Bicep files for the template's infrastructure as code. If you selected the Terraform starter template, this folder contains Terraform files instead.
-* **azure.yaml** - A file that describes how the parts of your application map to services in Azure.
+- **.azure** - A folder containing essential settings for the template's Azure environment, such as the environment name.
+- **.devcontainer** - A folder containing configuration files used to run the template in a dev container environment.
+- **infra** - A folder containing starter Bicep files for the template's infrastructure as code. If you selected the Terraform starter template, this folder contains Terraform files instead.
+- **azure.yaml** - A file that describes how the parts of your application map to services in Azure.
+- **.gitignore** - A starter .gitignore file for excluding unwanted files from git version control.
+- **README.md** - A starter README file that provides general guidance for the end user of the template.
 
 This starter template contains most of what you need to create your own `azd` template. Over the next several units, you'll learn how to update these existing files and add new assets to build a complete template.

learn-pr/azure/build-first-azd-template/includes/7-configure-cicd.md

@@ -1,8 +1,8 @@
-You created a template and provisioned its resources on Azure. However, the previous workflows relied on manual commands to apply changes to your environment. The starter template also provides configuration files to further automate this process using a CI/CD pipeline with either GitHub Actions or Azure Pipelines. By configuring a CI/CD pipeline, you can automatically update your Azure environment with the latest changes simply by committing and pushing your changes to GitHub.
+You created a template and provisioned its resources on Azure. However, the previous workflows relied on manual commands to apply changes to your environment. By configuring a CI/CD pipeline, you can automatically update your Azure environment with the latest changes simply by committing and pushing your changes to GitHub.
 
 ## Configure the pipeline
 
-Most `azd` templates include CI/CD workflow files in either the `.github` folder for [GitHub Actions](/training/modules/introduction-to-github-actions/) or the `.azdo` folder for [Azure Pipelines](/training/paths/deploy-applications-with-azure-devops/) (or both). The sample template created in this module was initialized with both. These workflow files use a standard structure for their respective platforms, so an in-depth exploration of CI/CD workflow configurations is beyond the scope of this module. However, a deep understanding of GitHub Actions or Azure Pipelines isn't required to complete this module, since `azd` abstracts much of the work behind simple commands that use the workflow configuration files.
+Most `azd` templates include CI/CD workflow files in either the `.github` folder for [GitHub Actions](/training/modules/introduction-to-github-actions/) or the `.azdo` folder for [Azure Pipelines](/training/paths/deploy-applications-with-azure-devops/) (or both). These workflow files use a standard structure for their respective platforms, so an in-depth exploration of CI/CD workflow configurations is beyond the scope of this module. However, a deep understanding of GitHub Actions or Azure Pipelines isn't required to complete this module, since `azd` abstracts much of the work behind simple commands that use the workflow configuration files.
 
 The `azd` command and workflow to configure a CI/CD pipeline is the same regardless of whether you choose GitHub Actions or Azure Pipelines. A GitHub repository is required for you to be able to set up CI/CD. You can either create the new repository by forking the original `azd` template repository and setting it as a remote, or you can create a repo using `azd` during the pipeline configuration process, which is the approach you'll use in this example.
 
@@ -14,6 +14,9 @@ Complete the following steps to configure a CI/CD pipeline for your template:
     azd pipeline config
     ```
 
+1. Choose **GitHub** when `azd` prompts you to select a provider. Note that Azure DevOps is also provided as an option.
+1. When prompted, enter *y* and press enter to instruct `azd` to create a default `azure-dev.yaml` file for you. `azure-dev.yaml` is a standard GitHub actions configuration file required to configure workflows such as a deployment pipeline. `azd` adds the the `azure-dev.yml` file to your project inside of a new `.github` folder. You can use the `azure-dev.yaml` file as-is or modify it to suit your needs.
+
 1. If a GitHub origin isn't set for your project, `azd` asks how you would like to configure your remote repository. Select the option **Create a new private GitHub repository** and then enter a name for the new repo. `azd` completes the following tasks for you:
     * Creates a GitHub repository and commits your project code to it.
     * Creates and configures a service principal for the app on the Azure subscription.