morpheus-cli 3.6.23 → 3.6.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcffe77543f6b4ac8d31742aacfa12c021c49fa79140ec9d21447b5a86a4ef21
-  data.tar.gz: db086e085556d680a02a862333e886e5dfc88c72066197325aca4f2f43fde60a
+  metadata.gz: 4d79e052f4783588f17ce7a97a26b04c974fd5ed06c43177fcececad2c9c58b1
+  data.tar.gz: 0440f108209b955081e05ec0512296910bd4c364afded4cc816100d6ac4867a0
 SHA512:
-  metadata.gz: a6ac7fcd0f8c88e28f51a2d19d9a3b4f20d8ecc2b4f70ccab4dfa4b4337aaa35e93f3a41fa067299fc47f65483edeb574ff08cf4b2af3f6b523fffedf15b7f0c
-  data.tar.gz: 33cb4330e4edcedbb950f057e9f25cf80c3b52cf592e12ee38e07ae2746b34a82dc8e389e7eb2a585913994c5b345a52fd1923308d2d6ff363232e63e7828bb9
+  metadata.gz: 2968f363d3ead95dcd556f47e2769ab7f32d33056eef9e61ace8abd91c9c46e41d8e59274160f3e5885935a7110c401a7634069e8de8aeac041928007fe797f2
+  data.tar.gz: aa78c0182612ab3b894b7c8f93805b8e4f029a5bda249bdfeaa9f09f6b12f36393b05be455053e60e67eb3b540b5ef5b4d28d0695c6143516fba8787749e1b3d

data/lib/morpheus/cli/commands/standard/curl_command.rb

@@ -20,7 +20,9 @@ class Morpheus::Cli::CurlCommand
       opts.on( '-p', '--pretty', "Print result as parsed JSON." ) do
         options[:pretty] = true
       end
-      build_common_options(opts, options, [:remote])
+      build_common_options(opts, options, [:dry_run, :remote])
+      opts.add_hidden_option('--curl')
+      #opts.add_hidden_option('--scrub')
       opts.footer = <<-EOT
 This invokes the `curl` command with url "appliance_url/api/$0
 and includes the authorization header -H "Authorization: Bearer access_token"
@@ -50,7 +52,7 @@ EOT
     # curry --insecure to curl
     if options[:insecure] || !Morpheus::RestClient.ssl_verification_enabled?
       #curl_args.unshift "-k"
-      curl_args.unshift "--inescure"
+      curl_args.unshift "--insecure"
     end
 
     if !@appliance_url
@@ -78,8 +80,17 @@ EOT
     end
     
     # Morpheus::Logging::DarkPrinter.puts "#{curl_cmd}" if Morpheus::Logging.debug?
+    curl_cmd_str = options[:scrub] ? Morpheus::Logging.scrub_message(curl_cmd) : curl_cmd
+
+    if options[:dry_run]
+      print cyan
+      print "#{cyan}#{curl_cmd_str}#{reset}"
+      print "\n\n"
+      print reset
+      return 0
+    end
     print cyan
-    print "#{cyan}#{curl_cmd}#{reset}"
+    print "#{cyan}#{curl_cmd_str}#{reset}"
     print "\n\n"
     print reset
     # print result

data/lib/morpheus/cli/instances.rb

@@ -1075,6 +1075,7 @@ class Morpheus::Cli::Instances
   end
 
   def _list_containers(arg, options)
+    params = {}
     begin
       instance = find_instance_by_name_or_id(arg)
       return 1 if instance.nil?
@@ -1083,7 +1084,7 @@ class Morpheus::Cli::Instances
         print_dry_run @instances_interface.dry.containers(instance['id'], params)
         return
       end
-      json_response = @instances_interface.containers(instance['id'])
+      json_response = @instances_interface.containers(instance['id'], params)
       if options[:json]
         puts as_json(json_response, options, "containers")
         return 0

data/lib/morpheus/cli/mixins/print_helper.rb

@@ -167,7 +167,7 @@ module Morpheus::Cli::PrintHelper
       print "\n"
       puts "#{cyan}#{bold}#{dark}CURL COMMAND#{reset}\n"
       print format_curl_command(http_method, url, headers, payload, options)
-      print "\n",reset
+      print "\n"
       return
     end
 

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.23"
+    VERSION = "3.6.24"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.23
+  version: 3.6.24
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler