morpheus-cli 4.1.13 → 4.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac0df1975e8da11d8f660ff39e84e186395b54b32f5022d444a182afc63d3df5
-  data.tar.gz: b3171f8c621d1090962322eb95478653e51740d1d08c9aafb1db9b20d60f619e
+  metadata.gz: 6ed9f7ed5543846a64411f1e25133cad8df66ee4a2db836754f4733225d83962
+  data.tar.gz: 859c8b97f7ca569359cb795462803da90c0ed624998c67cf358aa5b5ae8a7df5
 SHA512:
-  metadata.gz: d554ef4a1d27f7763e41eebeca34952ee24ce70072148999615bb50cea6863ebb13e9527751ab0701c6ebd5af300986cf12703c4e88059462ee02a05f1d95902
-  data.tar.gz: a223e0e79f20bf202743e2592186c249da94cb81accd63cef4d1f38c44571dce8e761dd8282cc355fdd4e7121f6117c731ed0c081fa4a62cb1d940b0eda344fb
+  metadata.gz: c140d5c006c3bb4b179c8d763514b47cc8b36f8526cb60472f39043601054e5da55cadd79039ec02cf756e54fe36ae3358a5fb1029ca18a0eef9ed60eb5a1e51
+  data.tar.gz: f81e24cbe8a4a62c46d33420baa43e9a599930ac2cc1066f05fac766fb82d0d96511dd2a06a99cd5b1b5f55edf56dc6a19a59004f7e997388d64ddf85b533b0d

data/lib/morpheus/cli/cli_command.rb

@@ -567,13 +567,17 @@ module Morpheus
             end
 
           when :fields
-            opts.on('-F', '--fields x,y,z', Array, "Filter Output to a limited set of fields. Default is all fields.") do |val|
+            opts.on('-f', '--fields x,y,z', Array, "Filter Output to a limited set of fields. Default is all fields.") do |val|
+              options[:include_fields] = val
+            end
+            opts.on('-F', '--old-fields x,y,z', Array, "alias for -f, --fields") do |val|
               options[:include_fields] = val
             end
             opts.on(nil, '--all-fields', "Show all fields. Useful for showing hidden columns on wide tables.") do
               options[:all_fields] = true
             end
             opts.add_hidden_option('--all-fields') if opts.is_a?(Morpheus::Cli::OptionParser)
+            opts.add_hidden_option('-F,') if opts.is_a?(Morpheus::Cli::OptionParser)
 
           when :thin
             opts.on( '--thin', '--thin', "Format headers and columns with thin borders." ) do |val|

data/lib/morpheus/cli/hosts.rb

@@ -109,10 +109,10 @@ class Morpheus::Cli::Hosts
         options[:details] = true
       end
       opts.on('--tag-compliant', "Displays only servers that are valid according to applied tag policies. Does not show servers that do not have tag policies." ) do
-        options[:tagCompliant] = true
+        params[:tagCompliant] = true
       end
       opts.on('--non-tag-compliant', "Displays only servers with tag compliance warnings." ) do
-        options[:tagCompliant] = false
+        params[:tagCompliant] = false
       end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List hosts."
@@ -1238,8 +1238,8 @@ class Morpheus::Cli::Hosts
       end
       @servers_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @servers_interface.dry.make_managed(host['id'], payload)
-        return
+        print_dry_run(@servers_interface.dry.make_managed(host['id'], payload), options)
+        return 0
       end
       json_response = @servers_interface.make_managed(host['id'], payload)
       if options[:json]
@@ -1249,7 +1249,7 @@ class Morpheus::Cli::Hosts
         print_green_success "Host #{host['name']} is being converted to managed."
         puts "Public Key:\n#{json_response['publicKey']}\n(copy to your authorized_keys file)"
       end
-      return true
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

data/lib/morpheus/cli/library_instance_types_command.rb

@@ -251,12 +251,25 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       opts.footer = "Create a new instance type."
     end
     optparse.parse!(args)
+    if args.count > 1
+      raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    if args[0]
+      #params["name"] = args[0]
+      options[:options]["name"] = args[0]
+    end
     connect(options)
     begin
+      passed_options = (options[:options] || {}).reject {|k,v| k.is_a?(Symbol) }
       payload = nil
       if options[:payload]
         payload = options[:payload]
+        # merge -O options
+        payload.deep_merge!({'instanceType' => passed_options}) unless passed_options.empty?
       else
+        # merge -O options
+        params.deep_merge!(passed_options) unless passed_options.empty?
+        # prompt
         v_prompt = Morpheus::Cli::OptionTypes.prompt(add_instance_type_option_types, options[:options], @api_client, options[:params])
         params.deep_merge!(v_prompt)
         if params['logo']
@@ -328,10 +341,15 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
     begin
       instance_type = find_instance_type_by_name_or_id(args[0])
       exit 1 if instance_type.nil?
+      passed_options = (options[:options] || {}).reject {|k,v| k.is_a?(Symbol) }
       payload = nil
       if options[:payload]
         payload = options[:payload]
+        # merge -O options
+        payload.deep_merge!({'instanceType' => passed_options}) unless passed_options.empty?
       else
+        # merge -O options
+        params.deep_merge!(passed_options) unless passed_options.empty?
         # option_types = update_instance_type_option_types(instance_type)
         # params = Morpheus::Cli::OptionTypes.prompt(option_types, options[:options], @api_client, options[:params])
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]

data/lib/morpheus/cli/library_layouts_command.rb

@@ -20,6 +20,8 @@ class Morpheus::Cli::LibraryLayoutsCommand
     @api_client = establish_remote_appliance_connection(opts)
     @library_layouts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_layouts
     @library_instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_instance_types
+    @spec_templates_interface = @api_client.library_spec_templates
+    @spec_template_types_interface = @api_client.library_spec_template_types
     @provision_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).provision_types
     @option_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).option_types
     @option_type_lists_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).option_type_lists
@@ -156,6 +158,7 @@ class Morpheus::Cli::LibraryLayoutsCommand
       description_cols = {
         "ID" => lambda {|it| it['id'] },
         "Name" => lambda {|it| it['name'] },
+        "Instance Type" => lambda {|it| it['instanceType']['name'] rescue '' },
         #"Code" => lambda {|it| it['code'] },
         "Version" => lambda {|it| it['instanceVersion'] },
         "Description" => lambda {|it| it['description'] },
@@ -223,9 +226,9 @@ class Morpheus::Cli::LibraryLayoutsCommand
         # print yellow,"No option types found for this layout.","\n",reset
       end
 
-      print_h2 "Node Types"
       layout_node_types = layout['containerTypes']
       if layout_node_types && layout_node_types.size > 0
+        print_h2 "Node Types"
         # match UI sorting [version desc, name asc]
         # or use something simpler like one of these
         layout_node_types = layout_node_types.sort { |a,b| a['name'] <=> b['name'] }
@@ -240,7 +243,21 @@ class Morpheus::Cli::LibraryLayoutsCommand
         ]
         print as_pretty_table(layout_node_types, node_type_columns)
       else
-        print yellow,"No node types for this layout.","\n",reset
+        # print yellow,"No node types for this layout.","\n",reset
+      end
+
+      layout_spec_templates = layout['specTemplates']
+      if layout_spec_templates && layout_spec_templates.size > 0
+        print_h2 "Spec Templates"
+        layout_spec_templates = layout_spec_templates.sort { |a,b| a['name'] <=> b['name'] }
+        spec_template_columns = [
+          {"ID" => lambda {|it| it['id'] } },
+          {"NAME" => lambda {|it| it['name'] } },
+          {"TYPE" => lambda {|it| it['type']['name'] rescue '' } }
+        ]
+        print as_pretty_table(layout_spec_templates, spec_template_columns)
+      else
+        # print yellow,"No spec templates for this layout.","\n",reset
       end
 
       print reset,"\n"
@@ -281,11 +298,26 @@ class Morpheus::Cli::LibraryLayoutsCommand
       opts.on('--workflow ID', String, "Workflow") do |val|
         params['taskSetId'] = val.to_i
       end
-      opts.on('--option-types x,y,z', Array, "List of Option Type IDs") do |val|
-        option_type_ids = val #.collect {|it| it.to_i }
+      opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
+        if list.nil?
+          option_type_ids = []
+        else
+          option_type_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+      opts.on('--node-types [x,y,z]', Array, "List of Node Type IDs") do |list|
+        if list.nil?
+          node_type_ids = []
+        else
+          node_type_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
       end
-      opts.on('--node-types x,y,z', Array, "List of Node Type IDs") do |val|
-        node_type_ids = val #.collect {|it| it.to_i }
+      opts.on('--spec-templates [x,y,z]', Array, "List of Spec Templates to include in this layout, comma separated list of names or IDs.") do |list|
+        if list.nil?
+          params['specTemplates'] = []
+        else
+          params['specTemplates'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
       end
       #build_option_type_options(opts, options, add_layout_option_types())
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
@@ -293,17 +325,21 @@ class Morpheus::Cli::LibraryLayoutsCommand
                     "[instance-type] is required and can be passed as --instance-type instead."
     end
     optparse.parse!(args)
-    connect(options)
-    
+    if args.count > 1
+      raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    if args[0]
+      #params["name"] = args[0]
+      instance_type_id = args[0]
+    end
     if instance_type_id.nil?
       instance_type_id = args[0]
     end
-
     if !instance_type_id
       puts optparse
-      exit 1
+      return 1
     end
-
+    connect(options)
     begin
       instance_type = find_instance_type_by_name_or_id(instance_type_id)
       exit 1 if instance_type.nil?
@@ -377,6 +413,14 @@ class Morpheus::Cli::LibraryLayoutsCommand
           # prompt
         end
 
+        # SPEC TEMPLATES
+        prompt_results = prompt_for_spec_templates(params, options, @api_client)
+        if prompt_results[:success]
+          params['specTemplates'] = prompt_results[:data] unless prompt_results[:data].nil?
+        else
+          return 1
+        end
+        
 
         payload = {'instanceTypeLayout' => params}
         
@@ -431,11 +475,26 @@ class Morpheus::Cli::LibraryLayoutsCommand
       opts.on('--workflow ID', String, "Workflow") do |val|
         params['taskSetId'] = val.to_i
       end
-      opts.on('--option-types x,y,z', Array, "List of Option Type IDs") do |val|
-        option_type_ids = val #.collect {|it| it.to_i }
+      opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
+        if list.nil?
+          option_type_ids = []
+        else
+          option_type_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+      opts.on('--node-types [x,y,z]', Array, "List of Node Type IDs") do |list|
+        if list.nil?
+          node_type_ids = []
+        else
+          node_type_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
       end
-      opts.on('--node-types x,y,z', Array, "List of Node Type IDs") do |val|
-        node_type_ids = val #.collect {|it| it.to_i }
+      opts.on('--spec-templates [x,y,z]', Array, "List of Spec Templates to include in this layout, comma separated list of names or IDs.") do |list|
+        if list.nil?
+          params['specTemplates'] = []
+        else
+          params['specTemplates'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
       end
       #build_option_type_options(opts, options, update_layout_option_types())
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
@@ -479,6 +538,16 @@ class Morpheus::Cli::LibraryLayoutsCommand
           # prompt
         end
 
+        # SPEC TEMPLATES
+        if params['specTemplates']
+          prompt_results = prompt_for_spec_templates(params, options, @api_client)
+          if prompt_results[:success]
+            params['specTemplates'] = prompt_results[:data] unless prompt_results[:data].nil?
+          else
+            return 1
+          end
+        end
+
         if params.empty?
           puts optparse
           exit 1

data/lib/morpheus/cli/library_spec_templates_command.rb

@@ -1,9 +1,10 @@
 require 'morpheus/cli/cli_command'
+require 'morpheus/cli/mixins/library_helper'
 
 class Morpheus::Cli::LibrarySpecTemplatesCommand
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::LibraryHelper
   set_command_name :'library-spec-templates'
-  set_command_hidden
   register_subcommands :list, :get, :add, :update, :remove, :list_types
   
   def connect(opts)
@@ -73,6 +74,9 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
+      opts.on('--no-content', "Do not display content." ) do
+        options[:no_content] = true
+      end
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -90,7 +94,7 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
   def _get(id, options)
 
     begin
-      resource_spec = find_resource_spec_by_name_or_id(id)
+      resource_spec = find_spec_template_by_name_or_id(id)
       if resource_spec.nil?
         return 1
       end
@@ -129,27 +133,38 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
         # "Created" => lambda {|it| format_local_dt(it['dateCreated']) + " by #{it['createdBy']}" },
         # "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) + " by #{it['updatedBy'] || it['createdBy']}" },
       }
+      template_type = resource_spec['type']['code'] rescue nil
+      if template_type.to_s.downcase == 'cloudformation'
+        cloudformation_description_cols = {
+          "CAPABILITY_IAM" => lambda {|it| format_boolean(it['config']['cloudformation']['IAM']) rescue '' },
+          "CAPABILITY_NAMED_IAM" => lambda {|it| format_boolean(it['config']['cloudformation']['CAPABILITY_NAMED_IAM']) rescue '' },
+          "CAPABILITY_AUTO_EXPAND" => lambda {|it| format_boolean(it['config']['cloudformation']['CAPABILITY_AUTO_EXPAND']) rescue '' },
+        }
+        description_cols.merge!(cloudformation_description_cols)
+      end
       print_description_list(description_cols, resource_spec)
 
-      file_content = resource_spec['file']
-      print_h2 "Content"
-      if file_content
-        if file_content['sourceType'] == 'local'
-          puts file_content['content']
-        elsif file_content['sourceType'] == 'url'
-          puts "URL: #{file_content['contentPath']}"
-        elsif file_content['sourceType'] == 'repository'
-          puts "Repository: #{file_content['repository']['name'] rescue 'n/a'}"
-          puts "Path: #{file_content['contentPath']}"
-          if file_content['contentRef']
-            puts "Ref: #{file_content['contentRef']}"
+      unless options[:no_content]
+        file_content = resource_spec['file']
+        print_h2 "Content"
+        if file_content
+          if file_content['sourceType'] == 'local'
+            puts file_content['content']
+          elsif file_content['sourceType'] == 'url'
+            puts "URL: #{file_content['contentPath']}"
+          elsif file_content['sourceType'] == 'repository'
+            puts "Repository: #{file_content['repository']['name'] rescue 'n/a'}"
+            puts "Path: #{file_content['contentPath']}"
+            if file_content['contentRef']
+              puts "Ref: #{file_content['contentRef']}"
+            end
+          else
+            puts "Source: #{file_content['sourceType']}"
+            puts "Path: #{file_content['contentPath']}"
           end
         else
-          puts "Source: #{file_content['sourceType']}"
-          puts "Path: #{file_content['contentPath']}"
+          print yellow,"No file content.",reset,"\n"
         end
-      else
-        print yellow,"No file content.",reset,"\n"
       end
 
       print reset,"\n"
@@ -171,7 +186,7 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
       opts.on('--name VALUE', String, "Name") do |val|
         params['name'] = val
       end
-      opts.on('--type VALUE', String, "Spec Template Type. kubernetes, helm, terraform") do |val|
+      opts.on('-t', '--type TYPE', "Spec Template Type. kubernetes, helm, terraform, cloudFormation") do |val|
         template_type = val.to_s
       end
       opts.on('--source VALUE', String, "Source Type. local, repository, url") do |val|
@@ -219,8 +234,14 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
     begin
       # construct payload
       payload = nil
+      passed_options = options[:options].reject {|k,v| k.is_a?(Symbol) }
       if options[:payload]
         payload = options[:payload]
+        # merge -O options into normally parsed options
+        params['file'] = file_params unless file_params.empty?
+        unless params.empty?
+          payload.deep_merge!({'specTemplate' => params })
+        end
       else
         # merge -O options into normally parsed options
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
@@ -229,7 +250,7 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
           params['name'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true}], options[:options], @api_client,{})['name']
         end
         if template_type.nil?
-          # should use code instead probably...
+          # use code instead of id
           #template_type = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'optionSource' => 'resourceSpecType', 'required' => true}], options[:options], @api_client,{})['type']
           #params['type'] = {'id' => template_type}
           spec_type_dropdown = get_all_spec_template_types.collect { |it| {'value' => it['code'], 'name' => it['name']} }
@@ -242,10 +263,12 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
           template_type = template_type_obj['code']
           params['type'] = {'code' => template_type}
         end
+        # source
         if source_type.nil?
           source_type = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'source', 'fieldLabel' => 'Source', 'type' => 'select', 'optionSource' => 'fileContentSource', 'required' => true, 'defaultValue' => 'local'}], options[:options], @api_client,{})['source']
           file_params['sourceType'] = source_type
         end
+        # source type options
         if source_type == "local"
           # prompt for content
           if file_params['content'].nil?
@@ -267,8 +290,9 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
             file_params['contentRef'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'ref', 'fieldLabel' => 'Version Ref', 'type' => 'text'}], options[:options], @api_client,{})['ref']
           end
         end
-        if template_type == "cloudFormation" # this right code?
-          # JD: the field names the UI uses are strange, we should make these consistent...
+        # config
+        if template_type.to_s.downcase == "cloudformation"
+          # JD: the field names the UI uses are inconsistent, should fix in api...
           cloud_formation_option_types = [
             {'fieldContext' => 'config', 'fieldName' => 'cloudformation.IAM', 'fieldLabel' => 'CAPABILITY_IAM', 'type' => 'checkbox'},
             {'fieldContext' => 'config', 'fieldName' => 'cloudformation.CAPABILITY_NAMED_IAM', 'fieldLabel' => 'CAPABILITY_NAMED_IAM', 'type' => 'checkbox'},
@@ -311,7 +335,7 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
       opts.on('--name VALUE', String, "Name") do |val|
         params['name'] = val
       end
-      opts.on('--type VALUE', String, "Spec Template Type. kubernetes, helm, terraform") do |val|
+      opts.on('-t', '--type TYPE', "Spec Template Type. kubernetes, helm, terraform, cloudFormation") do |val|
         template_type = val.to_s
       end
       opts.on('--source VALUE', String, "Source Type. local, repository, url") do |val|
@@ -352,7 +376,7 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
     end
     connect(options)
     begin
-      resource_spec = find_resource_spec_by_name_or_id(args[0])
+      resource_spec = find_spec_template_by_name_or_id(args[0])
       if resource_spec.nil?
         return 1
       end
@@ -443,7 +467,7 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
     connect(options)
 
     begin
-      resource_spec = find_resource_spec_by_name_or_id(args[0])
+      resource_spec = find_spec_template_by_name_or_id(args[0])
       if resource_spec.nil?
         return 1
       end
@@ -531,114 +555,6 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
 
   private
 
-  def find_resource_spec_by_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_resource_spec_by_id(val)
-    else
-      return find_resource_spec_by_name(val)
-    end
-  end
-
-  def find_resource_spec_by_id(id)
-    begin
-      json_response = @spec_templates_interface.get(id.to_i)
-      return json_response['specTemplate']
-    rescue RestClient::Exception => e
-      if e.response && e.response.code == 404
-        print_red_alert "Spec Template not found by id #{id}"
-      else
-        raise e
-      end
-    end
-  end
-
-  def find_resource_spec_by_name(name)
-    resource_specs = @spec_templates_interface.list({name: name.to_s})['specTemplates']
-    if resource_specs.empty?
-      print_red_alert "Spec Template not found by name #{name}"
-      return nil
-    elsif resource_specs.size > 1
-      print_red_alert "#{resource_specs.size} spec templates found by name #{name}"
-      print_resource_specs_table(resource_specs, {color: red})
-      print_red_alert "Try using ID instead"
-      print reset,"\n"
-      return nil
-    else
-      return resource_specs[0]
-    end
-  end
-
-  def print_resource_specs_table(resource_specs, opts={})
-    columns = [
-      {"ID" => lambda {|resource_spec| resource_spec['id'] } },
-      {"NAME" => lambda {|resource_spec| resource_spec['name'] } },
-      #{"OWNER" => lambda {|resource_spec| resource_spec['account'] ? resource_spec['account']['name'] : '' } },
-    ]
-    if opts[:include_fields]
-      columns = opts[:include_fields]
-    end
-    print as_pretty_table(resource_specs, columns, opts)
-  end
-
-  def find_spec_template_type_by_id(id)
-    begin
-      json_response = @spec_template_types_interface.get(id.to_i)
-      return json_response['networkType']
-    rescue RestClient::Exception => e
-      if e.response && e.response.code == 404
-        print_red_alert "Network Type not found by id #{id}"
-        return nil
-      else
-        raise e
-      end
-    end
-  end
-
-  # def find_spec_template_type_by_name(name)
-  #   json_response = @spec_template_types_interface.list({name: name.to_s})
-  #   spec_template_types = json_response['networkTypes']
-  #   if spec_template_types.empty?
-  #     print_red_alert "Network Type not found by name #{name}"
-  #     return spec_template_types
-  #   elsif spec_template_types.size > 1
-  #     print_red_alert "#{spec_template_types.size} network types found by name #{name}"
-  #     rows = spec_template_types.collect do |it|
-  #       {id: it['id'], name: it['name']}
-  #     end
-  #     puts as_pretty_table(rows, [:id, :name], {color:red})
-  #     return nil
-  #   else
-  #     return spec_template_types[0]
-  #   end
-  # end
-
-  def find_spec_template_type_by_name_or_code(name)
-    spec_template_types = get_all_spec_template_types().select { |it| name && it['code'] == name || it['name'] == name }
-    if spec_template_types.empty?
-      print_red_alert "Spec Template Type not found by code #{name}"
-      return nil
-    elsif spec_template_types.size > 1
-      print_red_alert "#{spec_template_types.size} spec template types found by code #{name}"
-      rows = spec_template_types.collect do |it|
-        {id: it['id'], code: it['code'], name: it['name']}
-      end
-      print "\n"
-      puts as_pretty_table(rows, [:id, :code, :name], {color:red})
-      return nil
-    else
-      return spec_template_types[0]
-    end
-  end
-
-  def find_spec_template_type_by_name_or_code_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_subnet_by_id(val)
-    else
-      return find_spec_template_type_by_name_or_code(val)
-    end
-  end
+  
 
-  def get_all_spec_template_types
-    @all_spec_template_types ||= @spec_template_types_interface.list({max: 1000})['specTemplateTypes'] || []
-  end
 end

data/lib/morpheus/cli/mixins/library_helper.rb

@@ -120,4 +120,173 @@ module Morpheus::Cli::LibraryHelper
     return ports
   end
 
+  ## Spec Template helper methods
+
+  def find_spec_template_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_spec_template_by_id(val)
+    else
+      return find_spec_template_by_name(val)
+    end
+  end
+
+  def find_spec_template_by_id(id)
+    begin
+      json_response = @spec_templates_interface.get(id.to_i)
+      return json_response['specTemplate']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Spec Template not found by id #{id}"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_spec_template_by_name(name)
+    resource_specs = @spec_templates_interface.list({name: name.to_s})['specTemplates']
+    if resource_specs.empty?
+      print_red_alert "Spec Template not found by name #{name}"
+      return nil
+    elsif resource_specs.size > 1
+      print_red_alert "#{resource_specs.size} spec templates found by name #{name}"
+      print_resource_specs_table(resource_specs, {color: red})
+      print_red_alert "Try using ID instead"
+      print reset,"\n"
+      return nil
+    else
+      return resource_specs[0]
+    end
+  end
+
+  def print_resource_specs_table(resource_specs, opts={})
+    columns = [
+      {"ID" => lambda {|resource_spec| resource_spec['id'] } },
+      {"NAME" => lambda {|resource_spec| resource_spec['name'] } },
+      #{"OWNER" => lambda {|resource_spec| resource_spec['account'] ? resource_spec['account']['name'] : '' } },
+    ]
+    if opts[:include_fields]
+      columns = opts[:include_fields]
+    end
+    print as_pretty_table(resource_specs, columns, opts)
+  end
+
+  def find_spec_template_type_by_id(id)
+    begin
+      json_response = @spec_template_types_interface.get(id.to_i)
+      return json_response['networkType']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Network Type not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  # def find_spec_template_type_by_name(name)
+  #   json_response = @spec_template_types_interface.list({name: name.to_s})
+  #   spec_template_types = json_response['networkTypes']
+  #   if spec_template_types.empty?
+  #     print_red_alert "Network Type not found by name #{name}"
+  #     return spec_template_types
+  #   elsif spec_template_types.size > 1
+  #     print_red_alert "#{spec_template_types.size} network types found by name #{name}"
+  #     rows = spec_template_types.collect do |it|
+  #       {id: it['id'], name: it['name']}
+  #     end
+  #     puts as_pretty_table(rows, [:id, :name], {color:red})
+  #     return nil
+  #   else
+  #     return spec_template_types[0]
+  #   end
+  # end
+
+  def find_spec_template_type_by_name_or_code(name)
+    spec_template_types = get_all_spec_template_types().select { |it| name && it['code'] == name || it['name'] == name }
+    if spec_template_types.empty?
+      print_red_alert "Spec Template Type not found by code #{name}"
+      return nil
+    elsif spec_template_types.size > 1
+      print_red_alert "#{spec_template_types.size} spec template types found by code #{name}"
+      rows = spec_template_types.collect do |it|
+        {id: it['id'], code: it['code'], name: it['name']}
+      end
+      print "\n"
+      puts as_pretty_table(rows, [:id, :code, :name], {color:red})
+      return nil
+    else
+      return spec_template_types[0]
+    end
+  end
+
+  def find_spec_template_type_by_name_or_code_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_subnet_by_id(val)
+    else
+      return find_spec_template_type_by_name_or_code(val)
+    end
+  end
+
+  def get_all_spec_template_types
+    @all_spec_template_types ||= @spec_template_types_interface.list({max: 1000})['specTemplateTypes'] || []
+  end
+
+  def prompt_for_spec_templates(params, options={}, api_client=nil, api_params={})
+    # spec_templates
+    spec_template_list = nil
+    spec_template_ids = nil
+    still_prompting = true
+    if params['specTemplates'].nil?
+      still_prompting = true
+      while still_prompting do
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'specTemplates', 'type' => 'text', 'fieldLabel' => 'Spec Templates', 'required' => false, 'description' => 'Spec Templates to include, comma separated list of names or IDs.'}], options[:options])
+        unless v_prompt['specTemplates'].to_s.empty?
+          spec_template_list = v_prompt['specTemplates'].split(",").collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+        spec_template_ids = []
+        bad_ids = []
+        if spec_template_list && spec_template_list.size > 0
+          spec_template_list.each do |it|
+            found_spec_template = nil
+            begin
+              found_spec_template = find_spec_template_by_name_or_id(it)
+            rescue SystemExit => cmdexit
+            end
+            if found_spec_template
+              spec_template_ids << found_spec_template['id']
+            else
+              bad_ids << it
+            end
+          end
+        end
+        still_prompting = bad_ids.empty? ? false : true
+      end
+    else
+      spec_template_list = params['specTemplates']
+      still_prompting = false
+      spec_template_ids = []
+      bad_ids = []
+      if spec_template_list && spec_template_list.size > 0
+        spec_template_list.each do |it|
+          found_spec_template = nil
+          begin
+            found_spec_template = find_spec_template_by_name_or_id(it)
+          rescue SystemExit => cmdexit
+          end
+          if found_spec_template
+            spec_template_ids << found_spec_template['id']
+          else
+            bad_ids << it
+          end
+        end
+      end
+      if !bad_ids.empty?
+        return {success:false, msg:"Spec Templates not found: #{bad_ids}"}
+      end
+    end
+    return {success:true, data: spec_template_ids}
+  end
+
 end

data/lib/morpheus/cli/mixins/print_helper.rb

@@ -215,6 +215,9 @@ module Morpheus::Cli::PrintHelper
           end
         end
       end
+      if options[:scrub]
+        output = Morpheus::Logging.scrub_message(output)
+      end
       print_result = print_to_file(output, options[:outfile], options[:overwrite])
       return print_result
     end
@@ -244,7 +247,11 @@ module Morpheus::Cli::PrintHelper
           end
         end
         puts "#{cyan}#{bold}#{dark}JSON#{reset}"
-        print JSON.pretty_generate(payload)
+        if options[:scrub]
+          print Morpheus::Logging.scrub_message(JSON.pretty_generate(payload))
+        else
+          print JSON.pretty_generate(payload)
+        end
       else
         print "Content-Type: #{content_type}", "\n"
         print reset
@@ -252,7 +259,11 @@ module Morpheus::Cli::PrintHelper
           pretty_size = "#{payload.size} B"
           print "File: #{payload.path} (#{pretty_size})"
         elsif payload.is_a?(String)
-          print payload
+          if options[:scrub]
+            print Morpheus::Logging.scrub_message(payload)
+          else
+            print payload
+          end
         else
           if content_type == 'application/x-www-form-urlencoded'
             body_str = payload.to_s
@@ -261,9 +272,17 @@ module Morpheus::Cli::PrintHelper
             rescue => ex
               # raise ex
             end
-            print body_str
+            if options[:scrub]
+              print Morpheus::Logging.scrub_message(body_str)
+            else
+              print body_str
+            end
           else
-            print payload
+            if options[:scrub]
+              print Morpheus::Logging.scrub_message(payload)
+            else
+              print payload
+            end
           end
         end
       end
@@ -945,7 +964,11 @@ module Morpheus::Cli::PrintHelper
   end
 
   def format_boolean(v)
-    !!v ? 'Yes' : 'No'
+    if v == true || v == "true" || v == "on"
+      "Yes"
+    else
+      "No"
+    end
   end
 
   def quote_csv_value(v)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.1.13"
+    VERSION = "4.1.14"
   end
 end

data/lib/morpheus/logging.rb

@@ -92,6 +92,8 @@ module Morpheus::Logging
         msg.gsub!(/#{header}\"\s?\=\>\s?\"[^"]+/, "#{header}\"=>\"************")
         msg.gsub!(/#{header}\:\s?[^"'']+/, "#{header}: ************")
       end
+      msg.gsub!(/password\"\: "[^"]+/, 'password": "************') # json properties ending with password
+      msg.gsub!(/Password\"\: "[^"]+/, 'Password": "************') # json properties ending with Password
       msg.gsub!(/password\"\s?\=\>\s?\"[^"]+/i, 'password"=>"************')
       msg.gsub!(/password\=\"[^"]+/i, 'password="************')
       msg.gsub!(/password\=[^"'&\Z]+/i, 'password=************') # buggy, wont work with ampersand or quotes in passwords! heh

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.1.13
+  version: 4.1.14
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -439,8 +439,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Provides CLI Interface to the Morpheus Public/Private Cloud Appliance