AWS-1786 Add ability to not set ReservedConcurrency on log forwarder lambda (#610)

* AWS-1786 Add ability to not set ReservedConcurrency on log forwarder lambda
* AWS-1786 update CURRENT_VERSION grep to work with gnu grep

Author: dwikle

aws/logs_monitoring/release.sh

@@ -7,7 +7,7 @@ set -e
 LAYER_NAME="Datadog-Forwarder"
 
 # Read the current version
-CURRENT_VERSION=$(grep -o 'Version: \d\+\.\d\+\.\d\+' template.yaml | cut -d' ' -f2)
+CURRENT_VERSION=$(grep -E -o 'Version: [0-9]+\.[0-9]+\.[0-9]+' template.yaml | cut -d' ' -f2)
 
 # Read the desired version
 if [ -z "$1" ]; then

aws/logs_monitoring/template.yaml

@@ -217,6 +217,13 @@ Parameters:
     Type: String
     Default: ""
     Description: The name of the forwarder bucket to create. If not provided, AWS will generate a unique name.
+  UseReservedConcurrency:
+    Type: String
+    Default: true
+    AllowedValues:
+      - true
+      - false
+    Description: Configure the Datadog Forwarder Lambda to use reserved concurrency. Set to false to use unreserved account concurrency.
 Conditions:
   IsAWSChina:
     Fn::Equals:
@@ -397,6 +404,10 @@ Conditions:
       - Fn::Equals:
           - Ref: DdForwarderBucketName
           - ""
+  SetReservedConcurrentExecutions:
+    Fn::Equals:
+      - Ref: UseReservedConcurrency
+      - true
 Rules:
   MustSetDdApiKey:
     Assertions:
@@ -618,7 +629,10 @@ Resources:
               - Ref: DdTraceIntakeUrl
               - Ref: AWS::NoValue
       ReservedConcurrentExecutions:
-        Ref: ReservedConcurrency
+        Fn::If:
+          - SetReservedConcurrentExecutions
+          - Ref: ReservedConcurrency
+          - Ref: AWS::NoValue
       VpcConfig:
         Fn::If:
           - UseVPC
@@ -1052,6 +1066,7 @@ Metadata:
           - DdTraceIntakeUrl
           - AdditionalTargetLambdaArns
           - DdForwarderBucketName
+          - UseReservedConcurrency
     ParameterLabels:
       DdApiKey:
         default: "DdApiKey *"

aws/logs_monitoring/tools/installation_test.sh

@@ -25,7 +25,7 @@ RUN_ID=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c10)
 # Since we never run the log forwarder, api key can be anything.
 DD_API_KEY=RUN_ID
 
-CURRENT_VERSION="$(grep -o 'Version: \d\+\.\d\+\.\d\+' template.yaml | cut -d' ' -f2)"
+CURRENT_VERSION="$(grep -E -o 'Version: [0-9]+\.[0-9]+\.[0-9]+' template.yaml | cut -d' ' -f2)"
 
 function aws-login() {
     cfg=( "$@" )
@@ -78,4 +78,4 @@ RUN_ID=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c10)
 echo
 echo "Running Publish with Layer test"
 LAYER_ARN="arn:aws:lambda:${AWS_REGION}:${CURRENT_ACCOUNT}:layer:${LAYER_NAME}:${LAYER_VERSION}"
-publish_test $(param LayerARN \"${LAYER_ARN}\")
+publish_test $(param LayerARN \"${LAYER_ARN}\")