Skip to content

Commit cb604e9

Browse files
authored
Remove DdApiKeySecretArn AllowedPattern constraints to allow friendly name support in DD forwarder lambda (#956)
1 parent 85ce352 commit cb604e9

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

aws/logs_monitoring/template.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ Parameters:
1313
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.
1414
DdApiKeySecretArn:
1515
Type: String
16-
AllowedPattern: "arn:.*:secretsmanager:.*"
17-
Default: "arn:aws:secretsmanager:DEFAULT"
18-
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.
16+
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.
1917
DdApiKeySsmParameterName:
2018
Type: String
2119
Default: "/my/parameter/path"
@@ -429,7 +427,7 @@ Resources:
429427
- !Ref DdForwarderExistingBucketName
430428
S3Key: !Sub
431429
- "aws-dd-forwarder-${DdForwarderVersion}.zip"
432-
- {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]}
430+
- { DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version] }
433431
- ZipFile: " "
434432
MemorySize: !Ref MemorySize
435433
Runtime: python3.12
@@ -832,7 +830,7 @@ Resources:
832830
- !Ref SourceZipUrl
833831
- !Sub
834832
- "https://github.com/DataDog/datadog-serverless-functions/releases/download/aws-dd-forwarder-${DdForwarderVersion}/aws-dd-forwarder-${DdForwarderVersion}.zip"
835-
- {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]}
833+
- { DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version] }
836834
# The Forwarder's source code is too big to fit the inline code size limit for CloudFormation. In most of AWS
837835
# partitions and regions, the Forwarder is able to load its source code from a Lambda layer attached to it.
838836
# In places where Datadog can't/doesn't yet publish Lambda layers, use another Lambda to copy the source code

0 commit comments

Comments
 (0)