From 1f1719821911ae4af612c7d9131a2a495e7b2180 Mon Sep 17 00:00:00 2001
From: Michel Daviot <michel.daviot@datadoghq.com>
Date: Fri, 16 Aug 2024 11:22:17 +0200
Subject: [PATCH] trying to fix docker compose in integration tests

---
 aws/logs_monitoring/template.yaml                | 16 +++++++++++-----
 .../tools/integration_tests/integration_tests.sh |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/aws/logs_monitoring/template.yaml b/aws/logs_monitoring/template.yaml
index bf2889ff4..9c0480c95 100644
--- a/aws/logs_monitoring/template.yaml
+++ b/aws/logs_monitoring/template.yaml
@@ -526,11 +526,17 @@ Resources:
         - SetReservedConcurrentExecutions
         - !Ref ReservedConcurrency
         - !Ref AWS::NoValue
-      VpcConfig: !If
-        - UseVPC
-        - SecurityGroupIds: !Ref VPCSecurityGroupIds
-          SubnetIds: !Ref VPCSubnetIds
-        - !Ref AWS::NoValue
+      VpcConfig:
+        Fn::If:
+          - UseVPC
+          - SecurityGroupIds: !Ref VPCSecurityGroupIds
+            SubnetIds: !Ref VPCSubnetIds
+          - Ref: AWS::NoValue
+      #VpcConfig: !If
+      #- UseVPC
+      #- SecurityGroupIds: !Ref VPCSecurityGroupIds
+      #SubnetIds: !Ref VPCSubnetIds
+      #- !Ref AWS::NoValue
   ForwarderRole:
     Type: AWS::IAM::Role
     Properties:
diff --git a/aws/logs_monitoring/tools/integration_tests/integration_tests.sh b/aws/logs_monitoring/tools/integration_tests/integration_tests.sh
index ad29d694b..5a65647e6 100755
--- a/aws/logs_monitoring/tools/integration_tests/integration_tests.sh
+++ b/aws/logs_monitoring/tools/integration_tests/integration_tests.sh
@@ -165,7 +165,7 @@ LOG_LEVEL=${LOG_LEVEL} \
         SNAPSHOTS_DIR_NAME="./${SNAPSHOTS_DIR_NAME}" \
         DD_FETCH_LAMBDA_TAGS=${DD_FETCH_LAMBDA_TAGS} \
         DD_FETCH_STEP_FUNCTIONS_TAGS=${DD_FETCH_STEP_FUNCTIONS_TAGS} \
-        docker-compose up --build --abort-on-container-exit
+        docker compose up --build --abort-on-container-exit
 
 if [ $ADDITIONAL_LAMBDA == true ]; then
         echo "Waiting for external lambda logs..."