morpheus-cli 5.3.1.1 → 5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a64f6250b5cad8827e2d0e11349e21fbb6fedc974503a79fa9a2b1defb7d381a
-  data.tar.gz: 6ab1fb279210a5b7a5dce73e19061b82dec7872463e38b5848fb7fe49a6891d3
+  metadata.gz: e776b0e0602c4de27079e0796d270009b0d3a592d571a41721ac936c7537b94e
+  data.tar.gz: 10f231de3b75dc6a16d5433af35a1cbde2931d1871bf2106040ee49a0812091c
 SHA512:
-  metadata.gz: 98e1a3b24ad173eb9d8077ae0e0a9a7602beecf42e370e1bc6be5e82a9a52385f2e749c035273c3057f3b3377dbbf4cd9eee1086131fdda55fe46e296d7d7c86
-  data.tar.gz: 03c1b3f5059084a7c57e68ed6888174aaca554eea319f85d043ed79752470c1487d0ea946b0e9d10244e894e03061e2266036d40a0d3d86692d0ce0c607c6dfb
+  metadata.gz: 893fd73648238a2a360273fef6a44654b0011075401743f6be61ba5f32c487f8bc5c5936f440cbcbb6be99ce05888ef99e453545e7f435e834a54ade3062851a
+  data.tar.gz: c558b3e31997546f382b44339183431e6d855be77b82e6c85be623c32dcf3333ae0a34c725b19fb317e308d8ec3ca2963de9f51ceba5b3bd658c7ad013ae9d67

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 5.3.1.1
+RUN gem install morpheus-cli -v 5.3.2
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/option_type_lists_interface.rb

@@ -2,38 +2,50 @@ require 'morpheus/api/api_client'
 
 class Morpheus::OptionTypeListsInterface < Morpheus::APIClient
 
-  def get(id)
+  def base_path
+    "/api/library/option-type-lists"
+  end
+
+  def get(id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/library/option-type-lists/#{id}"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    url = "#{base_path}/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
   def list(params={})
-    url = "#{@base_url}/api/library/option-type-lists"
+    url = "#{base_path}"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
     headers[:params].merge!(params)
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
+  def list_items(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{base_path}/#{id}/items"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
   def create(payload)
-    url = "#{@base_url}/api/library/option-type-lists"
+    url = "#{base_path}"
     headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
   def update(id, payload)
-    url = "#{@base_url}/api/library/option-type-lists/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
   def destroy(id)
-    url = "#{@base_url}/api/library/option-type-lists/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :delete, url: url, headers: headers}
     execute(opts)

data/lib/morpheus/cli/library_cluster_layouts_command.rb

@@ -41,10 +41,9 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
       opts.footer = "List cluster layouts."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
     if args.count > 0
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.inspect}\n#{optparse}"
-      return 1
+      options[:phrase] = args.join(" ")
     end
     connect(options)
     begin

data/lib/morpheus/cli/library_container_scripts_command.rb

@@ -25,12 +25,11 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       opts.footer = "List container scripts."
     end
     optparse.parse!(args)
-    connect(options)
+    # verify_args!(args:args, optparse:optparse, count:0)
     if args.count > 0
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
-      return 1
+      options[:phrase] = args.join(" ")
     end
+    connect(options)
     begin
       # construct payload
       params.merge!(parse_list_options(options))

data/lib/morpheus/cli/library_container_templates_command.rb

@@ -26,6 +26,10 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
       build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     connect(options)
     begin
       [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|

data/lib/morpheus/cli/library_container_types_command.rb

@@ -49,10 +49,9 @@ class Morpheus::Cli::LibraryContainerTypesCommand
       opts.footer = "List node types."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
     if args.count > 0
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.inspect}\n#{optparse}"
-      return 1
+      options[:phrase] = args.join(" ")
     end
     connect(options)
     begin

data/lib/morpheus/cli/library_instance_types_command.rb

@@ -47,10 +47,9 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       opts.footer = "List instance types."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
     if args.count > 0
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.inspect}\n#{optparse}"
-      return 1
+      options[:phrase] = args.join(" ")
     end
     connect(options)
     begin

data/lib/morpheus/cli/library_layouts_command.rb

@@ -59,6 +59,10 @@ class Morpheus::Cli::LibraryLayoutsCommand
       opts.footer = "List layouts."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     connect(options)
     begin
       # construct payload

data/lib/morpheus/cli/library_option_lists_command.rb

@@ -9,7 +9,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
   include Morpheus::Cli::LibraryHelper
 
   set_command_name :'library-option-lists'
-  register_subcommands :list, :get, :add, :update, :remove
+  register_subcommands :list, :get, :list_items, :add, :update, :remove
 
   def initialize()
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -35,6 +35,10 @@ class Morpheus::Cli::LibraryOptionListsCommand
       opts.footer = "List option lists."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     connect(options)
     begin
       params = {}
@@ -61,16 +65,14 @@ class Morpheus::Cli::LibraryOptionListsCommand
             id: option_type_list['id'],
             name: option_type_list['name'],
             description: option_type_list['description'],
-            type: option_type_list['type'],
-            size: option_type_list['listItems'] ? option_type_list['listItems'].size : ''
+            type: ((option_type_list['type'] == 'api') ? "#{option_type_list['type']} (#{option_type_list['apiType']})" : option_type_list['type'])
           }
         end
           columns = [
           :id,
           :name,
           :description,
-          :type,
-          :size
+          :type
         ]
         print cyan
         print as_pretty_table(rows, columns, options)
@@ -90,8 +92,8 @@ class Morpheus::Cli::LibraryOptionListsCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_standard_get_options(opts, options)
-      opts.on(nil,'--no-items', "Do not display List Items") do |val|
-        options[:no_list_items] = true
+      opts.on(nil,'--items', "Load and display option list items") do |val|
+        options[:list_items] = true
       end
       opts.footer = "Get details about an option list.\n" + 
                     "[name] is required. This is the name or id of an option list. Supports 1-N [name] arguments."
@@ -108,20 +110,31 @@ class Morpheus::Cli::LibraryOptionListsCommand
   end
   
   def _get(id, options)
-    
+    params = {}
+    params.merge!(parse_query_options(options))
     begin
       @option_type_lists_interface.setopts(options)
       if options[:dry_run]
         if id.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @option_type_lists_interface.dry.get(id.to_i)
+          print_dry_run @option_type_lists_interface.dry.get(id.to_i, params)
         else
-          print_dry_run @option_type_lists_interface.dry.list({name: id})
+          print_dry_run @option_type_lists_interface.dry.list(params.merge({name: id}))
         end
         return
       end
       option_type_list = find_option_type_list_by_name_or_id(id)
       return 1 if option_type_list.nil?
-
+      list_items = nil
+      if options[:list_items]
+        list_items = option_type_list['listItems']
+        if list_items.nil?
+          begin
+            list_items = @option_type_lists_interface.list_items(option_type_list['id'])['listItems']
+          rescue => e
+            puts_error "Failed to load option list items: #{e.message}"
+          end
+        end
+      end
       json_response = {'optionTypeList' => option_type_list}
       render_result = render_with_format(json_response, options, 'optionTypeList')
       return 0 if render_result
@@ -142,12 +155,14 @@ class Morpheus::Cli::LibraryOptionListsCommand
           "ID" => 'id',
           "Name" => 'name',
           "Description" => 'description',
-          "Type" => lambda {|it| it['type'].to_s.capitalize },
+          "Type" => lambda {|it| it['type'] },
+          "API Type" => lambda {|it| it['apiType'] },
           "Source URL" => 'sourceUrl',
           "Real Time" => lambda {|it| format_boolean it['realTime'] },
           "Ignore SSL Errors" => lambda {|it| format_boolean it['ignoreSSLErrors'] },
           "Source Method" => lambda {|it| it['sourceMethod'].to_s.upcase }
         }
+        option_list_columns.delete("API Type") if option_type_list['type'] != 'api'
         source_headers = []
         if option_type_list['config'] && option_type_list['config']['sourceHeaders']
           source_headers = option_type_list['config']['sourceHeaders'].collect do |header|
@@ -174,12 +189,13 @@ class Morpheus::Cli::LibraryOptionListsCommand
           print reset,"#{option_type_list['requestScript']}","\n",reset
         end
       end
-      if options[:no_list_items] != true
-        list_items = option_type_list['listItems']
+      if options[:list_items]
+        print_h2 "List Items"
         if list_items && list_items.size > 0
-          print_h2 "List Items"
           print as_pretty_table(list_items, [:name, :value], options)
           print_results_pagination({size: list_items.size, total: list_items.size})
+        else
+          print cyan,"No list items found.",reset,"\n"
         end
       end
       print reset,"\n"
@@ -189,6 +205,42 @@ class Morpheus::Cli::LibraryOptionListsCommand
     end
   end
 
+  def list_items(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      build_standard_get_options(opts, options)
+      opts.footer = "List items for an option list.\n" + 
+                    "[name] is required. This is the name or id of an option list."
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    option_type_list = find_option_type_list_by_name_or_id(args[0])
+    return 1 if option_type_list.nil?
+
+    params.merge!(parse_list_options(options))
+    @option_type_lists_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @option_type_lists_interface.dry.list_items(option_type_list['id'], params)
+      return
+    end
+    json_response = @option_type_lists_interface.list_items(option_type_list['id'], params)
+    list_items = json_response['listItems']
+    render_response(json_response, options, "listItems") do
+      print_h2 "List Items"
+      if list_items && list_items.size > 0
+        print as_pretty_table(list_items, [:name, :value], options)
+        print_results_pagination({size: list_items.size, total: list_items.size})
+      else
+        print cyan,"No list items found.",reset,"\n"
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
   def add(args)
     options = {}
     my_option_types = nil
@@ -373,7 +425,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
         {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'realTime', 'fieldLabel' => 'Real Time', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 7},
         {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'sourceMethod', 'fieldLabel' => 'Source Method', 'type' => 'select', 'selectOptions' => [{'name' => 'GET', 'value' => 'GET'}, {'name' => 'POST', 'value' => 'POST'}], 'defaultValue' => 'GET', 'required' => true, 'displayOrder' => 8},
         # sourceHeaders component (is done afterwards manually)
-        {'dependsOnCode' => 'optionTypeList.type:api', 'fieldName' => 'apiType', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'apiOptionLists', 'required' => true, 'description' => 'The code of the api list to use, eg. clouds, servers, etc.', 'displayOrder' => 9},
+        {'dependsOnCode' => 'optionTypeList.type:api', 'fieldName' => 'apiType', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'apiOptionLists', 'required' => true, 'description' => 'The code of the api option list to use, eg. clouds, environments, groups, instances, instance-wiki, networks, servicePlans, resourcePools, securityGroups, servers, server-wiki', 'displayOrder' => 9},
         {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'sourceUsername', 'fieldLabel' => 'Source Username', 'type' => 'text', 'description' => "An LDAP Username for use when type is 'ldap'.", 'displayOrder' => 10},
         {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'sourcePassword', 'fieldLabel' => 'Source Username', 'type' => 'text', 'description' => "An LDAP Password for use when type is 'ldap'.", 'displayOrder' => 11},
         {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'ldapQuery', 'fieldLabel' => 'LDAP Query', 'type' => 'text', 'description' => "LDAP Queries are standard LDAP formatted queries where different objects can be searched. Dependent parameters can be loaded into the query using the <%=phrase%> syntax.", 'displayOrder' => 12},

data/lib/morpheus/cli/library_option_types_command.rb

@@ -35,6 +35,10 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       opts.footer = "List option types."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     connect(options)
     begin
       params = {}

data/lib/morpheus/cli/library_spec_templates_command.rb

@@ -26,12 +26,11 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
       opts.footer = "List spec templates."
     end
     optparse.parse!(args)
-    connect(options)
+    # verify_args!(args:args, optparse:optparse, count:0)
     if args.count > 0
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.inspect}\n#{optparse}"
-      return 1
+      options[:phrase] = args.join(" ")
     end
+    connect(options)
     begin
       # construct payload
       params.merge!(parse_list_options(options))

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.3.1.1"
+    VERSION = "5.3.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.3.1.1
+  version: 5.3.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler