Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Terraform azuread to v2.53.0 #190

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aat.tfvars
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ccd_storage_account_enable_data_protection = true
dmstore_storage_account_enable_data_protection = true
additional_managed_identities_access = ["plum", "et", "sptribs", "civil", "ia", "sscs"]
sku = "Standard"
sku = "Standard"
12 changes: 6 additions & 6 deletions appinsights.tf
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module "application_insights" {
source = "[email protected]:hmcts/terraform-module-application-insights?ref=main"

env = var.env
product = var.product
location = var.location
application_type = var.application_type
resource_group_name = azurerm_resource_group.rg.name
env = var.env
product = var.product
location = var.location
application_type = var.application_type
resource_group_name = azurerm_resource_group.rg.name
daily_data_cap_in_gb = var.app_insights_data_cap
common_tags = var.common_tags
common_tags = var.common_tags
}

moved {
Expand Down
2 changes: 1 addition & 1 deletion demo.tfvars
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ccd_storage_account_enable_data_protection = true
dmstore_storage_account_enable_data_protection = true
sku = "Standard"
sku = "Standard"
2 changes: 1 addition & 1 deletion ithc.tfvars
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ccd_storage_account_enable_data_protection = true
dmstore_storage_account_enable_data_protection = true
sku = "Standard"
sku = "Standard"
8 changes: 4 additions & 4 deletions key-vault.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module "vault" {
common_tags = local.tags

additional_managed_identities_access = var.additional_managed_identities_access
create_managed_identity = true
create_managed_identity = true
}

data "azurerm_key_vault" "s2s_vault" {
Expand All @@ -23,17 +23,17 @@ data "azurerm_key_vault_secret" "ccd_gw_s2s_key" {
name = "microservicekey-ccd-gw"
key_vault_id = data.azurerm_key_vault.s2s_vault.id
}

data "azurerm_key_vault_secret" "ccd_case_disposer_s2s_key" {
name = "microservicekey-ccd-case-disposer"
key_vault_id = data.azurerm_key_vault.s2s_vault.id
}
}

resource "azurerm_key_vault_secret" "ccd-case-disposer-s2s-secret" {
name = "ccd-case-disposer-s2s-secret"
value = data.azurerm_key_vault_secret.ccd_case_disposer_s2s_key.value
key_vault_id = module.vault.key_vault_id
}
}

resource "azurerm_key_vault_secret" "ccd_gw_s2s_secret" {
name = "ccd-gw-s2s-secret"
Expand Down
20 changes: 10 additions & 10 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ locals {
var.common_tags,
tomap({
"Team Contact" = var.team_contact
"Destroy Me" = var.destroy_me
"Destroy Me" = var.destroy_me
})
)
em_tags = merge(
var.common_tags,
tomap({
"Team Contact" = var.em_team_contact
"Destroy Me" = var.em_destroy_me
"application" = "evidence-management"
"managedBy" = "Evidence Management"
"businessArea" = "CFT"
"contactSlackChannel" = var.em_team_contact
})
var.common_tags,
tomap({
"Team Contact" = var.em_team_contact
"Destroy Me" = var.em_destroy_me
"application" = "evidence-management"
"managedBy" = "Evidence Management"
"businessArea" = "CFT"
"contactSlackChannel" = var.em_team_contact
})
)
}

Expand Down
2 changes: 1 addition & 1 deletion perftest.tfvars
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ccd_storage_account_enable_data_protection = true
dmstore_storage_account_enable_data_protection = true
sku = "Standard"
sku = "Standard"
2 changes: 1 addition & 1 deletion state.tf
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ terraform {
}
azuread = {
source = "hashicorp/azuread"
version = "2.48.0"
version = "2.53.0"
}
}
}
4 changes: 2 additions & 2 deletions storage-account.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ locals {
]

preview_subnets = var.env == "aat" ? [data.azurerm_subnet.preview_aks_00_subnet.id, data.azurerm_subnet.preview_aks_01_subnet.id] : []
valid_subnets = concat(local.standard_subnets, local.preview_subnets)
valid_subnets = concat(local.standard_subnets, local.preview_subnets)

dmstoredoc_storage_replication_type = var.env == "aat" ? "LRS" : "ZRS"
}

Expand Down