rhc 0.84.15 → 0.85.12

data/bin/rhc-chk

@@ -44,7 +44,7 @@ def p_usage
   rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
   puts <<USAGE
 
-Usage: #{$0}
+Usage: rhc domain status
 Run a simple check on local configs and credentials to confirm tools are
 properly setup.  Often run to troubleshoot connection issues.
 
@@ -77,7 +77,7 @@ rescue Exception => e
   p_usage
 end
 
-if $opt["help"]
+if $opt["help"] || 0 != ARGV.length
   p_usage
 end
 
@@ -293,8 +293,8 @@ class Test3_SSH < Test::Unit::TestCase
 
     $remote_ssh_pubkeys = []
     additional_ssh_keys = RHC::get_ssh_keys($libra_server, $rhlogin, $password, $http)
-    if additional_ssh_keys && additional_ssh_keys.kind_of?(Hash)
-      additional_ssh_keys.each do |name, sshkey|
+    if additional_ssh_keys['keys'] && additional_ssh_keys['keys'].kind_of?(Hash)
+      additional_ssh_keys['keys'].each do |name, sshkey|
         $remote_ssh_pubkeys.push(sshkey['key'])
       end
     end
@@ -455,7 +455,7 @@ $messages = YAML.load <<-EOF
   :no_connectivity: "Cannot connect to server, therefore most tests will not work\n FIX: Ensure that you are able to connect to %s"
   :no_account: You must have an account on the server in order to test SSH key matches
   :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\n FIX: Perhaps you should regenerate your public key, or run rhc-create-domain with -a to alter the remote key"
+  :no_match_pub: "Local %s does not match remote pub key, SSH auth will not work\n FIX: Perhaps you should regenerate your public key, or run 'rhc sshkey add' to add your new key"
   :_404: "The user %s does not have an account on this server\n FIX: Please ensure that you've entered the correct username"
   :no_pubkey: We were unable to read your public SSH key to compare to %s
   :_401: "Invalid user credentials for %s\n FIX: Please ensure you used the correct password"

data/bin/rhc-create-app

@@ -83,7 +83,7 @@ check_cpath(opt)
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
-if opt["help"]
+if opt["help"] || 0 != ARGV.length
     p_usage
 end
 

data/bin/rhc-create-domain

@@ -27,7 +27,7 @@ require 'rhc-common'
 # print help
 #
 def p_usage
-
+    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
     puts <<USAGE
 
 Usage: #{$0}
@@ -37,14 +37,14 @@ Bind a registered rhcloud user to a domain in rhcloud.
         <id_rsa>.pub keys, then re-run with --alter
 
   -n|--namespace   namespace   Namespace for your application(s) (alphanumeric - max #{RHC::DEFAULT_MAX_LENGTH} chars) (required)
-  -l|--rhlogin     rhlogin     Red Hat login (RHN or OpenShift login with OpenShift Express access) (required)
+  -l|--rhlogin     rhlogin     Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
   -p|--password    password    RHLogin password (optional, will prompt)
   -a|--alter                   Alter namespace (will change urls) and/or ssh key
   -d|--debug                   Print Debug info
   -h|--help                    Show Usage info
   --config  path               Path of alternate config file
   --timeout #                  Timeout, in seconds, for connection
-
+  
 USAGE
 exit 255
 end
@@ -76,7 +76,7 @@ check_cpath(opt)
 # Pull in configs from files
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
-
+opt['rhlogin'] = get_var('default_rhlogin') unless opt['rhlogin']
 
 ssh_key_file_path = get_kfile(false)
 ssh_pub_key_file_path = get_kpfile(ssh_key_file_path, opt['alter'])
@@ -84,7 +84,7 @@ ssh_pub_key_file_path = get_kpfile(ssh_key_file_path, opt['alter'])
 ssh_config = "#{ENV['HOME']}/.ssh/config"
 ssh_config_d = "#{ENV['HOME']}/.ssh/"
 
-if opt["help"]
+if opt["help"] || 0 != ARGV.length
     p_usage
 end
 
@@ -282,7 +282,7 @@ EOF
                       dns_success = false
                   end
               end
-              puts "You can use rhc-user-info to view any url changes.  Be sure to update any links"
+              puts "You can use rhc-domain-info to view any url changes.  Be sure to update any links"
               puts "including the url in your local git config: <local_git_repo>/.git/config"
             end
             if dns_success

data/bin/rhc-ctl-app

@@ -96,7 +96,7 @@ ssh_config_d = "#{ENV['HOME']}/.ssh/"
 if opt["embedded-list"]
     p_embedded_list
 end
-if opt["help"]
+if opt["help"] || 0 != ARGV.length
     p_usage
 end
 

data/bin/rhc-ctl-domain

@@ -27,15 +27,15 @@ require 'rhc-common'
 # print help
 #
 def p_usage
-
+  rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
   puts <<USAGE
 
 Usage: #{$0}
 Manage multiple keys for the registered rhcloud user.
 
-  rhc-ctl-domain -l <rhlogin> [-p <passwd>] (-a <key-name> [-k <ssh-pubkey>] | -r <key-name> | -u <key-name> [-k <ssh-pubkey>])
+  rhc-ctl-domain [-l rhlogin] [-p password] [-d] [-h] [-n namespace] (-a key-name [-k ssh-pubkey] | -u key-name [-k ssh-pubkey] | -r key-name | --destroy)
 
-  -l|--rhlogin         rhlogin      Red Hat login (RHN or OpenShift login with OpenShift Express access) (required)
+  -l|--rhlogin         rhlogin      Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
   -p|--password        password     RHLogin password (optional, will prompt)
   -n|--namespace       namespace    Namespace for your application(s) (alphanumeric - max #{RHC::DEFAULT_MAX_LENGTH} chars) (required for destroying domain)
   -a|--add-ssh-key     key-name     Add SSH key to the user account (key-name is the user-specified identifier for the key)
@@ -90,7 +90,7 @@ libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 opt['rhlogin'] = get_var('default_rhlogin') unless opt['rhlogin']
 
-if opt['help']
+if opt['help'] || 0 != ARGV.length
     p_usage
 end
 

data/bin/rhc-domain

@@ -0,0 +1,348 @@
+#!/usr/bin/env ruby
+# Copyright 2011 Red Hat, Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+require 'rhc-common'
+
+#
+# print help
+#
+def p_usage
+    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
+    puts <<USAGE
+
+Usage: rhc domain (<command> | --help) [<args>]
+Manage a domain in rhcloud for a registered rhcloud user.
+
+List of commands
+  create            Bind a registered rhcloud user to a domain in rhcloud.
+  show              Display domain information and list the applications within the domain 
+  alter             Alter namespace (will change urls).
+  status            Run a simple check on local configs and credentials to confirm tools are properly setup.
+  destroy           Destroys the domain and any added ssh keys
+
+List of arguments
+  -l|--rhlogin      rhlogin      Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -p|--password     password     RHLogin password (optional, will prompt)
+  -n|--namespace    namespace    Namespace for your application(s) (alphanumeric - max #{RHC::DEFAULT_MAX_LENGTH} chars) (required for creating or destroying domain)
+  -d|--debug                     Print Debug info
+  -h|--help                      Show Usage info
+  --config          path         Path of alternate config file
+  --timeout         #            Timeout, in seconds, for connection
+
+USAGE
+exit 255
+end
+
+
+def get_args()
+  args = ""
+  $opt.each do |o, a|
+    if a.length > 0 && a.to_s.strip.length == 0; a = "'#{a}'" end
+    args += " --#{o} #{a}"
+  end
+  args
+end
+
+def validate_args(val_namespace=true, val_timeout=true)
+  # If provided a config path, check it
+  check_cpath($opt)
+  
+  # Pull in configs from files
+  $libra_server = get_var('libra_server')
+  debug = get_var('debug') == 'false' ? nil : get_var('debug')
+  
+  $opt['rhlogin'] = get_var('default_rhlogin') unless $opt['rhlogin']
+  p_usage if !RHC::check_rhlogin($opt['rhlogin'])
+  
+  p_usage if (val_namespace && !RHC::check_namespace($opt['namespace']))
+
+  debug = $opt["debug"] ? true : false
+  RHC::debug(debug)
+  
+  RHC::timeout($opt["timeout"] ? $opt["timeout"] : get_var('timeout')) if val_timeout
+  
+  $password = $opt['password'] ? $opt['password'] : RHC::get_password
+end
+
+def create_or_alter_domain(alter=false)
+  validate_args()
+  
+  ssh_key_file_path = get_kfile(false)
+  ssh_pub_key_file_path = get_kpfile(ssh_key_file_path, alter)
+  
+  ssh_config = "#{ENV['HOME']}/.ssh/config"
+  ssh_config_d = "#{ENV['HOME']}/.ssh/"
+
+  # Check to see if a ssh_key_file_path exists, if not create it.
+  if File.readable?(ssh_key_file_path)
+      puts "OpenShift Express key found at #{ssh_key_file_path}.  Reusing..."
+  else
+      puts "Generating OpenShift Express ssh key to #{ssh_key_file_path}"
+      # Use system for interaction
+      system("ssh-keygen -t rsa -f '#{ssh_key_file_path}'")
+  end
+  
+  ssh_keyfile_contents = File.open(ssh_pub_key_file_path).gets.chomp.split(' ')
+  ssh_key = ssh_keyfile_contents[1]
+  ssh_key_type = ssh_keyfile_contents[0]
+  
+  data = {'namespace' => $opt['namespace'],
+          'rhlogin' => $opt['rhlogin']}
+  
+  # send the ssh key and key type only in case of domain creation
+  # key updates will be handled by the 'rhc sshkey update' command
+  if !alter
+    data[:ssh] = ssh_key
+    data[:key_type] = ssh_key_type
+  end
+
+  if alter
+    data[:alter] = true
+    not_found_message = "A user with rhlogin '#{$opt['rhlogin']}' does not have a registered domain.  Be sure to run 'rhc domain create' first."
+    user_info = RHC::get_user_info($libra_server, $opt['rhlogin'], $password, @http, true, not_found_message)
+  end
+  if @mydebug
+    data[:debug] = true
+  end
+  RHC::print_post_data(data)
+  json_data = RHC::generate_json(data)
+  
+  url = URI.parse("https://#{$libra_server}/broker/domain")
+  response = RHC::http_post(@http, url, json_data, $password)
+  
+  if response.code == '200'
+      begin
+          json_resp = JSON.parse(response.body)
+          RHC::print_response_success(json_resp)
+          json_rhlogininfo = JSON.parse(json_resp['data'])
+          add_rhlogin_config(json_rhlogininfo['rhlogin'], json_rhlogininfo['uuid'])
+          add_ssh_config_host(json_rhlogininfo['rhc_domain'], ssh_key_file_path, ssh_config, ssh_config_d)
+      
+          if !alter
+                        puts <<EOF
+Creation successful
+
+You may now create an application.
+
+EOF
+          else
+              app_info = user_info['app_info']
+              dns_success = true
+              if !app_info.empty? && $opt['namespace'] != user_info['user_info']['namespace']
+                #
+                # Confirm that the host(s) exist in DNS
+                #
+                puts "Now your new domain name(s) are being propagated worldwide (this might take a minute)..."
+                # Allow DNS to propogate
+                sleep 15
+                app_info.each_key do |appname|
+                    fqdn = "#{appname}-#{$opt['namespace']}.#{user_info['user_info']['rhc_domain']}"
+                    
+                    # Now start checking for DNS
+                    loop = 0
+                    sleep_time = 2
+                    while loop < RHC::MAX_RETRIES && !RHC::hostexist?(fqdn)
+                        sleep sleep_time
+                        loop+=1
+                        puts "  retry # #{loop} - Waiting for DNS: #{fqdn}"
+                        sleep_time = RHC::delay(sleep_time)
+                    end
+                    
+                    if loop >= RHC::MAX_RETRIES
+                        puts "Host could not be found: #{fqdn}"
+                        dns_success = false
+                    end
+                end
+                puts "You can use 'rhc domain show' to view any url changes.  Be sure to update any links"
+                puts "including the url in your local git config: <local_git_repo>/.git/config"
+              end
+              if dns_success
+                puts "Alteration successful."
+              else
+                puts "Alteration successful but at least one of the urls is still updating in DNS."
+              end
+              puts ""
+          end
+          exit 0
+      rescue JSON::ParserError
+          RHC::print_response_err(response)
+      end
+  else
+      RHC::print_response_err(response)
+  end
+  exit 1
+end
+
+def destroy_domain()
+  validate_args(true, false)
+
+  url = URI.parse("https://#{$libra_server}/broker/domain")
+  data = {}
+  data[:rhlogin] = $opt['rhlogin']
+  data[:delete] = true
+  data[:namespace] = $opt['namespace']
+
+  RHC::print_post_data(data)
+  json_data = RHC::generate_json(data)
+  
+  response = RHC::http_post(@http, url, json_data, $password)
+  
+  if response.code == '200'
+    begin
+      json_resp = JSON.parse(response.body)
+      RHC::update_server_api_v(json_resp)
+      RHC::print_response_success(json_resp)
+      puts "Success"
+      exit 0
+    rescue JSON::ParserError
+      RHC::print_response_err(response)
+    end
+  else
+    RHC::print_response_err(response)
+  end
+  puts "Failure"
+  exit 1
+end
+
+def show_domain_info()
+  validate_args(false, true)
+  
+  user_info = RHC::get_user_info($libra_server, $opt['rhlogin'], $password, @http, true)
+  
+  puts ""
+  puts "User Info"
+  puts "========="
+  puts "Namespace: #{user_info['user_info']['namespace']}"
+  #puts "    UUID: #{user_info['user_info']['uuid']}"
+  puts "  RHLogin: #{user_info['user_info']['rhlogin']}"
+
+  puts "\n\n" 
+
+  puts "Application Info"
+  puts "================"
+  unless user_info['app_info'].empty?
+    user_info['app_info'].each do |key, val|
+        puts key
+        puts "    Framework: #{val['framework']}"
+        puts "     Creation: #{val['creation_time']}"
+        puts "         UUID: #{val['uuid']}"
+        puts "      Git URL: ssh://#{val['uuid']}@#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/~/git/#{key}.git/"
+        puts "   Public URL: http://#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/"
+        if val['aliases'] && !val['aliases'].empty?
+          puts "      Aliases: #{val['aliases'].join(', ')}"
+        end
+        puts ""
+        puts " Embedded: "
+        if val['embedded'] && !val['embedded'].empty? 
+            val['embedded'].each do |embed_key, embed_val|
+                if embed_val.has_key?('info') && !embed_val['info'].empty?
+                    puts "      #{embed_key} - #{embed_val['info']}"
+                else
+                    puts "      #{embed_key}"
+                end
+            end
+        else
+            puts "      None"
+        end
+        puts ""
+    end
+  else
+    puts "No applications found.  You can use 'rhc app create' to create new applications."
+  end
+end
+
+def check_domain_status
+  $opt['rhlogin'] = get_var('default_rhlogin') unless $opt['rhlogin']
+  p_usage if !RHC::check_rhlogin($opt['rhlogin'])
+
+  system("rhc-chk #{get_args} 2>&1")
+end
+
+
+begin
+  argv_c = ARGV.clone
+
+  if ARGV[0] =~ /^(create|alter|destroy)$/
+    ARGV.shift
+    opts = GetoptLong.new(
+        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
+        ["--help",  "-h", GetoptLong::NO_ARGUMENT],
+        ["--rhlogin", "-l", GetoptLong::REQUIRED_ARGUMENT],
+        ["--password", "-p", GetoptLong::REQUIRED_ARGUMENT],
+        ["--namespace", "-n", GetoptLong::REQUIRED_ARGUMENT],
+        ["--config", GetoptLong::REQUIRED_ARGUMENT],
+        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
+    )
+  elsif ARGV[0] =~ /^(status|show)$/
+    ARGV.shift
+    opts = GetoptLong.new(
+        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
+        ["--help",  "-h", GetoptLong::NO_ARGUMENT],
+        ["--rhlogin", "-l", GetoptLong::REQUIRED_ARGUMENT],
+        ["--password", "-p", GetoptLong::REQUIRED_ARGUMENT],
+        ["--config", GetoptLong::REQUIRED_ARGUMENT],
+        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
+    )
+  else
+    # if the user just enters "rhc domain", don't throw an error
+    # let it be handled by the "rhc domain show" command
+    if ARGV[0].to_s.strip.length == 0
+      opts = []
+    else
+      puts "Missing or invalid command!" unless ARGV[0] =~ /^(help|-h|--help)$/
+      # just exit at this point
+      # printing the usage description will be handled in the rescue
+      exit 255
+    end
+  end
+
+  $opt = {}
+  opts.each do |o, a|
+    $opt[o[2..-1]] = a.to_s
+  end
+rescue Exception => e
+  p_usage
+end
+
+p_usage if $opt["help"]
+
+case argv_c[0]
+when "create"
+  create_or_alter_domain(false)
+when "alter"
+  create_or_alter_domain(true)
+when "status"
+  check_domain_status
+when "show", nil
+  show_domain_info
+when "destroy"
+  destroy_domain
+when "-h", "--help", "help", nil
+  p_usage
+else
+  puts "Invalid command!"
+  p_usage
+end
+
+exit 0