morpheus-cli 4.1.4 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4dacc032b0f2cb81ba8c3941c374298747f2c8d75ab3307382b9f95e7247df6
-  data.tar.gz: 9aa05d08d822f72fb7c3c93c6fc34154390f4073f32b4157e7503329a4a4b868
+  metadata.gz: 8cf9fe88c6a717fcd35c655ca1bf208842bd6669c793a698cbee17d6a1c6263a
+  data.tar.gz: fc1ecf887d8b6bd1ef7b3de650d1a2a9d88bd13a7fc4b6a781858623da57dcd3
 SHA512:
-  metadata.gz: 5e63a7b794f281f737b86fea28c5d220875b8e2d30c802fb099fb7e2be0516e6c8afbb4a6ab6cc209421adf3adbba2d64c3f5cc28d525cd35174569837c9c360
-  data.tar.gz: 0eac4da8d373956f7468923d25efb8e5010ce107beeafc6cf9355f8efd9648cb4efedf43be0feeae80b3123dd20f0bad561343ec59f6d6896ea6214423960e3b
+  metadata.gz: 2af125ef03ebc7cfcdd528f069c33a4af72e037039b3256c954bb2e8f75511989b25be9b06a5508a49d28ebfe2686ecec6057ba19066c4daf466135570d3a9bd
+  data.tar.gz: ccf40b9d7d5e1a0bc7f12d5cb9249da035c5d043028fbf5ceb58dfdf95f2fad5b53eda43a0e9521060f92d77fd2e6369cbbe53616b92bf78ad762c241014aac8

data/lib/morpheus.rb

@@ -0,0 +1,5 @@
+# This provides the command: require 'morpheus'
+# This is really the same as just morpheus/api right now.
+# require 'morpheus/api'
+
+require 'morpheus/cli'

data/lib/morpheus/api.rb

@@ -1,6 +1,6 @@
-require "morpheus/cli/version"
+require 'morpheus/cli/version'
 require 'morpheus/cli/command_error'
-require "morpheus/rest_client"
+require 'morpheus/rest_client'
 require 'morpheus/formatters'
 #require 'morpheus/logging'
 #require 'term/ansicolor'

data/lib/morpheus/api/api_client.rb

@@ -3,19 +3,30 @@ require 'uri'
 require 'rest-client'
 
 class Morpheus::APIClient
+
+  CLIENT_ID = 'morph-cli' unless defined?(CLIENT_ID)
+
+  attr_accessor :client_id
   # Initialize a new APIClient
   #   client = APIClient.new(url:"https://morpheus.yourcompany.com", verify_ssl:false)
   # This old method signature is being deprecated:
   #   client = APIClient.new(access_token, refresh_token, expires_in, base_url, verify_ssl, options={})
   #
+  # def initialize(attrs={}, options={})
   def initialize(access_token, refresh_token=nil,expires_in = nil, base_url=nil, verify_ssl=true, options={})
+    self.client_id = CLIENT_ID
+    attrs = {}
     if access_token.is_a?(Hash)
-      client_opts = access_token.clone()
-      access_token = client_opts[:access_token]
-      refresh_token = client_opts[:refresh_token]
-      base_url = client_opts[:url] || client_opts[:base_url]
-      expires_in = client_opts[:expires_in]
-      verify_ssl = client_opts.key?(:verify_ssl) ? client_opts[:verify_ssl] : true
+      attrs = access_token.clone()
+      access_token = attrs[:access_token]
+      refresh_token = attrs[:refresh_token]
+      base_url = attrs[:url] || attrs[:base_url]
+      expires_in = attrs[:expires_in]
+      verify_ssl = attrs.key?(:verify_ssl) ? attrs[:verify_ssl] : true
+      self.client_id = attrs[:client_id] ? attrs[:client_id] : CLIENT_ID
+      if attrs[:client_id]
+        self.client_id = attrs[:client_id]
+      end
       options = refresh_token.is_a?(Hash) ? refresh_token.clone() : {}
     end
     @access_token = access_token
@@ -38,7 +49,7 @@ class Morpheus::APIClient
   end
 
   def to_s
-    "<##{self.class}:#{self.object_id.to_s(8)} @url=#{@base_url} @verify_ssl=#{@verify_ssl} @access_token=#{@access_token ? '************' : nil} @refresh_token=#{@access_token ? '************' : nil} @expires_at=#{@expires_at} @options=#{@options}>"
+    "<##{self.class}:#{self.object_id.to_s(8)} @url=#{@base_url} @verify_ssl=#{@verify_ssl} @access_token=#{@access_token ? '************' : nil} @refresh_token=#{@access_token ? '************' : nil} @expires_at=#{@expires_at} @client_id=#{@client_id} @options=#{@options}>"
   end
 
   def inspect
@@ -219,9 +230,20 @@ class Morpheus::APIClient
     !!@access_token
   end
 
-  def login(username, password)
+  def client_id
+    @client_id
+  end
+
+  def client_id=(val)
+    @client_id = val
+  end
+
+  def login(username, password, use_client_id=nil)
+    if use_client_id
+      self.client_id = use_client_id
+    end
     @access_token, @refresh_token, @expires_at = nil, nil, nil
-    response = auth.login(username, password)
+    response = auth.login(username, password, self.client_id)
     @access_token = response['access_token']
     @refresh_token = response['refresh_token']
     if response['expires_in'] != nil
@@ -235,7 +257,7 @@ class Morpheus::APIClient
     if @refresh_token.nil?
       raise "#{self.class} does not currently have a refresh_token"
     end
-    response = auth.use_refresh_token(@refresh_token)
+    response = auth.use_refresh_token(@refresh_token, self.client_id)
     @access_token = response['access_token']
     @refresh_token = response['refresh_token']
     if response['expires_in'] != nil
@@ -253,8 +275,12 @@ class Morpheus::APIClient
     return self
   end
 
+  def common_iface_opts
+    {url: @base_url, access_token: @access_token, refresh_token: @refresh_token, expires_at: @expires_at}
+  end
+
   def auth
-    Morpheus::AuthInterface.new(@base_url, @access_token).setopts(@options)
+    Morpheus::AuthInterface.new({url: @base_url, client_id: @client_id}).setopts(@options)
   end
 
   def whoami
@@ -301,6 +327,10 @@ class Morpheus::APIClient
     Morpheus::InstancesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
+  def appliance_settings
+    Morpheus::ApplianceSettingsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  end
+
   def containers
     Morpheus::ContainersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
@@ -421,8 +451,9 @@ class Morpheus::APIClient
     Morpheus::ExecuteSchedulesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
+  
   def setup
-    Morpheus::SetupInterface.new(@base_url).setopts(@options).setopts(@options)
+    Morpheus::SetupInterface.new(common_iface_opts).setopts(@options).setopts(@options)
   end
 
   def monitoring
@@ -576,6 +607,10 @@ class Morpheus::APIClient
     Morpheus::EnvironmentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
+  def whitelabel_settings
+    Morpheus::WhitelabelSettingsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  end
+
   def wiki
     Morpheus::WikiInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end

data/lib/morpheus/api/appliance_settings_interface.rb

@@ -0,0 +1,30 @@
+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
+  end
+
+  def get()
+    url = @api_url
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def update(payload)
+    url = @api_url
+    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"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+end

data/lib/morpheus/api/auth_interface.rb

@@ -2,17 +2,18 @@ require 'morpheus/api/api_client'
 
 class Morpheus::AuthInterface < Morpheus::APIClient
 
-  #attr_reader :access_token, :refresh_token, :expires_at
+  # def initialize(base_url, access_token=nil)
+  #   @base_url = base_url
+  #   @access_token = access_token
+  # end
 
-  def initialize(base_url, access_token=nil)
-    @base_url = base_url
-    @access_token = access_token
-  end
-
-  def login(username, password)
+  def login(username, password, use_client_id=nil)
+    if use_client_id
+      self.client_id = use_client_id
+    end
     @access_token, @refresh_token, @expires_at = nil, nil, nil
     url = "#{@base_url}/oauth/token"
-    params = {grant_type: 'password', scope:'write', client_id: 'morph-cli', username: username}
+    params = {grant_type: 'password', scope:'write', client_id: self.client_id, username: username}
     payload = {password: password}
     opts = {method: :post, url: url, headers:{ params: params}, payload: payload, timeout: 5}
     response = execute(opts)
@@ -26,10 +27,13 @@ class Morpheus::AuthInterface < Morpheus::APIClient
   end
 
   # this regenerates the access_token and refresh_token
-  def use_refresh_token(refresh_token)
+  def use_refresh_token(refresh_token, use_client_id=nil)
+    if use_client_id
+      self.client_id = use_client_id
+    end
     @access_token = nil
     url = "#{@base_url}/oauth/token"
-    params = {grant_type: 'refresh_token', scope:'write', client_id: 'morph-cli'}
+    params = {grant_type: 'refresh_token', scope:'write', client_id: self.client_id}
     payload = {refresh_token: refresh_token}
     opts = {method: :post, url: url, headers:{ params: params}, payload: payload}
     response = execute(opts)

data/lib/morpheus/api/clouds_interface.rb

@@ -45,6 +45,13 @@ class Morpheus::CloudsInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def list(params={})
+    url = "#{@base_url}/api/zones"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
   def create(payload)
     url = "#{@base_url}/api/zones"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/clusters_interface.rb

@@ -226,11 +226,23 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
     execute(method: :delete, url: url, headers: headers)
   end
 
-  # def list_pods(id, params={})
-  #   url = "#{@api_url}/#{id}/pods"
-  #   headers = { params: params, authorization: "Bearer #{@access_token}" }
-  #   execute(method: :get, url: url, headers: headers)
-  # end
+  def list_datastores(id, params={})
+    url = "#{@api_url}/#{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}"
+    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}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
 
   def wiki(id, params)
     url = "#{@base_url}/api/clusters/#{id}/wiki"

data/lib/morpheus/api/custom_instance_types_interface.rb

@@ -8,10 +8,9 @@ class Morpheus::CustomInstanceTypesInterface < Morpheus::APIClient
     @expires_at = expires_at
   end
 
-  def list(options={})
+  def list(params={})
     url = "#{@base_url}/api/custom-instance-types"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    headers[:params].merge!(options)
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 

data/lib/morpheus/api/deployments_interface.rb

@@ -8,6 +8,13 @@ class Morpheus::DeploymentsInterface < Morpheus::APIClient
     @expires_at = expires_at
   end
 
+  def list(params={})
+    url = "#{@base_url}/api/deployments"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+  
   def get(options=nil)
     url = "#{@base_url}/api/deployments"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/execute_schedules_interface.rb

@@ -16,10 +16,9 @@ class Morpheus::ExecuteSchedulesInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def list(options={})
+  def list(params={})
     url = "#{@base_url}/api/execute-schedules"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    headers[:params].merge!(options)
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, timeout: 10, headers: headers}
     execute(opts)
   end

data/lib/morpheus/api/groups_interface.rb

@@ -9,6 +9,13 @@ class Morpheus::GroupsInterface < Morpheus::APIClient
   end
 
 
+  def list(params={})
+    url = "#{@base_url}/api/groups"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
   def get(options=nil)
     url = "#{@base_url}/api/groups"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/license_interface.rb

@@ -14,18 +14,25 @@ class Morpheus::LicenseInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
-  def apply(key)
+  def install(key)
     url = "#{@base_url}/api/license"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = {license: key}
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
-  def decode(key)
+  def test(key)
+    # use /test instead, since 4.1.1
     url = "#{@base_url}/api/license/decode"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = {license: key}
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
+  def uninstall(params={})
+    url = "#{@base_url}/api/license"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :delete, url: url, headers: headers)
+  end
+
 end

data/lib/morpheus/api/load_balancers_interface.rb

@@ -21,6 +21,13 @@ class Morpheus::LoadBalancersInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
+  def list(params={})
+    url = "#{@base_url}/api/load-balancers"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+  
   def get(options=nil)
     url = "#{@base_url}/api/load-balancers"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/logs_interface.rb

@@ -8,15 +8,24 @@ class Morpheus::LogsInterface < Morpheus::APIClient
     @expires_at = expires_at
   end
 
+  def list(params={})
+    url = "#{@base_url}/api/logs"
+    # old versions expected containers[]
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute({method: :get, url: url, headers: headers})
+  end
+
   def container_logs(containers=[], params={})
     url = "#{@base_url}/api/logs"
-    headers = { params: {'containers' => containers}.merge(params), authorization: "Bearer #{@access_token}" }
+    # old versions expected containers[]
+    headers = { params: {'containers' => containers, 'containers[]' => containers}.merge(params), authorization: "Bearer #{@access_token}" }
     execute({method: :get, url: url, headers: headers})
   end
 
   def server_logs(servers=[], params={})
     url = "#{@base_url}/api/logs"
-    headers = { params: {'servers' => servers}.merge(params), authorization: "Bearer #{@access_token}" }
+    # old versions expected containers[]
+    headers = { params: {'servers' => servers, 'servers[]' => servers}.merge(params), authorization: "Bearer #{@access_token}" }
     execute({method: :get, url: url, headers: headers})
   end
 

data/lib/morpheus/api/monitoring_alerts_interface.rb

@@ -0,0 +1,45 @@
+class Morpheus::MonitoringAlertsInterface < 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/monitoring/alerts/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def list(params={})
+    url = "#{@base_url}/api/monitoring/alerts"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create(payload)
+    url = "#{@base_url}/api/monitoring/alerts"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update(id, payload)
+    url = "#{@base_url}/api/monitoring/alerts/#{id}"
+    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)
+    url = "#{@base_url}/api/monitoring/alerts/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers}
+    execute(opts)
+  end
+
+end

data/lib/morpheus/api/monitoring_checks_interface.rb

@@ -16,9 +16,9 @@ class Morpheus::MonitoringChecksInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def list(options={})
+  def list(params={})
     url = "#{@base_url}/api/monitoring/checks"
-    headers = { params: options, authorization: "Bearer #{@access_token}" }
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end