morpheus-cli 2.11.3 → 2.11.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d561294737f605bb14714d84f21984797f012b2
-  data.tar.gz: 857aa6f016e8f4db4cfaea280703a7f71adac83a
+  metadata.gz: 836015cb51a22a6a3da1217038e96675f6876044
+  data.tar.gz: b33d6a043d810fcd2a3bfaefaaf671eeee21cf96
 SHA512:
-  metadata.gz: 941e2fd2a2478c7af97e604f3bbea977874a585b5a4dcd0d526bce39434b4461b9859556f509054239b0fd957919f36b5606304e314f2befda86667d888aec15
-  data.tar.gz: 1fe0c7f8d07df32dd4ea2b771ef2b21106831115d3d3c0a51358e8b9c640be215a3057b12f8f3608524fb46aee02b8f6fa5eef2f60599b6653e1553df6e3cb16
+  metadata.gz: 2b9343e8835af95275215825186ad1162ffcb83288a39df86f5bdf5a21b145e4ba018f69d194b389f9a983d592e7ee5854b00ff93b3fd9c50f8d8666682c13c7
+  data.tar.gz: d8b85d7f7daece9b2e113bdf7fcad9cfeaaf0541a5a64e39cf3950a2ff503e47bfc1147be7dbad53154c5b486217d6c0792b276006a5795febb59d49d997fd50

data/lib/morpheus/cli/cli_command.rb

@@ -551,13 +551,15 @@ module Morpheus
         # this should just be an attribute of the api client
         # for now, this fixes the issue where passing --insecure or --remote
         # would then apply to all subsequent commands...
-        if options[:insecure]
-          Morpheus::RestClient.enable_ssl_verification = false
-        else
-          if appliance[:insecure] && Morpheus::RestClient.ssl_verification_enabled?
+        if !Morpheus::Cli::Shell.insecure
+          if options[:insecure]
             Morpheus::RestClient.enable_ssl_verification = false
-          elsif !appliance[:insecure] && !Morpheus::RestClient.ssl_verification_enabled?
-            Morpheus::RestClient.enable_ssl_verification = true
+          else
+            if appliance[:insecure] && Morpheus::RestClient.ssl_verification_enabled?
+              Morpheus::RestClient.enable_ssl_verification = false
+            elsif !appliance[:insecure] && !Morpheus::RestClient.ssl_verification_enabled?
+              Morpheus::RestClient.enable_ssl_verification = true
+            end
           end
         end
 

data/lib/morpheus/cli/remote.rb

@@ -1140,7 +1140,9 @@ EOT
       end
 
       # todo: this insecure flag needs to applied everywhere now tho..
-      Morpheus::RestClient.enable_ssl_verification = app_map[:insecure].to_s == 'true'
+      if app_map[:insecure]
+        Morpheus::RestClient.enable_ssl_verification = false
+      end
       # Morpheus::RestClient.enable_http = app_map[:insecure].to_s == 'true'
       setup_interface = Morpheus::SetupInterface.new(app_url)
       begin

data/lib/morpheus/cli/shell.rb

@@ -24,6 +24,10 @@ class Morpheus::Cli::Shell
     @@instance = self.new
   end
 
+  def self.insecure
+    !!(defined?(@@insecure) && @@insecure == true)
+  end
+
   attr_accessor :prompt #, :angry_prompt
 
   def initialize()
@@ -107,6 +111,7 @@ class Morpheus::Cli::Shell
         @norc = true
       end
       opts.on('-I','--insecure', "Allow for insecure HTTPS communication i.e. bad SSL certificate") do |val|
+        @@insecure = true
         Morpheus::RestClient.enable_ssl_verification = false
       end
       opts.on('-C','--nocolor', "Disable ANSI coloring") do

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "2.11.3"
+    VERSION = "2.11.3.1"
   end
 end

metadata

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