Release: promote Solr changes to main for TEST deployment

.github/CODEOWNERS

@@ -1 +1 @@
-* @eve-git @shaangill025 @stevenc987 @mengdong19 @ozamani9gh @rarmitag @flutistar @EPortman
+* @stevenc987 @mengdong19 @ozamani9gh @rarmitag @hfekete @davemck513

.github/workflows/bad-designation-notifier-cd.yml

@@ -25,6 +25,10 @@ on:
           - "false"
           - "true"
 
+permissions:
+  id-token: write
+  contents: write
+
 jobs:
   namex-bad-designation-notifier-cd:
     uses: bcgov/bcregistry-sre/.github/workflows/backend-job-cd.yaml@main

.github/workflows/bad-designation-notifier-ci.yml

@@ -10,12 +10,14 @@ defaults:
     shell: bash
     working-directory: ./jobs/bad-designation-notifier
 
+permissions:
+  id-token: write
+  contents: write
+
 jobs:
   namex-bad-designation-notifier-ci:
     uses: bcgov/bcregistry-sre/.github/workflows/backend-ci.yaml@main
     with:
       app_name: "namex-bad-designation-notifier"
       working_directory: "./jobs/bad-designation-notifier"
-      codecov_flag: "namexbaddesignationnotifier"
-      skip_isort: "true"
-      skip_black: "true"
+      codecov_flag: "namex-bad-designation-notifier"

.github/workflows/bad-name-notifier-cd.yml

@@ -25,6 +25,10 @@ on:
           - "false"
           - "true"
 
+permissions:
+  id-token: write
+  contents: write
+
 jobs:
   namex-bad-name-notifier-cd:
     uses: bcgov/bcregistry-sre/.github/workflows/backend-job-cd.yaml@main

.github/workflows/bad-name-notifier-ci.yml

@@ -10,12 +10,14 @@ defaults:
     shell: bash
     working-directory: ./jobs/bad-name-notifier
 
+permissions:
+  id-token: write
+  contents: write
+
 jobs:
   namex-bad-name-notifier-ci:
     uses: bcgov/bcregistry-sre/.github/workflows/backend-ci.yaml@main
     with:
       app_name: "namex-bad-name-notifier"
       working_directory: "./jobs/bad-name-notifier"
-      codecov_flag: "namexbadnamenotifier"
-      skip_isort: "true"
-      skip_black: "true"
+      codecov_flag: "namex-bad-name-notifier"

.github/workflows/notebook-report-cd.yml

@@ -30,7 +30,7 @@ jobs:
     uses: bcgov/bcregistry-sre/.github/workflows/backend-job-cd.yaml@main
     with:
       target: ${{ inputs.target }}
-      app_name: "notebook-report"
+      app_name: "namex-notebook-report"
       working_directory: "./jobs/notebook-report"
       redeploy: ${{ inputs.redeploy }}
     secrets:

.github/workflows/sftp-nuans-report-ci.yml

@@ -16,6 +16,4 @@ jobs:
     with:
       app_name: "nuans-report"
       working_directory: "./jobs/sftp-nuans-report"
-      codecov_flag: "namexnuansreport"
-      skip_isort: "true"
-      skip_black: "true"
+      codecov_flag: "namexnuansreport"

api/.env.sample

@@ -1,29 +1,33 @@
 SECRET_KEY=
-GUNICORN_PROCESSES='2'
-GUNICORN_THREADS='5'
+GUNICORN_PROCESSES=
+GUNICORN_THREADS=
 
 # Database
 # only for local db
 # check dev-scripts/local-db/docker-compose.yml for exact values
 # similar values are also used in https://github.com/bcgov/bcregistry-sre/blob/main/.github/workflows/backend-ci.yaml
-DATABASE_USERNAME=postgres
-DATABASE_PASSWORD="postgres"
-DATABASE_NAME="unittesting"
-DATABASE_HOST="localhost"
-DATABASE_PORT="54345"
-DATABASE_SCHEMA="public"
-DATABASE_OWNER="postgres"
+DATABASE_USERNAME=
+DATABASE_PASSWORD=
+DATABASE_NAME=
+DATABASE_HOST=
+DATABASE_PORT=
+DATABASE_SCHEMA=
+DATABASE_OWNER=
 
 # only when conenecting to clousql db
 DATABASE_INSTANCE_CONNECTION_NAME=
-DATABASE_NAME=namex
-DATABASE_USERNAME="[email protected]" # your email, which needs to be added as IAM user to cloudsql instance and granted readwrite access
-DATABASE_IP_TYPE=public
-DATABASE_OWNER=userHQH
+DATABASE_NAME=
+DATABASE_USERNAME=   # your email, which needs to be added as IAM user to cloudsql instance and granted readwrite access
+DATABASE_IP_TYPE=
+DATABASE_OWNER=
 
-# APIs
-SOLR_BASE_URL=
+# Solr API
+SOLR_API_URL=
+SOLR_API_VERSION=
+SOLR_API_SERVICE_ACCOUNT_CLIENT_ID=
+SOLR_API_SERVICE_ACCOUNT_CLIENT_SECRET=
 
+# APIs
 SOLR_SYNONYMS_API_URL=
 SOLR_SYNONYMS_API_VERSION=
 
@@ -61,9 +65,9 @@ ENTITY_SERVICE_ACCOUNT_CLIENT_SECRET=
 
 JWT_OIDC_WELL_KNOWN_CONFIG=
 JWT_OIDC_CLIENT_SECRET=
-JWT_OIDC_ALGORITHMS=RS256
-JWT_OIDC_CACHING_ENABLED=True
-JWT_OIDC_JWKS_CACHE_TIMEOUT=300
+JWT_OIDC_ALGORITHMS=
+JWT_OIDC_CACHING_ENABLED=
+JWT_OIDC_JWKS_CACHE_TIMEOUT=
 
 # PUBSUB
 NAMEX_MAILER_TOPIC=
@@ -74,7 +78,7 @@ MRAS_SVC_URL=
 MRAS_SVC_API_KEY=
 
 # Local development only
-DISABLE_NAMEREQUEST_SOLR_UPDATES=1
+DISABLE_NAMEREQUEST_SOLR_UPDATES=
 
 # launchdarkly
-NAMEX_LD_SDK_ID=sdk-075200eb-4ff7-4e0e-872a-848585d3d460
+NAMEX_LD_SDK_ID=

api/config.py

@@ -31,7 +31,7 @@ class Config(object):
 
     SQLALCHEMY_TRACK_MODIFICATIONS = False
 
-    SOLR_BASE_URL = os.getenv('SOLR_BASE_URL', None)
+    SOLR_API_URL = f'{os.getenv('SOLR_API_URL', None)}{os.getenv('SOLR_API_VERSION', None)}'
 
     SOLR_SYNONYMS_API_URL = f'{os.getenv("SOLR_SYNONYMS_API_URL", None)}{os.getenv("SOLR_SYNONYMS_API_VERSION", None)}'
 
@@ -100,8 +100,16 @@ class Config(object):
     PAYMENT_SVC_AUTH_CLIENT_ID = os.getenv('NAME_REQUEST_SERVICE_ACCOUNT_CLIENT_ID', '')
     PAYMENT_SVC_CLIENT_SECRET = os.getenv('NAME_REQUEST_SERVICE_ACCOUNT_CLIENT_SECRET', '')
 
+    SOLR_SVC_AUTH_URL = os.getenv('KEYCLOAK_AUTH_TOKEN_URL', '')
+    SOLR_API_SERVICE_ACCOUNT_CLIENT_ID = os.getenv('SOLR_API_SERVICE_ACCOUNT_CLIENT_ID', '')
+    SOLR_API_SERVICE_ACCOUNT_CLIENT_SECRET = os.getenv('SOLR_API_SERVICE_ACCOUNT_CLIENT_SECRET', '')
+
     DISABLE_NAMEREQUEST_SOLR_UPDATES = int(os.getenv('DISABLE_NAMEREQUEST_SOLR_UPDATES', 0))
 
+    # Enables test-only endpoints (e.g. force NR state without notifying Solr).
+    # Set in dev/test/sandbox only - never in production.
+    ALLOW_TEST_ENDPOINT = os.getenv('ALLOW_TEST_ENDPOINT', 'false').lower() == 'true'
+
     NAMEX_NR_STATE_TOPIC = os.getenv('NAMEX_NR_STATE_TOPIC', '')
     EMAILER_TOPIC = os.getenv('NAMEX_MAILER_TOPIC', '')
 
@@ -142,7 +150,10 @@ class TestConfig(Config):  # pylint: disable=too-few-public-methods
     DB_NAME = os.getenv('DATABASE_TEST_NAME', 'unittesting')
     DB_HOST = os.getenv('DATABASE_TEST_HOST', 'localhost')
     DB_PORT = os.getenv('DATABASE_TEST_PORT', '54345')
-    SQLALCHEMY_DATABASE_URI = f'postgresql+pg8000://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{int(DB_PORT)}/{DB_NAME}'
+    if os.getenv('TEST_USE_LOCAL_DB', False):
+        SQLALCHEMY_DATABASE_URI = f'postgresql+psycopg2://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{int(DB_PORT)}/{DB_NAME}'
+    else:
+        SQLALCHEMY_DATABASE_URI = f'postgresql+pg8000://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{int(DB_PORT)}/{DB_NAME}'
 
     # Ensure SQLAlchemy is properly configured for Flask-Marshmallow compatibility
     SQLALCHEMY_TRACK_MODIFICATIONS = False

api/devops/gcp/clouddeploy.yaml

@@ -82,4 +82,5 @@ serialPipeline:
       cloudsql-instances: "a083gt-prod:northamerica-northeast1:namex-db-prod"
       resources-cpu: 4000m
       resources-memory: 8Gi
-      container-concurrency: "8"
+      max-scale: "60"
+      container-concurrency: "20"

api/devops/vaults.gcp.env

@@ -22,11 +22,15 @@ LEGAL_API_URL="op://API/$APP_ENV/legal-api/LEGAL_API_URL"
 LEGAL_API_VERSION="op://API/$APP_ENV/legal-api/LEGAL_API_VERSION_2"
 NAMEX_LD_SDK_ID="op://launchdarkly/$APP_ENV/namex/NAMEX_LD_SDK_ID"
 SECRET_KEY="op://namex/$APP_ENV/namex-api/SECRET_KEY"
-SOLR_BASE_URL="op://namex/$APP_ENV/namex-api/SOLR_BASE_URL_EXTERNAL"
+SOLR_API_URL="op://namex/$APP_ENV/solr/SOLR_API_URL"
+SOLR_API_VERSION="op://namex/$APP_ENV/solr/SOLR_API_VERSION"
+SOLR_API_SERVICE_ACCOUNT_CLIENT_ID="op://namex/$APP_ENV/solr/SOLR_API_SERVICE_ACCOUNT_CLIENT_ID"
+SOLR_API_SERVICE_ACCOUNT_CLIENT_SECRET="op://namex/$APP_ENV/solr/SOLR_API_SERVICE_ACCOUNT_CLIENT_SECRET"
 GUNICORN_PROCESSES="op://namex/$APP_ENV/namex-api/GUNICORN_PROCESSES"
 GUNICORN_THREADS="op://namex/$APP_ENV/namex-api/GUNICORN_THREADS"
 AUTO_ANALYZE_URL="op://namex/$APP_ENV/namex-api/AUTO_ANALYZE_URL"
 AUTO_ANALYZE_CONFIG="op://namex/$APP_ENV/namex-api/AUTO_ANALYZE_CONFIG"
+ALLOW_TEST_ENDPOINT="op://namex/$APP_ENV/namex-api/ALLOW_TEST_ENDPOINT"
 MRAS_SVC_URL="op://namex/$APP_ENV/mras-api/MRAS_SVC_URL"
 MRAS_SVC_API_KEY="op://namex/$APP_ENV/mras-api/MRAS_SVC_API_KEY"
 JWT_OIDC_AUDIENCE="op://namex/$APP_ENV/jwt/JWT_OIDC_AUDIENCE"
@@ -47,4 +51,4 @@ DATABASE_USERNAME="op://database/$APP_ENV/namex-db-gcp/DATABASE_USERNAME"
 DATABASE_NAME="op://database/$APP_ENV/namex-db-gcp/DATABASE_NAME"
 DATABASE_INSTANCE_CONNECTION_NAME="op://database/$APP_ENV/namex-db-gcp/DATABASE_INSTANCE_CONNECTION_NAME"
 DATABASE_SCHEMA="op://database/$APP_ENV/namex-db-gcp/DATABASE_SCHEMA"
-DATABASE_OWNER="op://database/$APP_ENV/namex-db-gcp/DATABASE_OWNER"
+DATABASE_OWNER="op://database/$APP_ENV/namex-db-gcp/DATABASE_OWNER"

api/namex/VERSION.py

@@ -1 +1 @@
-__version__ = '1.2.69'
+__version__ = '1.2.70'