@@ -3,8 +3,8 @@ Description: Pushes logs, metrics and traces from AWS to Datadog.
33Mappings :
44 Constants :
55 DdForwarder :
6- Version : 3.121 .0
7- LayerVersion : " 61 "
6+ Version : 3.122 .0
7+ LayerVersion : " 62 "
88Parameters :
99 DdApiKey :
1010 Type : String
@@ -250,16 +250,15 @@ Parameters:
250250 Default : " "
251251 Description : The name of an existing s3 bucket to use. If not provided, a new bucket will be created.
252252Conditions :
253- IsAWSChina : !Equals [!Ref AWS::Partition, aws-cn]
254- IsGovCloud : !Equals [!Ref AWS::Partition, aws-us-gov]
253+ IsAWSChina : !Equals [!Ref ' AWS::Partition' , aws-cn]
254+ IsGovCloud : !Equals [!Ref ' AWS::Partition' , aws-us-gov]
255255 UseZipCopier : !Or
256256 - !Condition IsAWSChina
257257 - !And
258258 - !Equals [!Ref InstallAsLayer, "false"]
259259 - !Not
260260 - !Condition SetLayerARN
261- CreateDdApiKeySecret :
262- !Equals [!Ref DdApiKeySecretArn, arn:aws:secretsmanager:DEFAULT]
261+ CreateDdApiKeySecret : !Equals [!Ref DdApiKeySecretArn, 'arn:aws:secretsmanager:DEFAULT']
263262 SetFunctionName : !Not
264263 - !Equals [!Ref FunctionName, DatadogForwarder]
265264 SetSourceZipUrl : !Not
@@ -306,8 +305,7 @@ Conditions:
306305 - !Condition SetDdUsePrivateLink
307306 - !Condition SetDdUseVPC
308307 SetDdForwardLog : !Equals [!Ref DdForwardLog, false]
309- SetDdStepFunctionsTraceEnabled :
310- !Equals [!Ref DdStepFunctionsTraceEnabled, true]
308+ SetDdStepFunctionsTraceEnabled : !Equals [!Ref DdStepFunctionsTraceEnabled, true]
311309 SetDdUseCompression : !Equals [!Ref DdUseCompression, false]
312310 SetDdCompressionLevel : !Not
313311 - !Equals [!Ref DdCompressionLevel, 6]
@@ -379,10 +377,7 @@ Resources:
379377 - !Ref DdForwarderExistingBucketName
380378 S3Key : !Sub
381379 - " aws-dd-forwarder-${DdForwarderVersion}.zip"
382- - {
383- DdForwarderVersion :
384- !FindInMap [Constants, DdForwarder, Version],
385- }
380+ - {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]}
386381 - ZipFile : " "
387382 MemorySize : !Ref MemorySize
388383 Runtime : python3.11
@@ -558,8 +553,8 @@ Resources:
558553 PolicyDocument :
559554 Version : " 2012-10-17"
560555 Statement :
561- # Access the s3 bucket that is used by the forwarder as a datastore
562556 - !If
557+ # Access the s3 bucket that is used by the forwarder as a datastore
563558 - SetForwarderBucket
564559 - Action :
565560 - s3:GetObject
@@ -572,9 +567,9 @@ Resources:
572567 - !Sub " arn:aws:s3:::${DdForwarderExistingBucketName}/*"
573568 Effect : Allow
574569 - !Ref AWS::NoValue
575- # Get the actual log content from the s3 bucket based on the received s3 event.
576- # Use PermissionsBoundaryArn to limit (allow/deny) access if needed.
577570 - !If
571+ # Get the actual log content from the s3 bucket based on the received s3 event.
572+ # Use PermissionsBoundaryArn to limit (allow/deny) access if needed.
578573 - SetForwarderBucket
579574 - Action :
580575 - s3:ListBucket
@@ -608,25 +603,25 @@ Resources:
608603 - !Ref DdApiKeySecret
609604 - !Sub " ${DdApiKeySecretArn}*"
610605 Effect : Allow
611- # Fetch Lambda resource tags for data enrichment
612- # Fetch Step Functions resource tags for data enrichment
613606 - !If
607+ # Fetch Lambda resource tags for data enrichment
608+ # Fetch Step Functions resource tags for data enrichment
614609 - ShouldDdFetchTags
615610 - Action :
616611 - tag:GetResources
617612 Resource : " *"
618613 Effect : Allow
619614 - !Ref AWS::NoValue
620- # Get tags for log groups and attach them to the logs sent to Datadog
621615 - !If
616+ # Get tags for log groups and attach them to the logs sent to Datadog
622617 - SetDdFetchLogGroupTags
623618 - Action :
624619 - logs:ListTagsForResource
625620 Resource : " *"
626621 Effect : Allow
627622 - !Ref AWS::NoValue
628- # Required for Lambda deployed in VPC
629623 - !If
624+ # Required for Lambda deployed in VPC
630625 - UseVPC
631626 - Action :
632627 - ec2:CreateNetworkInterface
@@ -635,8 +630,8 @@ Resources:
635630 Resource : " *"
636631 Effect : Allow
637632 - !Ref AWS::NoValue
638- # To invoke a follower Lambda with the same event received by the forwarder for dual-shipping
639633 - !If
634+ # To invoke a follower Lambda with the same event received by the forwarder for dual-shipping
640635 - SetAdditionalTargetLambdas
641636 - Action :
642637 - lambda:InvokeFunction
@@ -754,7 +749,7 @@ Resources:
754749 - !Ref SourceZipUrl
755750 - !Sub
756751 - " https://github.com/DataDog/datadog-serverless-functions/releases/download/aws-dd-forwarder-${DdForwarderVersion}/aws-dd-forwarder-${DdForwarderVersion}.zip"
757- - { DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version] }
752+ - {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]}
758753 # The Forwarder's source code is too big to fit the inline code size limit for CloudFormation. In most of AWS
759754 # partitions and regions, the Forwarder is able to load its source code from a Lambda layer attached to it.
760755 # In places where Datadog can't/doesn't yet publish Lambda layers, use another Lambda to copy the source code
0 commit comments