diff options
author | Vivek Singh <vivek.singh@msystechnologies.com> | 2019-10-09 19:59:46 +0530 |
---|---|---|
committer | Vivek Singh <vivek.singh@msystechnologies.com> | 2019-10-09 19:59:46 +0530 |
commit | c1063d582e5f2dd96103ef454ac35456c6c599c0 (patch) | |
tree | 57f8140678bffbc12cdc4bdf105e019bf720d18b /lib/chef/knife/supermarket_list.rb | |
parent | a2311335336c857f2f72d0d7c844bc6e208d2d49 (diff) | |
download | chef-c1063d582e5f2dd96103ef454ac35456c6c599c0.tar.gz |
Update get_cookbook_list query params
Signed-off-by: Vivek Singh <vivek.singh@msystechnologies.com>
Diffstat (limited to 'lib/chef/knife/supermarket_list.rb')
-rw-r--r-- | lib/chef/knife/supermarket_list.rb | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lib/chef/knife/supermarket_list.rb b/lib/chef/knife/supermarket_list.rb index b0c87c3081..c379ea56c9 100644 --- a/lib/chef/knife/supermarket_list.rb +++ b/lib/chef/knife/supermarket_list.rb @@ -48,29 +48,25 @@ class Chef description: "Show cookbooks that are owned by the USER" def run - url_params = [] - url_params << "&order=#{config[:sort_by]}" if config[:sort_by] - url_params << "&user=#{config[:owned_by]}" if config[:owned_by] - - query = url_params.join unless url_params.empty? - cookbooks_list = get_cookbook_list(query) if config[:with_uri] - ui.output(format_for_display(cookbooks_list)) + ui.output(format_for_display(get_cookbook_list)) else - ui.msg(ui.list(cookbooks_list.keys, :columns_down)) + ui.msg(ui.list(get_cookbook_list.keys, :columns_down)) end end - def get_cookbook_list(query, items = 1000, start = 0, cookbook_collection = {}) + def get_cookbook_list(items = 1000, start = 0, cookbook_collection = {}) cookbooks_url = "#{config[:supermarket_site]}/api/v1/cookbooks?items=#{items}&start=#{start}" - cookbooks_url << query if query + cookbooks_url << "&order=#{config[:sort_by]}" if config[:sort_by] + cookbooks_url << "&user=#{config[:owned_by]}" if config[:owned_by] cr = noauth_rest.get(cookbooks_url) + cr["items"].each do |cookbook| cookbook_collection[cookbook["cookbook_name"]] = cookbook["cookbook"] end new_start = start + items if new_start < cr["total"] - get_cookbook_list(query, items, new_start, cookbook_collection) + get_cookbook_list(items, new_start, cookbook_collection) else cookbook_collection end |