Merge pull request #190 from danieljamesrees/sonar-github-integration-6

Sonar GitHub integration 6

Author: garethjevans

jobs/sonarqube/spec

@@ -10,6 +10,7 @@ templates:
   bin/sonarqube_ctl: bin/sonarqube_ctl
   bin/monit_debugger: bin/monit_debugger
   bin/pre-start: bin/pre-start
+  bin/post-deploy: bin/post-deploy
   config/sonar.properties: config/sonar.properties
   config/configure-groups.groovy: config/configure-groups.groovy
   config/configure-settings.groovy.erb: config/configure-settings.groovy

jobs/sonarqube/templates/bin/post-deploy

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e # exit immediately if a simple command exits with a non-zero status
+set -u # report the usage of uninitialized variables
+
+export JAVA_HOME="/var/vcap/packages/oraclejdk"
+export GROOVY_HOME="/var/vcap/packages/groovy"
+export GROOVY="${GROOVY_HOME}/bin/groovy"
+
+cd /var/vcap/jobs/sonarqube/config
+
+${GROOVY} configure-settings.groovy
+${GROOVY} configure-groups.groovy

jobs/sonarqube/templates/bin/pre-start

@@ -5,11 +5,3 @@ set -u # report the usage of uninitialized variables
 
 cp /var/vcap/jobs/sonarqube/config/sonar.properties /var/vcap/packages/sonarqube/conf/sonar.properties
 chown vcap:vcap -R /var/vcap/packages/sonarqube/*
-
-export GROOVY_HOME="/var/vcap/packages/groovy"
-export GROOVY="${GROOVY_HOME}/bin/groovy"
-
-cd /var/vcap/jobs/sonarqube/config
-
-${GROOVY} configure-settings.groovy
-${GROOVY} configure-groups.groovy

jobs/sonarqube/templates/config/SonarApiClient.groovy.erb

@@ -48,37 +48,69 @@ class SonarApiClient
 
     private static String generateAuthValue() {
         return "${username}:${password}".getBytes().encodeBase64().toString()
-    }
-    
-    static boolean postQueryString(String url, String queryString) {
+    }   
+
+    private static HttpURLConnection openPostConnection(String url) {
         def connection = new URL(url).openConnection() as HttpURLConnection
-    
+
         connection.setRequestProperty('Accept', 'application/json')
-        connection.setRequestProperty('Authorization', "Basic ${getAuthValue()}")
+        connection.setRequestProperty('Authorization', "Basic ${generateAuthValue()}")
         connection.setRequestMethod('POST')
         connection.doOutput = true
-    
-        def writer = new OutputStreamWriter(connection.outputStream)
-        
-        try {
-            writer.write(queryString)
-            writer.flush()
-        
-            if (connection.responseCode == HttpURLConnection.HTTP_OK ||
-                connection.responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                println "Request to ${url} with query string ${queryString} succeeded"
-            } else {
-                println "Request to ${url} with query string ${queryString} failed with status " +
-                        "${connection.responseCode} and response ${connection.responseMessage}"
+
+        return connection
+    }
+
+    static boolean postQueryString(
+                    String url,
+                    String queryString,
+                    int numberOfTimesToRetry = 60,
+                    int delayBetweenRetriesInMilliseconds = 1000) {
+
+        def finalResponseReceived = false
+
+        while ((!finalResponseReceived) && (numberOfTimesToRetry-- > 0)) {
+
+            def connection
+            def writer
+
+            try {
+                connection = openPostConnection(url)
+                writer = new OutputStreamWriter(connection.outputStream)
+
+                writer.write(queryString)
+                writer.flush()
+
+                def responseCode = connection.responseMessage
+
+                if (responseCode == HttpURLConnection.HTTP_NOT_FOUND) {
+                    sleep(delayBetweenRetriesInMilliseconds)
+                    println "Waiting ${delayBetweenRetriesInMilliseconds} milliseconds to post to ${url} with " + 
+                            "${numberOfTimesToRetry} retries remaining"
+                } else if (responseCode == HttpURLConnection.HTTP_OK ||
+                           responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
+                    println "Request to ${url} with query string ${queryString} succeeded"
+                    finalResponseReceived = true
+                } else {
+                    println "Request to ${url} with query string ${queryString} failed with status " +
+                            "${responseCode} and response ${connection.responseMessage}"
+                    finalResponseReceived = true
+                }
+            } catch (IOException ioe) {
+                println "Request failed with error: ${ioe}"
                 return false
+            } finally {
+                if (writer != null) writer.close()
+                if (connection != null) connection.disconnect()
             }
-        } catch (IOException ioe) {
-            println "Request failed with error: ${ioe}"
+        }
+
+        if (!finalResponseReceived) {
+            println "Timed out waiting for response from ${url}"
             return false
-        } finally {
-            writer.close()
         }
-    
+
         return true
     }
 }
+

packages/groovy/spec

@@ -1,7 +1,8 @@
 ---
 name: groovy
 
-dependencies: []
+dependencies:
+- oraclejdk
 
 files:
 - groovy/apache-groovy-binary-2.4.13.zip