Skip to content

Commit 7650c9a

Browse files
mbohloolmbohlool
authored
Merge pull request #267 from blackwoodseven/master
Swap order of parameters 'name' and 'namespace' for TPRs
2 parents 04f059a + b0bc0be commit 7650c9a

File tree

4 files changed

+52
-52
lines changed

4 files changed

+52
-52
lines changed

‎kubernetes/client/apis/third_party_resources_api.py‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def delete_third_party_resource_with_http_info(self, body, **kwargs):
278278
_request_timeout=params.get('_request_timeout'),
279279
collection_formats=collection_formats)
280280

281-
def get_third_party_resource(self, namespace, name, fqdn, version, resource, **kwargs):
281+
def get_third_party_resource(self, name, namespace, fqdn, version, resource, **kwargs):
282282
"""
283283
Gets a specific Resource
284284
Returns a specific Resource in a namespace
@@ -288,12 +288,12 @@ def get_third_party_resource(self, namespace, name, fqdn, version, resource, **k
288288
>>> def callback_function(response):
289289
>>> pprint(response)
290290
>>>
291-
>>> thread = api.get_third_party_resource(namespace, name, fqdn, version, resource, callback=callback_function)
291+
>>> thread = api.get_third_party_resource(name, namespace, fqdn, version, resource, callback=callback_function)
292292
293293
:param callback function: The callback function
294294
for asynchronous request. (optional)
295-
:param str namespace: The Resource's namespace (required)
296295
:param str name: The Resource's name (required)
296+
:param str namespace: The Resource's namespace (required)
297297
:param str fqdn: The Third party Resource fqdn (required)
298298
:param str version: The Third party Resource version (required)
299299
:param str resource: The Resource type (required)
@@ -303,12 +303,12 @@ def get_third_party_resource(self, namespace, name, fqdn, version, resource, **k
303303
"""
304304
kwargs['_return_http_data_only'] = True
305305
if kwargs.get('callback'):
306-
return self.get_third_party_resource_with_http_info(namespace, name, fqdn, version, resource, **kwargs)
306+
return self.get_third_party_resource_with_http_info(name, namespace, fqdn, version, resource, **kwargs)
307307
else:
308-
(data) = self.get_third_party_resource_with_http_info(namespace, name, fqdn, version, resource, **kwargs)
308+
(data) = self.get_third_party_resource_with_http_info(name, namespace, fqdn, version, resource, **kwargs)
309309
return data
310310

311-
def get_third_party_resource_with_http_info(self, namespace, name, fqdn, version, resource, **kwargs):
311+
def get_third_party_resource_with_http_info(self, name, namespace, fqdn, version, resource, **kwargs):
312312
"""
313313
Gets a specific Resource
314314
Returns a specific Resource in a namespace
@@ -318,12 +318,12 @@ def get_third_party_resource_with_http_info(self, namespace, name, fqdn, version
318318
>>> def callback_function(response):
319319
>>> pprint(response)
320320
>>>
321-
>>> thread = api.get_third_party_resource_with_http_info(namespace, name, fqdn, version, resource, callback=callback_function)
321+
>>> thread = api.get_third_party_resource_with_http_info(name, namespace, fqdn, version, resource, callback=callback_function)
322322
323323
:param callback function: The callback function
324324
for asynchronous request. (optional)
325-
:param str namespace: The Resource's namespace (required)
326325
:param str name: The Resource's name (required)
326+
:param str namespace: The Resource's namespace (required)
327327
:param str fqdn: The Third party Resource fqdn (required)
328328
:param str version: The Third party Resource version (required)
329329
:param str resource: The Resource type (required)
@@ -332,7 +332,7 @@ def get_third_party_resource_with_http_info(self, namespace, name, fqdn, version
332332
returns the request thread.
333333
"""
334334

335-
all_params = ['namespace', 'name', 'fqdn', 'version', 'resource']
335+
all_params = ['name', 'namespace', 'fqdn', 'version', 'resource']
336336
all_params.append('callback')
337337
all_params.append('_return_http_data_only')
338338
all_params.append('_preload_content')
@@ -347,12 +347,12 @@ def get_third_party_resource_with_http_info(self, namespace, name, fqdn, version
347347
)
348348
params[key] = val
349349
del params['kwargs']
350-
# verify the required parameter 'namespace' is set
351-
if ('namespace' not in params) or (params['namespace'] is None):
352-
raise ValueError("Missing the required parameter `namespace` when calling `get_third_party_resource`")
353350
# verify the required parameter 'name' is set
354351
if ('name' not in params) or (params['name'] is None):
355352
raise ValueError("Missing the required parameter `name` when calling `get_third_party_resource`")
353+
# verify the required parameter 'namespace' is set
354+
if ('namespace' not in params) or (params['namespace'] is None):
355+
raise ValueError("Missing the required parameter `namespace` when calling `get_third_party_resource`")
356356
# verify the required parameter 'fqdn' is set
357357
if ('fqdn' not in params) or (params['fqdn'] is None):
358358
raise ValueError("Missing the required parameter `fqdn` when calling `get_third_party_resource`")
@@ -368,10 +368,10 @@ def get_third_party_resource_with_http_info(self, namespace, name, fqdn, version
368368

369369
resource_path = '/apis/{fqdn}/{version}/namespaces/{namespace}/{resource}/{name}'.replace('{format}', 'json')
370370
path_params = {}
371-
if 'namespace' in params:
372-
path_params['namespace'] = params['namespace']
373371
if 'name' in params:
374372
path_params['name'] = params['name']
373+
if 'namespace' in params:
374+
path_params['namespace'] = params['namespace']
375375
if 'fqdn' in params:
376376
path_params['fqdn'] = params['fqdn']
377377
if 'version' in params:
@@ -522,7 +522,7 @@ def list_third_party_resource_with_http_info(self, fqdn, version, resource, **kw
522522
_request_timeout=params.get('_request_timeout'),
523523
collection_formats=collection_formats)
524524

525-
def update_third_party_resource(self, namespace, name, fqdn, version, resource, body, **kwargs):
525+
def update_third_party_resource(self, name, namespace, fqdn, version, resource, body, **kwargs):
526526
"""
527527
Update a Resource
528528
Update the specified third party resource of the type specified
@@ -532,12 +532,12 @@ def update_third_party_resource(self, namespace, name, fqdn, version, resource,
532532
>>> def callback_function(response):
533533
>>> pprint(response)
534534
>>>
535-
>>> thread = api.update_third_party_resource(namespace, name, fqdn, version, resource, body, callback=callback_function)
535+
>>> thread = api.update_third_party_resource(name, namespace, fqdn, version, resource, body, callback=callback_function)
536536
537537
:param callback function: The callback function
538538
for asynchronous request. (optional)
539-
:param str namespace: The Resource's namespace (required)
540539
:param str name: The Resource's name (required)
540+
:param str namespace: The Resource's namespace (required)
541541
:param str fqdn: The Third party Resource fqdn (required)
542542
:param str version: The Third party Resource version (required)
543543
:param str resource: The Resource type (required)
@@ -548,12 +548,12 @@ def update_third_party_resource(self, namespace, name, fqdn, version, resource,
548548
"""
549549
kwargs['_return_http_data_only'] = True
550550
if kwargs.get('callback'):
551-
return self.update_third_party_resource_with_http_info(namespace, name, fqdn, version, resource, body, **kwargs)
551+
return self.update_third_party_resource_with_http_info(name, namespace, fqdn, version, resource, body, **kwargs)
552552
else:
553-
(data) = self.update_third_party_resource_with_http_info(namespace, name, fqdn, version, resource, body, **kwargs)
553+
(data) = self.update_third_party_resource_with_http_info(name, namespace, fqdn, version, resource, body, **kwargs)
554554
return data
555555

556-
def update_third_party_resource_with_http_info(self, namespace, name, fqdn, version, resource, body, **kwargs):
556+
def update_third_party_resource_with_http_info(self, name, namespace, fqdn, version, resource, body, **kwargs):
557557
"""
558558
Update a Resource
559559
Update the specified third party resource of the type specified
@@ -563,12 +563,12 @@ def update_third_party_resource_with_http_info(self, namespace, name, fqdn, vers
563563
>>> def callback_function(response):
564564
>>> pprint(response)
565565
>>>
566-
>>> thread = api.update_third_party_resource_with_http_info(namespace, name, fqdn, version, resource, body, callback=callback_function)
566+
>>> thread = api.update_third_party_resource_with_http_info(name, namespace, fqdn, version, resource, body, callback=callback_function)
567567
568568
:param callback function: The callback function
569569
for asynchronous request. (optional)
570-
:param str namespace: The Resource's namespace (required)
571570
:param str name: The Resource's name (required)
571+
:param str namespace: The Resource's namespace (required)
572572
:param str fqdn: The Third party Resource fqdn (required)
573573
:param str version: The Third party Resource version (required)
574574
:param str resource: The Resource type (required)
@@ -578,7 +578,7 @@ def update_third_party_resource_with_http_info(self, namespace, name, fqdn, vers
578578
returns the request thread.
579579
"""
580580

581-
all_params = ['namespace', 'name', 'fqdn', 'version', 'resource', 'body']
581+
all_params = ['name', 'namespace', 'fqdn', 'version', 'resource', 'body']
582582
all_params.append('callback')
583583
all_params.append('_return_http_data_only')
584584
all_params.append('_preload_content')
@@ -593,12 +593,12 @@ def update_third_party_resource_with_http_info(self, namespace, name, fqdn, vers
593593
)
594594
params[key] = val
595595
del params['kwargs']
596-
# verify the required parameter 'namespace' is set
597-
if ('namespace' not in params) or (params['namespace'] is None):
598-
raise ValueError("Missing the required parameter `namespace` when calling `update_third_party_resource`")
599596
# verify the required parameter 'name' is set
600597
if ('name' not in params) or (params['name'] is None):
601598
raise ValueError("Missing the required parameter `name` when calling `update_third_party_resource`")
599+
# verify the required parameter 'namespace' is set
600+
if ('namespace' not in params) or (params['namespace'] is None):
601+
raise ValueError("Missing the required parameter `namespace` when calling `update_third_party_resource`")
602602
# verify the required parameter 'fqdn' is set
603603
if ('fqdn' not in params) or (params['fqdn'] is None):
604604
raise ValueError("Missing the required parameter `fqdn` when calling `update_third_party_resource`")
@@ -617,10 +617,10 @@ def update_third_party_resource_with_http_info(self, namespace, name, fqdn, vers
617617

618618
resource_path = '/apis/{fqdn}/{version}/namespaces/{namespace}/{resource}/{name}'.replace('{format}', 'json')
619619
path_params = {}
620-
if 'namespace' in params:
621-
path_params['namespace'] = params['namespace']
622620
if 'name' in params:
623621
path_params['name'] = params['name']
622+
if 'namespace' in params:
623+
path_params['namespace'] = params['namespace']
624624
if 'fqdn' in params:
625625
path_params['fqdn'] = params['fqdn']
626626
if 'version' in params:

‎kubernetes/docs/ThirdPartyResourcesApi.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Name | Type | Description | Notes
132132
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
133133

134134
# **get_third_party_resource**
135-
> object get_third_party_resource(namespace, name, fqdn, version, resource)
135+
> object get_third_party_resource(name, namespace, fqdn, version, resource)
136136
137137
Gets a specific Resource
138138

@@ -153,15 +153,15 @@ kubernetes.client.configuration.api_key['authorization'] = 'YOUR_API_KEY'
153153

154154
# create an instance of the API class
155155
api_instance = kubernetes.client.ThirdPartyResourcesApi()
156-
namespace = 'namespace_example' # str | The Resource's namespace
157156
name = 'name_example' # str | The Resource's name
157+
namespace = 'namespace_example' # str | The Resource's namespace
158158
fqdn = 'fqdn_example' # str | The Third party Resource fqdn
159159
version = 'version_example' # str | The Third party Resource version
160160
resource = 'resource_example' # str | The Resource type
161161

162162
try:
163163
# Gets a specific Resource
164-
api_response = api_instance.get_third_party_resource(namespace, name, fqdn, version, resource)
164+
api_response = api_instance.get_third_party_resource(name, namespace, fqdn, version, resource)
165165
pprint(api_response)
166166
except ApiException as e:
167167
print("Exception when calling ThirdPartyResourcesApi->get_third_party_resource: %s\n" % e)
@@ -171,8 +171,8 @@ except ApiException as e:
171171

172172
Name | Type | Description | Notes
173173
------------- | ------------- | ------------- | -------------
174-
**namespace** | **str**| The Resource's namespace |
175174
**name** | **str**| The Resource's name |
175+
**namespace** | **str**| The Resource's namespace |
176176
**fqdn** | **str**| The Third party Resource fqdn |
177177
**version** | **str**| The Third party Resource version |
178178
**resource** | **str**| The Resource type |
@@ -252,7 +252,7 @@ Name | Type | Description | Notes
252252
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
253253

254254
# **update_third_party_resource**
255-
> object update_third_party_resource(namespace, name, fqdn, version, resource, body)
255+
> object update_third_party_resource(name, namespace, fqdn, version, resource, body)
256256
257257
Update a Resource
258258

@@ -273,16 +273,16 @@ kubernetes.client.configuration.api_key['authorization'] = 'YOUR_API_KEY'
273273

274274
# create an instance of the API class
275275
api_instance = kubernetes.client.ThirdPartyResourcesApi()
276-
namespace = 'namespace_example' # str | The Resource's namespace
277276
name = 'name_example' # str | The Resource's name
277+
namespace = 'namespace_example' # str | The Resource's namespace
278278
fqdn = 'fqdn_example' # str | The Third party Resource fqdn
279279
version = 'version_example' # str | The Third party Resource version
280280
resource = 'resource_example' # str | The Resource type
281281
body = NULL # object | The JSON schema of the Resource to create.
282282

283283
try:
284284
# Update a Resource
285-
api_response = api_instance.update_third_party_resource(namespace, name, fqdn, version, resource, body)
285+
api_response = api_instance.update_third_party_resource(name, namespace, fqdn, version, resource, body)
286286
pprint(api_response)
287287
except ApiException as e:
288288
print("Exception when calling ThirdPartyResourcesApi->update_third_party_resource: %s\n" % e)
@@ -292,8 +292,8 @@ except ApiException as e:
292292

293293
Name | Type | Description | Notes
294294
------------- | ------------- | ------------- | -------------
295-
**namespace** | **str**| The Resource's namespace |
296295
**name** | **str**| The Resource's name |
296+
**namespace** | **str**| The Resource's namespace |
297297
**fqdn** | **str**| The Third party Resource fqdn |
298298
**version** | **str**| The Third party Resource version |
299299
**resource** | **str**| The Resource type |

‎scripts/swagger.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33262,17 +33262,17 @@
3326233262
},
3326333263
"parameters": [
3326433264
{
33265-
"description": "The Resource's namespace",
33265+
"description": "The Resource's name",
3326633266
"required": true,
3326733267
"type": "string",
33268-
"name": "namespace",
33268+
"name": "name",
3326933269
"in": "path"
3327033270
},
3327133271
{
33272-
"description": "The Resource's name",
33272+
"description": "The Resource's namespace",
3327333273
"required": true,
3327433274
"type": "string",
33275-
"name": "name",
33275+
"name": "namespace",
3327633276
"in": "path"
3327733277
},
3327833278
{
@@ -33371,17 +33371,17 @@
3337133371
},
3337233372
"parameters": [
3337333373
{
33374-
"description": "The Resource's namespace",
33374+
"description": "The Resource's name",
3337533375
"required": true,
3337633376
"type": "string",
33377-
"name": "namespace",
33377+
"name": "name",
3337833378
"in": "path"
3337933379
},
3338033380
{
33381-
"description": "The Resource's name",
33381+
"description": "The Resource's namespace",
3338233382
"required": true,
3338333383
"type": "string",
33384-
"name": "name",
33384+
"name": "namespace",
3338533385
"in": "path"
3338633386
},
3338733387
{

‎scripts/thirdpartypaths.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,17 @@
114114
],
115115
"parameters": [
116116
{
117-
"name": "namespace",
117+
"name": "name",
118118
"in": "path",
119119
"required": true,
120-
"description": "The Resource's namespace",
120+
"description": "The Resource's name",
121121
"type": "string"
122122
},
123123
{
124-
"name": "name",
124+
"name": "namespace",
125125
"in": "path",
126126
"required": true,
127-
"description": "The Resource's name",
127+
"description": "The Resource's namespace",
128128
"type": "string"
129129
},
130130
{
@@ -214,17 +214,17 @@
214214
],
215215
"parameters": [
216216
{
217-
"name": "namespace",
217+
"name": "name",
218218
"in": "path",
219219
"required": true,
220-
"description": "The Resource's namespace",
220+
"description": "The Resource's name",
221221
"type": "string"
222222
},
223223
{
224-
"name": "name",
224+
"name": "namespace",
225225
"in": "path",
226226
"required": true,
227-
"description": "The Resource's name",
227+
"description": "The Resource's namespace",
228228
"type": "string"
229229
},
230230
{

0 commit comments

Comments
 (0)