Skip to content

Commit 6c6319f

Browse files
corymhallcorymhall
committed
fixing merge conflicts with integ snapshots
1 parent 6f88862 commit 6c6319f

File tree

27 files changed

+112
-230
lines changed

27 files changed

+112
-230
lines changed

‎packages/@aws-cdk/aws-codepipeline-actions/test/pipeline-s3-deploy.integ.snapshot/aws-cdk-codepipeline-s3-deploy.assets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"version": "17.0.0",
33
"files": {
4-
"2e7146379ae6ea5a2cc888bddf661da387ad782bb16286426d7bb03a8a091c8b": {
4+
"0d855672b9c26273fdf4f904686f4baed56bfbb495dd5a5d2bc79b91dcb78ca3": {
55
"source": {
66
"path": "aws-cdk-codepipeline-s3-deploy.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "2e7146379ae6ea5a2cc888bddf661da387ad782bb16286426d7bb03a8a091c8b.json",
12+
"objectKey": "0d855672b9c26273fdf4f904686f4baed56bfbb495dd5a5d2bc79b91dcb78ca3.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

‎packages/@aws-cdk/aws-codepipeline-actions/test/pipeline-s3-deploy.integ.snapshot/aws-cdk-codepipeline-s3-deploy.template.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@
8989
"Arn"
9090
]
9191
},
92+
{
93+
"Fn::GetAtt": [
94+
"PipelineDisabledDisabledDeployActionCodePipelineActionRole9CEF3915",
95+
"Arn"
96+
]
97+
},
9298
{
9399
"Fn::GetAtt": [
94100
"PipelineSourceCodePipelineActionRoleC6F9E7F5",
@@ -593,4 +599,4 @@
593599
}
594600
}
595601
}
596-
}
602+
}

‎packages/@aws-cdk/aws-codepipeline-actions/test/pipeline-s3-deploy.integ.snapshot/tree.json

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,12 @@
178178
"Arn"
179179
]
180180
},
181+
{
182+
"Fn::GetAtt": [
183+
"PipelineDisabledDisabledDeployActionCodePipelineActionRole9CEF3915",
184+
"Arn"
185+
]
186+
},
181187
{
182188
"Fn::GetAtt": [
183189
"PipelineSourceCodePipelineActionRoleC6F9E7F5",
@@ -860,14 +866,14 @@
860866
}
861867
},
862868
"constructInfo": {
863-
"fqn": "@aws-cdk/core.Construct",
864-
"version": "0.0.0"
869+
"fqn": "constructs.Construct",
870+
"version": "10.0.9"
865871
}
866872
}
867873
},
868874
"constructInfo": {
869-
"fqn": "@aws-cdk/core.Construct",
870-
"version": "0.0.0"
875+
"fqn": "constructs.Construct",
876+
"version": "10.0.9"
871877
}
872878
}
873879
},
@@ -888,4 +894,4 @@
888894
"version": "0.0.0"
889895
}
890896
}
891-
}
897+
}

‎packages/@aws-cdk/aws-ec2/test/import-default-vpc.lit.integ.snapshot/aws-cdk-ec2-import.template.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
"IpProtocol": "-1"
1212
}
1313
],
14-
"VpcId": "vpc-12345"
14+
"VpcId": "vpc-60900905"
1515
}
1616
}
1717
},
1818
"Outputs": {
1919
"PublicSubnets": {
20-
"Value": "ids:s-12345,s-67890"
20+
"Value": "ids:subnet-e19455ca,subnet-e0c24797,subnet-ccd77395"
2121
},
2222
"PrivateSubnets": {
23-
"Value": "ids:p-12345,p-67890"
23+
"Value": "ids:"
2424
},
2525
"PublicRouteTables": {
26-
"Value": "ids: rtb-12345s, rtb-67890s"
26+
"Value": "ids: rtb-e19455ca, rtb-e0c24797, rtb-ccd77395"
2727
}
2828
}
2929
}

‎packages/@aws-cdk/aws-ec2/test/import-default-vpc.lit.integ.snapshot/manifest.json

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,5 @@
4545
},
4646
"displayName": "aws-cdk-ec2-import"
4747
}
48-
},
49-
"missing": [
50-
{
51-
"key": "vpc-provider:account=12345678:filter.isDefault=true:region=test-region:returnAsymmetricSubnets=true",
52-
"provider": "vpc-provider",
53-
"props": {
54-
"account": "12345678",
55-
"region": "test-region",
56-
"filter": {
57-
"isDefault": "true"
58-
},
59-
"returnAsymmetricSubnets": true
60-
}
61-
}
62-
]
48+
}
6349
}

‎packages/@aws-cdk/aws-ec2/test/import-default-vpc.lit.integ.snapshot/tree.json

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,33 +36,9 @@
3636
"version": "0.0.0"
3737
}
3838
},
39-
"PrivateSubnet1": {
40-
"id": "PrivateSubnet1",
41-
"path": "aws-cdk-ec2-import/VPC/PrivateSubnet1",
42-
"constructInfo": {
43-
"fqn": "@aws-cdk/core.Resource",
44-
"version": "0.0.0"
45-
}
46-
},
47-
"PrivateSubnet2": {
48-
"id": "PrivateSubnet2",
49-
"path": "aws-cdk-ec2-import/VPC/PrivateSubnet2",
50-
"constructInfo": {
51-
"fqn": "@aws-cdk/core.Resource",
52-
"version": "0.0.0"
53-
}
54-
},
55-
"IsolatedSubnet1": {
56-
"id": "IsolatedSubnet1",
57-
"path": "aws-cdk-ec2-import/VPC/IsolatedSubnet1",
58-
"constructInfo": {
59-
"fqn": "@aws-cdk/core.Resource",
60-
"version": "0.0.0"
61-
}
62-
},
63-
"IsolatedSubnet2": {
64-
"id": "IsolatedSubnet2",
65-
"path": "aws-cdk-ec2-import/VPC/IsolatedSubnet2",
39+
"PublicSubnet3": {
40+
"id": "PublicSubnet3",
41+
"path": "aws-cdk-ec2-import/VPC/PublicSubnet3",
6642
"constructInfo": {
6743
"fqn": "@aws-cdk/core.Resource",
6844
"version": "0.0.0"
@@ -92,7 +68,7 @@
9268
"ipProtocol": "-1"
9369
}
9470
],
95-
"vpcId": "vpc-12345"
71+
"vpcId": "vpc-60900905"
9672
}
9773
},
9874
"constructInfo": {

‎packages/@aws-cdk/aws-ec2/test/nat-instances.lit.integ.snapshot/aws-cdk-vpc-nat-instances.template.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"VpcId": {
2222
"Ref": "MyVpcF9F0CA6F"
2323
},
24-
"AvailabilityZone": "dummy1a",
24+
"AvailabilityZone": "test-region-1a",
2525
"CidrBlock": "10.0.0.0/19",
2626
"MapPublicIpOnLaunch": true,
2727
"Tags": [
@@ -93,7 +93,7 @@
9393
"MyVpcPublicSubnet1NatInstance8E94E5F7": {
9494
"Type": "AWS::EC2::Instance",
9595
"Properties": {
96-
"AvailabilityZone": "dummy1a",
96+
"AvailabilityZone": "test-region-1a",
9797
"IamInstanceProfile": {
9898
"Ref": "MyVpcPublicSubnet1NatInstanceInstanceProfile2FD934CB"
9999
},
@@ -131,7 +131,7 @@
131131
"VpcId": {
132132
"Ref": "MyVpcF9F0CA6F"
133133
},
134-
"AvailabilityZone": "dummy1b",
134+
"AvailabilityZone": "test-region-1b",
135135
"CidrBlock": "10.0.32.0/19",
136136
"MapPublicIpOnLaunch": true,
137137
"Tags": [
@@ -203,7 +203,7 @@
203203
"MyVpcPublicSubnet2NatInstance04BCE4E3": {
204204
"Type": "AWS::EC2::Instance",
205205
"Properties": {
206-
"AvailabilityZone": "dummy1b",
206+
"AvailabilityZone": "test-region-1b",
207207
"IamInstanceProfile": {
208208
"Ref": "MyVpcPublicSubnet2NatInstanceInstanceProfile5AB09EF6"
209209
},
@@ -241,7 +241,7 @@
241241
"VpcId": {
242242
"Ref": "MyVpcF9F0CA6F"
243243
},
244-
"AvailabilityZone": "dummy1c",
244+
"AvailabilityZone": "test-region-1c",
245245
"CidrBlock": "10.0.64.0/19",
246246
"MapPublicIpOnLaunch": true,
247247
"Tags": [
@@ -306,7 +306,7 @@
306306
"VpcId": {
307307
"Ref": "MyVpcF9F0CA6F"
308308
},
309-
"AvailabilityZone": "dummy1a",
309+
"AvailabilityZone": "test-region-1a",
310310
"CidrBlock": "10.0.96.0/19",
311311
"MapPublicIpOnLaunch": false,
312312
"Tags": [
@@ -368,7 +368,7 @@
368368
"VpcId": {
369369
"Ref": "MyVpcF9F0CA6F"
370370
},
371-
"AvailabilityZone": "dummy1b",
371+
"AvailabilityZone": "test-region-1b",
372372
"CidrBlock": "10.0.128.0/19",
373373
"MapPublicIpOnLaunch": false,
374374
"Tags": [
@@ -430,7 +430,7 @@
430430
"VpcId": {
431431
"Ref": "MyVpcF9F0CA6F"
432432
},
433-
"AvailabilityZone": "dummy1c",
433+
"AvailabilityZone": "test-region-1c",
434434
"CidrBlock": "10.0.160.0/19",
435435
"MapPublicIpOnLaunch": false,
436436
"Tags": [

‎packages/@aws-cdk/aws-ec2/test/nat-instances.lit.integ.snapshot/manifest.json

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -258,37 +258,5 @@
258258
},
259259
"displayName": "aws-cdk-vpc-nat-instances"
260260
}
261-
},
262-
"missing": [
263-
{
264-
"key": "availability-zones:account=12345678:region=test-region",
265-
"provider": "availability-zones",
266-
"props": {
267-
"account": "12345678",
268-
"region": "test-region"
269-
}
270-
},
271-
{
272-
"key": "ami:account=12345678:filters.image-type.0=machine:filters.name.0=amzn-ami-vpc-nat-*:filters.state.0=available:owners.0=amazon:region=test-region",
273-
"provider": "ami",
274-
"props": {
275-
"account": "12345678",
276-
"region": "test-region",
277-
"owners": [
278-
"amazon"
279-
],
280-
"filters": {
281-
"name": [
282-
"amzn-ami-vpc-nat-*"
283-
],
284-
"state": [
285-
"available"
286-
],
287-
"image-type": [
288-
"machine"
289-
]
290-
}
291-
}
292-
}
293-
]
261+
}
294262
}

‎packages/@aws-cdk/aws-ec2/test/nat-instances.lit.integ.snapshot/tree.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"vpcId": {
5757
"Ref": "MyVpcF9F0CA6F"
5858
},
59-
"availabilityZone": "dummy1a",
59+
"availabilityZone": "test-region-1a",
6060
"cidrBlock": "10.0.0.0/19",
6161
"mapPublicIpOnLaunch": true,
6262
"tags": [
@@ -177,7 +177,7 @@
177177
"attributes": {
178178
"aws:cdk:cloudformation:type": "AWS::EC2::Instance",
179179
"aws:cdk:cloudformation:props": {
180-
"availabilityZone": "dummy1a",
180+
"availabilityZone": "test-region-1a",
181181
"iamInstanceProfile": {
182182
"Ref": "MyVpcPublicSubnet1NatInstanceInstanceProfile2FD934CB"
183183
},
@@ -236,7 +236,7 @@
236236
"vpcId": {
237237
"Ref": "MyVpcF9F0CA6F"
238238
},
239-
"availabilityZone": "dummy1b",
239+
"availabilityZone": "test-region-1b",
240240
"cidrBlock": "10.0.32.0/19",
241241
"mapPublicIpOnLaunch": true,
242242
"tags": [
@@ -357,7 +357,7 @@
357357
"attributes": {
358358
"aws:cdk:cloudformation:type": "AWS::EC2::Instance",
359359
"aws:cdk:cloudformation:props": {
360-
"availabilityZone": "dummy1b",
360+
"availabilityZone": "test-region-1b",
361361
"iamInstanceProfile": {
362362
"Ref": "MyVpcPublicSubnet2NatInstanceInstanceProfile5AB09EF6"
363363
},
@@ -416,7 +416,7 @@
416416
"vpcId": {
417417
"Ref": "MyVpcF9F0CA6F"
418418
},
419-
"availabilityZone": "dummy1c",
419+
"availabilityZone": "test-region-1c",
420420
"cidrBlock": "10.0.64.0/19",
421421
"mapPublicIpOnLaunch": true,
422422
"tags": [
@@ -528,7 +528,7 @@
528528
"vpcId": {
529529
"Ref": "MyVpcF9F0CA6F"
530530
},
531-
"availabilityZone": "dummy1a",
531+
"availabilityZone": "test-region-1a",
532532
"cidrBlock": "10.0.96.0/19",
533533
"mapPublicIpOnLaunch": false,
534534
"tags": [
@@ -640,7 +640,7 @@
640640
"vpcId": {
641641
"Ref": "MyVpcF9F0CA6F"
642642
},
643-
"availabilityZone": "dummy1b",
643+
"availabilityZone": "test-region-1b",
644644
"cidrBlock": "10.0.128.0/19",
645645
"mapPublicIpOnLaunch": false,
646646
"tags": [
@@ -752,7 +752,7 @@
752752
"vpcId": {
753753
"Ref": "MyVpcF9F0CA6F"
754754
},
755-
"availabilityZone": "dummy1c",
755+
"availabilityZone": "test-region-1c",
756756
"cidrBlock": "10.0.160.0/19",
757757
"mapPublicIpOnLaunch": false,
758758
"tags": [

0 commit comments

Comments
 (0)