Skip to content

Commit 950c4f0

Browse files
committed
Update terraform definition
1 parent 4918667 commit 950c4f0

File tree

3 files changed

+26
-32
lines changed

3 files changed

+26
-32
lines changed

code/infra/terraform.tf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ terraform {
44
required_providers {
55
azurerm = {
66
source = "hashicorp/azurerm"
7-
version = "3.53.0"
7+
version = "3.59.0"
88
}
99
azapi = {
1010
source = "azure/azapi"
11-
version = "1.5.0"
11+
version = "1.6.0"
1212
}
1313
}
1414

1515
backend "azurerm" {
1616
environment = "public"
17-
subscription_id = "176a0de9-d99e-4faa-90cc-89780e1186fe"
18-
resource_group_name = "workload000-cicd"
19-
storage_account_name = "workload000stg001"
20-
container_name = "terraform"
21-
key = "terraform-function20.tfstate"
22-
use_oidc = true
17+
subscription_id = "8f171ff9-2b5b-4f0f-aed5-7fa360a1d094"
18+
resource_group_name = "mycrp-prd-cicd"
19+
storage_account_name = "mycrpprdstg001"
20+
container_name = "function"
21+
key = "terraform.tfstate"
22+
# use_oidc = true
2323
}
2424
}
2525

@@ -28,7 +28,7 @@ provider "azurerm" {
2828
environment = "public"
2929
skip_provider_registration = false
3030
storage_use_azuread = true
31-
use_oidc = true
31+
# use_oidc = true
3232

3333
features {
3434
key_vault {
@@ -52,5 +52,5 @@ provider "azapi" {
5252
disable_correlation_request_id = false
5353
environment = "public"
5454
skip_provider_registration = false
55-
use_oidc = true
55+
# use_oidc = true
5656
}

code/infra/variables.tf

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ variable "environment" {
1010
sensitive = false
1111
default = "dev"
1212
validation {
13-
condition = contains(["dev", "tst", "prd"], var.environment)
14-
error_message = "Please use an allowed value: \"dev\", \"tst\" or \"prd\"."
13+
condition = contains(["int", "dev", "tst", "qa", "uat", "prd"], var.environment)
14+
error_message = "Please use an allowed value: \"int\", \"dev\", \"tst\", \"qa\", \"uat\" or \"prd\"."
1515
}
1616
}
1717

@@ -27,14 +27,9 @@ variable "prefix" {
2727

2828
variable "tags" {
2929
description = "Specifies the tags that you want to apply to all resources."
30-
type = map(any)
31-
sensitive = false
32-
}
33-
34-
variable "timestamp_expiry" {
35-
description = "Specifies the initial key vault key expiry."
36-
type = number
30+
type = map(string)
3731
sensitive = false
32+
default = {}
3833
}
3934

4035
variable "vnet_id" {

code/infra/vars.dev.tfvars

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
location = "eastus"
2-
environment = "dev"
3-
prefix = "mb020"
4-
tags = {}
5-
timestamp_expiry = 1716628196
6-
vnet_id = "/subscriptions/6a439cba-0e4d-46ca-9eda-e3b7a8f60a49/resourceGroups/vnet-eastus-rg002/providers/Microsoft.Network/virtualNetworks/vnet-eastus002"
7-
nsg_id = "/subscriptions/6a439cba-0e4d-46ca-9eda-e3b7a8f60a49/resourceGroups/vnet-eastus-rg002/providers/Microsoft.Network/networkSecurityGroups/nsg-eastus002"
8-
route_table_id = "/subscriptions/6a439cba-0e4d-46ca-9eda-e3b7a8f60a49/resourceGroups/vnet-eastus-rg002/providers/Microsoft.Network/routeTables/rt-eastus002"
9-
private_dns_zone_id_blob = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.blob.core.windows.net"
10-
private_dns_zone_id_queue = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.queue.core.windows.net"
11-
private_dns_zone_id_table = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.table.core.windows.net"
12-
private_dns_zone_id_file = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.file.core.windows.net"
13-
private_dns_zone_id_key_vault = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.vaultcore.azure.net"
1+
location = "northeurope"
2+
environment = "dev"
3+
prefix = "myfunc"
4+
tags = {}
5+
vnet_id = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-function-network-rg/providers/Microsoft.Network/virtualNetworks/mycrp-prd-function-vnet001"
6+
nsg_id = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-function-network-rg/providers/Microsoft.Network/networkSecurityGroups/mycrp-prd-function-nsg001"
7+
route_table_id = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-function-network-rg/providers/Microsoft.Network/routeTables/mycrp-prd-function-rt001"
8+
private_dns_zone_id_blob = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.blob.core.windows.net"
9+
private_dns_zone_id_queue = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.queue.core.windows.net"
10+
private_dns_zone_id_table = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.table.core.windows.net"
11+
private_dns_zone_id_file = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.file.core.windows.net"
12+
private_dns_zone_id_key_vault = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.vaultcore.azure.net"

0 commit comments

Comments
 (0)