rhc 0.74.6 → 0.75.9

data/bin/rhc-chk

@@ -0,0 +1,207 @@
+#!/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'
+require 'net/http'
+require 'net/https'
+require 'rbconfig'
+
+
+#
+# print help
+#
+def p_usage
+    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
+    puts <<USAGE
+
+Usage: #{$0}
+Run a simple check on local configs and credentials to confirm tools are
+properly setup.  Often run to troubleshoot connection issues.
+
+  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -p|--password  password   Red Hat password (for RHN or OpenShift)
+  -d|--debug                Print Debug info
+  -h|--help                 Show Usage info
+
+USAGE
+exit 255
+end
+
+begin
+    opts = GetoptLong.new(
+        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
+        ["--help",  "-h", GetoptLong::NO_ARGUMENT],
+        ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
+        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT]
+    )
+    opt = {}
+    opts.each do |o, a|
+        opt[o[2..-1]] = a.to_s
+    end
+rescue Exception => e
+  #puts e.message
+    p_usage
+end
+
+# Pull in configs from files
+@libra_server = get_var('libra_server')
+@debug = get_var('debug') == 'false' ? nil : get_var('debug')
+
+libra_kfile = "#{ENV['HOME']}/.ssh/libra_id_rsa"
+libra_kpfile = "#{ENV['HOME']}/.ssh/libra_id_rsa.pub"
+
+if opt["help"]
+    p_usage
+end
+
+if opt["debug"]
+    @debug = true
+end
+
+opt["rhlogin"] = get_var('default_rhlogin') unless opt["rhlogin"]
+if !RHC::check_rhlogin(opt['rhlogin'])
+    p_usage
+end
+@rhlogin = opt["rhlogin"]
+
+@password = opt['password']
+if !@password
+  @password = RHC::get_password
+end
+
+#
+# Generic Info
+#
+puts "Ruby Version: #{RUBY_VERSION}"
+puts "host_alias: #{Config::CONFIG['host_alias']}"
+
+#
+# Check for proxy environment
+#
+if ENV['http_proxy']
+  host, port = ENV['http_proxy'].split(':')
+  @http = Net::HTTP::Proxy(host, port)
+  puts "Proxy being used: #{host}:#{port}"
+else
+  @http = Net::HTTP
+  puts "Proxy being used: none"
+end
+
+def test_url_json(uri, data)
+    json_data = RHC::generate_json(data)
+    url = URI.parse("https://#{@libra_server}#{uri}")
+    puts "  Contacting URL: https://#{@libra_server}#{uri}" if @debug
+    puts "  json_data: #{json_data}" if @debug
+    req = @http::Post.new(url.path)
+    req.set_form_data({'json_data' => json_data, 'password' => @password})
+    http = @http.new(url.host, url.port)
+    http.open_timeout = 10
+    if url.scheme == "https"
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+    begin
+        response = http.start {|http| http.request(req)}
+        puts "  Raw Response: #{response.body}" if @debug
+    rescue Exception => e
+        puts "  ERROR: #{e.message}"
+        return nil
+    end
+    return response
+end
+
+#
+# Checking Connectivity / cart list
+#
+puts
+puts "TEST1: Confirming connection to OpenShift"
+data = {'cart_type' => 'standalone'}
+
+response = test_url_json("/broker/cartlist", data)
+if response
+    puts "  Code: #{response.code}"
+    puts "  Message: #{response.message}"
+    resp_json = JSON.parse(response.body)
+    puts "  Cart Info: #{resp_json["data"]}"
+end
+
+
+#
+# Checking Authentication
+#
+
+puts
+puts "TEST2: Authentication (RHN account) / user info"
+data = {'rhlogin' => @rhlogin}
+
+response = test_url_json("/broker/userinfo", data)
+if response
+    puts "  Code: #{response.code}"
+    puts "  Message: #{response.message}"
+    body = JSON.parse(response.body)
+    @user_info = JSON.parse(body['data'].to_s)
+    puts "  rhlogin: #{@user_info["user_info"]["rhlogin"]}"
+    puts "  namespace: #{@user_info["user_info"]["namespace"]}"
+end
+
+#
+# Checking ssh key
+#
+puts
+puts "TEST3: SSH Key check"
+remote_ssh_pubkey = @user_info["user_info"]["ssh_key"]
+if File.exists?("#{ENV['HOME']}/.ssh/libra_id_rsa")
+    puts "  OK: ~/.ssh/libra_id_rsa - Found"
+    key_dump = `ssh-keygen -f ~/.ssh/libra_id_rsa -y`
+    local_derived_ssh_pubkey = key_dump.to_s.strip.split(' ')[1]
+else
+    puts "  ERROR: ~/.ssh/libra_id_rsa - Not Found!"
+end
+
+if File.exists?("#{ENV['HOME']}/.ssh/libra_id_rsa.pub")
+    puts "  OK: ~/.ssh/libra_id_rsa.pub Found"
+    fp = File.open("#{ENV['HOME']}/.ssh/libra_id_rsa.pub")
+    local_ssh_pubkey = fp.gets.split(' ')[1]
+    fp.close
+else
+    puts "  WARNING: ~/.ssh/libra_id_rsa.pub Not Found! (non fatal error)"
+end
+
+if local_ssh_pubkey.to_s.strip == remote_ssh_pubkey.to_s.strip
+    puts "  OK: Remote and ~/.ssh/libra_id_rsa.pub - match"
+else
+    puts "  WARNING: Remote and ~/.ssh/libra_id_rsa key do not match.  (have you changed machines or ssh keys?)"
+end
+
+if local_derived_ssh_pubkey.to_s.strip == remote_ssh_pubkey.to_s.strip
+    puts "  OK: local ~/.ssh/libra_id_rsa should auth with openshift"
+else
+    puts "  WARNING: local ~/.ssh/libra_id_rsa DOES NOT match remote pub key, ssh auth cannot continue"
+    puts "      FIX: Perhaps you should regenerate your public key, or run rhc-create-domain with -a to alter the remote key"
+end
+
+puts "remote_ssh_pubkey: #{remote_ssh_pubkey}" if @debug
+puts "local_ssh_pubkey: #{local_ssh_pubkey}" if @debug
+puts "local_derived_ssh_pubkey: #{local_derived_ssh_pubkey}" if @debug
+
+exit 0

data/bin/rhc-create-app

@@ -145,10 +145,15 @@ end
 #
 unless File.exists?("#{ssh_config_d}/libra_id_rsa")
     puts
-    puts "Could not find #{ssh_config_d}/libra_id_rsa, cannot continue"
-    puts "This file was created by rhc-create-domain.  If it does not exist you may need to create"
-    puts "a new one."
-    puts
+    puts "Could not find #{ssh_config_d}/libra_id_rsa.  Unable to continue."
+    puts "Your SSH keys are created either by running ssh-keygen (password optional)"
+    puts "or by having the rhc-create-domain command do it for you.  If you created"
+    puts "them on your own (or want to use an existing keypair), be sure to paste"
+    puts "your public key into the dashboard page at http://www.openshift.com."
+    puts "The client tools expect libra_id_rsa[.pub] so in the event that you are"
+    puts "using existing keys, you can symlink libra_id_rsa -> id_rsa and"
+    puts "libra_id_rsa.pub -> id_rsa.pub"
+    puts "Also, make sure you never give out your secret key!"
     exit 212
 end
 
@@ -166,7 +171,7 @@ data = {:cartridge => opt['type'],
 if debug
   data['debug'] = "true"
 end
-json_data = JSON.generate(data)
+json_data = RHC::generate_json(data)
 
 puts "Contacting https://#{libra_server}"
 
@@ -188,7 +193,7 @@ end
 #
 at_exit do
     unless $!.nil? || $!.is_a?(SystemExit) && $!.success?
-        json_data = JSON.generate(
+        json_data = RHC::generate_json(
                    {:cartridge => opt['type'],
                     :action => 'deconfigure',
                     :app_name => opt['app'],
@@ -272,7 +277,7 @@ File.chmod(0600, ssh_config)
 #
 # Confirm that the host exists in DNS
 #
-puts "Now your new domain name is being populated worldwide (this might take a minute)..."
+puts "Now your new domain name is being propagated worldwide (this might take a minute)..."
 
 # Allow DNS to propogate
 sleep 15
@@ -287,13 +292,9 @@ while loop < RHC::Maxretries && !RHC::hostexist?(fqdn)
     sleep_time = RHC::delay(sleep_time)
 end
 
-if loop >= RHC::Maxretries
-    puts "Host could not be created and/or found..."
-    exit 215
-end
-
 sleep_time = 2
 attempt = 0
+
 #
 # Pull new repo locally
 #
@@ -305,15 +306,52 @@ app_uuid = user_info['app_info'][app_name]['uuid']
 
 git_url = "ssh://#{app_uuid}@#{app_name}-#{namespace}.#{rhc_domain}/~/git/#{app_name}.git/"
 
+# If the hostname couldn't be resolved, print out the git URL
+# and exit cleanly.  This will help solve issues where DNS times
+# out in APAC, etc on resolution.
+if loop >= RHC::Maxretries
+    puts <<WARNING
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+WARNING: We weren't able to lookup your hostname (#{fqdn}) 
+in a reasonable amount of time.  This can happen periodically and will just
+take an extra minute or two to propagate depending on where you are in the
+world.  Once you are able to access your application in a browser, you can then
+clone your git repository.
+
+  Application URL: http://#{fqdn}
+
+  Git Repository URL: #{git_url}
+
+  Git Clone command: 
+    git clone #{git_url} #{opt['repo']}
+
+If you can't get your application running in the browser, you can also try
+destroying and recreating the application as well using:
+
+  rhc-ctl-app -c destroy -a #{opt['app']} -l #{opt["rhlogin"]}
+
+If this doesn't work for you, let us know in the forums or in IRC and we'll
+make sure to get you up and running.
+
+  Forums: https://www.redhat.com/openshift/forums/express
+
+  IRC: #openshift (on Freenode)
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+WARNING
+    exit 0
+end
+
 unless opt['nogit']
     puts "Pulling new repo down"
 
     puts "git clone --quiet #{git_url} #{opt['repo']}" if debug
     quiet = (debug ? ' ' : '--quiet ')
-    git_pull = %x<git clone #{quiet} #{git_url} #{opt['repo']}>
+    git_clone = %x<git clone #{quiet} #{git_url} #{opt['repo']}>
     if $?.exitstatus != 0
-        puts "Error in git pull"
-        puts git_pull
+        puts "Error in git clone"
+        puts git_clone
         exit 216
     end
 else

data/bin/rhc-create-domain

@@ -141,7 +141,7 @@ if debug
   data['debug'] = "true"
 end
 RHC::print_post_data(data, debug)
-json_data = JSON.generate(data)
+json_data = RHC::generate_json(data)
 
 url = URI.parse("https://#{libra_server}/broker/domain")
 response = RHC::http_post(@http, url, json_data, password)
@@ -168,7 +168,7 @@ EOF
               #
               # Confirm that the host(s) exist in DNS
               #
-              puts "Now your new domain name(s) are being populated worldwide (this might take a minute)..."
+              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|

data/bin/rhc-ctl-app

@@ -173,7 +173,7 @@ if debug
   data['debug'] = "true"
 end
 
-json_data = JSON.generate(data)
+json_data = RHC::generate_json(data)
 puts "Submitting form: #{json_data}" if debug
 
 puts "Contacting https://#{libra_server}"

data/bin/rhc-snapshot

@@ -35,6 +35,7 @@ Pull down application snapshot for a user
 
   -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
   -a|--app                  Target application to snapshot (required)
+  -r|--restore              Local path of the tarball to restore (restores git and application data folders found in archive)
   -s|--save                 Local path to save tarball (default: ./$APPNAME.tar.gz)
   -p|--password  password   RHLogin password (optional, will prompt)
   -d|--debug                Print Debug info
@@ -50,6 +51,7 @@ begin
         ["--help",  "-h", GetoptLong::NO_ARGUMENT],
         ["--app",  "-a", GetoptLong::REQUIRED_ARGUMENT],
         ["--save",  "-s", GetoptLong::REQUIRED_ARGUMENT],
+        ["--restore",  "-r", GetoptLong::REQUIRED_ARGUMENT],
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
         ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT]
     )
@@ -91,7 +93,7 @@ end
 user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, debug, false)
 
 app = opt['app']
-opt['save'] = "#{opt['app']}.tar.gz" unless opt['save']
+opt['save'] = "#{opt['app']}.tar.gz" unless opt['save'] || opt['restore']
 
 unless user_info['app_info'][app]
     puts
@@ -104,18 +106,44 @@ end
 app_uuid = user_info['app_info'][app]['uuid']
 namespace = user_info['user_info']['namespace']
 rhc_domain = user_info['user_info']['rhc_domain']
-ssh_cmd = "ssh #{app_uuid}@#{app}-#{namespace}.#{rhc_domain} 'snapshot #{app}' > #{opt['save']}"
+if opt['save']
+  ssh_cmd = "ssh #{app_uuid}@#{app}-#{namespace}.#{rhc_domain} 'snapshot' > #{opt['save']}"
+  puts "Pulling down a snapshot to #{opt['save']}"
+else
+  if File.exists? opt['restore']
+    `tar -tf #{opt['restore']} './*/#{app}'`
+    if $?.exitstatus != 0
+      puts "Archive at #{opt['restore']} does not contain the target application: ./#{app}"
+      exit 255
+    else
+      `tar -tf #{opt['restore']} './*/git'`
+      include_git = $?.exitstatus == 0
+      ssh_cmd = "cat #{opt['restore']} | ssh #{app_uuid}@#{app}-#{namespace}.#{rhc_domain} 'restore#{include_git ? ' INCLUDE_GIT' : ''}'"
+      puts "Restoring from snapshot #{opt['restore']}"
+    end
+  else
+    puts "Archive not found: #{opt['restore']}"
+    exit 255
+  end
+end
+
 
-puts "Pulling down a snapshot to #{opt['save']}"
 puts 
 puts ssh_cmd if debug
-git_pull = `#{ssh_cmd}`
+output = `#{ssh_cmd}`
+puts
 if $?.exitstatus != 0
+    puts output
     puts
+if opt['save']
     puts "Error in trying to save snapshot.  You can try to save manually by running:"
+else
+    puts "Error in trying to restore snapshot.  You can try to restore manually by running:"
+end
     puts
     puts ssh_cmd
     puts
     exit 254
 end
+puts output if opt['restore'] && debug
 exit 0

data/lib/rhc-common.rb

@@ -34,13 +34,31 @@ require 'uri'
 module RHC
 
   Maxdlen = 16
-  Maxretries = 10
+  Maxretries = 7
   Defaultdelay = 2
+  API = "1.1.1"
+  broker_version = "?.?.?"
+  api_version = "?.?.?"
+
+  def self.update_server_api_v(dict)
+    if !dict['broker'].nil? && (dict['broker'] =~ /\A\d+\.\d+\.\d+\z/)
+      broker_version = dict['broker']
+    end
+    if !dict['api'].nil? && (dict['api'] =~ /\A\d+\.\d+\.\d+\z/)
+      api_version = dict['api']
+    end
+  end
 
   def self.delay(time, adj=Defaultdelay)
     (time*=adj).to_int
   end
-  
+
+  def self.generate_json(data)
+      data['api'] = API
+      json = JSON.generate(data)
+      json
+  end
+
   def self.get_cartridges_list(libra_server, net_http, cart_type="standalone", debug=true, print_result=nil)
     puts "Contacting https://#{libra_server} to obtain list of cartridges..."
     puts " (please excuse the delay)"
@@ -49,7 +67,7 @@ module RHC
       data['debug'] = "true"
     end
     print_post_data(data, debug)
-    json_data = JSON.generate(data)
+    json_data = generate_json(data)
 
     url = URI.parse("https://#{libra_server}/broker/cartlist")
     response = http_post(net_http, url, json_data, "none")
@@ -58,7 +76,12 @@ module RHC
       print_response_err(response, debug)
       return []
     end
-    json_resp = JSON.parse(response.body)
+    begin
+      json_resp = JSON.parse(response.body)
+    rescue JSON::ParserError
+      exit 254
+    end
+    update_server_api_v(json_resp)
     if print_result
       print_response_success(json_resp, debug)
     end
@@ -143,7 +166,7 @@ module RHC
       data['debug'] = "true"
     end
     print_post_data(data, debug)
-    json_data = JSON.generate(data)
+    json_data = generate_json(data)
 
     url = URI.parse("https://#{libra_server}/broker/userinfo")
     response = http_post(net_http, url, json_data, password)
@@ -164,7 +187,12 @@ module RHC
       end
       exit 254
     end
-    json_resp = JSON.parse(response.body)
+    begin
+      json_resp = JSON.parse(response.body)
+    rescue JSON::ParserError
+      exit 254
+    end
+    update_server_api_v(json_resp)
     if print_result
       print_response_success(json_resp, debug)
     end
@@ -223,15 +251,20 @@ module RHC
     end
     exit_code = 254
     if response.content_type == 'application/json'
-      json_resp = JSON.parse(response.body)
-      exit_code = print_json_body(json_resp, debug)
+      puts "JSON response:"
+      begin
+        json_resp = JSON.parse(response.body)
+        exit_code = print_json_body(json_resp, debug)
+      rescue JSON::ParserError
+        exit_code = 254
+      end
     elsif debug
       puts "HTTP response from server is #{response.body}"
     end
     exit exit_code.nil? ? 666 : exit_code
   end
-  
-  def self.print_response_messages(json_resp)    
+
+  def self.print_response_messages(json_resp)
     messages = json_resp['messages']
     if (messages && !messages.empty?)
       puts ''
@@ -271,6 +304,12 @@ module RHC
         end
       end
     end
+    if json_resp['api']
+      puts "API version:    #{json_resp['api']}"
+    end
+    if json_resp['broker']
+      puts "Broker version: #{json_resp['broker']}"
+    end
     if json_resp['result']
       puts ''
       puts 'RESULT:'
@@ -308,7 +347,7 @@ if !File.exists? local_config_path
   FileUtils.touch local_config_path
   puts ""
   puts "Created local config file: " + local_config_path
-  puts "express.conf contains user configuration and can be transferred across clients."  
+  puts "express.conf contains user configuration and can be transferred across clients."
   puts ""
 end
 
@@ -331,7 +370,7 @@ else
 end
 
 #
-# Check for local var in 
+# Check for local var in
 #   1) ~/.openshift/express.conf
 #   2) /etc/openshift/express.conf
 #   3) $GEM/../conf/express.conf

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 315
+  hash: 289
   prerelease: false
   segments: 
   - 0
-  - 74
-  - 6
-  version: 0.74.6
+  - 75
+  - 9
+  version: 0.75.9
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 -05:00
+date: 2011-08-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/rhc-common.rb
+- bin/rhc-chk
 - bin/rhc-create-domain
 - bin/rhc-tail-files
 - bin/rhc-create-app