Skip to content

Commit cf09454

Browse files
madeline-kmadeline-k
authored
chore(servicediscovery): migrate to Assertions (#18541)
---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 4764f5b commit cf09454

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
},
7676
"license": "Apache-2.0",
7777
"devDependencies": {
78-
"@aws-cdk/assert-internal": "0.0.0",
78+
"@aws-cdk/assertions": "0.0.0",
7979
"@aws-cdk/cdk-build-tools": "0.0.0",
8080
"@aws-cdk/cdk-integ-tools": "0.0.0",
8181
"@aws-cdk/cfn2ts": "0.0.0",

‎packages/@aws-cdk/aws-servicediscovery/test/instance.test.ts

Lines changed: 8 additions & 8 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 elbv2 from '@aws-cdk/aws-elasticloadbalancingv2';
44
import * as cdk from '@aws-cdk/core';
@@ -24,7 +24,7 @@ describe('instance', () => {
2424
});
2525

2626
// THEN
27-
expect(stack).toHaveResource('AWS::ServiceDiscovery::Instance', {
27+
Template.fromStack(stack).hasResourceProperties('AWS::ServiceDiscovery::Instance', {
2828
InstanceAttributes: {
2929
AWS_INSTANCE_IPV4: '10.0.0.0',
3030
AWS_INSTANCE_IPV6: '0:0:0:0:0:ffff:a00:0',
@@ -62,7 +62,7 @@ describe('instance', () => {
6262
});
6363

6464
// THEN
65-
expect(stack).toHaveResource('AWS::ServiceDiscovery::Instance', {
65+
Template.fromStack(stack).hasResourceProperties('AWS::ServiceDiscovery::Instance', {
6666
InstanceAttributes: {
6767
AWS_INSTANCE_IPV4: '54.239.25.192',
6868
AWS_INSTANCE_IPV6: '0:0:0:0:0:ffff:a00:0',
@@ -102,7 +102,7 @@ describe('instance', () => {
102102
});
103103

104104
// THEN
105-
expect(stack).toHaveResource('AWS::ServiceDiscovery::Instance', {
105+
Template.fromStack(stack).hasResourceProperties('AWS::ServiceDiscovery::Instance', {
106106
InstanceAttributes: {
107107
AWS_INSTANCE_IPV4: '10.0.0.0',
108108
AWS_INSTANCE_IPV6: '0:0:0:0:0:ffff:a00:0',
@@ -256,7 +256,7 @@ describe('instance', () => {
256256
service.registerLoadBalancer('Loadbalancer', alb, customAttributes);
257257

258258
// THEN
259-
expect(stack).toHaveResource('AWS::ServiceDiscovery::Instance', {
259+
Template.fromStack(stack).hasResourceProperties('AWS::ServiceDiscovery::Instance', {
260260
InstanceAttributes: {
261261
AWS_ALIAS_DNS_NAME: {
262262
'Fn::GetAtt': [
@@ -343,7 +343,7 @@ describe('instance', () => {
343343
});
344344

345345
// THEN
346-
expect(stack).toHaveResource('AWS::ServiceDiscovery::Instance', {
346+
Template.fromStack(stack).hasResourceProperties('AWS::ServiceDiscovery::Instance', {
347347
InstanceAttributes: {
348348
AWS_INSTANCE_CNAME: 'foo.com',
349349
dogs: 'good',
@@ -397,7 +397,7 @@ describe('instance', () => {
397397
});
398398

399399
// THEN
400-
expect(stack).toHaveResource('AWS::ServiceDiscovery::Instance', {
400+
Template.fromStack(stack).hasResourceProperties('AWS::ServiceDiscovery::Instance', {
401401
InstanceAttributes: {
402402
dogs: 'good',
403403
},
@@ -494,7 +494,7 @@ describe('instance', () => {
494494
});
495495

496496
// THEN
497-
expect(stack).toCountResources('AWS::ServiceDiscovery::Instance', 2);
497+
Template.fromStack(stack).resourceCountIs('AWS::ServiceDiscovery::Instance', 2);
498498

499499

500500
});

‎packages/@aws-cdk/aws-servicediscovery/test/namespace.test.ts

Lines changed: 4 additions & 4 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 cdk from '@aws-cdk/core';
44
import * as servicediscovery from '../lib';
@@ -11,7 +11,7 @@ describe('namespace', () => {
1111
name: 'foobar.com',
1212
});
1313

14-
expect(stack).toMatchTemplate({
14+
Template.fromStack(stack).templateMatches({
1515
Resources: {
1616
MyNamespaceD0BB8558: {
1717
Type: 'AWS::ServiceDiscovery::HttpNamespace',
@@ -32,7 +32,7 @@ describe('namespace', () => {
3232
name: 'foobar.com',
3333
});
3434

35-
expect(stack).toMatchTemplate({
35+
Template.fromStack(stack).templateMatches({
3636
Resources: {
3737
MyNamespaceD0BB8558: {
3838
Type: 'AWS::ServiceDiscovery::PublicDnsNamespace',
@@ -55,7 +55,7 @@ describe('namespace', () => {
5555
vpc,
5656
});
5757

58-
expect(stack).toHaveResource('AWS::ServiceDiscovery::PrivateDnsNamespace', {
58+
Template.fromStack(stack).hasResourceProperties('AWS::ServiceDiscovery::PrivateDnsNamespace', {
5959
Name: 'foobar.com',
6060
Vpc: {
6161
Ref: 'MyVpcF9F0CA6F',

‎packages/@aws-cdk/aws-servicediscovery/test/service.test.ts

Lines changed: 8 additions & 8 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 cdk from '@aws-cdk/core';
44
import * as servicediscovery from '../lib';
@@ -21,7 +21,7 @@ describe('service', () => {
2121
});
2222

2323
// THEN
24-
expect(stack).toMatchTemplate({
24+
Template.fromStack(stack).templateMatches({
2525
Resources: {
2626
MyNamespaceD0BB8558: {
2727
Type: 'AWS::ServiceDiscovery::HttpNamespace',
@@ -69,7 +69,7 @@ describe('service', () => {
6969
});
7070

7171
// THEN
72-
expect(stack).toMatchTemplate({
72+
Template.fromStack(stack).templateMatches({
7373
Resources: {
7474
MyNamespaceD0BB8558: {
7575
Type: 'AWS::ServiceDiscovery::HttpNamespace',
@@ -118,7 +118,7 @@ describe('service', () => {
118118
});
119119

120120
// THEN
121-
expect(stack).toMatchTemplate({
121+
Template.fromStack(stack).templateMatches({
122122
Resources: {
123123
MyNamespaceD0BB8558: {
124124
Type: 'AWS::ServiceDiscovery::PublicDnsNamespace',
@@ -176,7 +176,7 @@ describe('service', () => {
176176
});
177177

178178
// THEN
179-
expect(stack).toMatchTemplate({
179+
Template.fromStack(stack).templateMatches({
180180
Resources: {
181181
MyNamespaceD0BB8558: {
182182
Type: 'AWS::ServiceDiscovery::PublicDnsNamespace',
@@ -233,7 +233,7 @@ describe('service', () => {
233233
});
234234

235235
// THEN
236-
expect(stack).toMatchTemplate({
236+
Template.fromStack(stack).templateMatches({
237237
Resources: {
238238
MyNamespaceD0BB8558: {
239239
Type: 'AWS::ServiceDiscovery::PublicDnsNamespace',
@@ -417,11 +417,11 @@ describe('service', () => {
417417
});
418418

419419
// THEN
420-
expect(stack).toHaveResource('AWS::ServiceDiscovery::PrivateDnsNamespace', {
420+
Template.fromStack(stack).hasResourceProperties('AWS::ServiceDiscovery::PrivateDnsNamespace', {
421421
Name: 'private',
422422
});
423423

424-
expect(stack).toHaveResource('AWS::ServiceDiscovery::Service', {
424+
Template.fromStack(stack).hasResourceProperties('AWS::ServiceDiscovery::Service', {
425425
Description: 'service description',
426426
DnsConfig: {
427427
DnsRecords: [

0 commit comments

Comments
 (0)