morpheus-cli 5.3.2 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e776b0e0602c4de27079e0796d270009b0d3a592d571a41721ac936c7537b94e
-  data.tar.gz: 10f231de3b75dc6a16d5433af35a1cbde2931d1871bf2106040ee49a0812091c
+  metadata.gz: ca7c939828b8f72ee86c663a19d01743a56d5c6c209cecc5e17b44046caeb484
+  data.tar.gz: e13fccbf1a45e8980e818e4cc1f0dba98d65e405c79f5d90e13c33341ad2e514
 SHA512:
-  metadata.gz: 893fd73648238a2a360273fef6a44654b0011075401743f6be61ba5f32c487f8bc5c5936f440cbcbb6be99ce05888ef99e453545e7f435e834a54ade3062851a
-  data.tar.gz: c558b3e31997546f382b44339183431e6d855be77b82e6c85be623c32dcf3333ae0a34c725b19fb317e308d8ec3ca2963de9f51ceba5b3bd658c7ad013ae9d67
+  metadata.gz: 5965b1af85499cadcae249f3109b6fd0ea4bee6af38192196fd6091bdcdb452f75c1f4025f372ec3d5f47ab1531e04acbf5fb2ed17848ba023087c309fdd06ee
+  data.tar.gz: 56bc2124de4e6b28c0c4484b5fa40beef19287708edd98ee1fdddbe334bc7854b853153209d1531793502aa8034d1c8ccf9fca643ec13aebf3eb8353cdd1f72e

data/Dockerfile

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

data/lib/morpheus/api/accounts_interface.rb

@@ -1,35 +1,9 @@
-require 'morpheus/api/api_client'
+require 'morpheus/api/rest_interface'
 
-class Morpheus::AccountsInterface < Morpheus::APIClient
-  
-  def get(id)
-    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/accounts/#{id}"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    execute(method: :get, url: url, headers: headers)
-  end
-
-  def list(params={})
-    url = "#{@base_url}/api/accounts"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    execute(method: :get, url: url, headers: headers)
-  end
+class Morpheus::AccountsInterface < Morpheus::RestInterface
 
-  def create(payload)
-    url = "#{@base_url}/api/accounts"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  def base_path
+    "/api/accounts"
   end
 
-  def update(id, payload)
-    url = "#{@base_url}/api/accounts/#{id}"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
-  end
-
-  def destroy(id)
-    url = "#{@base_url}/api/accounts/#{id}"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :delete, url: url, headers: headers)
-  end
 end

data/lib/morpheus/api/api_client.rb

@@ -474,6 +474,18 @@ class Morpheus::APIClient
     Morpheus::LoadBalancersInterface.new(common_interface_options).setopts(@options)
   end
 
+  def load_balancer_types
+    Morpheus::LoadBalancerTypesInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def load_balancer_virtual_servers
+    Morpheus::LoadBalancerVirtualServersInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def load_balancer_pools
+    Morpheus::LoadBalancerPoolsInterface.new(common_interface_options).setopts(@options)
+  end
+
   def tasks
     Morpheus::TasksInterface.new(common_interface_options).setopts(@options)
   end

data/lib/morpheus/api/instances_interface.rb

@@ -57,11 +57,24 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def cancel_removal(id, params = {})
-    url = "#{@base_url}/api/instances/#{id}/cancel-removal"
-    headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, headers: headers}
-    execute(opts)
+  def extend_shutdown(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/extend-shutdown", params: params, payload: payload, headers: headers)
+  end
+
+  def extend_expiration(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/extend-expiration", params: params, payload: payload, headers: headers)
+  end
+
+  def cancel_shutdown(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/cancel-shutdown", params: params, payload: payload, headers: headers)
+  end
+
+  def cancel_expiration(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/cancel-expiration", params: params, payload: payload, headers: headers)
+  end
+
+  def cancel_removal(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/cancel-removal", params: params, payload: payload, headers: headers)
   end
 
   def stop(id, params={})

data/lib/morpheus/api/load_balancer_pools_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/secondary_rest_interface'
+
+class Morpheus::LoadBalancerPoolsInterface < Morpheus::SecondaryRestInterface
+
+  def base_path(load_balancer_id)
+    "/api/load-balancers/#{load_balancer_id}/pools"
+  end
+
+end

data/lib/morpheus/api/load_balancer_types_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/read_interface'
+
+class Morpheus::LoadBalancerTypesInterface < Morpheus::ReadInterface
+
+  def base_path
+    "/api/load-balancer-types"
+  end
+
+end

data/lib/morpheus/api/load_balancer_virtual_servers_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/secondary_rest_interface'
+
+class Morpheus::LoadBalancerVirtualServersInterface < Morpheus::SecondaryRestInterface
+
+  def base_path(load_balancer_id)
+    "/api/load-balancers/#{load_balancer_id}/virtual-servers"
+  end
+
+end

data/lib/morpheus/api/load_balancers_interface.rb

@@ -1,58 +1,9 @@
-require 'morpheus/api/api_client'
+require 'morpheus/api/rest_interface'
 
-class Morpheus::LoadBalancersInterface < Morpheus::APIClient
+class Morpheus::LoadBalancersInterface < Morpheus::RestInterface
 
-  def load_balancer_types(options={})
-    url = "#{@base_url}/api/load-balancer-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/load-balancer-types/#{options}"
-    elsif options.is_a?(String)
-      headers[:params]['name'] = options
-    end
-    execute(method: :get, url: url, headers: headers)
+  def base_path
+    "/api/load-balancers"
   end
 
-  def list(params={})
-    url = "#{@base_url}/api/load-balancers"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
-  end
-  
-  def get(options=nil)
-    url = "#{@base_url}/api/load-balancers"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    if options.is_a?(Hash)
-      headers[:params].merge!(options)
-    elsif options.is_a?(Numeric)
-      url = "#{@base_url}/api/load-balancers/#{options}"
-    elsif options.is_a?(String)
-      headers[:params]['name'] = options
-    end
-    execute(method: :get, url: url, headers: headers)
-  end
-
-  def update(id, options)
-    url = "#{@base_url}/api/load-balancers/#{id}"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
-    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
-  end
-
-
-  def create(options)
-    url = "#{@base_url}/api/load-balancers"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
-    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
-  end
-
-  def destroy(id)
-    url = "#{@base_url}/api/load-balancers/#{id}"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :delete, url: url, headers: headers)
-  end
 end

data/lib/morpheus/api/network_routers_interface.rb

@@ -59,6 +59,34 @@ class Morpheus::NetworkRoutersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def list_firewall_rule_groups(router_id, params={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/firewall-rule-groups"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json', params: params }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create_firewall_rule_group(router_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/firewall-rule-groups"
+    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_firewall_rule_group(router_id, group_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/firewall-rule-groups/#{group_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 destroy_firewall_rule_group(router_id, group_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/firewall-rule-groups/#{group_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' }
@@ -66,6 +94,13 @@ class Morpheus::NetworkRoutersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def update_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: :put, 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' }
@@ -87,6 +122,27 @@ class Morpheus::NetworkRoutersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def create_nat(router_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/nats"
+    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_nat(router_id, nat_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/nats/#{nat_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 destroy_nat(router_id, nat_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/nats/#{nat_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' }

data/lib/morpheus/api/secondary_read_interface.rb

@@ -0,0 +1,25 @@
+require 'morpheus/api/api_client'
+
+# Interface class to be subclassed by interfaces that provide CRUD endpoints
+# for objects underneath another resource
+# Subclasses must override the base_path(resource_id) method
+class Morpheus::SecondaryReadInterface < Morpheus::APIClient
+
+  # subclasses should override in your interface
+  # Example: "/api/things/#{resource_id}/widgets"
+  def base_path(resource_id)
+    raise "#{self.class} has not defined base_path(resource_id)!"
+  end
+
+  def list(resource_id, params={}, headers={})
+    validate_id!(resource_id)
+    execute(method: :get, url: "#{base_path(resource_id)}", params: params, headers: headers)
+  end
+
+  def get(resource_id, id, params={}, headers={})
+    validate_id!(resource_id)
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path(resource_id)}/#{id}", params: params, headers: headers)
+  end
+
+end

data/lib/morpheus/api/secondary_rest_interface.rb

@@ -0,0 +1,42 @@
+require 'morpheus/api/api_client'
+
+# Interface class to be subclassed by interfaces that provide CRUD endpoints
+# for objects underneath another resource
+# Subclasses must override the base_path(resource_id) method
+class Morpheus::SecondaryRestInterface < Morpheus::APIClient
+
+  # subclasses should override in your interface
+  # Example: "/api/things/#{resource_id}/widgets"
+  def base_path(resource_id)
+    raise "#{self.class} has not defined base_path(resource_id)!"
+  end
+
+  def list(resource_id, params={}, headers={})
+    validate_id!(resource_id)
+    execute(method: :get, url: "#{base_path(resource_id)}", params: params, headers: headers)
+  end
+
+  def get(resource_id, id, params={}, headers={})
+    validate_id!(resource_id)
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path(resource_id)}/#{id}", params: params, headers: headers)
+  end
+
+  def create(resource_id, payload, params={}, headers={})
+    validate_id!(resource_id)
+    execute(method: :post, url: "#{base_path(resource_id)}", params: params, payload: payload, headers: headers)
+  end
+
+  def update(resource_id, id, payload, params={}, headers={})
+    validate_id!(resource_id)
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path(resource_id)}/#{id}", params: params, payload: payload, headers: headers)
+  end
+
+  def destroy(resource_id, id, params = {}, headers={})
+    validate_id!(resource_id)
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path(resource_id)}/#{id}", params: params, headers: headers)
+  end
+
+end

data/lib/morpheus/api/virtual_images_interface.rb

@@ -45,10 +45,10 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
-  def destroy(id)
+  def destroy(id, params={})
     url = "#{@base_url}/api/virtual-images/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :delete, url: url, headers: headers)
+    execute(method: :delete, url: url, params: params, headers: headers)
   end
 
   # multipart file upload
@@ -165,4 +165,25 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
     execute(method: :delete, url: url, headers: headers)
   end
 
+  def location_base_path(resource_id)
+    "/api/virtual-images/#{resource_id}/locations"
+  end
+
+  def list_locations(resource_id, params={}, headers={})
+    validate_id!(resource_id)
+    execute(method: :get, url: "#{location_base_path(resource_id)}", params: params, headers: headers)
+  end
+
+  def get_location(resource_id, id, params={}, headers={})
+    validate_id!(resource_id)
+    validate_id!(id)
+    execute(method: :get, url: "#{location_base_path(resource_id)}/#{id}", params: params, headers: headers)
+  end
+
+  def destroy_location(resource_id, id, params = {}, headers={})
+    validate_id!(resource_id)
+    validate_id!(id)
+    execute(method: :delete, url: "#{location_base_path(resource_id)}/#{id}", params: params, headers: headers)
+  end
+
 end

data/lib/morpheus/cli/apps.rb

@@ -438,7 +438,7 @@ class Morpheus::Cli::Apps
                       instance_prompt_options[:default_cloud] = cloud ? cloud['name'] : nil
                       instance_prompt_options[:environment] = selected_environment ? selected_environment['code'] : nil
                       instance_prompt_options[:default_security_groups] = scoped_instance_config['securityGroups'] ? scoped_instance_config['securityGroups'] : 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..
@@ -460,8 +460,9 @@ class Morpheus::Cli::Apps
                       instance_prompt_options[:locked_fields] = scoped_instance_config['lockedFields']
                       instance_prompt_options[:for_app] = true
                       # this provisioning helper method handles all (most) of the parsing and prompting
+                      scoped_instance_config = Marshal.load( Marshal.dump(scoped_instance_config) )
                       instance_config_payload = prompt_new_instance(instance_prompt_options)
-                      
+
                       # strip all empty string and nil
                       instance_config_payload.deep_compact!
                       # use the blueprint config as the base

data/lib/morpheus/cli/cli_command.rb

@@ -18,11 +18,11 @@ module Morpheus
     # todo: use delegate
     module CliCommand
 
-      def self.included(klass)
-        klass.send :include, Morpheus::Cli::PrintHelper
-        klass.send :include, Morpheus::Benchmarking::HasBenchmarking
-        klass.extend ClassMethods
-        Morpheus::Cli::CliRegistry.add(klass, klass.command_name)
+      def self.included(base)
+        base.send :include, Morpheus::Cli::PrintHelper
+        base.send :include, Morpheus::Benchmarking::HasBenchmarking
+        base.extend ClassMethods
+        Morpheus::Cli::CliRegistry.add(base, base.command_name)
       end
 
       # the beginning of instance variables from optparse !
@@ -983,10 +983,11 @@ module Morpheus
         out = ""
         out << usage.to_s.strip if usage
         out << "\n"
-        if !subcommands.empty?
+        my_subcommands = visible_subcommands
+        if !my_subcommands.empty?
           out << "Commands:"
           out << "\n"
-          subcommands.sort.each {|subcmd, method|
+          my_subcommands.sort.each {|subcmd, method|
             desc = get_subcommand_description(subcmd)
             out << "\t#{subcmd.to_s}"
             out << "\t#{desc}" if desc
@@ -1201,11 +1202,18 @@ module Morpheus
       # this could go be done in optparse.parse instead perhaps
       def verify_args!(opts={})
         args = opts[:args] || []
-        if opts[:count]
-          if args.count < opts[:count]
-            raise_args_error("not enough arguments, expected #{opts[:count]} and got #{args.count == 0 ? '0' : args.count.to_s + ': '}#{args.join(', ')}", args, opts[:optparse])
-          elsif args.count > opts[:count]
-            raise_args_error("too many arguments, expected #{opts[:count]} and got #{args.count == 0 ? '0' : args.count.to_s + ': '}#{args.join(', ')}", args, opts[:optparse])
+        count = opts[:count]
+        # simplify output for verify_args!(min:2, max:2) or verify_args!(max:0)
+        if opts[:min] && opts[:max] && opts[:min] == opts[:max]
+          count = opts[:min]
+        elsif opts[:max] == 0
+          count = 0
+        end
+        if count
+          if args.count < count
+            raise_args_error("not enough arguments, expected #{count} and got #{args.count == 0 ? '0' : args.count.to_s + ': '}#{args.join(', ')}", args, opts[:optparse])
+          elsif args.count > count
+            raise_args_error("too many arguments, expected #{count} and got #{args.count == 0 ? '0' : args.count.to_s + ': '}#{args.join(', ')}", args, opts[:optparse])
           end
         else
           if opts[:min]
@@ -1527,8 +1535,7 @@ module Morpheus
           cmds = subcommands.clone
           if @hidden_subcommands && !@hidden_subcommands.empty?
             @hidden_subcommands.each do |hidden_cmd|
-              cmds.delete(hidden_cmd.to_s)
-              cmds.delete(hidden_cmd.to_sym)
+              cmds.delete(hidden_cmd.to_s.gsub('_', '-'))
             end
           end
           cmds