Skip to content

Set raw component url value when updating a component #84

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

Merged
ivan-risueno merged 2 commits into from
Sep 4, 2026
Merged

Set raw component url value when updating a component #84

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
5195385
Set raw component url value when updating a component
Sep 4, 2026
a0a5e71
Improve one test
Sep 4, 2026
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
8 changes: 1 addition & 7 deletions ...ain/java/org/opendevstack/component_catalog/server/services/ProjectComponentsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ private ProjectComponent updateComponentIfMatch(Map.Entry<String, ProjectCompone
.catalogItemId(entry.getValue().getCatalogItemId())
.status(request.getStatus())
.catalogItemRef(resolveCatalogItemRef(entry.getValue(), request.getCatalogItemId()))
.componentUrl(resolveComponentUrl(entry.getValue(), request.getComponentUrl()))
.componentUrl(request.getComponentUrl()) // When a provision fails it should be able to update it to ""
.workflowJobId(resolveWorkflowJobId(entry.getValue(), request.getWorkflowJobId()))
.deletionWorkflowJobId(resolveDeletionWorkflowJobId(entry.getValue(), request.getDeletionWorkflowJobId()))
.createdAt(request.getCreatedAt())
Expand All @@ -181,12 +181,6 @@ private String resolveCatalogItemRef(ProjectComponent value, String catalogItemI
: getBranchRefFromCatalogItemId(catalogItemId);
}

private String resolveComponentUrl(ProjectComponent value, String newUrl) {
return StringUtils.isBlank(newUrl)
? value.getComponentUrl()
: newUrl;
}

private List<Parameter> resolveParameters(ProjectComponent value, List<Parameter> params) {
return (params == null || params.isEmpty())
? value.getParameters()
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/opendevstack/component_catalog/server/services/ProjectComponentsServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,14 @@ void givenExistingComponent_whenUpdatePartially_thenUpdatesOnlyFieldsProvided()
//when
ProjectComponents updated = service.updatePartiallyExistingComponent(
pc,
request("comp1", encodedFull, Status.CREATED, null, null, "created", "updated", parameters)
request("comp1", encodedFull, Status.CREATED, "", null, "created", "updated", parameters)
);

//then
ProjectComponent result = updated.getComponents().get("comp1");

assertThat(result.getStatus()).isEqualTo(Status.CREATED);
assertThat(result.getComponentUrl()).isEqualTo("oldUrl"); // unchanged
assertThat(result.getComponentUrl()).isEqualTo("");
assertThat(result.getCatalogItemRef()).isEqualTo(base64("?at=refs/heads/dev"));
assertThat(result.getCreatedAt()).isEqualTo("created");
assertThat(result.getUpdatedAt()).isEqualTo("updated");
Expand Down
Loading