morpheus-cli 5.3.1 → 5.3.2.2

data/lib/morpheus/api/prices_interface.rb

@@ -1,16 +1,13 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::PricesInterface < 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/prices"
-    @expires_at = expires_at
+
+  def base_path
+    "/api/prices"
   end
 
   def list(params={})
-    url = @api_url
+    url = base_path
     if params['ids']
       url = "#{url}?#{params.delete('ids').collect {|id| "id=#{id}"}.join('&')}"
     end
@@ -19,49 +16,49 @@ class Morpheus::PricesInterface < Morpheus::APIClient
   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 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 list_datastores(params={})
-    url = "#{@api_url}/datastores"
+    url = "#{base_path}/datastores"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def get_datastore(id, params={})
-    url = "#{@api_url}/datastores/#{id}"
+    url = "#{base_path}/datastores/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def list_volume_types(params={})
-    url = "#{@api_url}/volume-types"
+    url = "#{base_path}/volume-types"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def get_volume_type(id, params={})
-    url = "#{@api_url}/volume-types/#{id}"
+    url = "#{base_path}/volume-types/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end

data/lib/morpheus/api/processes_interface.rb

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

data/lib/morpheus/api/provision_types_interface.rb

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

data/lib/morpheus/api/provisioning_license_types_interface.rb

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

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

@@ -1,28 +1,25 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ProvisioningSettingsInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil, api='provisioning-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/provisioning-settings"
   end
 
   def get()
-    url = @api_url
+    url = base_path
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def update(payload)
-    url = @api_url
+    url = base_path
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
   def template_types()
-    url = "#{@api_url}/template-types"
+    url = "#{base_path}/template-types"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end

data/lib/morpheus/api/reports_interface.rb

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