[airavata-custos] branch develop updated: move super credentials to secret env

[is...@apache.org]

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

isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git


The following commit(s) were added to refs/heads/develop by this push:
     new 6f68255  move super credentials to secret  env
     new eac1254  Merge pull request #56 from isururanawaka/cleanup
6f68255 is described below

commit 6f682552078943ca4814b2878e5721365fb72263
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Mon May 4 11:39:55 2020 -0400

    move super credentials to secret  env
---
 .../src/main/resources/bootstrap.properties                           | 2 +-
 .../src/main/resources/bootstrap.properties                           | 3 ++-
 .../custos/federated/services/clients/cilogon/CILogonClient.java      | 4 ++--
 .../custos/federated/services/clients/keycloak/KeycloakClient.java    | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/custos-core-services/credential-store-core-service/src/main/resources/bootstrap.properties b/custos-core-services/credential-store-core-service/src/main/resources/bootstrap.properties
index 5350a24..3d6e403 100644
--- a/custos-core-services/credential-store-core-service/src/main/resources/bootstrap.properties
+++ b/custos-core-services/credential-store-core-service/src/main/resources/bootstrap.properties
@@ -17,7 +17,7 @@
 #  under the License.
 #
 
-spring.cloud.vault.token=s.8ey5QlIlHR7jG5AMP6vVgVi5
+spring.cloud.vault.token=vault_token
 spring.cloud.vault.scheme=http
 spring.cloud.vault.host=vault.custos.scigap.org
 spring.cloud.vault.port=30249
diff --git a/custos-core-services/federated-authentication-core-service/src/main/resources/bootstrap.properties b/custos-core-services/federated-authentication-core-service/src/main/resources/bootstrap.properties
index e7bca1d..760bf92 100644
--- a/custos-core-services/federated-authentication-core-service/src/main/resources/bootstrap.properties
+++ b/custos-core-services/federated-authentication-core-service/src/main/resources/bootstrap.properties
@@ -17,4 +17,5 @@
 #  under the License.
 #
 
-spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
\ No newline at end of file
+spring.cloud.config.uri=http://custos-configuration-service.custos.svc.cluster.local:9000
+spring.profiles.active:default
\ No newline at end of file
diff --git a/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/cilogon/CILogonClient.java b/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/cilogon/CILogonClient.java
index 6c1cb77..9fd17b9 100644
--- a/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/cilogon/CILogonClient.java
+++ b/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/cilogon/CILogonClient.java
@@ -37,11 +37,11 @@ import java.util.Base64;
 public class CILogonClient {
     private final static Logger LOGGER = LoggerFactory.getLogger(CILogonClient.class);
 
-    @Value("${ciLogon.admin.client.id:cilogon:/adminClient/22dc117c021f7787a3df8519438d4235/1581020563144}")
+    @Value("${ciLogon.admin.client.id}")
     private String adminClientId;
 
 
-    @Value("${ciLogon.admin.client.secret:c3o_634Ej3IpLCi98LZAx8JX8TE8WhfRtUSFB1qEPaoBKXblNzdCd6VC8pSCh0-SmWC8Tb729Rs6Mh2nQytL5g}")
+    @Value("${ciLogon.admin.client.secret}")
     private String adminClientSecret;
 
 
diff --git a/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/KeycloakClient.java b/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/KeycloakClient.java
index 4d0cbfe..ac1def1 100644
--- a/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/KeycloakClient.java
+++ b/custos-federated-services-clients/src/main/java/org/apache/custos/federated/services/clients/keycloak/KeycloakClient.java
@@ -70,10 +70,10 @@ public class KeycloakClient {
     @Value("${iam.server.url:https://keycloak.custos.scigap.org:31000/auth/}")
     private String iamServerURL;
 
-    @Value("${iam.server.admin.username:keycloak}")
+    @Value("${iam.server.admin.username}")
     private String superAdminUserName;
 
-    @Value("${iam.server.admin.password:5SocwZ78TEUyyj0R}")
+    @Value("${iam.server.admin.password}")
     private String superAdminPassword;
 
     @Value("${iam.server.super.admin.realm.id:master}")