From 1d2667e833da3b17046fe3e7c9ef1f125794168e Mon Sep 17 00:00:00 2001 From: bolyachevets Date: Wed, 6 May 2026 20:49:51 -0700 Subject: [PATCH] added ip-type var since prod/sandbox dont use vpc and need public ip --- jobs/permanent/assets-payment/devops/vaults.gcp.env | 1 + jobs/permanent/assets-payment/src/assets_payment/config.py | 4 ++-- .../assets-registrations-staff/devops/vaults.gcp.env | 1 + .../ppr-registrations-historical/devops/vaults.gcp.env | 1 + .../secured-party-notification/devops/vaults.gcp.env | 1 + .../src/secured_party_notification/config.py | 4 ++-- mhr-api/devops/vaults.gcp.env | 3 ++- ppr-api/devops/vaults.gcp.env | 7 +++---- 8 files changed, 13 insertions(+), 9 deletions(-) diff --git a/jobs/permanent/assets-payment/devops/vaults.gcp.env b/jobs/permanent/assets-payment/devops/vaults.gcp.env index f8bbfda4d..40f19c0fd 100644 --- a/jobs/permanent/assets-payment/devops/vaults.gcp.env +++ b/jobs/permanent/assets-payment/devops/vaults.gcp.env @@ -17,6 +17,7 @@ ACCOUNT_SVC_CLIENT_SECRET="op://ppr/$APP_ENV/jwt/ACCOUNT_SVC_CLIENT_SECRET" DATABASE_NAME="op://database/$APP_ENV/ppr-db-gcp/DATABASE_NAME" DATABASE_USERNAME="op://database/$APP_ENV/ppr-db-gcp/JOB_DATABASE_USERNAME" CLOUDSQL_INSTANCE_CONNECTION_NAME="op://database/$APP_ENV/ppr-db-gcp/DATABASE_INSTANCE_CONNECTION_NAME" +DATABASE_IP_TYPE="op://database/$APP_ENV/ppr-db-gcp/DATABASE_IP_TYPE" NOTIFY_STATUS_RECIPIENTS="op://ppr/$APP_ENV/assets-payment/NOTIFY_STATUS_RECIPIENTS" NOTIFY_STATUS_SUBJECT="op://ppr/$APP_ENV/assets-payment/NOTIFY_STATUS_SUBJECT" NOTIFY_STATUS_BODY="op://ppr/$APP_ENV/assets-payment/NOTIFY_STATUS_BODY" diff --git a/jobs/permanent/assets-payment/src/assets_payment/config.py b/jobs/permanent/assets-payment/src/assets_payment/config.py index bf7a401e0..7313b1f3d 100644 --- a/jobs/permanent/assets-payment/src/assets_payment/config.py +++ b/jobs/permanent/assets-payment/src/assets_payment/config.py @@ -57,9 +57,9 @@ class Config(BaseConfig): if CLOUDSQL_INSTANCE_CONNECTION_NAME: SQLALCHEMY_DATABASE_URI = "postgresql+pg8000://" if APP_DB_HOST: - APP_DATABASE_URI = f"postgresql://{APP_DB_USER}:{APP_DB_PASSWORD}@{APP_DB_HOST}:{APP_DB_PORT}/{APP_DB_NAME}" + APP_DATABASE_URI = f"postgresql+pg8000://{APP_DB_USER}:{APP_DB_PASSWORD}@{APP_DB_HOST}:{APP_DB_PORT}/{APP_DB_NAME}" SQLALCHEMY_DATABASE_URI = ( - f"postgresql://{APP_DB_USER}:{APP_DB_PASSWORD}@{APP_DB_HOST}:{APP_DB_PORT}/{APP_DB_NAME}" + f"postgresql+pg8000://{APP_DB_USER}:{APP_DB_PASSWORD}@{APP_DB_HOST}:{APP_DB_PORT}/{APP_DB_NAME}" ) # Notify config diff --git a/jobs/permanent/assets-registrations-staff/devops/vaults.gcp.env b/jobs/permanent/assets-registrations-staff/devops/vaults.gcp.env index ef08e96ab..3db48e2f3 100644 --- a/jobs/permanent/assets-registrations-staff/devops/vaults.gcp.env +++ b/jobs/permanent/assets-registrations-staff/devops/vaults.gcp.env @@ -1,4 +1,5 @@ DATABASE_NAME="op://database/$APP_ENV/ppr-db-gcp/DATABASE_NAME" DATABASE_USERNAME="op://database/$APP_ENV/ppr-db-gcp/JOB_DATABASE_USERNAME" CLOUDSQL_INSTANCE_CONNECTION_NAME="op://database/$APP_ENV/ppr-db-gcp/DATABASE_INSTANCE_CONNECTION_NAME" +DATABASE_IP_TYPE="op://database/$APP_ENV/ppr-db-gcp/DATABASE_IP_TYPE" VPC_CONNECTOR="op://CD/$APP_ENV/ppr-assets-reg-staff/VPC_CONNECTOR" \ No newline at end of file diff --git a/jobs/permanent/ppr-registrations-historical/devops/vaults.gcp.env b/jobs/permanent/ppr-registrations-historical/devops/vaults.gcp.env index 82050ebba..496995ab6 100644 --- a/jobs/permanent/ppr-registrations-historical/devops/vaults.gcp.env +++ b/jobs/permanent/ppr-registrations-historical/devops/vaults.gcp.env @@ -1,5 +1,6 @@ DATABASE_NAME="op://database/$APP_ENV/ppr-db-gcp/DATABASE_NAME" DATABASE_USERNAME="op://database/$APP_ENV/ppr-db-gcp/JOB_DATABASE_USERNAME" CLOUDSQL_INSTANCE_CONNECTION_NAME="op://database/$APP_ENV/ppr-db-gcp/DATABASE_INSTANCE_CONNECTION_NAME" +DATABASE_IP_TYPE="op://database/$APP_ENV/ppr-db-gcp/DATABASE_IP_TYPE" START_DATE_OFFSET="op://ppr/$APP_ENV/registrations-historical/START_DATE_OFFSET" VPC_CONNECTOR="op://CD/$APP_ENV/ppr-reg-historical/VPC_CONNECTOR" diff --git a/jobs/permanent/secured-party-notification/devops/vaults.gcp.env b/jobs/permanent/secured-party-notification/devops/vaults.gcp.env index 3f5a40633..4fe4d4ecb 100644 --- a/jobs/permanent/secured-party-notification/devops/vaults.gcp.env +++ b/jobs/permanent/secured-party-notification/devops/vaults.gcp.env @@ -17,6 +17,7 @@ ACCOUNT_SVC_CLIENT_SECRET="op://ppr/$APP_ENV/jwt/ACCOUNT_SVC_CLIENT_SECRET" DATABASE_NAME="op://database/$APP_ENV/ppr-db-gcp/DATABASE_NAME" DATABASE_USERNAME="op://database/$APP_ENV/ppr-db-gcp/JOB_DATABASE_USERNAME" CLOUDSQL_INSTANCE_CONNECTION_NAME="op://database/$APP_ENV/ppr-db-gcp/DATABASE_INSTANCE_CONNECTION_NAME" +DATABASE_IP_TYPE="op://database/$APP_ENV/ppr-db-gcp/DATABASE_IP_TYPE" REPORT_API_URL="op://ppr/$APP_ENV/ppr-api/REPORT_SVC_URL" REPORT_API_AUDIENCE="op://ppr/$APP_ENV/ppr-api/REPORT_API_AUDIENCE" NOTIFY_STATUS_RECIPIENTS="op://ppr/$APP_ENV/secured-party/NOTIFY_STATUS_RECIPIENTS" diff --git a/jobs/permanent/secured-party-notification/src/secured_party_notification/config.py b/jobs/permanent/secured-party-notification/src/secured_party_notification/config.py index a4abcb0c4..fed0bd076 100644 --- a/jobs/permanent/secured-party-notification/src/secured_party_notification/config.py +++ b/jobs/permanent/secured-party-notification/src/secured_party_notification/config.py @@ -55,9 +55,9 @@ class Config(BaseConfig): if CLOUDSQL_INSTANCE_CONNECTION_NAME: SQLALCHEMY_DATABASE_URI = "postgresql+pg8000://" if APP_DB_HOST: - APP_DATABASE_URI = f"postgresql://{APP_DB_USER}:{APP_DB_PASSWORD}@{APP_DB_HOST}:{APP_DB_PORT}/{APP_DB_NAME}" + APP_DATABASE_URI = f"postgresql+pg8000://{APP_DB_USER}:{APP_DB_PASSWORD}@{APP_DB_HOST}:{APP_DB_PORT}/{APP_DB_NAME}" SQLALCHEMY_DATABASE_URI = ( - f"postgresql://{APP_DB_USER}:{APP_DB_PASSWORD}@{APP_DB_HOST}:{APP_DB_PORT}/{APP_DB_NAME}" + f"postgresql+pg8000://{APP_DB_USER}:{APP_DB_PASSWORD}@{APP_DB_HOST}:{APP_DB_PORT}/{APP_DB_NAME}" ) # Notify config diff --git a/mhr-api/devops/vaults.gcp.env b/mhr-api/devops/vaults.gcp.env index e71af7850..00fda8d00 100644 --- a/mhr-api/devops/vaults.gcp.env +++ b/mhr-api/devops/vaults.gcp.env @@ -13,6 +13,7 @@ DATABASE_NAME="op://database/$APP_ENV/ppr-db-gcp/DATABASE_NAME" DATABASE_USERNAME="op://database/$APP_ENV/ppr-db-gcp/SA_DATABASE_USERNAME" CLOUDSQL_INSTANCE_CONNECTION_NAME="op://database/$APP_ENV/ppr-db-gcp/DATABASE_INSTANCE_CONNECTION_NAME" DATABASE_OWNER_ROLE="op://database/$APP_ENV/ppr-db-gcp/DATABASE_OWNER" +DATABASE_IP_TYPE="op://database/$APP_ENV/ppr-db-gcp/DATABASE_IP_TYPE" AUTH_API_URL="op://API/$APP_ENV/auth-api/AUTH_API_URL" AUTH_API_VERSION="op://API/$APP_ENV/auth-api/AUTH_API_VERSION" PAY_API_URL="op://API/$APP_ENV/pay-api/PAY_API_URL" @@ -23,7 +24,7 @@ GOOGLE_DEFAULT_SA="op://buckets/$APP_ENV/mhr-api/GOOGLE_DEFAULT_SA" GCP_CS_PROJECT_ID="op://ppr/$APP_ENV/mhr-api/GCP_PS_PROJECT_ID" GCP_CS_SA_SCOPES="op://buckets/$APP_ENV/mhr-api/GCP_CS_SA_SCOPES" GCP_CS_BUCKET_ID="op://buckets/$APP_ENV/mhr-api/GCP_CS_BUCKET_ID" -GCP_CS_BUCKET_ID_REGISTRATION ="op://buckets/$APP_ENV/mhr-api/GCP_CS_BUCKET_ID_REGISTRATION" +GCP_CS_BUCKET_ID_REGISTRATION="op://buckets/$APP_ENV/mhr-api/GCP_CS_BUCKET_ID_REGISTRATION" GCP_CS_BUCKET_ID_BATCH="op://buckets/$APP_ENV/mhr-api/GCP_CS_BUCKET_ID_BATCH" GCP_CS_BUCKET_ID_TERMS="op://buckets/$APP_ENV/mhr-api/GCP_CS_BUCKET_ID_TERMS" REPORT_TEMPLATE_PATH="op://API/$APP_ENV/report-api-gotenberg/REPORT_TEMPLATE_PATH" diff --git a/ppr-api/devops/vaults.gcp.env b/ppr-api/devops/vaults.gcp.env index d22bf8105..af9d43bd5 100644 --- a/ppr-api/devops/vaults.gcp.env +++ b/ppr-api/devops/vaults.gcp.env @@ -14,7 +14,7 @@ DATABASE_NAME="op://database/$APP_ENV/ppr-db-gcp/DATABASE_NAME" DATABASE_USERNAME="op://database/$APP_ENV/ppr-db-gcp/SA_DATABASE_USERNAME" CLOUDSQL_INSTANCE_CONNECTION_NAME="op://database/$APP_ENV/ppr-db-gcp/DATABASE_INSTANCE_CONNECTION_NAME" DATABASE_OWNER_ROLE="op://database/$APP_ENV/ppr-db-gcp/DATABASE_OWNER" - +DATABASE_IP_TYPE="op://database/$APP_ENV/ppr-db-gcp/DATABASE_IP_TYPE" AUTH_API_URL="op://API/$APP_ENV/auth-api/AUTH_API_URL" AUTH_API_VERSION="op://API/$APP_ENV/auth-api/AUTH_API_VERSION" @@ -24,12 +24,12 @@ REPORT_API_URL="op://ppr/$APP_ENV/ppr-api/REPORT_SVC_URL" REPORT_API_LARGE_URL="op://ppr/$APP_ENV/ppr-api/REPORT_SVC_LARGE_URL" REPORT_TEMPLATE_PATH="op://API/$APP_ENV/report-api-gotenberg/REPORT_TEMPLATE_PATH" REPORT_VERSION="op://ppr/$APP_ENV/ppr-api/REPORT_VERSION" -REPORT_API_AUDIENCE=op://ppr/$APP_ENV/ppr-api/REPORT_API_AUDIENCE" +REPORT_API_AUDIENCE="op://ppr/$APP_ENV/ppr-api/REPORT_API_AUDIENCE" REPORT_SEARCH_LIGHT="op://ppr/$APP_ENV/ppr-api/REPORT_SEARCH_LIGHT" GOOGLE_DEFAULT_SA="op://buckets/$APP_ENV/ppr-api/GOOGLE_DEFAULT_SA" GCP_CS_SA_SCOPES="op://buckets/$APP_ENV/ppr-api/GCP_CS_SA_SCOPES" GCP_CS_BUCKET_ID="op://buckets/$APP_ENV/ppr-api/GCP_CS_BUCKET_ID" -GCP_CS_BUCKET_ID_REGISTRATION ="op://buckets/$APP_ENV/ppr-api/GCP_CS_BUCKET_ID_REGISTRATION" +GCP_CS_BUCKET_ID_REGISTRATION="op://buckets/$APP_ENV/ppr-api/GCP_CS_BUCKET_ID_REGISTRATION" GCP_CS_BUCKET_ID_MAIL="op://buckets/$APP_ENV/ppr-api/GCP_CS_BUCKET_ID_MAIL" SEARCH_PDF_ASYNC_THRESHOLD="op://ppr/$APP_ENV/ppr-api/SEARCH_PDF_ASYNC_THRESHOLD" EVENT_MAX_RETRIES="op://ppr/$APP_ENV/ppr-api/EVENT_MAX_RETRIES" @@ -40,7 +40,6 @@ GCP_PS_VERIFICATION_REPORT_TOPIC="op://ppr/$APP_ENV/ppr-api/GCP_PS_VERIFICATION_ GCP_PS_REGISTRATION_REPORT_TOPIC="op://ppr/$APP_ENV/ppr-api/GCP_PS_REGISTRATION_REPORT_TOPIC" GATEWAY_URL="op://ppr/$APP_ENV/ppr-api/GATEWAY_URL" SUBSCRIPTION_API_KEY="op://ppr/$APP_ENV/ppr-api/SUBSCRIPTION_API_KEY" -REPORT_SEARCH_LIGHT="op://ppr/$APP_ENV/ppr-api/REPORT_SEARCH_LIGHT" MAX_SIZE_SEARCH_RT="op://ppr/$APP_ENV/ppr-api/MAX_SIZE_SEARCH_RT" GATEWAY_API_KEY="op://ppr/$APP_ENV/ppr-api/GATEWAY_API_KEY" ACCOUNT_REGISTRATIONS_MAX_RESULTS="op://ppr/$APP_ENV/ppr-api/ACCOUNT_REGISTRATIONS_MAX_RESULTS"