morpheus-cli 5.4.3.1 → 5.4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4a903c14e297c4ac0a1e4122f2348e997844c31051f7eb5e966663e3014adf9
-  data.tar.gz: 4f1ee47b1c73c9f6e9a00bcc7faec384e46a798b29e1a11138361b4f574ca544
+  metadata.gz: 035407b70b8d466e8167c8c82dcc564c1b1ec3890411efc1f0cada46f29b5fb7
+  data.tar.gz: 1af6373e32fd55e17031919e958987c3928f3cc9dd1537bdd03fa245f5d41c63
 SHA512:
-  metadata.gz: 87adf644de800a8a79d474fdf686d02061216b5033d7a83030e46f9824c150d1089c42cf87099667a3cd3ec76f1b62683946a05ec7e4395febbd7f623267dcd7
-  data.tar.gz: 013a285d1d21b26ffd89aec19c918626879de2fff8496684dc7cea85ea50fa92e54e187d0af93ac93e0f8f435101b9f40f8f55762b94579e59110c15cd3c0829
+  metadata.gz: 5635c593c0a181fab9635275458448336b593f87462e53586b5caf6d255710d3fcb2e749772b6a03ff68e3362a73c7e764e4df408dd3b8b7cd7a5bc0082e3e85
+  data.tar.gz: 10eb5b76228b348d8734c48014687a91adb2fece61d63905bdea17699b3d0a2751e3d509f12fe77e78871cf954c3bfe22443d48feb43d8af8da698d77a037f24

data/Dockerfile

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

data/lib/morpheus/api/api_client.rb

@@ -892,6 +892,14 @@ class Morpheus::APIClient
     Morpheus::SnapshotsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def credentials
+    Morpheus::CredentialsInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def credential_types
+    Morpheus::CredentialTypesInterface.new(common_interface_options).setopts(@options)
+  end
+
   def rest(endpoint)
     Morpheus::RestInterface.new(common_interface_options).setopts(@options.merge({base_path: "#{@base_url}/api/#{endpoint}"}))
   end

data/lib/morpheus/api/catalog_item_types_interface.rb

@@ -6,22 +6,19 @@ class Morpheus::CatalogItemTypesInterface < Morpheus::RestInterface
     "/api/catalog-item-types"
   end
 
-  # NOT json, multipart file upload
-  # def update_logo(id, logo_file)
-  #   url = "#{base_path}/#{id}/update-logo"
-  #   headers = { :params => {}, :authorization => "Bearer #{@access_token}"}
-  #   payload = {}
-  #   payload[:logo] = logo_file
-  #   payload[:multipart] = true
-  #   execute(method: :post, url: url, headers: headers, payload: payload)
-  # end
-
   # NOT json, multipart file upload, uses PUT update endpoint
-  def update_logo(id, logo_file)
+  def update_logo(id, logo_file, dark_logo_file=nil)
+    #url = "#{base_path}/#{id}/update-logo"
     url = "#{base_path}/#{id}"
     headers = { :params => {}, :authorization => "Bearer #{@access_token}"}
     payload = {}
-    payload["catalogItemType"] = {"logo" => logo_file}
+    payload["catalogItemType"] = {}
+    if logo_file
+      payload["catalogItemType"]["logo"] = logo_file
+    end
+    if dark_logo_file
+      payload["catalogItemType"]["darkLogo"] = dark_logo_file
+    end
     payload[:multipart] = true
     execute(method: :put, url: url, headers: headers, payload: payload)
   end

data/lib/morpheus/api/clusters_interface.rb

@@ -91,6 +91,18 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
+  def destroy_worker(id, worker_id, params={})
+    url = "#{base_path}/#{id}/servers/#{worker_id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :delete, url: url, headers: headers)
+  end
+
+  def update_worker_count(id, params={})
+    url = "#{base_path}/#{id}/worker-count"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :put, url: url, headers: headers)
+  end
+
   def list_services(id, params={})
     url = "#{base_path}/#{id}/services"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/credential_types_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/read_interface'
+
+class Morpheus::CredentialTypesInterface < Morpheus::ReadInterface
+
+  def base_path
+    "/api/credential-types"
+  end
+
+end

data/lib/morpheus/api/credentials_interface.rb

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

data/lib/morpheus/api/monitoring_apps_interface.rb

@@ -38,20 +38,28 @@ class Morpheus::MonitoringAppsInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def quarantine(id, payload={})
-    url = "#{@base_url}/api/monitoring/apps/#{id}/quarantine"
+  def mute(id, payload={})
+    url = "#{@base_url}/api/monitoring/apps/#{id}/mute"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
-  def quarantine_all(payload={})
-    url = "#{@base_url}/api/monitoring/apps/quarantine-all"
+  def mute_all(payload={})
+    url = "#{@base_url}/api/monitoring/apps/mute-all"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
+  def quarantine(id, payload={})
+    mute(id, payload)
+  end
+
+  def quarantine_all(payload={})
+    mute_all(payload)
+  end
+
   def statistics(id, params={})
     url = "#{@base_url}/api/monitoring/apps/#{id}/statistics"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/monitoring_checks_interface.rb

@@ -39,22 +39,30 @@ class Morpheus::MonitoringChecksInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def quarantine(id, options={})
-    url = "#{@base_url}/api/monitoring/checks/#{id}/quarantine"
+  def mute(id, options={})
+    url = "#{@base_url}/api/monitoring/checks/#{id}/mute"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = options
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
-  def quarantine_all(options={})
-    url = "#{@base_url}/api/monitoring/checks/quarantine-all"
+  def mute_all(options={})
+    url = "#{@base_url}/api/monitoring/checks/mute-all"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = options
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
+  def quarantine(id, payload={})
+    mute(id, payload)
+  end
+
+  def quarantine_all(payload={})
+    mute_all(payload)
+  end
+
   def history(id, params={})
     url = "#{@base_url}/api/monitoring/checks/#{id}/history"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/monitoring_groups_interface.rb

@@ -38,20 +38,28 @@ class Morpheus::MonitoringGroupsInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def quarantine(id, payload={})
-    url = "#{@base_url}/api/monitoring/groups/#{id}/quarantine"
+  def mute(id, payload={})
+    url = "#{@base_url}/api/monitoring/groups/#{id}/mute"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
-  def quarantine_all(payload={})
-    url = "#{@base_url}/api/monitoring/groups/quarantine-all"
+  def mute_all(payload={})
+    url = "#{@base_url}/api/monitoring/groups/mute-all"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
-  
+
+  def quarantine(id, payload={})
+    mute(id, payload)
+  end
+
+  def quarantine_all(payload={})
+    mute_all(payload)
+  end
+
   def history(id, params={})
     url = "#{@base_url}/api/monitoring/groups/#{id}/history"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/monitoring_incidents_interface.rb

@@ -58,21 +58,29 @@ class Morpheus::MonitoringIncidentsInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def quarantine(id, options={})
-    url = "#{@base_url}/api/monitoring/incidents/#{id}/quarantine"
+  def mute(id, options={})
+    url = "#{@base_url}/api/monitoring/incidents/#{id}/mute"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = options
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
-  def quarantine_all(payload={})
-    url = "#{@base_url}/api/monitoring/incidents/quarantine-all"
+  def mute_all(payload={})
+    url = "#{@base_url}/api/monitoring/incidents/mute-all"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
+  def quarantine(id, payload={})
+    mute(id, payload)
+  end
+
+  def quarantine_all(payload={})
+    mute_all(payload)
+  end
+
   def history(id, params={})
     url = "#{@base_url}/api/monitoring/incidents/#{id}/history"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/options_interface.rb

@@ -2,8 +2,15 @@ require 'morpheus/api/api_client'
 
 class Morpheus::OptionsInterface < Morpheus::APIClient
 
-  def options_for_source(source,params = {})
+  def options_for_type(option_type, params={})
+    options_for_source(option_type['optionSource'], params, option_type['optionSourceType'])
+  end
+
+  def options_for_source(source,params = {}, option_source_type=nil)
     url = "#{@base_url}/api/options/#{source}"
+    if option_source_type
+      url = "#{@base_url}/api/options/#{option_source_type}/#{source}"
+    end
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end

data/lib/morpheus/api/power_schedules_interface.rb

@@ -2,10 +2,10 @@ require 'morpheus/api/api_client'
 
 class Morpheus::PowerSchedulesInterface < Morpheus::APIClient
 
-  def get(id)
+  def get(id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
     url = "#{@base_url}/api/power-schedules/#{id}"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, timeout: 10, headers: headers}
     execute(opts)
   end

data/lib/morpheus/api/service_plans_interface.rb

@@ -42,6 +42,12 @@ class Morpheus::ServicePlansInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers)
   end
 
+  def destroy(id, params={})
+    url = "#{base_path}/#{id}"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :delete, url: url, headers: headers)
+  end
+
   def provision_types(params={})
     url = "#{base_path}/provision-types"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/cli/cli_command.rb

@@ -151,23 +151,13 @@ module Morpheus
         
         # add each one to the OptionParser
         option_types.each do |option_type|
-          field_namespace = []
-          field_name = option_type['fieldName'].to_s
-          if field_name.empty?
-            puts "Missing fieldName for option type: #{option_type}" if Morpheus::Logging.debug?
+          if option_type['fieldName'].empty?
+            puts_error "Missing fieldName for option type: #{option_type}" if Morpheus::Logging.debug?
             next
           end
-          
-          if !option_type['fieldContext'].to_s.empty?
-            option_type['fieldContext'].split(".").each do |ns|
-              field_namespace << ns
-            end
-          end
-          
-          full_field_name = field_name
-          if !field_namespace.empty?
-            full_field_name = "#{field_namespace.join('.')}.#{field_name}"
-          end
+          full_field_name = option_type['fieldContext'].to_s.empty? ? option_type['fieldName'] : "#{option_type['fieldContext']}.#{option_type['fieldName']}"
+          field_namespace = full_field_name.split(".")
+          field_name = field_namespace.pop
 
           description = "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}"
           if option_type['description']
@@ -1507,8 +1497,11 @@ module Morpheus
         type, *ids = args
         type = type.to_s.singularize.underscore
         # still relying on the command or helper to define these _label and _key methods
-        label = send("#{type}_label")
-        object_key = send("#{type}_object_key")
+        # label = send("#{type}_label")
+        # object_key = send("#{type}_object_key")
+        # ^ nope, not for long!
+        object_key = respond_to?("#{type}_object_key", true) ? send("#{type}_object_key") : type.camelcase.singularize
+        label = respond_to?("#{type}_label", true) ? send("#{type}_label") : type.titleize
         interface_name = "@#{type.pluralize}_interface"
         interface = instance_variable_get(interface_name)
         if interface.nil?

data/lib/morpheus/cli/commands/catalog_item_types_command.rb

@@ -13,7 +13,7 @@ class Morpheus::Cli::CatalogItemTypesCommand
   set_command_description "Self Service: View and manage catalog item types"
 
   register_subcommands :list, :get, :add, :update, :remove
-  register_subcommands({:'update-logo' => :update_logo})
+  register_subcommands({:'update-logo' => :update_logo, :'update-dark-logo' => :update_dark_logo})
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -224,6 +224,7 @@ EOT
     options = {}
     params = {}
     logo_file = nil
+    dark_logo_file = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       # opts.on('-t', '--type [instance|blueprint|workflow]', "Item Type, default is instance.") do |val|
@@ -235,7 +236,7 @@ EOT
         filename = val
         logo_file = nil
         if filename == 'null'
-          filename = 'null' # clear it
+          logo_file = 'null' # clear it
         else
           filename = File.expand_path(filename)
           if !File.exists?(filename)
@@ -244,6 +245,19 @@ EOT
           logo_file = File.new(filename, 'rb')
         end
       end
+      opts.on('--dark-logo FILE', String, "Upload a custom dark logo icon") do |val|
+        filename = val
+        dark_logo_file = nil
+        if filename == 'null'
+          dark_logo_file = 'null' # clear it
+        else
+          filename = File.expand_path(filename)
+          if !File.exists?(filename)
+            raise_command_error "File not found: #{filename}"
+          end
+          dark_logo_file = File.new(filename, 'rb')
+        end
+      end
       opts.on('--config-file FILE', String, "Config from a local JSON or YAML file") do |val|
         options[:config_file] = val.to_s
         file_content = nil
@@ -346,9 +360,9 @@ EOT
     end
     json_response = @catalog_item_types_interface.create(payload)
     if json_response['success']
-      if logo_file
+      if logo_file || dark_logo_file
         begin
-          @catalog_item_types_interface.update_logo(json_response['catalogItemType']['id'], logo_file)
+          @catalog_item_types_interface.update_logo(json_response['catalogItemType']['id'], logo_file, dark_logo_file)
         rescue RestClient::Exception => e
           print_red_alert "Failed to save logo!"
           print_rest_exception(e, options)
@@ -368,6 +382,7 @@ EOT
     params = {}
     payload = {}
     logo_file = nil
+    dark_logo_file = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[type] [options]")
       build_option_type_options(opts, options, update_catalog_item_type_option_types)
@@ -375,7 +390,7 @@ EOT
         filename = val
         logo_file = nil
         if filename == 'null'
-          filename = 'null' # clear it
+          logo_file = 'null' # clear it
         else
           filename = File.expand_path(filename)
           if !File.exists?(filename)
@@ -384,6 +399,19 @@ EOT
           logo_file = File.new(filename, 'rb')
         end
       end
+      opts.on('--dark-logo FILE', String, "Upload a custom dark logo icon") do |val|
+        filename = val
+        dark_logo_file = nil
+        if filename == 'null'
+          dark_logo_file = 'null' # clear it
+        else
+          filename = File.expand_path(filename)
+          if !File.exists?(filename)
+            raise_command_error "File not found: #{filename}"
+          end
+          dark_logo_file = File.new(filename, 'rb')
+        end
+      end
       opts.on('--config-file FILE', String, "Config from a local JSON or YAML file") do |val|
         options[:config_file] = val.to_s
         file_content = nil
@@ -474,7 +502,7 @@ EOT
       params['workflow'] = {'id' => params['workflow']}  if params['workflow'] && !params['workflow'].is_a?(Hash)
       params['blueprint'] = {'id' => params['blueprint']}  if params['blueprint'] && !params['blueprint'].is_a?(Hash)
       payload.deep_merge!({catalog_item_type_object_key => params})
-      if payload[catalog_item_type_object_key].empty? # || options[:no_prompt]
+      if payload[catalog_item_type_object_key].empty? && (!logo_file && !dark_logo_file)# || options[:no_prompt]
         raise_command_error "Specify at least one option to update.\n#{optparse}"
       end
     end
@@ -485,9 +513,9 @@ EOT
     end
     json_response = @catalog_item_types_interface.update(catalog_item_type['id'], payload)
     if json_response['success']
-      if logo_file
+      if logo_file || dark_logo_file
         begin
-          @catalog_item_types_interface.update_logo(json_response['catalogItemType']['id'], logo_file)
+          @catalog_item_types_interface.update_logo(json_response['catalogItemType']['id'], logo_file, dark_logo_file)
         rescue RestClient::Exception => e
           print_red_alert "Failed to save logo!"
           print_rest_exception(e, options)
@@ -541,6 +569,45 @@ EOT
     end
   end
 
+  def update_dark_logo(args)
+    options = {}
+    params = {}
+    filename = nil
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[type] [file]")
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.footer = "Update the dark logo for a catalog item type." + "\n" +
+                    "[type] is required. This is the name or id of a catalog item type." + "\n" +
+                    "[file] is required. This is the path of the dark logo file"
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:2)
+    connect(options)
+    catalog_item_type = find_catalog_item_type_by_name_or_id(args[0])
+    return 1 if catalog_item_type.nil?
+    filename = args[1]
+    dark_logo_file = nil
+    if filename == 'null'
+      dark_logo_file = 'null' # clear it
+    else
+      filename = File.expand_path(filename)
+      if !File.exists?(filename)
+        raise_command_error "File not found: #{filename}"
+      end
+      dark_logo_file = File.new(filename, 'rb')
+    end
+    @catalog_item_types_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @catalog_item_types_interface.dry.update_logo(catalog_item_type['id'], nil, dark_logo_file)
+      return
+    end
+    json_response = @catalog_item_types_interface.update_logo(catalog_item_type['id'], nil, dark_logo_file)
+    render_response(json_response, options, catalog_item_type_object_key) do
+      print_green_success "Updated catalog item type #{catalog_item_type['name']} logo"
+      return _get(catalog_item_type["id"], {}, options)
+    end
+  end
+
   def remove(args)
     options = {}
     params = {}