Skip to content

Commit 11fc610

Browse files
skinny85skinny85
authored
chore(codedeploy): migrate tests to use the Assertions module (#18585)
---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent c626513 commit 11fc610

File tree

7 files changed

+62
-65
lines changed

7 files changed

+62
-65
lines changed

‎packages/@aws-cdk/aws-codedeploy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
},
8383
"license": "Apache-2.0",
8484
"devDependencies": {
85-
"@aws-cdk/assert-internal": "0.0.0",
85+
"@aws-cdk/assertions": "0.0.0",
8686
"@aws-cdk/cdk-build-tools": "0.0.0",
8787
"@aws-cdk/cdk-integ-tools": "0.0.0",
8888
"@aws-cdk/cfn2ts": "0.0.0",

‎packages/@aws-cdk/aws-codedeploy/test/ecs/application.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import '@aws-cdk/assert-internal/jest';
1+
import { Template } from '@aws-cdk/assertions';
22
import * as cdk from '@aws-cdk/core';
33
import * as codedeploy from '../../lib';
44

@@ -7,7 +7,7 @@ describe('CodeDeploy ECS Application', () => {
77
const stack = new cdk.Stack();
88
new codedeploy.EcsApplication(stack, 'MyApp');
99

10-
expect(stack).toHaveResource('AWS::CodeDeploy::Application', {
10+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::Application', {
1111
ComputePlatform: 'ECS',
1212
});
1313
});
@@ -18,7 +18,7 @@ describe('CodeDeploy ECS Application', () => {
1818
applicationName: 'my-name',
1919
});
2020

21-
expect(stack).toHaveResource('AWS::CodeDeploy::Application', {
21+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::Application', {
2222
ApplicationName: 'my-name',
2323
ComputePlatform: 'ECS',
2424
});

‎packages/@aws-cdk/aws-codedeploy/test/lambda/application.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import '@aws-cdk/assert-internal/jest';
1+
import { Template } from '@aws-cdk/assertions';
22
import * as cdk from '@aws-cdk/core';
33
import * as codedeploy from '../../lib';
44

55
describe('CodeDeploy Lambda Application', () => {
66
test('can be created', () => {
77
const stack = new cdk.Stack();
88
new codedeploy.LambdaApplication(stack, 'MyApp');
9-
expect(stack).toHaveResource('AWS::CodeDeploy::Application', {
9+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::Application', {
1010
ComputePlatform: 'Lambda',
1111
});
1212
});
@@ -16,7 +16,7 @@ describe('CodeDeploy Lambda Application', () => {
1616
new codedeploy.LambdaApplication(stack, 'MyApp', {
1717
applicationName: 'my-name',
1818
});
19-
expect(stack).toHaveResource('AWS::CodeDeploy::Application', {
19+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::Application', {
2020
ApplicationName: 'my-name',
2121
ComputePlatform: 'Lambda',
2222
});

‎packages/@aws-cdk/aws-codedeploy/test/lambda/custom-deployment-config.test.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { ResourcePart } from '@aws-cdk/assert-internal';
2-
import '@aws-cdk/assert-internal/jest';
1+
import { Template } from '@aws-cdk/assertions';
32
import * as lambda from '@aws-cdk/aws-lambda';
43
import * as cdk from '@aws-cdk/core';
54
import * as codedeploy from '../../lib';
@@ -45,7 +44,7 @@ test('custom resource created', () => {
4544
});
4645

4746
// THEN
48-
expect(stack).toHaveResourceLike('Custom::AWS', {
47+
Template.fromStack(stack).hasResourceProperties('Custom::AWS', {
4948
ServiceToken: {
5049
'Fn::GetAtt': [
5150
'AWS679f53fac002430cb0da5b7982bd22872D164C4C',
@@ -57,7 +56,7 @@ test('custom resource created', () => {
5756
Delete: '{"service":"CodeDeploy","action":"deleteDeploymentConfig","parameters":{"deploymentConfigName":"CustomConfig.LambdaCanary5Percent1Minutes"}}',
5857
});
5958

60-
expect(stack).toHaveResource('AWS::IAM::Policy', {
59+
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Policy', {
6160
PolicyDocument: {
6261
Statement: [
6362
{
@@ -91,7 +90,7 @@ test('custom resource created with specific name', () => {
9190
});
9291

9392
// THEN
94-
expect(stack).toHaveResourceLike('Custom::AWS', {
93+
Template.fromStack(stack).hasResourceProperties('Custom::AWS', {
9594
Create: '{"service":"CodeDeploy","action":"createDeploymentConfig","parameters":{"deploymentConfigName":"MyDeploymentConfig","computePlatform":"Lambda","trafficRoutingConfig":{"type":"TimeBasedCanary","timeBasedCanary":{"canaryInterval":"1","canaryPercentage":"5"}}},"physicalResourceId":{"id":"MyDeploymentConfig"}}',
9695
Update: '{"service":"CodeDeploy","action":"createDeploymentConfig","parameters":{"deploymentConfigName":"MyDeploymentConfig","computePlatform":"Lambda","trafficRoutingConfig":{"type":"TimeBasedCanary","timeBasedCanary":{"canaryInterval":"1","canaryPercentage":"5"}}},"physicalResourceId":{"id":"MyDeploymentConfig"}}',
9796
Delete: '{"service":"CodeDeploy","action":"deleteDeploymentConfig","parameters":{"deploymentConfigName":"MyDeploymentConfig"}}',
@@ -112,7 +111,7 @@ test('can create linear custom config', () => {
112111
});
113112

114113
// THEN
115-
expect(stack).toHaveResourceLike('AWS::CodeDeploy::DeploymentGroup', {
114+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::DeploymentGroup', {
116115
DeploymentConfigName: 'CustomConfig.LambdaLinear5PercentEvery1Minutes',
117116
});
118117
});
@@ -131,7 +130,7 @@ test('can create canary custom config', () => {
131130
});
132131

133132
// THEN
134-
expect(stack).toHaveResourceLike('AWS::CodeDeploy::DeploymentGroup', {
133+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::DeploymentGroup', {
135134
DeploymentConfigName: 'CustomConfig.LambdaCanary5Percent1Minutes',
136135
});
137136
});
@@ -150,13 +149,13 @@ test('dependency on the config exists to ensure ordering', () => {
150149
});
151150

152151
// THEN
153-
expect(stack).toHaveResourceLike('AWS::CodeDeploy::DeploymentGroup', {
152+
Template.fromStack(stack).hasResource('AWS::CodeDeploy::DeploymentGroup', {
154153
Properties: {
155154
DeploymentConfigName: 'CustomConfig.LambdaCanary5Percent1Minutes',
156155
},
157156
DependsOn: [
158157
'CustomConfigDeploymentConfigCustomResourcePolicy0426B684',
159158
'CustomConfigDeploymentConfigE9E1F384',
160159
],
161-
}, ResourcePart.CompleteDefinition);
160+
});
162161
});

‎packages/@aws-cdk/aws-codedeploy/test/lambda/deployment-group.test.ts

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { ResourcePart } from '@aws-cdk/assert-internal';
2-
import '@aws-cdk/assert-internal/jest';
1+
import { Template } from '@aws-cdk/assertions';
32
import * as cloudwatch from '@aws-cdk/aws-cloudwatch';
43
import * as iam from '@aws-cdk/aws-iam';
54
import * as lambda from '@aws-cdk/aws-lambda';
@@ -33,7 +32,7 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
3332
deploymentConfig: codedeploy.LambdaDeploymentConfig.ALL_AT_ONCE,
3433
});
3534

36-
expect(stack).toHaveResource('AWS::CodeDeploy::DeploymentGroup', {
35+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::DeploymentGroup', {
3736
ApplicationName: {
3837
Ref: 'MyApp3CE31C26',
3938
},
@@ -56,7 +55,7 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
5655
},
5756
});
5857

59-
expect(stack).toHaveResource('AWS::Lambda::Alias', {
58+
Template.fromStack(stack).hasResource('AWS::Lambda::Alias', {
6059
Type: 'AWS::Lambda::Alias',
6160
Properties: {
6261
FunctionName: {
@@ -80,9 +79,9 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
8079
},
8180
},
8281
},
83-
}, ResourcePart.CompleteDefinition);
82+
});
8483

85-
expect(stack).toHaveResource('AWS::IAM::Role', {
84+
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Role', {
8685
AssumeRolePolicyDocument: {
8786
Statement: [{
8887
Action: 'sts:AssumeRole',
@@ -120,7 +119,7 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
120119
deploymentGroupName: 'test',
121120
});
122121

123-
expect(stack).toHaveResourceLike('AWS::CodeDeploy::DeploymentGroup', {
122+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::DeploymentGroup', {
124123
DeploymentGroupName: 'test',
125124
});
126125
});
@@ -140,7 +139,7 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
140139
role: serviceRole,
141140
});
142141

143-
expect(stack).toHaveResource('AWS::IAM::Role', {
142+
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Role', {
144143
AssumeRolePolicyDocument: {
145144
Statement: [{
146145
Action: 'sts:AssumeRole',
@@ -176,7 +175,7 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
176175
deploymentConfig: codedeploy.LambdaDeploymentConfig.LINEAR_10PERCENT_EVERY_1MINUTE,
177176
});
178177

179-
expect(stack).toHaveResource('AWS::CodeDeploy::DeploymentGroup', {
178+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::DeploymentGroup', {
180179
ApplicationName: {
181180
Ref: 'MyApp3CE31C26',
182181
},
@@ -216,7 +215,7 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
216215
})],
217216
});
218217

219-
expect(stack).toHaveResourceLike('AWS::CodeDeploy::DeploymentGroup', {
218+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::DeploymentGroup', {
220219
AlarmConfiguration: {
221220
Alarms: [{
222221
Name: {
@@ -268,7 +267,7 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
268267
deploymentConfig: codedeploy.LambdaDeploymentConfig.ALL_AT_ONCE,
269268
});
270269

271-
expect(stack).toHaveResourceLike('AWS::Lambda::Alias', {
270+
Template.fromStack(stack).hasResource('AWS::Lambda::Alias', {
272271
UpdatePolicy: {
273272
CodeDeployLambdaAliasUpdate: {
274273
ApplicationName: {
@@ -282,9 +281,9 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
282281
},
283282
},
284283
},
285-
}, ResourcePart.CompleteDefinition);
284+
});
286285

287-
expect(stack).toHaveResource('AWS::IAM::Policy', {
286+
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Policy', {
288287
PolicyName: 'MyDGServiceRoleDefaultPolicy65E8E1EA',
289288
Roles: [{
290289
Ref: 'MyDGServiceRole5E94FD88',
@@ -316,7 +315,7 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
316315
});
317316
group.addPreHook(mockFunction(stack, 'PreHook'));
318317

319-
expect(stack).toHaveResourceLike('AWS::Lambda::Alias', {
318+
Template.fromStack(stack).hasResource('AWS::Lambda::Alias', {
320319
UpdatePolicy: {
321320
CodeDeployLambdaAliasUpdate: {
322321
ApplicationName: {
@@ -330,9 +329,9 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
330329
},
331330
},
332331
},
333-
}, ResourcePart.CompleteDefinition);
332+
});
334333

335-
expect(stack).toHaveResource('AWS::IAM::Policy', {
334+
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Policy', {
336335
PolicyName: 'MyDGServiceRoleDefaultPolicy65E8E1EA',
337336
Roles: [{
338337
Ref: 'MyDGServiceRole5E94FD88',
@@ -364,7 +363,7 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
364363
deploymentConfig: codedeploy.LambdaDeploymentConfig.ALL_AT_ONCE,
365364
});
366365

367-
expect(stack).toHaveResourceLike('AWS::Lambda::Alias', {
366+
Template.fromStack(stack).hasResource('AWS::Lambda::Alias', {
368367
UpdatePolicy: {
369368
CodeDeployLambdaAliasUpdate: {
370369
ApplicationName: {
@@ -378,9 +377,9 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
378377
},
379378
},
380379
},
381-
}, ResourcePart.CompleteDefinition);
380+
});
382381

383-
expect(stack).toHaveResource('AWS::IAM::Policy', {
382+
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Policy', {
384383
PolicyName: 'MyDGServiceRoleDefaultPolicy65E8E1EA',
385384
Roles: [{
386385
Ref: 'MyDGServiceRole5E94FD88',
@@ -412,7 +411,7 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
412411
});
413412
group.addPostHook(mockFunction(stack, 'PostHook'));
414413

415-
expect(stack).toHaveResourceLike('AWS::Lambda::Alias', {
414+
Template.fromStack(stack).hasResource('AWS::Lambda::Alias', {
416415
UpdatePolicy: {
417416
CodeDeployLambdaAliasUpdate: {
418417
ApplicationName: {
@@ -426,9 +425,9 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
426425
},
427426
},
428427
},
429-
}, ResourcePart.CompleteDefinition);
428+
});
430429

431-
expect(stack).toHaveResource('AWS::IAM::Policy', {
430+
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Policy', {
432431
PolicyName: 'MyDGServiceRoleDefaultPolicy65E8E1EA',
433432
Roles: [{
434433
Ref: 'MyDGServiceRole5E94FD88',
@@ -467,7 +466,7 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
467466
})],
468467
});
469468

470-
expect(stack).toHaveResourceLike('AWS::CodeDeploy::DeploymentGroup', {
469+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::DeploymentGroup', {
471470
AlarmConfiguration: {
472471
Alarms: [{
473472
Name: {
@@ -494,7 +493,7 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
494493
},
495494
});
496495

497-
expect(stack).toHaveResource('AWS::CodeDeploy::DeploymentGroup', {
496+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::DeploymentGroup', {
498497
ApplicationName: {
499498
Ref: 'MyApp3CE31C26',
500499
},
@@ -526,7 +525,7 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
526525
},
527526
});
528527

529-
expect(stack).toHaveResourceLike('AWS::CodeDeploy::DeploymentGroup', {
528+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::DeploymentGroup', {
530529
AutoRollbackConfiguration: {
531530
Enabled: true,
532531
Events: [
@@ -557,7 +556,7 @@ describe('CodeDeploy Lambda DeploymentGroup', () => {
557556
})],
558557
});
559558

560-
expect(stack).toHaveResourceLike('AWS::CodeDeploy::DeploymentGroup', {
559+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::DeploymentGroup', {
561560
AutoRollbackConfiguration: {
562561
Enabled: true,
563562
Events: [

‎packages/@aws-cdk/aws-codedeploy/test/server/deployment-config.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import '@aws-cdk/assert-internal/jest';
1+
import { Template } from '@aws-cdk/assertions';
22
import * as cdk from '@aws-cdk/core';
33
import * as codedeploy from '../../lib';
44

@@ -12,7 +12,7 @@ describe('CodeDeploy DeploymentConfig', () => {
1212
minimumHealthyHosts: codedeploy.MinimumHealthyHosts.count(1),
1313
});
1414

15-
expect(stack).toHaveResource('AWS::CodeDeploy::DeploymentConfig', {
15+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::DeploymentConfig', {
1616
'MinimumHealthyHosts': {
1717
'Type': 'HOST_COUNT',
1818
'Value': 1,
@@ -27,7 +27,7 @@ describe('CodeDeploy DeploymentConfig', () => {
2727
minimumHealthyHosts: codedeploy.MinimumHealthyHosts.percentage(75),
2828
});
2929

30-
expect(stack).toHaveResource('AWS::CodeDeploy::DeploymentConfig', {
30+
Template.fromStack(stack).hasResourceProperties('AWS::CodeDeploy::DeploymentConfig', {
3131
'MinimumHealthyHosts': {
3232
'Type': 'FLEET_PERCENT',
3333
'Value': 75,

0 commit comments

Comments
 (0)