Skip to content

Backport 'resource.kind as list' patch #276

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

Closed
mmazur wants to merge 1 commit into from
Closed

Backport 'resource.kind as list' patch #276

Show file tree
Hide file tree
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
20 changes: 13 additions & 7 deletions openshift/dynamic/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import json
import hashlib
import tempfile
from collections import defaultdict
from functools import partial
from six import PY2, PY3

Expand Down Expand Up @@ -185,7 +186,7 @@ def parse_api_groups(self):
def get_resources_for_api_version(self, prefix, group, version, preferred):
""" returns a dictionary of resources associated with provided groupVersion"""

resources = {}
resources = defaultdict(list)
subresources = {}

path = '/'.join(filter(None, [prefix, group, version]))
Expand All @@ -204,7 +205,7 @@ def get_resources_for_api_version(self, prefix, group, version, preferred):
for key in ('prefix', 'group', 'api_version', 'client', 'preferred'):
resource.pop(key, None)

resources[resource['kind']] = Resource(
resourceobj = Resource(
prefix=prefix,
group=group,
api_version=version,
Expand All @@ -213,7 +214,10 @@ def get_resources_for_api_version(self, prefix, group, version, preferred):
subresources=subresources.get(resource['name']),
**resource
)
resources['{}List'.format(resource['kind'])] = ResourceList(resources[resource['kind']])
resource_list = ResourceList(resources[resource['kind']])

resources[resource['kind']].append(resourceobj)
resources[resource_list.kind].append(resource_list)
return resources

def ensure_namespace(self, resource, namespace, body):
Expand Down Expand Up @@ -670,11 +674,13 @@ def __search(self, parts, resources):
else:
resource = resources.get(part)
if parts[1] != '*' and isinstance(parts[1], dict):
for term, value in parts[1].items():
if getattr(resource, term) == value:
return [resource]
for _res in resource:
for term, value in parts[1].items():
if getattr(_res, term) == value:
return [_res]
return []
else:
return [resource]
return resource
elif part == '*':
matches = []
for key in resources.keys():
Expand Down
Loading