morpheus-cli 6.3.0 → 6.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02effa7bdd51120b68b2253e21f9be4df3a3388424975e21ec4add33a6ad516e
-  data.tar.gz: 55ce2d5a93cce0ac5aa77ed3d993af5daa41fd3473bddeae773e6d18ac324442
+  metadata.gz: '0190e52b071314ef69df636c03de5f81f01dabe1e8314ea96d52d6877b95f0b2'
+  data.tar.gz: '098aaf12c061b7bd684956750d14c5f6093e3b8a6dd66d558d510834af6ebcd0'
 SHA512:
-  metadata.gz: c8a17ab56472e03157c1e9d2fd2cbaf36dd98dbc4c0d06270b84dfd8b0064d93f2259206a0f6623dc2a51995cd0888ba7ea3785cbcf43936fe7998f4f54577b7
-  data.tar.gz: 3086104a09b6739bab99d963937dec66d8f1de208270aae3a7bb23374c3c848e1636e6bd7086f37dee0e259f6dc718e57b7a15213b615d37a985805fcc620f43
+  metadata.gz: '0853e9c37a2ac7f3b96d4b581c223ed0f729eaf299698415dfa821199b83269afb92fe55ee081b7d78c2bc8cea40ea98852172d6c56a4fce85bea4ac8af18e8b'
+  data.tar.gz: a5bf1ce5b619a150debf9b6558bc758208e1bd31c30fbfdbe3d3fc8d9bc1ea752294b49462e9f42dacf7e4c8a14fe9f4d191b565662fd1334a586b348a5b60e5

data/Dockerfile

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

data/README.md

@@ -54,12 +54,6 @@ 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
-```
-
-or 
-
 ```shell
 bundle exec morpheus shell —debug
 ```
@@ -72,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,60 @@
+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
+
+  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/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/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