morpheus-cli 4.2.11 → 4.2.16

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

@@ -550,10 +550,10 @@ module Morpheus::Cli::PrintHelper
     # label_width, justify = 0, "none"
     out = ""
     value = value.to_s
-    if do_wrap && value && Morpheus::Cli::PrintHelper.terminal_width
+    if do_wrap && value && value.include?(" ") && Morpheus::Cli::PrintHelper.terminal_width
       value_width = Morpheus::Cli::PrintHelper.terminal_width - label_width
       if value_width > 0 && value.gsub(/\e\[(\d+)m/, '').to_s.size > value_width
-        wrap_indent = label_width + 1 # plus 1 needs to go away
+        wrap_indent = label_width + 1
         value = wrap(value, value_width, wrap_indent)
       end
     end
@@ -571,7 +571,7 @@ module Morpheus::Cli::PrintHelper
   # truncate_string truncates a string and appends the suffix "..."
   # @param value [String] the string to pad
   # @param width [Integer] the length to truncate to
-  # @param pad_char [String] the character to pad with. Default is ' '
+  # @param suffix [String] the character to pad right side with. Default is '...'
   def truncate_string(value, width, suffix="...")
     value = value.to_s
     # JD: hack alerty.. this sux, but it's a best effort to preserve values containing ascii coloring codes
@@ -603,6 +603,41 @@ module Morpheus::Cli::PrintHelper
     end
   end
 
+  # truncate_string truncates a string and appends the prefix "..."
+  # @param value [String] the string to pad
+  # @param width [Integer] the length to truncate to
+  # @param prefix [String] the character to pad left side with. Default is '...'
+  def truncate_string_right(value, width, prefix="...")
+    value = value.to_s
+    # JD: hack alerty.. this sux, but it's a best effort to preserve values containing ascii coloring codes
+    #     it stops working when there are words separated by ascii codes, eg. two diff colors
+    #     plus this is probably pretty slow...
+    uncolored_value = Term::ANSIColor.coloring? ? Term::ANSIColor.uncolored(value.to_s) : value.to_s
+    if uncolored_value != value
+      trimmed_value = nil
+      if uncolored_value.size > width
+        if prefix
+          trimmed_value = prefix + uncolored_value[(uncolored_value.size - width - prefix.size)..-1]
+        else
+          trimmed_value = uncolored_value[(uncolored_value.size - width)..-1]
+        end
+        return value.gsub(uncolored_value, trimmed_value)
+      else
+        return value
+      end
+    else
+      if value.size > width
+        if prefix
+          return prefix + value[(value.size - width - prefix.size)..-1]
+        else
+          return value[(value.size - width)..-1]
+        end
+      else
+        return value
+      end
+    end
+  end
+
   # justified returns a left, center, or right aligned string. 
   # @param value [String] the string to pad
   # @param width [Integer] the length to truncate to
@@ -872,13 +907,7 @@ module Morpheus::Cli::PrintHelper
     out << color if color
     rows.each do |row|
       value = row[:value].to_s
-      if do_wrap
-        if value_width && value_width < value.size
-          wrap_indent = label_width + 1
-          value = wrap(value, value_width, wrap_indent)
-        end
-      end
-      out << format_dt_dd(row[:label], value, label_width, justify) + "\n"
+      out << format_dt_dd(row[:label], value, label_width, justify, do_wrap) + "\n"
     end
     out << reset if color
     return out

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

@@ -259,6 +259,17 @@ module Morpheus::Cli::ProvisioningHelper
     end
   end
 
+  ## resources
+
+  # todo: crud and /api/options for resources
+
+  def parse_resource_id_list(id_list)
+    parse_id_list(id_list).collect do |resource_id|
+      #find_resource_by_name_or_id(resource_id)['id']
+      resource_id
+    end
+  end
+
   ## apps
 
   def find_app_by_id(id)
@@ -1697,7 +1708,7 @@ module Morpheus::Cli::ProvisioningHelper
     while add_another_metadata do
       field_context = "metadata#{metadata_index}"
       metadata = {}
-      metadata['id'] = nil
+      #metadata['id'] = nil
       metadata_label = metadata_index == 0 ? "Metadata Tag" : "Metadata Tag [#{metadata_index+1}]"
       v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "#{metadata_label} Name", 'required' => true, 'description' => 'Metadata Tag Name.', 'defaultValue' => metadata['name']}], options[:options])
       # todo: metadata.type ?

data/lib/morpheus/cli/option_types.rb

@@ -47,7 +47,9 @@ module Morpheus
           end
         end
         # puts "Options Prompt #{options}"
-        option_types.sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i }.each do |option_type|
+        # only sort if displayOrder is set
+        sorted_option_types = (option_types[0] && option_types[0]['displayOrder']) ? option_types.sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i } : option_types
+        sorted_option_types.each do |option_type|
           context_map = results
           value = nil
           value_found=false
@@ -71,17 +73,26 @@ module Morpheus
 
           # respect optionType.dependsOnCode
           if option_type['dependsOnCode'] && option_type['dependsOnCode'] != ""
-            # optionTypes can have this setting in the format code=value or code:value
+            # support formats code=value or code:value OR code:(value|value2|value3)
             parts = option_type['dependsOnCode'].include?("=") ? option_type['dependsOnCode'].split("=") : option_type['dependsOnCode'].split(":")
             depends_on_code = parts[0]
-            depends_on_value = parts[1]
+            depends_on_value = parts[1].to_s.strip
+            depends_on_values = []
+            if depends_on_value.size > 0
+              # strip parenthesis
+              if depends_on_value[0] && depends_on_value[0].chr == "("
+                depends_on_value = depends_on_value[1..-1]
+              end
+              depends_on_value.chomp(")")
+              depends_on_values = depends_on_value.split("|").collect { |it| it.strip }
+            end
             depends_on_option_type = option_types.find {|it| it["code"] == depends_on_code }
             # could not find the dependent option type, proceed and prompt
             if !depends_on_option_type.nil?
               # dependent option type has a different value
               depends_on_field_key = depends_on_option_type['fieldContext'] ? "#{depends_on_option_type['fieldContext']}.#{depends_on_option_type['fieldName']}" : "#{depends_on_option_type['fieldName']}"
               found_dep_value = get_object_value(results, depends_on_field_key) || get_object_value(options, depends_on_field_key)
-              if depends_on_value && depends_on_value != found_dep_value
+              if depends_on_values.size > 0 && !depends_on_values.include?(found_dep_value)
                 next
               end
             end
@@ -622,14 +633,28 @@ module Morpheus
         if source_type == "local"
           # prompt for content
           if file_params['content'].nil?
-            file_params['content'] = multiline_prompt({'fieldContext' => full_field_key, 'fieldName' => 'content', 'type' => 'code-editor', 'fieldLabel' => 'Content', 'required' => true})
+            if options[:no_prompt]
+              print Term::ANSIColor.red, "\nMissing Required Option\n\n", Term::ANSIColor.reset
+              print Term::ANSIColor.red, "  * Content [-O #{full_field_key}.content=] - File Content\n", Term::ANSIColor.reset
+              print "\n"
+              exit 1
+            else
+              file_params['content'] = multiline_prompt({'fieldContext' => full_field_key, 'fieldName' => 'content', 'type' => 'code-editor', 'fieldLabel' => 'Content', 'required' => true})
+            end
           end
         elsif source_type == "url"
           if file_params['url']
             file_params['contentPath'] = file_params.delete('url')
           end
           if file_params['contentPath'].nil?
-            file_params['contentPath'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'url', 'fieldLabel' => 'URL', 'type' => 'text', 'required' => true})
+            if options[:no_prompt]
+              print Term::ANSIColor.red, "\nMissing Required Option\n\n", Term::ANSIColor.reset
+              print Term::ANSIColor.red, "  * URL [-O #{full_field_key}.url=] - Path of file in the repository\n", Term::ANSIColor.reset
+              print "\n"
+              exit 1
+            else
+              file_params['contentPath'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'url', 'fieldLabel' => 'URL', 'type' => 'text', 'required' => true})
+            end
           end
         elsif source_type == "repository"
           if file_params['repository'].nil?
@@ -637,10 +662,21 @@ module Morpheus
             file_params['repository'] = {'id' => repository_id}
           end
           if file_params['contentPath'].nil?
-            file_params['contentPath'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'path', 'fieldLabel' => 'File Path', 'type' => 'text', 'required' => true})
+            if options[:no_prompt]
+              print Term::ANSIColor.red, "\nMissing Required Option\n\n", Term::ANSIColor.reset
+              print Term::ANSIColor.red, "  * File Path [-O #{full_field_key}.path=] - Path of file in the repository\n", Term::ANSIColor.reset
+              print "\n"
+              exit 1
+            else
+              file_params['contentPath'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'path', 'fieldLabel' => 'File Path', 'type' => 'text', 'required' => true})
+            end
           end
-          if file_params['contentRef'].nil?
-            file_params['contentRef'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'ref', 'fieldLabel' => 'Version Ref', 'type' => 'text'})
+          if !file_params.key?('contentRef')
+            if options[:no_prompt]
+              # pass
+            else
+              file_params['contentRef'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'ref', 'fieldLabel' => 'Version Ref', 'type' => 'text'})
+            end
           end
         end
         return file_params

data/lib/morpheus/cli/price_sets_command.rb

@@ -461,7 +461,7 @@ class Morpheus::Cli::PriceSetsCommand
   private
 
   def currency_sym(currency)
-    Money::Currency.new((currency || 'usd').to_sym).symbol
+    Money::Currency.new((currency.to_s != '' ? currency : 'usd').to_sym).symbol
   end
 
   def price_prefix(price)

data/lib/morpheus/cli/projects_command.rb

@@ -7,11 +7,8 @@ class Morpheus::Cli::Projects
   # include Morpheus::Cli::InfrastructureHelper
   # include Morpheus::Cli::AccountsHelper
 
-  register_subcommands :list, :get, :add, :update, :remove,
-                       # :add_tags, :remove_tags,
-                       #:add_instance, :remove_instance
-                       #:add_host, :remove_host
-  
+  register_subcommands :list, :get, :add, :update, :remove
+
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @projects_interface = @api_client.projects
@@ -27,7 +24,7 @@ class Morpheus::Cli::Projects
   def list(args)
     params = {}
     options = {}
-    instance_ids, server_ids, cloud_ids = nil, nil, nil
+    instance_ids, server_ids, cloud_ids, resource_ids, owner_ids = nil, nil, nil, nil, nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on('--instances [LIST]', Array, "Filter by Instance, comma separated list of instance names or IDs.") do |list|
@@ -39,9 +36,12 @@ class Morpheus::Cli::Projects
       opts.on('--clouds [LIST]', Array, "Filter by Cloud, comma separated list of cloud (zone) names or IDs.") do |list|
         cloud_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
-      # opts.on('--owner [LIST]', Array, "Owner, comma separated list of usernames or IDs.") do |list|
-      #   params['ownerId'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
-      # end
+      opts.on('--resources [LIST]', Array, "Filter by Resources, comma separated list of resource IDs.") do |list|
+        resource_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
+      opts.on('--owners [LIST]', Array, "Owner, comma separated list of usernames or IDs.") do |list|
+        owner_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
       build_standard_get_options(opts, options)
       opts.footer = <<-EOT
 List projects.
@@ -56,6 +56,8 @@ EOT
     # todo server and cloud, missing parse_server_id_list() too
     params['serverId'] = parse_server_id_list(server_ids) if server_ids
     params['cloudId'] = parse_cloud_id_list(cloud_ids) if cloud_ids
+    params['resourceId'] = parse_resource_id_list(resource_ids) if resource_ids
+    params['ownerId'] = parse_user_id_list(owner_ids) if owner_ids
     @projects_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @projects_interface.dry.list(params)
@@ -79,6 +81,7 @@ EOT
           {"INSTANCES" => lambda {|it| it['instances'].size rescue '' } },
           {"SERVERS" => lambda {|it| it['servers'].size rescue '' } },
           {"CLOUDS" => lambda {|it| it['clouds'].size rescue '' } },
+          {"RESOURCES" => lambda {|it| it['resources'].size rescue '' } },
           {"OWNER" => lambda {|it| it['owner'] ? it['owner']['username'] : '' } },
           {"DATE CREATED" => lambda {|it| format_local_dt(it['dateCreated']) } },
           {"LAST UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) } },
@@ -98,10 +101,7 @@ EOT
   def get(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[workflow]")
-      opts.on('--no-content', "Do not display script content." ) do
-        options[:no_content] = true
-      end
+      opts.banner = subcommand_usage("[project]")
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = <<-EOT
 Get details about a project.
@@ -169,6 +169,14 @@ EOT
         print cyan
         print as_pretty_table(project_clouds, [:id, :name], options)
       end
+
+      project_resources = project["resources"] || project["accountResources"]
+      if project_resources && project_resources.size > 0
+        print_h2 "Resources"
+        print cyan
+        print as_pretty_table(project_resources, [:id, :name], options)
+      end
+
       print reset,"\n"
     end
     return 0, nil
@@ -177,7 +185,7 @@ EOT
   def add(args)
     exit_code, err = 0, nil
     params, options, payload = {}, {}, {}
-    project_name, description, metadata, instance_ids, server_ids, cloud_ids = nil, nil, nil, nil, nil, nil
+    project_name, description, metadata, instance_ids, server_ids, cloud_ids, resource_ids = nil, nil, nil, nil, nil, nil, nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on('--name NAME', String, "Project Name" ) do |val|
@@ -198,6 +206,9 @@ EOT
       opts.on('--clouds [LIST]', Array, "Clouds, comma separated list of cloud names or IDs.") do |list|
         cloud_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
+      opts.on('--resources [LIST]', Array, "Resources, comma separated list of resource IDs.") do |list|
+        resource_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
       build_standard_add_options(opts, options)
       opts.footer = <<-EOT
 Create a project.
@@ -228,11 +239,6 @@ EOT
         metadata = prompt_metadata(options)
         payload['project']['tags'] = metadata if metadata
       end
-      if instance_ids != nil
-        payload['project']['instances'] = parse_instance_id_list(instance_ids).collect { |it| {'id': it.to_i} }
-      else
-        # could prompt
-      end
       # --instances
       if instance_ids
         payload['project']['instances'] = parse_instance_id_list(instance_ids).collect { |it| {'id': it.to_i} }
@@ -245,6 +251,10 @@ EOT
       if cloud_ids
         payload['project']['clouds'] = parse_cloud_id_list(cloud_ids).collect { |it| {'id': it.to_i} }
       end
+      # --resources
+      if resource_ids
+        payload['project']['resources'] = parse_resource_id_list(resource_ids).collect { |it| {'id': it.to_i} }
+      end
     end
     @projects_interface.setopts(options)
     if options[:dry_run]
@@ -264,10 +274,11 @@ EOT
     exit_code, err = 0, nil
     params, options, payload = {}, {}, {}
     project_name, description, metadata, add_metadata, remove_metadata = nil, nil, nil, nil, nil
-    instance_ids, server_ids, cloud_ids = nil, nil, nil
+    instance_ids, server_ids, cloud_ids, resource_ids = nil, nil, nil, nil
     add_instance_ids, remove_instance_ids = nil, nil
     add_server_ids, remove_server_ids = nil, nil
     add_cloud_ids, remove_cloud_ids = nil, nil
+    add_resource_ids, remove_resource_ids = nil, nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[project] [options]")
       opts.on('--name NAME', String, "Project Name" ) do |val|
@@ -312,6 +323,15 @@ EOT
       opts.on('--remove-clouds LIST', Array, "Remove Clouds, comma separated list of cloud names or IDs to remove.") do |list|
         remove_cloud_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
+      opts.on('--resources [LIST]', Array, "Resources, comma separated list of resource names or IDs.") do |list|
+        resource_ids = list ? list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq : []
+      end
+      opts.on('--add-resources LIST', Array, "Add Resources, comma separated list of resource names or IDs to add.") do |list|
+        add_resource_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
+      opts.on('--remove-resources LIST', Array, "Remove Resources, comma separated list of resource names or IDs to remove.") do |list|
+        remove_resource_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
       build_standard_update_options(opts, options)
       opts.footer = <<-EOT
 Update a project.
@@ -379,109 +399,19 @@ EOT
         return 1, "clouds not found" if remove_cloud_ids.nil?
         payload['project']['removeClouds'] = remove_cloud_ids.collect { |it| {'id': it.to_i} }
       end
-    end
-    @projects_interface.setopts(options)
-    if options[:dry_run]
-      print_dry_run @projects_interface.dry.update(project['id'], payload)
-      return
-    end
-    json_response = @projects_interface.update(project['id'], payload)
-    project = json_response['project']
-    render_response(json_response, options, 'project') do
-      print_green_success "Project #{project['name']} updated"
-      exit_code, err = get([project['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
-    end
-    return exit_code, err
-  end
-
-  def add_tags(args)
-    params = {}
-    options = {}
-    payload = {}
-    metadata = nil
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[project] [tag=value] [tag=value]")
-      opts.on('--tags TAGS', String, "Project Tags in the format 'name:value, name:value'. This will add/update project tags.") do |val|
-        metadata = val
+      # --resources
+      if resource_ids
+        payload['project']['resources'] = parse_resource_id_list(resource_ids).collect { |it| {'id': it.to_i} }
       end
-      build_standard_update_options(opts, options)
-      opts.footer = <<-EOT
-Add metadata tags to a project.
-[project] is required. This is the name or id of a project.
-[tag=value] is required. This is a metadata tag in the format name=value, 1-N may be passed.
-EOT
-    end
-    optparse.parse!(args)
-    verify_args!(args:args, optparse:optparse, min:1) # maybe min:2 instead ?
-    connect(options)
-    exit_code, err = 0, nil
-    if args.count > 1
-      metadata = args[1..-1].join(" ")
-    end
-    project = find_project_by_name_or_id(args[0])
-    return 1, "project not found by '#{args[0]}'" if project.nil?
-    # construct payload
-
-    if options[:payload]
-      payload = options[:payload]
-      payload.deep_merge!({'project' => parse_passed_options(options)})
-    else
-      payload['project'] = {}
-      payload.deep_merge!({'project' => parse_passed_options(options)})
-      if options[:metadata]
-        payload['project']['addTags'] = parse_metadata(metadata)
-      end
-    end
-    @projects_interface.setopts(options)
-    if options[:dry_run]
-      print_dry_run @projects_interface.dry.update(project['id'], payload)
-      return
-    end
-    json_response = @projects_interface.update(project['id'], payload)
-    project = json_response['project']
-    render_response(json_response, options, 'project') do
-      print_green_success "Project #{project['name']} updated"
-      exit_code, err = get([project['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
-    end
-    return exit_code, err
-  end
-
-  def remove_tags(args)
-    params = {}
-    options = {}
-    payload = {}
-    metadata = nil
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[project] [tags]")
-      opts.on('--tags TAGS', String, "Project Tags in the format 'name=value, name=value'. This will add/update project tags.") do |val|
-        metadata = val
+      if add_resource_ids
+        add_resource_ids = parse_resource_id_list(add_resource_ids)
+        return 1, "resources not found" if add_resource_ids.nil?
+        payload['project']['addResources'] = add_resource_ids.collect { |it| {'id': it.to_i} }
       end
-      build_standard_update_options(opts, options)
-      opts.footer = <<-EOT
-Remove metadata tags from a project.
-[project] is required. This is the name or id of a project.
-[tags] is required. This is a metadata tag in the format tag=value, tag2, tag3, 1-N may be passed, value is optional and must match if passed.
-EOT
-    end
-    optparse.parse!(args)
-    verify_args!(args:args, optparse:optparse, min:1) # maybe min:2 instead ?
-    connect(options)
-    exit_code, err = 0, nil
-    if args.count > 1
-      metadata = args[1..-1].join(" ")
-    end
-    project = find_project_by_name_or_id(args[0])
-    return 1, "project not found by '#{args[0]}'" if project.nil?
-    # construct payload
-
-    if options[:payload]
-      payload = options[:payload]
-      payload.deep_merge!({'project' => parse_passed_options(options)})
-    else
-      payload['project'] = {}
-      payload.deep_merge!({'project' => parse_passed_options(options)})
-      if metadata
-        payload['project']['removeTags'] = parse_metadata(metadata)
+      if remove_resource_ids
+        remove_resource_ids = parse_resource_id_list(remove_resource_ids)
+        return 1, "resources not found" if remove_resource_ids.nil?
+        payload['project']['removeResources'] = remove_resource_ids.collect { |it| {'id': it.to_i} }
       end
     end
     @projects_interface.setopts(options)