ensure relase test fails if apply fails, fix bug in environment variable name causing codebuild build to fail

theodorehreuter · theodorehreuter · commit 04ba1d1c67d8 · 2026-01-07T13:04:39.000-05:00
diff --git a/.github/workflows/release-tests.yml b/.github/workflows/release-tests.yml
@@ -92,7 +92,6 @@ jobs:
 
       - name: Terraform Apply
         id: tf_apply
-        continue-on-error: true
         working-directory: utils/cicd
         run: terraform apply -input=false test.tfplan
 
diff --git a/filmdrop_ui.tf b/filmdrop_ui.tf
@@ -48,7 +48,7 @@ resource "aws_codebuild_project" "filmdrop_ui_codebuild" {
 
     environment_variable {
       name  = "CONTENT_BUCKET"
-      value = var.filmdrop_ui_bucket_name
+      value = aws_s3_bucket.filmdrop_ui_source_config.bucket
     }
   }
 
@@ -130,7 +130,7 @@ resource "random_id" "suffix" {
 }
 
 resource "aws_s3_bucket" "filmdrop_ui_source_config" {
-  bucket        = "filmdrop-ui-config-${random_id.suffix.hex}"
+  bucket        = "${var.filmdrop_ui_bucket_name}-${random_id.suffix.hex}"
   force_destroy = true
 }
 
diff --git a/utils/cicd/main.tf b/utils/cicd/main.tf
@@ -17,5 +17,5 @@ module "main" {
   vpc_id                  = module.vpc-data.vpc_id
   vpc_private_subnet_ids  = module.vpc-data.private_subnet_ids
   vpc_security_group_ids  = [module.vpc-data.security_group_id]
-  filmdrop_ui_bucket_name = "filmdrop-ui-content"
+  filmdrop_ui_bucket_name = "filmdrop-ui-config"
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ resource "aws_codebuild_project" "filmdrop_ui_codebuild" {`
`48`	`48`
`49`	`49`	`environment_variable {`
`50`	`50`	`name = "CONTENT_BUCKET"`
`51`		`- value = var.filmdrop_ui_bucket_name`
	`51`	`+ value = aws_s3_bucket.filmdrop_ui_source_config.bucket`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`@@ -130,7 +130,7 @@ resource "random_id" "suffix" {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`resource "aws_s3_bucket" "filmdrop_ui_source_config" {`
`133`		`- bucket = "filmdrop-ui-config-${random_id.suffix.hex}"`
	`133`	`+ bucket = "${var.filmdrop_ui_bucket_name}-${random_id.suffix.hex}"`
`134`	`134`	`force_destroy = true`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@ module "main" {`
`17`	`17`	`vpc_id = module.vpc-data.vpc_id`
`18`	`18`	`vpc_private_subnet_ids = module.vpc-data.private_subnet_ids`
`19`	`19`	`vpc_security_group_ids = [module.vpc-data.security_group_id]`
`20`		`- filmdrop_ui_bucket_name = "filmdrop-ui-content"`
	`20`	`+ filmdrop_ui_bucket_name = "filmdrop-ui-config"`
`21`	`21`	`}`