DTSPO-17456 Run tests for global functions

.gitignore

@@ -8,3 +8,4 @@ out
 bin
 .settings
 .DS_Store
+.java/**

Jenkinsfile_pipeline_test

@@ -15,6 +15,7 @@ try {
     }
 
     stage('Build') {
+      builder.gradle('--version')
       builder.gradle('clean build -x test')
     }
 

build.gradle

@@ -12,33 +12,53 @@ repositories {
 
 test {
   systemProperty 'groovy.grape.enable', 'false'
-  useJUnitPlatform()
+
+  reports {
+    html.required = true
+    html.outputLocation = file("$project.buildDir/reports/html")
+  }
+  ignoreFailures = true
+
+  // show test results
+  def results = []
+  afterSuite { desc, result ->
+    if (desc.className) { results << result }
+  }
+
+  // show summary
+  doLast {
+    println "Tests: ${results.sum { it.testCount }}" +
+      ", Failures: ${results.sum { it.failedTestCount }}" +
+      ", Errors: ${results.sum { it.exceptions.size() }}" +
+      ", Skipped: ${results.sum { it.skippedTestCount }}"
+  }
 }
 
 compileGroovy {
   groovyOptions.forkOptions.jvmArgs = [ '-Dgroovy.grape.enable=false' ]
+  // @CNP annotation comes from the Jenkins Runtime instance
+  exclude '**/pluginActive.groovy'
 }
+
 compileTestGroovy {
   groovyOptions.forkOptions.jvmArgs = [ '-Dgroovy.grape.enable=false' ]
 }
 
 dependencies {
-  implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.5.22'
-  implementation group: 'org.codehaus.groovy', name: 'groovy-dateutil', version: '2.5.22'
-
   implementation group: 'com.cloudbees', name: 'groovy-cps', version: '3773.v505e0052522c'
   testImplementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
 
-  implementation group: 'org.jenkins-ci.main', name: 'jenkins-core', version: '2.409'
-  implementation group: 'org.jenkins-ci.plugins.workflow', name: 'workflow-step-api', version: '625.vd896b_f445a_f8', ext: 'jar'
-  implementation group: 'org.jenkinsci.plugins', name: 'pipeline-model-definition', version: '2.2169.vee7cd0efc13e', ext: 'jar'
+  implementation group: 'org.jenkins-ci.main', name: 'jenkins-core', version: '2.460'
+  implementation group: 'org.jenkins-ci.plugins.workflow', name: 'workflow-step-api', version: '657.v03b_e8115821b_', ext: 'jar'
+  implementation group: 'org.jenkinsci.plugins', name: 'pipeline-model-definition', version: '2.2198.v41dd8ef6dd56', ext: 'jar'
   implementation 'org.jenkins-ci.plugins:job-dsl-core:1.87'
   implementation group: 'org.jenkins-ci.plugins', name: 'scm-api', version: '616.ve67136f6c77d', ext: 'jar'
 
-  testImplementation group: 'org.spockframework', name: 'spock-core', version: '2.3-groovy-2.5'
+  testImplementation 'junit:junit:4.13.2'
+  testImplementation group: 'org.spockframework', name: 'spock-core', version: '1.3-groovy-2.4'
   testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.0'
 
-  testImplementation group: 'com.lesfurets', name: 'jenkins-pipeline-unit', version: '1.17'
+  testImplementation (group: 'com.lesfurets', name: 'jenkins-pipeline-unit', version: '1.17')
   testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
   testImplementation group: 'net.javacrumbs.json-unit', name: 'json-unit-fluent', version: '2.36.0'
 
@@ -56,16 +76,15 @@ sourceSets {
 
   main {
     groovy {
-      srcDirs = ['src']
+      srcDirs = ["$project.rootDir/src", "$project.rootDir/vars"]
     }
   }
   test {
     groovy {
-      srcDirs = ['test']
+      srcDirs = ["$project.rootDir/test"]
     }
     resources {
-      srcDirs = ['testResources']
+      srcDirs = ["$project.rootDir/testResources"]
     }
-
   }
 }

src/uk/gov/hmcts/contino/AngularPipelineType.groovy

@@ -1,11 +1,11 @@
 package uk.gov.hmcts.contino
 
-public class AngularPipelineType implements PipelineType, Serializable {
+class AngularPipelineType implements PipelineType, Serializable {
   def steps
   def product
   def app
 
-  Builder builder
+  AngularBuilder builder
 
   AngularPipelineType(steps, product, app) {
     this.steps = steps

src/uk/gov/hmcts/contino/AppPipelineDsl.groovy

@@ -5,10 +5,10 @@ import uk.gov.hmcts.pipeline.deprecation.WarningCollector
 import java.time.LocalDate
 
 class AppPipelineDsl extends CommonPipelineDsl implements Serializable {
-  final AppPipelineConfig config
+  def final config
   def final steps
 
-  AppPipelineDsl(Object steps, PipelineCallbacksConfig callbacks, AppPipelineConfig config) {
+  AppPipelineDsl(steps, callbacks, config) {
     super(steps, callbacks, config)
     this.config = config
     this.steps = steps

src/uk/gov/hmcts/contino/CommonPipelineDsl.groovy

@@ -1,11 +1,11 @@
 package uk.gov.hmcts.contino
 
 abstract class CommonPipelineDsl implements Serializable {
-  final PipelineCallbacksConfig callbacks
-  final CommonPipelineConfig config
+  def final callbacks
+  def final config
   def final steps
 
-  CommonPipelineDsl(Object steps, PipelineCallbacksConfig callbacks, CommonPipelineConfig config) {
+  CommonPipelineDsl(steps, callbacks, config) {
     this.callbacks = callbacks
     this.config = config
     this.steps = steps

src/uk/gov/hmcts/contino/DockerImage.groovy

@@ -28,7 +28,7 @@ class DockerImage {
   def product
   def component
   def imageTag  // image tag, based on the current build branch name e.g. 'latest', 'pr-77'
-  Acr acr
+  def acr
   def commit
   def registryHost
   def lastCommitTime
@@ -119,7 +119,7 @@ class DockerImage {
     return getTag(stage.label)
   }
 
-  def getTag(String imageTag) {
+  def getTag(imageTag) {
     return (imageTag ==  'latest' ? imageTag : "${imageTag}-${this.commit}-${this.lastCommitTime}")
   }
 
@@ -137,15 +137,15 @@ class DockerImage {
     return shortName(this.imageTag)
   }
 
-  def getShortName(DeploymentStage stage) {
+  def getShortName(stage) {
     // if it's a PR use the full imageTag (e.g. pr-42)
     if (stage == DeploymentStage.PR) {
       return shortName(this.imageTag)
     }
     return shortName(stage.label)
   }
 
-  private def shortName(String imageTag) {
+  private def shortName(imageTag) {
     return repositoryName().concat(':')
       .concat(getTag(imageTag))
   }

src/uk/gov/hmcts/contino/GradleBuilder.groovy

@@ -15,13 +15,10 @@ class GradleBuilder extends AbstractBuilder {
   // https://issues.jenkins.io/browse/JENKINS-47355 means a weird super class issue
   def localSteps
 
-  def securitytest
-
   GradleBuilder(steps, product) {
     super(steps)
     this.product = product
     this.localSteps = steps
-    this.securitytest = new SecurityScan(this.steps)
   }
 
   def build() {

src/uk/gov/hmcts/contino/InfraPipelineDsl.groovy

@@ -2,10 +2,10 @@ package uk.gov.hmcts.contino
 
 class InfraPipelineDsl extends CommonPipelineDsl implements Serializable {
 
-  final InfraPipelineConfig config
+  def final config
   def final steps
 
-  InfraPipelineDsl(Object steps, PipelineCallbacksConfig callbacks, InfraPipelineConfig config) {
+  InfraPipelineDsl(steps, callbacks, config) {
     super(steps, callbacks, config)
     this.config = config
     this.steps = steps

src/uk/gov/hmcts/contino/NodePipelineType.groovy

@@ -5,7 +5,7 @@ public class NodePipelineType implements PipelineType, Serializable {
   def product
   def app
 
-  Builder builder
+  YarnBuilder builder
 
   NodePipelineType(steps, product, app) {
     this.steps = steps

src/uk/gov/hmcts/contino/PipelineCallbacksRunner.groovy

@@ -5,9 +5,9 @@ import uk.gov.hmcts.pipeline.deprecation.WarningCollector
 import java.time.LocalDate
 
 class PipelineCallbacksRunner implements Serializable {
-  final PipelineCallbacksConfig config
+  def final config
 
-  PipelineCallbacksRunner(PipelineCallbacksConfig config) {
+  PipelineCallbacksRunner(config) {
     this.config = config
   }
 

src/uk/gov/hmcts/contino/RubyPipelineType.groovy

@@ -5,7 +5,7 @@ class RubyPipelineType implements PipelineType, Serializable {
   def product
   def app
 
-  Builder builder
+  RubyBuilder builder
 
   RubyPipelineType(steps, product, app) {
     this.steps = steps

src/uk/gov/hmcts/contino/SpringBootPipelineType.groovy

@@ -5,7 +5,7 @@ class SpringBootPipelineType implements PipelineType, Serializable {
   def product
   def app
 
-  Builder builder
+  GradleBuilder builder
 
   SpringBootPipelineType(steps, product, app) {
     this.steps = steps

src/uk/gov/hmcts/contino/YarnBuilder.groovy

@@ -24,7 +24,7 @@ class YarnBuilder extends AbstractBuilder {
   YarnBuilder(steps) {
     super(steps)
     this.localSteps = steps
-    this.securitytest = new SecurityScan(this.steps)
+    this.securitytest = new SecurityScan(steps)
   }
 
   def build() {

src/uk/gov/hmcts/contino/azure/Acr.groovy

@@ -60,7 +60,7 @@ class Acr extends Az {
    * @return
    *   stdout of the step
    */
-  def build(DockerImage dockerImage) {
+  def build(dockerImage) {
     build(dockerImage, "")
   }
 
@@ -75,8 +75,8 @@ class Acr extends Az {
    * @return
    *   stdout of the step
    */
-  def build(DockerImage dockerImage, String additionalArgs) {
-    this.az "acr build --no-format -r ${registryName} -t ${dockerImage.getBaseShortName()} --subscription ${registrySubscription} -g ${resourceGroup} --build-arg REGISTRY_NAME=${registryName}${additionalArgs} ."
+  def build(dockerImage, additionalArgs) {
+    this.az"acr build --no-format -r ${registryName} -t ${dockerImage.getBaseShortName()} --subscription ${registrySubscription} -g ${resourceGroup} --build-arg REGISTRY_NAME=${registryName}${additionalArgs} ."
   }
 
   /**
@@ -124,7 +124,7 @@ class Acr extends Az {
    * @return
    *   stdout of the step
    */
-  def retagForStage(DockerImage.DeploymentStage stage, DockerImage dockerImage) {
+  def retagForStage(stage, dockerImage) {
     def additionalTag = dockerImage.getShortName(stage)
     // Non master branch builds like preview are tagged with the base tag
     def baseTag = (stage == DockerImage.DeploymentStage.PR || stage == DockerImage.DeploymentStage.PREVIEW || dockerImage.imageTag == 'staging')
@@ -138,7 +138,7 @@ class Acr extends Az {
     }
   }
 
-  def hasTag(DockerImage dockerImage) {
+  def hasTag(dockerImage) {
       return hasRepoTag(dockerImage.getTag(), dockerImage.getRepositoryName())
   }
 
@@ -147,7 +147,7 @@ class Acr extends Az {
     return hasRepoTag(tag, dockerImage.getRepositoryName())
   }
 
-  private def hasRepoTag(String tag, String repository) {
+  private boolean hasRepoTag(String tag, String repository) {
     // staging and latest are not really tags for our purposes, it just marks the most recent master build before and after tests are run in AAT.
     if (tag in ['staging' , 'latest'] ) {
       steps.echo "Warning: matching '${tag}' tag for ${repository}"
@@ -164,7 +164,7 @@ class Acr extends Az {
     return tagFound
   }
 
-  private def purgeOldTags(DockerImage.DeploymentStage stage, DockerImage dockerImage) {
+  def purgeOldTags(stage, dockerImage) {
     String purgeTag = stage == DockerImage.DeploymentStage.PR ? dockerImage.getImageTag() : stage.getLabel()
     String filterPattern = dockerImage.getRepositoryName().concat(":^").concat(purgeTag).concat("-.*")
     this.az "acr run --registry ${registryName} --subscription ${registrySubscription} --cmd \"acr purge --filter ${filterPattern} --ago ${stage.purgeAgo} --keep ${stage.purgeKeep} --untagged --concurrency 5\" /dev/null"

src/uk/gov/hmcts/contino/azure/Az.groovy

@@ -9,10 +9,10 @@ class Az {
   Az(steps, subscription) {
     this.steps = steps
     this.subscription = subscription
+  }
 
-    this.az = { cmd ->
+  def az(cmd) {
       return steps.sh(label: "az ${cmd}", script: "env AZURE_CONFIG_DIR=/opt/jenkins/.azure-${this.subscription} az ${cmd}", returnStdout: true)?.trim()
-    }
   }
 
 }

test/uk/gov/hmcts/contino/EnvironmentDnsConfigTest.groovy

@@ -12,7 +12,7 @@ class EnvironmentDnsConfigTest extends Specification {
       [
         [
           "name"         : "DTS-CFTSBOX-INTSVC",
-          "zoneTemplate" : 'service.core-compute-${environment}.internal',
+          "zoneTemplate" : '${environment}.platform.hmcts.net',
           "ttl"          : 300, "active": true, "consulActive": true,
           "environments" : [
             ["name": "sandbox", "ttl": 3600],
@@ -21,7 +21,7 @@ class EnvironmentDnsConfigTest extends Specification {
           "resourceGroup": "core-infra-intsvc-rg"],
         [
           "name"         : "DTS-CFTPTL-INTSVC",
-          "zoneTemplate" : 'service.core-compute-${environment}.internal',
+          "zoneTemplate" : '${environment}.platform.hmcts.net',
           "ttl"          : 3600, "active": false, "consulActive": true,
           "environments" : [
             ["name": "prod", "ttl": 2400],
@@ -54,7 +54,7 @@ class EnvironmentDnsConfigTest extends Specification {
     assertThat(idamSandbox.subscription).isEqualTo("DTS-CFTSBOX-INTSVC")
     assertThat(idamSandbox.resourceGroup).isEqualTo("core-infra-intsvc-rg")
     assertThat(idamSandbox.ttl).isEqualTo(300)
-    assertThat(idamSandbox.zone).isEqualTo("service.core-compute-idam-sandbox.internal")
+    assertThat(idamSandbox.zone).isEqualTo("idam-sandbox.platform.hmcts.net")
   }
 
   def "getEntry() should return null for an unknown environment"() {

test/uk/gov/hmcts/pipeline/DeprecationConfigTest.groovy

@@ -0,0 +1,18 @@
+package uk.gov.hmcts.pipeline
+
+class DeprecationConfigTest {
+
+  static def response = [
+    "content":
+      [
+        "terraform":
+          [
+            "terraform"                              : ["version": "1.3.4", "date_deadline": "2024-12-30"],
+            "registry.terraform.io/hashicorp/azurerm": ["version": "3.0.0", "date_deadline": "2024-12-30"]
+          ],
+        "helm"     : ["java": ["version": "5.2.0", "date_deadline": "2024-06-30"]],
+        "gradle"   : ["java-logging": ["version": "6.0.1", "date_deadline": "2023-10-28"]],
+        "npm"      : ["angular/core": ["version": "15", "date_deadline": "2024-03-25"]]
+      ]
+  ]
+}

test/uk/gov/hmcts/pipeline/deprecation/WarningCollectorTest.groovy

@@ -4,6 +4,7 @@ import spock.lang.Specification
 
 import java.time.LocalDate
 
+import static java.time.format.DateTimeFormatter.ofPattern
 import static org.assertj.core.api.Assertions.assertThat
 
 class WarningCollectorTest extends Specification {
@@ -12,8 +13,8 @@ class WarningCollectorTest extends Specification {
   LocalDate now = LocalDate.now()
   LocalDate nextWeek = now.plusWeeks(1)
 
-  String nextWeekFormattedDate = nextWeek.format("dd/MM/yyyy")
-  String nextDayFormattedDate = nextDay.format("dd/MM/yyyy")
+  String nextWeekFormattedDate = nextWeek.format(ofPattern("dd/MM/yyyy"))
+  String nextDayFormattedDate = nextDay.format(ofPattern("dd/MM/yyyy"))
 
   void setup() {
 
@@ -41,7 +42,7 @@ class WarningCollectorTest extends Specification {
 
   def "getMessageByDays() with same day should return today"() {
 
-    String formattedDate = now.format("dd/MM/yyyy")
+    String formattedDate = now.format(ofPattern("dd/MM/yyyy"))
 
     when:
     String message = WarningCollector.getMessageByDays(now)