Skip to content

Commit

Permalink
only 10 dispatch parameters allowed - use CLOUDFORMATION_SNS_ARN thro…
Browse files Browse the repository at this point in the history
…ugh vars
  • Loading branch information
credfeto committed Nov 19, 2024
1 parent 2b9b45e commit 90a1c47
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 21 deletions.
4 changes: 0 additions & 4 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,6 @@ inputs:
CLOUD_FORMATION_STACK:
description: 'The Cloud Formation stack to deploy as'
required: true
CLOUDFORMATION_SNS_ARN:
description: 'SSN Notification ARN'
required: false

# DOCKER
DOCKER_USERNAME:
Expand Down Expand Up @@ -441,7 +438,6 @@ runs:
with:
CLOUD_FORMATION_STACK: ${{inputs.CLOUD_FORMATION_STACK}}
CLOUD_FORMATION_TEMPLATE_FILE: "cloudformation.json"
CLOUDFORMATION_SNS_ARN: ${{inputs.CLOUDFORMATION_SNS_ARN}}
BUILD_VERSION: ${{env.BUILD_VERSION}}
DOCKER_APP_OWNER: ${{inputs.DOCKER_APP_OWNER}}
DOCKER_APP_NAME: ${{inputs.DOCKER_APP_NAME}}
Expand Down
11 changes: 4 additions & 7 deletions .github/actions/cloudformation-deploy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ inputs:
CLOUD_FORMATION_TEMPLATE_FILE:
description: 'The Cloud Formation file to deploy'
required: true
CLOUDFORMATION_SNS_ARN:
description: 'SSN Notification ARN'
required: false
DOCKER_APP_OWNER:
description: 'docker app owner'
required: true
Expand Down Expand Up @@ -82,11 +79,11 @@ runs:
- name: "show Validated TemplateParameters"
shell: bash
run: |
echo "SNS ARN: ${{inputs.CLOUDFORMATION_SNS_ARN}}"
echo "SNS ARN: ${{vars.CLOUDFORMATION_SNS_ARN}}"
echo "Validated parameters:"
jq . "${{github.workspace}}/TemplateParameters.json"
- if: inputs.CLOUDFORMATION_SNS_ARN != ''
- if: vars.CLOUDFORMATION_SNS_ARN != ''
name: "AWS Cloudformation Deploy (With Notifications)"
shell: bash
run: |
Expand All @@ -99,12 +96,12 @@ runs:
--parameter-overrides \
file://TemplateParameters.json \
--notification-arns \
"${{inputs.CLOUDFORMATION_SNS_ARN}}" \
"${{vars.CLOUDFORMATION_SNS_ARN}}" \
--tags \
"App=${{inputs.CLOUD_FORMATION_STACK}}" \
"Version=${{inputs.BUILD_VERSION}}"
- if: inputs.CLOUDFORMATION_SNS_ARN == ''
- if: vars.CLOUDFORMATION_SNS_ARN == ''
name: "AWS Cloudformation Deploy (No Notifications)"
shell: bash
run: |
Expand Down
5 changes: 0 additions & 5 deletions .github/actions/dispatch-deploy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ inputs:
CLOUD_FORMATION_TEMPLATE_FILE:
description: 'The Cloud Formation file to deploy'
required: true
CLOUDFORMATION_SNS_ARN:
description: 'SSN Notification ARN'
required: false
DOCKER_APP_OWNER:
description: 'docker app owner'
required: true
Expand Down Expand Up @@ -47,7 +44,6 @@ runs:
shell: bash
run: |
echo "CLOUD_FORMATION_STACK: ${{inputs.CLOUD_FORMATION_STACK}}"
echo "CLOUDFORMATION_SNS_ARN: ${{inputs.CLOUD_FORMATION_STACK}}"
echo "CLOUD_FORMATION_TEMPLATE_FILE: ${{inputs.CLOUD_FORMATION_TEMPLATE_FILE}}"
echo "DOCKER_APP_OWNER: ${{inputs.DOCKER_APP_OWNER}}"
echo "DOCKER_APP_NAME: ${{inputs.DOCKER_APP_NAME}}"
Expand All @@ -70,7 +66,6 @@ runs:
ref: 'main',
inputs: {
CLOUD_FORMATION_STACK: "${{inputs.CLOUD_FORMATION_STACK}}",
CLOUDFORMATION_SNS_ARN: "${{inputs.CLOUD_FORMATION_STACK}}",
CLOUD_FORMATION_TEMPLATE_FILE: "${{inputs.CLOUD_FORMATION_TEMPLATE_FILE}}",
DOCKER_APP_OWNER: "${{inputs.DOCKER_APP_OWNER}}",
DOCKER_APP_NAME: "${{inputs.DOCKER_APP_NAME}}",
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-and-publish-pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ jobs:
DOCKER_APP_NAME: ${{vars.DOCKER_APP_NAME}}
CLOUD_FORMATION_DEPLOY: ${{vars.CLOUD_FORMATION_DEPLOY}}
CLOUD_FORMATION_STACK: ${{vars.CLOUD_FORMATION_STACK}}
CLOUDFORMATION_SNS_ARN: ${{vars.CLOUDFORMATION_SNS_ARN}}
GITHUB_TOKEN: ${{secrets.SOURCE_PUSH_TOKEN}}
REPO_VISIBILITY: ${{env.REPO_STATUS}}
AWS_ACCESS_KEY_ID: ${{secrets.AWS_DOCKER_CONTAINER_REGISTRY_ACCESS_KEY_ID}}
Expand Down Expand Up @@ -138,7 +137,6 @@ jobs:
DOCKER_APP_NAME: ${{vars.DOCKER_APP_NAME}}
CLOUD_FORMATION_DEPLOY: ${{vars.CLOUD_FORMATION_DEPLOY}}
CLOUD_FORMATION_STACK: ${{vars.CLOUD_FORMATION_STACK}}
CLOUDFORMATION_SNS_ARN: ${{vars.CLOUDFORMATION_SNS_ARN}}
GITHUB_TOKEN: ${{secrets.SOURCE_PUSH_TOKEN}}
REPO_VISIBILITY: ${{env.REPO_STATUS}}
AWS_ACCESS_KEY_ID: ${{secrets.AWS_DOCKER_CONTAINER_REGISTRY_ACCESS_KEY_ID}}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-and-publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ jobs:
DOCKER_APP_NAME: ${{vars.DOCKER_APP_NAME}}
CLOUD_FORMATION_DEPLOY: ${{vars.CLOUD_FORMATION_DEPLOY}}
CLOUD_FORMATION_STACK: ${{vars.CLOUD_FORMATION_STACK}}
CLOUDFORMATION_SNS_ARN: ${{vars.CLOUDFORMATION_SNS_ARN}}
GITHUB_TOKEN: ${{secrets.SOURCE_PUSH_TOKEN}}
REPO_VISIBILITY: ${{env.REPO_STATUS}}
AWS_ACCESS_KEY_ID: ${{secrets.AWS_DOCKER_CONTAINER_REGISTRY_ACCESS_KEY_ID}}
Expand Down Expand Up @@ -129,7 +128,6 @@ jobs:
DOCKER_APP_NAME: ${{vars.DOCKER_APP_NAME}}
CLOUD_FORMATION_DEPLOY: ${{vars.CLOUD_FORMATION_DEPLOY}}
CLOUD_FORMATION_STACK: ${{vars.CLOUD_FORMATION_STACK}}
CLOUDFORMATION_SNS_ARN: ${{vars.CLOUDFORMATION_SNS_ARN}}
GITHUB_TOKEN: ${{secrets.SOURCE_PUSH_TOKEN}}
REPO_VISIBILITY: ${{env.REPO_STATUS}}
AWS_ACCESS_KEY_ID: ${{secrets.AWS_DOCKER_CONTAINER_REGISTRY_ACCESS_KEY_ID}}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ jobs:
uses: ./.github/actions/cloudformation-deploy
with:
CLOUD_FORMATION_STACK: ${{inputs.CLOUD_FORMATION_STACK}}
CLOUDFORMATION_SNS_ARN: ${{inputs.CLOUDFORMATION_SNS_ARN}}
CLOUD_FORMATION_TEMPLATE_FILE: "${{github.workspace}}/${{inputs.CLOUD_FORMATION_TEMPLATE_FILE}}"
DOCKER_APP_OWNER: ${{inputs.DOCKER_APP_OWNER}}
DOCKER_APP_NAME: ${{inputs.DOCKER_APP_NAME}}
Expand Down

0 comments on commit 90a1c47

Please sign in to comment.