morpheus-cli 5.3.1 → 5.3.1.1

data/lib/morpheus/api/roles_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::RolesInterface < 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/security_group_rules_interface.rb

@@ -1,13 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::SecurityGroupRulesInterface < 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(security_group_id, options=nil)
     url = "#{@base_url}/api/security-groups/#{security_group_id}/rules"

data/lib/morpheus/api/security_groups_interface.rb

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

data/lib/morpheus/api/server_types_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ServerTypesInterface < 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/servers_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ServersInterface < 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(options=nil)
     url = "#{@base_url}/api/servers"

data/lib/morpheus/api/service_plans_interface.rb

@@ -1,58 +1,55 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ServicePlansInterface < 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
-    @api_url = "#{@base_url}/api/service-plans"
-    @expires_at = expires_at
+
+  def base_path
+    "/api/service-plans"
   end
 
   def list(params={})
-    url = @api_url
+    url = base_path
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def get(id, params={})
-    url = "#{@api_url}/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def create(payload)
-    url = @api_url
+    url = base_path
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
   def update(id, payload)
-    url = "#{@api_url}/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
   def activate(id, params={})
-    url = "#{@api_url}/#{id}/activate"
+    url = "#{base_path}/#{id}/activate"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers)
   end
 
   def deactivate(id, params={})
-    url = "#{@api_url}/#{id}/deactivate"
+    url = "#{base_path}/#{id}/deactivate"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers)
   end
 
   def provision_types(params={})
-    url = "#{@api_url}/provision-types"
+    url = "#{base_path}/provision-types"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def price_sets(params={})
-    url = "#{@api_url}/price-sets"
+    url = "#{base_path}/price-sets"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end

data/lib/morpheus/api/storage_providers_interface.rb

@@ -1,13 +1,6 @@
 require 'morpheus/api/api_client'
-require 'uri'
 
 class Morpheus::StorageProvidersInterface < 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 == ''
@@ -49,7 +42,7 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
     if file_path.to_s.strip == "/"
       file_path = ""
     end
-    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + "/files/#{URI.escape(file_path)}".squeeze('/')
+    url = "#{@base_url}/api/storage/buckets/#{CGI::escape(id.to_s)}" + "/files/#{CGI::escape(file_path)}".squeeze('/')
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
@@ -68,13 +61,13 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
     end
     path_chunks = path.split("/")
     filename = path_chunks.pop
-    safe_dirname = path_chunks.collect {|it| URI.escape(it) }.join("/")
+    safe_dirname = path_chunks.collect {|it| CGI::escape(it) }.join("/")
     # filename = File.basename(destination)
     # dirname = File.dirname(destination)
     # if filename == "" || filename == "/"
     #   filename = File.basename(local_file)
     # end
-    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + "/files/#{safe_dirname}".squeeze('/')
+    url = "#{@base_url}/api/storage/buckets/#{CGI::escape(id.to_s)}" + "/files/#{safe_dirname}".squeeze('/')
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/octet-stream'}
     headers[:params][:filename] = filename # File.basename(destination)
     if !local_file.kind_of?(File)
@@ -88,8 +81,8 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
   def download_file(id, file_path, params={})
     raise "#{self.class}.download_file() passed a blank id!" if id.to_s == ''
     raise "#{self.class}.download_file() passed a blank file path!" if file_path.to_s == ''
-    escaped_file_path = file_path.split("/").collect {|it| URI.escape(it) }.join("/")
-    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + "/download-file/#{escaped_file_path}".squeeze('/')
+    escaped_file_path = file_path.split("/").collect {|it| CGI::escape(it) }.join("/")
+    url = "#{@base_url}/api/storage/buckets/#{CGI::escape(id.to_s)}" + "/download-file/#{escaped_file_path}".squeeze('/')
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts, false)
@@ -98,8 +91,8 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
   def download_file_chunked(id, file_path, outfile, params={})
     raise "#{self.class}.download_file() passed a blank id!" if id.to_s == ''
     raise "#{self.class}.download_file() passed a blank file path!" if file_path.to_s == ''
-    escaped_file_path = file_path.split("/").collect {|it| URI.escape(it) }.join("/")
-    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + "/download-file/#{escaped_file_path}".squeeze('/')
+    escaped_file_path = file_path.split("/").collect {|it| CGI::escape(it) }.join("/")
+    url = "#{@base_url}/api/storage/buckets/#{CGI::escape(id.to_s)}" + "/download-file/#{escaped_file_path}".squeeze('/')
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     # execute(opts, false)
@@ -127,8 +120,8 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
   end
 
   def download_zip_chunked(id, outfile, params={})
-    #url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + ".zip"
-    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}/download-zip"
+    #url = "#{@base_url}/api/storage/buckets/#{CGI::escape(id.to_s)}" + ".zip"
+    url = "#{@base_url}/api/storage/buckets/#{CGI::escape(id.to_s)}/download-zip"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     # execute(opts, false)

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