Skip to content

Commit a94fd77

Browse files
authored
Remove DdApiKeySecretArn AllowedPattern to allow friendly name support in forwarder lambda (#961)
1 parent 6ba75b4 commit a94fd77

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

aws/logs_monitoring/template.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ 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:.*"
1716
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.
17+
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.
1918
DdApiKeySsmParameterName:
2019
Type: String
2120
Default: "/my/parameter/path"
@@ -429,7 +428,7 @@ Resources:
429428
- !Ref DdForwarderExistingBucketName
430429
S3Key: !Sub
431430
- "aws-dd-forwarder-${DdForwarderVersion}.zip"
432-
- {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]}
431+
- { DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version] }
433432
- ZipFile: " "
434433
MemorySize: !Ref MemorySize
435434
Runtime: python3.12
@@ -832,7 +831,7 @@ Resources:
832831
- !Ref SourceZipUrl
833832
- !Sub
834833
- "https://github.com/DataDog/datadog-serverless-functions/releases/download/aws-dd-forwarder-${DdForwarderVersion}/aws-dd-forwarder-${DdForwarderVersion}.zip"
835-
- {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]}
834+
- { DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version] }
836835
# The Forwarder's source code is too big to fit the inline code size limit for CloudFormation. In most of AWS
837836
# partitions and regions, the Forwarder is able to load its source code from a Lambda layer attached to it.
838837
# 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)