rhc 0.80.5 → 0.81.14

data/bin/rhc-chk

@@ -123,18 +123,36 @@ def test_url_json(uri, data)
     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
+    http.use_ssl = true
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    response = nil
     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
+    if response
+        puts "  Code: #{response.code}"
+        puts "  Message: #{response.message}"
+        if response.code == '200'
+        puts response.body
+            resp_json = JSON.parse(response.body)
+            return resp_json
+        elsif response.code == '404' && data['rhlogin']
+            puts "A user with rhlogin '#{data['rhlogin']}' does not have a registered domain."
+            exit 99
+        elsif response.code == '401'
+            puts "Invalid user credentials"
+            exit 97
+        else
+            puts "Exiting due to error!"
+            exit 1
+        end
+    else
+        puts "Unable to connect to: https://#{@libra_server}"
+        exit 1
+    end
 end
 
 #
@@ -144,32 +162,21 @@ 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
+resp_json = test_url_json("/broker/cartlist", data)
+puts "  Cart Info: #{resp_json["data"]}"
 
 
 #
 # 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
+resp_json = test_url_json("/broker/userinfo", data)
+@user_info = JSON.parse(resp_json['data'].to_s)
+puts "  rhlogin: #{@user_info["user_info"]["rhlogin"]}"
+puts "  namespace: #{@user_info["user_info"]["namespace"]}"
 
 #
 # Checking ssh key
@@ -177,7 +184,7 @@ end
 puts
 puts "TEST3: SSH Key check"
 remote_ssh_pubkey = @user_info["user_info"]["ssh_key"]
-libra_kfile = get_kfile(false)
+libra_kfile = get_kfile()
 libra_kpfile = get_kpfile(libra_kfile, false)
 
 if File.exists?(libra_kfile)

data/bin/rhc-create-app

@@ -40,8 +40,13 @@ Create an OpenShift Express app.
   -n|--nogit                 Only create remote space, don't pull it locally
   -d|--debug                 Print Debug info
   -h|--help                  Show Usage info
+  --no-dns                   Skip DNS check
   --config  path             Path of alternate config file
   --timeout #                Timeout, in seconds, for connection
+  --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.
 
 USAGE
 exit 255
@@ -51,6 +56,7 @@ begin
     opts = GetoptLong.new(
         ["--debug", "-d", GetoptLong::NO_ARGUMENT],
         ["--help",  "-h", GetoptLong::NO_ARGUMENT],
+        ["--no-dns", GetoptLong::NO_ARGUMENT],
         ["--nogit", "-n", GetoptLong::NO_ARGUMENT],
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
         ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
@@ -58,7 +64,8 @@ begin
         ["--repo",  "-r", GetoptLong::REQUIRED_ARGUMENT],
         ["--config", GetoptLong::REQUIRED_ARGUMENT],
         ["--type",  "-t", GetoptLong::REQUIRED_ARGUMENT],
-        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
+        ["--timeout", GetoptLong::REQUIRED_ARGUMENT],
+        ["--enable-jenkins", GetoptLong::OPTIONAL_ARGUMENT]
     )
     opt = {}
     opts.each do |o, a|
@@ -76,9 +83,6 @@ check_cpath(opt)
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
-ssh_config = "#{ENV['HOME']}/.ssh/config"
-ssh_config_d = "#{ENV['HOME']}/.ssh/"
-
 if opt["help"]
     p_usage
 end
@@ -88,9 +92,9 @@ if opt["debug"]
 end
 RHC::debug(debug)
 
-RHC::timeout(opt["timeout"] ? opt["timeout"] : get_var('timeout'))
+RHC::timeout(opt['timeout'] ? opt['timeout'] : get_var('timeout'))
 
-opt["rhlogin"] = get_var('default_rhlogin') unless opt["rhlogin"]
+opt['rhlogin'] = get_var('default_rhlogin') unless opt['rhlogin']
 
 if !RHC::check_rhlogin(opt['rhlogin'])
     p_usage
@@ -105,7 +109,7 @@ if !opt['type']
     p_usage
 end
 
-if !opt["rhlogin"] || !opt["app"] || !opt["type"]
+if !opt['rhlogin'] || !opt['app'] || !opt['type']
     p_usage
 end
 
@@ -114,7 +118,68 @@ if !password
   password = RHC::get_password
 end
 
-opt["repo"] = opt["app"] unless opt["repo"]
+user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, false)
+jenkins_app_name = nil
+has_jenkins = false
+if opt['enable-jenkins']
+  app_info = user_info['app_info']
+  app_info.each do |app_name, app|
+    if app['framework'] == 'jenkins-1.4'
+      jenkins_app_name = app_name
+      has_jenkins = true
+      puts "
+Found existing Jenkins application: #{jenkins_app_name}
+"
+      if !opt['enable-jenkins'].empty?
+        puts "Ignoring specified Jenkins app name: #{opt['enable-jenkins']}"
+      end
+    end
+  end
+  if !has_jenkins
+    if opt['type'] =~ /^jenkins-/
+      has_jenkins = true
+      if opt['no-dns']
+        puts "
+The --no-dns option can't be used in conjunction with --enable-jenkins 
+when creating a #{opt['type']} application.  Either remove the --no-dns
+option or first install your #{opt['type']} application with --no-dns
+and then use rhc-ctl-app to embed the Jenkins client. 
+"
+        exit 255
+      end
+      jenkins_app_name = opt['app']
+      puts "
+The Jenkins client will be embedded into the Jenkins application 
+currently being created: '#{opt['app']}'
+"
+    end
+  end
+  if !has_jenkins
+    if !opt['enable-jenkins'].empty?
+      jenkins_app_name = opt['enable-jenkins']
+    else
+      jenkins_app_name = 'jenkins'
+    end
+  
+    if !RHC::check_app(jenkins_app_name)
+        p_usage
+    end
+
+    if jenkins_app_name == opt['app']
+      puts "You must specify a different name for your application and Jenkins ('#{opt['app']}')."
+      exit 100
+    end
+  
+    if app_info.has_key?(jenkins_app_name)
+      puts "You already have an application named '#{jenkins_app_name}'."
+      puts "In order to continue you'll need to specify a different name"
+      puts "with --enable-jenkins or destroy the existing application."
+      exit 100
+    end
+  end
+end
+
+opt['repo'] = opt['app'] unless opt['repo']
 
 puts "
 Found a bug? Post to the forum and we'll get right on it.
@@ -138,9 +203,9 @@ unless opt['nogit']
             # Create the parent directory for the git repo
             @git_parent = File.expand_path(opt['repo'] + "/../")
             FileUtils.mkdir_p(@git_parent)
-        rescue Errno::EACCES
+        rescue Exception => e
             puts "Could not write to #{@git_parent}"
-            puts "Reason: " + $!
+            puts "Reason: #{e.message}"
             puts
             puts "Please re-run from a directory you have write access to or specify -r with a"
             puts "path you have write access to"
@@ -150,269 +215,38 @@ unless opt['nogit']
     end
 end
 
-#
-# Create remote application space
-#
-
-puts "Attempting to create remote application space: " + opt['app']
-
-data = {:cartridge => opt['type'],
-                :action => 'configure',
-                :app_name => opt['app'],
-                :rhlogin => opt['rhlogin']
-                }
-if debug
-  data['debug'] = "true"
-end
-json_data = RHC::generate_json(data)
-
-puts "Contacting https://#{libra_server}"
-
-url = URI.parse("https://#{libra_server}/broker/cartridge")
-response = RHC::http_post(@http, url, json_data, password)
-
-if response.code == '200'
-    json_resp = JSON.parse(response.body)
-    RHC::print_response_success(json_resp, true)
-    json_data = JSON.parse(json_resp['data'])
-    health_check_path = json_data['health_check_path']
-else
-    RHC::print_response_err(response)
-end
-
-#
-# At this point, we need to register a handler to guarantee app
-# cleanup on any exceptions or calls to exit
-#
-at_exit do
-    unless $!.nil? || $!.is_a?(SystemExit) && $!.success?
-        json_data = RHC::generate_json(
-                   {:cartridge => opt['type'],
-                    :action => 'deconfigure',
-                    :app_name => opt['app'],
-                    :rhlogin => opt['rhlogin']
-                    })
-        puts "Cleaning up application"
-        url = URI.parse("https://#{libra_server}/broker/cartridge")
-        RHC::http_post(@http, url, json_data, password)
-    end
-end
-
-#
-# Check / add new host to ~/.ssh/config
-#
-
-puts "Checking ~/.ssh/config"
-
-user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, false)
+if jenkins_app_name && !has_jenkins
+  jenkins_no_git_message = "
 
-fqdn = "#{opt['app']}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}"
- 
-ssh_key_file_name = File.basename(get_kfile())
-if (ssh_key_file_name != 'id_rsa')
-  found = false
-  
-  begin
-      File.open(ssh_config, "r") do |sline|
-          while(line = sline.gets)
-              if line.to_s.index("Host *.#{user_info['user_info']['rhc_domain']}") == 0
-                  found = true
-                  break
-              end
-          end
-      end
-  rescue Errno::EACCES
-      puts "Could not read from #{ssh_config}"
-      puts "Reason: " + $!
-      puts
-      puts "Please correct this first.  Then run rerun."
-      puts
-      exit 213
-  rescue Errno::ENOENT
-      puts "Could not find #{ssh_config}.  This is ok, continuing"
-  end
-  if found
-      puts "Found #{user_info['user_info']['rhc_domain']} in ~/.ssh/config... No need to adjust"
-  else
-      puts "    Adding #{user_info['user_info']['rhc_domain']} to ~/.ssh/config"
-      begin
-          f = File.open(ssh_config, "a")
-          f.puts <<SSH
-  
-# Added by rhc-create-app on #{`date`}
-Host *.#{user_info['user_info']['rhc_domain']}
-    IdentityFile ~/.ssh/#{ssh_key_file_name}
-    VerifyHostKeyDNS yes
-    StrictHostKeyChecking no
-    UserKnownHostsFile ~/.ssh/libra_known_hosts
+Note: There is a git repo for your Jenkins application '#{jenkins_app_name}'
+but it isn't being downloaded as part of this process.  In most cases
+it isn't needed but you can always clone it later.
 
-SSH
-          f.close
-      rescue Errno::EACCES
-          puts "Could not write to #{ssh_config}"
-          puts "Reason: " + $!
-          puts
-          puts "Please correct this first.  Then run rerun."
-          puts
-          exit 214
-      rescue Errno::ENOENT
-          # Make directory and config if they do not exist
-          puts "Could not find directory: " + $!
-          puts "creating"
-          FileUtils.mkdir_p ssh_config_d
-          file = File.open(ssh_config, 'w')
-          file.close
-          retry
-      end
+"
+  jenkins_app = RHC::create_app(libra_server, @http, user_info, jenkins_app_name, 'jenkins-1.4', opt['rhlogin'], password, nil, false, true, jenkins_no_git_message)
+  available = RHC::check_app_available(@http, jenkins_app[:app_name], jenkins_app[:fqdn], jenkins_app[:health_check_path], jenkins_app[:result], jenkins_app[:git_url], nil, true)
+  if !available
+    puts "Unable to access your new Jenkins application."
+    exit 1
   end
-  
-  File.chmod(0700, ssh_config_d)
-  File.chmod(0600, ssh_config)
-end
-
-#
-# Confirm that the host exists in DNS
-#
-puts "Now your new domain name is being propagated worldwide (this might take a minute)..."
-
-# Allow DNS to propogate
-sleep 15
-
-# 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
 
-sleep_time = 2
-attempt = 0
-
 #
-# Pull new repo locally
+# Create remote application space
 #
+main_app = RHC::create_app(libra_server, @http, user_info, opt['app'], opt['type'], opt['rhlogin'], password, opt['repo'], opt['no-dns'], opt['nogit'])
+if jenkins_app_name
+  puts "
+Now embedding the jenkins client into '#{opt['app']}'...
 
-app_name = opt['app']
-namespace = user_info['user_info']['namespace']
-rhc_domain = user_info['user_info']['rhc_domain']
-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::MAX_RETRIES
-    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_clone = %x<git clone #{quiet} #{git_url} #{opt['repo']}>
-    if $?.exitstatus != 0
-        puts "Error in git clone"
-        puts git_clone
-        exit 216
-    end
-else
-    puts <<IMPORTANT
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-IMPORTANT: Since the -n flag was specified, no local repo has been created.
-This means you can't make changes to your published application until after
-you clone the repo yourself.  See the git url below for more information.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-IMPORTANT
-end
-
-#
-# At this point, we need to register a handler to guarantee git
-# repo cleanup on any exceptions or calls to exit
-#
-at_exit do
-    unless $!.nil? || $!.is_a?(SystemExit) && $!.success?
-        puts "Cleaning up git repo"
-        FileUtils.rm_rf opt['repo']
-    end
+"
+  RHC::ctl_app(libra_server, @http, opt['app'], opt['rhlogin'], password, 'configure', true, 'jenkins-client-1.4')
 end
 
-#
-# Test several times, doubling sleep time between attempts.
-#
-sleep_time = 2
-attempt = 0
-puts "Confirming application #{opt['app']} is available"
-while attempt < RHC::MAX_RETRIES
-    attempt+=1
-    puts "  Attempt # #{attempt}"
-    url = URI.parse("http://#{fqdn}/#{health_check_path}")
-    begin
-      response = @http.get_response(url)
-    rescue Exception => e
-      response = nil
-    end
-    if !response.nil? && response.code == "200" && response.body[0,1] == "1"
-        puts <<LOOKSGOOD
-
-Success!  Your application is now published here:
-
-      http://#{fqdn}/
-
-The remote repository is located here:
-
-    #{git_url}
-
-To make changes to your application, commit to #{opt['repo']}/.
-Then run 'git push' to update your OpenShift Express space
-
-LOOKSGOOD
-        exit 0
-    end
-    if !response.nil? && debug
-      puts "Server responded with #{response.code}"
-      puts response.body unless response.code == '503'
-    end
-    puts
-    puts "    sleeping #{sleep_time} seconds"
-    sleep sleep_time
-    sleep_time = RHC::delay(sleep_time)
+unless opt['no-dns']
+  available = RHC::check_app_available(@http, main_app[:app_name], main_app[:fqdn], main_app[:health_check_path], main_app[:result], main_app[:git_url], opt['repo'], opt['nogit'])
+  if !available
+    puts "Unable to access your new application."
+    exit 1
+  end
 end
-puts "Unable to find or access the site... problems"
-exit 254