morpheus-cli 5.3.1 → 5.3.2.2

data/lib/morpheus/api/subnet_types_interface.rb

@@ -1,14 +1,8 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::SubnetTypesInterface < 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 get(id, params={})
+  def get(id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
     url = "#{@base_url}/api/subnet-types/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/subnets_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::SubnetsInterface < 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 get(id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''

data/lib/morpheus/api/task_sets_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::TaskSetsInterface < 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/task-sets"

data/lib/morpheus/api/tasks_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::TasksInterface < 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/tasks"

data/lib/morpheus/api/user_groups_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::UserGroupsInterface < 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 get(account_id, id)
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''

data/lib/morpheus/api/user_sources_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::UserSourcesInterface < 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 get(account_id, id)
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''

data/lib/morpheus/api/users_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::UsersInterface < 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 get(account_id, id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''

data/lib/morpheus/api/virtual_images_interface.rb

@@ -4,12 +4,6 @@ require 'zlib'
 require 'forwardable'
 
 class Morpheus::VirtualImagesInterface < 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 virtual_image_types(options={})
     url = "#{@base_url}/api/virtual-image-types"

data/lib/morpheus/api/whitelabel_settings_interface.rb

@@ -1,41 +1,38 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::WhitelabelSettingsInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil, api='whitelabel-settings')
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @api_url = "#{base_url}/api/#{api}"
-    @expires_at = expires_at
+
+  def base_path
+    "/api/whitelabel-settings"
   end
 
   def get(params={})
-    url = @api_url
+    url = base_path
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def update(payload, params={})
-    url = @api_url
+    url = base_path
     headers = { params: params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
   def update_images(payload, params={})
-    url = "#{@api_url}/images"
+    url = "#{base_path}/images"
     headers = { params: params, :authorization => "Bearer #{@access_token}" }
     payload[:multipart] = true
     execute(method: :post, url: url, headers: headers, payload: payload)
   end
 
   def reset_image(image_type, params={})
-    url = "#{@api_url}/images/#{image_type}"
+    url = "#{base_path}/images/#{image_type}"
     headers = { params: params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :delete, url: url, headers: headers)
   end
 
   def download_image(image_type, outfile, params={})
-    url = "#{@api_url}/images/#{image_type}"
+    url = "#{base_path}/images/#{image_type}"
     headers = { params: params, :authorization => "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers, timeout: 172800}
 

data/lib/morpheus/api/wiki_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::WikiInterface < 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 get(id, params={})
     raise "#{self.class}.get() passed a blank name!" if id.to_s == ''

data/lib/morpheus/cli/access_token_command.rb

@@ -156,7 +156,7 @@ class Morpheus::Cli::AccessTokenCommand
       end
     end
     if options[:dry_run]
-      print_dry_run Morpheus::AuthInterface.new({url:@appliance_url}).setopts(options).use_refresh_token(refresh_token_value)
+      print_dry_run @api_client.auth.dry.use_refresh_token(refresh_token_value)
       return 0
     end
     unless options[:quiet]

data/lib/morpheus/cli/account_groups_command.rb

@@ -28,11 +28,11 @@ class Morpheus::Cli::AccountGroupsCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @account_groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).account_groups
-    @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
+    @account_groups_interface = @api_client.account_groups
+    @accounts_interface = @api_client.accounts
 
-    @groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).groups
-    @clouds_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).clouds
+    @groups_interface = @api_client.groups
+    @clouds_interface = @api_client.clouds
   end
 
   def handle(args)

data/lib/morpheus/cli/apps.rb

@@ -37,15 +37,15 @@ class Morpheus::Cli::Apps
     @api_client = establish_remote_appliance_connection(opts)
     @accounts_interface = @api_client.accounts
     @users_interface = @api_client.users
-    @apps_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).apps
-    @blueprints_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).blueprints
-    @instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instance_types
-    @library_layouts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_layouts
-    @instances_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instances
-    @options_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).options
-    @groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).groups
-    @clouds_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).clouds
-    @logs_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).logs
+    @apps_interface = @api_client.apps
+    @blueprints_interface = @api_client.blueprints
+    @instance_types_interface = @api_client.instance_types
+    @library_layouts_interface = @api_client.library_layouts
+    @instances_interface = @api_client.instances
+    @options_interface = @api_client.options
+    @groups_interface = @api_client.groups
+    @clouds_interface = @api_client.clouds
+    @logs_interface = @api_client.logs
     @processes_interface = @api_client.processes
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
   end

data/lib/morpheus/cli/archives_command.rb

@@ -48,9 +48,9 @@ class Morpheus::Cli::ArchivesCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @archive_buckets_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).archive_buckets
-    @archive_files_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).archive_files
-    @options_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).options
+    @archive_buckets_interface = @api_client.archive_buckets
+    @archive_files_interface = @api_client.archive_files
+    @options_interface = @api_client.options
     # @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
   end
 
@@ -979,10 +979,10 @@ class Morpheus::Cli::ArchivesCommand
       
       
       print_h2 "Download URLs"
-      private_download_url = "#{@appliance_url}/api/archives/download/#{URI.escape(bucket_id)}" + "/#{URI.escape(archive_file['filePath'])}".squeeze('/')
+      private_download_url = "#{@appliance_url}/api/archives/download/#{CGI::escape(bucket_id)}" + "/#{CGI::escape(archive_file['filePath'])}".squeeze('/')
       public_download_url = nil
       if archive_file['archiveBucket'] && archive_file['archiveBucket']['isPublic']
-        public_download_url = "#{@appliance_url}/public-archives/download/#{URI.escape(bucket_id)}" + "/#{URI.escape(archive_file['filePath'])}".squeeze('/')
+        public_download_url = "#{@appliance_url}/public-archives/download/#{CGI::escape(bucket_id)}" + "/#{CGI::escape(archive_file['filePath'])}".squeeze('/')
       end
       print cyan
       puts "Private URL: #{private_download_url}"

data/lib/morpheus/cli/blueprints_command.rb

@@ -29,11 +29,11 @@ class Morpheus::Cli::BlueprintsCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @blueprints_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).blueprints
-    @groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).groups
-    @instances_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instances
-    @instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instance_types
-    @options_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).options
+    @blueprints_interface = @api_client.blueprints
+    @groups_interface = @api_client.groups
+    @instances_interface = @api_client.instances
+    @instance_types_interface = @api_client.instance_types
+    @options_interface = @api_client.options
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
     @clouds_interface = @api_client.clouds
     @users_interface = @api_client.users

data/lib/morpheus/cli/boot_scripts_command.rb

@@ -24,7 +24,7 @@ class Morpheus::Cli::BootScriptsCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @image_builder_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).image_builder
+    @image_builder_interface = @api_client.image_builder
     @boot_scripts_interface = @image_builder_interface.boot_scripts
   end
 

data/lib/morpheus/cli/change_password_command.rb

@@ -19,10 +19,10 @@ class Morpheus::Cli::ChangePasswordCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @whoami_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).whoami
-    @users_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).users
-    @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
-    @roles_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).roles
+    @whoami_interface = @api_client.whoami
+    @users_interface = @api_client.users
+    @accounts_interface = @api_client.accounts
+    @roles_interface = @api_client.roles
   end
 
   def handle(args)

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
@@ -1124,6 +1125,7 @@ module Morpheus
         if options[:insecure] || appliance[:insecure] || Morpheus::Cli::Shell.insecure
           allow_insecure = true
         end
+        @verify_ssl = !allow_insecure
         # Morpheus::RestClient.enable_ssl_verification = allow_insecure != true
         if allow_insecure && Morpheus::RestClient.ssl_verification_enabled?
           Morpheus::RestClient.enable_ssl_verification = false
@@ -1189,7 +1191,7 @@ module Morpheus
         end
 
         # ok, connect to the appliance.. actually this just instantiates an ApiClient
-        api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)
+        api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url, @verify_ssl)
         @api_client = api_client # meh, just return w/o setting instance attrs
         return api_client
       end
@@ -1526,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/clouds.rb

@@ -24,8 +24,8 @@ class Morpheus::Cli::Clouds
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @clouds_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).clouds
-    @groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).groups
+    @clouds_interface = @api_client.clouds
+    @groups_interface = @api_client.groups
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
     # preload stuff
     get_available_cloud_types()

data/lib/morpheus/cli/clusters.rb

@@ -45,8 +45,8 @@ class Morpheus::Cli::Clusters
     @provision_types_interface = @api_client.provision_types
     @service_plans_interface = @api_client.service_plans
     @user_groups_interface = @api_client.user_groups
-    @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
-    @logs_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).logs
+    @accounts_interface = @api_client.accounts
+    @logs_interface = @api_client.logs
     #@active_security_group = ::Morpheus::Cli::SecurityGroups.load_security_group_file
   end
 

data/lib/morpheus/cli/credentials.rb

@@ -56,8 +56,7 @@ module Morpheus
           # OR whoami should return other wallet info like access token or maybe just the expiration date
           # for now, it just stores the access token without other wallet info
           begin
-            # @setup_interface = Morpheus::SetupInterface.new({url:@appliance_url,access_token:@access_token})
-            whoami_interface = Morpheus::WhoamiInterface.new({url: @appliance_url, access_token: options[:remote_token]})
+            whoami_interface = Morpheus::WhoamiInterface.new({url: @appliance_url, access_token: options[:remote_token], verify_ssl: !options[:insecure]})
             whoami_interface.setopts(options)
             if options[:dry_run]
               print_dry_run whoami_interface.dry.get()
@@ -104,13 +103,7 @@ module Morpheus
           end
           if wallet.nil?
             unless options[:quiet] || options[:no_prompt]
-              # if username.empty? || password.empty?
-                if options[:test_only]
-                  print "Test Morpheus Credentials for #{display_appliance(@appliance_name, @appliance_url)}", "\n", reset
-                else
-                  print "Enter Morpheus Credentials for #{display_appliance(@appliance_name, @appliance_url)}", "\n", reset
-                end
-              # end
+              print "Enter Morpheus Credentials for #{display_appliance(@appliance_name, @appliance_url)}", "\n", reset
               if options[:client_id].empty?
                 # print "Client ID: #{required_blue_prompt} #{options[:client_id]}", "\n", reset
               else
@@ -138,7 +131,7 @@ module Morpheus
               return nil
             end
             begin
-              auth_interface = Morpheus::AuthInterface.new({url:@appliance_url, client_id: options[:client_id]})
+              auth_interface = Morpheus::AuthInterface.new({url:@appliance_url, client_id: options[:client_id], verify_ssl: !options[:insecure]})
               auth_interface.setopts(options)
               if options[:dry_run]
                 print_dry_run auth_interface.dry.login(username, password)
@@ -276,7 +269,7 @@ module Morpheus
         username = wallet['username']
 
         begin
-          auth_interface = Morpheus::AuthInterface.new({url:@appliance_url})
+          auth_interface = Morpheus::AuthInterface.new({url:@appliance_url, client_id: options[:client_id], verify_ssl: !options[:insecure]})
           auth_interface.setopts(options)
           if options[:dry_run]
             print_dry_run auth_interface.dry.use_refresh_token(refresh_token_value)

data/lib/morpheus/cli/environments_command.rb

@@ -16,7 +16,7 @@ class Morpheus::Cli::EnvironmentsCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @environments_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).environments
+    @environments_interface = @api_client.environments
   end
 
   def handle(args)

data/lib/morpheus/cli/execute_schedules_command.rb

@@ -13,9 +13,9 @@ class Morpheus::Cli::ExecuteSchedulesCommand
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @execute_schedules_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).execute_schedules
-    @instances_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instances
-    @servers_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).servers
+    @execute_schedules_interface = @api_client.execute_schedules
+    @instances_interface = @api_client.instances
+    @servers_interface = @api_client.servers
   end
 
   def handle(args)