Skip to content

Commit a2f910f

Browse files
padamstxpadamstx
authored
fix(Resource Controller): re-gen service to get new Pagers (#176)
This commit contains a re-gen of the Resource Controller service to leverage the new Pagers emitted by the SDK generator. Signed-off-by: Phil Adams <phil_adams@us.ibm.com>
1 parent 7d543c3 commit a2f910f

File tree

5 files changed

+3034
-855
lines changed

5 files changed

+3034
-855
lines changed

‎.secrets.baseline‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2022-10-28T16:30:46Z",
6+
"generated_at": "2022-11-02T20:27:43Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -110,7 +110,7 @@
110110
"hashed_secret": "d506bd5213c46bd49e16c634754ad70113408252",
111111
"is_secret": false,
112112
"is_verified": false,
113-
"line_number": 3380,
113+
"line_number": 3697,
114114
"type": "Secret Keyword",
115115
"verified_result": null
116116
}
@@ -294,19 +294,43 @@
294294
}
295295
],
296296
"test/unit/test_resource_controller_v2.py": [
297+
{
298+
"hashed_secret": "0f97a4e707b7424540793cb2078919ee6770e07f",
299+
"is_secret": false,
300+
"is_verified": false,
301+
"line_number": 428,
302+
"type": "Hex High Entropy String",
303+
"verified_result": null
304+
},
305+
{
306+
"hashed_secret": "9dcf8fc308ef6fa3b7a44871323d56c7cd34339a",
307+
"is_secret": false,
308+
"is_verified": false,
309+
"line_number": 1510,
310+
"type": "Secret Keyword",
311+
"verified_result": null
312+
},
297313
{
298314
"hashed_secret": "d4c3d66fd0c38547a3c7a4c6bdc29c36911bc030",
299315
"is_secret": false,
300316
"is_verified": false,
301-
"line_number": 2277,
317+
"line_number": 3082,
318+
"type": "Secret Keyword",
319+
"verified_result": null
320+
},
321+
{
322+
"hashed_secret": "e5820470b19c80887788982786c5219793dc60bb",
323+
"is_secret": false,
324+
"is_verified": false,
325+
"line_number": 3151,
302326
"type": "Secret Keyword",
303327
"verified_result": null
304328
},
305329
{
306330
"hashed_secret": "b8473b86d4c2072ca9b08bd28e373e8253e865c4",
307331
"is_secret": false,
308332
"is_verified": false,
309-
"line_number": 3177,
333+
"line_number": 4207,
310334
"type": "Secret Keyword",
311335
"verified_result": null
312336
}

‎examples/test_resource_controller_v2_examples.py‎

Lines changed: 71 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# (C) Copyright IBM Corp. 2020.
2+
# (C) Copyright IBM Corp. 2020, 2022.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -171,18 +171,22 @@ def test_list_resource_instances_example(self):
171171
list_resource_instances request example
172172
"""
173173
try:
174-
global resource_instance_name
175174
print('\nlist_resource_instances() result:')
176175
# begin-list_resource_instances
177176

178-
resource_instances_list = resource_controller_service.list_resource_instances(
179-
name=resource_instance_name
180-
).get_result()
177+
all_results = []
178+
pager = ResourceInstancesPager(
179+
client=resource_controller_service,
180+
name=resource_instance_name,
181+
)
182+
while pager.has_next():
183+
next_page = pager.get_next()
184+
assert next_page is not None
185+
all_results.extend(next_page)
181186

182-
print(json.dumps(resource_instances_list, indent=2))
187+
print(json.dumps(all_results, indent=2))
183188

184189
# end-list_resource_instances
185-
186190
except ApiException as e:
187191
pytest.fail(str(e))
188192

@@ -268,14 +272,19 @@ def test_list_resource_aliases_example(self):
268272
print('\nlist_resource_aliases() result:')
269273
# begin-list_resource_aliases
270274

271-
resource_aliases_list = resource_controller_service.list_resource_aliases(
272-
name=alias_name
273-
).get_result()
275+
all_results = []
276+
pager = ResourceAliasesPager(
277+
client=resource_controller_service,
278+
name=alias_name,
279+
)
280+
while pager.has_next():
281+
next_page = pager.get_next()
282+
assert next_page is not None
283+
all_results.extend(next_page)
274284

275-
print(json.dumps(resource_aliases_list, indent=2))
285+
print(json.dumps(all_results, indent=2))
276286

277287
# end-list_resource_aliases
278-
279288
except ApiException as e:
280289
pytest.fail(str(e))
281290

@@ -311,14 +320,19 @@ def test_list_resource_aliases_for_instance_example(self):
311320
print('\nlist_resource_aliases_for_instance() result:')
312321
# begin-list_resource_aliases_for_instance
313322

314-
resource_aliases_list = resource_controller_service.list_resource_aliases_for_instance(
315-
id=instance_guid
316-
).get_result()
323+
all_results = []
324+
pager = ResourceAliasesForInstancePager(
325+
client=resource_controller_service,
326+
id=instance_guid,
327+
)
328+
while pager.has_next():
329+
next_page = pager.get_next()
330+
assert next_page is not None
331+
all_results.extend(next_page)
317332

318-
print(json.dumps(resource_aliases_list, indent=2))
333+
print(json.dumps(all_results, indent=2))
319334

320335
# end-list_resource_aliases_for_instance
321-
322336
except ApiException as e:
323337
pytest.fail(str(e))
324338

@@ -383,14 +397,19 @@ def test_list_resource_bindings_example(self):
383397
print('\nlist_resource_bindings() result:')
384398
# begin-list_resource_bindings
385399

386-
resource_bindings_list = resource_controller_service.list_resource_bindings(
387-
name=binding_name
388-
).get_result()
400+
all_results = []
401+
pager = ResourceBindingsPager(
402+
client=resource_controller_service,
403+
name=binding_name,
404+
)
405+
while pager.has_next():
406+
next_page = pager.get_next()
407+
assert next_page is not None
408+
all_results.extend(next_page)
389409

390-
print(json.dumps(resource_bindings_list, indent=2))
410+
print(json.dumps(all_results, indent=2))
391411

392412
# end-list_resource_bindings
393-
394413
except ApiException as e:
395414
pytest.fail(str(e))
396415

@@ -426,14 +445,19 @@ def test_list_resource_bindings_for_alias_example(self):
426445
print('\nlist_resource_bindings_for_alias() result:')
427446
# begin-list_resource_bindings_for_alias
428447

429-
resource_bindings_list = resource_controller_service.list_resource_bindings_for_alias(
430-
id=alias_guid
431-
).get_result()
448+
all_results = []
449+
pager = ResourceBindingsForAliasPager(
450+
client=resource_controller_service,
451+
id=alias_guid,
452+
)
453+
while pager.has_next():
454+
next_page = pager.get_next()
455+
assert next_page is not None
456+
all_results.extend(next_page)
432457

433-
print(json.dumps(resource_bindings_list, indent=2))
458+
print(json.dumps(all_results, indent=2))
434459

435460
# end-list_resource_bindings_for_alias
436-
437461
except ApiException as e:
438462
pytest.fail(str(e))
439463

@@ -498,14 +522,19 @@ def test_list_resource_keys_example(self):
498522
print('\nlist_resource_keys() result:')
499523
# begin-list_resource_keys
500524

501-
resource_keys_list = resource_controller_service.list_resource_keys(
502-
name=key_name
503-
).get_result()
525+
all_results = []
526+
pager = ResourceKeysPager(
527+
client=resource_controller_service,
528+
name=key_name,
529+
)
530+
while pager.has_next():
531+
next_page = pager.get_next()
532+
assert next_page is not None
533+
all_results.extend(next_page)
504534

505-
print(json.dumps(resource_keys_list, indent=2))
535+
print(json.dumps(all_results, indent=2))
506536

507537
# end-list_resource_keys
508-
509538
except ApiException as e:
510539
pytest.fail(str(e))
511540

@@ -541,14 +570,19 @@ def test_list_resource_keys_for_instance_example(self):
541570
print('\nlist_resource_keys_for_instance() result:')
542571
# begin-list_resource_keys_for_instance
543572

544-
resource_keys_list = resource_controller_service.list_resource_keys_for_instance(
545-
id=instance_guid
546-
).get_result()
573+
all_results = []
574+
pager = ResourceKeysForInstancePager(
575+
client=resource_controller_service,
576+
id=instance_guid,
577+
)
578+
while pager.has_next():
579+
next_page = pager.get_next()
580+
assert next_page is not None
581+
all_results.extend(next_page)
547582

548-
print(json.dumps(resource_keys_list, indent=2))
583+
print(json.dumps(all_results, indent=2))
549584

550585
# end-list_resource_keys_for_instance
551-
552586
except ApiException as e:
553587
pytest.fail(str(e))
554588

0 commit comments

Comments
 (0)