morpheus-cli 5.3.0.1 → 5.3.2

data/lib/morpheus/api/containers_interface.rb

@@ -3,12 +3,6 @@ require 'morpheus/api/api_client'
 # Containers API interface.
 # All of the PUT methods support passing an array of IDs.
 class Morpheus::ContainersInterface < 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
 
   # not used atm.. index api needs some work, we should implement it 
   # so it just paginates all containers. 

data/lib/morpheus/api/custom_instance_types_interface.rb

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

data/lib/morpheus/api/cypher_interface.rb

@@ -2,12 +2,6 @@ require 'morpheus/api/api_client'
 require 'uri'
 
 class Morpheus::CypherInterface < 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 base_path
     # can use just "/api/cypher" in 4.1.2

data/lib/morpheus/api/datastores_interface.rb

@@ -1,16 +1,13 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::DatastoresInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil, api='data-stores')
-    @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/data-stores"
   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

data/lib/morpheus/api/deploy_interface.rb

@@ -3,17 +3,12 @@ require 'net/http/post/multipart'
 require 'mime/types'
 
 class Morpheus::DeployInterface < 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 base_path
     # /api/deploys is now available in 5.0, switch to that eventually...
     "/api/deploy"
   end
+
   def list(params={})
     execute(method: :get, url: "#{base_path}", params: params)
   end

data/lib/morpheus/api/environments_interface.rb

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

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

data/lib/morpheus/api/execution_request_interface.rb

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

@@ -1,13 +1,6 @@
 require 'morpheus/api/api_client'
-require 'uri'
 
 class Morpheus::FileCopyRequestInterface < 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 == ''
@@ -35,7 +28,7 @@ class Morpheus::FileCopyRequestInterface < Morpheus::APIClient
     if !local_file.kind_of?(File)
       local_file = File.new(local_file, 'rb')
     end
-    url = "#{@base_url}/api/file-copy-request/lease/#{URI.escape(id)}"
+    url = "#{@base_url}/api/file-copy-request/lease/#{CGI::escape(id)}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/octet-stream'}
     headers[:params][:filename] = File.basename(local_file)
     payload = local_file
@@ -45,7 +38,7 @@ class Morpheus::FileCopyRequestInterface < Morpheus::APIClient
 
   def download_file_chunked(id, outfile, params={})
     raise "#{self.class}.download_file() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/file-copy-request/download/#{URI.escape(id)}"
+    url = "#{@base_url}/api/file-copy-request/download/#{CGI::escape(id)}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     # execute(opts, {parse_json: false})

data/lib/morpheus/api/group_policies_interface.rb

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

data/lib/morpheus/api/groups_interface.rb

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

data/lib/morpheus/api/guidance_interface.rb

@@ -1,46 +1,43 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::GuidanceInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil, api='guidance')
-    @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/guidance"
   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 stats()
-    url = "#{@api_url}/stats"
+    url = "#{base_path}/stats"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def types()
-    url = "#{@api_url}/types"
+    url = "#{base_path}/types"
     headers = { 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 exec(id, params={})
-    url = "#{@api_url}/#{id}/execute"
+    url = "#{base_path}/#{id}/execute"
     headers = { params: params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers)
   end
 
   def ignore(id, params={})
-    url = "#{@api_url}/#{id}/ignore"
+    url = "#{base_path}/#{id}/ignore"
     headers = { params: params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers)
   end

data/lib/morpheus/api/health_interface.rb

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

data/lib/morpheus/api/image_builder_boot_scripts_interface.rb

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

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 # this may change to just /api/image-builds
 class Morpheus::ImageBuilderImageBuildsInterface < 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/image_builder_interface.rb

@@ -4,23 +4,17 @@ require 'morpheus/api/image_builder_preseed_scripts_interface'
 require 'morpheus/api/image_builder_boot_scripts_interface'
 
 class Morpheus::ImageBuilderInterface < 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 image_builds
-    Morpheus::ImageBuilderImageBuildsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::ImageBuilderImageBuildsInterface.new(common_interface_options).setopts(@options)
   end
 
   def preseed_scripts
-    Morpheus::ImageBuilderPreseedScriptsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::ImageBuilderPreseedScriptsInterface.new(common_interface_options).setopts(@options)
   end
 
   def boot_scripts
-    Morpheus::ImageBuilderBootScriptsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::ImageBuilderBootScriptsInterface.new(common_interface_options).setopts(@options)
   end
   
 end

data/lib/morpheus/api/image_builder_preseed_scripts_interface.rb

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

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

@@ -1,29 +1,18 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::InstancesInterface < 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
+
+  def base_path
+    "/api/instances"
   end
 
-  def get(params={})
-    url = "#{@base_url}/api/instances"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    if params.is_a?(Hash)
-      headers[:params].merge!(params)
-    elsif params.is_a?(Numeric)
-      url = "#{@base_url}/api/instances/#{params}"
-    elsif params.is_a?(String)
-      headers[:params]['name'] = params
-    end
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
+  def list(params={}, headers={})
+    execute(method: :get, url: "#{base_path}", params: params, headers: headers)
   end
 
-  def list(params={})
-    get(params)
+  def get(id, params={}, headers={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{id}", params: params, headers: headers)
   end
 
   def get_envs(id, params={})

data/lib/morpheus/api/integration_types_interface.rb

@@ -0,0 +1,14 @@
+require 'morpheus/api/read_interface'
+
+class Morpheus::IntegrationTypesInterface < Morpheus::ReadInterface
+
+  def base_path
+    "/api/integration-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/integrations_interface.rb

@@ -1,29 +1,44 @@
-require 'morpheus/api/api_client'
-
-class Morpheus::IntegrationsInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil, api='integrations')
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @api_url = "#{base_url}/api/#{api}"
-    @expires_at = expires_at
+require 'morpheus/api/rest_interface'
+
+class Morpheus::IntegrationsInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/integrations"
+  end
+
+  def refresh(id, params={}, payload={}, headers={})
+    validate_id!(id)
+    execute(method: :post, url: "#{base_path}/#{id}/refresh", params: params, payload: payload, headers: headers)
+  end
+
+  ## Integration Objects CRUD
+
+  def list_objects(id, params={}, headers={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{id}/objects", params: params, headers: headers)
   end
 
-  def list(params={})
-    url = @api_url
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    execute(method: :get, url: url, headers: headers)
+  def get_object(id, obj_id, params={}, headers={})
+    validate_id!(id)
+    validate_id!(obj_id)
+    execute(method: :get, url: "#{base_path}/#{id}/objects/#{obj_id}", params: params, headers: headers)
   end
 
-  def get(id, params={})
-    url = "#{@api_url}/#{id}"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    execute(method: :get, url: url, headers: headers)
+  def create_object(id, payload, params={}, headers={})
+    validate_id!(id)
+    execute(method: :post, url: "#{base_path}/#{id}/objects", params: params, payload: payload, headers: headers)
   end
 
-  def update(payload, params={})
-    url = @api_url
-    headers = { params: params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  def update_object(id, obj_id, payload, params={}, headers={})
+    validate_id!(id)
+    validate_id!(obj_id)
+    execute(method: :put, url: "#{base_path}/#{id}/objects/#{obj_id}", params: params, payload: payload, headers: headers)
   end
+
+  def destroy_object(id, obj_id, params = {}, headers={})
+    validate_id!(id)
+    validate_id!(obj_id)
+    execute(method: :delete, url: "#{base_path}/#{id}/objects/#{obj_id}", params: params, headers: headers)
+  end
+
 end