You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by pp...@apache.org on 2021/07/19 22:36:21 UTC

[incubator-datalab] 01/01: [DATALAB-2370] YML config fix

This is an automated email from the ASF dual-hosted git repository.

ppapou pushed a commit to branch DATALAB-2370
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit 37b94d5a1880a0f651991927072fa6f873f9d7e3
Author: Pavel Papou <pp...@gmail.com>
AuthorDate: Mon Jul 19 18:36:13 2021 -0400

    [DATALAB-2370] YML config fix
    
    user/password regexp have been adjusted
---
 .../main/java/com/epam/datalab/properties/ChangePropertiesConst.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 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 82cc678..0d9474a 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
@@ -43,8 +43,8 @@ public interface ChangePropertiesConst {
     String SELF_SERVICE_SUPERVISORCTL_RUN_NAME = " ui ";
     String PROVISIONING_SERVICE_SUPERVISORCTL_RUN_NAME = " provserv ";
     String BILLING_SERVICE_SUPERVISORCTL_RUN_NAME = " billing ";
-    String SECRET_REGEX = "((.*)[sS]ecret(.*)|(p|P)assword): (.*)";
-    String USER_REGEX = " *(user|username): (.*)";
+    String SECRET_REGEX = "^?\\s([sS]ecret(.*)|.*assword|accessKeyId|secretAccessKey):?\\s(.*)";
+    String USER_REGEX = "(^?\\Suser|username):?\\s(.*)";
     String SECRET_REPLACEMENT_FORMAT = " ***********";
     String SUPERVISORCTL_RESTART_SH_COMMAND = "sudo supervisorctl restart";
     String CHANGE_CHMOD_SH_COMMAND_FORMAT = "sudo chmod %s %s";

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org