diff --git a/.viperlightrc b/.viperlightrc index 5893f1916..8392aeb06 100644 --- a/.viperlightrc +++ b/.viperlightrc @@ -1,4 +1,4 @@ { "failOn": "medium", "all": true -} +} \ No newline at end of file diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.expected.json index c8a21bba2..4b99550a6 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.expected.json @@ -1,5 +1,5 @@ { - "Description": "Integration Test with new VPC, Service and Table", + "Description": "Integration Test with existing VPC and Service and Table", "Resources": { "Vpc8378EB38": { "Type": "AWS::EC2::VPC", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.ts index a63cc4808..a2aada18c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.ts +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-dynamodb/test/integ.existing-resources.ts @@ -23,7 +23,7 @@ const app = new App(); const stack = new Stack(app, generateIntegStackName(__filename), { env: { account: Aws.ACCOUNT_ID, region: 'us-east-1' }, }); -stack.templateOptions.description = 'Integration Test with new VPC, Service and Table'; +stack.templateOptions.description = 'Integration Test with existing VPC and Service and Table'; const existingVpc = getTestVpc(stack); const [ existingTable ] = defaults.buildDynamoDBTable(stack, {}); diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.expected.json index c087530e8..0183470bc 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.expected.json @@ -1,5 +1,5 @@ { - "Description": "Integration Test with new VPC, Service and Existing Bucket", + "Description": "Integration Test with existing VPC, Service and Event Bus", "Resources": { "Vpc8378EB38": { "Type": "AWS::EC2::VPC", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.ts index e9ad58e9e..c15741d51 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.ts +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-eventbridge/test/integ.existing-resources.ts @@ -23,7 +23,7 @@ const app = new App(); const stack = new Stack(app, generateIntegStackName(__filename), { env: { account: Aws.ACCOUNT_ID, region: 'us-east-1' }, }); -stack.templateOptions.description = 'Integration Test with new VPC, Service and Existing Bucket'; +stack.templateOptions.description = 'Integration Test with existing VPC, Service and Event Bus'; const existingVpc = getTestVpc(stack); const image = ecs.ContainerImage.fromRegistry('nginx'); diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.expected.json index e564b309e..8e8164d32 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.expected.json @@ -1,5 +1,5 @@ { - "Description": "Integration Test with new VPC, Service and Bucket", + "Description": "Integration Test with existing VPC, Service and Bucket", "Resources": { "Vpc8378EB38": { "Type": "AWS::EC2::VPC", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.ts index e2b780278..7f3802be7 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.ts +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-s3/test/integ.existing-resources.ts @@ -23,7 +23,7 @@ const app = new App(); const stack = new Stack(app, generateIntegStackName(__filename), { env: { account: Aws.ACCOUNT_ID, region: 'us-east-1' }, }); -stack.templateOptions.description = 'Integration Test with new VPC, Service and Bucket'; +stack.templateOptions.description = 'Integration Test with existing VPC, Service and Bucket'; const existingVpc = getTestVpc(stack); const existingBucket = defaults.CreateScrapBucket(stack, { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.expected.json index 4eaa91abe..e715fe90d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.expected.json @@ -1,5 +1,5 @@ { - "Description": "Integration Test with new VPC, Service and a Secret", + "Description": "Integration Test with existing VPC, Service and a Secret", "Resources": { "Vpc8378EB38": { "Type": "AWS::EC2::VPC", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.ts index bdd5b068f..04d318e4c 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.ts +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-secretsmanager/test/integ.existing-resources.ts @@ -23,7 +23,7 @@ const app = new App(); const stack = new Stack(app, generateIntegStackName(__filename), { env: { account: Aws.ACCOUNT_ID, region: 'us-east-1' }, }); -stack.templateOptions.description = 'Integration Test with new VPC, Service and a Secret'; +stack.templateOptions.description = 'Integration Test with existing VPC, Service and a Secret'; const existingVpc = getTestVpc(stack); const existingSecretObj = defaults.buildSecretsManagerSecret(stack, 'secret', {}); diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.expected.json index 5d6575bcd..fb0c00d29 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.expected.json @@ -1,5 +1,5 @@ { - "Description": "Integration Test with new VPC, Service and Topic", + "Description": "Integration Test with existing VPC, Service and Topic", "Resources": { "Vpc8378EB38": { "Type": "AWS::EC2::VPC", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.ts index a02fd8c35..a3a66e3d1 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.ts +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-sns/test/integ.existing-resources.ts @@ -23,7 +23,7 @@ const app = new App(); const stack = new Stack(app, generateIntegStackName(__filename), { env: { account: Aws.ACCOUNT_ID, region: 'us-east-1' }, }); -stack.templateOptions.description = 'Integration Test with new VPC, Service and Topic'; +stack.templateOptions.description = 'Integration Test with existing VPC, Service and Topic'; const existingVpc = getTestVpc(stack); const existingTopic = new sns.Topic(stack, 'test-topic', {}); diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.expected.json index faa0decc6..3983feb0d 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.expected.json @@ -1,5 +1,5 @@ { - "Description": "Integration Test with new VPC, Service and Queue", + "Description": "Integration Test with existing VPC, Service and Queue", "Resources": { "Vpc8378EB38": { "Type": "AWS::EC2::VPC", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.ts index 84f3db7aa..78c196ef3 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.ts +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-sqs/test/integ.existing-resources.ts @@ -23,7 +23,7 @@ const app = new App(); const stack = new Stack(app, generateIntegStackName(__filename), { env: { account: Aws.ACCOUNT_ID, region: 'us-east-1' }, }); -stack.templateOptions.description = 'Integration Test with new VPC, Service and Queue'; +stack.templateOptions.description = 'Integration Test with existing VPC, Service and Queue'; const existingVpc = getTestVpc(stack); const existingQueue = new sqs.Queue(stack, 'test-queue', { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.expected.json index 8165303cb..dffa1b1c6 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.expected.json @@ -1,5 +1,5 @@ { - "Description": "Integration Test with new VPC, Service and SSM String Parameter", + "Description": "Integration Test with existing VPC, Service and SSM String Parameter", "Resources": { "Vpc8378EB38": { "Type": "AWS::EC2::VPC", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.ts index 3f867c4aa..f2d32288f 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.ts +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-ssmstringparameter/test/integ.existing-resources.ts @@ -23,7 +23,7 @@ const app = new App(); const stack = new Stack(app, generateIntegStackName(__filename), { env: { account: Aws.ACCOUNT_ID, region: 'us-east-1' }, }); -stack.templateOptions.description = 'Integration Test with new VPC, Service and SSM String Parameter'; +stack.templateOptions.description = 'Integration Test with existing VPC, Service and SSM String Parameter'; const existingVpc = getTestVpc(stack); const existingStringParameterObj = new ssm.StringParameter(stack, 'Parameter', { diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.expected.json b/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.expected.json index d7df697ce..a7c4ec0f1 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.expected.json @@ -1,5 +1,5 @@ { - "Description": "Integration Test with new VPC, Service and a state machine with no CloudWatch alarms", + "Description": "Integration Test with existing VPC and Service and a new state machine with no CloudWatch alarms", "Resources": { "Vpc8378EB38": { "Type": "AWS::EC2::VPC", diff --git a/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.ts b/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.ts index 53a786b13..2aaed3376 100644 --- a/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.ts +++ b/source/patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.no-cloudwatch-alarms.ts @@ -23,7 +23,7 @@ const app = new App(); const stack = new Stack(app, defaults.generateIntegStackName(__filename), { env: { account: Aws.ACCOUNT_ID, region: 'us-east-1' }, }); -stack.templateOptions.description = 'Integration Test with new VPC, Service and a state machine with no CloudWatch alarms'; +stack.templateOptions.description = 'Integration Test with existing VPC and Service and a new state machine with no CloudWatch alarms'; const existingVpc = defaults.getTestVpc(stack); const startState = new stepfunctions.Pass(stack, 'StartState'); diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.expected.json b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.expected.json index 9b9fdd863..39d31e5ea 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.expected.json +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.expected.json @@ -1,5 +1,5 @@ { - "Description": "Integration Test with new resourcesfor aws-lambda-elasticachememcached", + "Description": "Integration Test with existing vpc, Lambda function and cache", "Resources": { "Vpc8378EB38": { "Type": "AWS::EC2::VPC", diff --git a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.ts b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.ts index 68016f57c..e5b8bd347 100644 --- a/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.ts +++ b/source/patterns/@aws-solutions-constructs/aws-lambda-elasticachememcached/test/integ.existingResources.ts @@ -21,16 +21,10 @@ import { generateIntegStackName, getTestVpc, CreateTestCache, addCfnSuppressRule // Setup const app = new App(); const stack = new Stack(app, generateIntegStackName(__filename)); -stack.templateOptions.description = 'Integration Test with new resourcesfor aws-lambda-elasticachememcached'; +stack.templateOptions.description = 'Integration Test with existing vpc, Lambda function and cache'; const testVpc = getTestVpc(stack, false); -// const testSG = new ec2.SecurityGroup(stack, 'test-sg', { -// vpc: testVpc, -// }); -// addCfnSuppressRules(testSG, [{ id: "W40", reason: "Test Resource" }]); -// addCfnSuppressRules(testSG, [{ id: "W5", reason: "Test Resource" }]); -// addCfnSuppressRules(testSG, [{ id: "W36", reason: "Test Resource" }]); const testSG = buildSecurityGroup(stack, 'test-sg', { vpc: testVpc }, [], []); const testFunction = new lambda.Function(stack, 'test-function', {