morpheus-cli 6.2.3 → 6.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5930c4f23cd2074b678db885c77f067ca32b305371cb93875a372b22a91fd18
-  data.tar.gz: 036f912c60e1f86ba302dc240cc1a485722ef0716752d934a352e54d797fd5d4
+  metadata.gz: 8acef874a37276edc6d53f64e243ca01c0e0d30e49dea166502058da2f01350d
+  data.tar.gz: f0f9022abbb5b04c526cf992c95cacee2927ce5fb2e27027b19dc624abe454be
 SHA512:
-  metadata.gz: c93378cfb509b11873be3d183f69bc5662fd5afb6888ea759271347e84f87443a73c9eb80a12572b1c196f1afe8ebf40068d00290053ebad398df5ee320d8446
-  data.tar.gz: 1c277dd0ff9b918b3c2dfd9fc7bc0c4ed662e59ba3fa10a4abf3d037ffc08211e0f0c7a040917ca1322dbc06610391f676560ec195ddd794ff50d2098658235b
+  metadata.gz: ab4f224e431ff217ea24591b385d76f1a6370626770e8eb9f8ae8291c6d6681e3a29c58c6c220fea85510819da0df901e3816e37f4937ad2b04c4322a5eae0b2
+  data.tar.gz: 27976146b5f086f41968860c7eb210fdbc7cf8ac6667b55e1318e88f9fae938c33699b05a14a1cdba91bfcde0635b01113bc61c3c1e21ade5e2a7bea719cee66

data/Dockerfile

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

data/README.md

@@ -55,7 +55,7 @@ New CLI commands get added under the library directory: `lib/morpheus/cli/comman
 While developing, you can quickly reload your code changes in a morpheus shell while developing:
 
 ```shell
-morpheus shell
+bundle exec morpheus shell —debug
 ```
 
 Then to reload changes without restarting the morpheus shell (and the ruby process), use:
@@ -66,6 +66,9 @@ reload
 
 Don't forget to add unit tests for your new commands under the directory: `test/`.
 
+
+
+
 ## Testing
 
 To run the CLI unit tests, first create a `test_config.yaml` and then run `rake test`.

data/lib/morpheus/api/api_client.rb

@@ -600,6 +600,10 @@ class Morpheus::APIClient
     Morpheus::OptionTypeListsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def option_type_forms
+    Morpheus::OptionTypeFormsInterface.new(common_interface_options).setopts(@options)
+  end
+
   def scale_thresholds
     Morpheus::ScaleThresholdsInterface.new(common_interface_options).setopts(@options)
   end
@@ -766,6 +770,10 @@ class Morpheus::APIClient
     Morpheus::LibraryClusterLayoutsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def library_cluster_packages
+    Morpheus::LibraryClusterPackagesInterface.new(common_interface_options).setopts(@options)
+  end
+
   def library_spec_templates
     Morpheus::LibrarySpecTemplatesInterface.new(common_interface_options).setopts(@options)
   end

data/lib/morpheus/api/library_cluster_packages_interface.rb

@@ -0,0 +1,41 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::LibraryClusterPackagesInterface < Morpheus::APIClient
+
+  def list(params={})
+    url = "#{@base_url}/api/library/cluster-packages"
+    params['sort'] = 'name'
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def get(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/library/cluster-packages/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create(payload)
+    url = "#{@base_url}/api/library/cluster-packages"
+    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/library/cluster-packages/#{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, payload={})
+    url = "#{@base_url}/api/library/cluster-packages/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+end

data/lib/morpheus/api/option_type_forms_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::OptionTypeFormsInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/library/option-type-forms"
+  end
+
+end

data/lib/morpheus/cli/cli_command.rb

@@ -268,7 +268,6 @@ module Morpheus
         build_standard_post_options(opts, options, includes, excludes)
       end
 
-      # todo: this can go away once every command is using execute_api()
       def build_standard_add_many_options(opts, options, includes=[], excludes=[])
         build_standard_post_options(opts, options, includes + [:payloads], excludes)
       end
@@ -1579,6 +1578,9 @@ module Morpheus
           # could use parse_passed_options() here to support exclusion of certain options
           #passed_options = parse_passed_options(options, options[:apply_options] || {})
           passed_options = options[:options].reject {|k,v| k.is_a?(Symbol)}
+          if options[:apply_options_exclude]
+            passed_options = options[:options].reject {|k,v| options[:skip_apply_options].include?(k.to_s) || options[:skip_apply_options].include?(k.to_sym) }
+          end
           if object_key
             payload.deep_merge!({object_key => passed_options})
           else

data/lib/morpheus/cli/cli_registry.rb

@@ -95,12 +95,10 @@ module Morpheus
             suggestions = find_command_suggestions(command_name)
             if suggestions && suggestions.size == 1
               msg += "\nThe most similar command is:\n"
-              suggestions.first(5).each do |suggestion|
-                msg += "\t" + suggestion + "\n"
-              end
+              msg += "\t" + suggestions.first + "\n"
             elsif suggestions && suggestions.size > 1
               msg += "\nThe most similar commands are:\n"
-              suggestions.first(5).each do |suggestion|
+              suggestions.first(50).each do |suggestion|
                 msg += "\t" + suggestion + "\n"
               end
             end

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

@@ -283,7 +283,7 @@ EOT
     return 1 if backup.nil?
     parse_options(options, params)
     confirm!("Are you sure you want to delete the backup #{backup['name']}?", options)
-    execute_api(@backups_interface, :destroy, [backup['id']], options, 'backup') do |json_response|
+    execute_api(@backups_interface, :destroy, [backup['id']], options) do |json_response|
       print_green_success "Removed backup #{backup['name']}"
     end
   end

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

@@ -1,16 +1,15 @@
 require 'morpheus/cli/cli_command'
 
-# CLI command self service
-# UI is Tools: Self Service - Catalog
-# API is /catalog-item-types and returns catalogItemTypes
+# CLI command Catalog Item Types
+# UI is Library > Blueprints > Catalog Items
+# API is /api/catalog-item-types and returns catalogItemTypes
 class Morpheus::Cli::CatalogItemTypesCommand
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::LibraryHelper
   include Morpheus::Cli::OptionSourceHelper
 
-  # set_command_name :'catalog-types'
-  set_command_name :'self-service'
-  set_command_description "Self Service: View and manage catalog item types"
+  set_command_name :'catalog-item-types'
+  set_command_description "View and manage catalog item types"
 
   register_subcommands :list, :get, :add, :update, :remove
   register_subcommands({:'update-logo' => :update_logo, :'update-dark-logo' => :update_dark_logo})
@@ -152,13 +151,28 @@ EOT
       print_h1 "Catalog Item Type Details", [], options
       print cyan
       show_columns = catalog_item_type_column_definitions
+      show_columns.delete("Form") unless catalog_item_type['form']
       show_columns.delete("Blueprint") unless catalog_item_type['blueprint']
       show_columns.delete("Workflow") unless catalog_item_type['workflow']
       show_columns.delete("Context") unless catalog_item_type['context'] # workflow context
       print_description_list(show_columns, catalog_item_type)
 
+      option_type_form = catalog_item_type['form']
+      if option_type_form
+        print_h2 "Form Inputs"
+        form_inputs = (option_type_form['options'] || [])
+        if option_type_form['fieldGroups']
+          option_type_form['fieldGroups'].each { |field_group| form_inputs += (field_group['options'] || []) }
+        end
+        # print format_simple_option_types_table(form_inputs, options)
+        print format_option_types_table(form_inputs, options, 'config.customOptions')
+        print reset,"\n"
+      else
+        # print cyan,"No form inputs found for this catalog item.","\n",reset
+      end
+
       if catalog_item_type['optionTypes'] && catalog_item_type['optionTypes'].size > 0
-        print_h2 "Option Types"
+        print_h2 "Inputs"
         opt_columns = [
           {"ID" => lambda {|it| it['id'] } },
           {"NAME" => lambda {|it| it['name'] } },
@@ -313,7 +327,13 @@ EOT
           options[:options]['config'] = params['config'] # or file_content
         end
       end
-      opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
+      opts.on('--form-type form|optionTypes', String, "Form Type determines if input comes from a Form or list of Option Types") do |val|
+        params['formType'] = val
+      end
+      opts.on('--form FORM', String, "Form Name or ID") do |val|
+        params['form'] = val
+      end
+      opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |val|
         if list.nil?
           params['optionTypes'] = []
         else
@@ -379,11 +399,24 @@ EOT
       # massage association params a bit
       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)
-      prompt_results = prompt_for_option_types(params, options, @api_client)
-      if prompt_results[:success]
-        params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
+      if params['formType'].to_s.empty?
+        params['formType'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'formType', 'fieldLabel' => 'Form Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Form', 'value' => 'form'}, {'name' => 'Inputs', 'value' => 'optionTypes'}], 'defaultValue' => 'optionTypes', 'required' => true}], options[:options], @api_client, options[:params])['formType']
+      end
+      if params['formType'] == 'form'
+        # using formType = 'form'
+        # prompt for Form
+        options[:options]['form'] = params['form'] if params['form']
+        form_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'form', 'fieldLabel' => 'Form', 'type' => 'select', 'optionSource' => 'forms', 'required' => true}], options[:options], @api_client, options[:params])['form']
+        params['form'] = {'id' => form_id}
       else
-        return 1, "failed to parse optionTypes"
+        # using formType = 'optionTypes'
+        # prompt for Option Types
+        prompt_results = prompt_for_option_types(params, options, @api_client)
+        if prompt_results[:success]
+          params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
+        else
+          return 1, "failed to parse optionTypes"
+        end
       end
       payload[catalog_item_type_object_key].deep_merge!(params)
     end
@@ -470,6 +503,12 @@ EOT
           options[:options]['config'] = params['config'] # or file_content
         end
       end
+      opts.on('--form-type form|optionTypes', String, "Form Type determines if input comes from a Form or list of Option Types") do |val|
+        params['formType'] = val
+      end
+      opts.on('--form FORM', String, "Form Name or ID") do |val|
+        params['form'] = val
+      end
       opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
         if list.nil?
           params['optionTypes'] = []
@@ -693,6 +732,7 @@ EOT
       "Workflow" => lambda {|it| it['workflow'] ? it['workflow']['name'] : nil },
       "Context" => lambda {|it| it['context'] },
       # "Content" => lambda {|it| it['content'] },
+      "Form Type" => lambda {|it| it['formType'] == 'form' ? "Form" : "Inputs" },
       "Enabled" => lambda {|it| format_boolean(it['enabled']) },
       "Featured" => lambda {|it| format_boolean(it['featured']) },
       #"Config" => lambda {|it| it['config'] },
@@ -716,6 +756,8 @@ EOT
       "Workflow" => lambda {|it| it['workflow'] ? it['workflow']['name'] : nil },
       "Context" => lambda {|it| it['context'] },
       # "Content" => lambda {|it| it['content'] },
+      "Form Type" => lambda {|it| it['formType'] == 'form' ? "Form" : "Inputs" },
+      "Form" => lambda {|it| it['form'] ? it['form']['name'] : nil }, 
       "Enabled" => lambda {|it| format_boolean(it['enabled']) },
       "Featured" => lambda {|it| format_boolean(it['featured']) },
       "Allow Quantity" => lambda {|it| format_boolean(it['allowQuantity']) },

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

@@ -175,7 +175,7 @@ EOT
         end
         # reject hardcoded optionTypes
         config_option_types = config_option_types.reject {|it| it['fieldName'] == 'name' || it['fieldName'] == 'description' || it['fieldName'] == 'domainName' }
-        config_prompt = Morpheus::Cli::OptionTypes.prompt(config_option_types, options[:options], @api_client, options[:params])
+        config_prompt = Morpheus::Cli::OptionTypes.prompt(config_option_types, options[:options], @api_client, {certType: certificate_type['id']})
         config_prompt.deep_compact!
         params.deep_merge!(config_prompt)
       end

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

@@ -730,14 +730,13 @@ class Morpheus::Cli::Clusters
         server_payload['hostname'] = options[:hostname] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => true, 'description' => 'Hostname', 'defaultValue' => resourceName}], options[:options], @api_client, api_params)['hostname']
 
         # Kube Default Repo
-        if cluster_payload['type'] == 'kubernetes-cluster' && (layout['clusterVersion'] == '1.28.x' || layout['clusterVersion'] == '1.27.x')
+        if cluster_payload['type'] == 'kubernetes-cluster'
           default_repo = options[:default_repo] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultRepoAccount', 'fieldLabel' => 'Cluster Repo Account', 'type' => 'select', 'required' => false, 'optionSource' => 'dockerHubRegistries'}], options[:options], @api_client, api_params)['defaultRepoAccount']
           if default_repo != ""
             server_payload['config']['defaultRepoAccount'] = default_repo
           end
         end
 
-
         # Workflow / Automation
         if provision_type['code'] != 'manual' && controller_type && controller_type['hasAutomation']
           task_set_id = options[:taskSetId] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSet', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], options[:options], @api_client, api_params.merge({'phase' => 'postProvision'}))['taskSet']