From 0c73bea204aa5b9cb71c60c379ac7c6db3d17b37 Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Fri, 30 Aug 2024 14:20:36 -0700 Subject: [PATCH 1/5] Update .github/workflows/s3_upload.yaml --- .github/workflows/s3_upload.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/s3_upload.yaml b/.github/workflows/s3_upload.yaml index a9ea1fd..b35fb8f 100644 --- a/.github/workflows/s3_upload.yaml +++ b/.github/workflows/s3_upload.yaml @@ -16,7 +16,7 @@ jobs: env: AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}" AWS_ACCESS_KEY_ID: "${{ vars.AWS_ACCESS_KEY_ID }}" - AWS_SESSION_TOKEN: "${{ secrets.AWS_SESSION_TOKEN }}" + AWS_DEFAULT_REGION: "${{ vars.AWS_DEFAULT_REGION }}" # Steps represent a sequence of tasks that will be executed as part of the job From 910a7bb2b73dec80955bf37e41d3fcbf8695068c Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Tue, 3 Sep 2024 09:39:52 -0700 Subject: [PATCH 2/5] Update .github/workflows/s3_upload.yaml --- .github/workflows/s3_upload.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/s3_upload.yaml b/.github/workflows/s3_upload.yaml index b35fb8f..a9ea1fd 100644 --- a/.github/workflows/s3_upload.yaml +++ b/.github/workflows/s3_upload.yaml @@ -16,7 +16,7 @@ jobs: env: AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}" AWS_ACCESS_KEY_ID: "${{ vars.AWS_ACCESS_KEY_ID }}" - AWS_DEFAULT_REGION: "${{ vars.AWS_DEFAULT_REGION }}" + AWS_SESSION_TOKEN: "${{ secrets.AWS_SESSION_TOKEN }}" # Steps represent a sequence of tasks that will be executed as part of the job From 7a95af910b5eb03affaffc3af1159bf6600e3cde Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Wed, 4 Sep 2024 15:23:02 -0700 Subject: [PATCH 3/5] Update build.pkr.hcl --- build.pkr.hcl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.pkr.hcl b/build.pkr.hcl index 3d57886..6cd6ffd 100644 --- a/build.pkr.hcl +++ b/build.pkr.hcl @@ -100,7 +100,9 @@ build { "ANSIBLE_STDOUT_CALLBACK=yaml", "ANSIBLE_NOCOLOR=True", "AWS_ACCESS_KEY_ID=${local.aws_access_key_id}", - "AWS_SECRET_ACCESS_KEY=${local.aws_secret_access_key}" + "AWS_SECRET_ACCESS_KEY=${local.aws_secret_access_key}", + "AWS_REGION=${data.amazon-parameterstore.region.value}", + "AWS_DEFAULT_REGION=${data.amazon-parameterstore.region.value}" ] } From 88a5ce3ed809eadfd8becde9affd17f9432d9158 Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Tue, 10 Sep 2024 10:39:47 -0700 Subject: [PATCH 4/5] Update build.pkr.hcl --- build.pkr.hcl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.pkr.hcl b/build.pkr.hcl index 6cd6ffd..e0c4d74 100644 --- a/build.pkr.hcl +++ b/build.pkr.hcl @@ -28,6 +28,10 @@ variable project_name { default = "my-project" } +variable region { + type = string +} + # ecr_repository_name data amazon-parameterstore dest_image { name = "/image-pipeline/${var.project_name}/dest_image" From 89633035a3df43aff718456a2cdf7af612bc6ccb Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Tue, 10 Sep 2024 10:44:59 -0700 Subject: [PATCH 5/5] Update build.pkr.hcl --- build.pkr.hcl | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/build.pkr.hcl b/build.pkr.hcl index e0c4d74..3f8f635 100644 --- a/build.pkr.hcl +++ b/build.pkr.hcl @@ -28,10 +28,6 @@ variable project_name { default = "my-project" } -variable region { - type = string -} - # ecr_repository_name data amazon-parameterstore dest_image { name = "/image-pipeline/${var.project_name}/dest_image" @@ -102,11 +98,7 @@ build { roles_path = "${var.ansible_dir}/roles" ansible_env_vars = [ "ANSIBLE_STDOUT_CALLBACK=yaml", - "ANSIBLE_NOCOLOR=True", - "AWS_ACCESS_KEY_ID=${local.aws_access_key_id}", - "AWS_SECRET_ACCESS_KEY=${local.aws_secret_access_key}", - "AWS_REGION=${data.amazon-parameterstore.region.value}", - "AWS_DEFAULT_REGION=${data.amazon-parameterstore.region.value}" + "ANSIBLE_NOCOLOR=True" ] }