Skip to content

Commit 1213f2b

Browse files
ShiriMoranShiriMoran
authored
Merge branch 'main' into 851_lint_aws_tests
2 parents 17cf0bf + 64b9945 commit 1213f2b

9 files changed

+794
-19
lines changed

‎pkg/ibmvpc/examples/input/input_multi_regions.json

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,21 @@
6262
"resource_type": "vpc",
6363
"status": "available",
6464
"region": "us-east",
65+
"address_prefixes": [
66+
{
67+
"cidr": "10.241.0.0/22",
68+
"created_at": "2024-02-11T14:22:09.000Z",
69+
"has_subnets": true,
70+
"href": "href:18",
71+
"id": "id:19",
72+
"is_default": false,
73+
"name": "address-prefix-vpc-0",
74+
"zone": {
75+
"href": "href:5",
76+
"name": "us-east-1"
77+
}
78+
}
79+
],
6580
"tags": []
6681
},
6782
{
@@ -126,6 +141,21 @@
126141
"resource_type": "vpc",
127142
"status": "available",
128143
"region": "us-south",
144+
"address_prefixes": [
145+
{
146+
"cidr": "10.241.0.0/22",
147+
"created_at": "2024-02-11T14:22:09.000Z",
148+
"has_subnets": true,
149+
"href": "href:18",
150+
"id": "id:19",
151+
"is_default": false,
152+
"name": "address-prefix-vpc-0",
153+
"zone": {
154+
"href": "href:5",
155+
"name": "us-east-1"
156+
}
157+
}
158+
],
129159
"tags": []
130160
},
131161
{
@@ -322,6 +352,21 @@
322352
"resource_type": "vpc",
323353
"status": "available",
324354
"region": "us-east",
355+
"address_prefixes": [
356+
{
357+
"cidr": "10.240.64.0/22",
358+
"created_at": "2024-02-11T13:18:25.000Z",
359+
"has_subnets": true,
360+
"href": "href:34",
361+
"id": "id:35",
362+
"is_default": false,
363+
"name": "address-prefix-vpc-0",
364+
"zone": {
365+
"href": "href:24",
366+
"name": "us-south-2"
367+
}
368+
}
369+
],
325370
"tags": []
326371
},
327372
{
@@ -386,6 +431,21 @@
386431
"resource_type": "vpc",
387432
"status": "available",
388433
"region": "us-east",
434+
"address_prefixes": [
435+
{
436+
"cidr": "10.240.0.0/22",
437+
"created_at": "2024-02-11T13:18:25.000Z",
438+
"has_subnets": true,
439+
"href": "href:47",
440+
"id": "id:48",
441+
"is_default": false,
442+
"name": "address-prefix-vpc-0",
443+
"zone": {
444+
"href": "href:23",
445+
"name": "us-south-1"
446+
}
447+
}
448+
],
389449
"tags": []
390450
},
391451
{
@@ -450,6 +510,21 @@
450510
"resource_type": "vpc",
451511
"status": "available",
452512
"region": "us-south",
513+
"address_prefixes": [
514+
{
515+
"cidr": "10.240.64.0/22",
516+
"created_at": "2024-02-11T13:18:25.000Z",
517+
"has_subnets": true,
518+
"href": "href:34",
519+
"id": "id:35",
520+
"is_default": false,
521+
"name": "address-prefix-vpc-0",
522+
"zone": {
523+
"href": "href:24",
524+
"name": "us-south-2"
525+
}
526+
}
527+
],
453528
"tags": []
454529
},
455530
{
@@ -514,6 +589,21 @@
514589
"resource_type": "vpc",
515590
"status": "available",
516591
"region": "us-south",
592+
"address_prefixes": [
593+
{
594+
"cidr": "10.240.0.0/22",
595+
"created_at": "2024-02-11T13:18:25.000Z",
596+
"has_subnets": true,
597+
"href": "href:47",
598+
"id": "id:48",
599+
"is_default": false,
600+
"name": "address-prefix-vpc-0",
601+
"zone": {
602+
"href": "href:23",
603+
"name": "us-south-1"
604+
}
605+
}
606+
],
517607
"tags": []
518608
},
519609
{
@@ -715,7 +805,7 @@
715805
},
716806
"resource_group": {
717807
"href": "href:15",
718-
"id": "ola",
808+
"id": "id:16",
719809
"name": "anonymous"
720810
},
721811
"resource_type": "subnet",

‎pkg/ibmvpc/examples/input/input_multi_resource_groups.json

Lines changed: 97 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,21 @@
6161
},
6262
"resource_type": "vpc",
6363
"status": "available",
64+
"address_prefixes": [
65+
{
66+
"cidr": "10.241.0.0/22",
67+
"created_at": "2024-02-11T14:22:09.000Z",
68+
"has_subnets": true,
69+
"href": "href:18",
70+
"id": "id:19",
71+
"is_default": false,
72+
"name": "address-prefix-vpc-0",
73+
"zone": {
74+
"href": "href:5",
75+
"name": "us-east-1"
76+
}
77+
}
78+
],
6479
"tags": []
6580
},
6681
{
@@ -124,6 +139,21 @@
124139
},
125140
"resource_type": "vpc",
126141
"status": "available",
142+
"address_prefixes": [
143+
{
144+
"cidr": "10.241.0.0/22",
145+
"created_at": "2024-02-11T14:22:09.000Z",
146+
"has_subnets": true,
147+
"href": "href:18",
148+
"id": "id:19",
149+
"is_default": false,
150+
"name": "address-prefix-vpc-0",
151+
"zone": {
152+
"href": "href:5",
153+
"name": "us-east-1"
154+
}
155+
}
156+
],
127157
"tags": []
128158
},
129159
{
@@ -317,6 +347,21 @@
317347
},
318348
"resource_type": "vpc",
319349
"status": "available",
350+
"address_prefixes": [
351+
{
352+
"cidr": "10.240.64.0/22",
353+
"created_at": "2024-02-11T13:18:25.000Z",
354+
"has_subnets": true,
355+
"href": "href:34",
356+
"id": "id:35",
357+
"is_default": false,
358+
"name": "address-prefix-vpc-0",
359+
"zone": {
360+
"href": "href:24",
361+
"name": "us-south-2"
362+
}
363+
}
364+
],
320365
"tags": []
321366
},
322367
{
@@ -380,6 +425,21 @@
380425
},
381426
"resource_type": "vpc",
382427
"status": "available",
428+
"address_prefixes": [
429+
{
430+
"cidr": "10.240.0.0/22",
431+
"created_at": "2024-02-11T13:18:25.000Z",
432+
"has_subnets": true,
433+
"href": "href:47",
434+
"id": "id:48",
435+
"is_default": false,
436+
"name": "address-prefix-vpc-0",
437+
"zone": {
438+
"href": "href:23",
439+
"name": "us-south-1"
440+
}
441+
}
442+
],
383443
"tags": []
384444
},
385445
{
@@ -443,6 +503,21 @@
443503
},
444504
"resource_type": "vpc",
445505
"status": "available",
506+
"address_prefixes": [
507+
{
508+
"cidr": "10.240.64.0/22",
509+
"created_at": "2024-02-11T13:18:25.000Z",
510+
"has_subnets": true,
511+
"href": "href:34",
512+
"id": "id:35",
513+
"is_default": false,
514+
"name": "address-prefix-vpc-0",
515+
"zone": {
516+
"href": "href:24",
517+
"name": "us-south-2"
518+
}
519+
}
520+
],
446521
"tags": []
447522
},
448523
{
@@ -506,6 +581,21 @@
506581
},
507582
"resource_type": "vpc",
508583
"status": "available",
584+
"address_prefixes": [
585+
{
586+
"cidr": "10.240.0.0/22",
587+
"created_at": "2024-02-11T13:18:25.000Z",
588+
"has_subnets": true,
589+
"href": "href:47",
590+
"id": "id:48",
591+
"is_default": false,
592+
"name": "address-prefix-vpc-0",
593+
"zone": {
594+
"href": "href:23",
595+
"name": "us-south-1"
596+
}
597+
}
598+
],
509599
"tags": []
510600
},
511601
{
@@ -5428,12 +5518,12 @@
54285518
],
54295519
"transit_gateways": [
54305520
{
5431-
"crn": "crn:607",
5432-
"id": "id:608",
5433-
"name": "global-tg-ky",
5521+
"crn": "crn:595",
5522+
"id": "id:596",
5523+
"name": "global-tg-zn",
54345524
"location": "us-south",
54355525
"created_at": "2024-02-05T09:05:14.545Z",
5436-
"global": false,
5526+
"global": true,
54375527
"resource_group": {
54385528
"id": "id:40",
54395529
"href": "href:556",
@@ -5443,9 +5533,9 @@
54435533
"updated_at": "2024-02-05T09:07:19.719Z"
54445534
},
54455535
{
5446-
"crn": "crn:603",
5447-
"id": "id:604",
5448-
"name": "local-tg-ky",
5536+
"crn": "crn:599",
5537+
"id": "id:600",
5538+
"name": "local-tg-zn",
54495539
"location": "us-south",
54505540
"created_at": "2024-02-05T09:05:14.545Z",
54515541
"global": false,

‎pkg/ibmvpc/examples/input/input_tgw_basic_example.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,21 @@
6161
},
6262
"resource_type": "vpc",
6363
"status": "available",
64+
"address_prefixes": [
65+
{
66+
"cidr": "10.241.0.0/22",
67+
"created_at": "2024-02-11T14:22:09.000Z",
68+
"has_subnets": true,
69+
"href": "href:18",
70+
"id": "id:19",
71+
"is_default": false,
72+
"name": "address-prefix-vpc-0",
73+
"zone": {
74+
"href": "href:5",
75+
"name": "us-east-1"
76+
}
77+
}
78+
],
6479
"tags": []
6580
},
6681
{
@@ -124,6 +139,21 @@
124139
},
125140
"resource_type": "vpc",
126141
"status": "available",
142+
"address_prefixes": [
143+
{
144+
"cidr": "10.240.0.0/22",
145+
"created_at": "2024-02-11T13:18:25.000Z",
146+
"has_subnets": true,
147+
"href": "href:47",
148+
"id": "id:48",
149+
"is_default": false,
150+
"name": "address-prefix-vpc-0",
151+
"zone": {
152+
"href": "href:23",
153+
"name": "us-south-1"
154+
}
155+
}
156+
],
127157
"tags": []
128158
},
129159
{
@@ -187,6 +217,21 @@
187217
},
188218
"resource_type": "vpc",
189219
"status": "available",
220+
"address_prefixes": [
221+
{
222+
"cidr": "10.240.64.0/22",
223+
"created_at": "2024-02-11T13:18:25.000Z",
224+
"has_subnets": true,
225+
"href": "href:34",
226+
"id": "id:35",
227+
"is_default": false,
228+
"name": "address-prefix-vpc-0",
229+
"zone": {
230+
"href": "href:24",
231+
"name": "us-south-2"
232+
}
233+
}
234+
],
190235
"tags": []
191236
}
192237
],

0 commit comments

Comments
 (0)