Skip to content

Remove DdApiKeySecretArn AllowedPattern constraints to allow friendly name support in DD forwarder lambda #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 1, 2025
Merged

Remove DdApiKeySecretArn AllowedPattern constraints to allow friendly name support in DD forwarder lambda #956

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eecb8a4
Remove DdApiKeySecretArn AllowedPattern to allow friendly name suppor…
LorisFriedel Jun 30, 2025
a94f662
Improve DdApiKeySecretArn variable description
LorisFriedel Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions aws/logs_monitoring/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ Parameters:
Description: The Datadog API key, which can be found from the APIs page (/account/settings#api). It will be stored in AWS Secrets Manager securely. If DdApiKeySecretArn is also set, this value is ignored.
DdApiKeySecretArn:
Type: String
AllowedPattern: "arn:.*:secretsmanager:.*"
Default: "arn:aws:secretsmanager:DEFAULT"
Description: The ARN of the secret storing the Datadog API key, if you already have it stored in Secrets Manager. You must store the secret as a plaintext, rather than a key-value pair.
Description: The full ARN or name (if local) of the secret storing the Datadog API key, if you already have it stored in Secrets Manager. You must store the secret as a plaintext, rather than a key-value pair.
DdApiKeySsmParameterName:
Type: String
Default: "/my/parameter/path"
Expand Down Expand Up @@ -429,7 +427,7 @@ Resources:
- !Ref DdForwarderExistingBucketName
S3Key: !Sub
- "aws-dd-forwarder-${DdForwarderVersion}.zip"
- {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]}
- { DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version] }
- ZipFile: " "
MemorySize: !Ref MemorySize
Runtime: python3.12
Expand Down Expand Up @@ -832,7 +830,7 @@ Resources:
- !Ref SourceZipUrl
- !Sub
- "https://github.com/DataDog/datadog-serverless-functions/releases/download/aws-dd-forwarder-${DdForwarderVersion}/aws-dd-forwarder-${DdForwarderVersion}.zip"
- {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]}
- { DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version] }
# The Forwarder's source code is too big to fit the inline code size limit for CloudFormation. In most of AWS
# partitions and regions, the Forwarder is able to load its source code from a Lambda layer attached to it.
# In places where Datadog can't/doesn't yet publish Lambda layers, use another Lambda to copy the source code
Expand Down
Loading