Feature solr admin sql connector

solr-admin-app/config.py

@@ -1,4 +1,5 @@
 import os
+
 import dotenv
 
 dotenv.load_dotenv(dotenv.find_dotenv(), override=True)
@@ -28,12 +29,19 @@ class Config(object):
     DATABASE_PORT = os.getenv('NAMES_ADMIN_DATABASE_PORT', '5432')
     DATABASE_NAME = os.getenv('NAMES_ADMIN_DATABASE_NAME', '')
 
-    if DB_UNIX_SOCKET := os.getenv('NAMES_ADMIN_DATABASE_UNIX_SOCKET', None):
-        SQLALCHEMY_DATABASE_URI = f'postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@/{DATABASE_NAME}?host={DB_UNIX_SOCKET}'
-        SQLALCHEMY_BINDS = {'synonyms': f'postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@/{DATABASE_NAME}?host={DB_UNIX_SOCKET}'}
+    DB_SCHEMA = os.getenv('DATABASE_SCHEMA', 'public')
+    DB_IP_TYPE = os.getenv('DATABASE_IP_TYPE', 'private')
+
+    if DB_INSTANCE_CONNECTION_NAME := os.getenv('DATABASE_INSTANCE_CONNECTION_NAME', None):
+        SQLALCHEMY_DATABASE_URI = 'postgresql+pg8000://'
+        SQLALCHEMY_BINDS = {
+            'synonyms': 'postgresql+pg8000://'  # same minimal URI
+        }
     else:
-        SQLALCHEMY_DATABASE_URI = f'postgresql://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{int(DATABASE_PORT)}/{DATABASE_NAME}'
-        SQLALCHEMY_BINDS = {'synonyms': f'postgresql://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{int(DATABASE_PORT)}/{DATABASE_NAME}'}
+        SQLALCHEMY_DATABASE_URI = f'postgresql+pg8000://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}'
+        SQLALCHEMY_BINDS = {
+            'synonyms': f'postgresql+pg8000://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}'
+        }
 
     DEBUG = False
     TESTING = False

solr-admin-app/devops/vaults.gcp.env

@@ -3,10 +3,10 @@ JWT_OIDC_WELL_KNOWN_CONFIG="op://keycloak/$APP_ENV/jwt-base/JWT_OIDC_WELL_KNOWN_
 JWT_OIDC_AUDIENCE="op://namex/$APP_ENV/solr-admin/JWT_OIDC_AUDIENCE"
 JWT_OIDC_CLIENT_SECRET="op://namex/$APP_ENV/solr-admin/JWT_OIDC_CLIENT_SECRET"
 OIDC_REDIRECT_URI="op://namex/$APP_ENV/solr-admin/SOLR_ADMIN_APP_OVERWRITE_REDIRECT_URI_GCP"
-NAMES_ADMIN_DATABASE_UNIX_SOCKET="op://database/$APP_ENV/namex-db-gcp/DATABASE_UNIX_SOCKET"
+DATABASE_INSTANCE_CONNECTION_NAME="op://database/$APP_ENV/namex-db-gcp/DATABASE_INSTANCE_CONNECTION_NAME"
 NAMES_ADMIN_DATABASE_USERNAME="op://database/$APP_ENV/namex-db-gcp/DATABASE_USERNAME"
-NAMES_ADMIN_DATABASE_PASSWORD="op://database/$APP_ENV/namex-db-gcp/DATABASE_PASSWORD"
-NAMES_ADMIN_DATABASE_PORT="op://database/$APP_ENV/namex-db-gcp/DATABASE_PORT"
 NAMES_ADMIN_DATABASE_NAME="op://database/$APP_ENV/namex-db-gcp/DATABASE_NAME"
 SOLR_ADMIN_APP_SOLR_INSTANCE="op://namex/$APP_ENV/solr-admin/SOLR_ADMIN_APP_SOLR_INSTANCE"
-SOLR_URL="op://namex/$APP_ENV/solr-admin/SOLR_URL"
+SOLR_URL="op://namex/$APP_ENV/solr-admin/SOLR_URL"
+DATABASE_SCHEMA="op://database/$APP_ENV/namex-db-gcp/DATABASE_SCHEMA"
+VPC_CONNECTOR="op://CD/$APP_ENV/base/VPC_CONNECTOR"