morpheus-cli 6.2.1 → 6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ede124df9259964d52e159be3a4097dd21987e35a20423ef81c63efb65be54d
-  data.tar.gz: 270fb5f083ecb5b7643aef13bb2b37e5e3ee02fd706ded8c394635376bbda14b
+  metadata.gz: 5a11e083645c99cce105a6ee0a38ba60904debd213c3223f07e84a335a755b6a
+  data.tar.gz: 318bbfa3ecfa0b2533e29de1a8b773389cac8c7e36c4b75b71316bc1b860aef8
 SHA512:
-  metadata.gz: 86475908b6b602bcb9185e1e4a3c554f7fdb581e010e6e7e49e075124eb24d087bde16d90cb07b8dd8cb944da9d1f7de34f9d3d4252c9859811c4e9acd51eb7c
-  data.tar.gz: e1c6ed1cb7a06ec481687e516582131348a3f4292c618ebbe1a81c3b422e17d49f8ca85e65283d027e1516dd28c2ac35820691b90435a3933474c0ac44308c74
+  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
+RUN gem install morpheus-cli -v 6.2.2
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/service_catalog_interface.rb

@@ -46,22 +46,22 @@ class Morpheus::ServiceCatalogInterface < Morpheus::APIClient
   end
 
   # update cart (set cart name)
-  def update_cart(payload, params={})
+  def update_cart(params, payload)
     execute(method: :put, url: "#{base_path}/cart", params: params, payload: payload.to_json)
   end
 
   # validate a new item, can be used before before adding it
-  def validate_cart_item(payload, params={})
+  def validate_cart_item(params, payload)
     execute(method: :post, url: "#{base_path}/cart/items/validate", params: params, payload: payload.to_json)
   end
 
   # add item to cart
-  def create_cart_item(payload, params={})
+  def create_cart_item(params, payload)
     execute(method: :post, url: "#{base_path}/cart/items", params: params, payload: payload.to_json)
   end
 
   # update item in the cart
-  def update_cart_item(id, payload, params={})
+  def update_cart_item(id, params, payload)
     validate_id!(id)
     execute(method: :put, url: "#{base_path}/cart/items/#{id}", params: params, payload: payload.to_json)
   end
@@ -73,7 +73,7 @@ class Morpheus::ServiceCatalogInterface < Morpheus::APIClient
   end
 
   # place order with cart
-  def checkout(payload, params={})
+  def checkout(params, payload)
     execute(method: :post, url: "#{base_path}/checkout", params: params, payload: payload.to_json)
   end
 
@@ -83,7 +83,7 @@ class Morpheus::ServiceCatalogInterface < Morpheus::APIClient
   end
 
   # create an order from scratch, without using a cart
-  def create_order(payload, params={})
+  def create_order(params, payload)
     execute(method: :post, url: "#{base_path}/orders", params: params, payload: payload.to_json)
   end
 end

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/service_catalog_command.rb

@@ -871,7 +871,7 @@ EOT
     
     @service_catalog_interface.setopts(options)
     if options[:dry_run]
-      print_dry_run @service_catalog_interface.dry.checkout(payload)
+      print_dry_run @service_catalog_interface.dry.checkout(params, payload)
       return
     end
 
@@ -889,7 +889,7 @@ EOT
     unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to checkout and place an order?")
       return 9, "aborted command"
     end
-    json_response = @service_catalog_interface.checkout(payload, params)
+    json_response = @service_catalog_interface.checkout(params, payload)
     render_response(json_response, options) do
       print_green_success "Order placed"
       # ok so this is delayed because list does not return all statuses right now..

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"
+    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
+  version: 6.2.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler