chore(deps): Update aws-cdk from 1.52.0 to 1.57.0 (#49)

Updated unit tests which changed object IDs Updated unit tests which changed the default stack ID Updated unit test which mocked an object that creates a lambda to not require a mock.
aws · Aug 11, 2020 · dfbb1c0 · dfbb1c0
1 parent 0685e71
commit dfbb1c0
Show file tree

Hide file tree

Showing 9 changed files with 764 additions and 810 deletions.
diff --git a/examples/kitchen-sink/package.json b/examples/kitchen-sink/package.json
@@ -64,43 +64,43 @@
  "typescript": "~3.9.6"
  },
  "dependencies": {
- "@aws-cdk/aws-cloudwatch": "1.52.0",
- "@aws-cdk/aws-codeguruprofiler": "1.52.0",
- "@aws-cdk/aws-docdb": "1.52.0",
- "@aws-cdk/aws-ec2": "1.52.0",
- "@aws-cdk/aws-efs": "1.52.0",
- "@aws-cdk/aws-events": "1.52.0",
- "@aws-cdk/aws-iam": "1.52.0",
- "@aws-cdk/aws-kms": "1.52.0",
- "@aws-cdk/aws-lambda": "1.52.0",
- "@aws-cdk/aws-logs": "1.52.0",
- "@aws-cdk/aws-s3": "1.52.0",
- "@aws-cdk/aws-sqs": "1.52.0",
- "@aws-cdk/aws-ssm": "1.52.0",
- "@aws-cdk/core": "1.52.0",
- "@aws-cdk/cx-api": "1.52.0",
- "@aws-cdk/region-info": "1.52.0",
- "aws-cdk": "1.52.0",
+ "@aws-cdk/aws-cloudwatch": "1.57.0",
+ "@aws-cdk/aws-codeguruprofiler": "1.57.0",
+ "@aws-cdk/aws-docdb": "1.57.0",
+ "@aws-cdk/aws-ec2": "1.57.0",
+ "@aws-cdk/aws-efs": "1.57.0",
+ "@aws-cdk/aws-events": "1.57.0",
+ "@aws-cdk/aws-iam": "1.57.0",
+ "@aws-cdk/aws-kms": "1.57.0",
+ "@aws-cdk/aws-lambda": "1.57.0",
+ "@aws-cdk/aws-logs": "1.57.0",
+ "@aws-cdk/aws-s3": "1.57.0",
+ "@aws-cdk/aws-sqs": "1.57.0",
+ "@aws-cdk/aws-ssm": "1.57.0",
+ "@aws-cdk/core": "1.57.0",
+ "@aws-cdk/cx-api": "1.57.0",
+ "@aws-cdk/region-info": "1.57.0",
+ "aws-cdk": "1.57.0",
  "aws-rfdk": "0.15.0"
  },
  "peerDependencies": {
- "@aws-cdk/aws-cloudwatch": "1.52.0",
- "@aws-cdk/aws-codeguruprofiler": "1.52.0",
- "@aws-cdk/aws-docdb": "1.52.0",
- "@aws-cdk/aws-ec2": "1.52.0",
- "@aws-cdk/aws-efs": "1.52.0",
- "@aws-cdk/aws-events": "1.52.0",
- "@aws-cdk/aws-iam": "1.52.0",
- "@aws-cdk/aws-kms": "1.52.0",
- "@aws-cdk/aws-lambda": "1.52.0",
- "@aws-cdk/aws-logs": "1.52.0",
- "@aws-cdk/aws-s3": "1.52.0",
- "@aws-cdk/aws-sqs": "1.52.0",
- "@aws-cdk/aws-ssm": "1.52.0",
- "@aws-cdk/core": "1.52.0",
- "@aws-cdk/cx-api": "1.52.0",
- "@aws-cdk/region-info": "1.52.0",
- "aws-cdk": "1.52.0",
+ "@aws-cdk/aws-cloudwatch": "1.57.0",
+ "@aws-cdk/aws-codeguruprofiler": "1.57.0",
+ "@aws-cdk/aws-docdb": "1.57.0",
+ "@aws-cdk/aws-ec2": "1.57.0",
+ "@aws-cdk/aws-efs": "1.57.0",
+ "@aws-cdk/aws-events": "1.57.0",
+ "@aws-cdk/aws-iam": "1.57.0",
+ "@aws-cdk/aws-kms": "1.57.0",
+ "@aws-cdk/aws-lambda": "1.57.0",
+ "@aws-cdk/aws-logs": "1.57.0",
+ "@aws-cdk/aws-s3": "1.57.0",
+ "@aws-cdk/aws-sqs": "1.57.0",
+ "@aws-cdk/aws-ssm": "1.57.0",
+ "@aws-cdk/core": "1.57.0",
+ "@aws-cdk/cx-api": "1.57.0",
+ "@aws-cdk/region-info": "1.57.0",
+ "aws-cdk": "1.57.0",
  "aws-rfdk": "0.15.0"
  },
  "engines": {

diff --git a/integ/package.json b/integ/package.json
@@ -54,12 +54,12 @@
  "pkglint": "pkglint -f"
  },
  "devDependencies": {
- "@aws-cdk/assert": "1.52.0",
+ "@aws-cdk/assert": "1.57.0",
  "@types/jest": "^26.0.4",
  "@types/node": "^14.0.14",
  "@typescript-eslint/eslint-plugin": "^3.5.0",
  "@typescript-eslint/parser": "^3.5.0",
- "aws-cdk": "1.52.0",
+ "aws-cdk": "1.57.0",
  "eslint": "^7.4.0",
  "eslint-import-resolver-node": "^0.3.4",
  "eslint-import-resolver-typescript": "^2.0.0",
@@ -70,30 +70,30 @@
  "ts-jest": "^26.1.3"
  },
  "dependencies": {
- "@aws-cdk/aws-route53": "1.52.0",
- "@aws-cdk/aws-docdb": "1.52.0",
- "@aws-cdk/aws-ec2": "1.52.0",
- "@aws-cdk/aws-efs": "1.52.0",
- "@aws-cdk/aws-elasticloadbalancingv2": "1.52.0",
- "@aws-cdk/aws-iam": "1.52.0",
- "@aws-cdk/aws-logs": "1.52.0",
- "@aws-cdk/aws-s3": "1.52.0",
- "@aws-cdk/aws-s3-assets": "1.52.0",
- "@aws-cdk/core": "1.52.0",
+ "@aws-cdk/aws-route53": "1.57.0",
+ "@aws-cdk/aws-docdb": "1.57.0",
+ "@aws-cdk/aws-ec2": "1.57.0",
+ "@aws-cdk/aws-efs": "1.57.0",
+ "@aws-cdk/aws-elasticloadbalancingv2": "1.57.0",
+ "@aws-cdk/aws-iam": "1.57.0",
+ "@aws-cdk/aws-logs": "1.57.0",
+ "@aws-cdk/aws-s3": "1.57.0",
+ "@aws-cdk/aws-s3-assets": "1.57.0",
+ "@aws-cdk/core": "1.57.0",
  "aws-rfdk": "0.15.0",
  "aws-sdk": "^2.709.0"
  },
  "peerDependencies": {
- "@aws-cdk/aws-route53": "1.52.0",
- "@aws-cdk/aws-docdb": "1.52.0",
- "@aws-cdk/aws-ec2": "1.52.0",
- "@aws-cdk/aws-efs": "1.52.0",
- "@aws-cdk/aws-elasticloadbalancingv2": "1.52.0",
- "@aws-cdk/aws-iam": "1.52.0",
- "@aws-cdk/aws-logs": "1.52.0",
- "@aws-cdk/aws-s3": "1.52.0",
- "@aws-cdk/aws-s3-assets": "1.52.0",
- "@aws-cdk/core": "1.52.0",
+ "@aws-cdk/aws-route53": "1.57.0",
+ "@aws-cdk/aws-docdb": "1.57.0",
+ "@aws-cdk/aws-ec2": "1.57.0",
+ "@aws-cdk/aws-efs": "1.57.0",
+ "@aws-cdk/aws-elasticloadbalancingv2": "1.57.0",
+ "@aws-cdk/aws-iam": "1.57.0",
+ "@aws-cdk/aws-logs": "1.57.0",
+ "@aws-cdk/aws-s3": "1.57.0",
+ "@aws-cdk/aws-s3-assets": "1.57.0",
+ "@aws-cdk/core": "1.57.0",
  "aws-rfdk": "0.15.0",
  "aws-sdk": "^2.709.0"
  },

diff --git a/package.json b/package.json
@@ -31,61 +31,61 @@
  }
  },
  "devDependencies": {
- "@aws-cdk/assets": "1.52.0",
- "@aws-cdk/aws-apigateway": "1.52.0",
- "@aws-cdk/aws-applicationautoscaling": "1.52.0",
- "@aws-cdk/aws-autoscaling": "1.52.0",
- "@aws-cdk/aws-autoscaling-common": "1.52.0",
- "@aws-cdk/aws-autoscaling-hooktargets": "1.52.0",
- "@aws-cdk/aws-batch": "1.52.0",
- "@aws-cdk/aws-certificatemanager": "1.52.0",
- "@aws-cdk/aws-cloudformation": "1.52.0",
- "@aws-cdk/aws-cloudfront": "1.52.0",
- "@aws-cdk/aws-cloudwatch": "1.52.0",
- "@aws-cdk/aws-cloudwatch-actions": "1.52.0",
- "@aws-cdk/aws-codebuild": "1.52.0",
- "@aws-cdk/aws-codecommit": "1.52.0",
- "@aws-cdk/aws-codeguruprofiler": "1.52.0",
- "@aws-cdk/aws-codepipeline": "1.52.0",
- "@aws-cdk/aws-cognito": "1.52.0",
- "@aws-cdk/aws-docdb": "1.52.0",
- "@aws-cdk/aws-dynamodb": "1.52.0",
- "@aws-cdk/aws-ec2": "1.52.0",
- "@aws-cdk/aws-ecr": "1.52.0",
- "@aws-cdk/aws-ecr-assets": "1.52.0",
- "@aws-cdk/aws-ecs": "1.52.0",
- "@aws-cdk/aws-ecs-patterns": "1.52.0",
- "@aws-cdk/aws-efs": "1.52.0",
- "@aws-cdk/aws-elasticloadbalancing": "1.52.0",
- "@aws-cdk/aws-elasticloadbalancingv2": "1.52.0",
- "@aws-cdk/aws-events": "1.52.0",
- "@aws-cdk/aws-events-targets": "1.52.0",
- "@aws-cdk/aws-iam": "1.52.0",
- "@aws-cdk/aws-kinesis": "1.52.0",
- "@aws-cdk/aws-kms": "1.52.0",
- "@aws-cdk/aws-lambda": "1.52.0",
- "@aws-cdk/aws-logs": "1.52.0",
- "@aws-cdk/aws-route53": "1.52.0",
- "@aws-cdk/aws-route53-targets": "1.52.0",
- "@aws-cdk/aws-s3": "1.52.0",
- "@aws-cdk/aws-s3-assets": "1.52.0",
- "@aws-cdk/aws-sam": "1.52.0",
- "@aws-cdk/aws-secretsmanager": "1.52.0",
- "@aws-cdk/aws-servicediscovery": "1.52.0",
- "@aws-cdk/aws-sns": "1.52.0",
- "@aws-cdk/aws-sns-subscriptions": "1.52.0",
- "@aws-cdk/aws-sqs": "1.52.0",
- "@aws-cdk/aws-ssm": "1.52.0",
- "@aws-cdk/aws-stepfunctions": "1.52.0",
- "@aws-cdk/cloud-assembly-schema": "1.52.0",
- "@aws-cdk/core": "1.52.0",
- "@aws-cdk/custom-resources": "1.52.0",
- "@aws-cdk/cx-api": "1.52.0",
- "@aws-cdk/region-info": "1.52.0",
+ "@aws-cdk/assets": "1.57.0",
+ "@aws-cdk/aws-apigateway": "1.57.0",
+ "@aws-cdk/aws-applicationautoscaling": "1.57.0",
+ "@aws-cdk/aws-autoscaling": "1.57.0",
+ "@aws-cdk/aws-autoscaling-common": "1.57.0",
+ "@aws-cdk/aws-autoscaling-hooktargets": "1.57.0",
+ "@aws-cdk/aws-batch": "1.57.0",
+ "@aws-cdk/aws-certificatemanager": "1.57.0",
+ "@aws-cdk/aws-cloudformation": "1.57.0",
+ "@aws-cdk/aws-cloudfront": "1.57.0",
+ "@aws-cdk/aws-cloudwatch": "1.57.0",
+ "@aws-cdk/aws-cloudwatch-actions": "1.57.0",
+ "@aws-cdk/aws-codebuild": "1.57.0",
+ "@aws-cdk/aws-codecommit": "1.57.0",
+ "@aws-cdk/aws-codeguruprofiler": "1.57.0",
+ "@aws-cdk/aws-codepipeline": "1.57.0",
+ "@aws-cdk/aws-cognito": "1.57.0",
+ "@aws-cdk/aws-docdb": "1.57.0",
+ "@aws-cdk/aws-dynamodb": "1.57.0",
+ "@aws-cdk/aws-ec2": "1.57.0",
+ "@aws-cdk/aws-ecr": "1.57.0",
+ "@aws-cdk/aws-ecr-assets": "1.57.0",
+ "@aws-cdk/aws-ecs": "1.57.0",
+ "@aws-cdk/aws-ecs-patterns": "1.57.0",
+ "@aws-cdk/aws-efs": "1.57.0",
+ "@aws-cdk/aws-elasticloadbalancing": "1.57.0",
+ "@aws-cdk/aws-elasticloadbalancingv2": "1.57.0",
+ "@aws-cdk/aws-events": "1.57.0",
+ "@aws-cdk/aws-events-targets": "1.57.0",
+ "@aws-cdk/aws-iam": "1.57.0",
+ "@aws-cdk/aws-kinesis": "1.57.0",
+ "@aws-cdk/aws-kms": "1.57.0",
+ "@aws-cdk/aws-lambda": "1.57.0",
+ "@aws-cdk/aws-logs": "1.57.0",
+ "@aws-cdk/aws-route53": "1.57.0",
+ "@aws-cdk/aws-route53-targets": "1.57.0",
+ "@aws-cdk/aws-s3": "1.57.0",
+ "@aws-cdk/aws-s3-assets": "1.57.0",
+ "@aws-cdk/aws-sam": "1.57.0",
+ "@aws-cdk/aws-secretsmanager": "1.57.0",
+ "@aws-cdk/aws-servicediscovery": "1.57.0",
+ "@aws-cdk/aws-sns": "1.57.0",
+ "@aws-cdk/aws-sns-subscriptions": "1.57.0",
+ "@aws-cdk/aws-sqs": "1.57.0",
+ "@aws-cdk/aws-ssm": "1.57.0",
+ "@aws-cdk/aws-stepfunctions": "1.57.0",
+ "@aws-cdk/cloud-assembly-schema": "1.57.0",
+ "@aws-cdk/core": "1.57.0",
+ "@aws-cdk/custom-resources": "1.57.0",
+ "@aws-cdk/cx-api": "1.57.0",
+ "@aws-cdk/region-info": "1.57.0",
  "@types/jest": "^26.0.4",
  "@types/node": "^14.0.14",
  "@types/nodeunit": "^0.0.31",
- "aws-cdk": "1.52.0",
+ "aws-cdk": "1.57.0",
  "aws-sdk": "^2.709.0",
  "constructs": "^3.0.2",
  "conventional-changelog-cli": "^2.0.34",

diff --git a/packages/aws-rfdk/lib/core/test/imported-acm-certificate.test.ts b/packages/aws-rfdk/lib/core/test/imported-acm-certificate.test.ts
@@ -51,12 +51,12 @@ test('Import cert', () => {
  },
  Tags: [
  {
- Key: 'AcmCertImport-0EE07670',
- Value: '0ee0767063596bd478fd58f232ff43f0',
+ Key: 'AcmCertImport-F4E2ABF9',
+ Value: 'f4e2abf974443234fdb095fafcfa9ee2',
  },
  {
  Key: 'Name',
- Value: '0ee0767063596bd478fd58f232ff43f0',
+ Value: 'f4e2abf974443234fdb095fafcfa9ee2',
  },
  ],
  }));
@@ -121,7 +121,7 @@ test('Import cert', () => {
  ],
  Condition: {
  StringEquals: {
- 'aws:RequestTag/AcmCertImport-0EE07670': '0ee0767063596bd478fd58f232ff43f0',
+ 'aws:RequestTag/AcmCertImport-F4E2ABF9': 'f4e2abf974443234fdb095fafcfa9ee2',
  },
  },
  Resource: '*',

diff --git a/packages/aws-rfdk/lib/core/test/x509-certificate.test.ts b/packages/aws-rfdk/lib/core/test/x509-certificate.test.ts
@@ -81,7 +81,7 @@ test('Generate cert', () => {
  ],
  Condition: {
  StringEquals: {
- 'secretsmanager:ResourceTag/X509SecretGrant-B2B09A60': 'b2b09a6086e87fe14005f4e0b800e4f0',
+ 'secretsmanager:ResourceTag/X509SecretGrant-F53F5427': 'f53f5427b2e9eb4739661fcc0b249b6e',
  },
  },
  },
@@ -478,8 +478,8 @@ test('Convert to PKCS #12', () => {
  Ref: 'CertPkcs12Passphrase1E3DF360',
  },
  Secret: {
- NamePrefix: 'CertPkcs12',
- Description: 'CertPkcs12',
+ NamePrefix: 'Default/CertPkcs12',
+ Description: 'Default/CertPkcs12',
  Tags: [
  {
  Key: 'X509SecretGrant-71090F78',
@@ -626,8 +626,8 @@ test('Convert to PKCS #12, use KMS', () => {
  Ref: 'CertPkcs12Passphrase1E3DF360',
  },
  Secret: {
- NamePrefix: 'CertPkcs12',
- Description: 'CertPkcs12',
+ NamePrefix: 'Default/CertPkcs12',
+ Description: 'Default/CertPkcs12',
  Tags: [
  {
  Key: 'X509SecretGrant-71090F78',

diff --git a/packages/aws-rfdk/lib/deadline/test/render-queue.test.ts b/packages/aws-rfdk/lib/deadline/test/render-queue.test.ts
@@ -49,13 +49,10 @@ import { Secret } from '@aws-cdk/aws-secretsmanager';
 import {
  App,
  CfnElement,
- Construct,
  Stack,
 } from '@aws-cdk/core';
 
 import {
- LogGroupFactory,
- LogGroupFactoryProps,
  X509CertificatePem,
 } from '../..';
 import {
@@ -145,54 +142,11 @@ describe('RenderQueue', () => {
  });
 
  test('creates a log group with default prefix of "/renderfarm/"', () => {
- // GIVEN
- function mockLogGroupFactory() {
- jest.resetModules();
-
- class MockLogGroupFactory extends LogGroupFactory {
- public static readonly createOrFetchSpy = jest.fn();
-
- public static createOrFetch(scope: Construct, id: string, logGroupName: string, props: LogGroupFactoryProps) {
- this.createOrFetchSpy(scope, id, logGroupName, props);
-
- return LogGroupFactory.createOrFetch(scope, id, logGroupName, props);
- }
- }
-
- jest.mock('../../core', () => {
- const rfdk = jest.requireActual('../../core');
-
- return {
- ...rfdk,
- LogGroupFactory: MockLogGroupFactory,
- };
- });
-
- return {
- MockLogGroupFactory: require('../../core').LogGroupFactory as typeof MockLogGroupFactory, // eslint-disable-line
- RenderQueue: require('../lib').RenderQueue as typeof RenderQueue, // eslint-disable-line
- };
- }
- const mockModules = mockLogGroupFactory();
- const cleanStack = new Stack(app, 'CleanStack');
-
- // WHEN
- new mockModules.RenderQueue(cleanStack, 'RenderQueue', {
- images,
- repository,
- version,
- vpc,
- });
-
  // THEN
- expect(mockModules.MockLogGroupFactory.createOrFetchSpy).toHaveBeenCalledWith(
- expect.anything(),
- expect.stringContaining(''),
- expect.stringContaining(''),
- expect.objectContaining({
- logGroupPrefix: '/renderfarm/',
- }),
- );
+ expectCDK(stack).to(haveResourceLike('Custom::LogRetention', {
+ LogGroupName: '/renderfarm/RenderQueueCommon',
+ RetentionInDays: 3,
+ }));
  });
 
  test('configure the container log driver', () => {

diff --git a/packages/aws-rfdk/lib/deadline/test/repository.test.ts b/packages/aws-rfdk/lib/deadline/test/repository.test.ts
@@ -811,7 +811,7 @@ test('validate instance self-termination', () => {
  });
 
  // THEN
- const expectedString = 'function exitTrap(){\nexitCode=$?\nsleep 1m\nINSTANCE=\"$(curl http://169.254.169.254/latest/meta-data/instance-id)\"\nASG=\"$(aws --region ${Token[AWS::Region.4]} ec2 describe-tags --filters \"Name=resource-id,Values=${INSTANCE}\" \"Name=key,Values=aws:autoscaling:groupName\" --query \"Tags[0].Value\" --output text)\"\naws --region ${Token[AWS::Region.4]} autoscaling update-auto-scaling-group --auto-scaling-group-name ${ASG} --min-size 0 --max-size 0 --desired-capacity 0\n/opt/aws/bin/cfn-signal --stack Stack --resource repositoryInstallerASG7A08DC6A --region ${Token[AWS::Region.4]} -e $exitCode || echo \'Failed to send Cloudformation Signal\'\n}';
+ const expectedString = 'function exitTrap(){\nexitCode=$?\nsleep 1m\nINSTANCE=\"$(curl http://169.254.169.254/latest/meta-data/instance-id)\"\nASG=\"$(aws --region ${Token[AWS::Region.4]} ec2 describe-tags --filters \"Name=resource-id,Values=${INSTANCE}\" \"Name=key,Values=aws:autoscaling:groupName\" --query \"Tags[0].Value\" --output text)\"\naws --region ${Token[AWS::Region.4]} autoscaling update-auto-scaling-group --auto-scaling-group-name ${ASG} --min-size 0 --max-size 0 --desired-capacity 0\n/opt/aws/bin/cfn-signal --stack Default --resource repositoryInstallerASG7A08DC6A --region ${Token[AWS::Region.4]} -e $exitCode || echo \'Failed to send Cloudformation Signal\'\n}';
  expect((repo.node.defaultChild as AutoScalingGroup).userData.render()).toMatch(expectedString);
  expectCDK(stack).to(haveResourceLike('AWS::IAM::Policy', {
  PolicyDocument: {