Skip to content

Always set apiVersion and kind for resources within a resource list (#298) #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabianvf merged 1 commit into from
May 28, 2019
Merged

Always set apiVersion and kind for resources within a resource list (#298) #302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions openshift/dynamic/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ def get(self, body=None, **kwargs):
response = copy.deepcopy(body)
namespace = kwargs.pop('namespace', None)
response['items'] = [
self.resource.get(name=item['metadata']['name'], namespace=item['metadata'].get('namespace', namespace), **kwargs)
self.resource.get(name=item['metadata']['name'], namespace=item['metadata'].get('namespace', namespace), **kwargs).to_dict()
for item in body['items']
]
return ResourceInstance(self, response)
Expand All @@ -519,15 +519,15 @@ def delete(self, body=None, *args, **kwargs):
response = copy.deepcopy(body)
namespace = kwargs.pop('namespace', None)
response['items'] = [
self.resource.delete(name=item['metadata']['name'], namespace=item['metadata'].get('namespace', namespace), **kwargs)
self.resource.delete(name=item['metadata']['name'], namespace=item['metadata'].get('namespace', namespace), **kwargs).to_dict()
for item in body['items']
]
return ResourceInstance(self, response)

def verb_mapper(self, verb, body=None, **kwargs):
response = copy.deepcopy(body)
response['items'] = [
getattr(self.resource, verb)(body=item, **kwargs)
getattr(self.resource, verb)(body=item, **kwargs).to_dict()
for item in body['items']
]
return ResourceInstance(self, response)
Expand Down Expand Up @@ -738,6 +738,17 @@ class ResourceInstance(object):

def __init__(self, resource, instance):
self.resource_type = resource
# If we have a list of resources, then set the apiVersion and kind of
# each resource in 'items'
kind = instance['kind']
if kind.endswith('List') and 'items' in instance:
kind = instance['kind'][:-4]
for item in instance['items']:
if 'apiVersion' not in item:
item['apiVersion'] = instance['apiVersion']
if 'kind' not in item:
item['kind'] = kind

self.attributes = self.__deserialize(instance)

def __deserialize(self, field):
Expand Down