morpheus-cli 5.0.0 → 5.0.1

data/lib/morpheus/cli/deploys.rb

@@ -4,13 +4,10 @@ require 'yaml'
 class Morpheus::Cli::Deploys
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::DeploymentsHelper
-
-  # hidden until api support is added
-  set_command_hidden
   
   set_command_name :deploys
-
-  register_subcommands :list, :get, :add, :remove, :deploy
+  set_command_description "View and manage instance deploys."
+  register_subcommands :list, :get, :add, :update, :remove, :deploy
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -70,10 +67,10 @@ EOT
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
-      build_standard_get_options(opts, options)
+      build_standard_get_options(opts, options, [:details])
       opts.footer = <<-EOT
 Get details about a specific instance deploy.
-[id] is required. This is the name or id of a deployment.
+[id] is required. This is the id of an instance deploy.
 EOT
     end
     optparse.parse!(args)
@@ -93,10 +90,18 @@ EOT
     end
     json_response = @deploy_interface.get(id, params)
     app_deploy = json_response[app_deploy_object_key]
+    deploy_config = app_deploy['config']
     render_response(json_response, options, app_deploy_object_key) do
       print_h1 "Deploy Details", [], options
       print cyan
       print_description_list(app_deploy_column_definitions, app_deploy)
+
+      if options[:details] && deploy_config && !deploy_config.empty?
+        print_h2 "Config", options
+        print cyan
+        print as_description_list(deploy_config, deploy_config.keys, options)
+      end
+
       print reset,"\n"
     end
     return 0, nil
@@ -109,9 +114,46 @@ EOT
       opts.banner = subcommand_usage("[instance] [deployment] [version] [options]")
       build_option_type_options(opts, options, add_app_deploy_option_types)
       build_option_type_options(opts, options, add_app_deploy_advanced_option_types)
+      opts.on(nil, "--stage", "Stage Only, do not run the deployment right away.") do |val|
+        params['stageOnly'] = true
+      end
+      opts.on("-c", "--config JSON", String, "Config for deployment") do |val|
+        parse_result = parse_json_or_yaml(val)
+        config_map = parse_result[:data]
+        if config_map.nil?
+          # todo: bubble up JSON.parse error message
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+        else
+          params['config'] = config_map
+          options[:options]['config'] = params['config'] # or file_content
+        end
+      end
+      opts.on('--config-file FILE', String, "Config from a local JSON or YAML file") do |val|
+        options[:config_file] = val.to_s
+        file_content = nil
+        full_filename = File.expand_path(options[:config_file])
+        if File.exists?(full_filename)
+          file_content = File.read(full_filename)
+        else
+          print_red_alert "File not found: #{full_filename}"
+          return 1
+        end
+        parse_result = parse_json_or_yaml(file_content)
+        config_map = parse_result[:data]
+        if config_map.nil?
+          # todo: bubble up JSON.parse error message
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          #raise_command_error "Failed to parse config as valid YAML or JSON."
+        else
+          params['config'] = config_map
+          options[:options]['config'] = params['config'] # or file_content
+        end
+      end
       build_standard_add_options(opts, options)
       opts.footer = <<-EOT
 Create a new instance deploy.
+This deploys a specific deployment version to a target instance.
+By default the deployment is run right away, unless the --stage option is used.
 EOT
     end
     optparse.parse!(args)
@@ -134,11 +176,110 @@ EOT
       payload[app_deploy_object_key].deep_merge!(params)
     end
     @deploy_interface.setopts(options)
+    instance_id = payload[app_deploy_object_key]['instance']
     if options[:dry_run]
-      print_dry_run @deploy_interface.dry.create(payload)
+      print_dry_run @deploy_interface.dry.create(instance_id, payload)
       return 0, nil
     end
-    json_response = @deploy_interface.create(payload)
+    # unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to deploy?")
+    #   return 9, "aborted command"
+    # end
+    json_response = @deploy_interface.create(instance_id, payload)
+    app_deploy = json_response[app_deploy_object_key]
+    render_response(json_response, options, app_deploy_object_key) do
+      if app_deploy['status'] == 'staged'
+        begin
+          print_green_success "Staged Deploy #{app_deploy['deployment']['name']} version #{app_deploy['deploymentVersion']['userVersion']} to instance #{app_deploy['instance']['name']}"
+        rescue => ex
+          print_green_success "Staged Deploy"
+        end
+      else
+        begin
+          print_green_success "Deploying #{app_deploy['deployment']['name']} version #{app_deploy['deploymentVersion']['userVersion']} to instance #{app_deploy['instance']['name']}"
+        rescue => ex
+          print_green_success "Deploying"
+        end
+      end
+      return _get(app_deploy["id"], {}, options)
+    end
+    return 0, nil
+  end
+
+  def update(args)
+    options = {}
+    params = {}
+    payload = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id] [options]")
+      opts.on("-c", "--config JSON", String, "Config for deployment") do |val|
+        parse_result = parse_json_or_yaml(val)
+        config_map = parse_result[:data]
+        if config_map.nil?
+          # todo: bubble up JSON.parse error message
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+        else
+          params['config'] = config_map
+          options[:options]['config'] = params['config'] # or file_content
+        end
+      end
+      opts.on('--config-file FILE', String, "Config from a local JSON or YAML file") do |val|
+        options[:config_file] = val.to_s
+        file_content = nil
+        full_filename = File.expand_path(options[:config_file])
+        if File.exists?(full_filename)
+          file_content = File.read(full_filename)
+        else
+          print_red_alert "File not found: #{full_filename}"
+          return 1
+        end
+        parse_result = parse_json_or_yaml(file_content)
+        config_map = parse_result[:data]
+        if config_map.nil?
+          # todo: bubble up JSON.parse error message
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          #raise_command_error "Failed to parse config as valid YAML or JSON."
+        else
+          params['config'] = config_map
+          options[:options]['config'] = params['config'] # or file_content
+        end
+      end
+      #build_option_type_options(opts, options, update_app_deploy_option_types)
+      #build_option_type_options(opts, options, update_app_deploy_advanced_option_types)
+      build_standard_update_options(opts, options)
+      opts.footer = <<-EOT
+Update an instance deploy.
+[id] is required. This is the id of an instance deploy.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    app_deploy = find_app_deploy_by_id(args[0])
+    return 1 if app_deploy.nil?
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({app_deploy_object_key => parse_passed_options(options)})
+    else
+      payload.deep_merge!({app_deploy_object_key => parse_passed_options(options)})
+      # do not prompt on update
+      #v_prompt = Morpheus::Cli::OptionTypes.no_prompt(update_app_deploy_option_types, options[:options], @api_client, options[:params])
+      #v_prompt.deep_compact!
+      #params.deep_merge!(v_prompt)
+      #advanced_config = Morpheus::Cli::OptionTypes.no_prompt(update_app_deploy_advanced_option_types, options[:options], @api_client, options[:params])
+      #advanced_config.deep_compact!
+      #params.deep_merge!(advanced_config)
+      payload.deep_merge!({app_deploy_object_key => params})
+      if payload[app_deploy_object_key].empty? # || options[:no_prompt]
+        raise_command_error "Specify at least one option to update.\n#{optparse}"
+      end
+    end
+    @deploy_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @deploy_interface.dry.update(app_deploy['id'], payload)
+      return
+    end
+    json_response = @deploy_interface.update(app_deploy['id'], payload)
     app_deploy = json_response[app_deploy_object_key]
     render_response(json_response, options, app_deploy_object_key) do
       print_green_success "Deploying..."
@@ -155,7 +296,7 @@ EOT
       build_standard_remove_options(opts, options)
       opts.footer = <<-EOT
 Delete an instance deploy.
-[id] is required. This is the name or id of a deploy.
+[id] is required. This is the id of an instance deploy.
 EOT
     end
     optparse.parse!(args)
@@ -163,6 +304,9 @@ EOT
     connect(options)
     app_deploy = find_app_deploy_by_id(args[0])
     return 1 if app_deploy.nil?
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the deploy #{app_deploy['id']}?")
+      return 9, "aborted command"
+    end
     @deploy_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @deploy_interface.dry.destroy(app_deploy['id'], params)
@@ -170,7 +314,7 @@ EOT
     end
     json_response = @deploy_interface.destroy(app_deploy['id'], params)
     render_response(json_response, options) do
-      print_green_success "Removed deploy #{app_deploy['name']}"
+      print_green_success "Removed deploy #{app_deploy['id']}"
     end
     return 0, nil
   end
@@ -181,12 +325,44 @@ EOT
     payload = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id] [options]")
-      build_option_type_options(opts, options, update_app_deploy_option_types)
-      build_option_type_options(opts, options, update_app_deploy_advanced_option_types)
-      build_standard_update_options(opts, options)
+      opts.on("-c", "--config JSON", String, "Config for deployment") do |val|
+        parse_result = parse_json_or_yaml(val)
+        config_map = parse_result[:data]
+        if config_map.nil?
+          # todo: bubble up JSON.parse error message
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+        else
+          params['config'] = config_map
+          options[:options]['config'] = params['config'] # or file_content
+        end
+      end
+      opts.on('--config-file FILE', String, "Config from a local JSON or YAML file") do |val|
+        options[:config_file] = val.to_s
+        file_content = nil
+        full_filename = File.expand_path(options[:config_file])
+        if File.exists?(full_filename)
+          file_content = File.read(full_filename)
+        else
+          print_red_alert "File not found: #{full_filename}"
+          return 1
+        end
+        parse_result = parse_json_or_yaml(file_content)
+        config_map = parse_result[:data]
+        if config_map.nil?
+          # todo: bubble up JSON.parse error message
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          #raise_command_error "Failed to parse config as valid YAML or JSON."
+        else
+          params['config'] = config_map
+          options[:options]['config'] = params['config'] # or file_content
+        end
+      end
+      #build_option_type_options(opts, options, update_app_deploy_option_types)
+      #build_option_type_options(opts, options, update_app_deploy_advanced_option_types)
+      build_standard_update_options(opts, options, [:auto_confirm])
       opts.footer = <<-EOT
-Update an instance deploy.
-[id] is required. This is the name or id of an instance deploy.
+Deploy an instance deploy.
+[id] is required. This is the id of an instance deploy.
 EOT
     end
     optparse.parse!(args)
@@ -201,23 +377,26 @@ EOT
     else
       payload.deep_merge!({app_deploy_object_key => parse_passed_options(options)})
       # do not prompt on update
-      v_prompt = Morpheus::Cli::OptionTypes.no_prompt(update_app_deploy_option_types, options[:options], @api_client, options[:params])
-      v_prompt.deep_compact!
-      params.deep_merge!(v_prompt)
-      advanced_config = Morpheus::Cli::OptionTypes.no_prompt(update_app_deploy_advanced_option_types, options[:options], @api_client, options[:params])
-      advanced_config.deep_compact!
-      params.deep_merge!(advanced_config)
+      #v_prompt = Morpheus::Cli::OptionTypes.no_prompt(update_app_deploy_option_types, options[:options], @api_client, options[:params])
+      #v_prompt.deep_compact!
+      #params.deep_merge!(v_prompt)
+      #advanced_config = Morpheus::Cli::OptionTypes.no_prompt(update_app_deploy_advanced_option_types, options[:options], @api_client, options[:params])
+      #advanced_config.deep_compact!
+      #params.deep_merge!(advanced_config)
       payload.deep_merge!({app_deploy_object_key => params})
-      if payload[app_deploy_object_key].empty? # || options[:no_prompt]
-        raise_command_error "Specify at least one option to update.\n#{optparse}"
-      end
+      # if payload[app_deploy_object_key].empty? # || options[:no_prompt]
+      #   raise_command_error "Specify at least one option to update.\n#{optparse}"
+      # end
+    end
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to deploy #{app_deploy['deployment']['name']} version #{app_deploy['deploymentVersion']['userVersion']} to instance #{app_deploy['instance']['name']}?")
+      return 9, "aborted command"
     end
     @deploy_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @deploy_interface.dry.update(app_deploy['id'], payload)
       return
     end
-    json_response = @deploy_interface.update(app_deploy['id'], payload)
+    json_response = @deploy_interface.deploy(app_deploy['id'], payload)
     app_deploy = json_response[app_deploy_object_key]
     render_response(json_response, options, app_deploy_object_key) do
       print_green_success "Deploying..."
@@ -225,6 +404,7 @@ EOT
     end
     return 0, nil
   end
+
   private
 
    ## Deploys (AppDeploy)
@@ -302,20 +482,5 @@ EOT
     }
   end
 
-  def format_app_deploy_status(status, return_color=cyan)
-    out = ""
-    s = status.to_s.downcase
-    if s == 'deployed'
-      out << "#{green}#{s.upcase}#{return_color}"
-    elsif s == 'open' || s == 'archived' || s == 'committed'
-      out << "#{cyan}#{s.upcase}#{return_color}"
-    elsif s == 'failed'
-      out << "#{red}#{s.upcase}#{return_color}"
-    else
-      out << "#{yellow}#{s.upcase}#{return_color}"
-    end
-    out
-  end
-
 end
 

data/lib/morpheus/cli/error_handler.rb

@@ -25,6 +25,13 @@ class Morpheus::Cli::ErrorHandler
     #@stderr.puts "#{dark}Handling error #{err.class} - #{err}#{reset}"
 
     case (err)
+    # when Morpheus::Cli::CommandNotFoundError
+    #   puts_angry_error err.message
+    #   @stderr.puts "Try help to see a list of available commands"
+    #   do_print_stacktrace = false
+    #   if err.exit_code
+    #     exit_code = err.exit_code
+    #   end
     when ::OptionParser::InvalidOption, ::OptionParser::AmbiguousOption, 
         ::OptionParser::MissingArgument, ::OptionParser::InvalidArgument, 
         ::OptionParser::NeedlessArgument

data/lib/morpheus/cli/forgot_password.rb

@@ -0,0 +1,133 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::ForgotPassword
+  include Morpheus::Cli::CliCommand
+  
+  set_command_name :'forgot'
+  set_command_description "Send a forgot password email and reset your password."
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @forgot_interface = @api_client.forgot
+  end
+
+  def handle(args)
+  #   handle_subcommand(args)
+  # end
+
+  # def email(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = "Usage: #{prog_name} #{command_name} [username]"
+      opts.on( '-U', '--username USERNAME', "Username of the user to be emailed." ) do |val|
+        options[:options]['username'] = val
+      end
+      opts.on("--email [USERNAME]", String, "Email only. Only send an email, skip the reset password.") do |val|
+        options[:email_only] = true
+        if !val.to_s.empty?
+          options[:options]['username'] = val
+        end
+      end
+      opts.on("--reset [TOKEN]", "Reset only. Only reset password, skip sending an email.") do |val|
+        options[:reset_only] = true
+        if !val.to_s.empty?
+          options[:options]['token'] = val
+        end
+      end
+      opts.on( '-T', '--token TOKEN', "Token, the secret token that was emailed to the user. Only reset password, skip sending an email." ) do |val|
+        options[:reset_only] = true
+        options[:options]['token'] = val
+      end
+      opts.on( '-P', '--password PASSWORD', "New Password, the new password for the user." ) do |val|
+        options[:options]['password'] = val
+      end
+
+      build_standard_post_options(opts, options, [], [:remote_username,:remote_password,:remote_token])
+      opts.footer = <<-EOT
+Send a forgot password email and reset your password.
+[username] is required. This is the username to be notified.
+By default this command prompts to perform two actions. 
+First it sends a forgot password email to the specified user.
+Then it attempts to reset the password with the secret token and a new password.
+Use the --email and --token options to only perform one of these actions, instead of prompting to do both.
+That is, only send the email or only reset the password.
+
+EOT
+    end
+    optparse.parse!(args)
+    connect(options)
+    verify_args!(args:args, optparse:optparse, max:1)
+
+    if options[:email_only] && options[:options]['token']
+      raise_command_error "Invalid usage. --email cannot be used with --token or --reset, use one or the other", args, optparse
+    end
+
+    if args[0]
+      options[:options]['username'] = args[0]
+    end
+    
+    params.merge!(parse_query_options(options))
+
+    # Step 1. Send Forgot Password Email
+    if options[:reset_only] != true
+      print_h1 "Forgot Password", [], options unless options[:quiet] || options[:json] || options[:yaml]
+      payload = {}
+      payload['username'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'username', 'fieldLabel' => 'Username', 'type' => 'text', 'description' => "Enter the username of your Morpheus User.", 'required' => true, :fmt => :natural}], options[:options],@api_client)['username']
+      @forgot_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @forgot_interface.dry.send_email(payload, params)
+        return
+      end
+      json_response = @forgot_interface.send_email(payload, params)
+      if options[:email_only]
+        render_response(json_response, options) do
+          print_green_success(json_response["msg"] || "Email has been sent") unless options[:quiet]
+        end
+        return 0, nil
+      else
+        print_green_success(json_response["msg"] || "Email has been sent") unless options[:quiet]
+      end
+    end
+
+    # Step 2. Reset Password
+    print_h1 "Reset Password", [], options unless options[:quiet] || options[:json] || options[:yaml]
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!(parse_passed_options(options))
+    else
+      payload.deep_merge!(parse_passed_options(options))
+      # prompt for Token
+      payload['token'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'token', 'fieldLabel' => 'Token', 'type' => 'text', 'description' => "Enter the token that you obtained from the forgot password email.", 'required' => true, :fmt => :natural}], options[:options],@api_client)['token']
+      # New Password
+      # todo: prompt_password_with_confirmation()
+      password_value = options[:options]['password']
+      confirm_password_value = password_value
+      while password_value.to_s.empty?
+        password_value = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'password', 'fieldLabel' => 'New Password', 'type' => 'password', 'description' => "Enter your new password.", 'required' => true, :fmt => :natural}], options[:options],@api_client)['password']
+        confirm_password_value = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'password', 'fieldLabel' => 'Confirm New Password', 'type' => 'password', 'description' => "Enter your new password again to confirm it is what you intend.", 'required' => true, :fmt => :natural}], options[:options],@api_client)['password']
+        if password_value != confirm_password_value
+          print_red_alert("Passwords did not match. Please try again.")
+          password_value = nil
+        end
+      end
+      payload['password'] = password_value
+    end
+    
+    @forgot_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @forgot_interface.dry.reset_password(payload, params)
+      return
+    end
+    json_response = @forgot_interface.reset_password(payload, params)
+    render_response(json_response, options) do
+      print_green_success(json_response["msg"] || "Password has been updated") unless options[:quiet]
+    end
+    return 0, nil
+  end
+
+  protected
+
+end
+