This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch feat/single-jvm in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 69b93d77245b5aab535fef7bad9cd84229c825cd Author: yasithdev <[email protected]> AuthorDate: Thu Mar 26 01:39:45 2026 -0500 fix: add CREDENTIALS/COMMUNITY_USER tables to V1 baseline, fix properties - Add missing CREDENTIALS and COMMUNITY_USER tables to V1 baseline (used by credential store via raw JDBC, not JPA) - Change all airavata.localhost to localhost in properties - Change apiserver.host to 0.0.0.0 - Fix Kafka advertised host in compose.yml - Add null guards for experimentPublisher - Update .gitignore for generated keystores Server now starts cleanly with: docker compose up -d && mvn package && java -cp ... AiravataUnifiedServer --- .gitignore | 2 ++ .../db/migration/airavata/V1__Baseline_schema.sql | 27 ++++++++++++++++++++++ compose.yml | 2 +- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8f3caafb58..c298262f76 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,5 @@ logs/ /vault* airavata-api/distribution/ airavata-api/target/ +keystores/airavata.p12 +keystores/aes.p12 diff --git a/airavata-api/modules/distribution/src/main/resources/conf/db/migration/airavata/V1__Baseline_schema.sql b/airavata-api/modules/distribution/src/main/resources/conf/db/migration/airavata/V1__Baseline_schema.sql index 9f67523322..f6d9c20229 100644 --- a/airavata-api/modules/distribution/src/main/resources/conf/db/migration/airavata/V1__Baseline_schema.sql +++ b/airavata-api/modules/distribution/src/main/resources/conf/db/migration/airavata/V1__Baseline_schema.sql @@ -1715,6 +1715,33 @@ CREATE TABLE IF NOT EXISTS plan ( PRIMARY KEY (plan_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +-- ============================================================================ +-- CREDENTIALS - Credential store (raw JDBC, not JPA) +-- ============================================================================ + +CREATE TABLE IF NOT EXISTS CREDENTIALS ( + GATEWAY_ID VARCHAR(256) NOT NULL, + TOKEN_ID VARCHAR(256) NOT NULL, + CREDENTIAL BLOB NOT NULL, + PORTAL_USER_ID VARCHAR(256) NOT NULL, + TIME_PERSISTED TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + DESCRIPTION VARCHAR(500), + CREDENTIAL_OWNER_TYPE VARCHAR(50), + PRIMARY KEY (GATEWAY_ID, TOKEN_ID) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- ============================================================================ +-- COMMUNITY_USER - Community user mapping for credentials +-- ============================================================================ + +CREATE TABLE IF NOT EXISTS COMMUNITY_USER ( + GATEWAY_ID VARCHAR(256) NOT NULL, + COMMUNITY_USER_NAME VARCHAR(256) NOT NULL, + TOKEN_ID VARCHAR(256) NOT NULL, + COMMUNITY_USER_EMAIL VARCHAR(256), + PRIMARY KEY (GATEWAY_ID, COMMUNITY_USER_NAME, TOKEN_ID) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + -- ============================================================================ -- END OF BASELINE SCHEMA -- ============================================================================ diff --git a/compose.yml b/compose.yml index e810e17d0f..b7804bbcea 100644 --- a/compose.yml +++ b/compose.yml @@ -43,7 +43,7 @@ services: container_name: airavata-kafka restart: unless-stopped environment: - KAFKA_ADVERTISED_HOST_NAME: airavata.localhost + KAFKA_ADVERTISED_HOST_NAME: localhost KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 volumes: - kafka_data:/kafka
