Skip to content

Commit 39866b3

Browse files
author
AWS
committed
AWSBillingConductor Update: This release adds support for SKU Scope for pricing plans.
1 parent d9b015e commit 39866b3

File tree

4 files changed

+284
-54
lines changed

4 files changed

+284
-54
lines changed

‎.changes/next-release/feature-AWSBillingConductor-ef7ea3d.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "feature",
3+
"category": "AWSBillingConductor",
4+
"contributor": "",
5+
"description": "This release adds support for SKU Scope for pricing plans."
6+
}

‎services/billingconductor/src/main/resources/codegen-resources/endpoint-rule-set.json

Lines changed: 27 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,6 @@
5252
"ref": "Endpoint"
5353
}
5454
]
55-
},
56-
{
57-
"fn": "parseURL",
58-
"argv": [
59-
{
60-
"ref": "Endpoint"
61-
}
62-
],
63-
"assign": "url"
6455
}
6556
],
6657
"type": "tree",
@@ -196,15 +187,7 @@
196187
"conditions": [],
197188
"endpoint": {
198189
"url": "https://billingconductor-fips.{Region}.api.aws",
199-
"properties": {
200-
"authSchemes": [
201-
{
202-
"name": "sigv4",
203-
"signingRegion": "us-east-1",
204-
"signingName": "billingconductor"
205-
}
206-
]
207-
},
190+
"properties": {},
208191
"headers": {}
209192
},
210193
"type": "endpoint"
@@ -256,15 +239,7 @@
256239
"conditions": [],
257240
"endpoint": {
258241
"url": "https://billingconductor-fips.{Region}.amazonaws.com",
259-
"properties": {
260-
"authSchemes": [
261-
{
262-
"name": "sigv4",
263-
"signingRegion": "us-east-1",
264-
"signingName": "billingconductor"
265-
}
266-
]
267-
},
242+
"properties": {},
268243
"headers": {}
269244
},
270245
"type": "endpoint"
@@ -316,15 +291,7 @@
316291
"conditions": [],
317292
"endpoint": {
318293
"url": "https://billingconductor.{Region}.api.aws",
319-
"properties": {
320-
"authSchemes": [
321-
{
322-
"name": "sigv4",
323-
"signingRegion": "us-east-1",
324-
"signingName": "billingconductor"
325-
}
326-
]
327-
},
294+
"properties": {},
328295
"headers": {}
329296
},
330297
"type": "endpoint"
@@ -417,12 +384,18 @@
417384
"rules": [
418385
{
419386
"conditions": [],
420-
"endpoint": {
421-
"url": "https://billingconductor-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
422-
"properties": {},
423-
"headers": {}
424-
},
425-
"type": "endpoint"
387+
"type": "tree",
388+
"rules": [
389+
{
390+
"conditions": [],
391+
"endpoint": {
392+
"url": "https://billingconductor-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
393+
"properties": {},
394+
"headers": {}
395+
},
396+
"type": "endpoint"
397+
}
398+
]
426399
}
427400
]
428401
},
@@ -527,12 +500,18 @@
527500
"rules": [
528501
{
529502
"conditions": [],
530-
"endpoint": {
531-
"url": "https://billingconductor.{Region}.{PartitionResult#dualStackDnsSuffix}",
532-
"properties": {},
533-
"headers": {}
534-
},
535-
"type": "endpoint"
503+
"type": "tree",
504+
"rules": [
505+
{
506+
"conditions": [],
507+
"endpoint": {
508+
"url": "https://billingconductor.{Region}.{PartitionResult#dualStackDnsSuffix}",
509+
"properties": {},
510+
"headers": {}
511+
},
512+
"type": "endpoint"
513+
}
514+
]
536515
}
537516
]
538517
},

‎services/billingconductor/src/main/resources/codegen-resources/endpoint-tests.json

Lines changed: 222 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,83 @@
11
{
22
"testCases": [
3+
{
4+
"documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
5+
"expect": {
6+
"endpoint": {
7+
"url": "https://billingconductor-fips.cn-north-1.api.amazonwebservices.com.cn"
8+
}
9+
},
10+
"params": {
11+
"Region": "cn-north-1",
12+
"UseDualStack": true,
13+
"UseFIPS": true
14+
}
15+
},
16+
{
17+
"documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled",
18+
"expect": {
19+
"endpoint": {
20+
"url": "https://billingconductor-fips.cn-north-1.amazonaws.com.cn"
21+
}
22+
},
23+
"params": {
24+
"Region": "cn-north-1",
25+
"UseDualStack": false,
26+
"UseFIPS": true
27+
}
28+
},
29+
{
30+
"documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
31+
"expect": {
32+
"endpoint": {
33+
"url": "https://billingconductor.cn-north-1.api.amazonwebservices.com.cn"
34+
}
35+
},
36+
"params": {
37+
"Region": "cn-north-1",
38+
"UseDualStack": true,
39+
"UseFIPS": false
40+
}
41+
},
42+
{
43+
"documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled",
44+
"expect": {
45+
"endpoint": {
46+
"url": "https://billingconductor.cn-north-1.amazonaws.com.cn"
47+
}
48+
},
49+
"params": {
50+
"Region": "cn-north-1",
51+
"UseDualStack": false,
52+
"UseFIPS": false
53+
}
54+
},
55+
{
56+
"documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
57+
"expect": {
58+
"endpoint": {
59+
"url": "https://billingconductor-fips.us-iso-east-1.c2s.ic.gov"
60+
}
61+
},
62+
"params": {
63+
"Region": "us-iso-east-1",
64+
"UseDualStack": false,
65+
"UseFIPS": true
66+
}
67+
},
68+
{
69+
"documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
70+
"expect": {
71+
"endpoint": {
72+
"url": "https://billingconductor.us-iso-east-1.c2s.ic.gov"
73+
}
74+
},
75+
"params": {
76+
"Region": "us-iso-east-1",
77+
"UseDualStack": false,
78+
"UseFIPS": false
79+
}
80+
},
381
{
482
"documentation": "For region aws-global with FIPS disabled and DualStack disabled",
583
"expect": {
@@ -17,9 +95,148 @@
1795
}
1896
},
1997
"params": {
98+
"Region": "aws-global",
2099
"UseDualStack": false,
21-
"UseFIPS": false,
22-
"Region": "aws-global"
100+
"UseFIPS": false
101+
}
102+
},
103+
{
104+
"documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
105+
"expect": {
106+
"endpoint": {
107+
"url": "https://billingconductor-fips.us-east-1.api.aws"
108+
}
109+
},
110+
"params": {
111+
"Region": "us-east-1",
112+
"UseDualStack": true,
113+
"UseFIPS": true
114+
}
115+
},
116+
{
117+
"documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
118+
"expect": {
119+
"endpoint": {
120+
"url": "https://billingconductor-fips.us-east-1.amazonaws.com"
121+
}
122+
},
123+
"params": {
124+
"Region": "us-east-1",
125+
"UseDualStack": false,
126+
"UseFIPS": true
127+
}
128+
},
129+
{
130+
"documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
131+
"expect": {
132+
"endpoint": {
133+
"url": "https://billingconductor.us-east-1.api.aws"
134+
}
135+
},
136+
"params": {
137+
"Region": "us-east-1",
138+
"UseDualStack": true,
139+
"UseFIPS": false
140+
}
141+
},
142+
{
143+
"documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
144+
"expect": {
145+
"endpoint": {
146+
"properties": {
147+
"authSchemes": [
148+
{
149+
"name": "sigv4",
150+
"signingName": "billingconductor",
151+
"signingRegion": "us-east-1"
152+
}
153+
]
154+
},
155+
"url": "https://billingconductor.us-east-1.amazonaws.com"
156+
}
157+
},
158+
"params": {
159+
"Region": "us-east-1",
160+
"UseDualStack": false,
161+
"UseFIPS": false
162+
}
163+
},
164+
{
165+
"documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
166+
"expect": {
167+
"endpoint": {
168+
"url": "https://billingconductor-fips.us-gov-east-1.api.aws"
169+
}
170+
},
171+
"params": {
172+
"Region": "us-gov-east-1",
173+
"UseDualStack": true,
174+
"UseFIPS": true
175+
}
176+
},
177+
{
178+
"documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
179+
"expect": {
180+
"endpoint": {
181+
"url": "https://billingconductor-fips.us-gov-east-1.amazonaws.com"
182+
}
183+
},
184+
"params": {
185+
"Region": "us-gov-east-1",
186+
"UseDualStack": false,
187+
"UseFIPS": true
188+
}
189+
},
190+
{
191+
"documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
192+
"expect": {
193+
"endpoint": {
194+
"url": "https://billingconductor.us-gov-east-1.api.aws"
195+
}
196+
},
197+
"params": {
198+
"Region": "us-gov-east-1",
199+
"UseDualStack": true,
200+
"UseFIPS": false
201+
}
202+
},
203+
{
204+
"documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
205+
"expect": {
206+
"endpoint": {
207+
"url": "https://billingconductor.us-gov-east-1.amazonaws.com"
208+
}
209+
},
210+
"params": {
211+
"Region": "us-gov-east-1",
212+
"UseDualStack": false,
213+
"UseFIPS": false
214+
}
215+
},
216+
{
217+
"documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
218+
"expect": {
219+
"endpoint": {
220+
"url": "https://billingconductor-fips.us-isob-east-1.sc2s.sgov.gov"
221+
}
222+
},
223+
"params": {
224+
"Region": "us-isob-east-1",
225+
"UseDualStack": false,
226+
"UseFIPS": true
227+
}
228+
},
229+
{
230+
"documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
231+
"expect": {
232+
"endpoint": {
233+
"url": "https://billingconductor.us-isob-east-1.sc2s.sgov.gov"
234+
}
235+
},
236+
"params": {
237+
"Region": "us-isob-east-1",
238+
"UseDualStack": false,
239+
"UseFIPS": false
23240
}
24241
},
25242
{
@@ -30,9 +247,9 @@
30247
}
31248
},
32249
"params": {
250+
"Region": "us-east-1",
33251
"UseDualStack": false,
34252
"UseFIPS": false,
35-
"Region": "us-east-1",
36253
"Endpoint": "https://example.com"
37254
}
38255
},
@@ -42,9 +259,9 @@
42259
"error": "Invalid Configuration: FIPS and custom endpoint are not supported"
43260
},
44261
"params": {
262+
"Region": "us-east-1",
45263
"UseDualStack": false,
46264
"UseFIPS": true,
47-
"Region": "us-east-1",
48265
"Endpoint": "https://example.com"
49266
}
50267
},
@@ -54,9 +271,9 @@
54271
"error": "Invalid Configuration: Dualstack and custom endpoint are not supported"
55272
},
56273
"params": {
274+
"Region": "us-east-1",
57275
"UseDualStack": true,
58276
"UseFIPS": false,
59-
"Region": "us-east-1",
60277
"Endpoint": "https://example.com"
61278
}
62279
}

0 commit comments

Comments
 (0)