[#7706] Platform: Edit backup config credentials.

managed/src/main/java/com/yugabyte/yw/controllers/CustomerConfigController.java

@@ -2,22 +2,26 @@
 
 package com.yugabyte.yw.controllers;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import com.google.inject.Inject;
 
 import com.yugabyte.yw.common.ApiResponse;
 import com.yugabyte.yw.models.Audit;
 import com.yugabyte.yw.models.CustomerConfig;
+import com.yugabyte.yw.models.helpers.CommonUtils;
 import com.yugabyte.yw.models.helpers.CustomerConfigValidator;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import play.libs.Json;
 import play.mvc.Result;
 
 import java.util.UUID;
 
+
 public class CustomerConfigController extends AuthenticatedController {
   public static final Logger LOG = LoggerFactory.getLogger(CustomerConfigController.class);
 
@@ -57,4 +61,31 @@ public Result delete(UUID customerUUID, UUID configUUID) {
   public Result list(UUID customerUUID) {
     return ApiResponse.success(CustomerConfig.getAll(customerUUID));
   }
+
+  public Result edit(UUID customerUUID, UUID configUUID) {
+    JsonNode formData =  request().body().asJson();
+    ObjectNode errorJson = configValidator.validateFormData(formData);
+    if (errorJson.size() > 0) {
+      return ApiResponse.error(BAD_REQUEST, errorJson);
+    }
+
+    errorJson = configValidator.validateDataContent(formData);
+    if (errorJson.size() > 0) {
+      return ApiResponse.error(BAD_REQUEST, errorJson);
+    }
+    CustomerConfig customerConfig = CustomerConfig.get(customerUUID, configUUID);
+    if (customerConfig == null) {
+      return ApiResponse.error(BAD_REQUEST, "Invalid configUUID: " + configUUID);
+    }
+    CustomerConfig config = CustomerConfig.get(configUUID);
+    JsonNode data = Json.toJson(formData.get("data"));
+    if (data != null && data.get("BACKUP_LOCATION") != null) {
+      ((ObjectNode)data).put("BACKUP_LOCATION", config.data.get("BACKUP_LOCATION"));
+    }
+    JsonNode updatedData = CommonUtils.unmaskConfig(config.data, data);
+    config.data = Json.toJson(updatedData);
+    config.update();
+    Audit.createAuditEntry(ctx(), request());
+    return ApiResponse.success(config);
+  }
 }

managed/src/main/java/com/yugabyte/yw/models/helpers/CommonUtils.java

@@ -64,8 +64,8 @@ public static JsonNode maskConfig(JsonNode config) {
   }
 
   private static String getMaskedValue(String key, String value) {
-    return isStrictlySensitiveField(key) || (value == null) ? MASKED_FIELD_VALUE
-        : value.replaceAll(maskRegex, "*");
+    return isStrictlySensitiveField(key) || value.length() < 5
+        || (value == null) ? MASKED_FIELD_VALUE : value.replaceAll(maskRegex, "*");
   }
 
   /**

managed/src/main/resources/v1.routes

@@ -49,6 +49,7 @@ DELETE  /customers/:cUUID/providers/:pUUID/instance_types/:code                c
 POST    /customers/:cUUID/providers/setup_docker                               com.yugabyte.yw.controllers.CloudProviderController.setupDocker(cUUID: java.util.UUID)
 POST    /customers/:cUUID/configs                                              com.yugabyte.yw.controllers.CustomerConfigController.create(cUUID: java.util.UUID)
 GET     /customers/:cUUID/configs                                              com.yugabyte.yw.controllers.CustomerConfigController.list(cUUID: java.util.UUID)
+PUT     /customers/:cUUID/configs/:configUUID                                  com.yugabyte.yw.controllers.CustomerConfigController.edit(cUUID: java.util.UUID, configUUID: java.util.UUID)
 DELETE  /customers/:cUUID/configs/:configUUID                                  com.yugabyte.yw.controllers.CustomerConfigController.delete(cUUID: java.util.UUID, configUUID: java.util.UUID)
 
 #---------------------------------------------------------------------------------------------------

managed/src/test/java/com/yugabyte/yw/controllers/CustomerConfigControllerTest.java

@@ -169,4 +169,65 @@ public void testDeleteInUseStorageConfig() {
     assertEquals(0, CustomerConfig.getAll(defaultCustomer.uuid).size());
     assertAuditEntry(1, defaultCustomer.uuid);
   }
+
+  @Test
+  public void testEditInUseStorageConfig() {
+    ObjectNode bodyJson = Json.newObject();
+    JsonNode data = Json.parse("{\"BACKUP_LOCATION\": \"test\", \"ACCESS_KEY\": \"A-KEY\", " +
+        "\"ACCESS_SECRET\": \"A-SECRET\"}");
+    bodyJson.put("name", "test1");
+    bodyJson.set("data", data);
+    bodyJson.put("type", "STORAGE");
+    UUID configUUID = ModelFactory.createS3StorageConfig(defaultCustomer).configUUID;
+    Backup backup = ModelFactory.createBackup(defaultCustomer.uuid, UUID.randomUUID(),
+        configUUID);
+    String url = "/api/customers/" + defaultCustomer.uuid + "/configs/" + configUUID;
+    Result result = FakeApiHelper.doRequestWithAuthTokenAndBody("PUT", url,
+        defaultUser.createAuthToken(), bodyJson);
+    assertOk(result);
+    backup.delete();
+    result = FakeApiHelper.doRequestWithAuthTokenAndBody("PUT", url,
+        defaultUser.createAuthToken(), bodyJson);
+    assertOk(result);
+    JsonNode json = Json.parse(contentAsString(result));
+    assertEquals("s3://foo", json.get("data").get("BACKUP_LOCATION").textValue());
+  }
+
+  @Test
+  public void testEditInvalidCustomerConfig() {
+    ObjectNode bodyJson = Json.newObject();
+    JsonNode data = Json.parse("{\"foo\":\"bar\"}");
+    bodyJson.put("name", "test1");
+    bodyJson.set("data", data);
+    bodyJson.put("type", "STORAGE");
+    Customer customer = ModelFactory.testCustomer("nc", "New Customer");
+    UUID configUUID = ModelFactory.createS3StorageConfig(customer).configUUID;
+    String url = "/api/customers/" + defaultCustomer.uuid + "/configs/" + configUUID;
+    Result result = FakeApiHelper.doRequestWithAuthTokenAndBody("PUT", url,
+        defaultUser.createAuthToken(), bodyJson);
+    assertBadRequest(result, "Invalid configUUID: " + configUUID);
+    assertEquals(1, CustomerConfig.getAll(customer.uuid).size());
+    assertAuditEntry(0, defaultCustomer.uuid);
+  }
+
+  @Test
+  public void testEditWithBackupLocation() {
+    ObjectNode bodyJson = Json.newObject();
+    JsonNode data = Json.parse("{\"BACKUP_LOCATION\": \"test\", \"ACCESS_KEY\": \"A-KEY-NEW\", " +
+        "\"ACCESS_SECRET\": \"A-SECRET-NEW\"}");
+    bodyJson.put("name", "test1");
+    bodyJson.set("data", data);
+    bodyJson.put("type", "STORAGE");
+    UUID configUUID = ModelFactory.createS3StorageConfig(defaultCustomer).configUUID;
+    String url = "/api/customers/" + defaultCustomer.uuid + "/configs/" + configUUID;
+    Result result = FakeApiHelper.doRequestWithAuthTokenAndBody("PUT", url,
+        defaultUser.createAuthToken(), bodyJson);
+    assertOk(result);
+    JsonNode json = Json.parse(contentAsString(result));
+    // Should not update the field BACKUP_LOCATION to "test".
+    assertEquals("s3://foo", json.get("data").get("BACKUP_LOCATION").textValue());
+    // SHould be updated and the API response should give asked data.
+    assertEquals("A-*****EW", json.get("data").get("ACCESS_KEY").textValue());
+    assertEquals("A-********EW", json.get("data").get("ACCESS_SECRET").textValue());
+  }
 }

managed/ui/src/actions/customers.js

@@ -56,6 +56,11 @@ export const FETCH_YUGAWARE_VERSION_RESPONSE = 'FETCH_YUGAWARE_VERSION_RESPONSE'
 export const ADD_CUSTOMER_CONFIG = 'ADD_CUSTOMER_CONFIG';
 export const ADD_CUSTOMER_CONFIG_RESPONSE = 'ADD_CUSTOMER_CONFIG_RESPONSE';
 
+export const SET_INITIAL_CONFIG = 'SET_INITIAL_CONFIG';
+
+export const UPDATE_CUSTOMER_CONFIG = 'UPDATE_CUSTOMER_CONFIG';
+export const UPDATE_CUSTOMER_CONFIG_RESPONSE = 'UPDATE_CUSTOMER_CONFIG_RESPONSE';
+
 export const DELETE_CUSTOMER_CONFIG = 'DELETE_CUSTOMER_CONFIG';
 export const DELETE_CUSTOMER_CONFIG_RESPONSE = 'DELETE_CUSTOMER_CONFIG_RESPONSE';
 
@@ -488,6 +493,29 @@ export function addCustomerConfig(config) {
   };
 }
 
+export function setInitialConfigValues(initialValues) {
+  return {
+    type: SET_INITIAL_CONFIG,
+    payload: initialValues
+  };
+}
+
+export function updateCustomerConfig(config) {
+  const cUUID = localStorage.getItem('customerId');
+  const request = axios.put(`${ROOT_URL}/customers/${cUUID}/configs/${config.configUUID}`, config);
+  return {
+    type: UPDATE_CUSTOMER_CONFIG,
+    payload: request
+  };
+}
+
+export function updateCustomerConfigResponse(response) {
+  return {
+    type: UPDATE_CUSTOMER_CONFIG_RESPONSE,
+    payload: response
+  };
+}
+
 export function addCustomerConfigResponse(response) {
   return {
     type: ADD_CUSTOMER_CONFIG_RESPONSE,

managed/ui/src/components/config/ConfigProvider/providerConfig.scss

@@ -400,10 +400,10 @@
   display: flex;
   justify-content: flex-end;
   align-items: center;
+  column-gap: 8px;
 
   .disable-delete {
     display: inline-block;
-    margin: 4px 20px 4px auto;
     font-size: inherit;
 
     .fa-ban {