CCL-509 added git_branch

UKHomeOffice · Aug 29, 2024 · 6da3bb2 · 6da3bb2
1 parent 2802a28
commit 6da3bb2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/modules/products/static-site/iam.tf b/modules/products/static-site/iam.tf
@@ -18,7 +18,7 @@ resource "aws_iam_role" "static_site_actions_push" {
         }
         Condition = {
           StringLike = {
-            "token.actions.githubusercontent.com:sub" : "repo:${var.tenant_vars.repository}:*"
+            "token.actions.githubusercontent.com:sub" : "repo:${var.tenant_vars.repository}:${var.tenant_vars.gitbranch}"
             "sts:RoleSessionName" : "GitHubActions"
           }
           StringEquals = {

diff --git a/modules/products/static-site/variables.tf b/modules/products/static-site/variables.tf
@@ -9,3 +9,13 @@ variable "cloud_front_default_vars" {
 variable "aws_region" {
   type = string
 }
+
+variable "git_branch" {
+  type        = string
+  description = "git branches which can push to S3 from "
+
+  validation {
+    condition     = contains(var.git_branch, "main") || contains(var.git_branch, "master") || contains(var.git_branch, "CCL-509")
+    error_message = "valid push branches are [main,master,CCL-509]"
+  }
+}