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

refactor(MPTv2): Change nomenclature from version to tag. #2814

Merged
merged 1 commit into from
Apr 4, 2019
Merged

refactor(MPTv2): Change nomenclature from version to tag. #2814

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
6 changes: 3 additions & 3 deletions orca-front50/src/main/groovy/com/netflix/spinnaker/orca/front50/Front50Service.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,17 @@ interface Front50Service {

// v2
@POST("/v2/pipelineTemplates")
Response saveV2PipelineTemplate(@Query("version") String version, @Body Map pipelineTemplate)
Response saveV2PipelineTemplate(@Query("tag") String tag, @Body Map pipelineTemplate)

@GET("/v2/pipelineTemplates/{pipelineTemplateId}/dependentPipelines")
List<Map<String, Object>> getDependentPipelinesForTemplate(@Path("pipelineTemplateId") String pipelineTemplateId)

@PUT("/v2/pipelineTemplates/{pipelineTemplateId}")
Response updateV2PipelineTemplate(@Path("pipelineTemplateId") String pipelineTemplateId, @Query("version") String version, @Body Map pipelineTemplate)
Response updateV2PipelineTemplate(@Path("pipelineTemplateId") String pipelineTemplateId, @Query("tag") String tag, @Body Map pipelineTemplate)

@DELETE("/v2/pipelineTemplates/{pipelineTemplateId}")
Response deleteV2PipelineTemplate(@Path("pipelineTemplateId") String pipelineTemplateId,
@Query("version") String version,
@Query("tag") String tag,
@Query("digest") String digest)

@GET("/strategies")
Expand Down
6 changes: 3 additions & 3 deletions ...va/com/netflix/spinnaker/orca/pipelinetemplate/tasks/v2/CreateV2PipelineTemplateTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ public TaskResult execute(Stage stage) {

validate(pipelineTemplate);

String version = (String) stage.getContext().get("version");
Response response = front50Service.saveV2PipelineTemplate(version,
String tag = (String) stage.getContext().get("tag");
Response response = front50Service.saveV2PipelineTemplate(tag,
(Map<String, Object>) stage.decodeBase64("/pipelineTemplate", Map.class, pipelineTemplateObjectMapper));

// TODO(jacobkiefer): Reduce duplicated code.
String templateId = StringUtils.isEmpty(version) ? pipelineTemplate.getId() : String.format("%s:%s", pipelineTemplate.getId(), version);
String templateId = StringUtils.isEmpty(tag) ? pipelineTemplate.getId() : String.format("%s:%s", pipelineTemplate.getId(), tag);
Map<String, Object> outputs = new HashMap<>();
outputs.put("notification.type", "createpipelinetemplate");
outputs.put("pipelineTemplate.id", templateId);
Expand Down
4 changes: 2 additions & 2 deletions ...va/com/netflix/spinnaker/orca/pipelinetemplate/tasks/v2/DeleteV2PipelineTemplateTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ public TaskResult execute(Stage stage) {
}

String templateId = (String) stage.getContext().get("pipelineTemplateId");
String version = (String) stage.getContext().get("version");
String tag = (String) stage.getContext().get("tag");
String digest = (String) stage.getContext().get("digest");

Response _ = front50Service.deleteV2PipelineTemplate(templateId, version, digest);
Response _ = front50Service.deleteV2PipelineTemplate(templateId, tag, digest);

Map<String, Object> outputs = new HashMap<>();
outputs.put("notification.type", "deletepipelinetemplate");
Expand Down
6 changes: 3 additions & 3 deletions ...va/com/netflix/spinnaker/orca/pipelinetemplate/tasks/v2/UpdateV2PipelineTemplateTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ public TaskResult execute(Stage stage) {

validate(pipelineTemplate);

String version = (String) stage.getContext().get("version");
String tag = (String) stage.getContext().get("tag");
Response response = front50Service.updateV2PipelineTemplate((String) stage.getContext().get("id"),
version, (Map<String, Object>) stage.decodeBase64("/pipelineTemplate", Map.class, pipelineTemplateObjectMapper));
tag, (Map<String, Object>) stage.decodeBase64("/pipelineTemplate", Map.class, pipelineTemplateObjectMapper));

// TODO(jacobkiefer): Reduce duplicated code.
String templateId = StringUtils.isEmpty(version) ? pipelineTemplate.getId() : String.format("%s:%s", pipelineTemplate.getId(), version);
String templateId = StringUtils.isEmpty(tag) ? pipelineTemplate.getId() : String.format("%s:%s", pipelineTemplate.getId(), tag);
Map<String, Object> outputs = new HashMap<>();
outputs.put("notification.type", "updatepipelinetemplate");
outputs.put("pipelineTemplate.id", templateId);
Expand Down