Skip to content

Commit 191572b

Browse files
myc2h6omyc2h6o
committed
resolve comments
1 parent aae3e0f commit 191572b

8 files changed

Lines changed: 46 additions & 52 deletions

File tree

‎quickstart/201-vm-disk-encryption-extension/main.tf‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ resource "azurerm_key_vault_access_policy" "service-principal" {
3939
resource "azurerm_key_vault_key" "example" {
4040
name = "examplekey"
4141
key_vault_id = azurerm_key_vault.example.id
42-
key_type = "RSA"
42+
key_type = "RSA-HSM"
4343
key_size = 2048
4444

4545
key_opts = [
@@ -120,15 +120,13 @@ resource "azurerm_virtual_machine_extension" "example" {
120120
auto_upgrade_minor_version = false
121121
virtual_machine_id = azurerm_linux_virtual_machine.example.id
122122

123-
settings = <<SETTINGS
124-
{
125-
"EncryptionOperation": "EnableEncryption",
126-
"KeyEncryptionAlgorithm": "RSA-OAEP",
127-
"KeyVaultURL": "${azurerm_key_vault.example.vault_uri}",
128-
"KeyVaultResourceId": "${azurerm_key_vault.example.id}",
129-
"KeyEncryptionKeyURL": "${azurerm_key_vault_key.example.id}",
130-
"KekVaultResourceId": "${azurerm_key_vault.example.id}",
131-
"VolumeType": "All"
132-
}
133-
SETTINGS
123+
settings = jsonencode({
124+
"EncryptionOperation" = "EnableEncryption"
125+
"KeyEncryptionAlgorithm" = "RSA-OAEP"
126+
"KeyVaultURL" = azurerm_key_vault.example.vault_uri
127+
"KeyVaultResourceId" = azurerm_key_vault.example.id
128+
"KeyEncryptionKeyURL" = azurerm_key_vault_key.example.id
129+
"KekVaultResourceId" = azurerm_key_vault.example.id
130+
"VolumeType" = "All"
131+
})
134132
}

quickstart/201-vm-disk-encryption-extension/provider.tf renamed to quickstart/201-vm-disk-encryption-extension/providers.tf

File renamed without changes.

‎quickstart/201-vm-disk-encryption-extension/readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ This template deploys an Azure virtual machine with disk encryption extension.
1919
| Name | Description |
2020
|-|-|
2121
| `location` | (Required) Azure Region in which to deploy these resources.|
22+
| `name_prefix` | (Required) Prefix of the resource name.|
2223
| `vm_public_key` | (Required) Public key of the Virtual Machine.|
23-
| `name_prefix` | (Optional) Prefix of the resource name. Value defaults to: tftest|
2424

2525
## Example
2626

‎quickstart/201-vm-disk-encryption-extension/variables.tf‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ variable "location" {
33
description = "Location where resources will be created"
44
}
55

6-
variable "vm_public_key" {
6+
variable "name_prefix" {
77
type = string
8-
description = "Public key of the Virtual Machine"
8+
description = "Prefix of the resource name"
99
}
1010

11-
variable "name_prefix" {
11+
variable "vm_public_key" {
1212
type = string
13-
default = "tftest"
14-
description = "Prefix of the resource name"
13+
description = "Public key of the Virtual Machine"
1514
}

‎quickstart/201-vmss-disk-encryption-extension/main.tf‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ resource "azurerm_key_vault_access_policy" "service-principal" {
3939
resource "azurerm_key_vault_key" "example" {
4040
name = "examplekey"
4141
key_vault_id = azurerm_key_vault.example.id
42-
key_type = "RSA"
42+
key_type = "RSA-HSM"
4343
key_size = 3072
4444

4545
key_opts = [
@@ -114,15 +114,13 @@ resource "azurerm_virtual_machine_scale_set_extension" "example" {
114114
auto_upgrade_minor_version = false
115115
virtual_machine_scale_set_id = azurerm_windows_virtual_machine_scale_set.example.id
116116

117-
settings = <<SETTINGS
118-
{
119-
"EncryptionOperation": "EnableEncryption",
120-
"KeyEncryptionAlgorithm": "RSA-OAEP",
121-
"KeyVaultURL": "${azurerm_key_vault.example.vault_uri}",
122-
"KeyVaultResourceId": "${azurerm_key_vault.example.id}",
123-
"KeyEncryptionKeyURL": "${azurerm_key_vault_key.example.id}",
124-
"KekVaultResourceId": "${azurerm_key_vault.example.id}",
125-
"VolumeType": "All"
126-
}
127-
SETTINGS
117+
settings = jsonencode({
118+
"EncryptionOperation" = "EnableEncryption"
119+
"KeyEncryptionAlgorithm" = "RSA-OAEP"
120+
"KeyVaultURL" = azurerm_key_vault.example.vault_uri
121+
"KeyVaultResourceId" = azurerm_key_vault.example.id
122+
"KeyEncryptionKeyURL" = azurerm_key_vault_key.example.id
123+
"KekVaultResourceId" = azurerm_key_vault.example.id
124+
"VolumeType" = "All"
125+
})
128126
}

quickstart/201-vmss-disk-encryption-extension/provider.tf renamed to quickstart/201-vmss-disk-encryption-extension/providers.tf

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
terraform {
2-
required_version = ">=1.0"
3-
4-
required_providers {
5-
azurerm = {
6-
source = "hashicorp/azurerm"
7-
version = "~>3.8"
8-
}
9-
}
10-
}
11-
12-
provider "azurerm" {
13-
features {
14-
key_vault {
15-
recover_soft_deleted_key_vaults = false
16-
purge_soft_delete_on_destroy = false
17-
purge_soft_deleted_keys_on_destroy = false
18-
}
19-
}
20-
}
1+
terraform {
2+
required_version = ">=1.0"
3+
4+
required_providers {
5+
azurerm = {
6+
source = "hashicorp/azurerm"
7+
version = "~>3.8"
8+
}
9+
}
10+
}
11+
12+
provider "azurerm" {
13+
features {
14+
key_vault {
15+
recover_soft_deleted_key_vaults = false
16+
purge_soft_delete_on_destroy = false
17+
purge_soft_deleted_keys_on_destroy = false
18+
}
19+
}
20+
}

‎quickstart/201-vmss-disk-encryption-extension/readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This template deploys an Azure virtual machine scale set with disk encryption ex
1919
|-|-|
2020
| `admin_password` | (Required) Admin password of the virtual machine scale set.|
2121
| `location` | (Required) Azure Region in which to deploy these resources.|
22-
| `name_prefix` | (Optional) Prefix of the resource name. Value defaults to: tftest|
22+
| `name_prefix` | (Required) Prefix of the resource name.|
2323

2424
## Example
2525

‎quickstart/201-vmss-disk-encryption-extension/variables.tf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@ variable "location" {
1111

1212
variable "name_prefix" {
1313
type = string
14-
default = "tftest"
1514
description = "Prefix of the resource name"
1615
}

0 commit comments

Comments
 (0)