Skip to content

fix oapi, which has become obsolete in 4.0 #84

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
pruan-rht wants to merge 1 commit into from
Closed

fix oapi, which has become obsolete in 4.0 #84

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
15 changes: 13 additions & 2 deletions lib/rest_openshift.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module OpenShift
extend Helper

def self.populate(path, base_opts, opts)
populate_common("/oapi/<oapi_version>", path, base_opts, opts)
populate_common("/apis/user.openshift.io/<oapi_version>", path, base_opts, opts)
Copy link
Contributor

@akostadinov akostadinov Feb 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

::populate method is used by all calls. And I believe user.openshift.io is only for the user subsystem and will not work for ::list_projects for example.

I think that we need to drop this openshift/kube api calls separation because now openshift calls are not a separate endpoint, just extensions to kube API. And we can handle all calls in same way.

Copy link
Member Author

@pruan-rht pruan-rht Feb 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@akostadinov do you mean get ride of lib/rest_openshift.rb and merge it into lib/rest_kubernetes.rb

end

class << self
Expand Down Expand Up @@ -52,11 +52,22 @@ def self.get_project(base_opts, opts)
end

def self.get_user(base_opts, opts)
base_opts_org = base_opts.dup
populate("/users/<username>", base_opts, opts)
return perform(**base_opts, method: "GET") { |res|
res = perform(**base_opts, method: "GET") { |res|
res[:props][:name] = res[:parsed]["metadata"]["name"]
res[:props][:uid] = res[:parsed]["metadata"]["uid"]
}
unless res[:success]
# failed with new url, fall back to old url path
populate_common("/oapi/<oapi_version>", "/users/<username>", base_opts_org, opts)
res = perform(**base_opts_org, method: "GET") { |res|
res[:props][:name] = res[:parsed]["metadata"]["name"]
res[:props][:uid] = res[:parsed]["metadata"]["uid"]
}
end

return res
end

# this usually creates a project in fact
Expand Down