This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new 97bbfcf [DATALAB] -- [BE-ConfigPage]fixed bug with repeated changed
in config while writing yaml.
new 1f61f87 Merge remote-tracking branch 'origin/develop' into develop
97bbfcf is described below
commit 97bbfcf2d5630da43a970d87dbe65798614e09db
Author: KinashYurii <[email protected]>
AuthorDate: Tue Jul 13 16:02:22 2021 +0300
[DATALAB] -- [BE-ConfigPage]fixed bug with repeated changed in config while
writing yaml.
---
.../java/com/epam/datalab/properties/ChangePropertiesConst.java | 6 +++---
.../java/com/epam/datalab/properties/ChangePropertiesService.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesConst.java
b/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesConst.java
index ea71207..82cc678 100644
---
a/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesConst.java
+++
b/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesConst.java
@@ -24,14 +24,14 @@ public interface ChangePropertiesConst {
String GKE_SELF_SERVICE = "self-service.yaml";
String SELF_SERVICE = "self-service.yml";
String SELF_SERVICE_PROP_PATH = "/opt/datalab/conf/self-service.yml";
- // String SELF_SERVICE_PROP_PATH =
"services/self-service/self-service.yml";
+ // String SELF_SERVICE_PROP_PATH =
"services/self-service/self-service.yml";
String PROVISIONING_SERVICE = "provisioning.yml";
String PROVISIONING_SERVICE_PROP_PATH =
"/opt/datalab/conf/provisioning.yml";
-// String PROVISIONING_SERVICE_PROP_PATH =
"services/provisioning-service/provisioning.yml";
+//String PROVISIONING_SERVICE_PROP_PATH =
"services/provisioning-service/provisioning.yml";
String BILLING_SERVICE = "billing.yml";
String BILLING_SERVICE_PROP_PATH = "/opt/datalab/conf/billing.yml";
- // String BILLING_SERVICE_PROP_PATH =
"services/billing-gcp/billing.yml";
+ // String BILLING_SERVICE_PROP_PATH =
"services/billing-gcp/billing.yml";
// String BILLING_SERVICE_PROP_PATH =
"services/billing-azure/billing.yml";
// String BILLING_SERVICE_PROP_PATH = "services/billing-aws/billing.yml";
String GKE_BILLING_PATH = "/root/billing.yaml";
diff --git
a/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesService.java
b/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesService.java
index 095b78c..3190afe 100644
---
a/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesService.java
+++
b/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/ChangePropertiesService.java
@@ -169,8 +169,8 @@ public class ChangePropertiesService {
poll = poll.replace("*", "\\*");
String old = oldPassMatcher.group();
old = old.replace("$", "\\$");
- old = old.replace("{", "\\}");
- old = old.replace("}", "\\}");
+ old = old.replaceFirst("\\{", "\\{");
+ old = old.replaceFirst("}", "\\}");
fileWithReplacedEmptySecrets =
fileWithReplacedEmptySecrets.replaceFirst(poll, old);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
