From 70247cb50ad39fc3f53e683968ac955bdc42d01f Mon Sep 17 00:00:00 2001 From: Maor Shapira Date: Mon, 15 Feb 2021 10:58:53 +0200 Subject: [PATCH] EBL-423:fix edit blocker functionally no to reset the json configuration of the blocker (#489) * EBL-423: fix edit of Single Region Blocker --- .../apollo/controllers/BlockerDefinitionController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apollo-backend/src/main/java/io/logz/apollo/controllers/BlockerDefinitionController.java b/apollo-backend/src/main/java/io/logz/apollo/controllers/BlockerDefinitionController.java index e8eaf12d..31f24455 100644 --- a/apollo-backend/src/main/java/io/logz/apollo/controllers/BlockerDefinitionController.java +++ b/apollo-backend/src/main/java/io/logz/apollo/controllers/BlockerDefinitionController.java @@ -188,9 +188,15 @@ public void updateBlockerDefinition(int id, String name, Integer environmentId, blockerDefinition.setStackId(stackId); blockerDefinition.setAvailability(availability); blockerDefinition.setBlockerTypeName(blockerTypeName); - blockerDefinition.setBlockerJsonConfiguration(blockerJsonConfiguration); blockerDefinition.setActive(isActive); + if (blockerTypeName.equals(BlockerTypeName.SINGLE_REGION)) { + blockerJsonConfiguration = initSingleRegionBlockerJsonConfig(environmentId, serviceId, stackId, availability, blockerJsonConfiguration, req); + if (blockerJsonConfiguration == null) return; + } + + blockerDefinition.setBlockerJsonConfiguration(blockerJsonConfiguration); + blockerDefinitionDao.updateBlockerDefinition(blockerDefinition); logger.info(String.format("Updated blocker: blockerId - %s, blockerName - %s, active - %s", blockerDefinition.getId(), blockerDefinition.getName(), blockerDefinition.getActive())); assignJsonResponseToReq(req, HttpStatus.OK, blockerDefinition);