Skip to content

Commit edf43e6

Browse files
author
Tom McLaughlin
committed
New approach via CFN paramater default
1 parent f34b612 commit edf43e6

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/branch.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ jobs:
5151
--s3-bucket aws-sam-cli-sourcebucket-${{ secrets.AWS_CICD_ACCOUNT_ID }}-us-east-1 \
5252
--s3-prefix ${{ env.GITHUB_REPOSITORY_OWNER_PART_SLUG_URL }}/${{ env.GITHUB_REPOSITORY_NAME_PART_SLUG_URL }}/${{ env.GITHUB_REF_SLUG_URL }} \
5353
--region us-east-1 \
54-
--parameter-overrides "DatadogTemplateUrl=${{ vars.DATADOG_TEMPLATE_URL }}" \
5554
--output-template-file packaged-template.yaml
5655
5756
- name: Upload SAM artifact

cfn-parameters.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@
88
"DatadogApiKey": $secrets.DATADOG_API_KEY,
99
"DatadogAppKey": $secrets.DATADOG_APP_KEY,
1010
"DataDogLogsDestinationArn": $secrets.DATADOG_LOGS_DESTINATION_ARN,
11-
"DatadogSite": "us5.datadoghq.com",
12-
"DatadogTemplateUrl": $vars.DATADOG_TEMPLATE_URL
11+
"DatadogSite": "us5.datadoghq.com"
1312
}

template.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ Parameters:
1111
Type: String
1212
ObservabilityOu:
1313
Type: String
14+
# FIXME: Workaround for `sam package` which does not take an argument for parameter values.
1415
DatadogTemplateUrl:
1516
Type: String
17+
Default: "https://datadog-cloudformation-template-quickstart.s3.amazonaws.com/aws/v4.1.3/main_orgnizations.yaml"
1618
DatadogSite:
1719
Type: String
1820
DatadogApiKey:

0 commit comments

Comments
 (0)