From 42dd4e374e67dea4c4665b64d697ccfbdf3cd81f Mon Sep 17 00:00:00 2001 From: Piotr Grzesik Date: Wed, 22 Dec 2021 12:11:43 +0100 Subject: [PATCH] fix(AWS Deploy): Check for VPC config change in `deploy function` --- lib/plugins/aws/deployFunction.js | 14 ++++++++------ test/unit/lib/plugins/aws/deployFunction.test.js | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deployFunction.js index 671f63002f2..dfcd76d50b7 100644 --- a/lib/plugins/aws/deployFunction.js +++ b/lib/plugins/aws/deployFunction.js @@ -361,14 +361,16 @@ class AwsDeployFunction { const didVpcChange = () => { const remoteConfigToCompare = { SecurityGroupIds: [], SubnetIds: [] }; if (remoteFunctionConfiguration.VpcConfig) { - remoteConfigToCompare.SecurityGroupIds = - remoteFunctionConfiguration.VpcConfig.SecurityGroupIds || []; - remoteConfigToCompare.SubnetIds = remoteFunctionConfiguration.VpcConfig.SubnetIds || []; + remoteConfigToCompare.SecurityGroupIds = new Set( + remoteFunctionConfiguration.VpcConfig.SecurityGroupIds || [] + ); + remoteConfigToCompare.SubnetIds = new Set( + remoteFunctionConfiguration.VpcConfig.SubnetIds || [] + ); } const localConfigToCompare = { - SecurityGroupIds: [], - SubnetIds: [], - ...params.VpcConfig, + SecurityGroupIds: new Set(params.VpcConfig.SecurityGroupIds || []), + SubnetIds: new Set(params.VpcConfig.SubnetIds || []), }; return _.isEqual(remoteConfigToCompare, localConfigToCompare); }; diff --git a/test/unit/lib/plugins/aws/deployFunction.test.js b/test/unit/lib/plugins/aws/deployFunction.test.js index 9de68302c1a..012ad403ef7 100644 --- a/test/unit/lib/plugins/aws/deployFunction.test.js +++ b/test/unit/lib/plugins/aws/deployFunction.test.js @@ -792,7 +792,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => { VpcConfig: { VpcId: 'vpc-xxxx', SecurityGroupIds: ['sg-111', 'sg-222'], - SubnetIds: ['subnet-111', 'subnet-222'], + SubnetIds: ['subnet-222', 'subnet-111'], }, }, },