Skip to content

Commit 7a20f29

Browse files
otaviomacedootaviomacedo
authored
chore(eks-legacy): migrate tests to assertions (#18596)
---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 0e08eeb commit 7a20f29

File tree

5 files changed

+35
-35
lines changed

5 files changed

+35
-35
lines changed

‎packages/@aws-cdk/aws-eks-legacy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
},
7878
"license": "Apache-2.0",
7979
"devDependencies": {
80-
"@aws-cdk/assert-internal": "0.0.0",
80+
"@aws-cdk/assertions": "0.0.0",
8181
"@aws-cdk/cdk-build-tools": "0.0.0",
8282
"@aws-cdk/cdk-integ-tools": "0.0.0",
8383
"@aws-cdk/cfn2ts": "0.0.0",

‎packages/@aws-cdk/aws-eks-legacy/test/awsauth.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import '@aws-cdk/assert-internal/jest';
2-
import { describeDeprecated } from '@aws-cdk/cdk-build-tools';
1+
import { Template } from '@aws-cdk/assertions';
32
import * as iam from '@aws-cdk/aws-iam';
3+
import { describeDeprecated } from '@aws-cdk/cdk-build-tools';
44
import { Cluster, KubernetesResource } from '../lib';
55
import { AwsAuth } from '../lib/aws-auth';
66
import { testFixtureNoVpc } from './util';
@@ -17,7 +17,7 @@ describeDeprecated('awsauth', () => {
1717
new AwsAuth(stack, 'AwsAuth', { cluster });
1818

1919
// THEN
20-
expect(stack).toHaveResource(KubernetesResource.RESOURCE_TYPE, {
20+
Template.fromStack(stack).hasResourceProperties(KubernetesResource.RESOURCE_TYPE, {
2121
Manifest: JSON.stringify([{
2222
apiVersion: 'v1',
2323
kind: 'ConfigMap',
@@ -44,8 +44,8 @@ describeDeprecated('awsauth', () => {
4444
cluster.awsAuth.addAccount('5566776655');
4545

4646
// THEN
47-
expect(stack).toCountResources(KubernetesResource.RESOURCE_TYPE, 1);
48-
expect(stack).toHaveResource(KubernetesResource.RESOURCE_TYPE, {
47+
Template.fromStack(stack).resourceCountIs(KubernetesResource.RESOURCE_TYPE, 1);
48+
Template.fromStack(stack).hasResourceProperties(KubernetesResource.RESOURCE_TYPE, {
4949
Manifest: {
5050
'Fn::Join': [
5151
'',
@@ -106,7 +106,7 @@ describeDeprecated('awsauth', () => {
106106
cluster.awsAuth.addUserMapping(user, { groups: ['group2'] });
107107

108108
// THEN
109-
expect(stack).toHaveResource(KubernetesResource.RESOURCE_TYPE, {
109+
Template.fromStack(stack).hasResourceProperties(KubernetesResource.RESOURCE_TYPE, {
110110
Manifest: {
111111
'Fn::Join': [
112112
'',

‎packages/@aws-cdk/aws-eks-legacy/test/cluster.test.ts

Lines changed: 21 additions & 21 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 ec2 from '@aws-cdk/aws-ec2';
33
import * as iam from '@aws-cdk/aws-iam';
44
import { describeDeprecated } from '@aws-cdk/cdk-build-tools';
@@ -18,7 +18,7 @@ describeDeprecated('cluster', () => {
1818
new eks.Cluster(stack, 'Cluster', { vpc, kubectlEnabled: false, defaultCapacity: 0 });
1919

2020
// THEN
21-
expect(stack).toHaveResourceLike('AWS::EKS::Cluster', {
21+
Template.fromStack(stack).hasResourceProperties('AWS::EKS::Cluster', {
2222
ResourcesVpcConfig: {
2323
SubnetIds: [
2424
{ Ref: 'VPCPublicSubnet1SubnetB4246D30' },
@@ -40,7 +40,7 @@ describeDeprecated('cluster', () => {
4040
new eks.Cluster(stack, 'cluster');
4141

4242
// THEN
43-
expect(stack).toHaveResource('AWS::EC2::VPC');
43+
Template.fromStack(stack).resourceCountIs('AWS::EC2::VPC', 1);
4444

4545
});
4646

@@ -55,8 +55,8 @@ describeDeprecated('cluster', () => {
5555

5656
// THEN
5757
expect(cluster.defaultCapacity).toBeDefined();
58-
expect(stack).toHaveResource('AWS::AutoScaling::AutoScalingGroup', { DesiredCapacity: '2' });
59-
expect(stack).toHaveResource('AWS::AutoScaling::LaunchConfiguration', { InstanceType: 'm5.large' });
58+
Template.fromStack(stack).hasResourceProperties('AWS::AutoScaling::AutoScalingGroup', { DesiredCapacity: '2' });
59+
Template.fromStack(stack).hasResourceProperties('AWS::AutoScaling::LaunchConfiguration', { InstanceType: 'm5.large' });
6060

6161
});
6262

@@ -72,8 +72,8 @@ describeDeprecated('cluster', () => {
7272

7373
// THEN
7474
expect(cluster.defaultCapacity).toBeDefined();
75-
expect(stack).toHaveResource('AWS::AutoScaling::AutoScalingGroup', { DesiredCapacity: '10' });
76-
expect(stack).toHaveResource('AWS::AutoScaling::LaunchConfiguration', { InstanceType: 'm2.xlarge' });
75+
Template.fromStack(stack).hasResourceProperties('AWS::AutoScaling::AutoScalingGroup', { DesiredCapacity: '10' });
76+
Template.fromStack(stack).hasResourceProperties('AWS::AutoScaling::LaunchConfiguration', { InstanceType: 'm2.xlarge' });
7777

7878
});
7979

@@ -86,8 +86,8 @@ describeDeprecated('cluster', () => {
8686

8787
// THEN
8888
expect(cluster.defaultCapacity).toBeUndefined();
89-
expect(stack).not.toHaveResource('AWS::AutoScaling::AutoScalingGroup');
90-
expect(stack).not.toHaveResource('AWS::AutoScaling::LaunchConfiguration');
89+
Template.fromStack(stack).resourceCountIs('AWS::AutoScaling::AutoScalingGroup', 0);
90+
Template.fromStack(stack).resourceCountIs('AWS::AutoScaling::LaunchConfiguration', 0);
9191

9292
});
9393
});
@@ -100,7 +100,7 @@ describeDeprecated('cluster', () => {
100100
new eks.Cluster(stack, 'Cluster', { vpc, kubectlEnabled: false, defaultCapacity: 0 });
101101

102102
// THEN
103-
expect(stack).toHaveResource('AWS::EC2::Subnet', {
103+
Template.fromStack(stack).hasResourceProperties('AWS::EC2::Subnet', {
104104
Tags: [
105105
{ Key: 'aws-cdk:subnet-name', Value: 'Private' },
106106
{ Key: 'aws-cdk:subnet-type', Value: 'Private' },
@@ -120,7 +120,7 @@ describeDeprecated('cluster', () => {
120120
new eks.Cluster(stack, 'Cluster', { vpc, kubectlEnabled: false, defaultCapacity: 0 });
121121

122122
// THEN
123-
expect(stack).toHaveResource('AWS::EC2::Subnet', {
123+
Template.fromStack(stack).hasResourceProperties('AWS::EC2::Subnet', {
124124
MapPublicIpOnLaunch: true,
125125
Tags: [
126126
{ Key: 'aws-cdk:subnet-name', Value: 'Public' },
@@ -144,7 +144,7 @@ describeDeprecated('cluster', () => {
144144
});
145145

146146
// THEN
147-
expect(stack).toHaveResource('AWS::AutoScaling::AutoScalingGroup', {
147+
Template.fromStack(stack).hasResourceProperties('AWS::AutoScaling::AutoScalingGroup', {
148148
Tags: [
149149
{
150150
Key: { 'Fn::Join': ['', ['kubernetes.io/cluster/', { Ref: 'ClusterEB0386A7' }]] },
@@ -182,7 +182,7 @@ describeDeprecated('cluster', () => {
182182
new cdk.CfnOutput(stack2, 'ClusterARN', { value: imported.clusterArn });
183183

184184
// THEN
185-
expect(stack2).toMatchTemplate({
185+
Template.fromStack(stack2).templateMatches({
186186
Outputs: {
187187
ClusterARN: {
188188
Value: {
@@ -216,7 +216,7 @@ describeDeprecated('cluster', () => {
216216
new eks.Cluster(stack, 'Cluster', { vpc, mastersRole: role, defaultCapacity: 0 });
217217

218218
// THEN
219-
expect(stack).toHaveResource(eks.KubernetesResource.RESOURCE_TYPE, {
219+
Template.fromStack(stack).hasResourceProperties(eks.KubernetesResource.RESOURCE_TYPE, {
220220
Manifest: {
221221
'Fn::Join': [
222222
'',
@@ -247,11 +247,11 @@ describeDeprecated('cluster', () => {
247247
cluster.addResource('manifest2', { bar: 123 }, { boor: [1, 2, 3] });
248248

249249
// THEN
250-
expect(stack).toHaveResource(eks.KubernetesResource.RESOURCE_TYPE, {
250+
Template.fromStack(stack).hasResourceProperties(eks.KubernetesResource.RESOURCE_TYPE, {
251251
Manifest: '[{"foo":123}]',
252252
});
253253

254-
expect(stack).toHaveResource(eks.KubernetesResource.RESOURCE_TYPE, {
254+
Template.fromStack(stack).hasResourceProperties(eks.KubernetesResource.RESOURCE_TYPE, {
255255
Manifest: '[{"bar":123},{"boor":[1,2,3]}]',
256256
});
257257

@@ -269,7 +269,7 @@ describeDeprecated('cluster', () => {
269269
});
270270

271271
// THEN
272-
expect(stack).toHaveResource(eks.KubernetesResource.RESOURCE_TYPE, {
272+
Template.fromStack(stack).hasResourceProperties(eks.KubernetesResource.RESOURCE_TYPE, {
273273
Manifest: {
274274
'Fn::Join': [
275275
'',
@@ -302,7 +302,7 @@ describeDeprecated('cluster', () => {
302302
});
303303

304304
// THEN
305-
expect(stack).not.toHaveResource(eks.KubernetesResource.RESOURCE_TYPE);
305+
Template.fromStack(stack).resourceCountIs(eks.KubernetesResource.RESOURCE_TYPE, 0);
306306

307307
});
308308

@@ -317,7 +317,7 @@ describeDeprecated('cluster', () => {
317317
});
318318

319319
// THEN
320-
expect(stack).not.toHaveResource(eks.KubernetesResource.RESOURCE_TYPE);
320+
Template.fromStack(stack).resourceCountIs(eks.KubernetesResource.RESOURCE_TYPE, 0);
321321

322322
});
323323

@@ -524,7 +524,7 @@ describeDeprecated('cluster', () => {
524524
});
525525

526526
// THEN
527-
expect(stack).toHaveResource(eks.KubernetesResource.RESOURCE_TYPE, { Manifest: JSON.stringify(spotInterruptHandler()) });
527+
Template.fromStack(stack).hasResourceProperties(eks.KubernetesResource.RESOURCE_TYPE, { Manifest: JSON.stringify(spotInterruptHandler()) });
528528

529529
});
530530

@@ -540,7 +540,7 @@ describeDeprecated('cluster', () => {
540540
});
541541

542542
// THEN
543-
expect(stack).not.toHaveResource(eks.KubernetesResource.RESOURCE_TYPE);
543+
Template.fromStack(stack).resourceCountIs(eks.KubernetesResource.RESOURCE_TYPE, 0);
544544

545545
});
546546

‎packages/@aws-cdk/aws-eks-legacy/test/helm-chart.test.ts

Lines changed: 5 additions & 5 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 { describeDeprecated } from '@aws-cdk/cdk-build-tools';
33
import * as eks from '../lib';
44
import { testFixtureCluster } from './util';
@@ -15,7 +15,7 @@ describeDeprecated('helm chart', () => {
1515
new eks.HelmChart(stack, 'MyChart', { cluster, chart: 'chart' });
1616

1717
// THEN
18-
expect(stack).toHaveResource(eks.HelmChart.RESOURCE_TYPE, { Namespace: 'default' });
18+
Template.fromStack(stack).hasResourceProperties(eks.HelmChart.RESOURCE_TYPE, { Namespace: 'default' });
1919

2020
});
2121
test('should have a lowercase default release name', () => {
@@ -26,7 +26,7 @@ describeDeprecated('helm chart', () => {
2626
new eks.HelmChart(stack, 'MyChart', { cluster, chart: 'chart' });
2727

2828
// THEN
29-
expect(stack).toHaveResource(eks.HelmChart.RESOURCE_TYPE, { Release: 'stackmychartff398361' });
29+
Template.fromStack(stack).hasResourceProperties(eks.HelmChart.RESOURCE_TYPE, { Release: 'stackmychartff398361' });
3030

3131
});
3232
test('should trim the last 63 of the default release name', () => {
@@ -37,7 +37,7 @@ describeDeprecated('helm chart', () => {
3737
new eks.HelmChart(stack, 'MyChartNameWhichISMostProbablyLongerThenSixtyThreeCharacters', { cluster, chart: 'chart' });
3838

3939
// THEN
40-
expect(stack).toHaveResource(eks.HelmChart.RESOURCE_TYPE, { Release: 'rtnamewhichismostprobablylongerthensixtythreecharactersb800614d' });
40+
Template.fromStack(stack).hasResourceProperties(eks.HelmChart.RESOURCE_TYPE, { Release: 'rtnamewhichismostprobablylongerthensixtythreecharactersb800614d' });
4141

4242
});
4343
test('with values', () => {
@@ -48,7 +48,7 @@ describeDeprecated('helm chart', () => {
4848
new eks.HelmChart(stack, 'MyChart', { cluster, chart: 'chart', values: { foo: 123 } });
4949

5050
// THEN
51-
expect(stack).toHaveResource(eks.HelmChart.RESOURCE_TYPE, { Values: '{\"foo\":123}' });
51+
Template.fromStack(stack).hasResourceProperties(eks.HelmChart.RESOURCE_TYPE, { Values: '{\"foo\":123}' });
5252

5353
});
5454
});

‎packages/@aws-cdk/aws-eks-legacy/test/manifest.test.ts

Lines changed: 2 additions & 2 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 { describeDeprecated } from '@aws-cdk/cdk-build-tools';
33
import { Cluster, KubernetesResource } from '../lib';
44
import { testFixtureNoVpc } from './util';
@@ -69,7 +69,7 @@ describeDeprecated('manifest', () => {
6969
manifest,
7070
});
7171

72-
expect(stack).toHaveResource(KubernetesResource.RESOURCE_TYPE, {
72+
Template.fromStack(stack).hasResourceProperties(KubernetesResource.RESOURCE_TYPE, {
7373
Manifest: JSON.stringify(manifest),
7474
});
7575

0 commit comments

Comments
 (0)