Skip to content

Commit b6f52f3

Browse files
committed
changes per tech review
1 parent e866f84 commit b6f52f3

File tree

8 files changed

+36
-15
lines changed

8 files changed

+36
-15
lines changed

quickstart/101-attestation-provider/providers.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,8 @@ terraform {
1212
provider "azurerm" {
1313
features {}
1414
}
15+
16+
random = {
17+
source = "hashicorp/random"
18+
version = "~>3.0"
19+
}

quickstart/101-resource-group/providers.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,8 @@ terraform {
1212
provider "azurerm" {
1313
features {}
1414
}
15+
16+
random = {
17+
source = "hashicorp/random"
18+
version = "~>3.0"
19+
}

quickstart/201-k8s-cluster-with-tf-and-aks/outputs.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@ output "resource_group_name" {
33
}
44

55
output "client_key" {
6-
value = azurerm_kubernetes_cluster.k8s.kube_config.0.client_key
6+
value = azurerm_kubernetes_cluster.k8s.kube_config[0].client_key
77
sensitive = true
88
}
99

1010
output "client_certificate" {
11-
value = azurerm_kubernetes_cluster.k8s.kube_config.0.client_certificate
11+
value = azurerm_kubernetes_cluster.k8s.kube_config[0].client_certificate
1212
sensitive = true
1313
}
1414

1515
output "cluster_ca_certificate" {
16-
value = azurerm_kubernetes_cluster.k8s.kube_config.0.cluster_ca_certificate
16+
value = azurerm_kubernetes_cluster.k8s.kube_config[0].cluster_ca_certificate
1717
sensitive = true
1818
}
1919

2020
output "cluster_username" {
21-
value = azurerm_kubernetes_cluster.k8s.kube_config.0.username
21+
value = azurerm_kubernetes_cluster.k8s.kube_config[0].username
2222
sensitive = true
2323
}
2424

2525
output "cluster_password" {
26-
value = azurerm_kubernetes_cluster.k8s.kube_config.0.password
26+
value = azurerm_kubernetes_cluster.k8s.kube_config[0].password
2727
sensitive = true
2828
}
2929

quickstart/201-k8s-cluster-with-tf-and-aks/providers.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,8 @@ terraform {
1212
provider "azurerm" {
1313
features {}
1414
}
15+
16+
random = {
17+
source = "hashicorp/random"
18+
version = "~>3.0"
19+
}

quickstart/201-mysql-fs-db/main.tf

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,22 @@ resource "random_password" "password" {
2222
upper = true
2323
lower = true
2424
special = true
25+
numeric = false
2526
override_special = "_"
2627
}
2728

2829
# Manages the Virtual Network
2930
resource "azurerm_virtual_network" "default" {
3031
name = "vnet-${random_string.name.result}"
31-
location = azurerm_resource_group.default.location
32-
resource_group_name = azurerm_resource_group.default.name
32+
location = azurerm_resource_group.rg.location
33+
resource_group_name = azurerm_resource_group.rg.name
3334
address_space = ["10.0.0.0/16"]
3435
}
3536

3637
# Manages the Subnet
3738
resource "azurerm_subnet" "default" {
3839
name = "subnet-${random_string.name.result}"
39-
resource_group_name = azurerm_resource_group.default.name
40+
resource_group_name = azurerm_resource_group.rg.name
4041
virtual_network_name = azurerm_virtual_network.default.name
4142
address_prefixes = ["10.0.2.0/24"]
4243
service_endpoints = ["Microsoft.Storage"]
@@ -57,22 +58,22 @@ resource "azurerm_subnet" "default" {
5758
# Enables you to manage Private DNS zones within Azure DNS
5859
resource "azurerm_private_dns_zone" "default" {
5960
name = "${random_string.name.result}.mysql.database.azure.com"
60-
resource_group_name = azurerm_resource_group.default.name
61+
resource_group_name = azurerm_resource_group.rg.name
6162
}
6263

6364
# Enables you to manage Private DNS zone Virtual Network Links
6465
resource "azurerm_private_dns_zone_virtual_network_link" "default" {
6566
name = "mysqlfsVnetZone${random_string.name.result}.com"
6667
private_dns_zone_name = azurerm_private_dns_zone.default.name
6768
virtual_network_id = azurerm_virtual_network.default.id
68-
resource_group_name = azurerm_resource_group.default.name
69+
resource_group_name = azurerm_resource_group.rg.name
6970
}
7071

7172
# Manages the MySQL Flexible Server
7273
resource "azurerm_mysql_flexible_server" "default" {
7374
name = "mysqlfs-${random_string.name.result}"
74-
resource_group_name = azurerm_resource_group.default.name
75-
location = azurerm_resource_group.default.location
75+
resource_group_name = azurerm_resource_group.rg.name
76+
location = azurerm_resource_group.rg.location
7677
administrator_login = random_string.name.result
7778
administrator_password = random_password.password.result
7879
zone = "1"

quickstart/201-mysql-fs-db/mysql-fs-db.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
// Manages the MySQL Flexible Server Database
1+
# Manages the MySQL Flexible Server Database
22
resource "azurerm_mysql_flexible_database" "default" {
33
name = "mysqlfsdb_${random_string.name.result}"
4-
resource_group_name = azurerm_resource_group.default.name
4+
resource_group_name = azurerm_resource_group.rg.name
55
server_name = azurerm_mysql_flexible_server.default.name
66
charset = "utf8"
77
collation = "utf8_unicode_ci"

quickstart/201-mysql-fs-db/outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
output "resource_group_name" {
2-
value = azurerm_resource_group.default.name
2+
value = azurerm_resource_group.rg.name
33
}
44

55
output "azurerm_mysql_flexible_server" {

quickstart/201-mysql-fs-db/providers.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,8 @@ terraform {
1212
provider "azurerm" {
1313
features {}
1414
}
15+
16+
random = {
17+
source = "hashicorp/random"
18+
version = "~>3.0"
19+
}

0 commit comments

Comments
 (0)