Default region to us-east-1 and fix workflow structure
All checks were successful
Deploy Hello Lambda CFT / deploy (push) Successful in 1m23s
All checks were successful
Deploy Hello Lambda CFT / deploy (push) Successful in 1m23s
This commit is contained in:
parent
c40bb4455f
commit
2ec2e857f2
1 changed files with 34 additions and 39 deletions
|
|
@ -12,7 +12,7 @@ jobs:
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
||||||
AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
|
AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
|
||||||
AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
|
AWS_DEFAULT_REGION: us-east-1
|
||||||
LOWER: ${{ secrets.LOWER }}
|
LOWER: ${{ secrets.LOWER }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|
@ -61,47 +61,42 @@ jobs:
|
||||||
echo "Unable to install aws CLI on this runner."
|
echo "Unable to install aws CLI on this runner."
|
||||||
exit 1
|
exit 1
|
||||||
|
|
||||||
- name: Parse LOWER bundled secret
|
- name: Parse LOWER bundled secret
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
if [ -z "$LOWER" ]; then
|
if [ -z "$LOWER" ]; then
|
||||||
echo "LOWER secret is empty or not set; using individual secrets if present."
|
echo "LOWER secret is empty or not set; using individual secrets if present."
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Expected LOWER format is multiline KEY=VALUE entries.
|
# Expected LOWER format is multiline KEY=VALUE entries.
|
||||||
# Example:
|
while IFS= read -r line; do
|
||||||
# AWS_ACCESS_KEY_ID=...
|
l="$(echo "$line" | sed 's/^ *//;s/ *$//')"
|
||||||
# AWS_SECRET_ACCESS_KEY=...
|
[ -z "$l" ] && continue
|
||||||
# AWS_SESSION_TOKEN=... (optional)
|
[ "${l#\#}" != "$l" ] && continue
|
||||||
# AWS_DEFAULT_REGION=us-east-1
|
case "$l" in
|
||||||
while IFS= read -r line; do
|
*=*) ;;
|
||||||
l="$(echo "$line" | sed 's/^ *//;s/ *$//')"
|
*) continue ;;
|
||||||
[ -z "$l" ] && continue
|
esac
|
||||||
[ "${l#\#}" != "$l" ] && continue
|
|
||||||
case "$l" in
|
|
||||||
*=*) ;;
|
|
||||||
*) continue ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
key="${l%%=*}"
|
key="${l%%=*}"
|
||||||
value="${l#*=}"
|
value="${l#*=}"
|
||||||
key="$(echo "$key" | sed 's/^ *//;s/ *$//')"
|
key="$(echo "$key" | sed 's/^ *//;s/ *$//')"
|
||||||
value="$(echo "$value" | sed 's/^ *//;s/ *$//')"
|
value="$(echo "$value" | sed 's/^ *//;s/ *$//')"
|
||||||
|
|
||||||
case "$key" in
|
case "$key" in
|
||||||
AWS_ACCESS_KEY_ID|AWS_SECRET_ACCESS_KEY|AWS_SESSION_TOKEN|AWS_DEFAULT_REGION|AWS_REGION)
|
AWS_ACCESS_KEY_ID|AWS_SECRET_ACCESS_KEY|AWS_SESSION_TOKEN|AWS_DEFAULT_REGION|AWS_REGION)
|
||||||
if [ -n "$value" ]; then
|
if [ -n "$value" ]; then
|
||||||
echo "$key=$value" >> "$GITHUB_ENV"
|
echo "$key=$value" >> "$GITHUB_ENV"
|
||||||
if [ "$key" = "AWS_REGION" ]; then
|
if [ "$key" = "AWS_REGION" ]; then
|
||||||
echo "AWS_DEFAULT_REGION=$value" >> "$GITHUB_ENV"
|
echo "AWS_DEFAULT_REGION=$value" >> "$GITHUB_ENV"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done <<EOF
|
done <<EOF
|
||||||
$LOWER
|
$LOWER
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
- name: Check required AWS secrets
|
- name: Check required AWS secrets
|
||||||
run: |
|
run: |
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue