Skip to content

Commit 5e7b176

Browse files
committed
refactor: switch to a single input
1 parent daafaed commit 5e7b176

1 file changed

Lines changed: 18 additions & 30 deletions

File tree

.github/workflows/postgres-vm-image.yml

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,10 @@ on:
5151
description: "🧪 TEST ONLY: Skip builds, use dummy values to test PR creation"
5252
default: false
5353
type: boolean
54-
aws_role_arn:
55-
description: "AWS Role ARN for authentication (if empty, uses access keys)"
56-
type: string
57-
default: ""
58-
aws_build_role_arn:
59-
description: "AWS Role ARN used when running build.sh"
60-
type: string
61-
default: ""
62-
aws_vm_import_role_name:
63-
description: "IAM role name used by EC2 VM Import/Export during import-snapshot"
64-
type: string
65-
default: "vmimport"
66-
aws_ami_encryption_kms_key_id:
67-
description: "KMS Key ID for AMI encryption (optional)"
68-
type: string
69-
default: ""
54+
use_aws_role:
55+
description: "Use AWS role-based authentication (if false, uses access keys)"
56+
default: false
57+
type: boolean
7058

7159
permissions:
7260
id-token: write
@@ -92,10 +80,10 @@ jobs:
9280
uses: actions/checkout@v3
9381

9482
- name: Configure AWS credentials (build role)
95-
if: ${{ inputs.aws_build_role_arn != '' }}
83+
if: ${{ inputs.use_aws_role }}
9684
uses: aws-actions/configure-aws-credentials@v5
9785
with:
98-
role-to-assume: ${{ inputs.aws_build_role_arn }}
86+
role-to-assume: ${{ secrets.AWS_BUILD_ROLE_ARN }}
9987
role-session-name: postgres-image-${{ job.name }}
10088
aws-region: us-west-2
10189

@@ -191,15 +179,15 @@ jobs:
191179
aws --version
192180
193181
- name: Configure AWS credentials (role)
194-
if: ${{ inputs.upload_aws_ami && !inputs.build_only && inputs.aws_role_arn != '' }}
182+
if: ${{ inputs.upload_aws_ami && !inputs.build_only && inputs.use_aws_role }}
195183
uses: aws-actions/configure-aws-credentials@v5
196184
with:
197-
role-to-assume: ${{ inputs.aws_role_arn }}
185+
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
198186
role-session-name: postgres-image-${{ job.name }}
199187
aws-region: us-west-2
200188

201189
- name: Configure AWS credentials (access keys)
202-
if: ${{ inputs.upload_aws_ami && !inputs.build_only && inputs.aws_role_arn == '' }}
190+
if: ${{ inputs.upload_aws_ami && !inputs.build_only && !inputs.use_aws_role }}
203191
uses: aws-actions/configure-aws-credentials@v5
204192
with:
205193
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -227,7 +215,7 @@ jobs:
227215
image_filename=${{ steps.s3_upload.outputs.image_filename }}
228216
s3_bucket=${{ steps.s3_upload.outputs.s3_bucket }}
229217
s3_prefix=${{ steps.set_image_name.outputs.S3_BUCKET_IMAGE_PREFIX }}
230-
vm_import_role_name="${{ inputs.aws_vm_import_role_name }}"
218+
vm_import_role_name="${{ secrets.AWS_VM_IMPORT_ROLE_NAME || 'vmimport' }}"
231219
232220
cat <<EOT > containers.json
233221
{
@@ -361,7 +349,7 @@ jobs:
361349
--region "${region}"
362350
)
363351
364-
kms_key_id="${{ inputs.aws_ami_encryption_kms_key_id }}"
352+
kms_key_id="${{ secrets.AWS_AMI_ENCRYPTION_KMS_KEY_ID }}"
365353
if [ -n "${kms_key_id}" ]; then
366354
copy_args+=(--encrypted --kms-key-id "${kms_key_id}")
367355
fi
@@ -514,10 +502,10 @@ jobs:
514502
uses: actions/checkout@v3
515503

516504
- name: Configure AWS credentials (build role)
517-
if: ${{ inputs.aws_build_role_arn != '' }}
505+
if: ${{ inputs.use_aws_role }}
518506
uses: aws-actions/configure-aws-credentials@v5
519507
with:
520-
role-to-assume: ${{ inputs.aws_build_role_arn }}
508+
role-to-assume: ${{ secrets.AWS_BUILD_ROLE_ARN }}
521509
role-session-name: postgres-image-${{ job.name }}
522510
aws-region: us-west-2
523511

@@ -562,15 +550,15 @@ jobs:
562550
aws --version
563551
564552
- name: Configure AWS credentials (role)
565-
if: ${{ !inputs.build_only && inputs.aws_role_arn != '' }}
553+
if: ${{ !inputs.build_only && inputs.use_aws_role }}
566554
uses: aws-actions/configure-aws-credentials@v5
567555
with:
568-
role-to-assume: ${{ inputs.aws_role_arn }}
556+
role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
569557
role-session-name: postgres-image-${{ job.name }}
570558
aws-region: us-west-2
571559

572560
- name: Configure AWS credentials (access keys)
573-
if: ${{ !inputs.build_only && inputs.aws_role_arn == '' }}
561+
if: ${{ !inputs.build_only && !inputs.use_aws_role }}
574562
uses: aws-actions/configure-aws-credentials@v5
575563
with:
576564
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -600,7 +588,7 @@ jobs:
600588
image_filename=${{ steps.s3_upload.outputs.image_filename }}
601589
s3_bucket=${{ steps.s3_upload.outputs.s3_bucket }}
602590
s3_prefix=${{ steps.set_image_name.outputs.S3_BUCKET_IMAGE_PREFIX }}
603-
vm_import_role_name="${{ inputs.aws_vm_import_role_name }}"
591+
vm_import_role_name="${{ secrets.AWS_VM_IMPORT_ROLE_NAME || 'vmimport' }}"
604592
605593
cat <<EOT > containers.json
606594
{
@@ -734,7 +722,7 @@ jobs:
734722
--region "${region}"
735723
)
736724
737-
kms_key_id="${{ inputs.aws_ami_encryption_kms_key_id }}"
725+
kms_key_id="${{ secrets.AWS_AMI_ENCRYPTION_KMS_KEY_ID }}"
738726
if [ -n "${kms_key_id}" ]; then
739727
copy_args+=(--encrypted --kms-key-id "${kms_key_id}")
740728
fi

0 commit comments

Comments
 (0)