Merge pull request #118 from piyush-garg/iss_117

Refactor Util functions

Author: pradeepitm12

src/io/openshift/plugins/analytics.groovy

@@ -1,7 +1,7 @@
 package io.openshift.plugins
 
 import io.openshift.Events
-import io.openshift.Utils
+import static io.openshift.Utils.addAnnotationToBuild
 
 def register() {
     Events.on("build.pass") {
@@ -14,7 +14,7 @@ def register() {
             retry(3) {
                 def response = bayesianAnalysis(url: 'https://bayesian-link', gitUrl: a[0].git.url, ecosystem: image)
                 if (response.success) {
-                  Utils.addAnnotationToBuild(this, 'fabric8.io/bayesian.analysisUrl', response.getAnalysisUrl())
+                  addAnnotationToBuild(this, 'fabric8.io/bayesian.analysisUrl', response.getAnalysisUrl())
                 } else {
                   echo "Bayesian analysis failed ${response}"
                 }

vars/loadResources.groovy

@@ -1,4 +1,4 @@
-import io.openshift.Utils
+import static io.openshift.Utils.shWithOutput
 
 def call(Map args = [:]) {
   def file = args.file
@@ -17,7 +17,7 @@ def call(Map args = [:]) {
 
   def validate = args.validate == false ? false : true
   if (validate) {
-    Utils.shWithOutput(this, "oc apply --dry-run=true --validate=true -f $args.file");
+    shWithOutput(this, "oc apply --dry-run=true --validate=true -f $args.file");
   }
 
   // resources can be:

vars/pod.groovy

@@ -1,7 +1,7 @@
-import io.openshift.Utils
+import static io.openshift.Utils.buildID
 
 def call(Map args = [:], body = null) {
-    def label = Utils.buildID(env.JOB_NAME, env.BUILD_NUMBER, prefix=args.name)
+    def label = buildID(env.JOB_NAME, env.BUILD_NUMBER, prefix=args.name)
     def envVars = processEnvVars(args.envVars)
 
     podTemplate(

vars/processTemplate.groovy

@@ -1,4 +1,4 @@
-import io.openshift.Utils
+import static io.openshift.Utils.shWithOutput
 
 def call(args=[:]) {
   def file = args.file ?: ".openshiftio/application.yaml"
@@ -19,7 +19,7 @@ def call(args=[:]) {
   def params = applyDefaults(args.params, paramNames)
 
   def ocParams = params.collect { k,v -> "$k=$v"}.join(' ')
-  def processed = Utils.shWithOutput(this, "oc process -f $file $ocParams -o yaml")
+  def processed = shWithOutput(this, "oc process -f $file $ocParams -o yaml")
 
   def kind = { r -> r.kind }
   def resources = readYaml(text: processed).items.groupBy(kind)
@@ -44,9 +44,9 @@ def applyDefaults(provided=[:], templateParams) {
   }
 
   setParam('SUFFIX_NAME') { "-${env.BRANCH_NAME}".toLowerCase() }
-  setParam('SOURCE_REPOSITORY_REF') { Utils.shWithOutput(this, "git rev-parse --short HEAD") }
-  setParam('SOURCE_REPOSITORY_URL') { Utils.shWithOutput(this, "git config remote.origin.url") }
-  setParam('RELEASE_VERSION') { Utils.shWithOutput(this, "git rev-list --count HEAD") }
+  setParam('SOURCE_REPOSITORY_REF') { shWithOutput(this, "git rev-parse --short HEAD") }
+  setParam('SOURCE_REPOSITORY_URL') { shWithOutput(this, "git config remote.origin.url") }
+  setParam('RELEASE_VERSION') { shWithOutput(this, "git rev-list --count HEAD") }
   return params
 }
 

vars/runTest.groovy

@@ -1,4 +1,3 @@
-
 def call(Map args) {
   stage("Run Tests") {
     if (!args.commands) {
@@ -10,4 +9,4 @@ def call(Map args) {
     }
     spawn(image: image, version: config.version(), commands: args.commands)
   }
-}
+}

vars/spawn.groovy

@@ -1,4 +1,4 @@
-import io.openshift.Utils;
+import static io.openshift.Utils.mergeResources
 
 def call(Map args = [:], body = null){
     if (args.commands == null && body == null) {
@@ -44,7 +44,7 @@ def mergeEnvs(args, spec){
     def apiEnvVars = args.envVar ?: []
     // read environment variable from spec
     def specEnvVars = spec.envVar ?: []
-    return Utils.mergeResources(apiEnvVars + specEnvVars)
+    return mergeResources(apiEnvVars + specEnvVars)
 }
 
 def specForImage(image, version){

vars/testNamespace.groovy

@@ -1,5 +1,5 @@
-import io.openshift.Utils;
+import static io.openshift.Utils.usersNamespace
 
 def call() {
-  return Utils.usersNamespace()
+  return usersNamespace()
 }