Merge pull request microsoft#107 from TomArcherMsft/UserStory1977015

lonegunmanb · web-flow · commit 4832632b2c01 · 2022-08-24T22:27:43.000+08:00
User Story 1977015
diff --git a/quickstart/101-attestation-provider/main.tf b/quickstart/101-attestation-provider/main.tf
@@ -1,28 +1,16 @@
-terraform {
-
-  required_version = ">=0.12"
-    
-  required_providers {
-    azurerm = {
-      source = "hashicorp/azurerm"
-      version = "~>2.0"
-    }
-  }
-}
-
-provider "azurerm" {
-  features {}
+resource "random_pet" "rg_name" {
+  prefix = var.resource_group_name_prefix
 }
 
 resource "azurerm_resource_group" "rg" {
-  name = var.resource_group_name
+  name     = random_pet.rg_name.id
   location = var.resource_group_location
 }
 
-resource "azurerm_attestation_provider" "corpAttestation" {
-    name                              = var.attestation_provider_name
-    resource_group_name               = azurerm_resource_group.rg.name
-    location                          = azurerm_resource_group.rg.location
+resource "azurerm_attestation_provider" "corp_attestation" {
+  name                = var.attestation_provider_name
+  resource_group_name = azurerm_resource_group.rg.name
+  location            = azurerm_resource_group.rg.location
 
-    policy_signing_certificate_data   = file(var.policy_file)
+  policy_signing_certificate_data = file(var.policy_file)
 }
diff --git a/quickstart/101-attestation-provider/outputs.tf b/quickstart/101-attestation-provider/outputs.tf
@@ -0,0 +1,3 @@
+output "resource_group_name" {
+  value = azurerm_resource_group.rg.name
+}
diff --git a/quickstart/101-attestation-provider/providers.tf b/quickstart/101-attestation-provider/providers.tf
@@ -0,0 +1,14 @@
+terraform {
+  required_version = ">=0.12"
+
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "~>2.0"
+    }
+  }
+}
+
+provider "azurerm" {
+  features {}
+}
diff --git a/quickstart/101-attestation-provider/readme.md b/quickstart/101-attestation-provider/readme.md
@@ -0,0 +1,21 @@
+# Azure attestation provider
+
+This template deploys an [Attestation provider](/azure/attestation/overview) on Azure.
+
+## Terraform resource types
+
+- [random_pet](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/pet)
+- [azurerm_resource_group](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/resource_group)
+- [azurerm_attestation_provider](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/attestation)
+
+## Variables
+
+| Name | Description | Default |
+|-|-|-|
+| `resource_group_name_prefix` | (Optional) Prefix of the resource group name that's combined with a random ID so name is unique in your Azure subscription.| rg |
+| `resource_group_location` | (Optional) Azure Region in which to deploy these resources.| eastus |
+| `attestation_provider_name` | Name of the Attestation provider | attestationprovider007 |
+
+## Example
+
+To see how to run this example, see [Configure an Azure Attestation provider using Terraform](https://docs.microsoft.com/en-us/azure/developer/terraform/create-attestation-provider).
diff --git a/quickstart/101-attestation-provider/variables.tf b/quickstart/101-attestation-provider/variables.tf
@@ -1,9 +1,11 @@
-variable "resource_group_name" {
-  default = "myResourceGroup"
+variable "resource_group_name_prefix" {
+  default     = "rg"
+  description = "Prefix of the resource group name that's combined with a random ID so name is unique in your Azure subscription."
 }
 
 variable "resource_group_location" {
-  default = "eastus"
+  default     = "eastus"
+  description = "Location of the resource group."
 }
 
 variable "policy_file" {
diff --git a/quickstart/101-resource-group/main.tf b/quickstart/101-resource-group/main.tf
@@ -1,8 +1,8 @@
-resource "random_pet" "rg-name" {
-  prefix    = var.resource_group_name_prefix
+resource "random_pet" "rg_name" {
+  prefix = var.resource_group_name_prefix
 }
 
 resource "azurerm_resource_group" "rg" {
-  name      = random_pet.rg-name.id
-  location  = var.resource_group_location
+  name     = random_pet.rg_name.id
+  location = var.resource_group_location
 }
diff --git a/quickstart/101-resource-group/output.tf b/quickstart/101-resource-group/output.tf
diff --git a/quickstart/101-resource-group/outputs.tf b/quickstart/101-resource-group/outputs.tf
@@ -0,0 +1,3 @@
+output "resource_group_name" {
+  value = azurerm_resource_group.rg.name
+}
diff --git a/quickstart/101-resource-group/providers.tf b/quickstart/101-resource-group/providers.tf
@@ -1,10 +1,9 @@
 terraform {
-
   required_version = ">=0.12"
-  
+
   required_providers {
     azurerm = {
-      source = "hashicorp/azurerm"
+      source  = "hashicorp/azurerm"
       version = "~>2.0"
     }
   }
diff --git a/quickstart/101-resource-group/variables.tf b/quickstart/101-resource-group/variables.tf
@@ -1,9 +1,9 @@
 variable "resource_group_name_prefix" {
-  default       = "rg"
-  description   = "Prefix of the resource group name that's combined with a random ID so name is unique in your Azure subscription."
+  default     = "rg"
+  description = "Prefix of the resource group name that's combined with a random ID so name is unique in your Azure subscription."
 }
 
 variable "resource_group_location" {
-  default = "eastus"
-  description   = "Location of the resource group."
+  default     = "eastus"
+  description = "Location of the resource group."
 }
diff --git a/quickstart/201-mysql-fs-db/main.tf b/quickstart/201-mysql-fs-db/main.tf
@@ -1,5 +1,5 @@
 // Generate random value for the Resource Group name
-resource "random_pet" "rg-name" {
+resource "random_pet" "rg_name" {
   prefix = var.name_prefix
 }
 
@@ -22,7 +22,7 @@ resource "random_password" "password" {
 
 // Manages the Resource Group where the resource exists
 resource "azurerm_resource_group" "default" {
-  name     = "mysqlfsRG-${random_pet.rg-name.id}"
+  name     = "mysqlfsRG-${random_pet.rg_name.id}"
   location = var.location
 }
 
diff --git a/quickstart/201-mysql-fs-db/output.tf b/quickstart/201-mysql-fs-db/output.tf
diff --git a/quickstart/201-mysql-fs-db/outputs.tf b/quickstart/201-mysql-fs-db/outputs.tf
@@ -0,0 +1,11 @@
+output "resource_group_name" {
+  value = azurerm_resource_group.default.name
+}
+
+output "azurerm_mysql_flexible_server" {
+  value = azurerm_mysql_flexible_server.default.name
+}
+
+output "mysql_flexible_server_database_name" {
+  value = azurerm_mysql_flexible_database.default.name
+}
diff --git a/quickstart/201-mysql-fs-db/providers.tf b/quickstart/201-mysql-fs-db/providers.tf
@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     azurerm = {
-      source = "hashicorp/azurerm"
+      source  = "hashicorp/azurerm"
       version = "~>3.0"
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+output "resource_group_name" {`
	`2`	`+ value = azurerm_resource_group.rg.name`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`		`-variable "resource_group_name" {`
`2`		`- default = "myResourceGroup"`
	`1`	`+variable "resource_group_name_prefix" {`
	`2`	`+ default = "rg"`
	`3`	`+ description = "Prefix of the resource group name that's combined with a random ID so name is unique in your Azure subscription."`
`3`	`4`	`}`
`4`	`5`
`5`	`6`	`variable "resource_group_location" {`
`6`		`- default = "eastus"`
	`7`	`+ default = "eastus"`
	`8`	`+ description = "Location of the resource group."`
`7`	`9`	`}`
`8`	`10`
`9`	`11`	`variable "policy_file" {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-resource "random_pet" "rg-name" {`
`2`		`- prefix = var.resource_group_name_prefix`
	`1`	`+resource "random_pet" "rg_name" {`
	`2`	`+ prefix = var.resource_group_name_prefix`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`resource "azurerm_resource_group" "rg" {`
`6`		`- name = random_pet.rg-name.id`
`7`		`- location = var.resource_group_location`
	`6`	`+ name = random_pet.rg_name.id`
	`7`	`+ location = var.resource_group_location`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`	`1`	`terraform {`
`2`		`-`
`3`	`2`	`required_version = ">=0.12"`
`4`		`-`
	`3`	`+`
`5`	`4`	`required_providers {`
`6`	`5`	`azurerm = {`
`7`		`- source = "hashicorp/azurerm"`
	`6`	`+ source = "hashicorp/azurerm"`
`8`	`7`	`version = "~>2.0"`
`9`	`8`	`}`
`10`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`variable "resource_group_name_prefix" {`
`2`		`- default = "rg"`
`3`		`- description = "Prefix of the resource group name that's combined with a random ID so name is unique in your Azure subscription."`
	`2`	`+ default = "rg"`
	`3`	`+ description = "Prefix of the resource group name that's combined with a random ID so name is unique in your Azure subscription."`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`variable "resource_group_location" {`
`7`		`- default = "eastus"`
`8`		`- description = "Location of the resource group."`
	`7`	`+ default = "eastus"`
	`8`	`+ description = "Location of the resource group."`
`9`	`9`	`}`