feat(jenkins): Enable Jenkins job triggers for jobs in sub-folders (#…

…1204) (#1215) - Allow triggering of Jenkins jobs that reside in sub-folders, by treating job names containing slashes as query variables. - Prior to this feature, jobs in sub-folders were not appropriately matched by the Spring framework due to slashes in their path, causing trigger requests to fail. - Include a new feature flag to determine the usage of the existing endpoint (which uses the job name as a path variable) or an updated endpoint (which takes the job name as a query parameter). Co-authored-by: Jason <[email protected]> (cherry picked from commit 54fbbcc) Co-authored-by: Raul Cristian <[email protected]>
spinnaker · Jan 22, 2024 · 6832466 · 6832466
1 parent 3fb141e
commit 6832466
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
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
@@ -107,6 +107,16 @@ class BuildController {
     return jobStatus(buildService, master, job, buildNumber)
   }
 
+  @RequestMapping(value = '/builds/status/{buildNumber}/{master}')
+  @PreAuthorize("hasPermission(#master, 'BUILD_SERVICE', 'READ')")
+  GenericBuild getJobStatus(
+    @PathVariable String master,
+    @PathVariable Integer buildNumber,
+    @RequestParam("job") String job) {
+    def buildService = getBuildService(master)
+    return jobStatus(buildService, master, job, buildNumber)
+  }
+
   @RequestMapping(value = '/builds/artifacts/{buildNumber}/{master:.+}/**')
   @PreAuthorize("hasPermission(#master, 'BUILD_SERVICE', 'READ')")
   List<Artifact> getBuildResults(@PathVariable String master, @PathVariable

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
@@ -129,6 +129,19 @@ class BuildControllerSpec extends Specification {
     response.contentAsString == "{\"building\":false,\"number\":${BUILD_NUMBER}}"
   }
 
+  void 'get the status of a build with job name as query parameter'() {
+    given:
+    1 * service.getGenericBuild(JOB_NAME, BUILD_NUMBER) >> new GenericBuild(building: false, number: BUILD_NUMBER)
+
+    when:
+    MockHttpServletResponse response = mockMvc.perform(get("/builds/status/${BUILD_NUMBER}/${SERVICE}")
+      .param("job", JOB_NAME)
+      .accept(MediaType.APPLICATION_JSON)).andReturn().response
+
+    then:
+    response.contentAsString == "{\"building\":false,\"number\":${BUILD_NUMBER}}"
+  }
+
   void 'get an item from the queue'() {
     given:
     1 * jenkinsService.queuedBuild(_, QUEUED_JOB_NUMBER) >> new QueuedJob(executable: [number: QUEUED_JOB_NUMBER])