Reimplement list kinds to be more generic #240
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
the
size/L
fabianvf
force-pushed
the
better-resource-list
branch
from
126962a
to
88b8b0a
Compare
|
@willthames or @asetty any reservations about this one going in? |
asetty
reviewed
Dec 13, 2018
| @@ -916,7 +987,7 @@ def main(): | |||
| item = {} | |||
| item[key] = {k: v for k, v in resource.__dict__.items() if k not in ('client', 'subresources', 'resource')} | |||
| if isinstance(resource, ResourceList): | |||
| item[key]["resource"] = '{}.{}'.format(resource.resource.group_version, resource.resource.kind) | |||
| item[key]["resource"] = '{}.{}'.format(resource.group_version, resource.kind) | |||
There was a problem hiding this comment.
Should this be resource.base_kind instead of resource.kind?
Maybe you don't need this at all because base_kind is already an attribute of the resource.
asetty
reviewed
Dec 13, 2018
openshift/dynamic/client.py
Outdated
| @@ -738,7 +809,7 @@ def __iter__(self): | |||
| prefix, group, version, rg.preferred) | |||
| self._cache['resources'][prefix][group][version] = rg | |||
| self.__update_cache = True | |||
| for resource in rg.resources: | |||
| for _, resource in rg.resources.items(): | |||
There was a problem hiding this comment.
Good catch. Maybe use iteritems instead so you get an iterator rather than create a list.
asetty
suggested changes
Dec 13, 2018
willthames
pushed a commit
to willthames/openshift-restclient-python
that referenced
this pull request
Feb 3, 2019
* Reimplement list kinds to generically support typed and untyped lists * Fix various issues from rebase * Use iteritems from six
willthames
pushed a commit
to willthames/openshift-restclient-python
that referenced
this pull request
Nov 22, 2019
* Reimplement list kinds to generically support typed and untyped lists * Fix various issues from rebase * Use iteritems from six
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This implementation will support both typed and untyped List kinds, and we now automatically add the fake
v1.Listresource during discovery.Should fix one of the issues brought up in redhat-cop/openshift-applier#39, also recorded in ansible/ansible#49100, and will close #209