diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl index dd68c3941..2cca2adca 100644 --- a/terraform/.terraform.lock.hcl +++ b/terraform/.terraform.lock.hcl @@ -119,21 +119,22 @@ provider "registry.terraform.io/hashicorp/helm" { } provider "registry.terraform.io/hashicorp/http" { - version = "2.1.0" - constraints = "~> 2.1.0" + version = "2.2.0" + constraints = "2.2.0" hashes = [ - "h1:HmUcHqc59VeHReHD2SEhnLVQPUKHKTipJ8Jxq67GiDU=", - "zh:03d82dc0887d755b8406697b1d27506bc9f86f93b3e9b4d26e0679d96b802826", - "zh:0704d02926393ddc0cfad0b87c3d51eafeeae5f9e27cc71e193c141079244a22", - "zh:095ea350ea94973e043dad2394f10bca4a4bf41be775ba59d19961d39141d150", - "zh:0b71ac44e87d6964ace82979fc3cbb09eb876ed8f954449481bcaa969ba29cb7", - "zh:0e255a170db598bd1142c396cefc59712ad6d4e1b0e08a840356a371e7b73bc4", - "zh:67c8091cfad226218c472c04881edf236db8f2dc149dc5ada878a1cd3c1de171", - "zh:75df05e25d14b5101d4bc6624ac4a01bb17af0263c9e8a740e739f8938b86ee3", - "zh:b4e36b2c4f33fdc44bf55fa1c9bb6864b5b77822f444bd56f0be7e9476674d0e", - "zh:b9b36b01d2ec4771838743517bc5f24ea27976634987c6d5529ac4223e44365d", - "zh:ca264a916e42e221fddb98d640148b12e42116046454b39ede99a77fc52f59f4", - "zh:fe373b2fb2cc94777a91ecd7ac5372e699748c455f44f6ea27e494de9e5e6f92", + "h1:syLdPUKrNIJ7mF7+ijSSUot8VIuFL/45kbN5UcHEIvU=", + "zh:159add5739a597c08439318f67c440a90ce8444a009e7b8aabbcb9279da9191f", + "zh:1e5fbe9a4b8d3d9f167effc03bd5324ad6ef721c23a174e98c7eb2e8b85e34e8", + "zh:4b150790ac5948ceec4f97df4deaff835e4798049d858c20413cbdff6e610c4d", + "zh:4f85c6130249f45ff0dccdcfe78296382c930c288e2f8ec844d73fa48ab3c4ef", + "zh:74a1270db30043d9601ed70fecea568693552758f912a37b423dec1530a6f390", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:8125231d0b16283130bac7cb4b0c4972a596af10e1a7348ff905dcb02ea61dc9", + "zh:83f78277025d276ee6f4fd1ae93cf69b748c6601e7cfc7e30f07beca9ce4dfdd", + "zh:abca2c2e14ce0984a1353f03fd13e9dc19312ab7844f64129ec09628e3d5d472", + "zh:b5d0f58057c730aab9a0bf348a9143e8a0ae18f2a3ddfb9f56c603aa62212601", + "zh:bc6054404263c1d7faaffe4c27d1f93dd5a9848d515a6eae42d43828c3e10447", + "zh:cb9d4a0aeebd25cbbae5b7c726deb285c007079191bc43a6a8d6b951b7ef928a", ] } diff --git a/terraform/main.tf b/terraform/main.tf index dc2ff5d22..151262334 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -367,7 +367,7 @@ terraform { } http = { source = "hashicorp/http" - version = "2.1.0" + version = "2.2.0" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/terraform/modules/data_share_processor/data_share_processor.tf b/terraform/modules/data_share_processor/data_share_processor.tf index 971635ff8..60b8504da 100644 --- a/terraform/modules/data_share_processor/data_share_processor.tf +++ b/terraform/modules/data_share_processor/data_share_processor.tf @@ -185,9 +185,9 @@ data "http" "peer_share_processor_global_manifest" { locals { ingestor_global_manifest_exists = data.external.global_manifest_http_status.result.http_code == "200" ingestor_server_identity = local.ingestor_global_manifest_exists ? ( - jsondecode(data.http.ingestor_global_manifest[0].body).server-identity + jsondecode(data.http.ingestor_global_manifest[0].response_body).server-identity ) : ( - jsondecode(data.http.ingestor_specific_manifest[0].body).server-identity + jsondecode(data.http.ingestor_specific_manifest[0].response_body).server-identity ) ingestor_gcp_service_account_id = lookup(local.ingestor_server_identity, "gcp-service-account-id", "") ingestor_aws_role_arn = lookup(local.ingestor_server_identity, "aws-iam-entity", "") @@ -204,7 +204,7 @@ locals { resource_prefix = "prio-${var.environment}-${var.data_share_processor_name}" - peer_share_processor_server_identity = jsondecode(data.http.peer_share_processor_global_manifest.body).server-identity + peer_share_processor_server_identity = jsondecode(data.http.peer_share_processor_global_manifest.response_body).server-identity peer_share_processor_gcp_service_account_email = local.peer_share_processor_server_identity.gcp-service-account-email peer_share_processor_gcp_service_account_unique_id = lookup(local.peer_share_processor_server_identity, "gcp-service-account-id", "")