morpheus-cli 4.1.14 → 4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ed9f7ed5543846a64411f1e25133cad8df66ee4a2db836754f4733225d83962
-  data.tar.gz: 859c8b97f7ca569359cb795462803da90c0ed624998c67cf358aa5b5ae8a7df5
+  metadata.gz: 65ef554015f7c79d475689f9b09d7a91e235c7feb992580f588e11c4c2fe36a5
+  data.tar.gz: 787e1ba5b1dbe066f8ab8e1fd47ec93372d9b68f5402ff4bcee3e1e7dbc62cfc
 SHA512:
-  metadata.gz: c140d5c006c3bb4b179c8d763514b47cc8b36f8526cb60472f39043601054e5da55cadd79039ec02cf756e54fe36ae3358a5fb1029ca18a0eef9ed60eb5a1e51
-  data.tar.gz: f81e24cbe8a4a62c46d33420baa43e9a599930ac2cc1066f05fac766fb82d0d96511dd2a06a99cd5b1b5f55edf56dc6a19a59004f7e997388d64ddf85b533b0d
+  metadata.gz: f21d7fef551d46c5e2f9465fdebc59b8b3c801d8a44474a299a2285234672206da64a0e68ca7d3b3f36eb1ee80279477ea1a0fc3b13c7ade10e72cbdde4bb3e8
+  data.tar.gz: 183b260af59171e6f0620864fc428245618506276cd350097396664a5f7609e866f4defcba7dd41f2f87a07ea292af42de57887b23736190c15ca46042977ea8

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 4.1.13
+RUN gem install morpheus-cli -v 4.2
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/api_client.rb

@@ -534,6 +534,10 @@ class Morpheus::APIClient
     Morpheus::NetworkPoolIpsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
+  def network_routers
+    Morpheus::NetworkRoutersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  end
+
   def network_services
     Morpheus::NetworkServicesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end

data/lib/morpheus/api/library_container_types_interface.rb

@@ -51,7 +51,7 @@ class Morpheus::LibraryContainerTypesInterface < Morpheus::APIClient
   def build_url(layout_id=nil, id=nil)
     url = "#{@base_url}/api"
     if layout_id
-      url += "/library/#{layout_id}/container-types"
+      url += "/library/layouts/#{layout_id}/container-types"
     else
       url += "/library/container-types"
     end

data/lib/morpheus/api/library_instance_types_interface.rb

@@ -10,21 +10,21 @@ class Morpheus::LibraryInstanceTypesInterface < Morpheus::APIClient
 
   def get(id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/library/#{id}"
+    url = "#{@base_url}/api/library/instance-types/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
   def list(params={})
-    url = "#{@base_url}/api/library"
+    url = "#{@base_url}/api/library/instance-types"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
   def create(options)
-    url = "#{@base_url}/api/library"
+    url = "#{@base_url}/api/library/instance-types"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = options
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
@@ -32,7 +32,7 @@ class Morpheus::LibraryInstanceTypesInterface < Morpheus::APIClient
   end
 
   def update(id, options)
-    url = "#{@base_url}/api/library/#{id}"
+    url = "#{@base_url}/api/library/instance-types/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = options
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
@@ -40,14 +40,14 @@ class Morpheus::LibraryInstanceTypesInterface < Morpheus::APIClient
   end
 
   def toggle_featured(id, params={}, payload={})
-    url = "#{@base_url}/api/library/#{id}/toggle-featured"
+    url = "#{@base_url}/api/library/instance-types/#{id}/toggle-featured"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
   def destroy(id, payload={})
-    url = "#{@base_url}/api/library/#{id}"
+    url = "#{@base_url}/api/library/instance-types/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
@@ -55,7 +55,7 @@ class Morpheus::LibraryInstanceTypesInterface < Morpheus::APIClient
 
   # NOT json, multipart file upload
   def update_logo(id, logo_file)
-    url = "#{@base_url}/api/library/#{id}/update-logo"
+    url = "#{@base_url}/api/library/instance-types/#{id}/update-logo"
     headers = { :params => {}, :authorization => "Bearer #{@access_token}"}
     payload = {}
     payload[:logo] = logo_file

data/lib/morpheus/api/library_layouts_interface.rb

@@ -51,7 +51,7 @@ class Morpheus::LibraryLayoutsInterface < Morpheus::APIClient
   def build_url(instance_type_id=nil, id=nil)
     url = "#{@base_url}/api"
     if instance_type_id
-      url += "/library/#{instance_type_id}/layouts"
+      url += "/library/instance-types/#{instance_type_id}/layouts"
     else
       url += "/library/layouts"
     end

data/lib/morpheus/api/network_routers_interface.rb

@@ -0,0 +1,101 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkRoutersInterface < Morpheus::APIClient
+  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil)
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  def list(params={})
+    url = "#{@base_url}/api/networks/routers"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def get(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/networks/routers/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create(payload)
+    url = "#{@base_url}/api/networks/routers"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update(id, payload)
+    url = "#{@base_url}/api/networks/routers/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def types(params={})
+    url = "#{@base_url}/api/network-router-types"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json', params: params }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def groups(params={})
+    url = "#{@base_url}/api/network-router-groups"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json', params: params }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def servers(type_id, params={})
+    url = "#{@base_url}/api/network-router-types/#{type_id}/servers"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json', params: params }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def destroy(id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def create_firewall_rule(router_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/firewall-rules"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy_firewall_rule(router_id, rule_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/firewall-rules/#{rule_id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def create_route(router_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/routes"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy_route(router_id, rule_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/routes/#{rule_id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update_permissions(router_id, payload)
+    url = "#{@base_url}/api/networks/routers/#{router_id}/permissions"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+end

data/lib/morpheus/api/tasks_interface.rb

@@ -8,20 +8,6 @@ class Morpheus::TasksInterface < Morpheus::APIClient
     @expires_at = expires_at
   end
 
-  def task_types(options={})
-    url = "#{@base_url}/api/task-types"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-
-    if options.is_a?(Hash)
-      headers[:params].merge!(options)
-    elsif options.is_a?(Numeric)
-      url = "#{@base_url}/api/task-types/#{options}"
-    elsif options.is_a?(String)
-      headers[:params]['name'] = options
-    end
-    execute(method: :get, url: url, headers: headers)
-  end
-
   def list(params={})
     url = "#{@base_url}/api/tasks"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
@@ -71,4 +57,16 @@ class Morpheus::TasksInterface < Morpheus::APIClient
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
+  def list_types(params={})
+    url = "#{@base_url}/api/task-types"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def get_type(id, params={})
+    url = "#{@base_url}/api/task-types/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
 end

data/lib/morpheus/cli.rb

@@ -139,6 +139,7 @@ module Morpheus
       load 'morpheus/cli/network_pool_servers_command.rb'
       load 'morpheus/cli/network_domains_command.rb'
       load 'morpheus/cli/network_proxies_command.rb'
+      load 'morpheus/cli/network_routers_command.rb'
       load 'morpheus/cli/cypher_command.rb'
       load 'morpheus/cli/image_builder_command.rb'
       load 'morpheus/cli/preseed_scripts_command.rb'

data/lib/morpheus/cli/apps.rb

@@ -284,6 +284,7 @@ class Morpheus::Cli::Apps
 
         # Default Cloud
         cloud_id = nil
+        cloud = nil
         scoped_available_clouds = get_available_clouds(group['id'])
         if options[:cloud]
           cloud_id = options[:cloud]
@@ -361,16 +362,16 @@ class Morpheus::Cli::Apps
                       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
+                      # 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
@@ -380,7 +381,7 @@ class Morpheus::Cli::Apps
                       # 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[:cloud] = cloud ? cloud['name'] : 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]
@@ -398,7 +399,9 @@ class Morpheus::Cli::Apps
                       #instance_prompt_options[:name_required] = true
                       instance_prompt_options[:instance_type_code] = instance_type_code
                       # todo: an effort to render more useful help eg.  -O Web.0.instance.name
-                      instance_prompt_options[:extra_field_context] = "#{tier_name}.#{instance_index}" 
+                      help_field_prefix = "#{tier_name}.#{instance_index}" 
+                      instance_prompt_options[:help_field_prefix] = help_field_prefix
+                      instance_prompt_options[:options][:help_field_prefix] = help_field_prefix
                       # this provisioning helper method handles all (most) of the parsing and prompting
                       instance_config_payload = prompt_new_instance(instance_prompt_options)
                       

data/lib/morpheus/cli/cli_command.rb

@@ -56,6 +56,11 @@ module Morpheus
         my_terminal.stdout.print(*msgs)
       end
 
+      def println(*msgs)
+        print(*msgs)
+        print "\n"
+      end
+
       def puts(*msgs)
         my_terminal.stdout.puts(*msgs)
       end
@@ -201,6 +206,26 @@ module Morpheus
         opts
       end
 
+      def build_standard_list_options(opts, options, includes=[], excludes=[])
+        build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote] + includes, excludes)
+      end
+
+      def build_standard_get_options(opts, options, includes=[], excludes=[])
+        build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote] + includes, excludes)
+      end
+
+      def build_standard_add_options(opts, options, includes=[], excludes=[])
+        build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote] + includes, excludes)
+      end
+
+      def build_standard_update_options(opts, options, includes=[], excludes=[])
+        build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote] + includes, excludes)
+      end
+
+      def build_standard_remove_options(opts, options, includes=[], excludes=[])
+        build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote] + includes, excludes)
+      end
+      
       # appends to the passed OptionParser all the generic options
       # @param opts [OptionParser] the option parser object being constructed
       # @param options [Hash] the output Hash that is to being modified
@@ -974,12 +999,25 @@ module Morpheus
         return subtitles
       end
 
-      def parse_payload(options={})
+      def parse_payload(options={}, object_key=nil)
         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]
+          apply_options(payload, options, object_key)
+        end
+        payload
+      end
+
+      # support -O OPTION switch
+      def apply_options(payload, options, object_key=nil)
+        payload ||= {}
+        if options[:options]
+          if object_key
+            payload.deep_merge!({object_key => options[:options].reject {|k,v| k.is_a?(Symbol)}})
+          else
+            payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol)})
+          end
         end
         payload
       end

data/lib/morpheus/cli/clusters.rb

@@ -632,6 +632,10 @@ class Morpheus::Cli::Clusters
 
         server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id']}))
 
+        # Worker count
+        default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 3})['nodeCount'] : 3
+        server_payload['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "nodeCount", 'type' => 'number', 'fieldLabel' => "#{cluster_type['code'].include?('docker') ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count}], options[:options], @api_client, {}, options[:no_prompt])["nodeCount"]
+
         # Create User
         if !options[:createUser].nil?
           server_payload['config']['createUser'] = options[:createUser]
@@ -1106,6 +1110,8 @@ class Morpheus::Cli::Clusters
       else
         server_payload = {'config' => {}}
 
+        cluster_type = find_cluster_type_by_id(cluster['type']['id'])
+
         # If not available add set type return
         layout = find_layout_by_id(cluster['layout']['id'])
 
@@ -1191,6 +1197,10 @@ class Morpheus::Cli::Clusters
         # Security Groups
         server_payload['securityGroups'] = prompt_security_groups_by_cloud(cloud, provision_type, resource_pool, options)
 
+        # Worker count
+        default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 3})['nodeCount'] : 3
+        server_payload['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "nodeCount", 'type' => 'number', 'fieldLabel' => "#{cluster_type['code'].include?('docker') ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count}], options[:options], @api_client, {}, options[:no_prompt])["nodeCount"]
+
         # Options / Custom Config
         option_type_list = (server_type['optionTypes'].reject { |type|
           !type['enabled'] || type['fieldComponent'] ||
@@ -3681,13 +3691,6 @@ class Morpheus::Cli::Clusters
     @clouds_interface.cloud_type(zone_type_id)['zoneType']['provisionTypes'].first rescue nil
   end
 
-  def current_user(refresh=false)
-    if !@current_user || refresh
-      load_whoami
-    end
-    @current_user
-  end
-
   def load_group(options)
     # Group / Site
     group_id = nil
@@ -3777,6 +3780,9 @@ class Morpheus::Cli::Clusters
     opts.on( '-p', '--plan PLAN', "Service Plan") do |val|
       options[:servicePlan] = val
     end
+    opts.on( '-n', '--worker-count VALUE', String, "Worker / host count") do |val|
+      options[:options]['nodeCount'] = val
+    end
     opts.on('--max-memory VALUE', String, "Maximum Memory (MB)") do |val|
       options[:maxMemory] = val
     end

data/lib/morpheus/cli/cypher_command.rb

@@ -294,13 +294,14 @@ EOT
     connect(options)
     
     # parse arguments like [value] or [k=v]
-    item_key = args[0]
-    item_value = args[1]
     if args.count == 0
       # prompt for key and value
     elsif args.count == 1
+      item_key = args[0]
       # prompt for value
     elsif args.count == 2
+      item_key = args[0]
+      item_value = args[1]
       # expecting [value] or [k=v]
       item_value_object = {}
       item_value_pair = item_value.split("=")
@@ -311,6 +312,8 @@ EOT
         # item_value = item_value
       end
     elsif args.count > 2
+      item_key = args[0]
+      item_value = args[1]
       # expecting [k=v] [k=v]
       item_value_object = {}
       args[1..(args.size-1)].each do |arg|