Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(jenkins): Enable properties and artifacts with job name as query parameter (backport #1230) #1232

Merged
merged 1 commit into from
Feb 27, 2024
Merged

fix(jenkins): Enable properties and artifacts with job name as query parameter (backport #1230) #1232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions igor-web/src/main/groovy/com/netflix/spinnaker/igor/build/BuildController.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
15 changes: 15 additions & 0 deletions igor-web/src/test/groovy/com/netflix/spinnaker/igor/build/BuildControllerSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down