From 26a919e903b8fd32a489086b603f6eb5a24def3c Mon Sep 17 00:00:00 2001 From: Tom Archer Date: Tue, 23 Aug 2022 19:02:18 -0700 Subject: [PATCH 1/6] Updating code to align with Contributor Guide template --- quickstart/101-attestation-provider/main.tf | 20 ++++-------------- quickstart/101-attestation-provider/output.tf | 3 +++ .../101-attestation-provider/providers.tf | 15 +++++++++++++ quickstart/101-attestation-provider/readme.md | 21 +++++++++++++++++++ .../101-attestation-provider/variables.tf | 6 ++++-- 5 files changed, 47 insertions(+), 18 deletions(-) create mode 100644 quickstart/101-attestation-provider/output.tf create mode 100644 quickstart/101-attestation-provider/providers.tf create mode 100644 quickstart/101-attestation-provider/readme.md diff --git a/quickstart/101-attestation-provider/main.tf b/quickstart/101-attestation-provider/main.tf index 123d2607..a70d617b 100644 --- a/quickstart/101-attestation-provider/main.tf +++ b/quickstart/101-attestation-provider/main.tf @@ -1,22 +1,10 @@ -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 - location = var.resource_group_location + name = random_pet.rg-name.id + location = var.resource_group_location } resource "azurerm_attestation_provider" "corpAttestation" { diff --git a/quickstart/101-attestation-provider/output.tf b/quickstart/101-attestation-provider/output.tf new file mode 100644 index 00000000..2de7782a --- /dev/null +++ b/quickstart/101-attestation-provider/output.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 new file mode 100644 index 00000000..fcf87af8 --- /dev/null +++ b/quickstart/101-attestation-provider/providers.tf @@ -0,0 +1,15 @@ +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 new file mode 100644 index 00000000..f42ce260 --- /dev/null +++ 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). \ No newline at end of file diff --git a/quickstart/101-attestation-provider/variables.tf b/quickstart/101-attestation-provider/variables.tf index 2fbd8523..2bc2ff16 100644 --- 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" + description = "Location of the resource group." } variable "policy_file" { From de3b6a2a42e8239cc2f3d3e83e0c16d564c0f4ba Mon Sep 17 00:00:00 2001 From: Tom Archer Date: Wed, 24 Aug 2022 06:35:20 -0700 Subject: [PATCH 2/6] Updated variables to snake case per review --- quickstart/101-attestation-provider/main.tf | 4 ++-- quickstart/201-mysql-fs-db/main.tf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/quickstart/101-attestation-provider/main.tf b/quickstart/101-attestation-provider/main.tf index a70d617b..02ad9d96 100644 --- a/quickstart/101-attestation-provider/main.tf +++ b/quickstart/101-attestation-provider/main.tf @@ -1,9 +1,9 @@ -resource "random_pet" "rg-name" { +resource "random_pet" "rg_name" { prefix = var.resource_group_name_prefix } resource "azurerm_resource_group" "rg" { - name = random_pet.rg-name.id + name = random_pet.rg_name.id location = var.resource_group_location } diff --git a/quickstart/201-mysql-fs-db/main.tf b/quickstart/201-mysql-fs-db/main.tf index 193c7983..feab9787 100644 --- 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 } From 32a23622d0474010697e4eaa8dd359103e731ca0 Mon Sep 17 00:00:00 2001 From: Tom Archer Date: Wed, 24 Aug 2022 06:43:54 -0700 Subject: [PATCH 3/6] Updated file naming per review --- quickstart/101-attestation-provider/{output.tf => outputs.tf} | 0 quickstart/101-resource-group/main.tf | 4 ++-- quickstart/101-resource-group/{output.tf => outputs.tf} | 0 quickstart/201-mysql-fs-db/{output.tf => outputs.tf} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename quickstart/101-attestation-provider/{output.tf => outputs.tf} (100%) rename quickstart/101-resource-group/{output.tf => outputs.tf} (100%) rename quickstart/201-mysql-fs-db/{output.tf => outputs.tf} (100%) diff --git a/quickstart/101-attestation-provider/output.tf b/quickstart/101-attestation-provider/outputs.tf similarity index 100% rename from quickstart/101-attestation-provider/output.tf rename to quickstart/101-attestation-provider/outputs.tf diff --git a/quickstart/101-resource-group/main.tf b/quickstart/101-resource-group/main.tf index 1820e2ab..77d2c581 100644 --- a/quickstart/101-resource-group/main.tf +++ b/quickstart/101-resource-group/main.tf @@ -1,8 +1,8 @@ -resource "random_pet" "rg-name" { +resource "random_pet" "rg_name" { prefix = var.resource_group_name_prefix } resource "azurerm_resource_group" "rg" { - name = random_pet.rg-name.id + 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/outputs.tf similarity index 100% rename from quickstart/101-resource-group/output.tf rename to quickstart/101-resource-group/outputs.tf diff --git a/quickstart/201-mysql-fs-db/output.tf b/quickstart/201-mysql-fs-db/outputs.tf similarity index 100% rename from quickstart/201-mysql-fs-db/output.tf rename to quickstart/201-mysql-fs-db/outputs.tf From 4a706b9f6d0a74fe7782c088de9d49a780e93425 Mon Sep 17 00:00:00 2001 From: Tom Archer Date: Wed, 24 Aug 2022 06:50:04 -0700 Subject: [PATCH 4/6] Ran 'terraform fmt' against code being modified in this PR' --- quickstart/101-attestation-provider/main.tf | 14 +++++++------- quickstart/101-attestation-provider/outputs.tf | 2 +- quickstart/101-attestation-provider/providers.tf | 4 ++-- quickstart/101-attestation-provider/variables.tf | 8 ++++---- quickstart/101-resource-group/main.tf | 6 +++--- quickstart/101-resource-group/outputs.tf | 2 +- quickstart/101-resource-group/providers.tf | 4 ++-- quickstart/101-resource-group/variables.tf | 8 ++++---- quickstart/201-mysql-fs-db/outputs.tf | 6 +++--- quickstart/201-mysql-fs-db/providers.tf | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/quickstart/101-attestation-provider/main.tf b/quickstart/101-attestation-provider/main.tf index 02ad9d96..cc97b75b 100644 --- a/quickstart/101-attestation-provider/main.tf +++ b/quickstart/101-attestation-provider/main.tf @@ -1,16 +1,16 @@ resource "random_pet" "rg_name" { - prefix = var.resource_group_name_prefix + 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 } resource "azurerm_attestation_provider" "corpAttestation" { - name = var.attestation_provider_name - resource_group_name = azurerm_resource_group.rg.name - location = azurerm_resource_group.rg.location + 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) } \ No newline at end of file diff --git a/quickstart/101-attestation-provider/outputs.tf b/quickstart/101-attestation-provider/outputs.tf index 2de7782a..62816bd7 100644 --- a/quickstart/101-attestation-provider/outputs.tf +++ b/quickstart/101-attestation-provider/outputs.tf @@ -1,3 +1,3 @@ output "resource_group_name" { - value = azurerm_resource_group.rg.name + value = azurerm_resource_group.rg.name } diff --git a/quickstart/101-attestation-provider/providers.tf b/quickstart/101-attestation-provider/providers.tf index fcf87af8..9397419a 100644 --- a/quickstart/101-attestation-provider/providers.tf +++ b/quickstart/101-attestation-provider/providers.tf @@ -1,10 +1,10 @@ terraform { required_version = ">=0.12" - + required_providers { azurerm = { - source = "hashicorp/azurerm" + source = "hashicorp/azurerm" version = "~>2.0" } } diff --git a/quickstart/101-attestation-provider/variables.tf b/quickstart/101-attestation-provider/variables.tf index 2bc2ff16..7c14fc2b 100644 --- a/quickstart/101-attestation-provider/variables.tf +++ b/quickstart/101-attestation-provider/variables.tf @@ -1,11 +1,11 @@ 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." } variable "policy_file" { diff --git a/quickstart/101-resource-group/main.tf b/quickstart/101-resource-group/main.tf index 77d2c581..b312f1af 100644 --- 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 + 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/outputs.tf b/quickstart/101-resource-group/outputs.tf index 2de7782a..62816bd7 100644 --- a/quickstart/101-resource-group/outputs.tf +++ b/quickstart/101-resource-group/outputs.tf @@ -1,3 +1,3 @@ output "resource_group_name" { - value = azurerm_resource_group.rg.name + value = azurerm_resource_group.rg.name } diff --git a/quickstart/101-resource-group/providers.tf b/quickstart/101-resource-group/providers.tf index fcf87af8..9397419a 100644 --- a/quickstart/101-resource-group/providers.tf +++ b/quickstart/101-resource-group/providers.tf @@ -1,10 +1,10 @@ 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 index 1790a608..19f4680c 100644 --- 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/outputs.tf b/quickstart/201-mysql-fs-db/outputs.tf index 00ce7cc8..a4c7915b 100644 --- a/quickstart/201-mysql-fs-db/outputs.tf +++ b/quickstart/201-mysql-fs-db/outputs.tf @@ -1,11 +1,11 @@ output "resource_group_name" { - value = azurerm_resource_group.default.name + value = azurerm_resource_group.default.name } output "azurerm_mysql_flexible_server" { - value = azurerm_mysql_flexible_server.default.name + value = azurerm_mysql_flexible_server.default.name } output "mysql_flexible_server_database_name" { - value = azurerm_mysql_flexible_database.default.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 index 269412b8..cbe3e719 100644 --- 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" } } From 1043acb83641fde52d84041444bb0d5ae96e9bdf Mon Sep 17 00:00:00 2001 From: Tom Archer Date: Wed, 24 Aug 2022 06:55:46 -0700 Subject: [PATCH 5/6] Per review, removed blank line --- quickstart/101-attestation-provider/providers.tf | 1 - quickstart/101-resource-group/providers.tf | 1 - 2 files changed, 2 deletions(-) diff --git a/quickstart/101-attestation-provider/providers.tf b/quickstart/101-attestation-provider/providers.tf index 9397419a..6bd52554 100644 --- a/quickstart/101-attestation-provider/providers.tf +++ b/quickstart/101-attestation-provider/providers.tf @@ -1,5 +1,4 @@ terraform { - required_version = ">=0.12" required_providers { diff --git a/quickstart/101-resource-group/providers.tf b/quickstart/101-resource-group/providers.tf index 9397419a..6bd52554 100644 --- a/quickstart/101-resource-group/providers.tf +++ b/quickstart/101-resource-group/providers.tf @@ -1,5 +1,4 @@ terraform { - required_version = ">=0.12" required_providers { From 1eb58101bae86fa4d9ab450a74681b25af42b4eb Mon Sep 17 00:00:00 2001 From: Tom Archer Date: Wed, 24 Aug 2022 07:01:30 -0700 Subject: [PATCH 6/6] Per review, changed var name from camel case to snake case --- quickstart/101-attestation-provider/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstart/101-attestation-provider/main.tf b/quickstart/101-attestation-provider/main.tf index cc97b75b..36091ab7 100644 --- a/quickstart/101-attestation-provider/main.tf +++ b/quickstart/101-attestation-provider/main.tf @@ -7,7 +7,7 @@ resource "azurerm_resource_group" "rg" { location = var.resource_group_location } -resource "azurerm_attestation_provider" "corpAttestation" { +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