morpheus-cli 5.0.0 → 5.2.2

data/lib/morpheus/cli/invoices_command.rb

@@ -8,7 +8,7 @@ class Morpheus::Cli::InvoicesCommand
 
   set_command_name :'invoices'
 
-  register_subcommands :list, :get, :refresh,
+  register_subcommands :list, :get, :update, :refresh,
                        :list_line_items, :get_line_item
   
   def connect(opts)
@@ -25,16 +25,19 @@ class Morpheus::Cli::InvoicesCommand
     options = {}
     params = {}
     ref_ids = []
-    query_tags = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on('-a', '--all', "Display all details, costs and prices." ) do
         options[:show_all] = true
+        options[:show_dates] = true
         options[:show_estimates] = true
         # options[:show_costs] = true
         options[:show_prices] = true
         # options[:show_raw_data] = true
       end
+      opts.on('--dates', "Display Ref Start, Ref End, etc.") do |val|
+        options[:show_dates] = true
+      end
       opts.on('--estimates', '--estimates', "Display all estimated costs, from usage info: Compute, Storage, Network, Extra" ) do
         options[:show_estimates] = true
       end
@@ -107,9 +110,12 @@ class Morpheus::Cli::InvoicesCommand
         params['accountId'] = val
       end
       opts.on('--tags Name=Value',String, "Filter by tags.") do |val|
-        k,v = val.split("=")
-        query_tags[k] ||= []
-        query_tags[k] << v
+        val.split(",").each do |value_pair|
+          k,v = value_pair.strip.split("=")
+          options[:tags] ||= {}
+          options[:tags][k] ||= []
+          options[:tags][k] << (v || '')
+        end
       end
       opts.on('--raw-data', '--raw-data', "Display Raw Data, the cost data from the cloud provider's API.") do |val|
         options[:show_raw_data] = true
@@ -169,8 +175,8 @@ class Morpheus::Cli::InvoicesCommand
     end
     params['rawData'] = true if options[:show_raw_data]
     params['refId'] = ref_ids unless ref_ids.empty?
-    if query_tags && !query_tags.empty?
-      query_tags.each do |k,v|
+    if options[:tags] && !options[:tags].empty?
+      options[:tags].each do |k,v|
         params['tags.' + k] = v
       end
     end
@@ -203,6 +209,7 @@ class Morpheus::Cli::InvoicesCommand
           {"INVOICE ID" => lambda {|it| it['id'] } },
           {"TYPE" => lambda {|it| format_invoice_ref_type(it) } },
           {"REF ID" => lambda {|it| it['refId'] } },
+          {"REF UUID" => lambda {|it| it['refUuid'] } },
           {"REF NAME" => lambda {|it| 
             if options[:show_all]
               it['refName']
@@ -218,9 +225,11 @@ class Morpheus::Cli::InvoicesCommand
           {"PERIOD" => lambda {|it| format_invoice_period(it) } },
           {"START" => lambda {|it| format_date(it['startDate']) } },
           {"END" => lambda {|it| format_date(it['endDate']) } },
-        ] + (options[:show_all] ? [
+        ] + ((options[:show_dates] || options[:show_all]) ? [
           {"REF START" => lambda {|it| format_dt(it['refStart']) } },
           {"REF END" => lambda {|it| format_dt(it['refEnd']) } },
+          # {"LAST COST DATE" => lambda {|it| format_local_dt(it['lastCostDate']) } },
+          # {"LAST ACTUAL DATE" => lambda {|it| format_local_dt(it['lastActualDate']) } },
         ] : []) + [
           {"COMPUTE" => lambda {|it| format_money(it['computeCost'], 'usd', {sigdig:options[:sigdig]}) } },
           # {"MEMORY" => lambda {|it| format_money(it['memoryCost']) } },
@@ -263,7 +272,7 @@ class Morpheus::Cli::InvoicesCommand
           {"ESTIMATE" => lambda {|it| format_boolean(it['estimate']) } },
           {"ACTIVE" => lambda {|it| format_boolean(it['active']) } },
           {"ITEMS" => lambda {|it| it['lineItems'].size rescue '' } },
-          {"TAGS" => lambda {|it| it['metadata'] ? it['metadata'].collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' } },
+          {"TAGS" => lambda {|it| (it['metadata'] || it['tags']) ? (it['metadata'] || it['tags']).collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' } },
         ]
         if show_projects
           columns += [
@@ -272,9 +281,15 @@ class Morpheus::Cli::InvoicesCommand
           {"PROJECT TAGS" => lambda {|it| it['project'] ? truncate_string(format_metadata(it['project']['tags']), 50) : '' } },
         ]
         end
+        if options[:show_dates]
+          columns += [
+            {"LAST COST DATE" => lambda {|it| format_local_dt(it['lastCostDate']) } },
+            {"LAST ACTUAL DATE" => lambda {|it| format_local_dt(it['lastActualDate']) } },
+          ]
+        end
         columns += [
           {"CREATED" => lambda {|it| format_local_dt(it['dateCreated']) } },
-          {"UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) } }
+          {"UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) } },
         ]
         if options[:show_raw_data]
           columns += [{"RAW DATA" => lambda {|it| truncate_string(it['rawData'].to_s, 10) } }]
@@ -423,7 +438,7 @@ EOT
         "Ref Start" => lambda {|it| format_dt(it['refStart']) },
         "Ref End" => lambda {|it| format_dt(it['refEnd']) },
         "Items" => lambda {|it| it['lineItems'].size rescue '' },
-        "Tags" => lambda {|it| it['metadata'] ? it['metadata'].collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
+        "Tags" => lambda {|it| (it['metadata'] || it['tags']) ? (it['metadata'] || it['tags']).collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
         "Project ID" => lambda {|it| it['project'] ? it['project']['id'] : '' },
         "Project Name" => lambda {|it| it['project'] ? it['project']['name'] : '' },
         "Project Tags" => lambda {|it| it['project'] ? format_metadata(it['project']['tags']) : '' },
@@ -439,7 +454,8 @@ EOT
         description_cols.delete("Project Name")
         description_cols.delete("Project Tags")
       end
-      if invoice['metadata'].nil? || invoice['metadata'].empty?
+      tags = (invoice['metadata'] || invoice['tags'])
+      if tags.nil? || tags.empty?
         description_cols.delete("Tags")
       end
       if !['ComputeServer','Instance','Container'].include?(invoice['refType'])
@@ -575,6 +591,68 @@ EOT
     end
   end
 
+  def update(args)
+    options = {}
+    params = {}
+    payload = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[invoice] [options]")
+      opts.on('--tags LIST', String, "Tags in the format 'name:value, name:value'. This will add and remove tags.") do |val|
+        options[:tags] = val
+      end
+      opts.on('--add-tags TAGS', String, "Add Tags in the format 'name:value, name:value'. This will only add/update tags.") do |val|
+        options[:add_tags] = val
+      end
+      opts.on('--remove-tags TAGS', String, "Remove Tags in the format 'name, name:value'. This removes tags, the :value component is optional and must match if passed.") do |val|
+        options[:remove_tags] = val
+      end
+      build_standard_update_options(opts, options)
+      opts.footer = <<-EOT
+Update an invoice.
+[invoice] is required. This is the id of an invoice.
+      EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    json_response = @invoices_interface.get(args[0])
+    invoice = json_response['invoice']
+
+    invoice_payload = parse_passed_options(options)
+    if options[:tags]
+      invoice_payload['tags'] = parse_metadata(options[:tags])
+    end
+    if options[:add_tags]
+      invoice_payload['addTags'] = parse_metadata(options[:add_tags])
+    end
+    if options[:remove_tags]
+      invoice_payload['removeTags'] = parse_metadata(options[:remove_tags])
+    end
+
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({'invoice' => invoice_payload})
+    else
+      payload.deep_merge!({'invoice' => invoice_payload})
+      if invoice_payload.empty?
+        raise_command_error "Specify at least one option to update.\n#{optparse}"
+      end
+    end
+    @invoices_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @invoices_interface.dry.update(invoice['id'], payload)
+      return
+    end
+    json_response = @invoices_interface.update(invoice['id'], payload)
+    invoice = json_response['invoice']
+    render_response(json_response, options, 'invoice') do
+      print_green_success "Updated invoice #{invoice['id']}"
+      return _get(invoice["id"], options)
+    end
+    return 0, nil
+  end
+
   def refresh(args)
     options = {}
     params = {}
@@ -656,7 +734,6 @@ EOT
     options = {}
     params = {}
     ref_ids = []
-    query_tags = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on('-a', '--all', "Display all details, costs and prices." ) do
@@ -744,11 +821,14 @@ EOT
       opts.on('--tenant ID', String, "View invoice line items for a tenant. Default is your own account.") do |val|
         params['accountId'] = val
       end
-      # opts.on('--tags Name=Value',String, "Filter by tags.") do |val|
-      #   k,v = val.split("=")
-      #   query_tags[k] ||= []
-      #   query_tags[k] << v
-      # end
+      opts.on('--tags Name=Value',String, "Filter by tags.") do |val|
+        val.split(",").each do |value_pair|
+          k,v = value_pair.strip.split("=")
+          options[:tags] ||= {}
+          options[:tags][k] ||= []
+          options[:tags][k] << (v || '')
+        end
+      end
       opts.on('--raw-data', '--raw-data', "Display Raw Data, the cost data from the cloud provider's API.") do |val|
         options[:show_raw_data] = true
       end
@@ -808,8 +888,8 @@ EOT
     end
     params['rawData'] = true if options[:show_raw_data]
     params['refId'] = ref_ids unless ref_ids.empty?
-    if query_tags && !query_tags.empty?
-      query_tags.each do |k,v|
+    if options[:tags] && !options[:tags].empty?
+      options[:tags].each do |k,v|
         params['tags.' + k] = v
       end
     end

data/lib/morpheus/cli/jobs_command.rb

@@ -28,6 +28,7 @@ class Morpheus::Cli::JobsCommand
 
   def list(args)
     options = {}
+    options[:show_stats] = true
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
@@ -37,7 +38,10 @@ class Morpheus::Cli::JobsCommand
       opts.on("--internal [true|false]", String, "Filters job based on internal flag. Internal jobs are excluded by default.") do |val|
         params["internalOnly"] = (val.to_s != "false")
       end
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.on("--stats [true|false]", String, "Hide Execution Stats. Job statistics are displayed by default.") do |val|
+        options[:show_stats] = (val.to_s != "false")
+      end
+      build_standard_list_options(opts, options)
       opts.footer = "List jobs."
     end
     optparse.parse!(args)
@@ -47,78 +51,72 @@ class Morpheus::Cli::JobsCommand
       return 1
     end
 
-    begin
-      params.merge!(parse_list_options(options))
 
-      if !options[:source].nil?
-        if !['all', 'user', 'discovered', 'sync'].include?(options[:source])
-          print_red_alert "Invalid source filter #{options[:source]}"
-          exit 1
-        end
-        params['itemSource'] = options[:source] == 'discovered' ? 'sync' : options[:source]
-      end
+    params.merge!(parse_list_options(options))
 
-      @jobs_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @jobs_interface.dry.list(params)
-        return
+    if !options[:source].nil?
+      if !['all', 'user', 'discovered', 'sync'].include?(options[:source])
+        print_red_alert "Invalid source filter #{options[:source]}"
+        exit 1
       end
-      json_response = @jobs_interface.list(params)
-
-      render_result = render_with_format(json_response, options, 'jobs')
-      return 0 if render_result
+      params['itemSource'] = options[:source] == 'discovered' ? 'sync' : options[:source]
+    end
 
+    @jobs_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @jobs_interface.dry.list(params)
+      return
+    end
+    json_response = @jobs_interface.list(params)
+    jobs = json_response['jobs']
+    render_response(json_response, options, 'jobs') do
       title = "Morpheus Jobs"
       subtitles = []
       subtitles += parse_list_subtitles(options)
       if params["internalOnly"]
         subtitles << "internalOnly: #{params['internalOnly']}"
       end
-      print_h1 title, subtitles
-
-      jobs = json_response['jobs']
-
+      print_h1 title, subtitles, options
       if jobs.empty?
         print cyan,"No jobs found.",reset,"\n"
       else
-        rows = jobs.collect do |job|
-          {
-              id: job['id'],
-              type: job['type'] ? job['type']['name'] : '',
-              name: job['name'],
-              details: job['jobSummary'],
-              enabled: "#{job['enabled'] ? '' : yellow}#{format_boolean(job['enabled'])}#{cyan}",
-              lastRun: format_local_dt(job['lastRun']),
-              nextRun: job['enabled'] && job['scheduleMode'] && job['scheduleMode'] != 'manual' ? format_local_dt(job['nextFire']) : '',
-              lastResult: format_status(job['lastResult'])
-          }
-        end
-        columns = [
-            :id, :type, :name, :details, :enabled, :lastRun, :nextRun, :lastResult
-        ]
-        print as_pretty_table(rows, columns, options)
+        columns = {
+          "ID" => 'id',
+          "Type" => lambda {|job| job['type'] ? job['type']['name'] : '' },
+          "Name" => 'name',
+          "Details" => lambda {|job| job['jobSummary'] },
+          "Enabled" => lambda {|job| "#{job['enabled'] ? '' : yellow}#{format_boolean(job['enabled'])}#{cyan}" },
+          # "Date Created" => lambda {|job| format_local_dt(job['dateCreated']) },
+          # "Last Updated" => lambda {|job| format_local_dt(job['lastUpdated']) },
+          "Last Run" => lambda {|job| format_local_dt(job['lastRun']) },
+          "Next Run" =>  lambda {|job| job['enabled'] && job['scheduleMode'] && job['scheduleMode'] != 'manual' ? format_local_dt(job['nextFire']) : '' },
+          "Last Result" =>  lambda {|job| format_status(job['lastResult']) },
+        }
+        print as_pretty_table(jobs, columns.upcase_keys!, options)
         print_results_pagination(json_response)
-
-        if stats = json_response['stats']
-          label_width = 17
-
-          print_h2 "Execution Stats - Last 7 Days"
-          print cyan
-
-          print "Jobs".rjust(label_width, ' ') + ": #{stats['jobCount']}\n"
-          print "Executions Today".rjust(label_width, ' ') + ": #{stats['todayCount']}\n"
-          print "Daily Executions".rjust(label_width, ' ') + ": " + stats['executionsPerDay'].join(' | ') + "\n"
-          print "Total Executions".rjust(label_width, ' ') + ": #{stats['execCount']}\n"
-          print "Completed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execSuccessRate'].to_f, 100, {bar_color:green}) + "#{stats['execSuccess']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
-          print "Failed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execFailedRate'].to_f, 100, {bar_color:red}) + "#{stats['execFailed']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
+        if options[:show_stats]
+          if stats = json_response['stats']
+            label_width = 17
+
+            print_h2 "Execution Stats - Last 7 Days"
+            print cyan
+
+            print "Jobs".rjust(label_width, ' ') + ": #{stats['jobCount']}\n"
+            print "Executions Today".rjust(label_width, ' ') + ": #{stats['todayCount']}\n"
+            print "Daily Executions".rjust(label_width, ' ') + ": " + stats['executionsPerDay'].join(' | ') + "\n"
+            print "Total Executions".rjust(label_width, ' ') + ": #{stats['execCount']}\n"
+            print "Completed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execSuccessRate'].to_f, 100, {bar_color:green}) + "#{stats['execSuccess']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
+            print "Failed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execFailedRate'].to_f, 100, {bar_color:red}) + "#{stats['execFailed']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
+          end
+          print reset,"\n"
         end
-        print reset,"\n"
       end
       print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+    end
+    if jobs.empty?
+      return 1, "no jobs found"
+    else
+      return 0, nil
     end
   end
 
@@ -735,53 +733,57 @@ class Morpheus::Cli::JobsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[job]")
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.on('--job JOB', String, "Filter by Job ID or name.") do |val|
+        options[:job] = val
+      end
+      opts.on("--internal [true|false]", String, "Filters executions based on internal flag. Internal executions are excluded by default.") do |val|
+        params["internalOnly"] = (val.to_s != "false")
+      end
+      build_standard_list_options(opts, options)
       opts.footer = "List job executions.\n" +
           "[job] is optional. Job ID or name to filter executions."
 
     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}"
-      return 1
+    # verify_args!(args:args, optparse:optparse, max:1)
+    if args.count > 0
+      options[:job] = args.join(" ")
     end
 
-    begin
-      params.merge!(parse_list_options(options))
-
-      if args.count > 0
-        job = find_by_name_or_id('job', args[0])
+    params.merge!(parse_list_options(options))
 
-        if job.nil?
-          print_red_alert "Job #{args[0]} not found"
-          exit 1
-        end
-        params['jobId'] = job['id']
-      end
-
-      @jobs_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @jobs_interface.dry.list_executions(params)
-        return
+    if options[:job]
+      job = find_by_name_or_id('job', options[:job])
+      if job.nil?
+        raise_command_error "Job #{options[:job]} not found"
       end
-      json_response = @jobs_interface.list_executions(params)
-
-      render_result = render_with_format(json_response, options, 'jobExecutions')
-      return 0 if render_result
+      params['jobId'] = job['id']
+    end
 
+    @jobs_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @jobs_interface.dry.list_executions(params)
+      return
+    end
+    json_response = @jobs_interface.list_executions(params)
+    job_executions = json_response['jobExecutions']
+    render_response(json_response, options, 'jobExecutions') do
       title = "Morpheus Job Executions"
       subtitles = job ? ["Job: #{job['name']}"] : []
       subtitles += parse_list_subtitles(options)
-      print_h1 title, subtitles
-
-      print_job_executions(json_response['jobExecutions'], options)
+      if params["internalOnly"]
+        subtitles << "internalOnly: #{params['internalOnly']}"
+      end
+      print_h1 title, subtitles, options
+      print_job_executions(job_executions, options)
       print_results_pagination(json_response)
       print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+    end
+    if job_executions.empty?
+      return 3, "no executions found"
+    else
+      return 0, nil
     end
   end
 
@@ -812,7 +814,7 @@ class Morpheus::Cli::JobsCommand
       end
       json_response = @jobs_interface.get_execution(args[0], params)
 
-      render_result = render_with_format(json_response, options, 'job')
+      render_result = render_with_format(json_response, options, 'jobExecution')
       return 0 if render_result
 
       title = "Morpheus Job Execution"
@@ -845,7 +847,7 @@ class Morpheus::Cli::JobsCommand
           description_cols = {
               "Process ID" => lambda {|it| it[:id]},
               "Description" => lambda {|it| it[:description]},
-              "Start Data" => lambda {|it| it[:start_date]},
+              "Start Date" => lambda {|it| it[:start_date]},
               "Created By" => lambda {|it| it[:created_by]},
               "Duration" => lambda {|it| it[:duration]},
               "Status" => lambda {|it| it[:status]}
@@ -919,7 +921,7 @@ class Morpheus::Cli::JobsCommand
       description_cols = {
           "ID" => lambda {|it| it[:id]},
           "Description" => lambda {|it| it[:description]},
-          "Start Data" => lambda {|it| it[:start_date]},
+          "Start Date" => lambda {|it| it[:start_date]},
           "Created By" => lambda {|it| it[:created_by]},
           "Duration" => lambda {|it| it[:duration]},
           "Status" => lambda {|it| it[:status]}
@@ -974,7 +976,7 @@ class Morpheus::Cli::JobsCommand
             job: ex['job'] ? ex['job']['name'] : '',
             description: ex['description'] || ex['job'] ? ex['job']['description'] : '',
             type: ex['job'] && ex['job']['type'] ? (ex['job']['type']['code'] == 'morpheus.workflow' ? 'Workflow' : 'Task') : '',
-            startDate: format_local_dt(ex['startDate']),
+            start: format_local_dt(ex['startDate']),
             duration: ex['duration'] ? format_human_duration(ex['duration'] / 1000.0) : '',
             status: format_status(ex['status']),
             error: truncate_string(ex['process'] && (ex['process']['message'] || ex['process']['error']) ? ex['process']['message'] || ex['process']['error'] : '', 32)
@@ -982,7 +984,7 @@ class Morpheus::Cli::JobsCommand
       end
 
       columns = [
-          :id, :job, :type, :startDate, {'ETA/TIME' => :duration}, :status, :error
+          :id, :job, :type, {'START DATE' => :start}, {'ETA/TIME' => :duration}, :status, :error
       ]
       print as_pretty_table(rows, columns, options)
       print reset,"\n"