Skip to content

[inmutable-collections-update] - Fix bug where we tried to update an … #22

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 2 commits into from
Apr 21, 2026
Merged

[inmutable-collections-update] - Fix bug where we tried to update an … #22

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2702dff
[inmutable-collections-update] - Fix bug where we tried to update an …
sergio-soria-bi Apr 21, 2026
e6122ae
[inmutable-collections-update] - Fix bug where we tried to update an …
sergio-soria-bi Apr 21, 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
23 changes: 21 additions & 2 deletions ...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 @@ -18,6 +18,7 @@
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Objects;

@Service
@Slf4j
Expand Down Expand Up @@ -97,6 +98,7 @@ private String getParameterString(ProvisionAction provisionAction, String parame
return provisionAction.getParameters().stream()
.filter(parameter -> parameterName.equals(parameter.getName()))
.map(ProvisionActionParameter::getValue)
.filter(Objects::nonNull)
.map(Object::toString)
.findAny()
.orElse(Strings.EMPTY);
Expand Down Expand Up @@ -156,8 +158,25 @@ private AwxWorkflowJobLaunch buildAwxWorkflowJobLaunch(ProvisionAction provision
.value(provisionAction.getId())
.build();

provisionAction.addParametersItem(parameterItem);
var updatedProvisionAction = addParametersItem(provisionAction, parameterItem);

return entitiesMapper.asAwxWorkflowJobLaunch(provisionAction);
return entitiesMapper.asAwxWorkflowJobLaunch(updatedProvisionAction);
}

// In order to be safe, we create a new ProvisionAction instance with the additional parameter instead of modifying the existing one (which might be immutable or shared).
private ProvisionAction addParametersItem(ProvisionAction provisionAction, ProvisionActionParameter parameterItem) {
if (parameterItem == null) {
return provisionAction;
} else {
Copy link
Copy Markdown
Contributor

@ivan-risueno ivan-risueno Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extract the code outside the else block. This reduces one level of indentation, which improves readability.

var newParameters = provisionAction.getParameters() == null
? List.of(parameterItem)
: java.util.stream.Stream.concat(provisionAction.getParameters().stream(), java.util.stream.Stream.of(parameterItem))
.toList();

return provisionAction.toBuilder()
.id(provisionAction.getId())
.parameters(newParameters)
.build();
}
}
}
35 changes: 34 additions & 1 deletion ...org/opendevstack/component_provisioner/server/facade/ProvisionerActionsApiFacadeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.opendevstack.component_catalog.client.projects_info_service.v1_0_0.model.ProjectInfo;
import org.opendevstack.component_provisioner.server.controllers.exceptions.ProjectConfigurationException;
import org.opendevstack.component_provisioner.server.mappers.EntitiesMapper;
import org.opendevstack.component_provisioner.server.model.ProvisionAction;
import org.opendevstack.component_provisioner.server.model.ProvisionActionMother;
import org.opendevstack.component_provisioner.server.model.ProvisionActionParameter;
import org.opendevstack.component_provisioner.server.model.ProvisionActionParameterMother;
Expand Down Expand Up @@ -62,7 +63,8 @@ void requestProvisionToAwx_mapsResponseCorrectly() {
var job = new AwxWorkflowJob();
var response = new ProvisionActionResponse();

when(entitiesMapper.asAwxWorkflowJobLaunch(action)).thenReturn(launch);
ArgumentCaptor<ProvisionAction> actionCaptor = ArgumentCaptor.forClass(ProvisionAction.class);
when(entitiesMapper.asAwxWorkflowJobLaunch(actionCaptor.capture())).thenReturn(launch);
when(awxService.triggerWorkflowJob(action.getId(), launch))
.thenReturn(Pair.of(HttpStatus.OK, Optional.of(job)));
when(entitiesMapper.asProvisionActionResponse(job)).thenReturn(response);
Expand All @@ -73,6 +75,10 @@ void requestProvisionToAwx_mapsResponseCorrectly() {
// then
assertEquals(HttpStatus.OK, result.httpStatusCode());
assertEquals(response, result.awxResponseBody());

var capturedAction = actionCaptor.getValue();
assertThat(capturedAction.getParameters())
.anyMatch(p -> "action_id".equals(p.getName()) && action.getId().equals(p.getValue()));
}

@Test
Expand Down Expand Up @@ -192,4 +198,31 @@ void addSystemParametersToAction_usesFirstCluster_whenMultipleClustersAreReturne
assertThat(clusterLocation).isEqualTo("cluster-primary");
}

@Test
void requestProvisionToAwx_addsActionIdParameter_whenParametersIsNull() {
// given
var action = ProvisionActionMother.of(null);

var launch = new AwxWorkflowJobLaunch();
var job = new AwxWorkflowJob();
var response = new ProvisionActionResponse();

ArgumentCaptor<ProvisionAction> actionCaptor = ArgumentCaptor.forClass(ProvisionAction.class);
when(entitiesMapper.asAwxWorkflowJobLaunch(actionCaptor.capture())).thenReturn(launch);
when(awxService.triggerWorkflowJob(action.getId(), launch))
.thenReturn(Pair.of(HttpStatus.OK, Optional.of(job)));
when(entitiesMapper.asProvisionActionResponse(job)).thenReturn(response);

// when
var result = facade.requestProvisionToAwx(action);

// then
assertEquals(HttpStatus.OK, result.httpStatusCode());
assertEquals(response, result.awxResponseBody());

var capturedAction = actionCaptor.getValue();
assertThat(capturedAction.getParameters())
.hasSize(1)
.anyMatch(p -> "action_id".equals(p.getName()) && action.getId().equals(p.getValue()));
}
}
Loading