CCM-11586: remove config variable, reference infra

Author: masl2

infrastructure/terraform/components/api/README.md

@@ -24,7 +24,6 @@ No requirements.
 | <a name="input_project"></a> [project](#input\_project) | The name of the tfscaffold project | `string` | n/a | yes |
 | <a name="input_region"></a> [region](#input\_region) | The AWS Region | `string` | n/a | yes |
 | <a name="input_shared_infra_account_id"></a> [shared\_infra\_account\_id](#input\_shared\_infra\_account\_id) | The AWS Account ID of the shared infrastructure account | `string` | `"000000000000"` | no |
-| <a name="input_truststore_s3_bucket_config"></a> [truststore\_s3\_bucket\_config](#input\_truststore\_s3\_bucket\_config) | Parameters for configuring the Notify Supplier API truststore bucket | <pre>object({<br/>    kms_key_id              = string<br/>    kms_key_arn             = string<br/>    bucket_logs_bucket_name = string<br/>  })</pre> | <pre>{<br/>  "bucket_logs_bucket_name": "",<br/>  "kms_key_arn": "",<br/>  "kms_key_id": ""<br/>}</pre> | no |
 ## Modules
 
 | Name | Source | Version |

infrastructure/terraform/components/api/s3_bucket_truststore.tf

@@ -17,7 +17,7 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "truststore" {
   rule {
     apply_server_side_encryption_by_default {
       sse_algorithm     = "aws:kms"
-      kms_master_key_id = var.truststore_s3_bucket_config.kms_key_id
+      kms_master_key_id = module.kms.key_id
     }
     bucket_key_enabled = true
   }
@@ -47,7 +47,7 @@ resource "aws_s3_bucket_public_access_block" "truststore" {
 resource "aws_s3_bucket_logging" "truststore" {
   bucket = aws_s3_bucket.truststore.id
 
-  target_bucket = var.truststore_s3_bucket_config.bucket_logs_bucket_name
+  target_bucket = "${local.csi_s3}-bucket-logs"
   target_prefix = "truststore/${aws_s3_bucket.truststore.bucket}/"
 }
 

infrastructure/terraform/components/api/variables.tf

@@ -98,17 +98,3 @@ variable "enable_backups" {
   description = "Enable backups"
   default     = false
 }
-
-variable "truststore_s3_bucket_config" {
-  type = object({
-    kms_key_id              = string
-    kms_key_arn             = string
-    bucket_logs_bucket_name = string
-  })
-  description = "Parameters for configuring the Notify Supplier API truststore bucket"
-  default = {
-    bucket_logs_bucket_name = ""
-    kms_key_arn             = ""
-    kms_key_id              = ""
-  }
-}