morpheus-cli 5.3.1.1 → 5.3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a64f6250b5cad8827e2d0e11349e21fbb6fedc974503a79fa9a2b1defb7d381a
-  data.tar.gz: 6ab1fb279210a5b7a5dce73e19061b82dec7872463e38b5848fb7fe49a6891d3
+  metadata.gz: fedf8a7443a29dd8ac5097e8f17bec94d481d3d1cadffd16dce033d9cb152f61
+  data.tar.gz: f1a306e2a42cebcb474371e589c07b2b31f6ed84faee0d47b640813e672d08ce
 SHA512:
-  metadata.gz: 98e1a3b24ad173eb9d8077ae0e0a9a7602beecf42e370e1bc6be5e82a9a52385f2e749c035273c3057f3b3377dbbf4cd9eee1086131fdda55fe46e296d7d7c86
-  data.tar.gz: 03c1b3f5059084a7c57e68ed6888174aaca554eea319f85d043ed79752470c1487d0ea946b0e9d10244e894e03061e2266036d40a0d3d86692d0ce0c607c6dfb
+  metadata.gz: fe7834f3099b3dd5666c9230c8b833ac05a613d58465850d0eaf5e88cdb973a8eec4ac020946d6ba902abb43cd71d705760040e69b243a2e670e2dd8b5295c9b
+  data.tar.gz: 3cc4909d59ae2fcf99f319e74a13eb4db2261fe475629723b6a091fbf3dd13aa5f92e939ae9262ec44b9817b97591c21d6ac69046c400c41523ed588c9602087

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 5.3.1.1
+RUN gem install morpheus-cli -v 5.3.2.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/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/option_type_lists_interface.rb

@@ -2,38 +2,50 @@ require 'morpheus/api/api_client'
 
 class Morpheus::OptionTypeListsInterface < Morpheus::APIClient
 
-  def get(id)
+  def base_path
+    "/api/library/option-type-lists"
+  end
+
+  def get(id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/library/option-type-lists/#{id}"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    url = "#{base_path}/#{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/option-type-lists"
+    url = "#{base_path}"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
     headers[:params].merge!(params)
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
+  def list_items(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{base_path}/#{id}/items"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
   def create(payload)
-    url = "#{@base_url}/api/library/option-type-lists"
+    url = "#{base_path}"
     headers = { :params => {}, :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/library/option-type-lists/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { :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)
-    url = "#{@base_url}/api/library/option-type-lists/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :delete, url: url, headers: headers}
     execute(opts)

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/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
@@ -1527,8 +1528,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

data/lib/morpheus/cli/instances.rb

@@ -2565,46 +2565,50 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance]")
-      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      build_standard_update_options(opts, options)
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
+    verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
-    begin
-      instance = find_instance_by_name_or_id(args[0])
-
-      group_id = instance['group']['id']
-      cloud_id = instance['cloud']['id']
-      layout_id = instance['layout']['id']
-
-      plan_id = instance['plan']['id']
+    instance = find_instance_by_name_or_id(args[0])
+    return 1, "instance not found" if instance.nil?
+    
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!(parse_passed_options(options))
+    else
       payload = {
-        :instance => {:id => instance["id"]}
+        "instance" => {:id => instance["id"]}
       }
+      payload.deep_merge!(parse_passed_options(options))
 
       # avoid 500 error
       # payload[:servicePlanOptions] = {}
 
       puts "\nDue to limitations by most Guest Operating Systems, Disk sizes can only be expanded and not reduced.\nIf a smaller plan is selected, memory and CPU (if relevant) will be reduced but storage will not.\n\n"
 
+      group_id = instance['group']['id']
+      cloud_id = instance['cloud']['id']
+      layout_id = instance['layout']['id']
+      plan_id = instance['plan']['id']
+      current_plan_name = instance['plan']['name']
       # prompt for service plan
       service_plans_json = @instances_interface.service_plans({zoneId: cloud_id, siteId: group_id, layoutId: layout_id})
       service_plans = service_plans_json["plans"]
       service_plans_dropdown = service_plans.collect {|sp| {'name' => sp["name"], 'value' => sp["id"]} } # already sorted
       service_plans_dropdown.each do |plan|
-        if plan['value'] && plan['value'].to_i == plan_id.to_i
-          plan['name'] = "#{plan['name']} (current)"
-        end
+        # if plan['value'] && plan['value'].to_i == plan_id.to_i
+        #   plan['name'] = "#{plan['name']} (current)"
+        #   current_plan_name = plan['name']
+        # end
       end
-      plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'description' => 'Choose the appropriately sized plan for this instance'}],options[:options])
+      plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'defaultValue' => current_plan_name, 'description' => 'Choose the appropriately sized plan for this instance'}],options[:options])
       service_plan = service_plans.find {|sp| sp["id"] == plan_prompt['servicePlan'].to_i }
       new_plan_id = service_plan["id"]
       #payload[:servicePlan] = new_plan_id # ew, this api uses servicePlanId instead
       #payload[:servicePlanId] = new_plan_id
-      payload[:instance][:plan] = {id: service_plan["id"]}
+      payload["instance"]["plan"] = {"id" => service_plan["id"]}
 
       volumes_response = @instances_interface.volumes(instance['id'])
       current_volumes = volumes_response['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
@@ -2612,29 +2616,27 @@ class Morpheus::Cli::Instances
       # prompt for volumes
       volumes = prompt_resize_volumes(current_volumes, service_plan, options)
       if !volumes.empty?
-        payload[:volumes] = volumes
+        payload["volumes"] = volumes
       end
 
       # only amazon supports this option
       # for now, always do this
-      payload[:deleteOriginalVolumes] = true
-      @instances_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @instances_interface.dry.resize(instance['id'], payload)
-        return
-      end
-      json_response = @instances_interface.resize(instance['id'], payload)
-      if options[:json]
-        puts as_json(json_response, options)
-        return 0
-      else
-        print_green_success "Resizing instance #{instance['name']}"
-        #list([])
-      end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+      payload["deleteOriginalVolumes"] = true
+    end
+    payload.delete("rootVolume")
+    (1..20).each {|i| payload.delete("dataVolume#{i}") }
+    @instances_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @instances_interface.dry.resize(instance['id'], payload)
+      return
+    end
+    json_response = @instances_interface.resize(instance['id'], payload)
+    render_response(json_response, options, 'snapshots') do
+      print_green_success "Resizing instance #{instance['name']}"
     end
+    return 0, nil
+    
+  
   end
 
   def backup(args)