From e3641a3e48f1a4bff5bd29eedb16649e1039e019 Mon Sep 17 00:00:00 2001 From: Ishrath Ahamed Date: Wed, 26 Mar 2025 14:56:31 +0530 Subject: [PATCH 01/11] Update database connection URLs to point to new host --- configmaps/baseutil-database-configs.yml | 2 +- configmaps/ehr-database-configs.yml | 8 ++++---- configmaps/iam-service-configs.yml | 2 +- configmaps/init-database-configs.yaml | 12 ++++++------ configmaps/security-database-configs.yml | 2 +- configmaps/service-config-bloodbank.yml | 4 ++-- configmaps/service-config-pharmacy.yml | 4 ++-- configmaps/service-configs-adt.yml | 12 ++++++------ configmaps/service-configs-bm-promotional.yaml | 2 +- configmaps/service-configs-bm.yml | 6 +++--- configmaps/service-configs-cssd.yaml | 4 ++-- configmaps/service-configs-dms.yml | 2 +- .../service-configs-document-management-service | 2 +- configmaps/service-configs-empi-api.yaml | 2 +- configmaps/service-configs-integration.yml | 6 +++--- configmaps/service-configs-jdbc-sink.yaml | 2 +- configmaps/service-configs-reporting.yml | 6 +++--- configmaps/service-configs-rf-uploader.yml | 2 +- configmaps/service-configs-stream-etl.yml | 2 +- 19 files changed, 41 insertions(+), 41 deletions(-) diff --git a/configmaps/baseutil-database-configs.yml b/configmaps/baseutil-database-configs.yml index cbef6f2..fbb1c80 100644 --- a/configmaps/baseutil-database-configs.yml +++ b/configmaps/baseutil-database-configs.yml @@ -1,6 +1,6 @@ apiVersion: v1 data: - db-base-utility-url: jdbc:postgresql://172.15.100.52:5432/quat + db-base-utility-url: jdbc:postgresql://172.15.100.51:5432/quat db-dialect: org.hibernate.dialect.PostgreSQLDialect db-driver: org.postgresql.Driver SPRING_JPA_HIBERNATE_DDL-AUTO: update diff --git a/configmaps/ehr-database-configs.yml b/configmaps/ehr-database-configs.yml index e688ede..b0c4617 100644 --- a/configmaps/ehr-database-configs.yml +++ b/configmaps/ehr-database-configs.yml @@ -1,12 +1,12 @@ apiVersion: v1 data: - database-url: jdbc:postgresql://172.15.100.52:5432/quat - database-url-second: jdbc:postgresql://172.15.100.52:5432/quat + database-url: jdbc:postgresql://172.15.100.51:5432/quat + database-url-second: jdbc:postgresql://172.15.100.51:5432/quat db-dialect: org.hibernate.dialect.PostgreSQLDialect db-driver: org.postgresql.Driver db-or-anesthesia-schema: EH_ORANESTHESIA - db-spe-url: jdbc:postgresql://172.15.100.52:5432/quat - db-ip-url: jdbc:postgresql://172.15.100.52:5432/quat + db-spe-url: jdbc:postgresql://172.15.100.51:5432/quat + db-ip-url: jdbc:postgresql://172.15.100.51:5432/quat EHR_WORKFLOW_MONGO_URI: mongodb://admin:admin@172.15.100.24:27017/task_list?tls=true&tlsAllowInvalidCertificates=true kind: ConfigMap metadata: diff --git a/configmaps/iam-service-configs.yml b/configmaps/iam-service-configs.yml index 0647bcb..7d91932 100644 --- a/configmaps/iam-service-configs.yml +++ b/configmaps/iam-service-configs.yml @@ -9,7 +9,7 @@ data: KEYCLOAK_HOSTNAME: csi.dev.cloudsol.lk REPORTING_QUEUE_NAME: csi-reporting # DB_CONNECTION_STRING: jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=10.201.217.11)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME =VIDA4PDB))) - DB_CONNECTION_STRING: jdbc:postgresql://172.15.100.52:5432/quat + DB_CONNECTION_STRING: jdbc:postgresql://172.15.100.51:5432/quat kind: ConfigMap metadata: name: iam-service-configs diff --git a/configmaps/init-database-configs.yaml b/configmaps/init-database-configs.yaml index ee840ce..e4a231a 100644 --- a/configmaps/init-database-configs.yaml +++ b/configmaps/init-database-configs.yaml @@ -1,10 +1,10 @@ apiVersion: v1 data: - CSI_INIT_DB_MASTERDATA_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_INIT_DB_CONFIG_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_INIT_DB_BASEUTIL_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_INIT_DB_BL_INVOICE_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_INIT_DB_BL_INVOICE_URL: jdbc:postgresql://172.15.100.52:5432/quat + CSI_INIT_DB_MASTERDATA_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_INIT_DB_CONFIG_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_INIT_DB_BASEUTIL_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_INIT_DB_BL_INVOICE_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_INIT_DB_BL_INVOICE_URL: jdbc:postgresql://172.15.100.51:5432/quat SCREEN_PERMISSION_API_END_POINT: http://service-base-ui-registry/ui-registry/save SCREEN_PERMISSION_X_GROUP: "1" SCREEN_PERMISSION_X_HOSPITAL: "4" @@ -26,7 +26,7 @@ data: MASTER_DATA_DISABLED: "true" MONGO_DB_URL: mongodb://admin:admin@172.15.100.24:27017/csi-morgue?tls=true&tlsAllowInvalidCertificates=truereadPreference=nearest #RELATIONAL_DATABASE_URL: jdbc:oracle:thin:@(description=(CONNECT_TIMEOUT=10)(TRANSPORT_CONNECT_TIMEOUT=5)(RETRY_COUNT=3)(address=(host=VIDAUDB.hmg.local)(protocol=tcp)(port=1521))(failover=yes)(connect_data=(SERVER=DEDICATED)(service_name=vuatpdb.hmg.local)(failover_mode=(type=select)(method=basic)))) - RELATIONAL_DATABASE_URL: jdbc:postgresql://172.15.100.52:5432/quat + RELATIONAL_DATABASE_URL: jdbc:postgresql://172.15.100.51:5432/quat SCREEN_PERMISSION_API_END_POINT: http://service-base-ui-registry/ui-registry/save FEATURE_TOGGLE_API_END_POINT: 'http://csi-java-base-utility/base/util/tenant' LIQUIBASE_DB_MIGRATION: "true" diff --git a/configmaps/security-database-configs.yml b/configmaps/security-database-configs.yml index 017e98f..7b07800 100644 --- a/configmaps/security-database-configs.yml +++ b/configmaps/security-database-configs.yml @@ -1,6 +1,6 @@ apiVersion: v1 data: - database-url: jdbc:postgresql://172.15.100.52:5432/quat + database-url: jdbc:postgresql://172.15.100.51:5432/quat db-dialect: org.hibernate.dialect.PostgreSQLDialect db-driver: org.postgresql.Driver permission-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/roles-permissions-01?tls=true&tlsAllowInvalidCertificates=truereadPreference=nearest diff --git a/configmaps/service-config-bloodbank.yml b/configmaps/service-config-bloodbank.yml index 372e505..b8077f5 100644 --- a/configmaps/service-config-bloodbank.yml +++ b/configmaps/service-config-bloodbank.yml @@ -2,9 +2,9 @@ apiVersion: v1 data: active_profile: java-dev bloodTransfusion-db-platform: org.hibernate.dialect.PostgreSQLDialect - bloodTransfusion-db-url: jdbc:postgresql://172.15.100.52:5432/quat?currentSchema=bb_transfusion + bloodTransfusion-db-url: jdbc:postgresql://172.15.100.51:5432/quat?currentSchema=bb_transfusion bloodbank-db-platform: org.hibernate.dialect.PostgreSQLDialect - bloodbank-db-url: jdbc:postgresql://172.15.100.52:5432/quat?currentSchema=bb_bloodbank + bloodbank-db-url: jdbc:postgresql://172.15.100.51:5432/quat?currentSchema=bb_bloodbank configserver: http://config-server eureka_server: http://eureka:8761/eureka/ rootDomainName: cloudsol.lk diff --git a/configmaps/service-config-pharmacy.yml b/configmaps/service-config-pharmacy.yml index 862fa88..b650ddf 100644 --- a/configmaps/service-config-pharmacy.yml +++ b/configmaps/service-config-pharmacy.yml @@ -8,8 +8,8 @@ data: discharge-summary-clear-notification: adt-discharge-summary-clear-notification.t eureka_server: http://eureka:8761/eureka/ pharmacy-db-platform: org.hibernate.dialect.PostgreSQLDialect - pharmacy-db-url: jdbc:postgresql://172.15.100.52:5432/quat - prescription-db-url: jdbc:postgresql://172.15.100.52:5432/quat + pharmacy-db-url: jdbc:postgresql://172.15.100.51:5432/quat + prescription-db-url: jdbc:postgresql://172.15.100.51:5432/quat prescription-db-platform: org.hibernate.dialect.PostgreSQLDialect mongodb-phr-cron-uri: mongodb://admin:admin@172.15.100.24:27017/cron?tls=true&tlsAllowInvalidCertificates=true diff --git a/configmaps/service-configs-adt.yml b/configmaps/service-configs-adt.yml index 023b3b8..618f5ab 100644 --- a/configmaps/service-configs-adt.yml +++ b/configmaps/service-configs-adt.yml @@ -1,11 +1,11 @@ apiVersion: v1 data: - CSI_DB_ADT_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_DENTAL_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_MASTERDATA_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_RESERVATION_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_RESOURCE_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_MORGUE_URL: jdbc:postgresql://172.15.100.52:5432/quat + CSI_DB_ADT_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_DB_DENTAL_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_DB_MASTERDATA_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_DB_RESERVATION_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_DB_RESOURCE_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_DB_MORGUE_URL: jdbc:postgresql://172.15.100.51:5432/quat SPRING_DATASOURCE_DRIVER-CLASS-NAME: org.postgresql.Driver SPRING_JPA_DATABASE-PLATFORM: org.hibernate.dialect.PostgreSQLDialect CSI_RMS_ADTREQUEST_MONGOURI: mongodb://admin:admin@172.15.100.24:27017/adt-request?tls=true&tlsAllowInvalidCertificates=truereadPreference=nearest&maxStalenessSeconds=300 diff --git a/configmaps/service-configs-bm-promotional.yaml b/configmaps/service-configs-bm-promotional.yaml index 4b5d4fd..0605140 100644 --- a/configmaps/service-configs-bm-promotional.yaml +++ b/configmaps/service-configs-bm-promotional.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - CSI_DB_BM_PROMOTION_URL: jdbc:postgresql://172.15.100.52:5432/quat + CSI_DB_BM_PROMOTION_URL: jdbc:postgresql://172.15.100.51:5432/quat CSI_DB_SERVER: postgres #SPRING_JPA_DATABASE-PLATFORM: org.hibernate.dialect.Oracle10gDialect configserver: http://config-server diff --git a/configmaps/service-configs-bm.yml b/configmaps/service-configs-bm.yml index e8b3826..8dd0edf 100644 --- a/configmaps/service-configs-bm.yml +++ b/configmaps/service-configs-bm.yml @@ -1,8 +1,8 @@ apiVersion: v1 data: - CSI_DB_BM_APPROVAL_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_BM_BILLING_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_BM_INVOICE_URL: jdbc:postgresql://172.15.100.52:5432/quat + CSI_DB_BM_APPROVAL_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_DB_BM_BILLING_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_DB_BM_INVOICE_URL: jdbc:postgresql://172.15.100.51:5432/quat CSI_DB_PORT: "1521" CSI_DB_SERVER: postgress SPRING_DATASOURCE_DRIVER-CLASS-NAME: org.postgresql.Driver diff --git a/configmaps/service-configs-cssd.yaml b/configmaps/service-configs-cssd.yaml index 2f79417..be855c9 100644 --- a/configmaps/service-configs-cssd.yaml +++ b/configmaps/service-configs-cssd.yaml @@ -1,7 +1,7 @@ apiVersion: v1 data: - SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.52:5432/quat - database-url: jdbc:postgresql://172.15.100.52:5432/quat + SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.51:5432/quat + database-url: jdbc:postgresql://172.15.100.51:5432/quat CSI_DB_SERVER: POSTGRESQL SPRING_JPA_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect #SPRING_JPA_DATABASE-PLATFORM: org.hibernate.dialect.Oracle12cDialect diff --git a/configmaps/service-configs-dms.yml b/configmaps/service-configs-dms.yml index a7ce5e6..12bc926 100644 --- a/configmaps/service-configs-dms.yml +++ b/configmaps/service-configs-dms.yml @@ -11,7 +11,7 @@ data: db_driver: org.postgresql.Driver db_profile: slick.jdbc.PostgresProfile db_driver: org.postgresql.Driver - db_url: jdbc:postgresql://172.15.100.52:5432/quat + db_url: jdbc:postgresql://172.15.100.51:5432/quat minio_endpoint: http://172.15.100.68:7480 mongo_connection_string: mongodb://admin:admin@172.15.100.24:27017/?tls=true&tlsAllowInvalidCertificates=true kind: ConfigMap diff --git a/configmaps/service-configs-document-management-service b/configmaps/service-configs-document-management-service index 64e4663..8720202 100644 --- a/configmaps/service-configs-document-management-service +++ b/configmaps/service-configs-document-management-service @@ -1,7 +1,7 @@ apiVersion: v1 data: SPRING_DATASOURCE_DRIVER-CLASS-NAME: org.postgresql.Driver - SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.52:5432/quat + SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.51:5432/quat SPRING_JPA_PROPERTIES_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect # SPRING_LIQUIBASE_CHANGE-LOG: classpath:db/changelog/postgres/changelog-master.xml MINIO_ENDPOINT: http://172.15.100.68:7480 diff --git a/configmaps/service-configs-empi-api.yaml b/configmaps/service-configs-empi-api.yaml index 25edc29..9da2a23 100644 --- a/configmaps/service-configs-empi-api.yaml +++ b/configmaps/service-configs-empi-api.yaml @@ -6,7 +6,7 @@ data: active_profile: java-dev JPA_DIALECT: org.hibernate.dialect.PostgreSQLDialect DB_SCHEMA: EMPI - DB_JDBC_URL: jdbc:postgresql://172.15.100.52:5432/quat + DB_JDBC_URL: jdbc:postgresql://172.15.100.51:5432/quat DB_DRIVER_CLASS_NAME: org.postgresql.Driver #HIBERNATE_DDL_AUTO: "false" KAFKA_PRODUCER_BOOTSTRAP_SERVER_URLS: 172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092 diff --git a/configmaps/service-configs-integration.yml b/configmaps/service-configs-integration.yml index 5b95716..aea000c 100644 --- a/configmaps/service-configs-integration.yml +++ b/configmaps/service-configs-integration.yml @@ -2,9 +2,9 @@ apiVersion: v1 data: dbVendor: postgres CSI_DB_DRIVER: org.postgresql.Driver - CSI_DB_INT_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_INT2_URL: jdbc:postgresql://172.15.100.52:5432/quat - CSI_DB_MOBILE_URL: jdbc:postgresql://172.15.100.52:5432/quat + CSI_DB_INT_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_DB_INT2_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_DB_MOBILE_URL: jdbc:postgresql://172.15.100.51:5432/quat CSI_DB_PLATFORM: org.hibernate.dialect.PostgreSQLDialect CSI_DB_INT_PLATFORM: org.hibernate.dialect.PostgreSQLDialect CSI_DB_MOBILE_SEQUENCETEMPLATE: "SELECT ##sequence_name##.NEXTVAL FROM dual" diff --git a/configmaps/service-configs-jdbc-sink.yaml b/configmaps/service-configs-jdbc-sink.yaml index ec07293..42c90a7 100644 --- a/configmaps/service-configs-jdbc-sink.yaml +++ b/configmaps/service-configs-jdbc-sink.yaml @@ -2,7 +2,7 @@ apiVersion: v1 data: METADATA_TOPIC: form-metadata-queue DATA_TOPIC: form-data-queue - ORACLE_URL: jdbc:postgresql://172.15.100.52:5432/quat + ORACLE_URL: jdbc:postgresql://172.15.100.51:5432/quat BOOTSTRAP_SERVERS: 172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092 kind: ConfigMap metadata: diff --git a/configmaps/service-configs-reporting.yml b/configmaps/service-configs-reporting.yml index c897b70..fa59b6e 100644 --- a/configmaps/service-configs-reporting.yml +++ b/configmaps/service-configs-reporting.yml @@ -2,16 +2,16 @@ apiVersion: v1 data: METADB_DRIVER: org.postgresql.Driver METADB_PROFILE: slick.jdbc.PostgresProfile - METADB_URL: jdbc:postgresql://172.15.100.52:5432/quat + METADB_URL: jdbc:postgresql://172.15.100.51:5432/quat WAREHOUSEDB_DB_DRIVER: org.postgresql.Driver WAREHOUSEDB_DRIVER: slick.driver.PostgresqlDriver WAREHOUSEDB_PROFILE: slick.jdbc.PostgresProfile - WAREHOUSEDB_URL: jdbc:postgresql://172.15.100.52:5432/quat + WAREHOUSEDB_URL: jdbc:postgresql://172.15.100.51:5432/quat METADB_NUM_THREADS : "10" METADB_MAX_CONNECTIONS : "10" APP_DB_DRIVER: org.postgresql.Driver APP_DB_PROFILE: slick.jdbc.PostgresProfile - APP_DB_URL: jdbc:postgresql://172.15.100.52:5432/quat + APP_DB_URL: jdbc:postgresql://172.15.100.51:5432/quat # active_hospital_filter: "true" # hospital_id_columns: HOSPITAL_ID,HOSPITALID # tenant_id_columns: HOSPITAL_GROUP_ID,HOSPITALGROUPID,TENANT_ID,TENANTID diff --git a/configmaps/service-configs-rf-uploader.yml b/configmaps/service-configs-rf-uploader.yml index a5ea814..9eb5f46 100644 --- a/configmaps/service-configs-rf-uploader.yml +++ b/configmaps/service-configs-rf-uploader.yml @@ -3,7 +3,7 @@ data: spring.env.url: http://csi-reporting-service spring.env.path: /csi-api/csi-reporting-service spring.datasource.driver-class-name: org.postgresql.Driver - spring.datasource.url: jdbc:postgresql://172.15.100.52:5432/quat + spring.datasource.url: jdbc:postgresql://172.15.100.51:5432/quat kind: ConfigMap metadata: annotations: diff --git a/configmaps/service-configs-stream-etl.yml b/configmaps/service-configs-stream-etl.yml index c793332..0ab2a53 100644 --- a/configmaps/service-configs-stream-etl.yml +++ b/configmaps/service-configs-stream-etl.yml @@ -10,7 +10,7 @@ data: MONGO_CONNECTION_STRING: mongodb://admin:admin@172.15.100.24:27017/?tls=true&tlsAllowInvalidCertificates=true SLICK_DATASOURCE_PROFILE: slick.jdbc.PostgresProfile$ DATASOURCE_DRIVER: org.postgresql.Driver - DATASOURCE_URL: jdbc:postgresql://172.15.100.52:5432/quat + DATASOURCE_URL: jdbc:postgresql://172.15.100.51:5432/quat kind: ConfigMap metadata: From 62318d72cec5a1e26b81ceeaa5ba57f44aeae63c Mon Sep 17 00:00:00 2001 From: Ishrath Ahamed Date: Wed, 26 Mar 2025 15:12:34 +0530 Subject: [PATCH 02/11] Update database connection URLs to point to new temporary database --- configmaps/baseutil-database-configs.yml | 2 +- configmaps/ehr-database-configs.yml | 8 ++++---- configmaps/iam-service-configs.yml | 2 +- configmaps/init-database-configs.yaml | 12 ++++++------ configmaps/security-database-configs.yml | 2 +- configmaps/service-config-bloodbank.yml | 4 ++-- configmaps/service-config-pharmacy.yml | 4 ++-- configmaps/service-configs-adt.yml | 12 ++++++------ configmaps/service-configs-bm-promotional.yaml | 2 +- configmaps/service-configs-bm.yml | 6 +++--- configmaps/service-configs-cssd.yaml | 4 ++-- configmaps/service-configs-dms.yml | 2 +- .../service-configs-document-management-service | 2 +- configmaps/service-configs-empi-api.yaml | 2 +- configmaps/service-configs-integration.yml | 6 +++--- configmaps/service-configs-jdbc-sink.yaml | 2 +- configmaps/service-configs-reporting.yml | 6 +++--- configmaps/service-configs-rf-uploader.yml | 2 +- configmaps/service-configs-stream-etl.yml | 2 +- 19 files changed, 41 insertions(+), 41 deletions(-) diff --git a/configmaps/baseutil-database-configs.yml b/configmaps/baseutil-database-configs.yml index fbb1c80..40ebdbd 100644 --- a/configmaps/baseutil-database-configs.yml +++ b/configmaps/baseutil-database-configs.yml @@ -1,6 +1,6 @@ apiVersion: v1 data: - db-base-utility-url: jdbc:postgresql://172.15.100.51:5432/quat + db-base-utility-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database db-dialect: org.hibernate.dialect.PostgreSQLDialect db-driver: org.postgresql.Driver SPRING_JPA_HIBERNATE_DDL-AUTO: update diff --git a/configmaps/ehr-database-configs.yml b/configmaps/ehr-database-configs.yml index b0c4617..c70db58 100644 --- a/configmaps/ehr-database-configs.yml +++ b/configmaps/ehr-database-configs.yml @@ -1,12 +1,12 @@ apiVersion: v1 data: - database-url: jdbc:postgresql://172.15.100.51:5432/quat - database-url-second: jdbc:postgresql://172.15.100.51:5432/quat + database-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + database-url-second: jdbc:postgresql://172.15.100.28:5432/temp-quat-database db-dialect: org.hibernate.dialect.PostgreSQLDialect db-driver: org.postgresql.Driver db-or-anesthesia-schema: EH_ORANESTHESIA - db-spe-url: jdbc:postgresql://172.15.100.51:5432/quat - db-ip-url: jdbc:postgresql://172.15.100.51:5432/quat + db-spe-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + db-ip-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database EHR_WORKFLOW_MONGO_URI: mongodb://admin:admin@172.15.100.24:27017/task_list?tls=true&tlsAllowInvalidCertificates=true kind: ConfigMap metadata: diff --git a/configmaps/iam-service-configs.yml b/configmaps/iam-service-configs.yml index 7d91932..685cd1b 100644 --- a/configmaps/iam-service-configs.yml +++ b/configmaps/iam-service-configs.yml @@ -9,7 +9,7 @@ data: KEYCLOAK_HOSTNAME: csi.dev.cloudsol.lk REPORTING_QUEUE_NAME: csi-reporting # DB_CONNECTION_STRING: jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=10.201.217.11)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME =VIDA4PDB))) - DB_CONNECTION_STRING: jdbc:postgresql://172.15.100.51:5432/quat + DB_CONNECTION_STRING: jdbc:postgresql://172.15.100.28:5432/temp-quat-database kind: ConfigMap metadata: name: iam-service-configs diff --git a/configmaps/init-database-configs.yaml b/configmaps/init-database-configs.yaml index e4a231a..cb9d025 100644 --- a/configmaps/init-database-configs.yaml +++ b/configmaps/init-database-configs.yaml @@ -1,10 +1,10 @@ apiVersion: v1 data: - CSI_INIT_DB_MASTERDATA_URL: jdbc:postgresql://172.15.100.51:5432/quat - CSI_INIT_DB_CONFIG_URL: jdbc:postgresql://172.15.100.51:5432/quat - CSI_INIT_DB_BASEUTIL_URL: jdbc:postgresql://172.15.100.51:5432/quat - CSI_INIT_DB_BL_INVOICE_URL: jdbc:postgresql://172.15.100.51:5432/quat - CSI_INIT_DB_BL_INVOICE_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_INIT_DB_MASTERDATA_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_INIT_DB_CONFIG_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_INIT_DB_BASEUTIL_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_INIT_DB_BL_INVOICE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_INIT_DB_BL_INVOICE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database SCREEN_PERMISSION_API_END_POINT: http://service-base-ui-registry/ui-registry/save SCREEN_PERMISSION_X_GROUP: "1" SCREEN_PERMISSION_X_HOSPITAL: "4" @@ -26,7 +26,7 @@ data: MASTER_DATA_DISABLED: "true" MONGO_DB_URL: mongodb://admin:admin@172.15.100.24:27017/csi-morgue?tls=true&tlsAllowInvalidCertificates=truereadPreference=nearest #RELATIONAL_DATABASE_URL: jdbc:oracle:thin:@(description=(CONNECT_TIMEOUT=10)(TRANSPORT_CONNECT_TIMEOUT=5)(RETRY_COUNT=3)(address=(host=VIDAUDB.hmg.local)(protocol=tcp)(port=1521))(failover=yes)(connect_data=(SERVER=DEDICATED)(service_name=vuatpdb.hmg.local)(failover_mode=(type=select)(method=basic)))) - RELATIONAL_DATABASE_URL: jdbc:postgresql://172.15.100.51:5432/quat + RELATIONAL_DATABASE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database SCREEN_PERMISSION_API_END_POINT: http://service-base-ui-registry/ui-registry/save FEATURE_TOGGLE_API_END_POINT: 'http://csi-java-base-utility/base/util/tenant' LIQUIBASE_DB_MIGRATION: "true" diff --git a/configmaps/security-database-configs.yml b/configmaps/security-database-configs.yml index 7b07800..f755185 100644 --- a/configmaps/security-database-configs.yml +++ b/configmaps/security-database-configs.yml @@ -1,6 +1,6 @@ apiVersion: v1 data: - database-url: jdbc:postgresql://172.15.100.51:5432/quat + database-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database db-dialect: org.hibernate.dialect.PostgreSQLDialect db-driver: org.postgresql.Driver permission-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/roles-permissions-01?tls=true&tlsAllowInvalidCertificates=truereadPreference=nearest diff --git a/configmaps/service-config-bloodbank.yml b/configmaps/service-config-bloodbank.yml index b8077f5..36a1ae7 100644 --- a/configmaps/service-config-bloodbank.yml +++ b/configmaps/service-config-bloodbank.yml @@ -2,9 +2,9 @@ apiVersion: v1 data: active_profile: java-dev bloodTransfusion-db-platform: org.hibernate.dialect.PostgreSQLDialect - bloodTransfusion-db-url: jdbc:postgresql://172.15.100.51:5432/quat?currentSchema=bb_transfusion + bloodTransfusion-db-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database?currentSchema=bb_transfusion bloodbank-db-platform: org.hibernate.dialect.PostgreSQLDialect - bloodbank-db-url: jdbc:postgresql://172.15.100.51:5432/quat?currentSchema=bb_bloodbank + bloodbank-db-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database?currentSchema=bb_bloodbank configserver: http://config-server eureka_server: http://eureka:8761/eureka/ rootDomainName: cloudsol.lk diff --git a/configmaps/service-config-pharmacy.yml b/configmaps/service-config-pharmacy.yml index b650ddf..b7f0a3a 100644 --- a/configmaps/service-config-pharmacy.yml +++ b/configmaps/service-config-pharmacy.yml @@ -8,8 +8,8 @@ data: discharge-summary-clear-notification: adt-discharge-summary-clear-notification.t eureka_server: http://eureka:8761/eureka/ pharmacy-db-platform: org.hibernate.dialect.PostgreSQLDialect - pharmacy-db-url: jdbc:postgresql://172.15.100.51:5432/quat - prescription-db-url: jdbc:postgresql://172.15.100.51:5432/quat + pharmacy-db-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + prescription-db-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database prescription-db-platform: org.hibernate.dialect.PostgreSQLDialect mongodb-phr-cron-uri: mongodb://admin:admin@172.15.100.24:27017/cron?tls=true&tlsAllowInvalidCertificates=true diff --git a/configmaps/service-configs-adt.yml b/configmaps/service-configs-adt.yml index 618f5ab..c00ee92 100644 --- a/configmaps/service-configs-adt.yml +++ b/configmaps/service-configs-adt.yml @@ -1,11 +1,11 @@ apiVersion: v1 data: - CSI_DB_ADT_URL: jdbc:postgresql://172.15.100.51:5432/quat - CSI_DB_DENTAL_URL: jdbc:postgresql://172.15.100.51:5432/quat - CSI_DB_MASTERDATA_URL: jdbc:postgresql://172.15.100.51:5432/quat - CSI_DB_RESERVATION_URL: jdbc:postgresql://172.15.100.51:5432/quat - CSI_DB_RESOURCE_URL: jdbc:postgresql://172.15.100.51:5432/quat - CSI_DB_MORGUE_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_DB_ADT_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_DENTAL_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_MASTERDATA_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_RESERVATION_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_RESOURCE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_MORGUE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database SPRING_DATASOURCE_DRIVER-CLASS-NAME: org.postgresql.Driver SPRING_JPA_DATABASE-PLATFORM: org.hibernate.dialect.PostgreSQLDialect CSI_RMS_ADTREQUEST_MONGOURI: mongodb://admin:admin@172.15.100.24:27017/adt-request?tls=true&tlsAllowInvalidCertificates=truereadPreference=nearest&maxStalenessSeconds=300 diff --git a/configmaps/service-configs-bm-promotional.yaml b/configmaps/service-configs-bm-promotional.yaml index 0605140..9e6ca26 100644 --- a/configmaps/service-configs-bm-promotional.yaml +++ b/configmaps/service-configs-bm-promotional.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - CSI_DB_BM_PROMOTION_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_DB_BM_PROMOTION_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database CSI_DB_SERVER: postgres #SPRING_JPA_DATABASE-PLATFORM: org.hibernate.dialect.Oracle10gDialect configserver: http://config-server diff --git a/configmaps/service-configs-bm.yml b/configmaps/service-configs-bm.yml index 8dd0edf..f4368c4 100644 --- a/configmaps/service-configs-bm.yml +++ b/configmaps/service-configs-bm.yml @@ -1,8 +1,8 @@ apiVersion: v1 data: - CSI_DB_BM_APPROVAL_URL: jdbc:postgresql://172.15.100.51:5432/quat - CSI_DB_BM_BILLING_URL: jdbc:postgresql://172.15.100.51:5432/quat - CSI_DB_BM_INVOICE_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_DB_BM_APPROVAL_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_BM_BILLING_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_BM_INVOICE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database CSI_DB_PORT: "1521" CSI_DB_SERVER: postgress SPRING_DATASOURCE_DRIVER-CLASS-NAME: org.postgresql.Driver diff --git a/configmaps/service-configs-cssd.yaml b/configmaps/service-configs-cssd.yaml index be855c9..8536c6a 100644 --- a/configmaps/service-configs-cssd.yaml +++ b/configmaps/service-configs-cssd.yaml @@ -1,7 +1,7 @@ apiVersion: v1 data: - SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.51:5432/quat - database-url: jdbc:postgresql://172.15.100.51:5432/quat + SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + database-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database CSI_DB_SERVER: POSTGRESQL SPRING_JPA_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect #SPRING_JPA_DATABASE-PLATFORM: org.hibernate.dialect.Oracle12cDialect diff --git a/configmaps/service-configs-dms.yml b/configmaps/service-configs-dms.yml index 12bc926..16422e1 100644 --- a/configmaps/service-configs-dms.yml +++ b/configmaps/service-configs-dms.yml @@ -11,7 +11,7 @@ data: db_driver: org.postgresql.Driver db_profile: slick.jdbc.PostgresProfile db_driver: org.postgresql.Driver - db_url: jdbc:postgresql://172.15.100.51:5432/quat + db_url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database minio_endpoint: http://172.15.100.68:7480 mongo_connection_string: mongodb://admin:admin@172.15.100.24:27017/?tls=true&tlsAllowInvalidCertificates=true kind: ConfigMap diff --git a/configmaps/service-configs-document-management-service b/configmaps/service-configs-document-management-service index 8720202..fd0d07a 100644 --- a/configmaps/service-configs-document-management-service +++ b/configmaps/service-configs-document-management-service @@ -1,7 +1,7 @@ apiVersion: v1 data: SPRING_DATASOURCE_DRIVER-CLASS-NAME: org.postgresql.Driver - SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.51:5432/quat + SPRING_DATASOURCE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database SPRING_JPA_PROPERTIES_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect # SPRING_LIQUIBASE_CHANGE-LOG: classpath:db/changelog/postgres/changelog-master.xml MINIO_ENDPOINT: http://172.15.100.68:7480 diff --git a/configmaps/service-configs-empi-api.yaml b/configmaps/service-configs-empi-api.yaml index 9da2a23..f88148d 100644 --- a/configmaps/service-configs-empi-api.yaml +++ b/configmaps/service-configs-empi-api.yaml @@ -6,7 +6,7 @@ data: active_profile: java-dev JPA_DIALECT: org.hibernate.dialect.PostgreSQLDialect DB_SCHEMA: EMPI - DB_JDBC_URL: jdbc:postgresql://172.15.100.51:5432/quat + DB_JDBC_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database DB_DRIVER_CLASS_NAME: org.postgresql.Driver #HIBERNATE_DDL_AUTO: "false" KAFKA_PRODUCER_BOOTSTRAP_SERVER_URLS: 172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092 diff --git a/configmaps/service-configs-integration.yml b/configmaps/service-configs-integration.yml index aea000c..0938989 100644 --- a/configmaps/service-configs-integration.yml +++ b/configmaps/service-configs-integration.yml @@ -2,9 +2,9 @@ apiVersion: v1 data: dbVendor: postgres CSI_DB_DRIVER: org.postgresql.Driver - CSI_DB_INT_URL: jdbc:postgresql://172.15.100.51:5432/quat - CSI_DB_INT2_URL: jdbc:postgresql://172.15.100.51:5432/quat - CSI_DB_MOBILE_URL: jdbc:postgresql://172.15.100.51:5432/quat + CSI_DB_INT_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_INT2_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database + CSI_DB_MOBILE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database CSI_DB_PLATFORM: org.hibernate.dialect.PostgreSQLDialect CSI_DB_INT_PLATFORM: org.hibernate.dialect.PostgreSQLDialect CSI_DB_MOBILE_SEQUENCETEMPLATE: "SELECT ##sequence_name##.NEXTVAL FROM dual" diff --git a/configmaps/service-configs-jdbc-sink.yaml b/configmaps/service-configs-jdbc-sink.yaml index 42c90a7..da7b34c 100644 --- a/configmaps/service-configs-jdbc-sink.yaml +++ b/configmaps/service-configs-jdbc-sink.yaml @@ -2,7 +2,7 @@ apiVersion: v1 data: METADATA_TOPIC: form-metadata-queue DATA_TOPIC: form-data-queue - ORACLE_URL: jdbc:postgresql://172.15.100.51:5432/quat + ORACLE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database BOOTSTRAP_SERVERS: 172.15.100.80:9092,172.15.100.81:9092,172.15.100.82:9092 kind: ConfigMap metadata: diff --git a/configmaps/service-configs-reporting.yml b/configmaps/service-configs-reporting.yml index fa59b6e..acf0815 100644 --- a/configmaps/service-configs-reporting.yml +++ b/configmaps/service-configs-reporting.yml @@ -2,16 +2,16 @@ apiVersion: v1 data: METADB_DRIVER: org.postgresql.Driver METADB_PROFILE: slick.jdbc.PostgresProfile - METADB_URL: jdbc:postgresql://172.15.100.51:5432/quat + METADB_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database WAREHOUSEDB_DB_DRIVER: org.postgresql.Driver WAREHOUSEDB_DRIVER: slick.driver.PostgresqlDriver WAREHOUSEDB_PROFILE: slick.jdbc.PostgresProfile - WAREHOUSEDB_URL: jdbc:postgresql://172.15.100.51:5432/quat + WAREHOUSEDB_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database METADB_NUM_THREADS : "10" METADB_MAX_CONNECTIONS : "10" APP_DB_DRIVER: org.postgresql.Driver APP_DB_PROFILE: slick.jdbc.PostgresProfile - APP_DB_URL: jdbc:postgresql://172.15.100.51:5432/quat + APP_DB_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database # active_hospital_filter: "true" # hospital_id_columns: HOSPITAL_ID,HOSPITALID # tenant_id_columns: HOSPITAL_GROUP_ID,HOSPITALGROUPID,TENANT_ID,TENANTID diff --git a/configmaps/service-configs-rf-uploader.yml b/configmaps/service-configs-rf-uploader.yml index 9eb5f46..c8f1184 100644 --- a/configmaps/service-configs-rf-uploader.yml +++ b/configmaps/service-configs-rf-uploader.yml @@ -3,7 +3,7 @@ data: spring.env.url: http://csi-reporting-service spring.env.path: /csi-api/csi-reporting-service spring.datasource.driver-class-name: org.postgresql.Driver - spring.datasource.url: jdbc:postgresql://172.15.100.51:5432/quat + spring.datasource.url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database kind: ConfigMap metadata: annotations: diff --git a/configmaps/service-configs-stream-etl.yml b/configmaps/service-configs-stream-etl.yml index 0ab2a53..bc95b8c 100644 --- a/configmaps/service-configs-stream-etl.yml +++ b/configmaps/service-configs-stream-etl.yml @@ -10,7 +10,7 @@ data: MONGO_CONNECTION_STRING: mongodb://admin:admin@172.15.100.24:27017/?tls=true&tlsAllowInvalidCertificates=true SLICK_DATASOURCE_PROFILE: slick.jdbc.PostgresProfile$ DATASOURCE_DRIVER: org.postgresql.Driver - DATASOURCE_URL: jdbc:postgresql://172.15.100.51:5432/quat + DATASOURCE_URL: jdbc:postgresql://172.15.100.28:5432/temp-quat-database kind: ConfigMap metadata: From c57fdae4743f0cdc8f902c58d522f87056034bf2 Mon Sep 17 00:00:00 2001 From: Ishrath Ahamed Date: Wed, 26 Mar 2025 15:26:15 +0530 Subject: [PATCH 03/11] Update database name in IAM service secret --- secrets/iam-service-secret.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secrets/iam-service-secret.yml b/secrets/iam-service-secret.yml index ad6c73f..2468c7e 100644 --- a/secrets/iam-service-secret.yml +++ b/secrets/iam-service-secret.yml @@ -1,6 +1,6 @@ apiVersion: v1 data: - DB_DATABASE: cXVhdA== + DB_DATABASE: dGVtcC1xdWF0LWRhdGFiYXNl DB_PASSWORD: cXVhdHBnMTIz DB_USER: c2NfaWFt KEYCLOAK_PASSWORD: cGdzcWw= From bc691fdc9bdb4e6d25b4f29132e79e74142c8d10 Mon Sep 17 00:00:00 2001 From: Ishrath Ahamed Date: Thu, 27 Mar 2025 09:18:03 +0530 Subject: [PATCH 04/11] Add service-configs-secret for future use --- secrets/service-configs-secret.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 secrets/service-configs-secret.yml diff --git a/secrets/service-configs-secret.yml b/secrets/service-configs-secret.yml new file mode 100644 index 0000000..7d747b0 --- /dev/null +++ b/secrets/service-configs-secret.yml @@ -0,0 +1,8 @@ +apiVersion: v1 +data: + EMPTY_DATA: future_use +kind: Secret +metadata: + name: service-configs-secret + namespace: csi-dev +type: Opaque From b6edf71f6604741929b0041880c7d7625869cc25 Mon Sep 17 00:00:00 2001 From: Ishrath Ahamed Date: Thu, 27 Mar 2025 09:20:18 +0530 Subject: [PATCH 05/11] Update namespace for service-configs-secret to csi-uat --- secrets/service-configs-secret.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secrets/service-configs-secret.yml b/secrets/service-configs-secret.yml index 7d747b0..314b35e 100644 --- a/secrets/service-configs-secret.yml +++ b/secrets/service-configs-secret.yml @@ -4,5 +4,5 @@ data: kind: Secret metadata: name: service-configs-secret - namespace: csi-dev + namespace: csi-uat type: Opaque From b45c0f84ba05cf3bfa2a3eec18d766d484add272 Mon Sep 17 00:00:00 2001 From: Ishrath Ahamed Date: Thu, 27 Mar 2025 09:21:49 +0530 Subject: [PATCH 06/11] Update EMPTY_DATA in service-configs-secret to base64 encoded value --- secrets/service-configs-secret.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secrets/service-configs-secret.yml b/secrets/service-configs-secret.yml index 314b35e..639c29b 100644 --- a/secrets/service-configs-secret.yml +++ b/secrets/service-configs-secret.yml @@ -1,6 +1,6 @@ apiVersion: v1 data: - EMPTY_DATA: future_use + EMPTY_DATA: ZnV0dXJlVXNl kind: Secret metadata: name: service-configs-secret From e6294d01de436f0528bc1e37271b467101cc499c Mon Sep 17 00:00:00 2001 From: Ishrath Ahamed Date: Thu, 27 Mar 2025 09:37:12 +0530 Subject: [PATCH 07/11] Fix MongoDB URI parameters in security-database-configs.yml for correct TLS settings --- configmaps/security-database-configs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configmaps/security-database-configs.yml b/configmaps/security-database-configs.yml index f755185..8e65008 100644 --- a/configmaps/security-database-configs.yml +++ b/configmaps/security-database-configs.yml @@ -3,8 +3,8 @@ data: database-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database db-dialect: org.hibernate.dialect.PostgreSQLDialect db-driver: org.postgresql.Driver - permission-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/roles-permissions-01?tls=true&tlsAllowInvalidCertificates=truereadPreference=nearest - ui-reg-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/ui-registry-01?tls=true&tlsAllowInvalidCertificates=truereadPreference=nearest + permission-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/roles-permissions-01?tls=true&tlsAllowInvalidCertificates=true&readPreference=nearest + ui-reg-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/ui-registry-01?tls=true&tlsAllowInvalidCertificates=true&readPreference=nearest csi.personalization.mongo.uri: mongodb://admin:admin@172.15.100.24:27017/csi-personalisation?tls=true&tlsAllowInvalidCertificates=true kind: ConfigMap From 7b891d42952363650a17258ebf442843ceb4f85b Mon Sep 17 00:00:00 2001 From: Ishrath Ahamed Date: Thu, 27 Mar 2025 09:47:55 +0530 Subject: [PATCH 08/11] Remove tlsAllowInvalidCertificates parameter from MongoDB URIs in security-database-configs.yml --- configmaps/security-database-configs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configmaps/security-database-configs.yml b/configmaps/security-database-configs.yml index 8e65008..c160a4c 100644 --- a/configmaps/security-database-configs.yml +++ b/configmaps/security-database-configs.yml @@ -3,9 +3,9 @@ data: database-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database db-dialect: org.hibernate.dialect.PostgreSQLDialect db-driver: org.postgresql.Driver - permission-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/roles-permissions-01?tls=true&tlsAllowInvalidCertificates=true&readPreference=nearest - ui-reg-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/ui-registry-01?tls=true&tlsAllowInvalidCertificates=true&readPreference=nearest - csi.personalization.mongo.uri: mongodb://admin:admin@172.15.100.24:27017/csi-personalisation?tls=true&tlsAllowInvalidCertificates=true + permission-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/roles-permissions-01?tls=true&readPreference=nearest + ui-reg-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/ui-registry-01?tls=true&readPreference=nearest + csi.personalization.mongo.uri: mongodb://admin:admin@172.15.100.24:27017/csi-personalisation?tls=true kind: ConfigMap metadata: From a79d326e34fbd83d8130175799272ddd6d31ec7e Mon Sep 17 00:00:00 2001 From: Ishrath Ahamed Date: Thu, 27 Mar 2025 10:01:29 +0530 Subject: [PATCH 09/11] Remove TLS parameter from MongoDB URIs in security-database-configs.yml --- configmaps/security-database-configs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configmaps/security-database-configs.yml b/configmaps/security-database-configs.yml index c160a4c..1242917 100644 --- a/configmaps/security-database-configs.yml +++ b/configmaps/security-database-configs.yml @@ -3,9 +3,9 @@ data: database-url: jdbc:postgresql://172.15.100.28:5432/temp-quat-database db-dialect: org.hibernate.dialect.PostgreSQLDialect db-driver: org.postgresql.Driver - permission-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/roles-permissions-01?tls=true&readPreference=nearest - ui-reg-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/ui-registry-01?tls=true&readPreference=nearest - csi.personalization.mongo.uri: mongodb://admin:admin@172.15.100.24:27017/csi-personalisation?tls=true + permission-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/roles-permissions-01?&readPreference=nearest + ui-reg-mongodb-uri: mongodb://admin:admin@172.15.100.24:27017/ui-registry-01?&readPreference=nearest + csi.personalization.mongo.uri: mongodb://admin:admin@172.15.100.24:27017/csi-personalisation kind: ConfigMap metadata: From e85a15385ed258c2628c604e25f1ba9a025c843a Mon Sep 17 00:00:00 2001 From: Ishrath Ahamed Date: Thu, 27 Mar 2025 10:45:31 +0530 Subject: [PATCH 10/11] rename script --- extract_common_secret_mappings.py | 94 +++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 extract_common_secret_mappings.py diff --git a/extract_common_secret_mappings.py b/extract_common_secret_mappings.py new file mode 100644 index 0000000..c2343c0 --- /dev/null +++ b/extract_common_secret_mappings.py @@ -0,0 +1,94 @@ +import os +import yaml +from collections import defaultdict + +SECRET_DIR = "configmaps" +OUTPUT_YML = "config_mappings.yml" +PLACEHOLDER_PREFIX = "PH_" + +secret_mappings = {} +common_values = defaultdict(int) +value_to_placeholder = {} +value_to_first_key = {} +value_to_first_file = {} + +def find_common_values(obj, parent_key=None, filename=None): + if isinstance(obj, dict): + for k, v in obj.items(): + find_common_values(v, k, filename) + elif isinstance(obj, list): + for item in obj: + find_common_values(item, parent_key, filename) + elif isinstance(obj, str): + common_values[obj] += 1 + if obj not in value_to_first_key: + value_to_first_key[obj] = parent_key + value_to_first_file[obj] = filename + +def replace_common_values(obj): + global modified + if isinstance(obj, dict): + for k, v in obj.items(): + if isinstance(v, str) and common_values[v] > 1: + if v not in value_to_placeholder: + placeholder = ( + f"{PLACEHOLDER_PREFIX}{value_to_first_key[v].replace('-', '_').upper()}_" + f"{value_to_first_file[v].replace('.', '_').upper()}" + ) + value_to_placeholder[v] = placeholder + obj[k] = value_to_placeholder[v] + secret_mappings[value_to_placeholder[v]] = v + modified = True + elif isinstance(v, str) and "\n" in v: # Handle multi-line strings + lines = v.split("\n") + for i, line in enumerate(lines): + if line.strip() in common_values and common_values[line.strip()] > 1: + if line.strip() not in value_to_placeholder: + placeholder = ( + f"{PLACEHOLDER_PREFIX}{value_to_first_key[line.strip()].replace('-', '_').upper()}_" + f"{value_to_first_file[line.strip()].replace('.', '_').upper()}" + ) + value_to_placeholder[line.strip()] = placeholder + lines[i] = value_to_placeholder[line.strip()] + secret_mappings[value_to_placeholder[line.strip()]] = line.strip() + modified = True + obj[k] = "\n".join(lines) # Preserve formatting + else: + replace_common_values(v) + elif isinstance(obj, list): + for i, item in enumerate(obj): + if isinstance(item, str) and common_values[item] > 1: + if item not in value_to_placeholder: + placeholder = f"{PLACEHOLDER_PREFIX}{i}_{value_to_first_file[item].replace('.', '_').upper()}" + value_to_placeholder[item] = placeholder + obj[i] = value_to_placeholder[item] + secret_mappings[value_to_placeholder[item]] = item + modified = True + else: + replace_common_values(item) + +# First pass: Identify common values +for filename in os.listdir(SECRET_DIR): + if filename.endswith(".yml") or filename.endswith(".yaml"): + file_path = os.path.join(SECRET_DIR, filename) + with open(file_path, "r") as file: + data = yaml.safe_load(file) + find_common_values(data, filename=filename) + +# Second pass: Replace common values +for filename in os.listdir(SECRET_DIR): + if filename.endswith(".yml") or filename.endswith(".yaml"): + file_path = os.path.join(SECRET_DIR, filename) + with open(file_path, "r") as file: + data = yaml.safe_load(file) + modified = False + replace_common_values(data) + if modified: + with open(file_path, "w") as file: + yaml.safe_dump(data, file, default_flow_style=False) + +# Save mappings +with open(OUTPUT_YML, "w") as yamlfile: + yaml.safe_dump(secret_mappings, yamlfile, default_flow_style=False) + +print(f"Processing completed. Placeholder mappings saved in {OUTPUT_YML}.") From 77d73f6808e26a28184895606ca607d0f531725b Mon Sep 17 00:00:00 2001 From: Ishrath Ahamed Date: Thu, 27 Mar 2025 10:45:57 +0530 Subject: [PATCH 11/11] rename --- extract_common_secret_mappings copy.py | 94 -------------------------- 1 file changed, 94 deletions(-) delete mode 100644 extract_common_secret_mappings copy.py diff --git a/extract_common_secret_mappings copy.py b/extract_common_secret_mappings copy.py deleted file mode 100644 index c2343c0..0000000 --- a/extract_common_secret_mappings copy.py +++ /dev/null @@ -1,94 +0,0 @@ -import os -import yaml -from collections import defaultdict - -SECRET_DIR = "configmaps" -OUTPUT_YML = "config_mappings.yml" -PLACEHOLDER_PREFIX = "PH_" - -secret_mappings = {} -common_values = defaultdict(int) -value_to_placeholder = {} -value_to_first_key = {} -value_to_first_file = {} - -def find_common_values(obj, parent_key=None, filename=None): - if isinstance(obj, dict): - for k, v in obj.items(): - find_common_values(v, k, filename) - elif isinstance(obj, list): - for item in obj: - find_common_values(item, parent_key, filename) - elif isinstance(obj, str): - common_values[obj] += 1 - if obj not in value_to_first_key: - value_to_first_key[obj] = parent_key - value_to_first_file[obj] = filename - -def replace_common_values(obj): - global modified - if isinstance(obj, dict): - for k, v in obj.items(): - if isinstance(v, str) and common_values[v] > 1: - if v not in value_to_placeholder: - placeholder = ( - f"{PLACEHOLDER_PREFIX}{value_to_first_key[v].replace('-', '_').upper()}_" - f"{value_to_first_file[v].replace('.', '_').upper()}" - ) - value_to_placeholder[v] = placeholder - obj[k] = value_to_placeholder[v] - secret_mappings[value_to_placeholder[v]] = v - modified = True - elif isinstance(v, str) and "\n" in v: # Handle multi-line strings - lines = v.split("\n") - for i, line in enumerate(lines): - if line.strip() in common_values and common_values[line.strip()] > 1: - if line.strip() not in value_to_placeholder: - placeholder = ( - f"{PLACEHOLDER_PREFIX}{value_to_first_key[line.strip()].replace('-', '_').upper()}_" - f"{value_to_first_file[line.strip()].replace('.', '_').upper()}" - ) - value_to_placeholder[line.strip()] = placeholder - lines[i] = value_to_placeholder[line.strip()] - secret_mappings[value_to_placeholder[line.strip()]] = line.strip() - modified = True - obj[k] = "\n".join(lines) # Preserve formatting - else: - replace_common_values(v) - elif isinstance(obj, list): - for i, item in enumerate(obj): - if isinstance(item, str) and common_values[item] > 1: - if item not in value_to_placeholder: - placeholder = f"{PLACEHOLDER_PREFIX}{i}_{value_to_first_file[item].replace('.', '_').upper()}" - value_to_placeholder[item] = placeholder - obj[i] = value_to_placeholder[item] - secret_mappings[value_to_placeholder[item]] = item - modified = True - else: - replace_common_values(item) - -# First pass: Identify common values -for filename in os.listdir(SECRET_DIR): - if filename.endswith(".yml") or filename.endswith(".yaml"): - file_path = os.path.join(SECRET_DIR, filename) - with open(file_path, "r") as file: - data = yaml.safe_load(file) - find_common_values(data, filename=filename) - -# Second pass: Replace common values -for filename in os.listdir(SECRET_DIR): - if filename.endswith(".yml") or filename.endswith(".yaml"): - file_path = os.path.join(SECRET_DIR, filename) - with open(file_path, "r") as file: - data = yaml.safe_load(file) - modified = False - replace_common_values(data) - if modified: - with open(file_path, "w") as file: - yaml.safe_dump(data, file, default_flow_style=False) - -# Save mappings -with open(OUTPUT_YML, "w") as yamlfile: - yaml.safe_dump(secret_mappings, yamlfile, default_flow_style=False) - -print(f"Processing completed. Placeholder mappings saved in {OUTPUT_YML}.")