Skip to content

Commit 1f17198

Browse files
committed
trying to fix docker compose in integration tests
1 parent ad0b27f commit 1f17198

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

aws/logs_monitoring/template.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -526,11 +526,17 @@ Resources:
526526
- SetReservedConcurrentExecutions
527527
- !Ref ReservedConcurrency
528528
- !Ref AWS::NoValue
529-
VpcConfig: !If
530-
- UseVPC
531-
- SecurityGroupIds: !Ref VPCSecurityGroupIds
532-
SubnetIds: !Ref VPCSubnetIds
533-
- !Ref AWS::NoValue
529+
VpcConfig:
530+
Fn::If:
531+
- UseVPC
532+
- SecurityGroupIds: !Ref VPCSecurityGroupIds
533+
SubnetIds: !Ref VPCSubnetIds
534+
- Ref: AWS::NoValue
535+
#VpcConfig: !If
536+
#- UseVPC
537+
#- SecurityGroupIds: !Ref VPCSecurityGroupIds
538+
#SubnetIds: !Ref VPCSubnetIds
539+
#- !Ref AWS::NoValue
534540
ForwarderRole:
535541
Type: AWS::IAM::Role
536542
Properties:

aws/logs_monitoring/tools/integration_tests/integration_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ LOG_LEVEL=${LOG_LEVEL} \
165165
SNAPSHOTS_DIR_NAME="./${SNAPSHOTS_DIR_NAME}" \
166166
DD_FETCH_LAMBDA_TAGS=${DD_FETCH_LAMBDA_TAGS} \
167167
DD_FETCH_STEP_FUNCTIONS_TAGS=${DD_FETCH_STEP_FUNCTIONS_TAGS} \
168-
docker-compose up --build --abort-on-container-exit
168+
docker compose up --build --abort-on-container-exit
169169

170170
if [ $ADDITIONAL_LAMBDA == true ]; then
171171
echo "Waiting for external lambda logs..."

0 commit comments

Comments
 (0)