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 7ee4e754d Fix local development issues
new 549fe8f0f Merge pull request #379 from isururanawaka/develop
7ee4e754d is described below
commit 7ee4e754de2757e1ff9ff5a2ed87b09fc33ca6fb
Author: Isuru Ranawaka <[email protected]>
AuthorDate: Fri Apr 28 19:26:42 2023 -0400
Fix local development issues
---
.../custos-core-services-server/Dockerfile | 2 +-
.../custos-core-services-server/pom.xml | 12 +++++++++
.../src/main/resources/application.properties | 2 +-
.../src/main/resources/certificate_mul.p12 | Bin 0 -> 2621 bytes
.../custos-integration-services-server/pom.xml | 10 +++++++-
.../services/commons/model/AuthClaim.java | 5 ++--
.../management/service/GroupManagementService.java | 2 +-
.../src/main/java/CustosBootstrapService.java | 2 +-
custos-utilities/ide-integration/Dockerfile | 4 +--
.../src/main/containers/certificate_mul.p12 | Bin 0 -> 2621 bytes
.../src/main/containers/certificate_mul.pem | 24 ++++++++++++++++++
.../src/main/containers/docker-compose.yml | 10 ++++----
.../src/main/containers/key_mul.pem | 28 +++++++++++++++++++++
pom.xml | 6 ++++-
14 files changed, 92 insertions(+), 15 deletions(-)
diff --git a/custos-services/custos-core-services-server/Dockerfile
b/custos-services/custos-core-services-server/Dockerfile
index 70fb7e763..f185bfcbf 100644
--- a/custos-services/custos-core-services-server/Dockerfile
+++ b/custos-services/custos-core-services-server/Dockerfile
@@ -1,5 +1,5 @@
FROM openjdk:17.0.2-slim
-COPY src/main/resources/certificate.p12
/home/ubuntu/keystore/keycloak-client-truststore.pkcs12
+COPY src/main/resources/certificate_mul.p12
/home/ubuntu/keystore/keycloak-client-truststore.pkcs12
VOLUME /tmp
ARG JAR_FILE
ADD ${JAR_FILE} app.jar
diff --git a/custos-services/custos-core-services-server/pom.xml
b/custos-services/custos-core-services-server/pom.xml
index 8a15cd351..5b9f29905 100644
--- a/custos-services/custos-core-services-server/pom.xml
+++ b/custos-services/custos-core-services-server/pom.xml
@@ -178,6 +178,10 @@
<version>1.7.26</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
</dependencies>
@@ -252,6 +256,14 @@
<skip>false</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4.1</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git
a/custos-services/custos-core-services-server/src/main/resources/application.properties
b/custos-services/custos-core-services-server/src/main/resources/application.properties
index bbe4724f5..d8840a874 100644
---
a/custos-services/custos-core-services-server/src/main/resources/application.properties
+++
b/custos-services/custos-core-services-server/src/main/resources/application.properties
@@ -58,7 +58,7 @@ ciLogon.admin.client.id=abc
ciLogon.admin.client.secret=1234
iam.server.truststore.path=/home/ubuntu/keystore/keycloak-client-truststore.pkcs12
-#iam.server.truststore.path=/Users/isururanawaka/Documents/Airavata_Repository/airavata-custos/custos-services/custos-core-services-server/src/main/resources/certificate.p12
+#iam.server.truststore.path=/Users/isururanawaka/Documents/Airavata_Repository/airavata-custos/custos-services/custos-core-services-server/src/main/resources/certificate_mul.p12
spring.cloud.vault.token=00000000-0000-0000-0000-000000000000
diff --git
a/custos-services/custos-core-services-server/src/main/resources/certificate_mul.p12
b/custos-services/custos-core-services-server/src/main/resources/certificate_mul.p12
new file mode 100644
index 000000000..dc22776eb
Binary files /dev/null and
b/custos-services/custos-core-services-server/src/main/resources/certificate_mul.p12
differ
diff --git a/custos-services/custos-integration-services-server/pom.xml
b/custos-services/custos-integration-services-server/pom.xml
index 93d4607cc..76f6b0237 100644
--- a/custos-services/custos-integration-services-server/pom.xml
+++ b/custos-services/custos-integration-services-server/pom.xml
@@ -188,7 +188,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
+ <artifactId>slf4j-simple</artifactId>
</dependency>
</dependencies>
@@ -262,6 +262,14 @@
<skip>false</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4.1</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git
a/custos-services/custos-integration-services/custos-integration-services-commons/src/main/java/org/apache/custos/integration/services/commons/model/AuthClaim.java
b/custos-services/custos-integration-services/custos-integration-services-commons/src/main/java/org/apache/custos/integration/services/commons/model/AuthClaim.java
index 16aedd51e..88a47de2d 100644
---
a/custos-services/custos-integration-services/custos-integration-services-commons/src/main/java/org/apache/custos/integration/services/commons/model/AuthClaim.java
+++
b/custos-services/custos-integration-services/custos-integration-services-commons/src/main/java/org/apache/custos/integration/services/commons/model/AuthClaim.java
@@ -27,9 +27,10 @@ public class AuthClaim {
private String iamAuthSecret;
- private String ciLogonId;
- private String ciLogonSecret;
+ private String ciLogonId="";
+
+ private String ciLogonSecret="";
private String custosId;
diff --git
a/custos-services/custos-integration-services/group-management-service/src/main/java/org/apache/custos/group/management/service/GroupManagementService.java
b/custos-services/custos-integration-services/group-management-service/src/main/java/org/apache/custos/group/management/service/GroupManagementService.java
index 6940c963d..791e97df5 100644
---
a/custos-services/custos-integration-services/group-management-service/src/main/java/org/apache/custos/group/management/service/GroupManagementService.java
+++
b/custos-services/custos-integration-services/group-management-service/src/main/java/org/apache/custos/group/management/service/GroupManagementService.java
@@ -473,7 +473,7 @@ public class GroupManagementService extends
GroupManagementServiceGrpc.GroupMana
responseObserver.onCompleted();
} catch (Exception ex) {
- String msg = "Error occurred at removeUserFromGroup " +
ex.getMessage();
+ String msg = "Error occurred at getAllGroups " + ex.getMessage();
LOGGER.error(msg, ex);
responseObserver.onError(Status.INTERNAL.withDescription(msg).asRuntimeException());
diff --git
a/custos-utilities/custos-bootstrap-service/src/main/java/CustosBootstrapService.java
b/custos-utilities/custos-bootstrap-service/src/main/java/CustosBootstrapService.java
index 591531a3d..8313a03c2 100644
---
a/custos-utilities/custos-bootstrap-service/src/main/java/CustosBootstrapService.java
+++
b/custos-utilities/custos-bootstrap-service/src/main/java/CustosBootstrapService.java
@@ -36,7 +36,7 @@ public class CustosBootstrapService {
"Custos",
"Admin",
"[email protected]",
- "custosAdmin",
+ "custosadmin",
"1234",
new String[]{"[email protected]"},
new String[]{"http://localhost:8080/callback"},
diff --git a/custos-utilities/ide-integration/Dockerfile
b/custos-utilities/ide-integration/Dockerfile
index 430223b1a..72aa51ec3 100644
--- a/custos-utilities/ide-integration/Dockerfile
+++ b/custos-utilities/ide-integration/Dockerfile
@@ -1,5 +1,5 @@
FROM nginx:stable-alpine
COPY src/main/containers/nginx.conf /etc/nginx/conf.d/default.conf
-COPY src/main/containers/certificate.pem /etc/nginx/certificate.pem
-COPY src/main/containers/key.pem /etc/nginx/key.pem
+COPY src/main/containers/certificate_mul.pem /etc/nginx/certificate.pem
+COPY src/main/containers/key_mul.pem /etc/nginx/key.pem
EXPOSE 443
\ No newline at end of file
diff --git
a/custos-utilities/ide-integration/src/main/containers/certificate_mul.p12
b/custos-utilities/ide-integration/src/main/containers/certificate_mul.p12
new file mode 100644
index 000000000..dc22776eb
Binary files /dev/null and
b/custos-utilities/ide-integration/src/main/containers/certificate_mul.p12
differ
diff --git
a/custos-utilities/ide-integration/src/main/containers/certificate_mul.pem
b/custos-utilities/ide-integration/src/main/containers/certificate_mul.pem
new file mode 100644
index 000000000..542bb1bcb
--- /dev/null
+++ b/custos-utilities/ide-integration/src/main/containers/certificate_mul.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIID9zCCAt+gAwIBAgIJAI2b+A8pv1QJMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYD
+VQQGEwJVUzELMAkGA1UECAwCSU4xCzAJBgNVBAcMAkJMMQswCQYDVQQKDAJJVTEN
+MAsGA1UECwwEQ0lSQzEdMBsGA1UEAwwUaG9zdC5kb2NrZXIuaW50ZXJuYWwxHjAc
+BgkqhkiG9w0BCQEWD2lzamFyYW5hQGl1LmVkdTESMBAGA1UdEQwJbG9jYWxob3N0
+MB4XDTIzMDQyODIxMTIyMloXDTI0MDQyNzIxMTIyMlowgZYxCzAJBgNVBAYTAlVT
+MQswCQYDVQQIDAJJTjELMAkGA1UEBwwCQkwxCzAJBgNVBAoMAklVMQ0wCwYDVQQL
+DARDSVJDMR0wGwYDVQQDDBRob3N0LmRvY2tlci5pbnRlcm5hbDEeMBwGCSqGSIb3
+DQEJARYPaXNqYXJhbmFAaXUuZWR1MRIwEAYDVR0RDAlsb2NhbGhvc3QwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwrgdQl2mMOG0dg3X9FjtJEX5RBAVr
+htzA3SKE1lIAyAVEyXXZ4Vllttk8f0/10HmD90GCGpgJxUy2LUc7Gy4Hh6E8nOoD
+8xsM41XmGOTtvsUamUBDcoibnO+KXtkGyrasTRx4ml9m5fCOLFOdwAMkZa8hSAMg
+lD8XZBIFZOYDNQsMgCoDsoG4/ksmfBsHTvvmiearVmuYKKPXGF0qp7t7Go2sO5x2
+ZYhe7/ICNl4mjgEhDoEwMrtuQE7RDeGKIjF0aVkN4obUNbA9KU/ZAyVjdQF8fIvG
+T8YdTiBmmKxR4FIuHgqSZDIMLvXy0OTds0sGHIyLQb+lMj4jCIiTlSBzAgMBAAGj
+RjBEMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMCoGA1UdEQQjMCGCCWxvY2FsaG9z
+dIIUaG9zdC5kb2NrZXIuaW50ZXJuYWwwDQYJKoZIhvcNAQELBQADggEBAC/St8vK
+Z3weNbl1P/lo5Rbb4bQllg1omJPrIZSo3VZVAOUt6v6PhRsRFHt+zdU076KH87SD
+Jx0yEWmdWPPKbLjMwDKlZdNP0HcrePBInW9YD+tjUp/gm4IHB1yIU2cvyldCJ1VJ
+Fih490C31UypI8/xKYzSbIHw56NCGwQdKv59SdtyehQQL1sbPtZC8NcegLOIqAuT
+a7PeOPZ2lyhmQTmvLN1M2e8b9sQVg0dXU+OGDXxJAh2Qxcn3ZBZ6X7eOXOJeiZR9
+986QPFh/Ll0P9h3Qu1Q72HOf5eCpskposTq6wRuN+PY+CIae/Mlr8rrcytj4gQWR
+GLb7Qx0C84+WWqg=
+-----END CERTIFICATE-----
diff --git
a/custos-utilities/ide-integration/src/main/containers/docker-compose.yml
b/custos-utilities/ide-integration/src/main/containers/docker-compose.yml
index ef8404898..af90161f2 100644
--- a/custos-utilities/ide-integration/src/main/containers/docker-compose.yml
+++ b/custos-utilities/ide-integration/src/main/containers/docker-compose.yml
@@ -37,8 +37,8 @@ services:
image: apachecustos/custos-rest-proxy:latest
container_name: rest-proxy
restart: on-failure:10
- depends_on:
- - custos_integration_services_server
+# depends_on:
+# - custos_integration_services_server
ports:
- "10000:50000"
my_sql_local:
@@ -54,9 +54,9 @@ services:
MYSQL_USER: admin
MYSQL_PASSWORD: admin
MAX_ALLOWED_PACKET: 1073741824
-# volumes:
-# - ./init/mysql/scripts/bash:/docker-entrypoint-initdb.d
-# - ./init/mysql/scripts/sql:/tmp/sql
+ volumes:
+ - ./init/mysql/scripts/bash:/docker-entrypoint-initdb.d
+ - ./init/mysql/scripts/sql:/tmp/sql
custos_core_services_server:
container_name: custos_core_server
diff --git a/custos-utilities/ide-integration/src/main/containers/key_mul.pem
b/custos-utilities/ide-integration/src/main/containers/key_mul.pem
new file mode 100644
index 000000000..6311662c8
--- /dev/null
+++ b/custos-utilities/ide-integration/src/main/containers/key_mul.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCwrgdQl2mMOG0d
+g3X9FjtJEX5RBAVrhtzA3SKE1lIAyAVEyXXZ4Vllttk8f0/10HmD90GCGpgJxUy2
+LUc7Gy4Hh6E8nOoD8xsM41XmGOTtvsUamUBDcoibnO+KXtkGyrasTRx4ml9m5fCO
+LFOdwAMkZa8hSAMglD8XZBIFZOYDNQsMgCoDsoG4/ksmfBsHTvvmiearVmuYKKPX
+GF0qp7t7Go2sO5x2ZYhe7/ICNl4mjgEhDoEwMrtuQE7RDeGKIjF0aVkN4obUNbA9
+KU/ZAyVjdQF8fIvGT8YdTiBmmKxR4FIuHgqSZDIMLvXy0OTds0sGHIyLQb+lMj4j
+CIiTlSBzAgMBAAECggEACfCQesk55+iYwutNbQKeLTsttxMZ1vXMX5FRStXf4Slf
+moIW/j3+UImb6RpkfjjPTUxQxCgI26vc5/beJgYebdAEkytkwvofUHdNstc9sd5k
+ql1qzyCXbOHEXC1/2jD3W/QuoN5WdayD/wuhXKObyaVq1918R43virpXhTQq+I0g
+XezDXZ/Leq9POSIVDVj9HW3Kntzu4PLCI68uHKyLlHE2jFAhQ3//2tBM8K3CTR0Y
+R1uitvflswvb4iC8NNzfvjwgtaFwVHMYmsYBpjcoEfr74NLXqugGnEBCV438StDh
+aCFpfPN7pTdECz0A6IZ7WltTQgpS8YN4pB8HSwKZgQKBgQDoz0bXCd+j1vQCx2wA
+mmVkJOwaYfoQcdLV6afgiTZ46WxTEDrgwUjTwmR+3MA0DOyWeRACWmy4OXRFP9Y4
+AWjrdKWBA/czOP4ZuE5B0yAmCU5R+Aa0mS4YbrQDeKw+vNCuY78W/ZE6IlCwXlBE
+rGAnU4pwuJP+Ey1tY7w88GbeswKBgQDCR2vrs69hFAv0mq9M8WNYrpkkfZsAr8TA
+opF7Uk/74xITEL4JkVX2lgHZs1WaCQIt3uvzpitWqzYRESPH+UTuTCaDI4efkuzO
+AU6P6sB4KARBsAOoiN/AIcz3YQVdfNEib5CfZzViGQT/WSJBhMGds+mNQFe6xveu
+i4YawPmXQQKBgGsMvH8uvBYDRips9n2EgTC+RY6QFMMxA4h3K0l07oZElxnOsbQd
+TFaK4VjwOrT0aGl8e18Jo0pGqO8avm78PvldpqifYTC9eSHsfJeJ9BNpXgkU6khq
+0yZK6R1bhKBIhBBcL0bsC7ZWhxHCHFinhoMux86zIOHIga/2F11SEYs/AoGAF4mX
+paLLaLOJD0V+X5APPTtKCoW9NcQVzlDj11ENp7LHCdBJdddJ1uotpzZ29IaK4QvV
+AlvrfECZ+E9fSmcE1uoa8GBpmgeu8PZvkjgawXP3sA2nI9ARa7Gsp3v1rnHk1Is3
+tlhGu2/Ujys5Xz66RmT5ssdM2bApadg1kyA2HQECgYAOB1IhbBO3P21zPEEDPP5Z
+UJGUcCiUPFmg7W3FGbXx++U0yJERzAQZOuumE8dYi+1cFg8qFYSLLk8wpP3Q5x3V
+QKVfyZGCJ6UzbqUp+MFQ1cP23MRCcA+h1qSedHXMuzLh1ruhmdVxswA376qMs7H+
+d2yMw3GBdAhzu0aLWy9kxA==
+-----END PRIVATE KEY-----
diff --git a/pom.xml b/pom.xml
index 52a688d50..b5d1a3e87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -300,6 +300,11 @@
<artifactId>log4j-over-slf4j</artifactId>
<version>${org.slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${org.slf4j.version}</version>
+ </dependency>
@@ -428,7 +433,6 @@
<org.slf4j.version>2.0.6</org.slf4j.version>
<log4j.version>1.2.17</log4j.version>
<log4j2.version>2.8.2</log4j2.version>
- <log4j-slf4j></log4j-slf4j>
<thrift.version>0.12.0</thrift.version>
<openjpa.version>2.4.3</openjpa.version>
<mysql.connector.version>5.1.34</mysql.connector.version>
