morpheus-cli 4.2.8 → 4.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39ea88743d6ad4977058a608249545bffa88dfdd0bec6c80b23cd73d904cbf3d
-  data.tar.gz: 5b775dd9bdb4652c381c8166721560b5b49d9f5f4a64055bd51ef80189072ca6
+  metadata.gz: 306e4f72ea1678c854091571261b455432291cb6b2d724ccfdca97f704c89329
+  data.tar.gz: 43a8b4a1e73a40a65c9d8e732f7f370145c539db165b63a620385768d3ed3b0a
 SHA512:
-  metadata.gz: 00cbddb0b701321221a396758a1a344028c9e02608dfe5a1e8ea8ddc834a02c52b9ddb76b99b9a226f933763c5cefee9c22a07198262f6f57216edb2eb1f844f
-  data.tar.gz: bd44a4e080bdac78a9c6aae481f61c749041527332ccf09881e72ba63c8359bfb7658d05e9204ac957d8453314893bca24fb63d232007e1ab406bc23071854bf
+  metadata.gz: d314342d0bb820cd1c787c7aa9f9738f1cd2febeae2942c2be8001d428857f266a4b2be0cab29c8020233e100c2caccc07bdd544f09a93c3e1514d016beff1cc
+  data.tar.gz: c487245071a039afa9ae99e1ba7d50a1ebf241a4a6e67a91cc8af7ffdbf44db930ebe7242fd26af477939a0605a7808ab7c972d02da40c5424cbc122c8d9f1d1

data/Dockerfile

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

data/lib/morpheus/api.rb

@@ -1,5 +1,5 @@
 require 'morpheus/cli/version'
-require 'morpheus/cli/command_error'
+require 'morpheus/cli/errors'
 require 'morpheus/rest_client'
 require 'morpheus/formatters'
 #require 'morpheus/logging'

data/lib/morpheus/api/activity_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::ActivityInterface < Morpheus::APIClient
+
+  def list(params={})
+    execute(method: :get, url: "/api/activity", headers: {params: params})
+  end
+
+end

data/lib/morpheus/api/api_client.rb

@@ -33,7 +33,7 @@ class Morpheus::APIClient
     @refresh_token = refresh_token
     @base_url = base_url
     if @base_url.to_s.empty?
-      raise "#{self.class} requires option :url"
+      raise "#{self.class} initialized without a required option :url"
     end
     @base_url = @base_url.chomp("/")
     # todo: validate URI
@@ -74,10 +74,24 @@ class Morpheus::APIClient
   end
 
   # set this in your interface, eg. to 'application/json'
+  # or let it it default to json when payload is present.
   def default_content_type
     nil
   end
 
+  # set default seconds for interface to timeout after
+  # or let it use system default? none, it should not timeout by default.. 
+  # I think execute() may use 30 seconds for get by default.
+  # and it should remove timeout when method is post, put, or delete
+  def default_timeout
+    nil
+  end
+
+  # Authorization is required, except for a couple commands like Ping and Setup
+  def authorization_required?
+    true
+  end
+
   # common global options, hooray.
   # this is probably needed for CliCommand too..
   # maybe make this a mixin...
@@ -132,6 +146,14 @@ 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={})
+    # 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...
+    if opts[:url]
+      if !opts[:url].include?(@base_url)
+        opts[:url] = "#{@base_url}#{opts[:url]}"
+      end
+    end
     # merge in common global @options
     if @options
       options = options.merge(@options)
@@ -139,23 +161,26 @@ class Morpheus::APIClient
       options = options.clone
     end
 
-    # default HTTP method
+    # determine HTTP method
     if opts[:method].nil?
-      # why not a default? you will get an error from RestClient
-      # opts[:method] = :get
+      opts[:method] = :get
     else
       # convert to lowercase Symbol like :get, :post, :put, or :delete
       opts[:method] = opts[:method].to_s.downcase.to_sym
     end
+    
+    # could validate method here...
 
     # apply default headers
     opts[:headers] ||= {}
     # Authorization: apply our access token
-    if @access_token
-      if opts[:headers][:authorization].nil? && opts[:headers]['Authorization'].nil?
-        opts[:headers][:authorization] = "Bearer #{@access_token}"
-      else
-        # authorization header has already been set.
+    if authorization_required?
+      if @access_token
+        if opts[:headers][:authorization].nil? && opts[:headers]['Authorization'].nil?
+          opts[:headers][:authorization] = "Bearer #{@access_token}"
+        else
+          # authorization header has already been set.
+        end
       end
     end
 
@@ -163,10 +188,20 @@ class Morpheus::APIClient
     if opts[:headers]['Content-Type'].nil? && default_content_type
       opts[:headers]['Content-Type'] = default_content_type
     end
+    
+    # default Content-Type to application/json if you pass a payload.
+    if opts[:headers]['Content-Type'].nil? && options[:payload]
+      opts[:headers]['Content-Type'] = 'application/json'
+    end
 
-    # use custom timeout eg. from --timeout option
-    if options[:timeout]
-      opts[:timeout] = options[:timeout].to_f
+    # always use custom timeout eg. from --timeout option
+    # or use default_timeout for GET requests only.
+    if opts[:timeout].nil?
+      if options[:timeout]
+        opts[:timeout] = options[:timeout].to_f
+      elsif default_timeout && opts[:method] == :get
+        opts[:timeout] = default_timeout.to_f
+      end
     end
 
     # add extra headers, eg. from --header option
@@ -176,7 +211,6 @@ class Morpheus::APIClient
     end
 
     # this is confusing, but RestClient expects :params inside the headers...?
-    # right?
     # move/copy params to headers.params for simplification.
     # remove this if issues arise
     if opts[:params] && (opts[:headers][:params].nil? || opts[:headers][:params].empty?)
@@ -275,20 +309,43 @@ 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}
+  def common_interface_options
+    {
+      url: @base_url, 
+      access_token: @access_token, 
+      refresh_token: @refresh_token, 
+      expires_at: @expires_at, 
+      client_id: @client_id
+    }
+  end
+
+  def ping
+    Morpheus::PingInterface.new(common_interface_options).setopts(@options)
   end
 
+  def setup
+    Morpheus::SetupInterface.new(common_interface_options).setopts(@options)
+  end
+  
   def auth
+    # Morpheus::AuthInterface.new(common_interface_options).setopts(@options)
     Morpheus::AuthInterface.new({url: @base_url, client_id: @client_id}).setopts(@options)
   end
 
   def whoami
-    Morpheus::WhoamiInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::WhoamiInterface.new(common_interface_options).setopts(@options)
   end
 
   def user_settings
-    Morpheus::UserSettingsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::UserSettingsInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def dashboard
+    Morpheus::DashboardInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def activity
+    Morpheus::ActivityInterface.new(common_interface_options).setopts(@options)
   end
 
   def options
@@ -475,10 +532,6 @@ class Morpheus::APIClient
     Morpheus::OptionTypeListsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
-  def dashboard
-    Morpheus::DashboardInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
-  end
-
   def power_schedules
     Morpheus::PowerSchedulesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
@@ -487,11 +540,6 @@ class Morpheus::APIClient
     Morpheus::ExecuteSchedulesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
-  
-  def setup
-    Morpheus::SetupInterface.new(common_iface_opts).setopts(@options).setopts(@options)
-  end
-
   def monitoring
     Morpheus::MonitoringInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
@@ -683,13 +731,21 @@ class Morpheus::APIClient
   end
 
   def invoices
-    Morpheus::InvoicesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::InvoicesInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def invoice_line_items
+    Morpheus::InvoiceLineItemsInterface.new(common_interface_options).setopts(@options)
   end
 
   def guidance
     Morpheus::GuidanceInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
+  def projects
+    Morpheus::ProjectsInterface.new(common_interface_options).setopts(@options)
+  end
+
   # add new interfaces here
 
 end

data/lib/morpheus/api/apps_interface.rb

@@ -57,6 +57,27 @@ class Morpheus::AppsInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def refresh(app_id, params, payload)
+    url = "#{@base_url}/api/apps/#{app_id}/refresh"
+    headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def apply(app_id, params, payload)
+    url = "#{@base_url}/api/apps/#{app_id}/apply"
+    headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def prepare_apply(app_id, params, payload)
+    url = "#{@base_url}/api/apps/#{app_id}/prepare-apply"
+    headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
   def add_instance(app_id, payload)
     url = "#{@base_url}/api/apps/#{app_id}/add-instance"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/dashboard_interface.rb

@@ -1,30 +1,14 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::DashboardInterface < 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={})
-    dashboard(options)
-  end
 
-  def dashboard(options={})
-    url = "#{@base_url}/api/dashboard"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    headers[:params].merge!(options)
-    execute(method: :get, url: url, headers: headers)
+  def get(params={})
+    execute(method: :get, url: "/api/dashboard", headers: {params: params})
   end
 
-  def recent_activity(account_id=nil, options={})
-    url = "#{@base_url}/api/dashboard/recent-activity"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    headers[:params].merge!(options)
-    headers[:params]['accountId'] = account_id if account_id
-    execute(method: :get, url: url, headers: headers)
+  # [DEPRECATED] Use ActivityInterface.list() instead.
+  def recent_activity(params={})
+    execute(method: :get, url: "/api/dashboard/recent-activity", headers: {params: params})
   end
 
 end

data/lib/morpheus/api/instances_interface.rb

@@ -217,10 +217,11 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
-    def import_snapshot(id, params={})
+  
+  def import_snapshot(id, params={}, payload={})
     url = "#{@base_url}/api/instances/#{id}/import-snapshot"
     headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, headers: headers}
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
@@ -266,14 +267,6 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  # deprecated in 4.0
-  def update_notes(id, payload)
-    url = "#{@base_url}/api/instances/#{id}/notes"
-    headers = {authorization: "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
-  end
-
   def history(id, params={})
     url = "#{@base_url}/api/instances/#{id}/history"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/invoice_line_items_interface.rb

@@ -0,0 +1,14 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::InvoiceLineItemsInterface < Morpheus::APIClient
+
+  def list(params={})
+    execute(method: :get, url: "/api/invoice-line-items", headers: {params: params})
+  end
+
+  def get(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    execute(method: :get, url: "/api/invoice-line-items/#{id}", headers: {params: params})
+  end
+
+end

data/lib/morpheus/api/invoices_interface.rb

@@ -1,24 +1,19 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::InvoicesInterface < 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 list(params={})
+    execute(method: :get, url: "/api/invoices", headers: {params: params})
   end
 
   def get(id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/invoices/#{id}"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    execute(method: :get, url: url, headers: headers)
+    execute(method: :get, url: "/api/invoices/#{id}", headers: {params: params})
   end
 
-  def list(params={})
-    url = "#{@base_url}/api/invoices"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    execute(method: :get, url: url, headers: headers)
+  def refresh(params={}, payload={})
+    headers = {:params => params, 'Content-Type' => 'application/json'}
+    execute(method: :post, url: "/api/invoices/refresh", headers: headers, payload: payload.to_json)
   end
 
 end

data/lib/morpheus/api/library_layouts_interface.rb

@@ -46,6 +46,14 @@ class Morpheus::LibraryLayoutsInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def update_permissions(id, options)
+    url = build_url(nil, id) + "/permissions"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
   private
 
   def build_url(instance_type_id=nil, id=nil)

data/lib/morpheus/api/ping_interface.rb

@@ -0,0 +1,20 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::PingInterface < Morpheus::APIClient
+  
+  # no Authorization header is required
+  def authorization_required?
+    false
+  end
+
+  # health checks use a relatively small timeout by default
+  def default_timeout
+    5
+  end
+
+  def get(params={})
+    headers = {params: params}
+    execute(method: :get, url: "/api/ping", headers: headers)
+  end
+
+end

data/lib/morpheus/api/projects_interface.rb

@@ -0,0 +1,33 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::ProjectsInterface < Morpheus::APIClient
+
+  def build_url(id=nil)
+    id ? "/api/projects/#{id}" : "/api/projects"
+  end
+
+  def list(params={})
+    execute(method: :get, url: build_url(), headers: {params: params})
+  end
+
+  def get(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    execute(method: :get, url: build_url(id), headers: {params: params})
+  end
+
+  def create(payload, params={})
+    # headers = {:params => params, 'Content-Type' => 'application/json'}
+    headers = {:params => params, 'Content-Type' => 'application/json'}
+    execute(method: :post, url: build_url(), headers: headers, payload: payload.to_json)
+  end
+
+  def update(id, payload, params={})
+    headers = {:params => params, 'Content-Type' => 'application/json'}
+    execute(method: :put, url: build_url(id), headers: headers, payload: payload.to_json)
+  end
+
+  def destroy(id, params={})
+    execute(method: :delete, url: build_url(id), headers: {params: params})
+  end
+
+end