Merge pull request #191 from danieljamesrees/refactor-sonar-properties

Refactor sonar properties

Author: cagiti

jobs/sonarqube/spec

@@ -10,10 +10,10 @@ 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
+  bin/post-deploy.erb: 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
+  config/configure-settings.groovy: config/configure-settings.groovy
   config/group-permissions.json: config/group-permissions.json
   config/SonarApiClient.groovy.erb: config/SonarApiClient.groovy
   data/properties.sh.erb: data/properties.sh

jobs/sonarqube/templates/bin/post-deploy …/sonarqube/templates/bin/post-deploy.erbjobs/sonarqube/templates/bin/post-deploy renamed to jobs/sonarqube/templates/bin/post-deploy.erb jobs/sonarqube/templates/bin/post-deploy renamed to jobs/sonarqube/templates/bin/post-deploy.erb

@@ -3,6 +3,7 @@
 set -e # exit immediately if a simple command exits with a non-zero status
 set -u # report the usage of uninitialized variables
 
+<% if defined?p('github.server.url') %>
 export JAVA_HOME="/var/vcap/packages/oraclejdk"
 export GROOVY_HOME="/var/vcap/packages/groovy"
 export GROOVY="${GROOVY_HOME}/bin/groovy"
@@ -11,3 +12,4 @@ cd /var/vcap/jobs/sonarqube/config
 
 ${GROOVY} configure-settings.groovy
 ${GROOVY} configure-groups.groovy
+<% end %>

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

@@ -5,6 +5,10 @@ class SonarApiClient
     static def sonarUrl = '<%= p('sonar.server.url') %>'
     static def sonarApiUrl = sonarUrl + '/api/'
 
+    static def gitHubUrl = '<%= p('github.server.url') if not defined? p('github.server.url') %>'
+    static def clientSecret = '<%= p('sonar.client.secret') if not defined? p('sonar.client.secret') %>'
+    static def clientId = '<%= p('sonar.client.id') if not defined? p('sonar.client.secret') %>'
+
     static def username = '<%= p('sonar.admin.username') %>'
     static def password = '<%= p('sonar.admin.password') %>'
 

…tes/config/configure-settings.groovy.erb …mplates/config/configure-settings.groovyjobs/sonarqube/templates/config/configure-settings.groovy.erb renamed to jobs/sonarqube/templates/config/configure-settings.groovy jobs/sonarqube/templates/config/configure-settings.groovy.erb renamed to jobs/sonarqube/templates/config/configure-settings.groovy

@@ -4,17 +4,17 @@ import SonarApiClient
 def sonarApiSettingsUrl = SonarApiClient.sonarApiUrl + 'settings/set'
 // Could connect to 'settings/get' after to test without exercising functionality.
 
-def gitHubUrl = '<%= p('github.server.url') %>'
+def gitHubUrl = SonarApiClient.gitHubUrl
 
 def keySingleValuePairs = [
     new Tuple2('sonar.core.serverBaseURL', SonarApiClient.sonarUrl),
     new Tuple2('sonar.auth.github.enabled', 'true'),
     new Tuple2('sonar.auth.github.apiUrl', gitHubUrl + '/api/v3/'),
     new Tuple2('sonar.auth.github.allowUsersToSignUp', 'true'),
     new Tuple2('sonar.auth.github.webUrl', gitHubUrl),
-	new Tuple2('sonar.auth.github.clientSecret.secured', '<%= p('sonar.client.secret') %>'),
+	new Tuple2('sonar.auth.github.clientSecret.secured', SonarApiClient.clientSecret),
     new Tuple2('sonar.auth.github.loginStrategy', 'Same as GitHub login'),
-    new Tuple2('sonar.auth.github.clientId.secured', '<%= p('sonar.client.id') %>')
+    new Tuple2('sonar.auth.github.clientId.secured', SonarApiClient.clientId)
 ]
 
 for (pair in keySingleValuePairs) {