morpheus-cli 5.3.0.1 → 5.3.2

data/lib/morpheus/api/appliance_settings_interface.rb

@@ -1,28 +1,25 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ApplianceSettingsInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil, api='appliance-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/appliance-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 cloud_types(params={})
-    url = "#{@api_url}/zone-types"
+    url = "#{base_path}/zone-types"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)

data/lib/morpheus/api/approvals_interface.rb

@@ -1,22 +1,19 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ApprovalsInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil, api='approvals')
-    @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/approvals"
   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: {}, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end

data/lib/morpheus/api/apps_interface.rb

@@ -1,13 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::AppsInterface < 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(params={})
     url = "#{@base_url}/api/apps"

data/lib/morpheus/api/archive_buckets_interface.rb

@@ -1,17 +1,10 @@
 require 'morpheus/api/api_client'
-require 'uri'
 
 class Morpheus::ArchiveBucketsInterface < 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 == ''
-    url = "#{@base_url}/api/archives/buckets/#{URI.escape(id)}"
+    url = "#{@base_url}/api/archives/buckets/#{CGI::escape(id)}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
@@ -32,14 +25,14 @@ class Morpheus::ArchiveBucketsInterface < Morpheus::APIClient
   end
 
   def update(id, payload)
-    url = "#{@base_url}/api/archives/buckets/#{URI.escape(id.to_s)}"
+    url = "#{@base_url}/api/archives/buckets/#{CGI::escape(id.to_s)}"
     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(id, params={})
-    url = "#{@base_url}/api/archives/buckets/#{URI.escape(id.to_s)}"
+    url = "#{@base_url}/api/archives/buckets/#{CGI::escape(id.to_s)}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :delete, url: url, headers: headers}
     execute(opts)
@@ -49,7 +42,7 @@ class Morpheus::ArchiveBucketsInterface < Morpheus::APIClient
     if file_path.to_s.strip == "/"
       file_path = ""
     end
-    url = "#{@base_url}/api/archives/buckets/#{URI.escape(id.to_s)}" + "/files/#{URI.escape(file_path)}".squeeze('/')
+    url = "#{@base_url}/api/archives/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::ArchiveBucketsInterface < 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/archives/buckets/#{URI.escape(bucket_id.to_s)}" + "/files/#{safe_dirname}".squeeze('/')
+    url = "#{@base_url}/api/archives/buckets/#{CGI::escape(bucket_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)
@@ -86,7 +79,7 @@ class Morpheus::ArchiveBucketsInterface < Morpheus::APIClient
   end
 
   def download_bucket_zip_chunked(bucket_id, outfile, params={})
-    url = "#{@base_url}/api/archives/buckets/#{URI.escape(bucket_id.to_s)}" + ".zip"
+    url = "#{@base_url}/api/archives/buckets/#{CGI::escape(bucket_id.to_s)}" + ".zip"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers, timeout: 172800}
     # execute(opts, {parse_json:false})
@@ -114,7 +107,7 @@ class Morpheus::ArchiveBucketsInterface < Morpheus::APIClient
   end
 
   def recalc(id, params={})
-    url = "#{@base_url}/api/archives/buckets/#{URI.escape(id.to_s)}/recalc"
+    url = "#{@base_url}/api/archives/buckets/#{CGI::escape(id.to_s)}/recalc"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :get, url: url, headers: headers, payload: payload.to_json}
     execute(opts)

data/lib/morpheus/api/archive_files_interface.rb

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

data/lib/morpheus/api/auth_interface.rb

@@ -2,10 +2,10 @@ require 'morpheus/api/api_client'
 
 class Morpheus::AuthInterface < Morpheus::APIClient
 
-  # def initialize(base_url, access_token=nil)
-  #   @base_url = base_url
-  #   @access_token = access_token
-  # end
+  # no Authorization header is required
+  def authorization_required?
+    false
+  end
 
   def login(username, password, use_client_id=nil)
     if use_client_id

data/lib/morpheus/api/backup_settings_interface.rb

@@ -1,22 +1,19 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::BackupSettingsInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil, api='backup-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/backup-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

data/lib/morpheus/api/blueprints_interface.rb

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

data/lib/morpheus/api/budgets_interface.rb

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

@@ -0,0 +1,14 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::CertificateTypesInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/certificate-types"
+  end
+
+  def option_types(id, params={}, headers={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{id}/option-types", params: params, headers: headers)
+  end
+
+end

data/lib/morpheus/api/certificates_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::CertificatesInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/certificates"
+  end
+
+end

data/lib/morpheus/api/cloud_datastores_interface.rb

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

data/lib/morpheus/api/cloud_folders_interface.rb

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

data/lib/morpheus/api/cloud_policies_interface.rb

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

data/lib/morpheus/api/cloud_resource_pools_interface.rb

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

data/lib/morpheus/api/clouds_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::CloudsInterface < 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 cloud_types(params={})
     url = "#{@base_url}/api/zone-types"

data/lib/morpheus/api/clusters_interface.rb

@@ -1,28 +1,25 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ClustersInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil, api='clusters')
-    @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/clusters"
   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(params={})
-    url = @api_url
+    url = base_path
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
 
     if params.is_a?(Hash)
       headers[:params].merge!(params)
     elsif params.is_a?(Numeric)
-      url = "#{@api_url}/#{params}"
+      url = "#{base_path}/#{params}"
     elsif params.is_a?(String)
       headers[:params]['name'] = params
     end
@@ -30,19 +27,19 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
   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 destroy(id, params={})
-    url = "#{@api_url}/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :delete, url: url, headers: headers)
   end
@@ -57,13 +54,13 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
   end
 
   def update_permissions(id, payload)
-    url = "#{@api_url}/#{id}/permissions"
+    url = "#{base_path}/#{id}/permissions"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
   def list_jobs(id, params={})
-    url = "#{@api_url}/#{id}/jobs"
+    url = "#{base_path}/#{id}/jobs"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
@@ -71,10 +68,10 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
   def destroy_job(id, job_id=nil, params={}, payload={})
     url = nil
     if job_id.is_a?(Array)
-      url = "#{@api_url}/#{id}/jobs"
+      url = "#{base_path}/#{id}/jobs"
       params['jobId'] = job_id
     elsif job_id.is_a?(Numeric) || job_id.is_a?(String)
-      url = "#{@api_url}/#{id}/jobs/#{job_id}"
+      url = "#{base_path}/#{id}/jobs/#{job_id}"
     else
       raise "passed a bad volume_id: #{job_id || '(none)'}" # lazy
     end
@@ -83,19 +80,19 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
   end
 
   def list_masters(id, params={})
-    url = "#{@api_url}/#{id}/masters"
+    url = "#{base_path}/#{id}/masters"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def list_workers(id, params={})
-    url = "#{@api_url}/#{id}/workers"
+    url = "#{base_path}/#{id}/workers"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def list_services(id, params={})
-    url = "#{@api_url}/#{id}/services"
+    url = "#{base_path}/#{id}/services"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
@@ -104,10 +101,10 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
   def destroy_service(id, service_id=nil, params={}, payload={})
     url = nil
     if service_id.is_a?(Array)
-      url = "#{@api_url}/#{id}/services"
+      url = "#{base_path}/#{id}/services"
       params['serviceId'] = service_id
     elsif service_id.is_a?(Numeric) || service_id.is_a?(String)
-      url = "#{@api_url}/#{id}/services/#{service_id}"
+      url = "#{base_path}/#{id}/services/#{service_id}"
     else
       raise "passed a bad volume_id: #{service_id || '(none)'}" # lazy
     end
@@ -116,13 +113,13 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
   end
 
   def add_server(id, payload)
-    url = "#{@api_url}/#{id}/servers"
+    url = "#{base_path}/#{id}/servers"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
   def list_volumes(id, params={})
-    url = "#{@api_url}/#{id}/volumes"
+    url = "#{base_path}/#{id}/volumes"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
@@ -131,10 +128,10 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
   def destroy_volume(id, volume_id=nil, params={}, payload={})
     url = nil
     if volume_id.is_a?(Array)
-      url = "#{@api_url}/#{id}/volumes"
+      url = "#{base_path}/#{id}/volumes"
       params['volumeId'] = volume_id
     elsif volume_id.is_a?(Numeric) || volume_id.is_a?(String)
-      url = "#{@api_url}/#{id}/volumes/#{volume_id}"
+      url = "#{base_path}/#{id}/volumes/#{volume_id}"
     else
       raise "passed a bad volume_id: #{volume_id || '(none)'}" # lazy
     end
@@ -145,31 +142,31 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
   alias :delete_volume :destroy_volume
 
   def list_namespaces(id, params={})
-    url = "#{@api_url}/#{id}/namespaces"
+    url = "#{base_path}/#{id}/namespaces"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def get_namespace(id, namespace_id, params={})
-    url = "#{@api_url}/#{id}/namespaces/#{namespace_id}"
+    url = "#{base_path}/#{id}/namespaces/#{namespace_id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def create_namespace(id, payload)
-    url = "#{@api_url}/#{id}/namespaces"
+    url = "#{base_path}/#{id}/namespaces"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
   def update_namespace(id, namespace_id, payload)
-    url = "#{@api_url}/#{id}/namespaces/#{namespace_id}"
+    url = "#{base_path}/#{id}/namespaces/#{namespace_id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
   def destroy_namespace(id, namespace_id, params={})
-    url = "#{@api_url}/#{id}/namespaces/#{namespace_id}"
+    url = "#{base_path}/#{id}/namespaces/#{namespace_id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :delete, url: url, headers: headers)
   end
@@ -177,23 +174,23 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
   alias :delete_namespace :destroy_namespace
 
   def list_containers(id, params={})
-    url = "#{@api_url}/#{id}/containers"
+    url = "#{base_path}/#{id}/containers"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def restart_container(id, container_id, params={})
-    url = "#{@api_url}/#{id}/containers/#{container_id}/restart"
+    url = "#{base_path}/#{id}/containers/#{container_id}/restart"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :put, url: url, headers: headers)
   end
 
   def destroy_container(id, container_id, params={})
     if container_id.is_a?(Array)
-      url = "#{@api_url}/#{id}/containers"
+      url = "#{base_path}/#{id}/containers"
       params['containerId'] = container_id
     elsif container_id.is_a?(Numeric) || container_id.is_a?(String)
-      url = "#{@api_url}/#{id}/containers/#{container_id}"
+      url = "#{base_path}/#{id}/containers/#{container_id}"
     else
       raise "passed a bad container_id: #{container_id || '(none)'}" # lazy
     end
@@ -202,23 +199,23 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
   end
 
   def list_container_groups(id, resource_type, params={})
-    url = "#{@api_url}/#{id}/#{resource_type}s"
+    url = "#{base_path}/#{id}/#{resource_type}s"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def restart_container_group(id, container_group_id, resource_type, params={})
-    url = "#{@api_url}/#{id}/#{resource_type}s/#{container_group_id}/restart"
+    url = "#{base_path}/#{id}/#{resource_type}s/#{container_group_id}/restart"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :put, url: url, headers: headers)
   end
 
   def destroy_container_group(id, container_group_id, resource_type, params={})
     if container_group_id.is_a?(Array)
-      url = "#{@api_url}/#{id}/#{resource_type}s"
+      url = "#{base_path}/#{id}/#{resource_type}s"
       params['containerGroupId'] = container_group_id
     elsif container_group_id.is_a?(Numeric) || container_group_id.is_a?(String)
-      url = "#{@api_url}/#{id}/#{resource_type}s/#{container_group_id}"
+      url = "#{base_path}/#{id}/#{resource_type}s/#{container_group_id}"
     else
       raise "passed a bad container_group_id: #{container_group_id || '(none)'}" # lazy
     end
@@ -227,19 +224,19 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
   end
 
   def list_datastores(id, params={})
-    url = "#{@api_url}/#{id}/datastores"
+    url = "#{base_path}/#{id}/datastores"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def get_datastore(id, datastore_id, params={})
-    url = "#{@api_url}/#{id}/datastores/#{datastore_id}"
+    url = "#{base_path}/#{id}/datastores/#{datastore_id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def update_datastore(id, datastore_id, payload)
-    url = "#{@api_url}/#{id}/datastores/#{datastore_id}"
+    url = "#{base_path}/#{id}/datastores/#{datastore_id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
@@ -259,7 +256,7 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
   end
 
   def api_config(id, params={})
-    url = "#{@api_url}/#{id}/api-config"
+    url = "#{base_path}/#{id}/api-config"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end