From 227648dbd615e90493d579eaeefc61eeef279dd7 Mon Sep 17 00:00:00 2001
From: morganpa <66316054+morganpa@users.noreply.github.com>
Date: Thu, 16 Sep 2021 16:15:07 -0700
Subject: [PATCH 1/2] allow account reset codebuild access to custom nuke
 config bucketgit

---
 modules/reset_codebuild.tf | 91 +++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 41 deletions(-)

diff --git a/modules/reset_codebuild.tf b/modules/reset_codebuild.tf
index ced0653ea..7ad78a7df 100755
--- a/modules/reset_codebuild.tf
+++ b/modules/reset_codebuild.tf
@@ -151,51 +151,60 @@ EOF
   tags = var.global_tags
 }
 
-# Configure IAM Policy for CodeBuild
+# Configure IAM Role for CodeBuild
 resource "aws_iam_role_policy" "codebuild_reset" {
-  role = aws_iam_role.codebuild_reset.name
-  name = "account-reset-codebuild-${var.namespace}"
+  role   = aws_iam_role.codebuild_reset.name
+  name   = "account-reset-codebuild-${var.namespace}"
+  policy = data.aws_iam_policy_document.codebuild_reset_policy_document.json
+}
 
-  policy = <<POLICY
-{
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Effect": "Allow",
-      "Resource": [
-        "*"
-      ],
-      "Action": [
-        "logs:CreateLogGroup",
-        "logs:CreateLogStream",
-        "logs:PutLogEvents",
-        "sts:AssumeRole",
-        "ssm:GetParameter",
-        "dynamodb:GetItem",
-        "dynamodb:Scan",
-        "dynamodb:Query",
-        "dynamodb:UpdateItem",
-        "sns:Publish"
-      ]
-    },
-    {
-      "Effect": "Allow",
-      "Action": [
-          "s3:PutObject",
-          "s3:GetObject",
-          "s3:GetObjectVersion",
-          "s3:GetBucketAcl",
-          "s3:GetBucketLocation"
-      ],
-      "Resource": [
-        "${aws_s3_bucket.artifacts.arn}",
-        "${aws_s3_bucket.artifacts.arn}/*"
-      ]
-    }
-  ]
+# Configure IAM Policy for CodeBuild
+data "aws_iam_policy_document" "codebuild_reset_policy_document" {
+  override_json = var.reset_nuke_template_bucket == "STUB" ? null : data.aws_iam_policy_document.custom_nuke_config[0].json
+  statement {
+    actions = [
+      "logs:CreateLogGroup",
+      "logs:CreateLogStream",
+      "logs:PutLogEvents",
+      "sts:AssumeRole",
+      "ssm:GetParameter",
+      "dynamodb:GetItem",
+      "dynamodb:Scan",
+      "dynamodb:Query",
+      "dynamodb:UpdateItem",
+      "sns:Publish"
+    ]
+    resources = ["*"]
+  }
+  statement {
+    actions = [
+      "s3:PutObject",
+      "s3:GetObject",
+      "s3:GetObjectVersion",
+      "s3:GetBucketAcl",
+      "s3:GetBucketLocation"
+    ]
+    resources = [
+      "${aws_s3_bucket.artifacts.arn}",
+      "${aws_s3_bucket.artifacts.arn}/*"
+    ]
+  }
 }
-POLICY
 
+data "aws_iam_policy_document" "custom_nuke_config" {
+  count = var.reset_nuke_template_bucket == "STUB" ? 0 : 1
+  statement {
+    sid = "allowCustomNukeConfig"
+    # only put this statement if reset_nuke_template_bucket has been set by the user
+    actions = [
+      "s3:ListBucket",
+      "s3:GetObject"
+    ]
+    resources = [
+      "arn:aws:s3:::${var.reset_nuke_template_bucket}",
+      "arn:aws:s3:::${var.reset_nuke_template_bucket}/${var.reset_nuke_template_key}",
+    ]
+  }
 }
 
 # Cloudwatch alarm, for Reset CodeBuild failure

From c00454ad19f94a9777099e39b8fad1c739f48a4c Mon Sep 17 00:00:00 2001
From: morganpa <66316054+morganpa@users.noreply.github.com>
Date: Thu, 16 Sep 2021 16:23:23 -0700
Subject: [PATCH 2/2] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad23d73eb..8735b27da 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v0.33.9
+- Allow account reset codebuild access to custom nuke config bucket
+
 ## v0.33.8
 - Upgrade the Swagger UI dependency to remove a very dangerous vulnerability (upgrade Swagger UI to v3.51.2).