Skip to content

Commit 9f4b5e2

Browse files
sean-freemansean-freeman
committed
fix: azure var prefixes
1 parent 72c576b commit 9f4b5e2

23 files changed

+191
-125
lines changed

‎msazure_vm/account_bootstrap/module_variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
variable "module_var_az_resource_group_name" {}
22

3-
variable "module_var_az_region" {} // aka. Azure Location Display Name
3+
variable "module_var_az_location_region" {} // aka. Azure Location Display Name
44

5-
variable "module_var_az_availability_zone_no" {}
5+
variable "module_var_az_location_availability_zone_no" {}
66

77
variable "module_var_resource_prefix" {}
88

‎msazure_vm/account_bootstrap/network_security_groups.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
resource "azurerm_network_security_group" "vnet_sg" {
99
name = "${var.module_var_resource_prefix}-vnet-vm-sg"
1010
resource_group_name = var.module_var_az_resource_group_name
11-
location = var.module_var_az_region
11+
location = var.module_var_az_location_region
1212

1313

1414
# Allow Outbound HTTP Port 80 connection to any (e.g. via NAT Gateway)

‎msazure_vm/account_bootstrap/network_security_nsg.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
resource "azurerm_network_security_group" "vnet_nsg" {
88
name = "${var.module_var_resource_prefix}-vnet-subnet-nsg"
99
resource_group_name = var.module_var_az_resource_group_name
10-
location = var.module_var_az_region
10+
location = var.module_var_az_location_region
1111

1212
# Allow ping outbound only
1313
# Permits all ICMP Types (and the Codes within the Types) - https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xml

‎msazure_vm/account_bootstrap/ssh_keys.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "tls_private_key" "bastion_ssh" {
99
resource "azurerm_ssh_public_key" "bastion_ssh" {
1010
name = "${var.module_var_resource_prefix}-bastion-ssh-key"
1111
resource_group_name = var.module_var_az_resource_group_name
12-
location = var.module_var_az_region
12+
location = var.module_var_az_location_region
1313
public_key = trimspace(tls_private_key.bastion_ssh.public_key_openssh)
1414
}
1515

@@ -24,7 +24,7 @@ resource "tls_private_key" "host_ssh" {
2424
resource "azurerm_ssh_public_key" "host_ssh" {
2525
name = "${var.module_var_resource_prefix}-host-ssh-key"
2626
resource_group_name = var.module_var_az_resource_group_name
27-
location = var.module_var_az_region
27+
location = var.module_var_az_location_region
2828
public_key = trimspace(tls_private_key.host_ssh.public_key_openssh)
2929
}
3030

‎msazure_vm/account_init/account_resource_group_new.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
resource "azurerm_resource_group" "resource_group" {
44
count = var.module_var_az_resource_group_create_boolean ? 1 : 0
55
name = "${var.module_var_resource_prefix}-rg"
6-
location = var.module_var_az_region
6+
location = var.module_var_az_location_region
77
}

‎msazure_vm/account_init/module_variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ variable "module_var_az_resource_group_name" {}
33

44
variable "module_var_az_resource_group_create_boolean" {}
55

6-
variable "module_var_az_region" {} // aka. Azure Location Display Name
6+
variable "module_var_az_location_region" {} // aka. Azure Location Display Name
77

8-
variable "module_var_az_availability_zone_no" {}
8+
variable "module_var_az_location_availability_zone_no" {}
99

1010
variable "module_var_resource_prefix" {}
1111

‎msazure_vm/account_init/network_vnet_new.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ resource "azurerm_virtual_network" "vnet" {
44
name = "${var.module_var_resource_prefix}-vnet"
55
resource_group_name = var.module_var_az_resource_group_create_boolean ? azurerm_resource_group.resource_group[0].name : data.azurerm_resource_group.resource_group[0].name
66
address_space = ["10.200.0.0/16"]
7-
location = var.module_var_az_region
7+
location = var.module_var_az_location_region
88
}
99

1010

‎msazure_vm/account_init/network_vnet_public_gateway.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
resource "azurerm_public_ip" "nat_gw_publicip" {
55
count = var.module_var_az_vnet_name_create_boolean ? 1 : 0
66
name = "${var.module_var_resource_prefix}-vnet-nat-gw-publicip"
7-
location = var.module_var_az_region
7+
location = var.module_var_az_location_region
88
resource_group_name = var.module_var_az_resource_group_create_boolean ? azurerm_resource_group.resource_group[0].name : data.azurerm_resource_group.resource_group[0].name
99
allocation_method = "Static"
1010
sku = "Standard"
@@ -14,7 +14,7 @@ resource "azurerm_public_ip" "nat_gw_publicip" {
1414
resource "azurerm_nat_gateway" "nat_gw" {
1515
count = var.module_var_az_vnet_name_create_boolean ? 1 : 0
1616
name = "${var.module_var_resource_prefix}-vnet-nat-gw"
17-
location = var.module_var_az_region
17+
location = var.module_var_az_location_region
1818
resource_group_name = var.module_var_az_resource_group_create_boolean ? azurerm_resource_group.resource_group[0].name : data.azurerm_resource_group.resource_group[0].name
1919
sku_name = "Standard"
2020
#idle_timeout_in_minutes = 10

‎msazure_vm/bastion_inject/bastion_network_security_groups.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
resource "azurerm_network_security_group" "bastion_connection_sg" {
99
name = "${var.module_var_resource_prefix}-bastion-proxy-connection-sg"
1010
resource_group_name = var.module_var_az_resource_group_name
11-
location = var.module_var_az_region
11+
location = var.module_var_az_location_region
1212

1313
# Security Group Rule for Host - Allow Inbound Proxy Connection on SSH Port 22 via the Bastion/Jump Host
1414
security_rule {
@@ -29,7 +29,7 @@ resource "azurerm_network_security_group" "bastion_connection_sg" {
2929
resource "azurerm_network_security_group" "bastion_vm_sg" {
3030
name = "${var.module_var_resource_prefix}-bastion-vm-sg"
3131
resource_group_name = var.module_var_az_resource_group_name
32-
location = var.module_var_az_region
32+
location = var.module_var_az_location_region
3333

3434
# Security Group Rule for Bastion/Jump Host - Allow Inbound SSH Port 22 connection from remote (i.e. Public Internet)
3535
security_rule {

‎msazure_vm/bastion_inject/bastion_network_security_nsg.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
resource "azurerm_network_security_group" "bastion_nsg" {
88
name = "${var.module_var_resource_prefix}-bastion-subnet-nsg"
99
resource_group_name = var.module_var_az_resource_group_name
10-
location = var.module_var_az_region
10+
location = var.module_var_az_location_region
1111

1212
security_rule {
1313
name = "inbound_tcp_all"

0 commit comments

Comments
 (0)