morpheus-cli 6.3.1 → 6.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8acef874a37276edc6d53f64e243ca01c0e0d30e49dea166502058da2f01350d
-  data.tar.gz: f0f9022abbb5b04c526cf992c95cacee2927ce5fb2e27027b19dc624abe454be
+  metadata.gz: 94da7995030caa8d8370454c1a17ae68e314080fa52dde2d95b48122e69e5f6d
+  data.tar.gz: 19aa5d0040441e385606f43f1ae1b0d09e6eb5a3fa99958450acc6914dc8a803
 SHA512:
-  metadata.gz: ab4f224e431ff217ea24591b385d76f1a6370626770e8eb9f8ae8291c6d6681e3a29c58c6c220fea85510819da0df901e3816e37f4937ad2b04c4322a5eae0b2
-  data.tar.gz: 27976146b5f086f41968860c7eb210fdbc7cf8ac6667b55e1318e88f9fae938c33699b05a14a1cdba91bfcde0635b01113bc61c3c1e21ade5e2a7bea719cee66
+  metadata.gz: d718c881f79ecdf26a91172506f9500b69a3269bc1ae00bf53d0191fcbe484d10aea1e9919822c2a6fdf69d195b2d1c8009917d79ef9d5fd0df0a76962ba8f14
+  data.tar.gz: da197f17e1617a9f909bd61b92c3f82b79ab70b951603033b08cd6b86e5b5ff20b8f659cd48fd5823fea80afad02712be72ad202ec5ef0d3e179a12a503af225

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 6.3.1
+RUN gem install morpheus-cli -v 6.3.3
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/library_cluster_packages_interface.rb

@@ -38,4 +38,23 @@ class Morpheus::LibraryClusterPackagesInterface < Morpheus::APIClient
     opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
+
+  def update_logo(id, logo_file, dark_logo_file=nil)
+    url = "#{@base_url}/api/library/cluster-packages/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}"}
+    payload = {}
+    payload["clusterPackage"] = {}
+    if logo_file
+      payload["clusterPackage"]["logo"] = logo_file
+    end
+    if dark_logo_file
+      payload["clusterPackage"]["darkLogo"] = dark_logo_file
+    end
+    if logo_file.is_a?(File) || dark_logo_file.is_a?(File)
+      payload[:multipart] = true
+    else
+      headers['Content-Type'] = 'application/x-www-form-urlencoded'
+    end
+    execute(method: :put, url: url, headers: headers, payload: payload)
+  end
 end

data/lib/morpheus/cli/cli_command.rb

@@ -563,7 +563,7 @@ module Morpheus
             # added with :payload too... just need it here to avoid unknown key error
             # todo: remove this when every command supporting :payload is updated to use parse_payload(options) and execute_api(options)
           when :list
-            opts.on( '-m', '--max MAX', "Max Results (use -1 for all results)" ) do |val|
+            opts.on( '-m', '--max MAX', "Max Results" ) do |val|
               # api supports max=-1 for all at the moment..
               if val.to_s == "all" || val.to_s == "-1"
                 options[:max] = "-1"

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

@@ -181,7 +181,8 @@ class Morpheus::Cli::CloudFoldersCommand
         #"Type" => lambda {|it| it['type'].to_s.capitalize },
         "Cloud" => lambda {|it| it['zone'] ? it['zone']['name'] : '' },
         "Active" => lambda {|it| format_boolean(it['active']) },
-        "Default" => lambda {|it| format_boolean(it['defaultPool']) },
+        "Default" => lambda {|it| format_boolean(it['defaultFolder']) },
+        "Image Target" => lambda {|it| format_boolean(it['defaultStore']) },
         "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
         #"Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|it| it['name'] }.uniq.join(', ') : '' }
         # "Owner" => lambda {|it| it['owner'] ? it['owner']['name'] : '' },
@@ -319,6 +320,12 @@ class Morpheus::Cli::CloudFoldersCommand
       opts.on('--active [on|off]', String, "Can be used to disable a resource folder") do |val|
         options['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--default-folder [on|off]', String, "Default Folder") do |val|
+        options['defaultFolder'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--image-target [on|off]', String, "Image Target") do |val|
+        options['defaultStore'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a resource folder." + "\n" +
                     "[cloud] is required. This is the name or id of the cloud." + "\n"
@@ -408,6 +415,16 @@ class Morpheus::Cli::CloudFoldersCommand
         if options['active'] != nil
           payload['folder']['active'] = options['active']
         end
+
+        # Default
+        if options['defaultFolder'] != nil
+          payload['folder']['defaultFolder'] = options['defaultFolder']
+        end
+
+        # Image Target
+        if options['defaultStore'] != nil
+          payload['folder']['defaultStore'] = options['defaultStore']
+        end
         
         # Visibility
         if options['visibility'] != nil

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

@@ -5,6 +5,7 @@ class Morpheus::Cli::DashboardCommand
   include Morpheus::Cli::ProvisioningHelper
   set_command_name :dashboard
   set_command_description "View Morpheus Dashboard"
+  set_command_hidden
 
   def initialize()
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -16,7 +17,7 @@ class Morpheus::Cli::DashboardCommand
   end
 
   def usage
-    "Usage: morpheus #{command_name}"
+    "#{yellow}API for this command has been removed starting with appliance version 6.2.6\n#{reset}Usage: morpheus #{command_name}"
   end
 
   def handle(args)

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

@@ -89,7 +89,7 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
       opts.banner = subcommand_usage("[clusterPackage]")
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Display cluster package details." + "\n" +
-                    "[clusterPackage] is required. This is the name or id of a cluster package."
+                    "[clusterPackage] is required. This is the id of a cluster package."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -114,7 +114,7 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
           print_dry_run @library_cluster_packages_interface.dry.get(id)
         return
       end
-      package = find_package_by_name_or_id(id)
+      package = find_package_by_id(id)
       if package.nil?
         return 1
       end
@@ -143,6 +143,9 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
         "Package Version" => lambda {|it| it['packageVersion']},
         "Package Type" => lambda {|it| it['packageType']},
         "Type" => lambda {|it| it['type'] },
+        "Repeat Install" => lambda {|it| format_boolean(it['repeatInstall'])},
+        "Logo" => lambda {|it| it['imagePath'] },
+        "Dark Logo" => lambda {|it| it['darkImagePath'] },
         "Spec Templates" => lambda {|it| 
           "(#{it['specTemplates'].count}) #{it['specTemplates'].collect {|it| it['name'] }.join(', ')}"
         }
@@ -171,6 +174,8 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
   def add(args)
     options = {}
     params = {}
+    logo_file = nil
+    dark_logo_file = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name] [options]")
       opts.on('-n', '--name VALUE', String, "Name for this cluster package") do |val|
@@ -202,7 +207,32 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
           params['specTemplates'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
-
+      opts.on('--logo FILE', String, "Upload a custom logo icon") do |val|
+        filename = val
+        logo_file = nil
+        if filename == 'null'
+          logo_file = 'null' # clear it
+        else
+          filename = File.expand_path(filename)
+          if !File.exist?(filename)
+            raise_command_error "File not found: #{filename}"
+          end
+          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.exist?(filename)
+            raise_command_error "File not found: #{filename}"
+          end
+          dark_logo_file = File.new(filename, 'rb')
+        end
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Create a cluster package."
     end
@@ -263,6 +293,11 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
           params['packageVersion'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'packageVersion', 'packageVersion' => 'text', 'fieldLabel' => 'Package Version', 'required' => true}], options[:options], @api_client,{})['packageVersion']
         end
 
+        # logo
+        if params['iconPath'].nil?
+          params['iconPath'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'iconPath', 'fieldLabel' => 'Logo', 'type' => 'select', 'optionSource' => 'iconList'}], options[:options], @api_client,{})['iconPath']
+        end
+
         # specTemplates
         if params['specTemplates'].nil?
           spec_templates = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'specTemplates', 'fieldLabel' => 'Spec Templates', 'type' => 'multiSelect', 'required' => true, 'optionSource' => 'clusterResourceSpecTemplates'}], options[:options], @api_client, {})['specTemplates']
@@ -279,6 +314,16 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
       end
 
       json_response = @library_cluster_packages_interface.create(payload)
+      if json_response['success']
+        if logo_file || dark_logo_file
+          begin
+            @library_cluster_packages_interface.update_logo(json_response['id'], logo_file, dark_logo_file)
+          rescue RestClient::Exception => e
+            print_red_alert "Failed to save logo!"
+            print_rest_exception(e, options)
+          end
+        end
+      end
 
       if options[:json]
         print JSON.pretty_generate(json_response), "\n"
@@ -295,8 +340,10 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
   def update(args)
     options = {}
     params = {}
+    logo_file = nil
+    dark_logo_file = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name] [options]")
+      opts.banner = subcommand_usage("[id] [options]")
       opts.on('-n', '--name VALUE', String, "Name for this cluster package") do |val|
         params['name'] = val
       end
@@ -326,10 +373,35 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
           params['specTemplates'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
-
+      opts.on('--logo FILE', String, "Upload a custom logo icon") do |val|
+        filename = val
+        logo_file = nil
+        if filename == 'null'
+          logo_file = 'null' # clear it
+        else
+          filename = File.expand_path(filename)
+          if !File.exist?(filename)
+            raise_command_error "File not found: #{filename}"
+          end
+          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.exist?(filename)
+            raise_command_error "File not found: #{filename}"
+          end
+          dark_logo_file = File.new(filename, 'rb')
+        end
+      end
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
       opts.footer = "Update a cluster package." + "\n" +
-                    "[name] is required. This is the name or id of a cluster package."
+                    "[id] is required. This is the id of a cluster package."
     end
 
     optparse.parse!(args)
@@ -340,7 +412,7 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
       return 1
     end
     begin
-      cluster_package = find_package_by_name_or_id(args[0])
+      cluster_package = find_package_by_id(args[0])
       exit 1 if cluster_package.nil?
       passed_options = (options[:options] || {}).reject {|k,v| k.is_a?(Symbol) }
       payload = nil
@@ -351,7 +423,7 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
       end
      
-      if params.empty?
+      if params.empty? && !logo_file && !dark_logo_file
         print_green_success "Nothing to update"
         exit 1
       end
@@ -361,15 +433,34 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
         print_dry_run @library_cluster_packages_interface.dry.update(cluster_package['id'], payload)
         return 0
       end
-      
-      json_response = @library_cluster_packages_interface.update(cluster_package['id'], payload)
-      
-      if options[:json]
-        print JSON.pretty_generate(json_response), "\n"
-        return 0
-      end
 
-      print_green_success "Updated Cluster Package #{params['name'] || cluster_package['name']}"
+      if (logo_file || dark_logo_file) && params.empty?
+        begin
+          @library_cluster_packages_interface.update_logo(cluster_package['id'], logo_file, dark_logo_file)
+          print_green_success "Updated Cluster Package #{params['name'] || cluster_package['name']}"
+        rescue RestClient::Exception => e
+          print_red_alert "Failed to save logo!"
+          print_rest_exception(e, options)
+        end
+      else
+        json_response = @library_cluster_packages_interface.update(cluster_package['id'], payload)
+        if json_response['success']
+          if logo_file || dark_logo_file
+            begin
+              @library_cluster_packages_interface.update_logo(json_response['id'], logo_file, dark_logo_file)
+            rescue RestClient::Exception => e
+              print_red_alert "Failed to save logo!"
+              print_rest_exception(e, options)
+            end
+          end
+        end
+        if options[:json]
+          print JSON.pretty_generate(json_response), "\n"
+          return 0
+        end
+  
+        print_green_success "Updated Cluster Package #{params['name'] || cluster_package['name']}"
+      end
       return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -383,7 +474,7 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
       opts.banner = subcommand_usage("[clusterPackage]")
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
       opts.footer = "Delete a cluster package." + "\n" +
-                    "[clusterPackage] is required. This is the name or id of a cluster package."
+                    "[clusterPackage] is required. This is the id of a cluster package."
     end
     optparse.parse!(args)
 
@@ -396,7 +487,7 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
     connect(options)
 
     begin
-      cluster_package = find_package_by_name_or_id(args[0])
+      cluster_package = find_package_by_id(args[0])
       if cluster_package.nil?
         return 1
       end
@@ -432,14 +523,6 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
 
   private
 
-  def find_package_by_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_package_by_id(val)
-    else
-      return find_package_by_name(val)
-    end
-  end
-
   def find_package_by_id(id)
     begin
       json_response = @library_cluster_packages_interface.get(id.to_i)
@@ -453,22 +536,6 @@ class Morpheus::Cli::LibraryClusterPackagesCommand
     end
   end
 
-  def find_package_by_name(name)
-    packages = @library_cluster_packages_interface.list({name: name.to_s})['clusterPackages']
-    if packages.empty?
-      print_red_alert "Cluster package not found by name #{name}"
-      return nil
-    elsif packages.size > 1
-      print_red_alert "#{packages.size} cluster packages found by name #{name}"
-      print_packages_table(packages, {color: red})
-      print_red_alert "Try using ID instead"
-      print reset,"\n"
-      return nil
-    else
-      return packages[0]
-    end
-  end
-
   def print_packages_table(packages, opts={})
     columns = [
       {"ID" => lambda {|package| package['id'] } },

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

@@ -1505,7 +1505,8 @@ EOT
     # this should be fixed on the api side, so it automatically extracts this input from the config
     begin
       instance_type_code = nil
-      catalog_item_type = find_by_id(:catalog_item_type, catalog_item_type_id.to_i)
+      catalog_item_type = record
+      #catalog_item_type = find_by_id(:catalog_item_type, catalog_item_type_id.to_i)
       if catalog_item_type
         if catalog_item_type['type'] == 'instance'
           if catalog_item_type['config'] && catalog_item_type['config']['type']

data/lib/morpheus/cli/option_types.rb

@@ -76,7 +76,8 @@ module Morpheus
             option_type['type'] = 'multiText'
           end
           # swap types to multiSelect when flag is set..
-          if option_type["config"] && ["true","on"].include?(option_type["config"]["multiSelect"].to_s)
+          config_multi_select = option_type["config"] && ["true","on"].include?(option_type["config"]["multiSelect"].to_s)
+          if config_multi_select
             if option_type["type"] == "typeahead"
               option_type["type"] = "multiTypeahead"
             elsif option_type["type"] == "select"
@@ -175,10 +176,9 @@ module Morpheus
                 }
               end
 
+              depends_on_field_key = depends_on_code
               if depends_on_option_type
                 depends_on_field_key = depends_on_option_type['fieldContext'].nil? || depends_on_option_type['fieldContext'].empty? ? "#{depends_on_option_type['fieldName']}" : "#{depends_on_option_type['fieldContext']}.#{depends_on_option_type['fieldName']}"
-              else
-                depends_on_field_key = depends_on_code
               end
 
               field_value = get_object_value(results, depends_on_field_key) ||
@@ -198,6 +198,53 @@ module Morpheus
             next if !found_dep_value
           end
 
+          # respect optionType.requireOnCode
+          require_option_check_value = option_type['requireOnCode']
+          if !require_option_check_value.to_s.empty?
+            # require_on_code = check_require_on_code(option_type, option_types, options)
+
+            match_type = 'any'
+
+            if require_option_check_value.include?('::')
+              match_type = 'all' if require_option_check_value.start_with?('matchAll')
+              require_option_check_value = require_option_check_value[require_option_check_value.index('::') + 2..-1]
+            end
+
+            found_dep_value = match_type == 'all' ? true : false
+            require_option_check_value.sub(',', ' ').split(' ').each do |value|
+              parts = value.split(':')
+              depends_on_code = parts[0]
+              depends_on_value = parts.count > 1 ? parts[1].to_s.strip : nil
+              depends_on_option_type = option_types.find {|it| it["code"] == depends_on_code }
+              if !depends_on_option_type
+                depends_on_option_type = option_types.find {|it|
+                  (it['fieldContext'] ? "#{it['fieldContext']}.#{it['fieldName']}" : it['fieldName']) == depends_on_code
+                }
+              end
+
+              depends_on_field_key = depends_on_code
+              if depends_on_option_type
+                depends_on_field_key = depends_on_option_type['fieldContext'].nil? || depends_on_option_type['fieldContext'].empty? ? "#{depends_on_option_type['fieldName']}" : "#{depends_on_option_type['fieldContext']}.#{depends_on_option_type['fieldName']}"
+              end
+
+              field_value = get_object_value(results, depends_on_field_key) ||
+                            get_object_value(options, depends_on_field_key) ||
+                            get_object_value(api_params, depends_on_field_key)
+
+              if field_value.nil? && !options['_object_key'].nil?
+                field_value = get_object_value({options['_object_key'] => results}, depends_on_field_key)
+              end
+
+              if !field_value.nil? && (depends_on_value.nil? || depends_on_value.empty? || field_value.to_s.match?(depends_on_value))
+                found_dep_value = true if match_type != 'all'
+              else
+                found_dep_value = false if match_type == 'all'
+              end
+            end
+             
+            option_type = option_type.merge({'required' => found_dep_value})
+          end
+
           # build parameters for option source api request
           option_params = (option_type['noParams'] ? {} : (api_params || {}).deep_merge(results))
           option_params.merge!(option_type['optionParams']) if option_type['optionParams']
@@ -316,6 +363,23 @@ module Morpheus
                   value = typeahead_prompt(option_type, api_client, option_params, true)
                   value_found = !!value
                 end
+                if option_type['type'] == 'hidden'
+                  if option_type['optionSource'].nil?
+                    value = option_type['defaultValue']
+                  else
+                    select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, option_params)
+                    config_multi_select = option_type["config"] && ["true","on"].include?(option_type["config"]["multiSelect"].to_s)
+                    if config_multi_select
+                      value = select_options.collect { |it| it['value'] }
+                    elsif select_options.is_a?(Array)
+                      value = select_options[0] ? select_options[0]['value'] : nil
+                    elsif select_options.is_a?(Hash)
+                      value = select_options['value']
+                    else
+                      value = select_options
+                    end
+                  end
+                end
                 if !value_found && !ignore_empty
                   if option_type['required']
                     print Term::ANSIColor.red, "\nMissing Required Option\n\n", Term::ANSIColor.reset
@@ -384,7 +448,17 @@ module Morpheus
               if option_type['optionSource'].nil?
                 value = option_type['defaultValue']
               else
-                value = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, api_params || {})
+                select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, option_params)
+                config_multi_select = option_type["config"] && ["true","on"].include?(option_type["config"]["multiSelect"].to_s)
+                if config_multi_select
+                  value = select_options.collect { |it| it['value'] }
+                elsif select_options.is_a?(Array)
+                  value = select_options[0] ? select_options[0]['value'] : nil
+                elsif select_options.is_a?(Hash)
+                  value = select_options['value']
+                else
+                  value = select_options
+                end
               end
             elsif option_type['type'] == 'file'
               value = file_prompt(option_type)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "6.3.1"
+    VERSION = "6.3.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 6.3.3
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-14 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler