morpheus-cli 5.2.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f4b5a29dcfa1a915ab2d3fed9ad07197d2a760758b2bc3b76e72cf6899c4372
-  data.tar.gz: 59c981a5aede057b69e08f5c717d27c884bdd64aed84fb81361b35291b3aaf72
+  metadata.gz: 4409a856333a1b2957649aac67f62677b943706754ebc810c614fa5f879b120d
+  data.tar.gz: bb968663da852f4ea631fc9b0c89c115f6fb1067049585953c33b7c24e4b284a
 SHA512:
-  metadata.gz: 678ff7f73923c9883968ee8bba29b8d75d5464a4899ca812477ce943b25f758c74f187a481c781500928206c4d540d5153f858ee4e2242cfb24cc2604be1602d
-  data.tar.gz: c27881081abb71b05eceb4857280f51a4f838e9a568658baa34385afe7fc2b86be61eb31a070a4e3a9381000337ceb9b11f58fe8572fff8066882225133742ba
+  metadata.gz: 2be204c65dd3c2a35ce5ac7170e70a2297aa34ee1348db2fc736a5915a2678c0c45361269a801db228f202e27dcdcfaaf69afc7f49d9eded429c16d5381dd28f
+  data.tar.gz: a5018a327ae43078e4661c1c3744e75b6cc1adfc8854ca09d99a0a47f8e0678d2f8914b46d724bd8189011b13a42f2ac5779b3980611af1655cdebc4393a3e53

data/.gitignore

@@ -21,3 +21,4 @@ tmp
 *.a
 mkmf.log
 .DS_Store
+.idea

data/lib/morpheus/cli/hosts.rb

@@ -530,9 +530,10 @@ class Morpheus::Cli::Hosts
         puts records_as_csv([json_response['server']], options)
         return 0
       end
-      server = json_response['server']
+      server = json_response['server'] || json_response['host'] || {}
       #stats = server['stats'] || json_response['stats'] || {}
       stats = json_response['stats'] || {}
+      tags = server['tags'] || server['metadata']
       title = "Host Details"
       print_h1 title, [], options
       print cyan
@@ -541,6 +542,7 @@ class Morpheus::Cli::Hosts
         "Name" => 'name',
         "Hostname" => 'hostname',
         "Description" => 'description',
+        "Tags" => lambda {|it| tags ? format_metadata(tags) : '' },
         "Owner" => lambda {|it| it['owner'] ? it['owner']['username'] : '' },
         "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
         #"Group" => lambda {|it| it['group'] ? it['group']['name'] : '' },
@@ -564,6 +566,7 @@ class Morpheus::Cli::Hosts
       # server_columns.delete("Tenant") if multi_tenant != true
       server_columns.delete("Cost") if server['hourlyCost'].to_f == 0
       server_columns.delete("Price") if server['hourlyPrice'].to_f == 0 || server['hourlyPrice'] == server['hourlyCost']
+      server_columns.delete("Tags") if tags.nil? || tags.empty?
 
       print_description_list(server_columns, server)
 
@@ -990,6 +993,19 @@ class Morpheus::Cli::Hosts
       opts.on('--power-schedule-type ID', String, "Power Schedule Type ID") do |val|
         params['powerScheduleType'] = val == "null" ? nil : val
       end
+      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('--metadata LIST', String, "Alias for --tags.") do |val|
+        options[:tags] = val
+      end
+      opts.add_hidden_option('--metadata')
+      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
       # opts.on('--created-by ID', String, "Created By User ID") do |val|
       #   params['createdById'] = val
       # end
@@ -1008,6 +1024,18 @@ class Morpheus::Cli::Hosts
       new_group = nil
       passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
       params.deep_merge!(passed_options) unless passed_options.empty?
+      # metadata tags
+      if options[:tags]
+        params['tags'] = parse_metadata(options[:tags])
+      else
+        # params['tags'] = prompt_metadata(options)
+      end
+      if options[:add_tags]
+        params['addTags'] = parse_metadata(options[:add_tags])
+      end
+      if options[:remove_tags]
+        params['removeTags'] = parse_metadata(options[:remove_tags])
+      end
       payload = nil
       if options[:payload]
         payload = options[:payload]
@@ -1919,7 +1947,8 @@ class Morpheus::Cli::Hosts
           snapshot_column_definitions = {
             "ID" => lambda {|it| it['id'] },
             "Name" => lambda {|it| it['name'] },
-            "Description" => lambda {|it| it['snapshotType'] ? (it['snapshotType']['name'] || it['snapshotType']['code']) : '' },
+            "Description" => lambda {|it| it['description'] },
+            # "Type" => lambda {|it| it['snapshotType'] },
             "Date Created" => lambda {|it| format_local_dt(it['snapshotCreated']) },
             "Status" => lambda {|it| format_snapshot_status(it) }
           }

data/lib/morpheus/cli/instances.rb

@@ -459,17 +459,58 @@ class Morpheus::Cli::Instances
       options[:instance_name] = args[0]
     end
 
-    # use active group by default
-    options[:group] ||= @active_group_id
-    options[:select_datastore] = true
-    options[:name_required] = true
     begin
       payload = nil
       if options[:payload]
         payload = options[:payload]
         # support -O OPTION switch on top of --payload
         payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        # obviously should support every option that prompt supports on top of -- payload as well
+        # group, cloud and type for now
+        # todo: also support :layout, service_plan, :resource_pool, etc.
+        group = nil
+        if options[:group]
+          group = find_group_by_name_or_id_for_provisioning(options[:group])
+          if group.nil?
+            return 1, "group not found by #{options[:group]}"
+          end
+          #payload["siteId"] = group["id"]
+          payload.deep_merge!({"instance" => {"site" => {"id" => group["id"]} } })
+        end
+        if options[:cloud]
+          group_id = group ? group["id"] : ((payload["instance"] && payload["instance"]["site"].is_a?(Hash)) ? payload["instance"]["site"]["id"] : nil)
+          cloud = find_cloud_by_name_or_id_for_provisioning(group_id, options[:cloud])
+          if cloud.nil?
+            return 1, "cloud not found by #{options[:cloud]}"
+          end
+          payload["zoneId"] = cloud["id"]
+          payload.deep_merge!({"instance" => {"cloud" => cloud["name"] } })
+        end
+        if options[:cloud]
+          group_id = group ? group["id"] : ((payload["instance"] && payload["instance"]["site"].is_a?(Hash)) ? payload["instance"]["site"]["id"] : nil)
+          cloud = find_cloud_by_name_or_id_for_provisioning(group_id, options[:cloud])
+          if cloud.nil?
+            return 1, "cloud not found by #{options[:cloud]}"
+          end
+          payload["zoneId"] = cloud["id"]
+          payload.deep_merge!({"instance" => {"cloud" => cloud["name"] } })
+        end
+        if options[:instance_type_code]
+          # should just use find_instance_type_by_name_or_id
+          # note that the api actually will match name name or code
+          instance_type = (options[:instance_type_code].to_s =~ /\A\d{1,}\Z/) ? find_instance_type_by_id(options[:instance_type_code]) : find_instance_type_by_code(options[:instance_type_code])
+          if instance_type.nil?
+            return 1, "instance type not found by #{options[:cloud]}"
+          end
+          payload.deep_merge!({"instance" => {"type" => instance_type["code"] } })
+          payload.deep_merge!({"instance" => {"instanceType" => {"code" => instance_type["code"]} } })
+        end
+
       else
+        # use active group by default
+        options[:group] ||= @active_group_id
+        options[:select_datastore] = true
+        options[:name_required] = true
         # prompt for all the instance configuration options
         # this provisioning helper method handles all (most) of the parsing and prompting
         # and it relies on the method to exit non-zero on error, like a bad CLOUD or TYPE value
@@ -562,16 +603,17 @@ class Morpheus::Cli::Instances
       opts.on('--group GROUP', String, "Group Name or ID") do |val|
         options[:group] = val
       end
-      opts.on('--tags LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
-        options[:metadata] = val
+      opts.on('--labels LIST', String, "Labels (keywords) in the format 'foo, bar'") do |val|
+        params['labels'] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
       end
-      opts.on('--metadata LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
-        options[:metadata] = val
+      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.add_hidden_option('--metadata')
-      opts.on('--labels LIST', String, "Labels (keywords) in the format 'foo, bar'") do |val|
-        # todo switch this from 'tags' to 'labels'
-        params['tags'] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
+      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
       opts.on('--power-schedule-type ID', String, "Power Schedule Type ID") do |val|
         params['powerScheduleType'] = val == "null" ? nil : val
@@ -627,32 +669,17 @@ class Morpheus::Cli::Instances
         payload['instance']['site'] = {'id' => group['id']}
       end
       # metadata tags
-      # if options[:options]['metadata'].is_a?(Array) && !options[:metadata]
-      #   options[:metadata] = options[:options]['metadata']
-      # end
-      if options[:metadata]
-        metadata = []
-        if options[:metadata] == "[]" || options[:metadata] == "null"
-          payload['instance']['metadata'] = []
-        elsif options[:metadata].is_a?(Array)
-          payload['instance']['metadata'] = options[:metadata]
-        else
-          # parse string into format name:value, name:value
-          # merge IDs from current metadata
-          # todo: should allow quoted semicolons..
-          metadata_list = options[:metadata].split(",").select {|it| !it.to_s.empty? }
-          metadata_list = metadata_list.collect do |it|
-            metadata_pair = it.split(":")
-            if metadata_pair.size == 1 && it.include?("=")
-              metadata_pair = it.split("=")
-            end
-            row = {}
-            row['name'] = metadata_pair[0].to_s.strip
-            row['value'] = metadata_pair[1].to_s.strip
-            row
-          end
-          payload['instance']['metadata'] = metadata_list
-        end
+      if options[:tags]
+        # api version 4.2.5 and later supports tags, older versions expect metadata
+        # todo: use tags instead like everywhere else
+        # payload['instance']['tags'] = parse_metadata(options[:tags])
+        payload['instance']['metadata'] = parse_metadata(options[:tags])
+      end
+      if options[:add_tags]
+        payload['instance']['addTags'] = parse_metadata(options[:add_tags])
+      end
+      if options[:remove_tags]
+        payload['instance']['removeTags'] = parse_metadata(options[:remove_tags])
       end
       if payload['instance'].empty? && params.empty? && options[:owner].nil?
         raise_command_error "Specify at least one option to update.\n#{optparse}"
@@ -1256,11 +1283,14 @@ class Morpheus::Cli::Instances
       # metadata tags used to be returned as metadata and are now returned as tags
       # the problem is tags is what we used to call Labels (keywords)
       # the api will change to tags and labels, so handle the old format as long as metadata is returned.
-      tags, labels = nil, nil
-      if instance.key?('metadata')
-        tags, labels = instance['metadata'], instance['tags']
+      labels = nil
+      tags = nil
+      if instance.key?('labels')
+        labels = instance['labels']
+        tags = instance['tags']
       else
-        tags, labels = instance['tags'], instance['labels']
+        labels = instance['tags']
+        tags = instance['metadata']
       end
       # containers are fetched via separate api call
       containers = nil
@@ -1302,7 +1332,7 @@ class Morpheus::Cli::Instances
         # "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         # "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         "Environment" => 'instanceContext',
-        "Labels" => lambda {|it| it['tags'] ? it['tags'].join(',') : '' },
+        "Labels" => lambda {|it| labels ? labels.join(',') : '' },
         "Tags" => lambda {|it| tags ? tags.collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
         "Owner" => lambda {|it| 
           if it['owner']
@@ -3020,7 +3050,8 @@ EOT
           snapshot_column_definitions = {
             "ID" => lambda {|it| it['id'] },
             "Name" => lambda {|it| it['name'] },
-            "Description" => lambda {|it| it['snapshotType'] ? (it['snapshotType']['name'] || it['snapshotType']['code']) : '' },
+            "Description" => lambda {|it| it['description'] },
+            # "Type" => lambda {|it| it['snapshotType'] },
             "Date Created" => lambda {|it| format_local_dt(it['snapshotCreated']) },
             "Status" => lambda {|it| format_snapshot_status(it) }
           }

data/lib/morpheus/cli/invoices_command.rb

@@ -272,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 += [
@@ -438,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']) : '' },
@@ -454,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'])

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

@@ -596,14 +596,12 @@ module Morpheus::Cli::ProvisioningHelper
     v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'environment', 'fieldLabel' => 'Environment', 'type' => 'select', 'required' => false, 'selectOptions' => get_available_environments()}], options[:options])
     payload['instance']['instanceContext'] = v_prompt['environment'] if !v_prompt['environment'].empty?
 
-    # Labels (Provisioning API still refers to these as tags)
-    # and tags (metadata tags) is called metadata.
-    # todo: switch this from 'tags' to labels' when the api changes
+    # Labels (used to be called tags)
     if options[:labels]
-      payload['instance']['tags'] = options[:labels].is_a?(Array) ? options[:labels] : options[:labels].to_s.split(',').collect {|it| it.to_s.strip }.compact.uniq
+      payload['instance']['labels'] = options[:labels].is_a?(Array) ? options[:labels] : options[:labels].to_s.split(',').collect {|it| it.to_s.strip }.compact.uniq
     else
       v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false}], options[:options])
-      payload['instance']['tags'] = v_prompt['tags'].split(',').collect {|it| it.to_s.strip }.compact.uniq if !v_prompt['tags'].empty?
+      payload['instance']['labels'] = v_prompt['labels'].split(',').collect {|it| it.to_s.strip }.compact.uniq if !v_prompt['labels'].empty?
     end
 
     # Version and Layout
@@ -1693,6 +1691,15 @@ module Morpheus::Cli::ProvisioningHelper
           row = {}
           row['name'] = metadata_pair[0].to_s.strip
           row['value'] = metadata_pair[1].to_s.strip
+          # hacky way to set masked flag to true of false to (masked) in the value itself
+          if(row['value'].include?("(masked)"))
+            row['value'] = row['value'].gsub("(masked)", "").strip
+            row['masked'] = true
+          end
+          if(row['value'].include?("(unmasked)"))
+            row['value'] = row['value'].gsub("(unmasked)", "").strip
+            row['masked'] = false
+          end
           row
         end
         metadata = metadata_list

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.2.0"
+    VERSION = "5.2.1"
   end
 end

data/lib/morpheus/cli/virtual_images.rb

@@ -299,7 +299,7 @@ EOT
       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 project tags.") do |val|
+      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|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler