Skip to content

fix(core): handle concurrent deletion and update of environment #2986

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

Open
Divyanshu1998 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(core): handle concurrent deletion and update of environment #2986

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
7 changes: 7 additions & 0 deletions core/src/main/java/io/aiven/klaw/service/EnvsClustersTenantsControllerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,13 @@ public ApiResponse addNewEnv(EnvModel newEnv) throws KlawException, KlawValidati
newEnv.setId(String.valueOf(id));
}
} else {
Optional<Env> existingEnvOpt =
envActualList.stream().filter(env -> env.getId().equals(newEnv.getId())).findFirst();
if (existingEnvOpt.isEmpty()) {

// cannot modify a deleted env
return ApiResponse.notOk("Cannot modify a deleted environment.");
}
// modify env
envActualList =
envActualList.stream()
Expand Down
3 changes: 3 additions & 0 deletions core/src/main/resources/static/js/modifyEnvs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,9 @@ app.controller("modifyEnvsCtrl", function($scope, $http, $location, $window) {
$window.location.href = $window.location.origin + $scope.dashboardDetails.contextPath + "/envs";
});
}else $scope.showSubmitFailed('','');
setTimeout(function(){
$window.location.href = $window.location.origin + $scope.dashboardDetails.contextPath + "/envs";
}, 1200);
}).error(
function(error)
{
Expand Down
30 changes: 30 additions & 0 deletions core/src/test/java/io/aiven/klaw/service/EnvsClustersTenantsControllerServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,4 +1275,34 @@ private static Map<Integer, KwClusters> buildClusters(
}
return map;
}

@Test
@WithMockUser(
username = "james",
authorities = {"ADMIN", "USER"})
void addNewEnv_UpdateOfDeletedEnv_ReturnsNotOk() throws KlawException, KlawValidationException {
EnvModel envToUpdate = getTestEnvModel(null);
envToUpdate.setId("99");

when(commonUtilsService.isNotAuthorizedUser(userDetails, PermissionType.ADD_EDIT_DELETE_ENVS))
.thenReturn(false);
when(handleDbRequestsJdbc.getAllEnvs(101))
.thenReturn(
List.of(
buildEnv("1", 101, "DEV", KafkaClustersType.KAFKA, 1),
buildEnv("2", 101, "TST", KafkaClustersType.KAFKA, 2)));
when(manageDatabase.getAllEnvList(101))
.thenReturn(
List.of(
buildEnv("1", 101, "DEV", KafkaClustersType.KAFKA, 1),
buildEnv("2", 101, "TST", KafkaClustersType.KAFKA, 2)));

ApiResponse response = service.addNewEnv(envToUpdate);

// Assert
assertThat(response.isSuccess()).isFalse();
assertThat(response.getMessage()).contains("Cannot modify a deleted environment.");

verify(handleDbRequestsJdbc, times(0)).addNewEnv(any(Env.class));
}
}
Loading