morpheus-cli 5.3.0.3 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 537ea8ecb044cb316ca3c7610ff9d48d2cfdea448c37c2ce171d797143b9d5bb
-  data.tar.gz: e80110f66f9a28496f507bebc117fb7aa74f770f33f8aadb9078bf331b4099f7
+  metadata.gz: 5ef633b92f3026067d66ea71995c2d7d2655579b07a200f083dccead54b371bb
+  data.tar.gz: 7fd5dedc5f5aa6a9c9a071f47639e9fa3f9a86a2a777e737d1a8581dfb195e86
 SHA512:
-  metadata.gz: 0fff28a9b02ccbff264efa449fd56455316af3263c990cc15f37eae658f45c44e47f5138c33428744d0b687850fa7a710f9fe7193ca753da82057c5570da1ab0
-  data.tar.gz: 7738424a32347e6e51970a7b4542accf527057f1634f4a798ec8e98cf0a908c92b5a14a0fda217dd2f94f2666c0d588f9935d5a0f2ab71b7dc78daa04b97563f
+  metadata.gz: 5e23c9f9a34bf2efa4f3d5c4299045fa800b04789abec9553daa134e4db271e274840b50627ac6131a1f4f38e14bda05e630dd4d47bb36dce0d001ef2bbed368
+  data.tar.gz: 3f55908e5d7f440a041de2ad74c8e0019123b04ed32fecaa6e3dfb14ae41e9b86c7b7a298e060d0c2ffb74db82349b80be08ac4e0a750453bed4ca66dbd640a9

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 5.3.0.3
+RUN gem install morpheus-cli -v 5.3.1
 
 ENTRYPOINT ["morpheus"]

data/README.md

@@ -23,8 +23,6 @@ And then execute:
 
     $ bundle install
 
-
-
 ## Usage
 
 ### morpheus command
@@ -32,7 +30,7 @@ And then execute:
 This gem installs the [morpheus](https://github.com/gomorpheus/morpheus-cli/wiki/CLI-Manual) binary for running commands in your terminal shell. 
 
 ```sh
-morpheus remote add demo https://demo.mymorpheus.com
+morpheus remote add
 morpheus instances list
 ```
 

data/lib/morpheus/api/api_client.rb

@@ -146,6 +146,7 @@ class Morpheus::APIClient
   #   :headers - Extra headers to add. This expects a Hash like {'Content-Type' => 'application/json'}.
   #   :timeout - A custom timeout in seconds for api requests. The default is 30. todo: separate timeout options
   def execute(opts, options={})
+    # Morpheus::Logging::DarkPrinter.puts "Morpheus::RestClient.execute(#{opts})" if Morpheus::Logging.debug?
     # ok, always prepend @base_url, let the caller specify it exactly or leave it off.
     # this allows the Interface definition be lazy and not specify the base_url in every call to execute()
       # it will be used though...
@@ -174,7 +175,7 @@ class Morpheus::APIClient
     # apply default headers
     opts[:headers] ||= {}
 
-    is_multipart = (opts[:payload].is_a?(Hash) && opts[:payload][:multipart])
+    is_multipart = (opts[:payload].is_a?(Hash) && opts[:payload][:multipart] == true)
 
     # Authorization: apply our access token
     if authorization_required?
@@ -187,15 +188,20 @@ class Morpheus::APIClient
       end
     end
 
-    # Content-Type default is application/json
-    if opts[:headers]['Content-Type'].nil? && opts[:payload] && is_multipart == false
-      opts[:headers]['Content-Type'] = (default_content_type || 'application/json')
-    end
+    # POST and PUT requests default Content-Type is application/json
+    # set Content-Type or pass :form_data => true if you want application/x-www-form-urlencoded
+    # or use opts[:payload][:multipart] = true if you need multipart/form-data
+    if opts[:method] == :post || opts[:method] == :put
+      if opts[:headers]['Content-Type'].nil? && opts[:payload] && is_multipart != true && opts[:form_data] != true
+        opts[:headers]['Content-Type'] = (default_content_type || 'application/json')
+      end
 
-    # this could be nice too..
-    # if opts[:headers]['Content-Type'] == 'application/json' && opts[:payload].is_a?(Hash)
-    #   opts[:payload] = opts[:payload].to_json
-    # end
+      # Auto encode payload as JSON, just to be nice
+      if opts[:headers]['Content-Type'] == 'application/json' && !opts[:payload].is_a?(String)
+        opts[:payload] = opts[:payload].to_json
+      end
+
+    end
 
     # always use custom timeout eg. from --timeout option
     # or use default_timeout for GET requests only.
@@ -431,7 +437,11 @@ class Morpheus::APIClient
   end
 
   def integrations
-    Morpheus::IntegrationsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::IntegrationsInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def integration_types
+    Morpheus::IntegrationTypesInterface.new(common_interface_options).setopts(@options)
   end
 
   def jobs
@@ -534,12 +544,16 @@ class Morpheus::APIClient
     Morpheus::KeyPairsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
-  def license
-    Morpheus::LicenseInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  def certificates
+    Morpheus::CertificatesInterface.new(common_interface_options).setopts(@options)
   end
 
-  def custom_instance_types
-    Morpheus::CustomInstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  def certificate_types
+    Morpheus::CertificateTypesInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def license
+    Morpheus::LicenseInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def option_types
@@ -787,6 +801,26 @@ class Morpheus::APIClient
   def billing
     Morpheus::BillingInterface.new(common_interface_options).setopts(@options)
   end
+
+  def vdi
+    Morpheus::VdiInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def vdi_pools
+    Morpheus::VdiPoolsInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def vdi_allocations
+    Morpheus::VdiAllocationsInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def vdi_apps
+    Morpheus::VdiAppsInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def vdi_gateways
+    Morpheus::VdiGatewaysInterface.new(common_interface_options).setopts(@options)
+  end
   
   # add new interfaces here
 

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/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,14 @@
-require 'morpheus/api/api_client'
+require 'morpheus/api/rest_interface'
 
-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
-  end
+class Morpheus::IntegrationsInterface < Morpheus::RestInterface
 
-  def list(params={})
-    url = @api_url
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    execute(method: :get, url: url, headers: headers)
+  def base_path
+    "/api/integrations"
   end
 
-  def get(id, params={})
-    url = "#{@api_url}/#{id}"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    execute(method: :get, url: url, headers: headers)
+  def refresh(id, params={}, payload={}, headers={})
+    validate_id!(id)
+    execute(method: :post, url: "#{base_path}/#{id}/refresh", 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)
-  end
 end

data/lib/morpheus/api/network_services_interface.rb

@@ -23,6 +23,20 @@ class Morpheus::NetworkServicesInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def get(params={})
+    url = "#{@base_url}/api/networks/services"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+
+    if params.is_a?(Hash)
+      headers[:params].merge!(params)
+    elsif params.is_a?(Numeric)
+      url = "#{url}/#{params}"
+    elsif params.is_a?(String)
+      headers[:params]['name'] = params
+    end
+    execute(method: :get, url: url, headers: headers)
+  end
+
   # def create(payload)
   #   url = "#{@base_url}/api/networks/services"
   #   headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/read_interface.rb

@@ -0,0 +1,23 @@
+require 'morpheus/api/api_client'
+
+# Interface class to be subclassed by interfaces that are read-only
+# and only provide list() and get() methods, not full CRUD
+# Subclasses must override the base_path method
+class Morpheus::ReadInterface < Morpheus::APIClient
+
+  # subclasses should override in your interface
+  # Example: "/api/thing-types"
+  def base_path
+    raise "#{self.class} has not defined base_path!"
+  end
+
+  def list(params={}, headers={})
+    execute(method: :get, url: "#{base_path}", params: params, headers: headers)
+  end
+
+  def get(id, params={}, headers={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{id}", params: params, headers: headers)
+  end
+
+end

data/lib/morpheus/api/rest_interface.rb

@@ -1,5 +1,7 @@
 require 'morpheus/api/api_client'
 
+# Interface class to be subclassed by interfaces that provide CRUD endpoints
+# Subclasses must override the base_path method
 class Morpheus::RestInterface < Morpheus::APIClient
 
   # subclasses should override in your interface
@@ -8,27 +10,27 @@ class Morpheus::RestInterface < Morpheus::APIClient
     raise "#{self.class} has not defined base_path!"
   end
 
-  def list(params={})
-    execute(method: :get, url: "#{base_path}", params: params)
+  def list(params={}, headers={})
+    execute(method: :get, url: "#{base_path}", params: params, headers: headers)
   end
 
-  def get(id, params={})
+  def get(id, params={}, headers={})
     validate_id!(id)
-    execute(method: :get, url: "#{base_path}/#{id}", params: params)
+    execute(method: :get, url: "#{base_path}/#{id}", params: params, headers: headers)
   end
 
-  def create(payload, params={})
-    execute(method: :post, url: "#{base_path}", params: params, payload: payload.to_json)
+  def create(payload, params={}, headers={})
+    execute(method: :post, url: "#{base_path}", params: params, payload: payload, headers: headers)
   end
 
-  def update(id, payload, params={})
+  def update(id, payload, params={}, headers={})
     validate_id!(id)
-    execute(method: :put, url: "#{base_path}/#{id}", params: params, payload: payload.to_json)
+    execute(method: :put, url: "#{base_path}/#{id}", params: params, payload: payload, headers: headers)
   end
 
-  def destroy(id, params = {})
+  def destroy(id, params = {}, headers={})
     validate_id!(id)
-    execute(method: :delete, url: "#{base_path}/#{id}", params: params)
+    execute(method: :delete, url: "#{base_path}/#{id}", params: params, headers: headers)
   end
 
 end

data/lib/morpheus/api/roles_interface.rb

@@ -91,6 +91,13 @@ class Morpheus::RolesInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
+  def update_vdi_pool(account_id, id, options)
+    url = build_url(account_id, id) + "/update-vdi-pool"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+
   private
 
   def build_url(account_id=nil, role_id=nil)

data/lib/morpheus/api/servers_interface.rb

@@ -183,4 +183,11 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def software_sync(id, payload={}, params={})
+    url = "#{@base_url}/api/servers/#{id}/software/sync"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :put, url: url, headers: headers}
+    execute(opts)
+  end
+
 end

data/lib/morpheus/api/user_settings_interface.rb

@@ -2,31 +2,29 @@ require 'morpheus/api/api_client'
 
 class Morpheus::UserSettingsInterface < Morpheus::APIClient
 
-  def get(params={})
-    url = "#{@base_url}/api/user-settings"
-    headers = { :params => params, authorization: "Bearer #{@access_token}"}
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
+  def base_path
+    "/api/user-settings"
   end
 
-  def update(params, payload)
-    url = "#{@base_url}/api/user-settings"
-    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
-    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
+  def get(params={}, headers={})
+    execute(method: :get, url: "#{base_path}", params: params, headers: headers)
   end
 
-  # NOT json, download file as attachment
+  def update(payload, params={}, headers={})
+    execute(method: :put, url: "#{base_path}", params: params, payload: payload, headers: headers)
+  end
+
+  # download file as attachment
   def download_avatar(params, outfile)
-    url = "#{@base_url}/api/user-settings/avatar"
+    url = "#{base_path}/avatar"
     headers = { :params => params, :authorization => "Bearer #{@access_token}"}
     opts = {method: :get, url: url, headers: headers, payload: payload}
     execute(opts)
   end
 
-  # NOT json, multipart file upload
+  # multipart file upload
   def update_avatar(avatar_file, params={})
-    url = "#{@base_url}/api/user-settings/avatar"
+    url = "#{base_path}/avatar"
     headers = { :params => params, :authorization => "Bearer #{@access_token}"}
     payload = {}
     #payload['user'] ||= {}
@@ -38,7 +36,29 @@ class Morpheus::UserSettingsInterface < Morpheus::APIClient
   end
 
   def remove_avatar(params={})
-    url = "#{@base_url}/api/user-settings/avatar"
+    url = "#{base_path}/avatar"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}"}
+    # POST empty payload will do
+    payload = {}
+    opts = {method: :delete, url: url, headers: headers, payload: payload}
+    execute(opts)
+  end
+
+  # multipart file upload
+  def update_desktop_background(desktop_background_file, params={})
+    url = "#{base_path}/desktop-background"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}"}
+    payload = {}
+    #payload['user'] ||= {}
+    #payload['user']['desktopBackground'] = desktop_background_file
+    payload['user.desktopBackground'] = desktop_background_file
+    payload[:multipart] = true
+    opts = {method: :post, url: url, headers: headers, payload: payload}
+    execute(opts)
+  end
+
+  def remove_desktop_background(params={})
+    url = "#{base_path}/desktop-background"
     headers = { :params => params, :authorization => "Bearer #{@access_token}"}
     # POST empty payload will do
     payload = {}
@@ -47,21 +67,21 @@ class Morpheus::UserSettingsInterface < Morpheus::APIClient
   end
 
   def regenerate_access_token(params, payload={})
-    url = "#{@base_url}/api/user-settings/regenerate-access-token"
+    url = "#{base_path}/regenerate-access-token"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
   def clear_access_token(params, payload={})
-    url = "#{@base_url}/api/user-settings/clear-access-token"
+    url = "#{base_path}/clear-access-token"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
   def available_clients(params={})
-    url = "#{@base_url}/api/user-settings/api-clients"
+    url = "#{base_path}/api-clients"
     headers = { :params => params, authorization: "Bearer #{@access_token}"}
     opts = {method: :get, url: url, headers: headers}
     execute(opts)

data/lib/morpheus/api/vdi_allocations_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/read_interface'
+
+class Morpheus::VdiAllocationsInterface < Morpheus::ReadInterface
+
+  def base_path
+    "/api/vdi-allocations"
+  end
+
+end