morpheus-cli 6.2.1.1 → 6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c3a197cce2be26fa8c5920d9dcfb367edab10b100b645c02b171ce830e2eb7f
-  data.tar.gz: f8467d902d52c8238d3edeae9cf2c6a57eab41e693b76a2742230a9635aa7403
+  metadata.gz: 5a11e083645c99cce105a6ee0a38ba60904debd213c3223f07e84a335a755b6a
+  data.tar.gz: 318bbfa3ecfa0b2533e29de1a8b773389cac8c7e36c4b75b71316bc1b860aef8
 SHA512:
-  metadata.gz: 74ffa8dc07f0960f05790ae69568fbf9ae0b1afbe68bf7b8fea8dd532bd79a6cbafad4e1893c899b41fdef2c48fcb063d539f475b976ec72419279b77e312ce6
-  data.tar.gz: 7f512bfd99104a127d8e2f67976ad3f221ae9a3c35cf6dd70f7c6002f5b0fe494c961570cdb40ace71abbc3ccff2d09b3a3b582089fc83355da4d95f1fddf9d4
+  metadata.gz: 79c6bd2a41bbd7c5fc79dfecd769db385626eea40bcf1ca19d6d4021f0cc57404c8eab74bfc831013f55b0668a1cbce86b909d11b71723a9bfc1587b29beb6c4
+  data.tar.gz: 21973cfd06571448876862f243895dc2334f19f5c20355cff9224d4d1c319911776a7d60c93196b1d79e5e16c65b66b1179476b89816931b181bad7e98bbd3dc

data/Dockerfile

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

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

@@ -93,7 +93,7 @@ class Morpheus::Cli::CatalogItemTypesCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[type]")
-      opts.on( '-c', '--config', "Display raw config only. Default is YAML. Combine with -j for JSON instead." ) do
+      opts.on( '-c', '--config', "Display raw config only." ) do
         options[:show_config] = true
       end
       # opts.on('--no-config', "Do not display Config YAML." ) do
@@ -136,13 +136,17 @@ EOT
       json_response = @catalog_item_types_interface.get(id, params)
     end
     catalog_item_type = json_response[catalog_item_type_object_key]
-    config = catalog_item_type['config'] || {}
     # export just the config as json or yaml (default)
     if options[:show_config]
+      if catalog_item_type['instanceSpec']
+        puts catalog_item_type['instanceSpec']
+        # print reset
+        return 0, nil
+      end
       unless options[:json] || options[:yaml] || options[:csv]
-        options[:yaml] = true
+        options[:json] = true
       end
-      return render_with_format(config, options)
+      return render_with_format(catalog_item_type['config'] || {}, options)
     end
     render_response(json_response, options, catalog_item_type_object_key) do
       print_h1 "Catalog Item Type Details", [], options
@@ -172,11 +176,11 @@ EOT
       item_type_code = catalog_item_type['type'].to_s.downcase
       if options[:no_config] != true
         if item_type_code == 'instance'
-          print_h2 "Config YAML"
-          if config
+          print_h2 "Config JSON"
+          
             #print reset,(JSON.pretty_generate(config) rescue config),"\n",reset
             #print reset,(as_yaml(config, options) rescue config),"\n",reset
-            config_string = as_yaml(config, options) rescue config
+            config_string = catalog_item_type['instanceSpec'] || (as_json(catalog_item_type['config'], options) rescue "")
             config_lines = config_string.split("\n")
             config_line_count = config_lines.size
             max_lines = 10
@@ -191,9 +195,7 @@ EOT
               config_string = config_string[4..-1]
             end
             print reset,config_string.chomp("\n"),"\n",reset
-          else
-            print reset,"(blank)","\n",reset
-          end
+          
         elsif item_type_code == 'blueprint' || item_type_code == 'apptemplate' || item_type_code == 'app'
           print_h2 "App Spec"
           if catalog_item_type['appSpec']

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

@@ -6,7 +6,7 @@ class Morpheus::Cli::PluginsCommand
 
   set_command_name :plugins
   set_command_description "View and manage plugins."
-  register_subcommands :list, :get, :upload, :update, :remove, :'check-updates'
+  register_subcommands :list, :get, :upload, :update, :remove #, :'check-updates'
 
   # RestCommand settings
   register_interfaces :plugins

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

@@ -759,7 +759,7 @@ EOT
       end
       build_common_options(opts, options, [:quiet])
       opts.footer = <<-EOT
-Clone remote appliance configuratio, including any existing credentials.
+Clone remote appliance configuration, including any existing credentials.
 [remote] is required. This is the name of an existing remote.
 [name] is optional. This is the name of the new remote that will be created.
 EOT

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

@@ -34,7 +34,7 @@ View the remote appliance in a web browser.
 [id] is optional. This is the resource name or id to be append to the path to load details of a specific object.
 The [path] is matched against the #{prog_name} UI site map to find the best matching route.
 Route matching is skipped if the path begins with a "/" or --absolute is used.
-By default no authentication is not done and the existing web browser session used.
+By default no authentication is done and the existing web browser session used.
 The --login option will authenticate via the CLI access token and create a new browser session.
 
 Examples:

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "6.2.1.1"
+    VERSION = "6.2.2"
   end
 end

metadata

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