Skip to content

[roles-restrictions] - Send catalogItemId on any partial update when … #87

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
sergio-soria-bi merged 1 commit into from
Sep 3, 2026
Merged

[roles-restrictions] - Send catalogItemId on any partial update when … #87

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
3 changes: 2 additions & 1 deletion ...ava/org/opendevstack/component_provisioner/server/facade/ProvisionerActionsApiFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,10 @@ private void updateAwxJobIdIntoProjectComponents(ProvisionActionWrapper provisio

var projectKey = provisionActionWrapper.getProjectKey();
var componentId = provisionActionWrapper.getComponentId();
var catalogItemId = provisionActionWrapper.getCatalogItemId();
var accessToken = authenticationProvider.getAccessToken();

componentCatalogService.setWorkflowJobId(projectKey, componentId, awxJobId, accessToken);
componentCatalogService.setWorkflowJobId(projectKey, componentId, catalogItemId, awxJobId, accessToken);
} else {
log.warn("Not updating project components with AWX job id since the AWX request was not successful. HTTP status code: {}", awxResponse.httpStatusCode());
}
Expand Down
2 changes: 2 additions & 0 deletions .../java/org/opendevstack/component_provisioner/server/services/ComponentCatalogService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,13 @@ public void notifyComponentCatalogProvisionStarts(String projectKey,

public void setWorkflowJobId(String projectKey,
String componentId,
String catalogItemId,
String workflowJobId,
String accessToken) {

var provisionStatusUpdateRequest = ProvisioningStatusUpdateRequest.builder()
.componentId(componentId)
.catalogItemId(catalogItemId)
.workflowJobId(workflowJobId)
.build();

Expand Down
7 changes: 5 additions & 2 deletions ...a/org/opendevstack/component_provisioner/server/services/ComponentCatalogServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,7 @@ void givenValidInput_whenSetWorkflowJobId_thenInvokesProvisionerActionsApiWithPa
// given
String projectKey = "PRJ-KEY";
String componentId = "CMP-001";
String catalogItemId = "CAT-001";
String workflowJobId = "WFJ-123";
String accessToken = "secret";

Expand All @@ -462,7 +463,7 @@ void givenValidInput_whenSetWorkflowJobId_thenInvokesProvisionerActionsApiWithPa
ArgumentCaptor.forClass(ProvisioningStatusUpdateRequest.class);

// when
componentCatalogService.setWorkflowJobId(projectKey, componentId, workflowJobId, accessToken);
componentCatalogService.setWorkflowJobId(projectKey, componentId, catalogItemId, workflowJobId, accessToken);

// then
verify(provisionerActionsApi).notifyProvisioningStatusUpdatePartially(
Expand All @@ -476,6 +477,7 @@ void givenValidInput_whenSetWorkflowJobId_thenInvokesProvisionerActionsApiWithPa

ProvisioningStatusUpdateRequest captured = requestCaptor.getValue();
assertThat(captured.getComponentId()).isEqualTo(componentId);
assertThat(captured.getCatalogItemId()).isEqualTo(catalogItemId);
assertThat(captured.getWorkflowJobId()).isEqualTo(workflowJobId);
}

Expand Down Expand Up @@ -536,14 +538,15 @@ void givenProjectKeyAndWorkflowJobId_whenSetWorkflowJobId_thenInvokesProvisioner
// given
var projectKey = "PRJ";
var componentId = "CID";
var catalogItemId = "CAT";
var workflowJobId = "WFJ123";
var accessToken = "TOKEN";

when(componentCatalogServiceProps.getBaseRestUrl()).thenReturn(new URL("http://catalog"));
when(apiClientsBuilder.provisionerActionsApi(accessToken, "http://catalog")).thenReturn(provisionerActionsApi);

// when
componentCatalogService.setWorkflowJobId(projectKey, componentId, workflowJobId, accessToken);
componentCatalogService.setWorkflowJobId(projectKey, componentId, catalogItemId, workflowJobId, accessToken);

// then
verify(provisionerActionsApi).notifyProvisioningStatusUpdatePartially(eq(projectKey), eq(ProvisioningStatus.CREATING), any(ProvisioningStatusUpdateRequest.class));
Expand Down
Loading