Merge branch 'dev' into bugFix-obs-import

bcgov · Aug 26, 2024 · 1704975 · 1704975
2 parents 5860191 + d4e0f59
commit 1704975
Show file tree

Hide file tree

Showing 7 changed files with 113 additions and 2 deletions.
diff --git a/.config/config.json b/.config/config.json
@@ -5,6 +5,7 @@
     "tools": "tools",
     "dev": "dev",
     "test": "test",
+    "test-spi": "test",
     "prod": "prod"
   },
   "version": "1.0.0",
@@ -20,17 +21,20 @@
   "staticUrls": {
     "dev": "dev-biohubbc.apps.silver.devops.gov.bc.ca",
     "test": "test-biohubbc.apps.silver.devops.gov.bc.ca",
+    "test-spi": "test-spi-biohubbc.apps.silver.devops.gov.bc.ca",
     "prod": "biohubbc.apps.silver.devops.gov.bc.ca",
     "prodVanityUrl": "sims.nrs.gov.bc.ca"
   },
   "staticUrlsAPI": {
     "dev": "api-dev-biohubbc.apps.silver.devops.gov.bc.ca",
     "test": "api-test-biohubbc.apps.silver.devops.gov.bc.ca",
+    "test-spi": "api-test-spi-biohubbc.apps.silver.devops.gov.bc.ca",
     "prod": "api-biohubbc.apps.silver.devops.gov.bc.ca"
   },
   "siteminderLogoutURL": {
     "dev": "https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi",
     "test": "https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi",
+    "test-spi": "https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi",
     "prod": "https://logon7.gov.bc.ca/clp-cgi/logoff.cgi"
   },
   "sso": {
@@ -68,6 +72,23 @@
         "cssApiEnvironment": "test"
       }
     },
+    "test-spi": {
+      "host": "https://test.loginproxy.gov.bc.ca/auth",
+      "realm": "standard",
+      "clientId": "sims-4461",
+      "keycloakSecret": "keycloak",
+      "serviceClient": {
+        "serviceClientName": "sims-svc-4464",
+        "keycloakSecretServiceClientPasswordKey": "sims_svc_client_password"
+      },
+      "cssApi": {
+        "cssApiTokenUrl": "https://loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/token",
+        "cssApiClientId": "service-account-team-1190-4229",
+        "cssApiHost": "https://api.loginproxy.gov.bc.ca/api/v1",
+        "keycloakSecretCssApiSecretKey": "css_api_client_secret",
+        "cssApiEnvironment": "test"
+      }
+    },
     "prod": {
       "host": "https://loginproxy.gov.bc.ca/auth",
       "realm": "standard",

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -7,6 +7,7 @@ on:
     types: [opened, reopened, synchronize, ready_for_review]
     branches-ignore:
       - test
+      - test-spi
       - prod
 
 concurrency:

diff --git a/.github/workflows/deployStatic.yml b/.github/workflows/deployStatic.yml
@@ -8,6 +8,7 @@ on:
     branches:
       - dev
       - test
+      - test-spi
       - prod
 
 jobs:

diff --git a/api/.pipeline/config.js b/api/.pipeline/config.js
@@ -52,7 +52,6 @@ const phases = {
   build: {
     namespace: 'af2668-tools',
     name: `${name}`,
-    dbName: `${dbName}`,
     phase: 'build',
     changeId: changeId,
     suffix: `-build-${changeId}`,
@@ -152,6 +151,49 @@ const phases = {
     replicas: '2',
     replicasMax: '2'
   },
+  'test-spi': {
+    namespace: 'af2668-test',
+    name: `${name}-spi`,
+    dbName: `${dbName}-spi`,
+    phase: 'test-spi',
+    changeId: deployChangeId,
+    suffix: `-test-spi`,
+    instance: `${name}-spi-test-spi`,
+    version: `${version}`,
+    tag: `test-spi-${version}`,
+    host: staticUrlsAPI['test-spi'],
+    appHost: staticUrls['test-spi'],
+    backboneInternalApiHost: 'https://api-test-biohub-platform.apps.silver.devops.gov.bc.ca',
+    backbonePublicApiHost: 'https://api-test-biohub-platform.apps.silver.devops.gov.bc.ca',
+    backboneIntakePath: '/api/submission/intake',
+    backboneArtifactIntakePath: '/api/artifact/intake',
+    biohubTaxonPath: '/api/taxonomy/taxon',
+    biohubTaxonTsnPath: '/api/taxonomy/taxon/tsn',
+    bctwApiHost: 'https://moe-bctw-api-test.apps.silver.devops.gov.bc.ca',
+    critterbaseApiHost: 'https://moe-critterbase-api-test.apps.silver.devops.gov.bc.ca/api',
+    nodeEnv: 'production',
+    s3KeyPrefix: 'sims',
+    tz: config.timezone.api,
+    sso: config.sso['test-spi'],
+    featureFlags: '',
+    logLevel: 'warn',
+    logLevelFile: 'debug',
+    logFileDir: 'data/logs',
+    logFileName: 'sims-api-%DATE%.log',
+    logFileDatePattern: 'YYYY-MM-DD-HH',
+    logFileMaxSize: '50m',
+    logFileMaxFiles: '10',
+    volumeCapacity: '500Mi',
+    apiResponseValidationEnabled: true,
+    databaseResponseValidationEnabled: true,
+    nodeOptions: '--max_old_space_size=3000', // 75% of memoryLimit (bytes)
+    cpuRequest: '50m',
+    cpuLimit: '1000m',
+    memoryRequest: '100Mi',
+    memoryLimit: '4Gi',
+    replicas: '2',
+    replicasMax: '2'
+  },
   prod: {
     namespace: 'af2668-prod',
     name: `${name}`,

diff --git a/api/.pipeline/templates/api.dc.yaml b/api/.pipeline/templates/api.dc.yaml
@@ -129,7 +129,7 @@ parameters:
     value: 'debug'
     description: Log level for logs written to log files (file transport)
   - name: LOG_FILE_DIR
-    value: data
+    value: data/logs
     description: Directory where log files are stored
   - name: LOG_FILE_NAME
     value: sims-api-%DATE%.log

diff --git a/app/.pipeline/config.js b/app/.pipeline/config.js
@@ -121,6 +121,33 @@ const phases = {
     biohubTaxonPath: '/api/taxonomy/taxon',
     biohubTaxonTsnPath: '/api/taxonomy/taxon/tsn'
   },
+  'test-spi': {
+    namespace: 'af2668-test',
+    name: `${name}-spi`,
+    phase: 'test-spi',
+    changeId: deployChangeId,
+    suffix: `-test-spi`,
+    instance: `${name}-test-spi`,
+    version: `${version}`,
+    tag: `test-spi-${version}`,
+    host: staticUrls['test-spi'],
+    apiHost: staticUrlsAPI['test-spi'],
+    siteminderLogoutURL: config.siteminderLogoutURL['test-spi'],
+    maxUploadNumFiles,
+    maxUploadFileSize,
+    nodeEnv: 'production',
+    sso: config.sso['test-spi'],
+    featureFlags: '',
+    cpuRequest: '50m',
+    cpuLimit: '500m',
+    memoryRequest: '100Mi',
+    memoryLimit: '500Mi',
+    replicas: '2',
+    replicasMax: '2',
+    backbonePublicApiHost: 'https://api-test-biohub-platform.apps.silver.devops.gov.bc.ca',
+    biohubTaxonPath: '/api/taxonomy/taxon',
+    biohubTaxonTsnPath: '/api/taxonomy/taxon/tsn'
+  },
   prod: {
     namespace: 'af2668-prod',
     name: `${name}`,

diff --git a/database/.pipeline/config.js b/database/.pipeline/config.js
@@ -97,6 +97,25 @@ const phases = {
     memoryLimit: '5Gi',
     replicas: '1'
   },
+  'test-spi': {
+    namespace: 'af2668-test',
+    name: `${name}-spi`,
+    phase: 'test-spi',
+    changeId: deployChangeId,
+    suffix: '-test-spi',
+    instance: `${name}-spi-test-spi`,
+    version: `${version}`,
+    tag: `test-spi-${version}`,
+    nodeEnv: 'production',
+    tz: config.timezone.db,
+    dbSetupDockerfilePath: dbSetupDockerfilePath,
+    volumeCapacity: '20Gi',
+    cpuRequest: '50m',
+    cpuLimit: '2000m',
+    memoryRequest: '100Mi',
+    memoryLimit: '5Gi',
+    replicas: '1'
+  },
   prod: {
     namespace: 'af2668-prod',
     name: `${name}`,
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ on: @@
         branches:
           - dev
           - test
+          - test-spi
           - prod
     jobs:
@@ Expand Down @@