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

Resolves fetch plugin incompatibility with gocd > 18.10 #68

Merged
merged 1 commit into from
Jan 30, 2019
Merged

Resolves fetch plugin incompatibility with gocd > 18.10 #68

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
4 changes: 4 additions & 0 deletions fetch/src/main/java/com/indix/gocd/s3fetch/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public class Config {
private final String source;
private final String sourcePrefix;
private final String destination;
private final String jobName;

public String getMaterialType() {
return materialType;
Expand Down Expand Up @@ -52,6 +53,8 @@ public String getDestination() {
return destination;
}

public String getJobName() { return jobName; }

public Config(Map config) {
materialType = getValue(config, MATERIAL_TYPE);
repo = getValue(config, REPO);
Expand All @@ -62,6 +65,7 @@ public Config(Map config) {
source = getValue(config, SOURCE);
sourcePrefix = getValue(config, SOURCE_PREFIX);
destination = getValue(config, DESTINATION);
jobName = getValue(config, JOB_NAME);
}

private String escapeEnvironmentVariable(String value) {
Expand Down
5 changes: 5 additions & 0 deletions fetch/src/main/java/com/indix/gocd/s3fetch/FetchTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@ private GoPluginApiResponse handleGetConfigRequest() {
destination.put("required", false);
config.put(Constants.DESTINATION, destination);

HashMap jobName = new HashMap();
jobName.put("default-value", "");
jobName.put("required", false);
config.put(Constants.JOB_NAME, jobName);

return createResponse(DefaultGoPluginApiResponse.SUCCESS_RESPONSE_CODE, config);
}

Expand Down
6 changes: 3 additions & 3 deletions fetch/src/main/java/com/indix/gocd/s3fetch/PipelineFetchExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ protected String getArtifactsLocationTemplate(Config config, GoEnvironment env)
String pipelineCounter = locatorParts[1];
String stage = locatorParts[2];
String stageCounter = locatorParts[3];
String job = config.getJob();
String job = config.getJobName();

return env.artifactsLocationTemplate(pipeline, stage, job, pipelineCounter, stageCounter);
}
Expand All @@ -33,8 +33,8 @@ public Map<String, String> validate(Config config) {
if (StringUtils.isBlank(config.getMaterial())) {
errors.put(Constants.MATERIAL, Constants.REQUIRED_FIELD_MESSAGE);
}
if (StringUtils.isBlank(config.getJob())) {
errors.put(Constants.JOB, Constants.REQUIRED_FIELD_MESSAGE);
if (StringUtils.isBlank(config.getJobName())) {
errors.put(Constants.JOB_NAME, Constants.REQUIRED_FIELD_MESSAGE);
}
return errors;
}
Expand Down
5 changes: 3 additions & 2 deletions fetch/src/main/resources/views/task.template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</div>
<div class="form_item_block" ng-show="MaterialType == 'Pipeline'">
<label>Job:<span class="asterisk">*</span></label>
<input type="text" ng-model="Job" ng-required="true">
<span class="form_error" ng-show="GOINPUTNAME[Job].$error.server">{{ GOINPUTNAME[Job].$error.server }}</span>
<input type="text" ng-model="JobName" ng-required="true">
<span class="form_error" ng-show="GOINPUTNAME[JobName].$error.server">{{ GOINPUTNAME[JobName].$error.server }}</span>
</div>

<!-- Stage fields -->
Expand Down Expand Up @@ -85,6 +85,7 @@
this.Repo = null;
this.Package = null;
this.Material = null;
this.JobName = null;
this.clearStageFields();
};
});
Expand Down
8 changes: 4 additions & 4 deletions fetch/src/test/java/com/indix/gocd/s3fetch/PipelineFetchExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void setUp() throws Exception {
config = new Config(Maps.builder()
.with(Constants.MATERIAL_TYPE, Maps.builder().with("value", "Pipeline").build())
.with(Constants.MATERIAL, Maps.builder().with("value", "mymaterial").build())
.with(Constants.JOB, Maps.builder().with("value", "job").build())
.with(Constants.JOB_NAME, Maps.builder().with("value", "job").build())
.with(Constants.DESTINATION, Maps.builder().with("value", "artifacts").build())
.build());

Expand Down Expand Up @@ -105,7 +105,7 @@ public void shouldBeAbleToHandleTaskConfigEntriesWithDashesInTheName() {

config = new Config(Maps.builder()
.with(Constants.MATERIAL, Maps.builder().with("value", "my-material").build())
.with(Constants.JOB, Maps.builder().with("value", "job").build())
.with(Constants.JOB_NAME, Maps.builder().with("value", "job").build())
.with(Constants.DESTINATION, Maps.builder().with("value", "artifacts").build())
.build());
TaskExecutionResult result = fetchExecutor.execute(config, mockContext(mockVariables));
Expand All @@ -125,7 +125,7 @@ public void shouldBeAbleToHandleTaskConfigEntriesWithPeriodsInTheName() {

config = new Config(Maps.builder()
.with(Constants.MATERIAL, Maps.builder().with("value", "my.material").build())
.with(Constants.JOB, Maps.builder().with("value", "job").build())
.with(Constants.JOB_NAME, Maps.builder().with("value", "job").build())
.with(Constants.DESTINATION, Maps.builder().with("value", "artifacts").build())
.build());
TaskExecutionResult result = fetchExecutor.execute(config, mockContext(mockVariables));
Expand All @@ -145,7 +145,7 @@ public void shouldBeAbleToHandleTaskConfigEntriesWithSpecialCharactersInTheName(

config = new Config(Maps.builder()
.with(Constants.MATERIAL, Maps.builder().with("value", "my`~!@#$%^&*()-+=[{]}\\|;:'\",<.>/?material").build())
.with(Constants.JOB, Maps.builder().with("value", "job").build())
.with(Constants.JOB_NAME, Maps.builder().with("value", "job").build())
.with(Constants.DESTINATION, Maps.builder().with("value", "artifacts").build())
.build());
TaskExecutionResult result = fetchExecutor.execute(config, mockContext(mockVariables));
Expand Down
1 change: 1 addition & 0 deletions utils/src/main/java/com/indix/gocd/utils/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public class Constants {
public static final String SOURCE = "Source";
public static final String SOURCE_PREFIX = "SourcePrefix";
public static final String DESTINATION = "Destination";
public static final String JOB_NAME = "JobName";

public static final String REQUIRED_FIELD_MESSAGE = "This field is required";
}