CCM-11586: try fix truststore uri

Author: masl2

infrastructure/terraform/components/api/api_gateway_domain.tf

@@ -9,11 +9,12 @@ resource "aws_api_gateway_domain_name" "main" {
   }
 
   depends_on = [
-    aws_s3_bucket.truststore
+    aws_s3_bucket.truststore,
+    aws_s3_object.placeholder_truststore
   ]
 
   mutual_tls_authentication {
-      truststore_uri     = "s3://${aws_s3_bucket.truststore.id}/${aws_s3_object.placeholder_truststore[0].id}"
+      truststore_uri     = "s3://${aws_s3_bucket.truststore.id}/${aws_s3_object.placeholder_truststore[0].key}"
       truststore_version = aws_s3_object.placeholder_truststore[0].version_id
   }
 
@@ -35,11 +36,12 @@ resource "aws_api_gateway_domain_name" "main_nonprod" {
   }
 
   depends_on = [
-    aws_s3_bucket.truststore
+    aws_s3_bucket.truststore,
+    aws_s3_object.placeholder_truststore_nonprod
   ]
 
   mutual_tls_authentication {
-      truststore_uri     = "s3://${aws_s3_bucket.truststore.id}/${aws_s3_object.placeholder_truststore_nonprod[0].id}"
+      truststore_uri     = "s3://${aws_s3_bucket.truststore.id}/${aws_s3_object.placeholder_truststore_nonprod[0].key}"
       truststore_version = aws_s3_object.placeholder_truststore_nonprod[0].version_id
   }
 }

infrastructure/terraform/components/api/s3_bucket_truststore.tf

@@ -52,7 +52,8 @@ resource "aws_s3_object" "placeholder_truststore" {
   content = module.supplier_ssl[0].cacert_pem
 
   depends_on = [
-    aws_s3_bucket_versioning.truststore
+    aws_s3_bucket_versioning.truststore,
+    module.supplier_ssl
   ]
 
   lifecycle {
@@ -65,7 +66,7 @@ resource "aws_s3_object" "placeholder_truststore" {
 # In non-manually configured env (e.g. PR) exclude lifecycle policy so resources are managed
 # Requires duplicate block as lifecycle policies cannot be dynamic
 resource "aws_s3_object" "placeholder_truststore_nonprod" {
-  count   = var.manually_configure_mtls_truststore ? 0 : 1
+  count   = !var.manually_configure_mtls_truststore ? 1 : 0
   bucket  = aws_s3_bucket.truststore.bucket
   key     = "truststore.pem"
   content = module.supplier_ssl[0].cacert_pem