Merge branch 'main' of github.com:DataDog/datadog-lambda-extension

Author: Andrew Rodriguez

local_tests/build-docker-runtime.sh

@@ -19,9 +19,9 @@ fi
 case "$RUNTIME" in
     python)
         if [ "$ARCHITECTURE" == "amd64" ]; then
-            LAYER_NAME=Datadog-Python39-ARM
-        else
             LAYER_NAME=Datadog-Python39
+        else
+            LAYER_NAME=Datadog-Python39-ARM
         fi
         DOCKERFILE=Dockerfile.Python
         ;;
@@ -47,6 +47,7 @@ CURRENT_PATH=$(pwd)
 # Build the extension
 ARCHITECTURE=$ARCHITECTURE VERSION=1 ./scripts/build_binary_and_layer_dockerized.sh
 
+
 # Move to the local_tests repo
 cd ./local_tests
 
@@ -55,7 +56,13 @@ cp ../.layers/datadog_extension-$ARCHITECTURE/extensions/datadog-agent .
 
 # Build the recorder extension which will act as a man-in-a-middle to intercept payloads sent to Datadog
 cd ../../datadog-agent/test/integration/serverless/recorder-extension
-GOOS=linux GOARCH=$ARCHITECTURE go build -o "$CURRENT_PATH/local_tests/recorder-extension" main.go
+
+if [ `uname -o` == "GNU/Linux" ]; then
+      CGO_ENABLED=0 GOOS=linux GOARCH=$ARCHITECTURE go build -o "$CURRENT_PATH/local_tests/recorder-extension" main.go
+    else
+      GOOS=linux GOARCH=$ARCHITECTURE go build -o "$CURRENT_PATH/local_tests/recorder-extension" main.go
+fi
+
 cd "$CURRENT_PATH/local_tests"
 if [ -z "$LAYER_PATH" ] && [ -n "$LAYER_NAME" ]; then
     # Get the latest available version
@@ -73,7 +80,7 @@ if [ -z "$LAYER_PATH" ] && [ -n "$LAYER_NAME" ]; then
         URL=$(aws-vault exec serverless-sandbox-account-admin \
             -- aws lambda get-layer-version --layer-name $LAYER_NAME --version-number $LATEST_AVAILABLE_VERSION \
             --query Content.Location --region sa-east-1 --output text)
-        curl $URL -o "$LAYER"
+        curl -k $URL -o "$LAYER"
         rm -rf $CURRENT_PATH/local_tests/META_INF
         rm -rf $CURRENT_PATH/local_tests/python
         unzip "$LAYER"

local_tests/invoke.sh

@@ -3,7 +3,7 @@
 NB_INVOKE=$1
 
 # Start the container
-dockerId=$(docker run -d -p 9000:8080 -p 8124:8124 datadog/extension-local-tests)
+dockerId=$(docker run -d -p 9000:8080 -p 127.0.0.1:8124:8124 datadog/extension-local-tests)
 
 # Curl it!
 i=0
@@ -19,7 +19,7 @@ while true; do
         curl -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{}' ; echo
     fi
     sleep 1
-    if [[ $i -gt $NB_INVOKE ]]
+    if [[ $i -ge $NB_INVOKE ]]
     then
         echo "Saving logs to logs.txt"
         docker logs $dockerId >./local_tests/logs.txt 2>&1