morpheus-cli 6.1.2 → 6.2.1

data/lib/morpheus/cli/commands/roles.rb

@@ -1206,7 +1206,7 @@ EOT
       role = find_role_by_name_or_id(account_id, name)
       exit 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
 
       cloud = nil
       if !do_all
@@ -1355,7 +1355,7 @@ EOT
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       instance_type = nil
       if !do_all
         instance_type = find_instance_type_by_name(instance_type_name)
@@ -1504,7 +1504,7 @@ EOT
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       blueprint_global_access = role_json['globalAppTemplateAccess'] || role_json['globalBlueprintAccess']
       blueprint_permissions = role_json['appTemplatePermissions'] || role_json['blueprintPermissions'] || []
 
@@ -1666,7 +1666,7 @@ EOT
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       catalog_item_type_global_access = role_json['globalCatalogItemTypeAccess']
       catalog_item_type_permissions = role_json['catalogItemTypePermissions'] || role_json['catalogItemTypes'] []
 
@@ -1821,7 +1821,7 @@ Update default persona access for a role.
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       
       # no lookup right now, pass the code serviceCatalog|standard
       persona_code = persona_id
@@ -1963,7 +1963,7 @@ EOT
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       vdi_pool_global_access = role_json['globalVdiPoolAccess']
       vdi_pool_permissions = role_json['vdiPoolPermissions'] || role_json['vdiPools'] || []
 
@@ -2119,7 +2119,7 @@ EOT
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       report_type_global_access = role_json['globalReportTypeAccess']
       report_type_permissions = role_json['reportTypePermissions'] || role_json['reportTypes'] || []
 
@@ -2273,7 +2273,7 @@ Update default task access for a role.
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       task_permissions = role_json['taskPermissions'] || role_json['tasks'] || []
 
       # hacky, but support name or code lookup via the list returned in the show payload
@@ -2425,7 +2425,7 @@ Update default workflow access for a role.
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       workflow_permissions = role_json['taskSetPermissions'] || role_json['taskSets'] || []
 
       # hacky, but support name or code lookup via the list returned in the show payload

data/lib/morpheus/cli/commands/service_catalog_command.rb

@@ -560,27 +560,17 @@ EOT
     # fetch current cart
     # cart = @service_catalog_interface.get_cart()['cart']
     update_cart_object_key = 'order'
-    payloads = parse_payloads(options, update_cart_object_key) do |payload|
+    parse_payload(options, update_cart_object_key) do |payload|
       payload.deep_merge!({update_cart_object_key => parse_passed_options(options)})
       if payload[update_cart_object_key].empty? # || options[:no_prompt]
         raise_command_error "Specify at least one option to update.\n#{optparse}"
       end
     end
-    process_payloads(payloads, options) do |payload|
-      @service_catalog_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @service_catalog_interface.dry.update_cart(payload)
-        next
-      end
-      json_response = @service_catalog_interface.update_cart(payload)
-      #cart = json_response['cart']
-      #cart = @service_catalog_interface.get_cart()['cart']
-      render_response(json_response, options, 'cart') do
-        print_green_success "Updated cart"
-        get_cart([] + (options[:remote] ? ["-r",options[:remote]] : []))
-      end
+    execute_api(@service_catalog_interface, :update_cart, [params], options, "cart") do |json_response|
+      #cart = json_response["cart"]
+      print_green_success "Updated cart"
+      get_cart([] + (options[:remote] ? ["-r",options[:remote]] : []))
     end
-    return 0, nil
   end
 
   def add(args)
@@ -600,6 +590,7 @@ EOT
       end
       opts.on('--validate','--validate', "Validate Only. Validates the configuration and skips adding the item.") do
         options[:validate_only] = true
+        params['validate'] = true
       end
       opts.on('--context [instance|server]', String, "Context Type for operational workflow types") do |val|
         workflow_context = val.to_s
@@ -608,7 +599,7 @@ EOT
         workflow_target = val.to_s
       end
       opts.add_hidden_option('--sigdig')
-      build_standard_update_options(opts, options, [:payloads, :sigdig])
+      build_standard_add_many_options(opts, options, [:sigdig])
       opts.footer = <<-EOT
 Add an item to your cart
 [type] is required, this is name or id of a catalog item type.
@@ -622,7 +613,7 @@ EOT
       type_id = args.join(" ")
     end
     add_item_object_key = 'item'
-    payloads = parse_payloads(options, add_item_object_key) do |payload|
+    parse_payload(options, add_item_object_key) do |payload|
       payload.deep_merge!({add_item_object_key => parse_passed_options(options)})
       # prompt for Type
       if type_id
@@ -712,46 +703,35 @@ EOT
         end
       end
     end
-    if options[:validate_only]
-      params['validate'] = true
-    end
-    process_payloads(payloads, options) do |payload|
-      @service_catalog_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @service_catalog_interface.dry.create_cart_item(payload, params)
-        next
-      end
-      json_response = @service_catalog_interface.create_cart_item(payload, params)
+    execute_api(@service_catalog_interface, :create_cart_item, [params], options, 'item') do |json_response|
       cart_item = json_response['item']
-      render_response(json_response, options) do
-        if options[:validate_only]
-          if json_response['success']
-            print_h2 "Validated Cart Item", [], options
-            cart_item_columns = {
-              "Type" => lambda {|it| it['type']['name'] rescue '' },
-              #"Qty" => lambda {|it| it['quantity'] },
-              "Price" => lambda {|it| it['price'] ? format_money(it['price'] , it['currency'], {sigdig:options[:sigdig] || default_sigdig}) : "No pricing configured" },
-              "Status" => lambda {|it| 
-                status_string = format_catalog_item_status(it)
-                if it['errorMessage'].to_s != ""
-                  status_string << " - #{it['errorMessage']}"
-                end
-                status_string
-              },
-              #"Config" => lambda {|it| truncate_string(format_name_values(it['config']), 50) }
-            }
-            print as_pretty_table([cart_item], cart_item_columns.upcase_keys!)
-            print reset, "\n"
-            print_green_success(json_response['msg'] || "Item is valid")
-            print reset, "\n"
-          else
-            # not needed because it will be http 400
-            print_rest_errors(json_response, options)
-          end
+      if options[:validate_only]
+        if json_response['success']
+          print_h2 "Validated Cart Item", [], options
+          cart_item_columns = {
+            "Type" => lambda {|it| it['type']['name'] rescue '' },
+            #"Qty" => lambda {|it| it['quantity'] },
+            "Price" => lambda {|it| it['price'] ? format_money(it['price'] , it['currency'], {sigdig:options[:sigdig] || default_sigdig}) : "No pricing configured" },
+            "Status" => lambda {|it| 
+              status_string = format_catalog_item_status(it)
+              if it['errorMessage'].to_s != ""
+                status_string << " - #{it['errorMessage']}"
+              end
+              status_string
+            },
+            #"Config" => lambda {|it| truncate_string(format_name_values(it['config']), 50) }
+          }
+          print as_pretty_table([cart_item], cart_item_columns.upcase_keys!)
+          print reset, "\n"
+          print_green_success(json_response['msg'] || "Item is valid")
+          print reset, "\n"
         else
-          print_green_success "Added item to cart"
-          get_cart([] + (options[:remote] ? ["-r",options[:remote]] : []))
+          # not needed because it will be http 400
+          print_rest_errors(json_response, options)
         end
+      else
+        print_green_success "Added item to cart"
+        get_cart([] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
     end
   end
@@ -935,6 +915,7 @@ EOT
       end
       opts.on('--validate','--validate', "Validate Only. Validates the configuration and skips creating the order.") do
         options[:validate_only] = true
+        params['validate'] = true
       end
       opts.on('-a', '--details', "Display all details: item configuration." ) do
         options[:details] = true
@@ -962,7 +943,7 @@ EOT
     end
     payload = {}
     order_object_key = 'order'
-    payloads = parse_payloads(options, order_object_key) do |payload|
+    parse_payload(options, order_object_key) do |payload|
       payload.deep_merge!({order_object_key => {}})
       # Prompt for 1-N Types
       # still_prompting = options[:no_prompt] != true
@@ -1076,38 +1057,24 @@ EOT
           end
         end
 
-      end
-      
-      
+      end      
     end
-    if options[:validate_only]
-      params['validate'] = true
-      #payload['validate'] = true
-    end
-    process_payloads(payloads, options) do |payload|
-      @service_catalog_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @service_catalog_interface.dry.create_order(payload, params)
-        next
-      end
-      json_response = @service_catalog_interface.create_order(payload, params)
+    execute_api(@service_catalog_interface, :create_order, [params], options, "order") do |json_response|
       order = json_response['order'] || json_response['cart']
-      render_response(json_response, options) do
-        if options[:validate_only]
-          if json_response['success']
-            print_h2 "Review Order", [], options
-            print_order_details(order, options)
-            print_green_success(json_response['msg'] || "Order is valid")
-            print reset, "\n"
-          else
-            # not needed because it will be http 400
-            print_rest_errors(json_response, options)
-          end
-        else
-          print_green_success "Order placed"
-          print_h2 "Order Details", [], options
+      if options[:validate_only]
+        if json_response['success']
+          print_h2 "Review Order", [], options
           print_order_details(order, options)
+          print_green_success(json_response['msg'] || "Order is valid")
+          print reset, "\n"
+        else
+          # not needed because it will be http 400
+          print_rest_errors(json_response, options)
         end
+      else
+        print_green_success "Order placed"
+        print_h2 "Order Details", [], options
+        print_order_details(order, options)
       end
     end
   end

data/lib/morpheus/cli/commands/user_sources_command.rb

@@ -158,7 +158,8 @@ EOT
         "Login URL" => lambda {|it| it['loginURL'] },
         "Default Role" => lambda {|it| it['defaultAccountRole'] ? it['defaultAccountRole']['authority'] : '' },
         "External Login" => lambda {|it| format_boolean it['externalLogin'] },
-        "Allow Custom Mappings" => lambda {|it| format_boolean it['allowCustomMappings'] },
+        "Enable Role Mapping Permission" => lambda {|it| format_boolean it['allowCustomMappings'] },
+        "Manual Role Assignment" => lambda {|it| it['manualRoleAssignment'].nil? ? '' : format_boolean(it['manualRoleAssignment']) },
         "Active" => lambda {|it| format_boolean it['active'] },
       }
       print_description_list(description_cols, user_source)
@@ -235,13 +236,27 @@ EOT
       opts.on('--description VALUE', String, "Description") do |val|
         params['description'] = val
       end
-      opts.on("--allow-custom-mappings [on|off]", ['on','off'], "Allow Custom Mappings, Enable Role Mapping Permissions") do |val|
+      opts.on("--allow-custom-mappings [on|off]", ['on','off'], "Enable Role Mapping Permissions") do |val|
         params['allowCustomMappings'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
-      opts.on("--allowCustomMappings [on|off]", ['on','off'], "Allow Custom Mappings, Enable Role Mapping Permissions") do |val|
+      opts.on("--allowCustomMappings [on|off]", ['on','off'], "Enable Role Mapping Permissions") do |val|
         params['allowCustomMappings'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
       opts.add_hidden_option('--allowCustomMappings')
+      opts.on("--manual-role-assignment [on|off]", ['on','off'], "Manual Role Assignment") do |val|
+        params['manualRoleAssignment'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.on("--manualRoleAssignment [on|off]", ['on','off'], "Manual Role Assignment") do |val|
+        params['manualRoleAssignment'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.add_hidden_option('--manualRoleAssignment')
+      opts.on("--manual-role-assignment [on|off]", ['on','off'], "Manual Role Assignment") do |val|
+        params['manualRoleAssignment'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.on("--manualRoleAssignment [on|off]", ['on','off'], "Manual Role Assignment") do |val|
+        params['manualRoleAssignment'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.add_hidden_option('--manualRoleAssignment')
       opts.on('--role-mappings MAPPINGS', String, "Role Mappings FQN in the format id1:FQN1,id2:FQN2") do |val|
         role_mappings = {}
         val.split(',').collect {|it| it.strip.split(':') }.each do |pair|
@@ -386,14 +401,22 @@ EOT
         end
         payload['userSource']['defaultAccountRole'] = {'id' => default_role_id }
 
-        # Allow Custom Mappings
+        # Enable Role Mapping Permissions
         if !params['allowCustomMappings'].nil?
           payload['userSource']['allowCustomMappings'] = ["on","true"].include?(params['allowCustomMappings'].to_s)
         else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'allowCustomMappings', 'type' => 'checkbox', 'fieldLabel' => 'Allow Custom Mappings', 'defaultValue' => false}], options[:options])
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'allowCustomMappings', 'type' => 'checkbox', 'fieldLabel' => 'Enable Role Mapping Permissions', 'defaultValue' => false}], options[:options])
           payload['userSource']['allowCustomMappings'] = ["on","true"].include?(v_prompt['allowCustomMappings'].to_s)
         end
 
+        # Manual Role Assignment
+        if !params['manualRoleAssignment'].nil?
+          payload['userSource']['manualRoleAssignment'] = ["on","true"].include?(params['allowCustomMappings'].to_s)
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'manualRoleAssignment', 'type' => 'checkbox', 'fieldLabel' => 'Manual Role Assignment', 'defaultValue' => false}], options[:options])
+          payload['userSource']['manualRoleAssignment'] = ["on","true"].include?(v_prompt['manualRoleAssignment'].to_s)
+        end
+
         if role_mappings
           payload['roleMappings'] = role_mappings
         end
@@ -435,10 +458,10 @@ EOT
       opts.on('--description VALUE', String, "Description") do |val|
         params['description'] = val
       end
-      opts.on("--allow-custom-mappings [on|off]", ['on','off'], "Allow Custom Mappings, Enable Role Mapping Permissions") do |val|
+      opts.on("--allow-custom-mappings [on|off]", ['on','off'], "Enable Role Mapping Permissions") do |val|
         params['allowCustomMappings'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
-      opts.on("--allowCustomMappings [on|off]", ['on','off'], "Allow Custom Mappings, Enable Role Mapping Permissions") do |val|
+      opts.on("--allowCustomMappings [on|off]", ['on','off'], "Enable Role Mapping Permissions") do |val|
         params['allowCustomMappings'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
       opts.add_hidden_option('--allowCustomMappings')
@@ -493,11 +516,16 @@ EOT
           payload['userSource']['description'] = params['description']
         end
         
-        # Allow Custom Mappings
+        # Enable Role Mapping Permissions
         if !params['allowCustomMappings'].nil?
           payload['userSource']['allowCustomMappings'] = params['allowCustomMappings']
         end
 
+        # Manual Role Assignment
+        if !params['manualRoleAssignment'].nil?
+          payload['userSource']['manualRoleAssignment'] = params['manualRoleAssignment']
+        end
+
         if role_mappings
           payload['roleMappings'] = role_mappings
         end

data/lib/morpheus/cli/commands/view.rb

@@ -46,20 +46,22 @@ Examples:
 EOT
     end
     optparse.parse!(args)
-    # verify_args!(args:args, optparse:optparse, min: 0, max: 2)
+    verify_args!(args:args, optparse:optparse, min: 0, max: 2)
     connect(options)
     # todo: it would actually be cool to use the params and include them on the path..
     # params.merge!(parse_query_options(options))
-    path, *ids = args
+    # input, *ids = args
+    input = args[0]
+    id = args[1]
     # default to index page "/"
-    path = path || "/"
+    path = input || "/"
     if options[:absolute_path] != true
       if path.start_with?("/")
         # treat like absolute path, no lookup
       else
         # lookup best matching route from sitemap
         # lookup plural routes first, so 'app' finds apps and not approvals
-        found_route = Morpheus::Routes.lookup(path)
+        found_route = Morpheus::Routes.lookup(path, id)
         if found_route
           # Morpheus::Logging::DarkPrinter.puts "Found matching route: '#{path}' => '#{found_route}'" if Morpheus::Logging.debug?
           path = found_route
@@ -69,26 +71,24 @@ EOT
       end
       # always add a leading slash
       path = path.start_with?("/") ? path : "/#{path}"
-      # append id(s) to path if passed
-      if ids.size > 0
-        # convert names to ids
+      # append id to path if passed
+      if id
+        # convert name to id
         # assume the last part of path is the type and use generic finder
         # only lookup names, and allow any id
-        ids = ids.collect do |id|
-          if id.to_s !~ /\A\d{1,}\Z/
-            # assume the last part of path is the type
-            record_type = path.split("/").last
-            record_type.sub!('#!', '')
-            record = find_by_name(record_type, id)
-            if record.nil?
-              raise_command_error("[id] is invalid. No #{record_type} found for '#{id}'", args, optparse)
-            end
-            record['id'].to_s
-          else
-            id
+        if id.to_s !~ /\A\d{1,}\Z/
+          # record type is just args[0]
+          record_type = input
+          # assume the last part of path is the type
+          # record_type = path.split("/").last
+          # record_type.sub!('#!', '')
+          record = find_by_name(record_type, id)
+          if record.nil?
+            raise_command_error("[id] is invalid. No #{record_type} found for '#{id}'", args, optparse)
           end
+          id = record['id'].to_s
         end
-        path = "#{path}/" + ids.join("/")
+        path = "#{path}/#{id}"
       end
     end
     # build the link to use, either our path or oauth-redirect to that path

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

@@ -110,4 +110,62 @@ module Morpheus::Cli::BackupsHelper
       return backup_jobs[0]
     end
   end
+
+  ## Backup Results
+
+  def backup_result_list_column_definitions()
+    {
+      "ID" => 'id',
+      "Backup" => lambda {|it| it['backup']['name'] rescue '' },
+      "Status" => lambda {|it| format_backup_result_status(it) },
+      #"Duration" => lambda {|it| format_duration(it['startDate'], it['endDate']) },
+      "Duration" => lambda {|it| format_duration_milliseconds(it['durationMillis']) },
+      "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
+      "End Date" => lambda {|it| format_local_dt(it['endDate']) },
+      "Size" => lambda {|it| format_bytes(it['sizeInMb'], 'MB') },
+    }
+  end
+
+  def backup_result_column_definitions()
+    backup_result_list_column_definitions()
+  end
+
+  def format_backup_result_status(backup_result, return_color=cyan)
+    out = ""
+    status_string = backup_result['status'].to_s.upcase
+    if status_string == 'SUCCEEDED' || status_string == 'SUCCESS'
+      out <<  "#{green}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'FAILED'
+      out <<  "#{red}#{status_string.upcase}#{return_color}"
+    elsif status_string
+      out <<  "#{cyan}#{status_string.upcase}#{return_color}"
+    else
+      out <<  ""
+    end
+    out
+  end
+
+  ## Backup Restores
+
+  def backup_restore_list_column_definitions()
+    {
+      "ID" => 'id',
+      "Backup" => lambda {|it| it['backup']['name'] rescue '' },
+      "Backup Result ID" => lambda {|it| it['backupResultId'] rescue '' },
+      "Target" => lambda {|it| it['instance']['name'] rescue '' },
+      "Status" => lambda {|it| format_backup_result_status(it) },
+      #"Duration" => lambda {|it| format_duration(it['startDate'], it['endDate']) },
+      "Duration" => lambda {|it| format_duration_milliseconds(it['durationMillis']) },
+      "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
+      "End Date" => lambda {|it| format_local_dt(it['endDate']) },
+    }
+  end
+
+  def backup_restore_column_definitions()
+    backup_restore_list_column_definitions()
+  end
+
+  def format_backup_restore_status(backup_restore, return_color=cyan)
+    format_backup_result_status(backup_restore, return_color)
+  end
 end

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

@@ -191,7 +191,24 @@ module Morpheus::Cli::PrintHelper
     output = ""
     if api_request[:curl] || options[:curl]
       output = format_curl_command(http_method, url, headers, payload, options)
+    elsif options[:json]
+      # --dry --json should print the payload only
+      payload_object = payload.is_a?(String) ? JSON.parse(payload) : payload
+      output = as_json(payload_object, options)
+    elsif options[:yaml]
+      # --dry --yaml should print the payload only as yaml
+      payload_object = payload.is_a?(String) ? JSON.parse(payload) : payload
+      output = as_yaml(payload_object, options)
     else
+      # default format is 
+      # DRY RUN
+      # REQUEST
+      # GET https://server/api/things
+      #
+      # JSON
+      # {
+      #    "thing": { ... }
+      # }
       output = format_api_request(http_method, url, headers, payload, options)
     end
     # this is an extra scrub, should remove
@@ -210,14 +227,20 @@ module Morpheus::Cli::PrintHelper
     if api_request[:curl] || options[:curl]
       print "\n"
       print "#{cyan}#{bold}#{dark}CURL COMMAND#{reset}\n"
+      print output
+      print reset, "\n"
+      print reset
+    elsif options[:json] || options[:yaml]
+      # print just the just payload
+      print output, "\n"
     else
       print "\n"
       print "#{cyan}#{bold}#{dark}REQUEST#{reset}\n"
+      print output
+      print reset, "\n"
+      print reset
     end
-    print output
-    print reset, "\n"
-    print reset
-    return
+    return output
   end
 
   def print_system_command_dry_run(cmd, options={})

data/lib/morpheus/cli/option_types.rb

@@ -48,6 +48,7 @@ module Morpheus
 
       # supresses prompting unless --prompt has been passed
       def self.no_prompt(option_types, options={}, api_client=nil,api_params={})
+        options[:edit_mode] = true # hack used for updates to avoid default values being used
         if options[:always_prompt]
           prompt(option_types, options, api_client, api_params)
         else
@@ -218,7 +219,7 @@ module Morpheus
 
           # credential type
           handle_credential_type = -> {
-            credential_type = select_prompt(option_type.merge({'defaultValue' => value}), api_client, option_params.merge({'credentialTypes' => option_type['config']['credentialTypes']}), !value.nil?, nil, paging_enabled, ignore_empty)
+            credential_type = select_prompt(option_type.merge({'defaultValue' => value}), api_client, option_params.merge({'credentialTypes' => option_type['config']['credentialTypes']}), !value.nil?, nil, paging_enabled, ignore_empty, options[:edit_mode])
             # continue prompting for local creds
             if credential_type == 'local'
               parent_context_map.reject! {|k,v| k == 'credential'}
@@ -247,14 +248,14 @@ module Morpheus
               end
             # these select prompts should just fall down through below, with the extra params no_prompt, use_value
             elsif option_type['type'] == 'select'
-              value = select_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, option_params, true, nil, false, ignore_empty)
+              value = select_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, option_params, true, nil, false, ignore_empty, options[:edit_mode])
             elsif option_type['type'] == 'multiSelect'
               # support value as csv like "thing1, thing2"
               value_list = value.is_a?(String) ? value.parse_csv.collect {|v| v ? v.to_s.strip : v } : [value].flatten
               input_value_list = input_value.is_a?(String) ? input_value.parse_csv.collect {|v| v ? v.to_s.strip : v } : [input_value].flatten
               select_value_list = []
               value_list.each_with_index do |v, i|
-                select_value_list << select_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, option_params, true, nil, false, ignore_empty)
+                select_value_list << select_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, option_params, true, nil, false, ignore_empty, options[:edit_mode])
               end
               value = select_value_list
             elsif option_type['type'] == 'typeahead'
@@ -302,7 +303,7 @@ module Morpheus
                   next
                 end
                 if ['select', 'multiSelect'].include?(option_type['type'])
-                  value = select_prompt(option_type, api_client, option_params, true, nil, false, ignore_empty)
+                  value = select_prompt(option_type, api_client, option_params, true, nil, false, ignore_empty, options[:edit_mode])
                   value_found = !!value
                 end
                 if ['typeahead', 'multiTypeahead'].include?(option_type['type'])
@@ -347,12 +348,12 @@ module Morpheus
               # I suppose the entered value should take precedence
               # api_params = api_params.merge(options) # this might be good enough
               # dup it
-              value = select_prompt(option_type, api_client, option_params, options[:no_prompt], nil, paging_enabled, ignore_empty)
+              value = select_prompt(option_type, api_client, option_params, options[:no_prompt], nil, paging_enabled, ignore_empty, options[:edit_mode])
               if value && option_type['type'] == 'multiSelect'
                 value = [value]
                 recommended_count = (option_type['config'] || {})['recommendedCount'] || 0
                 while self.confirm("Add another #{option_type['fieldLabel']}?", {:default => recommended_count > value.count}) do
-                  if addn_value = select_prompt(option_type, api_client, option_params, options[:no_prompt], nil, paging_enabled, ignore_empty)
+                  if addn_value = select_prompt(option_type, api_client, option_params, options[:no_prompt], nil, paging_enabled, ignore_empty, options[:edit_mode])
                     value << addn_value
                   else
                     break
@@ -476,7 +477,7 @@ module Morpheus
         Thread.current[:_last_select]
       end
 
-      def self.select_prompt(option_type, api_client, api_params={}, no_prompt=false, use_value=nil, paging_enabled=false, ignore_empty=false)
+      def self.select_prompt(option_type, api_client, api_params={}, no_prompt=false, use_value=nil, paging_enabled=false, ignore_empty=false, edit_mode=false)
         paging_enabled = false if Morpheus::Cli.windows?
         field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
         help_field_key = option_type[:help_field_prefix] ? "#{option_type[:help_field_prefix]}.#{field_key}" : field_key
@@ -550,6 +551,8 @@ module Morpheus
             print "\n"
             exit 1
           end
+        elsif edit_mode
+          # do not use a default value for edit mode
         # skipSingleOption is no longer supported
         # elsif !select_options.nil? && select_options.count == 1 && option_type['skipSingleOption'] == true
         #   value_found = true

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "6.1.2"
+    VERSION = "6.2.1"
   end
 end

data/lib/morpheus/formatters.rb

@@ -134,7 +134,7 @@ end
 
 def format_duration_milliseconds(milliseconds, format="human", ms_threshold=1000)
   out = ""
-  milliseconds = milliseconds.abs.to_i
+  milliseconds = milliseconds.to_i.abs
   if ms_threshold && ms_threshold > milliseconds
     out = "#{milliseconds}ms"
   else