morpheus-cli 3.6.5 → 3.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5af54f955b29a018c9dc09a30706f3dff383b42b71f08e92ba63539cf679171
-  data.tar.gz: f10233595e661594134eb2605bbe3dd48be90458c36441c5bd7afddbabc7093f
+  metadata.gz: 6da8f8d23212139cce4d64119553bfa16acfaeecb64eee54d6607f0f3e9e9171
+  data.tar.gz: b63b976a649deffd4cfeb86290a3573f60ca838697763b7721020f5bdb0b3f50
 SHA512:
-  metadata.gz: 19e02a97f046c115b8080fb6489f07e4973e0dc734dd6986a492816e4abcd805d32ad49008593973acc9fc1346c1416d2cfc93121c96576a8fcb8cdb1b056dc3
-  data.tar.gz: 69d7ab3ae77e4fccc8ee42f09fc7c16f4f3383801a39acd57c8d661bcc0ea38633ed97a6c81840f761e84d3038aded3e2bd15667c8d9522f129dc39a265e3339
+  metadata.gz: 137db6bddd24c7a6521e70e592ef2f8110cd8f14ec65d7c1777af8ff04bffc57fd73216d2416ad2365ac7173f6dd61707069ed0f610a683049f0ade41c1d09ff
+  data.tar.gz: 5e8dbd46a7c628ba8c658276c2dd08e28c51573a642888030f0340e36d4a00a5fc18ac34c76ff6d91ca3c0d0374a8c5e1f65d2524db914333fd5b09ed2eb6331

data/lib/morpheus/cli/apps.rb

@@ -265,7 +265,7 @@ class Morpheus::Cli::Apps
                 tier_instance_types = tier_instances ? tier_instances.collect {|it| (it['instance'] && it['instance']['type']) ? it['instance']['type'].to_s : 'unknown'}.compact : []
                 unless options[:quiet]
                   # print cyan, "Configuring Tier: #{tier_name} (#{tier_instance_types.empty? ? 'empty' : tier_instance_types.join(', ')})", "\n"
-                  print cyan, "Configuring tier #{tier_name}", "\n"
+                  print cyan, "Configuring tier #{tier_name}", reset, "\n"
                 end
                 # todo: also prompt for tier settings here, like linkedTiers: []
                 if tier_instances
@@ -280,23 +280,38 @@ class Morpheus::Cli::Apps
                       return 1
                     else
                       unless options[:quiet]
-                        print cyan, "Configuring #{instance_type_code} instance #{tier_name}.#{instance_index}", "\n"
+                        print cyan, "Configuring #{instance_type_code} instance #{tier_name}.#{instance_index}", reset, "\n"
                       end
+
+                      # Cloud
+                      cloud_id = nil
+                      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'fieldLabel' => 'Cloud', 'type' => 'select', 'selectOptions' => scoped_available_clouds, 'defaultValue' => cloud ? cloud['name'] : nil}], options[:options])
+                      cloud_id = v_prompt['cloud'] unless v_prompt['cloud'].to_s.empty?
+                      if cloud_id
+                        # cloud = find_cloud_by_name_or_id_for_provisioning(group['id'], cloud_id)
+                        cloud = scoped_available_clouds.find {|it| it['name'] == cloud_id.to_s } || scoped_available_clouds.find {|it| it['id'].to_s == cloud_id.to_s }
+                        return 1 if cloud.nil?
+                      else
+                        # prompt still happens inside get_scoped_instance_config
+                      end
+                      
+                      
                       # prompt for the cloud for this instance
                       # the cloud is part of finding the scoped config in the blueprint
-
                       scoped_instance_config = get_scoped_instance_config(instance_config.clone, payload['environment'], group ? group['name'] : nil, cloud ? cloud['name'] : nil)
+
                       # now configure an instance like normal, use the config as default options with :always_prompt
                       instance_prompt_options = {}
                       instance_prompt_options[:group] = group ? group['id'] : nil
-                      instance_prompt_options[:default_cloud] = cloud ? cloud['id'] : nil
+                      instance_prompt_options[:cloud] = cloud ? cloud['name'] : nil
+                      instance_prompt_options[:default_cloud] = cloud ? cloud['name'] : nil
                       instance_prompt_options[:no_prompt] = options[:no_prompt]
                       instance_prompt_options[:always_prompt] = options[:no_prompt] != true # options[:always_prompt]
                       instance_prompt_options[:options] = scoped_instance_config # meh, actually need to make these default values instead..
                       instance_prompt_options[:options][:always_prompt] = instance_prompt_options[:no_prompt] != true
                       instance_prompt_options[:options][:no_prompt] = instance_prompt_options[:no_prompt]
 
-                      # also allow arbritrary options passed as tierName.instanceIndex
+                      # also allow arbritrary options passed as tierName.instanceIndex like Web.0.instance.layout.id=75
                       instance_extra_options = {}
                       if tier_extra_options && tier_extra_options[instance_index.to_s]
                         instance_extra_options = tier_extra_options[instance_index.to_s]
@@ -1568,18 +1583,20 @@ class Morpheus::Cli::Apps
   # def tmplCfg = getConfigMap(appTemplateConfig?.tiers?.getAt(tierName)?.instances?.getAt(index), opts.environment, opts.group, instanceOpts.instance.cloud?: opts?.defaultCloud?.name)
   def get_scoped_instance_config(instance_config, env_name, group_name, cloud_name)
       config = instance_config.clone
-      if env_name && config['environments'] && config['environments'][env_name]
+      if env_name.to_s != '' && config['environments'] && config['environments'][env_name]
         config = config['environments'][env_name].clone
       end
-      if group_name && config['groups'] && config['groups'][group_name]
+      if group_name.to_s != '' && config['groups'] && config['groups'][group_name]
         config = config['groups'][group_name].clone
       end
-      if cloud_name && config['clouds'] && config['clouds'][cloud_name]
+      if cloud_name.to_s != '' && config['clouds'] && config['clouds'][cloud_name]
         config = config['clouds'][cloud_name].clone
       end
       config.delete('environments')
       config.delete('groups')
       config.delete('clouds')
+      # puts "get_scoped_instance_config(instance_config, #{env_name}, #{group_name}, #{cloud_name})"
+      # puts "returned config: #{config}"
       return config
   end
 

data/lib/morpheus/cli/hosts.rb

@@ -811,7 +811,9 @@ class Morpheus::Cli::Hosts
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
+      build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
+      opts.footer = "Start a host.\n" +
+                    "[name] is required. This is the name or id of a host. Supports 1-N [name] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -842,7 +844,7 @@ class Morpheus::Cli::Hosts
       elsif !options[:quiet]
         print_green_success "Started #{objects_label}"
       end
-      return
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -853,7 +855,9 @@ class Morpheus::Cli::Hosts
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
+      build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
+      opts.footer = "Stop a host.\n" +
+                    "[name] is required. This is the name or id of a host. Supports 1-N [name] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -884,7 +888,7 @@ class Morpheus::Cli::Hosts
       elsif !options[:quiet]
         print_green_success "Stopped #{objects_label}"
       end
-      return
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

data/lib/morpheus/cli/instances.rb

@@ -1348,7 +1348,7 @@ class Morpheus::Cli::Instances
       opts.add_hidden_option('muteMonitoring') if opts.is_a?(Morpheus::Cli::OptionParser)
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
       opts.footer = "Stop an instance.\n" +
-                    "[name] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
+                    "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1408,7 +1408,7 @@ class Morpheus::Cli::Instances
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
       opts.footer = "Start an instance.\n" +
-                    "[name] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
+                    "[name] is required. This is the name or id of an instance. Supports 1-N [name] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1465,16 +1465,16 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      opts.on('--mute-monitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
+      opts.on('--mute-monitoring [on|off]', String, "Mute monitoring. Default is on.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
-      opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
+      opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is on.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
       opts.add_hidden_option('muteMonitoring') if opts.is_a?(Morpheus::Cli::OptionParser)
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
-      opts.footer = "Start an instance.\n" +
-                    "[name] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
+      opts.footer = "Restart an instance.\n" +
+                    "[name] is required. This is the name or id of an instance. Supports 1-N [name] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1535,6 +1535,8 @@ class Morpheus::Cli::Instances
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
+      opts.footer = "Suspend an instance.\n" +
+                    "[name] is required. This is the name or id of an instance. Supports 1-N [name] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1581,6 +1583,8 @@ class Morpheus::Cli::Instances
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
+      opts.footer = "Eject an instance.\n" +
+                    "[name] is required. This is the name or id of an instance. Supports 1-N [name] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1634,7 +1638,7 @@ class Morpheus::Cli::Instances
       opts.add_hidden_option('muteMonitoring') if opts.is_a?(Morpheus::Cli::OptionParser)
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
       opts.footer = "Stop service on an instance.\n" +
-                    "[name] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
+                    "[name] is required. This is the name or id of an instance. Supports 1-N [name] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1694,7 +1698,7 @@ class Morpheus::Cli::Instances
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
       opts.footer = "Start service on an instance.\n" +
-                    "[name] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
+                    "[name] is required. This is the name or id of an instance. Supports 1-N [name] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1751,16 +1755,16 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      opts.on('--mute-monitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
+      opts.on('--mute-monitoring [on|off]', String, "Mute monitoring. Default is on.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
-      opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
+      opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is on.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
       opts.add_hidden_option('muteMonitoring') if opts.is_a?(Morpheus::Cli::OptionParser)
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
       opts.footer = "Restart service on an instance.\n" +
-                    "[name] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
+                    "[name] is required. This is the name or id of an instance. Supports 1-N [name] arguments."
     end
     optparse.parse!(args)
     if args.count < 1

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

@@ -258,6 +258,8 @@ module Morpheus::Cli::ProvisioningHelper
     instance_name = nil
     if options[:instance_name]
       options[:options]['name'] = options[:instance_name]
+    elsif options[:options]['instance'] && options[:options]['instance']['name']
+      options[:options]['name'] = options[:options]['instance']['name']
     end
     name_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Instance Name', 'type' => 'text', 'required' => options[:name_required]}], options[:options])
     instance_name = name_prompt['name']

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.5"
+    VERSION = "3.6.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.5
+  version: 3.6.6
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler