rhc 0.93.19 → 0.94.8

data/bin/rhc

@@ -37,53 +37,63 @@ def get_args
   args
 end
 
+def run_setup_wizard_if_needed
+  default_setup_wizard unless ARGV.include?('--noprompt')
+end
 
-wizard_run = default_setup_wizard unless ARGV.include?('--noprompt') or ARGV.include?('--help') or ARGV.include?('-h')
+begin
+  case ARGV[0]
+  when "domain"
+    run_setup_wizard_if_needed
+    system("rhc-domain #{get_args} 2>&1")
+    retcode = $?.exitstatus
+  when "app"
+    run_setup_wizard_if_needed
+    system("rhc-app #{get_args} 2>&1")
+    retcode = $?.exitstatus
+  when "sshkey"
+    run_setup_wizard_if_needed
+    system("rhc-sshkey #{get_args} 2>&1")
+    retcode = $?.exitstatus
+  when "port-forward"
+    run_setup_wizard_if_needed
+    system("rhc-port-forward #{get_args} 2>&1")
+    retcode = $?.exitstatus
+  when "server"
+    run_setup_wizard_if_needed
+    begin
+      require 'rhc/cli'
+      RHC::CLI.start(ARGV)
+      retcode = 0
+    rescue SystemExit => e
+      retcode = e.status
+    end
+  when "setup"
+    if ARGV.include?('--help') or ARGV.include?('-h') or ARGV.include?('help')
+      puts "Usage: rhc setup"
+      puts "Runs the setup wizard to configure your account"
+      exit 0
+    end
 
-case ARGV[0]
-when "domain"
-  system("rhc-domain #{get_args} 2>&1")
-  retcode = $?.exitstatus
-when "app"
-  system("rhc-app #{get_args} 2>&1")
-  retcode = $?.exitstatus
-when "sshkey"
-  system("rhc-sshkey #{get_args} 2>&1")
-  retcode = $?.exitstatus
-when "port-forward"
-  system("rhc-port-forward #{get_args} 2>&1")
-  retcode = $?.exitstatus
-when "server"
-  begin
-    require 'rhc/cli'
-    RHC::CLI.start(ARGV)
+    w = RHC::RerunWizard.new(RHC::Config.local_config_path) 
+    success = w.run
     retcode = 0
-  rescue SystemExit => e
-    retcode = e.status
-  end
-when "setup"
-  if ARGV.include?('--help') or ARGV.include?('-h')
-    puts "Usage: rhc setup"
-    puts "Runs the setup wizard to configure your account"
-    exit 0
+    retcode = 1 unless success
+  when "-h", "--help", "help", nil
+    p_usage 0
+  else
+    puts "Invalid rhc command: #{ARGV[0]}"
+    p_usage
   end
-  exit 0 if wizard_run
-  w = RHC::RerunWizard.new(RHC::Config.local_config_path) 
-  success = w.run
-  retcode = 0
-  retcode = 1 unless success
-when "-h", "--help", "help", nil
-  p_usage 0
-else
-  puts "Invalid rhc command: #{ARGV[0]}"
-  p_usage
-end
 
-if retcode == nil
-  retcode = 1
+  if retcode == nil
+    retcode = 1
 
-  # return codes for uncaught signals are 128 + the signal code
-  retcode = 128 + $?.termsig if $?.signaled? and !$?.termsig.nil?
-end
+    # return codes for uncaught signals are 128 + the signal code
+    retcode = 128 + $?.termsig if $?.signaled? and !$?.termsig.nil?
+  end
 
-exit retcode
+  exit retcode
+rescue Interrupt
+  exit 128 + 2 #INT
+end

data/bin/rhc-app

@@ -17,10 +17,10 @@ Usage: rhc app (<command> | cartridge <cartridge-action> | --help) [<args>]
 Create and manage an OpenShift application.
 
 List of commands
-  create                         Bind a registered rhcloud user to a domain in rhcloud.
+  create                         Create a new application on OpenShift
   show                           Display information about a user
-  start                          Starts the application (includes embedded)
-  stop                           Stops the application (includes embedded)
+  start                          Starts the application (includes all cartridges)
+  stop                           Stops the application (includes all cartridges)
   force-stop                     Stops all application processes
   restart                        Restart the application
   reload                         Reloads application configuration
@@ -32,17 +32,17 @@ List of commands
   threaddump                     Trigger a thread dump for jbossas, jbosseap, and ruby applications
   tail                           Tail the logs of an application
   snapshot       [save|restore]  Saves/Restores an application snapshot to/from a tarball at the location specified using --filepath (default: ./$APPNAME.tar.gz)
-  cartridge      <action>        Manage an embedded cartridge
+  cartridge      <action>        Manage a cartridge runningin this application
 
 List of cartridge actions
   list                           List of supported embedded cartridges
-  add                            Add an embedded application
-  remove                         Remove an embedded application
-  stop                           Stop the embedded application
-  start                          Start the embedded application
-  restart                        Restart the embedded application
-  status                         Returns embedded application status
-  reload                         Reloads embedded application configuration
+  add                            Add a cartridge to this application
+  remove                         Remove a cartridge from this application
+  stop                           Stop a cartridge
+  start                          Start a cartridge
+  restart                        Restart a cartridge
+  status                         Returns cartridge status
+  reload                         Reloads cartridge configuration
 
 List of arguments
   -l|--rhlogin      rhlogin      Red Hat login (RHN or OpenShift login) (#{rhlogin})
@@ -63,7 +63,7 @@ List of arguments
   --alias           alias        Specify server alias (when using add/remove-alias)
   --config          path         Path of alternate config file
   --timeout         #            Timeout, in seconds, for the session
-  --enable-jenkins  [name]       Indicates to create a Jenkins application (if not already available) and embed the Jenkins client into this application.  The default name will be 'jenkins' if not specified. Note that --no-dns is ignored for the creation of the Jenkins application.
+  --enable-jenkins  [name]       Enables builds for your application with Jenkins.  You may optionally specify the name of the Jenkins application that is created (default: 'jenkins').  Note that --no-dns is ignored for the creation of the Jenkins application.
 USAGE
 exit exit_code
 end
@@ -180,7 +180,7 @@ currently being created: '#{$opt['app']}'
     puts "
     Found a bug? Post to the forum and we'll get right on it.
         IRC: #openshift on freenode
-        Forums: https://www.redhat.com/openshift/forums
+        Forums: https://openshift.redhat.com/community/forums/openshift
     
     "
   end
@@ -365,7 +365,10 @@ def show_embedded_list
     type_keys = RHC::get_cartridge_listing(nil, ', ', libra_server, RHC::Config.default_proxy, 'embedded', false)
     puts type_keys
     puts ""
-    exit 255
+
+    # we should always get something back unless there was an error
+    exit 255 if type_keys.length == 0
+    exit 0
 end
 
 def save_or_restore_snapshot(command)

data/bin/rhc-chk

@@ -105,7 +105,7 @@ end
 $debuginfo = {
   'environment' => {
     'Ruby Version' => RUBY_VERSION,
-    "host_alias" => Config::CONFIG['host_alias']
+    "host_alias" => (Object.const_get(defined?(RbConfig) ? :RbConfig : :Config))::CONFIG['host_alias'],
   },
   'options' => {
     "Command Line" => $opt,
@@ -197,10 +197,11 @@ def error_for(name,*args)
   if name.kind_of? String
     name = name.downcase.to_sym
   end
-  message = sprintf(get_message(:errors,name),*args)
+
+  message = sprintf(get_message(:errors,name),*(args.shift || ''))
   solution = get_message(:solutions,name)
   if solution
-    message << "\n" << sprintf(solution,*args)
+    message << "\n" << sprintf(solution,*(args.shift || ''))
   end
   message
 end
@@ -213,6 +214,43 @@ def get_message(type,name)
   val
 end
 
+# This test tries to make sure we have the keys unlocked before testing 
+#   to ensure nicer workflow
+class Test0_SSH_Keys_Unlocked < Test::Unit::TestCase
+  include TestBase
+  
+  def test_ssh_quick
+    begin
+      # Get user info from OpenShift
+      data = {'rhlogin' => $rhlogin}
+      response = fetch_url_json("/broker/userinfo", data)
+      resp_json = RHC::json_decode(response.body)
+      user_info = RHC::json_decode(resp_json['data'].to_s)
+
+      # Get any keys Net::SSH thinks we'll need
+      $ssh = Net::SSH
+      needed_keys = 
+      user_info['app_info'].map do |name,opts|
+        host = "%s-%s.%s" % [
+          name,
+          user_info['user_info']['namespace'],
+          user_info['user_info']['rhc_domain']
+        ]
+        $ssh.configuration_for(host)[:keys].map{|f| File.expand_path(f)}
+      end.compact.flatten
+
+      agent_keys = Net::SSH::Authentication::Agent.connect.identities.map{|x| x.comment }
+      missing_keys = needed_keys - agent_keys
+
+      unless missing_keys.empty?
+        $stderr.puts "\n  NOTE: These tests may require you to unlock one or more of your SSH keys \n\n"
+      end
+    rescue
+    end
+  end
+
+end
+
 class Test1_Connectivity < Test::Unit::TestCase
   include TestBase
   def teardown
@@ -265,8 +303,6 @@ end
 #
 class Test3_SSH < Test::Unit::TestCase
 
-  @@local_derived_ssh_pubkey = nil
-  @@local_ssh_pubkey = nil
 
   include TestBase
 
@@ -277,64 +313,94 @@ class Test3_SSH < Test::Unit::TestCase
     end
   end
 
-  def test_01_ssh_private_key
-    $remote_ssh_pubkeys = []
-    check_permissions(@libra_kfile, /[4-7]00/) # Needs to at least be readable by user and nobody else
-
-    # Derive the public key from the private key
-    key_dump = RHC::Vendor::SSHKey.new(File.read(@libra_kfile)).ssh_public_key
-    @@local_derived_ssh_pubkey = key_dump.to_s.strip.split(' ')[1]
+  def require_login(test)
+    flunk(error_for(:no_account,test)) if $user_info.nil?
+  end
 
-    assert_not_nil @@local_derived_ssh_pubkey, error_for(:no_derive)
-    assert_not_nil $user_info, error_for(:no_account) 
+  def require_remote_keys(test)
+    require_login(test)
+    @@remote_pub_keys ||= (
 
     ssh_keys = RHC::get_ssh_keys($libra_server, $rhlogin, $password, $http)
     my_keys = [ssh_keys['ssh_key'], ssh_keys['keys'].values.map{|k| k['key']}].flatten
     my_keys.delete_if{|x| x.length == 0 }
-    $remote_ssh_pubkeys = my_keys unless my_keys.nil?
-
-    # Ensure that the user has ssh keys
-    assert(!$remote_ssh_pubkeys.empty?, error_for(:no_remote_pub_keys ) )
-    assert $remote_ssh_pubkeys.include?(@@local_derived_ssh_pubkey), error_for(:no_match_pub, @libra_kfile)
+      my_keys
+    )
+    flunk(error_for(:no_remote_pub_keys,test)) if @@remote_pub_keys.nil?
   end
 
-  def test_02_ssh_public_key
-    check_permissions(@libra_kpfile, /.../) # Any permissions are OK
+  def require_agent_keys(fatal = true)
+    @@agent_keys ||= (
+      begin
+        Net::SSH::Authentication::Agent.connect.identities
+      rescue
+        nil
+      end
+    )
+    flunk(error_for(:no_keys_loaded)) if (fatal && @@agent_keys.nil?)
+  end
 
-    # Store the public key
-    fp = File.open(@libra_kpfile)
-    @@local_ssh_pubkey = fp.gets.split(' ')[1]
+  def agent_key_names
+    @@agent_keys.map{|x| File.expand_path(x.comment) }
+  end
 
-    assert_not_nil @@local_ssh_pubkey, error_for(:no_pubkey, 'the remote key')
+  def agent_key_fingerprints
+    @@agent_keys.map{|x| x.to_s.split("\n")[1..-2].join('') }
+  end
 
-    # Test public key and remote key
-    assert_not_nil $user_info, error_for(:no_account) 
-    assert $remote_ssh_pubkeys.include?(@@local_ssh_pubkey), error_for(:no_match_pub, @libra_kfile)
+  def libra_public_key
+    @@local_ssh_pubkey ||= (
+    fp = File.open(@libra_kpfile)
+      fp.gets.split(' ')[1]
+    )
   ensure
     fp.close if fp
   end
 
-  def test_06_ssh_agent
-    loaded_keys = `ssh-add -L`
-    loaded_keys = loaded_keys.send(loaded_keys.respond_to?(:lines) ? :lines : :to_s).to_a
-    # Make sure we can load keys from ssh-agent
-    assert !loaded_keys.empty?, error_for(:no_keys_loaded)
-    loaded_keys.map!{|key| key.split(' ')[1]}
+  def test_01_local_files
+    [
+      [@libra_kfile, /[4-7]00/], # Needs to at least be readable by user and nobody else
+      [@libra_kpfile, /.../], # Any permissions are OK
+    ].each do |args|
+      continue_test{check_permissions(*args)}
+    end
+  end
+
+  def test_02_ssh_agent
+    require_agent_keys
 
-    assert_not_nil @@local_ssh_pubkey, error_for(:no_pubkey, 'the keys in ssh-agent')
-    assert loaded_keys.include?(@@local_ssh_pubkey),error_for(:pubkey_not_loaded)
+    assert agent_key_names.include?(File.expand_path(@libra_kfile)) ,error_for(:pubkey_not_loaded, ": #{@libra_kpfile}")
   end
 
-  def test_07_ssh_connect
-    assert_not_nil $user_info, error_for(:no_account)
-    host_template = "%s@%s-%s.%s"
+  def test_03_remote_ssh_keys
+    require_remote_keys("whether you have a valid key loaded in your agent")
+    require_agent_keys(false)
+
+    assert !(@@remote_pub_keys & [agent_key_fingerprints,libra_public_key].flatten).empty? ,error_for(:pubkey_not_loaded," ")
+  end
+
+  def test_04_ssh_connect
+    require_login("connecting to your applications")
+
+    host_template = "%%s-%s.%s" % [
+      $user_info['user_info']['domains'][0]['namespace'],
+      $user_info['user_info']['rhc_domain']
+    ]
     $user_info['app_info'].each do |k,v|
       uuid = v['uuid']
-      host = sprintf("%s-%s",k,$user_info['user_info']['domains'][0]['namespace'])
-      domain = $user_info['user_info']['rhc_domain']
-      ssh_command = sprintf("ssh %s@%s.%s true &> /dev/null", uuid, host, domain)
-      system(ssh_command)
-      continue_test{ assert_equal $?, 0, error_for(:cant_ssh, host) }
+      hostname = host_template % k
+      timeout = 10
+      begin
+        @ssh = Net::SSH.start(hostname,uuid,{:timeout => timeout})
+      rescue Timeout::Error
+        if timeout < 30
+          timeout += 10
+          retry
+        end
+      ensure
+        continue_test{ assert_not_nil @ssh, error_for(:cant_ssh, hostname) }
+        @ssh.close if @ssh
+      end
     end
   end
 
@@ -346,7 +412,7 @@ class Test3_SSH < Test::Unit::TestCase
 
     perms = sprintf('%o',File.stat(file).mode)[-3..-1]
 
-    assert_match permission, perms, error_for(:bad_permissions,file,perms,permission.source)
+    assert_match permission, perms, error_for(:bad_permissions,[file,perms],permission.source)
   end
 end
 
@@ -460,7 +526,7 @@ $messages = YAML.load <<-EOF
 :errors:
   :no_derive: "We were unable to derive your public SSH key and compare it to the remote"
   :no_connectivity: "Cannot connect to server, therefore most tests will not work"
-  :no_account: You must have an account on the server in order to test SSH key matches
+  :no_account: "You must have an account on the server in order to test: %s"
   :cant_connect: You need to be able to connect to the server in order to test authentication
   :no_match_pub: "Local %s does not match remote pub key, SSH auth will not work"
   :_404: "The user %s does not have an account on this server"
@@ -470,9 +536,9 @@ $messages = YAML.load <<-EOF
   :_other_http: "There was an error communicating with the server: %s"
   :bad_permissions: "File %s has incorrect permissions %s"
   :no_keys_loaded: Either ssh-agent is not running or you do not have any keys loaded 
-  :pubkey_not_loaded: Your public key is not loaded into a running ssh-agent
+  :pubkey_not_loaded: "Your public key is not loaded into a running ssh-agent%s"
   :cant_ssh: "Cannot SSH into your app: %s"
-  :no_remote_pub_keys: "It appears you do not have any public ssh keys."
+  :no_remote_pub_keys: "You do not have any public keys associated with your OpenShift account. Cannot test: %s"
 :solutions:
   :no_connectivity: "Ensure that you are able to connect to %s"
   :no_match_pub: "Perhaps you should regenerate your public key, or run 'rhc sshkey add' to add your new key"
@@ -480,4 +546,6 @@ $messages = YAML.load <<-EOF
   :_401: "Please ensure you used the correct password"
   :bad_permissions: "Permissions should match %s"
   :no_remote_pub_keys: "You should try to add your ssh-key by running 'rhc sshkey add'"
+  :pubkey_not_loaded: If this is your only error, your connection may still work, depending on your SSH configuration
+  :no_keys_loaded: If this is your only error, your connection may still work, depending on your SSH configuration
 EOF

data/bin/rhc-create-app

@@ -179,7 +179,7 @@ if @mydebug
   puts "
   Found a bug? Post to the forum and we'll get right on it.
       IRC: #openshift on freenode
-      Forums: https://www.redhat.com/openshift/forums
+      Forums: https://openshift.redhat.com/community/forums/openshift
   
   "
 end

data/bin/rhc-create-domain

@@ -91,19 +91,6 @@ if !password
   password = RHC::get_password
 end
 
-#
-# Add a new namespace to configs
-#
-def add_rhlogin_config(rhlogin, uuid)
-    f = open(File.expand_path(config_path), 'a')
-    unless config.get_value('default_rhlogin')
-        f.puts("# Default rhlogin to use if none is specified")
-        f.puts("default_rhlogin=#{rhlogin}")
-        f.puts("")
-    end
-    f.close
-end
-
 #
 # Check to see if a ssh_key_file_path exists, if not create it.
 #
@@ -143,8 +130,6 @@ if response.code == '200'
     begin
         json_resp = RHC::json_decode(response.body)
         RHC::print_response_success(json_resp)
-        json_rhlogininfo = RHC::json_decode(json_resp['data'])
-        add_rhlogin_config(json_rhlogininfo['rhlogin'], json_rhlogininfo['uuid'])
         if opt['alter'] != ''
             puts <<EOF
 Creation successful