Merge branch 'master' into nija-at/cognito-domain

aws · Apr 21, 2020 · c5eda23 · c5eda23
2 parents 81f0ef1 + 94a7f98
commit c5eda23
Show file tree

Hide file tree

Showing 1,021 changed files with 15,661 additions and 15,599 deletions.
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
@@ -14,4 +14,9 @@ update_configs:
           dependency_name: "@jsii/*"
       - match:
           dependency_name: "codemaker"
-
+      - match:
+          dependency_name: "semver"
+      - match:
+          dependency_name: "@types/node"
+          version_requirement: ">=11.0.0-0"
+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -278,7 +278,7 @@ The following linters are used -
 - [pkglint](#pkglint)
 - [awslint](#awslint)
 
-#### eslint
+#### eslint
 
 Historically, the CDK has used tslint for linting its typescript source code. With [tslint's deprecation in
 2019](https://medium.com/palantir/tslint-in-2019-1a144c2317a9), we are slowly moving over to using eslint.

diff --git a/packages/@aws-cdk/app-delivery/test/integ.cicd.ts b/packages/@aws-cdk/app-delivery/test/integ.cicd.ts
@@ -10,8 +10,8 @@ const app = new cdk.App();
 const stack = new cdk.Stack(app, 'CICD');
 const pipeline = new codepipeline.Pipeline(stack, 'CodePipeline', {
   artifactBucket: new s3.Bucket(stack, 'ArtifactBucket', {
-    removalPolicy: cdk.RemovalPolicy.DESTROY
-  })
+    removalPolicy: cdk.RemovalPolicy.DESTROY,
+  }),
 });
 const sourceOutput = new codepipeline.Artifact('Artifact_CICDGitHubF8BA7ADD');
 const source = new cpactions.GitHubSourceAction({

diff --git a/packages/@aws-cdk/app-delivery/test/test.pipeline-deploy-stack-action.ts b/packages/@aws-cdk/app-delivery/test/test.pipeline-deploy-stack-action.ts
@@ -43,8 +43,8 @@ export = nodeunit.testCase({
               adminPermissions: false,
             }));
           }, 'Cross-environment deployment is not supported');
-        }
-      )
+        },
+      ),
     );
     test.done();
   },
@@ -74,8 +74,8 @@ export = nodeunit.testCase({
               adminPermissions: false,
             }));
           }, 'createChangeSetRunOrder must be < executeChangeSetRunOrder');
-        }
-      )
+        },
+      ),
     );
     test.done();
   },
@@ -138,48 +138,48 @@ export = nodeunit.testCase({
         StackName: 'TestStack',
         ActionMode: 'CHANGE_SET_REPLACE',
         Capabilities: 'CAPABILITY_NAMED_IAM',
-      }
+      },
     })));
     expect(pipelineStack).to(haveResource('AWS::CodePipeline::Pipeline', hasPipelineAction({
       Configuration: {
         StackName: 'AnonymousIAM',
         ActionMode: 'CHANGE_SET_REPLACE',
         Capabilities: 'CAPABILITY_IAM',
-      }
+      },
     })));
     expect(pipelineStack).notTo(haveResource('AWS::CodePipeline::Pipeline', hasPipelineAction({
       Configuration: {
         StackName: 'NoCapStack',
         ActionMode: 'CHANGE_SET_REPLACE',
         Capabilities: 'CAPABILITY_NAMED_IAM',
-      }
+      },
     })));
     expect(pipelineStack).notTo(haveResource('AWS::CodePipeline::Pipeline', hasPipelineAction({
       Configuration: {
         StackName: 'NoCapStack',
         ActionMode: 'CHANGE_SET_REPLACE',
         Capabilities: 'CAPABILITY_IAM',
-      }
+      },
     })));
     expect(pipelineStack).to(haveResource('AWS::CodePipeline::Pipeline', hasPipelineAction({
       Configuration: {
         StackName: 'NoCapStack',
         ActionMode: 'CHANGE_SET_REPLACE',
-      }
+      },
     })));
     expect(pipelineStack).to(haveResource('AWS::CodePipeline::Pipeline', hasPipelineAction({
       Configuration: {
         StackName: 'AutoExpand',
         ActionMode: 'CHANGE_SET_REPLACE',
         Capabilities: 'CAPABILITY_AUTO_EXPAND',
-      }
+      },
     })));
     expect(pipelineStack).to(haveResource('AWS::CodePipeline::Pipeline', hasPipelineAction({
       Configuration: {
         StackName: 'AnonymousIAMAndAutoExpand',
         ActionMode: 'CHANGE_SET_REPLACE',
         Capabilities: 'CAPABILITY_IAM,CAPABILITY_AUTO_EXPAND',
-      }
+      },
     })));
     test.done();
   },
@@ -245,16 +245,16 @@ export = nodeunit.testCase({
             Action: '*',
             Effect: 'Allow',
             Resource: '*',
-          }
+          },
         ],
-      }
+      },
     }));
     expect(pipelineStack).to(haveResource('AWS::CodePipeline::Pipeline', hasPipelineAction({
       Configuration: {
         StackName: 'TestStack',
         ActionMode: 'CHANGE_SET_REPLACE',
         Capabilities: 'CAPABILITY_NAMED_IAM,CAPABILITY_AUTO_EXPAND',
-      }
+      },
     })));
     test.done();
   },
@@ -271,7 +271,7 @@ export = nodeunit.testCase({
       stack: pipelineStack,
       input: selfUpdatingStack.synthesizedApp,
       adminPermissions: false,
-      role
+      role,
     });
     selfUpdateStage.addAction(deployAction);
     test.same(deployAction.deploymentRole, role);
@@ -305,9 +305,9 @@ export = nodeunit.testCase({
         'ec2:DescribeSecurityGroups',
         'ec2:CreateSecurityGroup',
         'ec2:RevokeSecurityGroupEgress',
-        'ec2:RevokeSecurityGroupIngress'
+        'ec2:RevokeSecurityGroupIngress',
       ],
-      resources: ['*']
+      resources: ['*'],
     }));
 
     // THEN //
@@ -339,7 +339,7 @@ export = nodeunit.testCase({
                         'Arn',
                       ],
                     },
-                    '/*'
+                    '/*',
                   ],
                 ],
               },
@@ -366,7 +366,7 @@ export = nodeunit.testCase({
               'ec2:DescribeSecurityGroups',
               'ec2:CreateSecurityGroup',
               'ec2:RevokeSecurityGroupEgress',
-              'ec2:RevokeSecurityGroupIngress'
+              'ec2:RevokeSecurityGroupIngress',
             ],
             Effect: 'Allow',
             Resource: '*',
@@ -401,11 +401,11 @@ export = nodeunit.testCase({
               adminPermissions: false,
             });
           }, /Cannot deploy the stack DeployedStack because it references/);
-        }
-      )
+        },
+      ),
     );
     test.done();
-  }
+  },
 });
 
 class FakeAction implements codepipeline.IAction {

diff --git a/packages/@aws-cdk/assert/jest.ts b/packages/@aws-cdk/assert/jest.ts
@@ -41,12 +41,12 @@ expect.extend({
     if (pass) {
       return {
         pass,
-        message: () => 'Not ' + assertion.description
+        message: () => 'Not ' + assertion.description,
       };
     } else {
       return {
         pass,
-        message: () => assertion.description
+        message: () => assertion.description,
       };
     }
   },
@@ -76,7 +76,7 @@ expect.extend({
     props: HaveOutputProperties) {
 
     return applyAssertion(haveOutput(props), actual);
-  }
+  },
 });
 
 function applyAssertion(assertion: JestFriendlyAssertion<StackInspector>, actual: cxapi.CloudFormationStackArtifact | core.Stack) {

diff --git a/packages/@aws-cdk/assert/test/assertions.test.ts b/packages/@aws-cdk/assert/test/assertions.test.ts
@@ -37,8 +37,8 @@ passingExample('expect <synthStack> to match (exactly) <template>', () => {
   });
   const expected = {
     Resources: {
-      TestResource: { Type: resourceType }
-    }
+      TestResource: { Type: resourceType },
+    },
   };
   cdkExpect(synthStack).to(matchTemplate(expected, MatchStyle.EXACT));
 });
@@ -62,8 +62,8 @@ passingExample('expect <synthStack> to be a superset of <template>', () => {
   const expected = {
     Resources: {
       TestResourceA: { Type: 'Test::Resource' },
-      TestResourceB: { Type: 'Test::Resource', Properties: { Foo: 'Bar' } }
-    }
+      TestResourceB: { Type: 'Test::Resource', Properties: { Foo: 'Bar' } },
+    },
   };
   cdkExpect(synthStack).to(matchTemplate(expected, MatchStyle.SUPERSET));
 });
@@ -73,9 +73,9 @@ passingExample('sugar for matching stack to a template', () => {
   cdkExpect(stack).toMatch({
     Resources: {
       TestResource: {
-        Type: 'Test::Resource'
-      }
-    }
+        Type: 'Test::Resource',
+      },
+    },
   });
 });
 passingExample('expect <synthStack> to match (no replaces) <template> with parameters', () => {
@@ -98,8 +98,8 @@ passingExample('expect <synthStack> to be a superset of <template> with paramete
   const expected = {
     Parameters: {
       TestParameterA: { Type: 'Test::Parameter' },
-      TestParameterB: { Type: 'Test::Parameter', Default: { Foo: 'Bar' } }
-    }
+      TestParameterB: { Type: 'Test::Parameter', Default: { Foo: 'Bar' } },
+    },
   };
   cdkExpect(synthStack).to(matchTemplate(expected, MatchStyle.SUPERSET));
 });
@@ -132,8 +132,8 @@ failingExample('expect <synthStack> to match (exactly) <template>', () => {
   });
   const expected = {
     Resources: {
-      TestResource: { Type: resourceType, DependsOn: ['Something'] }
-    }
+      TestResource: { Type: resourceType, DependsOn: ['Something'] },
+    },
   };
   cdkExpect(synthStack).to(matchTemplate(expected, MatchStyle.EXACT));
 });
@@ -144,8 +144,8 @@ failingExample('expect <synthStack> to match (no replaces) <template>', () => {
   });
   const expected = {
     Resources: {
-      TestResource: { Type: 'AWS::S3::Bucket' }
-    }
+      TestResource: { Type: 'AWS::S3::Bucket' },
+    },
   };
   cdkExpect(synthStack).to(matchTemplate(expected, MatchStyle.NO_REPLACES));
 });
@@ -162,8 +162,8 @@ failingExample('expect <synthStack> to be a superset of <template>', () => {
   const expected = {
     Resources: {
       TestResourceA: { Type: 'Test::Resource' },
-      TestResourceB: { Type: 'Test::Resource', Properties: { Foo: 'Baz' } }
-    }
+      TestResourceB: { Type: 'Test::Resource', Properties: { Foo: 'Baz' } },
+    },
   };
   cdkExpect(synthStack).to(matchTemplate(expected, MatchStyle.SUPERSET));
 });
@@ -174,8 +174,8 @@ failingExample('expect <synthStack> to match (no replaces) <template> with param
   });
   const expected = {
     Parameters: {
-      TestParameter: { Type: 'AWS::S3::Bucket' }
-    }
+      TestParameter: { Type: 'AWS::S3::Bucket' },
+    },
   };
   cdkExpect(synthStack).to(matchTemplate(expected, MatchStyle.NO_REPLACES));
 });
@@ -192,8 +192,8 @@ failingExample('expect <synthStack> to be a superset of <template> with paramete
   const expected = {
     Parameters: {
       TestParameterA: { Type: 'Test::Parameter' },
-      TestParameterB: { Type: 'Test::Parameter', Default: { Foo: 'Baz' } }
-    }
+      TestParameterB: { Type: 'Test::Parameter', Default: { Foo: 'Baz' } },
+    },
   };
   cdkExpect(synthStack).to(matchTemplate(expected, MatchStyle.SUPERSET));
 });