morpheus-cli 3.3.2.3 → 3.3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8701d670a60da80458ef5dc574852c5dc070c7e
-  data.tar.gz: 8b7f01e73bcdc238668b4d643c5976ded6956c2a
+  metadata.gz: 23b7256e7bd53616a95b10545533e64cc2968492
+  data.tar.gz: 8e7f50f6e32d7f0d203907b033b1c88ff644ffd7
 SHA512:
-  metadata.gz: 31882e7b1280de15565ca180788d404dafbfe2b811a42c03c3006466d3f0d25b5ec24fb4cab5ec978b9e78eec2c4c6835463b059e57c957cf308d96f6c0ee3e3
-  data.tar.gz: 5bfc0364301f53166c3e70f56b9fa16304bf44aa69b75ac750c9a908520fff6f035386799327c06af998cdcd2593b746901aed28e35c284ab4ec8d7a4e6b955b
+  metadata.gz: c02866eacbb6104b57f41af564b5a032b659e1029c95a4d59705b6cd91feaba103405a1664fec20c6cda1ab4e668aff08fe0412f464c5d609824360c02c90c7b
+  data.tar.gz: 44ca0888b0bb4857ecc52faeb5d38c16cca055507fbc3c89db5cadfc9174933c49b9efd7039873d33412beb1ed562da6a474d987496bf2d42a8bb5f1073733d6

data/lib/morpheus/cli/instances.rb

@@ -208,6 +208,7 @@ class Morpheus::Cli::Instances
 
   def add(args)
     options = {}
+    options[:create_user] = true
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       # opts.banner = subcommand_usage("[type] [name]")
       opts.banner = subcommand_usage("[name] -c CLOUD -t TYPE")
@@ -220,6 +221,9 @@ class Morpheus::Cli::Instances
       opts.on( '-t', '--type CODE', "Instance Type" ) do |val|
         options[:instance_type_code] = val
       end
+      opts.on( '--name NAME', "Instance Name" ) do |val|
+        options[:instance_name] = val
+      end
       opts.on("--copies NUMBER", Integer, "Number of copies to provision") do |val|
         options[:copies] = val.to_i
       end
@@ -232,6 +236,12 @@ class Morpheus::Cli::Instances
       # opts.on('-L', "--lb", "Enable Load Balancer") do
       #   options[:enable_load_balancer] = true
       # end
+      opts.on("--create-user on|off", String, "User Config: Create Your User. Default is on") do |val|
+        options[:create_user] = !['false','off','0'].include?(val.to_s)
+      end
+      opts.on("--user-group USERGROUP", String, "User Config: User Group") do |val|
+        options[:user_group_id] = val
+      end
       opts.on("--shutdown-days NUMBER", Integer, "Automation: Shutdown Days") do |val|
         options[:expire_days] = val.to_i
       end
@@ -242,6 +252,9 @@ class Morpheus::Cli::Instances
         options[:create_backup] = ['on','true','1'].include?(val.to_s.downcase) ? 'on' : 'off'
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
+      opts.footer = "Create a new instance." + "\n" +
+                    "[name] is required. This is the new instance name." + "\n" +
+                    "The available options vary by --type."
     end
 
     optparse.parse!(args)
@@ -264,24 +277,13 @@ class Morpheus::Cli::Instances
       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]
       else
         # 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
         payload = prompt_new_instance(options)
-        # other stuff
-        payload[:copies] = options[:copies] if options[:copies] && options[:copies] > 0
-        payload[:layoutSize] = options[:layout_size] if options[:layout_size] && options[:layout_size] > 0 # aka Scale Factor
-        payload[:createBackup] = options[:create_backup] ? 'on' : 'off' if options[:create_backup] == true
-        payload['instance']['expireDays'] = options[:expire_days] if options[:expire_days]
-        payload['instance']['shutdownDays'] = options[:shutdown_days] if options[:shutdown_days]
-        if options[:workflow_id]
-          payload['taskSetId'] = options[:workflow_id]
-        end
-        if options[:enable_load_balancer]
-          lb_payload = prompt_instance_load_balancer(payload['instance'], nil, options)
-          payload.deep_merge!(lb_payload)
-        end
         # clean payload of empty objects 
         # note: this is temporary and should be fixed upstream in OptionTypes.prompt()
         if payload['instance'].is_a?(Hash)
@@ -298,6 +300,29 @@ class Morpheus::Cli::Instances
         end
       end
 
+      if options[:instance_name]
+        payload['instance'] ||= payload['instance']
+        payload['instance']['name'] = options[:instance_name]
+      end
+      payload[:copies] = options[:copies] if options[:copies] && options[:copies] > 0
+      payload[:layoutSize] = options[:layout_size] if options[:layout_size] && options[:layout_size] > 0 # aka Scale Factor
+      payload[:createBackup] = options[:create_backup] ? 'on' : 'off' if options[:create_backup] == true
+      payload['instance']['expireDays'] = options[:expire_days] if options[:expire_days]
+      payload['instance']['shutdownDays'] = options[:shutdown_days] if options[:shutdown_days]
+      if options.key?(:create_user)
+        payload['config']['createUser'] = options[:create_user]
+      end
+      if options[:user_group_id]
+        payload['instance']['userGroup'] = {'id' => options[:user_group_id] }
+      end
+      if options[:workflow_id]
+        payload['taskSetId'] = options[:workflow_id]
+      end
+      if options[:enable_load_balancer]
+        lb_payload = prompt_instance_load_balancer(payload['instance'], nil, options)
+        payload.deep_merge!(lb_payload)
+      end
+
       if options[:dry_run]
         print_dry_run @instances_interface.dry.create(payload)
         return 0

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.3.2.3"
+    VERSION = "3.3.2.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.3.2.3
+  version: 3.3.2.4
 platform: ruby
 authors:
 - David Estes