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

Jump to bottom

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

Open
wants to merge 2 commits into
base: release-1.28.x
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04ca93b
feat(jenkins): Enable Jenkins job triggers for jobs in sub-folders (#…
ciurescuraul Dec 22, 2023
bb18a96
Merge branch 'release-1.28.x' into mergify/bp/release-1.28.x/pr-4618
jasonmcintosh Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 10 additions & 12 deletions orca-igor/src/main/java/com/netflix/spinnaker/orca/igor/BuildService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,17 @@
import com.netflix.spinnaker.kork.artifacts.model.Artifact;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.web.util.UriUtils;
import retrofit.client.Response;

@RequiredArgsConstructor
@EnableConfigurationProperties(IgorFeatureFlagProperties.class)
public class BuildService {
private final IgorService igorService;
private final IgorFeatureFlagProperties igorFeatureFlagProperties;

public BuildService(
IgorService igorService, IgorFeatureFlagProperties igorFeatureFlagProperties) {
this.igorService = igorService;
this.igorFeatureFlagProperties = igorFeatureFlagProperties;
}

private String encode(String uri) {
return UriUtils.encodeFragment(uri, "UTF-8");
}
Expand All @@ -45,19 +43,19 @@ public Response build(
}

public String stop(String master, String jobName, String queuedBuild, Integer buildNumber) {
if (this.igorFeatureFlagProperties.isJobNameAsQueryParameter()) {
return igorService.stopWithJobNameAsQueryParameter(
master, jobName, queuedBuild, buildNumber, "");
}
return igorService.stop(master, jobName, queuedBuild, buildNumber, "");
return this.igorFeatureFlagProperties.isJobNameAsQueryParameter()
? igorService.stopWithJobNameAsQueryParameter(master, jobName, queuedBuild, buildNumber, "")
: igorService.stop(master, jobName, queuedBuild, buildNumber, "");
}

public Map queuedBuild(String master, String item) {
return igorService.queuedBuild(master, item);
}

public Map<String, Object> getBuild(Integer buildNumber, String master, String job) {
return igorService.getBuild(buildNumber, master, encode(job));
return this.igorFeatureFlagProperties.isJobNameAsQueryParameter()
? igorService.getBuildWithJobAsQueryParam(buildNumber, master, encode(job))
: igorService.getBuild(buildNumber, master, encode(job));
}

public Map<String, Object> getPropertyFile(
Expand Down
8 changes: 8 additions & 0 deletions orca-igor/src/main/java/com/netflix/spinnaker/orca/igor/IgorFeatureFlagProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,15 @@

package com.netflix.spinnaker.orca.igor;

import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;

@Getter
@Setter
@ConfigurationProperties(prefix = "feature.igor")
public class IgorFeatureFlagProperties {
<<<<<<< HEAD
private boolean jobNameAsQueryParameter = false;

public boolean isJobNameAsQueryParameter() {
Expand All @@ -29,4 +34,7 @@ public boolean isJobNameAsQueryParameter() {
public void setJobNameAsQueryParameter(boolean jobNameAsQueryParameter) {
this.jobNameAsQueryParameter = jobNameAsQueryParameter;
}
=======
private boolean jobNameAsQueryParameter = true;
>>>>>>> 13c6f6ebf (feat(jenkins): Enable Jenkins job triggers for jobs in sub-folders (#4618))
}
6 changes: 6 additions & 0 deletions orca-igor/src/main/java/com/netflix/spinnaker/orca/igor/IgorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ Map<String, Object> getBuild(
@Path("master") String master,
@Path(encode = false, value = "job") String job);

@GET("/builds/status/{buildNumber}/{master}")
Map<String, Object> getBuildWithJobAsQueryParam(
@Path("buildNumber") Integer buildNumber,
@Path("master") String master,
@Query(encodeValue = false, value = "job") String job);

@GET("/builds/properties/{buildNumber}/{fileName}/{master}/{job}")
Map<String, Object> getPropertyFile(
@Path("buildNumber") Integer buildNumber,
Expand Down
14 changes: 13 additions & 1 deletion orca-igor/src/test/groovy/com/netflix/spinnaker/orca/igor/BuildServiceSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class BuildServiceSpec extends Specification {

void setup() {
igorService = Mock(IgorService)
buildService = new BuildService(igorService, new IgorFeatureFlagProperties())
buildService = new BuildService(igorService, new IgorFeatureFlagProperties(jobNameAsQueryParameter: false))
}

void 'build method encodes the job name'() {
Expand All @@ -52,6 +52,18 @@ class BuildServiceSpec extends Specification {
1 * igorService.getBuild(BUILD_NUMBER, MASTER, JOB_NAME_ENCODED)
}

void 'getBuild method get job name in query when flag is true'() {
IgorFeatureFlagProperties igorFeatureFlagProperties = new IgorFeatureFlagProperties()
igorFeatureFlagProperties.setJobNameAsQueryParameter(true)
buildService = new BuildService(igorService, igorFeatureFlagProperties)

when:
buildService.getBuild(BUILD_NUMBER, MASTER, JOB_NAME)

then:
1 * igorService.getBuildWithJobAsQueryParam(BUILD_NUMBER, MASTER, JOB_NAME_ENCODED)
}

void 'getPropertyFile method encodes the job name'() {
when:
buildService.getPropertyFile(BUILD_NUMBER, FILENAME, MASTER, JOB_NAME)
Expand Down