Skip to content

Commit 8eee48a

Browse files
authored
Revert "Remove DdApiKeySecretArn AllowedPattern to allow friendly name suppor…" (#962)
This reverts commit a94fd77.
1 parent a94fd77 commit 8eee48a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

aws/logs_monitoring/template.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ 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:.*"
1617
Default: "arn:aws:secretsmanager:DEFAULT"
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.
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.
1819
DdApiKeySsmParameterName:
1920
Type: String
2021
Default: "/my/parameter/path"
@@ -428,7 +429,7 @@ Resources:
428429
- !Ref DdForwarderExistingBucketName
429430
S3Key: !Sub
430431
- "aws-dd-forwarder-${DdForwarderVersion}.zip"
431-
- { DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version] }
432+
- {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]}
432433
- ZipFile: " "
433434
MemorySize: !Ref MemorySize
434435
Runtime: python3.12
@@ -831,7 +832,7 @@ Resources:
831832
- !Ref SourceZipUrl
832833
- !Sub
833834
- "https://github.com/DataDog/datadog-serverless-functions/releases/download/aws-dd-forwarder-${DdForwarderVersion}/aws-dd-forwarder-${DdForwarderVersion}.zip"
834-
- { DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version] }
835+
- {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]}
835836
# The Forwarder's source code is too big to fit the inline code size limit for CloudFormation. In most of AWS
836837
# partitions and regions, the Forwarder is able to load its source code from a Lambda layer attached to it.
837838
# 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)