morpheus-cli 5.3.1 → 5.3.1.1

data/lib/morpheus/cli/power_schedules_command.rb

@@ -13,9 +13,9 @@ class Morpheus::Cli::PowerSchedulesCommand
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @power_schedules_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).power_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
+    @power_schedules_interface = @api_client.power_schedules
+    @instances_interface = @api_client.instances
+    @servers_interface = @api_client.servers
   end
 
   def handle(args)

data/lib/morpheus/cli/preseed_scripts_command.rb

@@ -23,7 +23,7 @@ class Morpheus::Cli::PreseedScriptsCommand
 
   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
     @preseed_scripts_interface = @image_builder_interface.preseed_scripts
   end
 

data/lib/morpheus/cli/remote.rb

@@ -1700,7 +1700,7 @@ EOT
         # wtf, no url...
         return appliance, json_response
       else
-        setup_interface = Morpheus::SetupInterface.new({url:appliance_url, verify_ssl: (appliance[:insecure] != true), timeout: timeout})
+        setup_interface = Morpheus::SetupInterface.new({url:appliance_url, verify_ssl: !appliance[:insecure], timeout: timeout})
         start_time = Time.now
         begin
           json_response = setup_interface.check(params)

data/lib/morpheus/cli/roles.rb

@@ -19,15 +19,15 @@ class Morpheus::Cli::Roles
 
   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
-    @groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).groups
-    @options_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).options
-    @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
-    @blueprints_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).blueprints
+    @whoami_interface = @api_client.whoami
+    @users_interface = @api_client.users
+    @accounts_interface = @api_client.accounts
+    @roles_interface = @api_client.roles
+    @groups_interface = @api_client.groups
+    @options_interface = @api_client.options
+    @instances_interface = @api_client.instances
+    @instance_types_interface = @api_client.instance_types
+    @blueprints_interface = @api_client.blueprints
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
   end
 

data/lib/morpheus/cli/security_group_rules.rb

@@ -16,7 +16,7 @@ class Morpheus::Cli::SecurityGroupRules
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @security_group_rules_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).security_group_rules
+    @security_group_rules_interface = @api_client.security_group_rules
     @active_security_group = ::Morpheus::Cli::SecurityGroups.load_security_group_file
   end
 

data/lib/morpheus/cli/setup.rb

@@ -61,7 +61,6 @@ EOT
       payload.deep_merge!(parse_passed_options(options))
 
       # JD: This should just do a Remote.check_appliance() first... needs to work with --remote-url though.
-      # @setup_interface = Morpheus::SetupInterface.new({url:@appliance_url,access_token:@access_token})
       appliance_status_json = nil
       begin
         appliance_status_json = @setup_interface.get()

data/lib/morpheus/cli/tenants_command.rb

@@ -25,9 +25,9 @@ class Morpheus::Cli::TenantsCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @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
+    @users_interface = @api_client.users
+    @accounts_interface = @api_client.accounts
+    @roles_interface = @api_client.roles
   end
 
   def handle(args)

data/lib/morpheus/cli/user_groups_command.rb

@@ -12,9 +12,9 @@ class Morpheus::Cli::UserGroupsCommand
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @user_groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).user_groups
-    @users_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).users
-    @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
+    @user_groups_interface = @api_client.user_groups
+    @users_interface = @api_client.users
+    @accounts_interface = @api_client.accounts
   end
 
   def handle(args)

data/lib/morpheus/cli/user_sources_command.rb

@@ -20,9 +20,9 @@ class Morpheus::Cli::UserSourcesCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @user_sources_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).user_sources
-    @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
-    @users_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).users
+    @user_sources_interface = @api_client.user_sources
+    @accounts_interface = @api_client.accounts
+    @users_interface = @api_client.users
   end
 
   def handle(args)

data/lib/morpheus/cli/users.rb

@@ -22,9 +22,9 @@ class Morpheus::Cli::Users
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @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
+    @users_interface = @api_client.users
+    @accounts_interface = @api_client.accounts
+    @roles_interface = @api_client.roles
   end
 
   def handle(args)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.3.1"
+    VERSION = "5.3.1.1"
   end
 end

data/lib/morpheus/cli/virtual_images.rb

@@ -20,7 +20,7 @@ class Morpheus::Cli::VirtualImages
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @virtual_images_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).virtual_images
+    @virtual_images_interface = @api_client.virtual_images
   end
 
   def handle(args)

data/lib/morpheus/cli/whoami.rb

@@ -319,21 +319,6 @@ EOT
           set_whoami_cache(appliance_name, user_id, result)
         end
       end
-      # if result.nil?
-      #   # appliance needs to be passed in here...heh
-      #   appliance = ::Morpheus::Cli::Remote.load_remote(appliance_name)
-      #   if appliance.nil?
-      #     raise "Remote not found for name '#{appliance_name}'"
-      #   end
-      #   wallet = ::Morpheus::Cli::Credentials.new(appliance[:name], appliance[:url]).load_saved_credentials()
-      #   if wallet.nil? || wallet['access_token'].nil?
-      #     raise "Access token not found for remote '#{appliance_name}'"
-      #   end
-      #   access_token = wallet['access_token']
-      #   whoami_interface = Morpheus::WhoamiInterface.new({url: appliance[:url], access_token: wallet['access_token']})
-      #   whoami_response = whoami_interface.get()
-      #   result = whoami_response
-      # end
       return result
     end
 

data/lib/morpheus/cli/wiki_command.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.3.1.1
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler