From 478dbb5d8e69d0f666f75aabef0510e2d3a90585 Mon Sep 17 00:00:00 2001
From: Christos Arvanitis <christos.arvanitis@armory.io>
Date: Mon, 26 Feb 2024 20:28:26 +0200
Subject: [PATCH] fix(jenkins): Enable properties and artifacts with job name
 as query parameter (#1230)

(cherry picked from commit 097a08ac86347cc0faf3bd18964762e7e9087dea)
---
 .../igor/build/BuildController.groovy         | 30 +++++++++++++++++++
 .../igor/build/BuildControllerSpec.groovy     | 15 ++++++++++
 2 files changed, 45 insertions(+)

diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/build/BuildController.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/build/BuildController.groovy
index 4b336a4ce..3adf52d74 100644
--- a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/build/BuildController.groovy
+++ b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/build/BuildController.groovy
@@ -132,6 +132,20 @@ class BuildController {
     return Collections.emptyList()
   }
 
+
+  @RequestMapping(value = '/builds/artifacts/{buildNumber}/{master}')
+  @PreAuthorize("hasPermission(#master, 'BUILD_SERVICE', 'READ')")
+  List<Artifact> getBuildResults(@PathVariable String master, @PathVariable
+    Integer buildNumber, @RequestParam("job") String job ,@Query("propertyFile") String propertyFile) {
+    def buildService = getBuildService(master)
+    GenericBuild build = jobStatus(buildService, master, job, buildNumber)
+    if (build && buildService instanceof BuildProperties && artifactExtractor != null) {
+      build.properties = buildService.getBuildProperties(job, build, propertyFile)
+      return artifactExtractor.extractArtifacts(build)
+    }
+    return Collections.emptyList()
+  }
+
   @RequestMapping(value = '/builds/queue/{master}/{item}')
   @PreAuthorize("hasPermission(#master, 'BUILD_SERVICE', 'READ')")
   Object getQueueLocation(@PathVariable String master, @PathVariable int item) {
@@ -335,6 +349,22 @@ class BuildController {
     return Collections.emptyMap()
   }
 
+
+  @RequestMapping(value = '/builds/properties/{buildNumber}/{fileName}/{master}')
+  @PreAuthorize("hasPermission(#master, 'BUILD_SERVICE', 'READ')")
+  Map<String, Object> getProperties(
+    @PathVariable String master,
+    @PathVariable Integer buildNumber, @PathVariable
+      String fileName, @RequestParam("job") String job) {
+    def buildService = getBuildService(master)
+    if (buildService instanceof BuildProperties) {
+      BuildProperties buildProperties = (BuildProperties) buildService
+      def genericBuild = buildService.getGenericBuild(job, buildNumber)
+      return buildProperties.getBuildProperties(job, genericBuild, fileName)
+    }
+    return Collections.emptyMap()
+  }
+
   private BuildOperations getBuildService(String master) {
     def buildService = buildServices.getService(master)
     if (buildService == null) {
diff --git a/igor-web/src/test/groovy/com/netflix/spinnaker/igor/build/BuildControllerSpec.groovy b/igor-web/src/test/groovy/com/netflix/spinnaker/igor/build/BuildControllerSpec.groovy
index 8553c4943..80baf7b4a 100644
--- a/igor-web/src/test/groovy/com/netflix/spinnaker/igor/build/BuildControllerSpec.groovy
+++ b/igor-web/src/test/groovy/com/netflix/spinnaker/igor/build/BuildControllerSpec.groovy
@@ -238,6 +238,21 @@ class BuildControllerSpec extends Specification {
       .andReturn().response
   }
 
+  void 'get properties of a build with job Name in query parameters' () {
+    given:
+    1 * jenkinsService.getGenericBuild(JOB_NAME, BUILD_NUMBER) >> genericBuild
+    1 * jenkinsService.getBuildProperties(JOB_NAME, genericBuild, FILE_NAME) >> ['foo': 'bar']
+
+    when:
+    MockHttpServletResponse response = mockMvc.perform(
+      get("/builds/properties/${BUILD_NUMBER}/${FILE_NAME}/${JENKINS_SERVICE}")
+        .param("job", JOB_NAME)
+        .accept(MediaType.APPLICATION_JSON)).andReturn().response
+
+    then:
+    response.contentAsString == "{\"foo\":\"bar\"}"
+  }
+
   void 'get properties of a travis build'() {
     given:
     1 * travisService.getGenericBuild(JOB_NAME, BUILD_NUMBER) >> genericBuild