morpheus-cli 4.2.10 → 4.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306e4f72ea1678c854091571261b455432291cb6b2d724ccfdca97f704c89329
-  data.tar.gz: 43a8b4a1e73a40a65c9d8e732f7f370145c539db165b63a620385768d3ed3b0a
+  metadata.gz: c05a0d047f94e91857345c03ab934d64eef1b23620acf24b38057eba3d92cbcb
+  data.tar.gz: 17a33813d17587e8686ef3ad1cbec018ef1e18049be40184aa76573d60eba469
 SHA512:
-  metadata.gz: d314342d0bb820cd1c787c7aa9f9738f1cd2febeae2942c2be8001d428857f266a4b2be0cab29c8020233e100c2caccc07bdd544f09a93c3e1514d016beff1cc
-  data.tar.gz: c487245071a039afa9ae99e1ba7d50a1ebf241a4a6e67a91cc8af7ffdbf44db930ebe7242fd26af477939a0605a7808ab7c972d02da40c5424cbc122c8d9f1d1
+  metadata.gz: 8450675f6ce45f28e42b3919ac5e6c65f210fde6deb14671a78eef72b0b7d6f0d0d008a108fc0af56a45af3e4485788bd6d91697ab544e868974df73d9ea4c54
+  data.tar.gz: b0f5a5f626de331115ca8863b8e60305ec66ba34bfd6762697778f084bf7553618e37613e755c4ddc8cea425d8241faece71bbcf6a2a9483b94a7b1c0712c495

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 4.2.10
+RUN gem install morpheus-cli -v 4.2.11
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/cli/ping.rb

@@ -83,7 +83,7 @@ EOT
       rescue RestClient::Exception => e
         # api_exception = e
         # fallback to older /api/setup/check, which is also public and looks just about the same
-        if e.response.code == 404
+        if e.response && (e.response.code == 404 || e.response.code == 401)
           start_time = Time.now
           begin
             json_response = @setup_interface.check(params)

data/lib/morpheus/cli/remote.rb

@@ -366,18 +366,11 @@ EOT
     end
 
     # setup fresh appliance?
-    if appliance[:status] == 'fresh' # || appliance[:setup_needed] == true
-      if !appliance[:active]
-        if ::Morpheus::Cli::OptionTypes::confirm("Would you like to switch to using this remote now?", options.merge({default: true}))
-          use([appliance[:name]])
-          appliance[:active] = true # just in case, could reload instead with load_active_remote()
-        end
-      end
-
+    if appliance[:status] == 'fresh'
       print cyan
       puts "It looks like this appliance needs to be setup. Starting setup ..."
-      return setup([new_appliance_name])
-      # no need to login, setup() handles that
+      #return setup([new_appliance_name] + [Morpheus::Logging.debug? ? ["--debug"] : []])
+      return Morpheus::Cli::Setup.new.handle(["-r", new_appliance_name] + (Morpheus::Logging.debug? ? ["--debug"] : []))
     end
 
     # only login if you are using this remote
@@ -1211,7 +1204,7 @@ EOT
   
   # This moved to the SetupCommand
   def setup(args)
-    print_error yellow,"[DEPRECATED] The command `remote setup [name]` is deprecated. It has been replaced by `setup init`.",reset,"\n"
+    print_error yellow,"[DEPRECATED] The command `remote setup` is deprecated. It has been replaced by `setup`.",reset,"\n"
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage()
@@ -1230,7 +1223,7 @@ and it may only be executed successfully one time.
 EOT
     end
     optparse.parse!(args)
-    verify_args!(args:args, max:1, optparse:optparse)
+    verify_args!(args:args, optparse:optparse, max:1)
     # just invoke the setup command.
     # for this to work, the argument [remote] must be the first argument.
     cmd_args = []
@@ -1240,7 +1233,7 @@ EOT
       # cmd_args = cmd_args + ["-r",remote_name, args]
       cmd_args = args + ["-r",remote_name, args]
     end
-    return Morpheus::Cli::Setup.new.init(cmd_args)
+    return Morpheus::Cli::Setup.new.handle(cmd_args)
   end
 
   def load_remote_by_name(appliance_name, allow_current=true)

data/lib/morpheus/cli/setup.rb

@@ -60,15 +60,20 @@ EOT
     else
       payload.deep_merge!(parse_passed_options(options))
 
+      # JD: This should just do a Remote.check_appliance() first... needs to work with --remote-url though.
       # @setup_interface = Morpheus::SetupInterface.new({url:@appliance_url,access_token:@access_token})
       appliance_status_json = nil
       begin
         appliance_status_json = @setup_interface.get()
+      rescue RestClient::SSLCertificateNotVerified => e
+        @remote_appliance[:status] = 'ssl-error'
+        @remote_appliance[:last_check] ||= {}
+        @remote_appliance[:last_check][:error] = e.message
       rescue RestClient::Exception => e
         # pre 4.2.1 api would return HTTP 400 here, but with setupNeeded=false
         # so fallback to the old /api/setup/check
         # this could be in the interface itself..
-        if e.response.code == 400
+        if e.response && (e.response.code == 400 || e.response.code == 404 || e.response.code == 401)
           Morpheus::Logging::DarkPrinter.puts "HTTP 400 from /api/setup, falling back to older /api/setup/check" if Morpheus::Logging.debug?
           begin
             appliance_status_json = @setup_interface.check()
@@ -81,20 +86,33 @@ EOT
             end
           end
         end
+        if appliance_status_json.nil?
+          @remote_appliance[:status] = 'http-error'
+          @remote_appliance[:last_check] ||= {}
+          @remote_appliance[:last_check][:error] = e.message
+        end
       end
 
       # my_terminal.execute("setup needed?")
       # theres a bug here with --remote-url :status == "unknown"
       # but hey, we got json back, so set status to "ready"
+      if appliance_status_json && appliance_status_json['setupNeeded'] == false
+        @remote_appliance[:status] == 'ready'
+      end
       remote_status_string = format_appliance_status(@remote_appliance, cyan)
       if appliance_status_json && appliance_status_json['setupNeeded'] == true
         # ok, setupNeeded
         # print_error cyan,"Setup is needed, status is #{remote_status_string}",reset,"\n"
       else
+        if @remote_appliance[:status] == 'ssl-error'
+          print_error cyan,"Setup unavailable, status is #{remote_status_string}","\n"
+          print_error "Try passing the --insecure option.",reset,"\n"
+          return 1, "setup unavailable"
+        end
         if options[:force] != true
           print_error cyan,"Setup unavailable, status is #{remote_status_string}",reset,"\n"
           #print_error red, "#{appliance_status_json['msg']}\n", reset
-          return 1, "already setup"
+          return 1, "setup unavailable"
         end
       end
 
@@ -133,7 +151,7 @@ EOT
         puts "This is done to retrieve and install the license key for your appliance."
         puts "You have several options for how to proceed:"
         hub_action_dropdown.each_with_index do |hub_action, idx|
-          puts "#{idx+1}. #{hub_action['name']} [#{hub_action['value']}]"
+          puts "* #{hub_action['name']} [#{hub_action['value']}]"
         end
         print "\n", reset
 

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.10"
+    VERSION = "4.2.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.10
+  version: 4.2.11
 platform: ruby
 authors:
 - David Estes