Skip to content

Commit

Permalink
Added cft apim mi to kv (#138)
Browse files Browse the repository at this point in the history
* Added cft mi to kv

* Updating Terraform Formatting

* update versions

---------

Co-authored-by: 54687 <61242337+hmcts-jenkins-j-to-z[bot]@users.noreply.github.com>
  • Loading branch information
1 parent de115a2 commit 246ddca
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 21 deletions.
5 changes: 3 additions & 2 deletions aat.tfvars
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
managed_identity_api_mgmt = "44935ce1-0f79-4e61-a747-068ba34b356d"
enable_staging_account = 1
managed_identity_api_mgmt = "44935ce1-0f79-4e61-a747-068ba34b356d"
managed_identity_cft_api_mgmt = "3dc6cd48-14a5-43f4-9fbb-53e4fcd426f6"
enable_staging_account = 1

storage_account_repl_type = "ZRS"
staging_storage_account_repl_type = "ZRS"
3 changes: 2 additions & 1 deletion demo.tfvars
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
managed_identity_api_mgmt = "8f175f8a-28c1-4940-b8e4-303ac51c9ad0"
managed_identity_api_mgmt = "8f175f8a-28c1-4940-b8e4-303ac51c9ad0"
managed_identity_cft_api_mgmt = "16fcf789-4b69-4a06-af63-0537bfc53ca1"

storage_account_repl_type = "ZRS"
3 changes: 2 additions & 1 deletion perftest.tfvars
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
managed_identity_api_mgmt = "2f88a054-9bfd-4caa-98e3-6910d2726ec4"
managed_identity_api_mgmt = "2f88a054-9bfd-4caa-98e3-6910d2726ec4"
managed_identity_cft_api_mgmt = "10974469-beb0-44e8-843f-e31bdd9807dd"

storage_account_repl_type = "ZRS"
9 changes: 5 additions & 4 deletions prod.tfvars
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
managed_identity_api_mgmt = "5e090c83-1e36-4712-911f-2c82adda9050"
sku_service_bus = "Premium"
zone_redundant_service_bus = true
capacity_service_bus = 1
managed_identity_api_mgmt = "5e090c83-1e36-4712-911f-2c82adda9050"
managed_identity_cft_api_mgmt = "661fb30b-b28a-4a95-a446-79327570b44b"
sku_service_bus = "Premium"
zone_redundant_service_bus = true
capacity_service_bus = 1
4 changes: 2 additions & 2 deletions state.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~>3.72.0"
version = "3.106.0"
}
azuread = {
source = "hashicorp/azuread"
version = "1.6.0"
version = "2.48.0"
}
}
}
4 changes: 4 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ variable "managed_identity_api_mgmt" {
default = ""
}

variable "managed_identity_cft_api_mgmt" {
default = ""
}

variable "external_hostname" {
type = string
default = "platform.hmcts.net"
Expand Down
22 changes: 11 additions & 11 deletions vault.tf
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
module "vault" {
source = "[email protected]:hmcts/cnp-module-key-vault?ref=master"
name = "${var.product}-${var.env}"
product = var.product
env = var.env
tenant_id = var.tenant_id
object_id = var.jenkins_AAD_objectId
resource_group_name = azurerm_resource_group.rg.name
product_group_object_id = "70de400b-4f47-4f25-a4f0-45e1ee4e4ae3"
common_tags = var.common_tags
managed_identity_object_id = var.managed_identity_api_mgmt
create_managed_identity = true
source = "[email protected]:hmcts/cnp-module-key-vault?ref=master"
name = "${var.product}-${var.env}"
product = var.product
env = var.env
tenant_id = var.tenant_id
object_id = var.jenkins_AAD_objectId
resource_group_name = azurerm_resource_group.rg.name
product_group_object_id = "70de400b-4f47-4f25-a4f0-45e1ee4e4ae3"
common_tags = var.common_tags
managed_identity_object_ids = [var.managed_identity_api_mgmt, var.managed_identity_cft_api_mgmt]
create_managed_identity = true
}

output "vaultName" {
Expand Down

0 comments on commit 246ddca

Please sign in to comment.