Updated GitHub environments with variable name change

OBJECTSTORAGE_TEMP_EXPIRESIN changed to
SERVER_TEMP_EXPIRESIN

.github/environments/values.dev.yaml

@@ -19,14 +19,14 @@ config:
     KC_REALM: standard
     KC_SERVERURL: "https://dev.loginproxy.gov.bc.ca/auth"
     OBJECTSTORAGE_BUCKET: egejyy
-    OBJECTSTORAGE_TEMP_EXPIRESIN: "300"
     OBJECTSTORAGE_ENDPOINT: "https://nrs.objectstore.gov.bc.ca"
     # OBJECTSTORAGE_KEY: ~
     SERVER_BODYLIMIT: 30mb
     # SERVER_LOGFILE: ~
     SERVER_LOGLEVEL: http
     SERVER_PORT: "3000"
     SERVER_PRIVACY_MASK: "true"
+    SERVER_TEMP_EXPIRESIN: "300"
 
 patroni:
   enabled: true

.github/environments/values.prod.yaml

@@ -19,14 +19,14 @@ config:
     KC_REALM: standard
     KC_SERVERURL: "https://loginproxy.gov.bc.ca/auth"
     OBJECTSTORAGE_BUCKET: egejyy
-    OBJECTSTORAGE_TEMP_EXPIRESIN: "300"
     OBJECTSTORAGE_ENDPOINT: "https://nrs.objectstore.gov.bc.ca"
     # OBJECTSTORAGE_KEY: ~
     SERVER_BODYLIMIT: 30mb
     # SERVER_LOGFILE: ~
     SERVER_LOGLEVEL: http
     SERVER_PORT: "3000"
     SERVER_PRIVACY_MASK: "true"
+    SERVER_TEMP_EXPIRESIN: "300"
 
 patroni:
   enabled: true

.github/environments/values.test.yaml

@@ -19,14 +19,14 @@ config:
     KC_REALM: standard
     KC_SERVERURL: "https://test.loginproxy.gov.bc.ca/auth"
     OBJECTSTORAGE_BUCKET: egejyy
-    OBJECTSTORAGE_TEMP_EXPIRESIN: "300"
     OBJECTSTORAGE_ENDPOINT: "https://nrs.objectstore.gov.bc.ca"
     # OBJECTSTORAGE_KEY: ~
     SERVER_BODYLIMIT: 30mb
     # SERVER_LOGFILE: ~
     SERVER_LOGLEVEL: http
     SERVER_PORT: "3000"
     SERVER_PRIVACY_MASK: "true"
+    SERVER_TEMP_EXPIRESIN: "300"
 
 patroni:
   enabled: true

app/README.md

@@ -84,7 +84,6 @@ The following variables enable and enforce the use of OIDC Bearer Authentication
 | --- | --- | --- | --- |
 | `accessKeyId` | `OBJECTSTORAGE_ACCESSKEYID` | | The Access Key for your S3 compatible object storage account  |
 | `bucket` | `OBJECTSTORAGE_BUCKET` | | The object storage bucket name |
-| `defaultTempExpiresIn` | `OBJECTSTORAGE_TEMP_EXPIRESIN` | 300 | The expiry time for pre-signed URLs to objects in seconds  |
 | `endpoint` | `OBJECTSTORAGE_ENDPOINT` | | Object store URL. eg: `https://nrs.objectstore.gov.bc.ca` |
 | `key` | `OBJECTSTORAGE_KEY` | | The base path for storage location |
 | `secretAccessKey` | `OBJECTSTORAGE_SECRETACCESSKEY` | | The Secret Access Key for your S3 compatible object storage account |
@@ -96,6 +95,7 @@ The following variables alter the general Express application behavior. For most
 | Config Var | Env Var | Default | Notes |
 | --- | --- | --- | --- |
 | `bodyLimit` | `SERVER_BODYLIMIT` | 30mb | Maximum body size accepted for parsing to JSON body |
+| `defaultTempExpiresIn` | `SERVER_TEMP_EXPIRESIN` | 300 | The expiry time for pre-signed S3 URLs to objects in seconds  |
 | `logFile` | `SERVER_LOGFILE` | | Writes logs to the following file only if defined |
 | `logLevel` | `SERVER_LOGLEVEL` | http | The logging level of COMS |
 | `passphrase` | `SERVER_PASSPHRASE` | | A key to encrypt/decrypt bucket secretAccessKey's saved to the database |

app/tests/unit/services/storage.spec.js

@@ -29,7 +29,7 @@ const { MetadataDirective, TaggingDirective } = require('../../../src/components
 const DEFAULTREGION = 'us-east-1'; // Need to specify valid AWS region or it'll explode ('us-east-1' is default, 'ca-central-1' for Canada)
 const bucket = 'bucket';
 const key = 'filePath';
-const defaultTempExpiresIn = parseInt(config.get('objectStorage.defaultTempExpiresIn'), 10);
+const defaultTempExpiresIn = parseInt(config.get('server.defaultTempExpiresIn'), 10);
 
 const s3ClientMock = mockClient(S3Client);
 

charts/coms/README.md

@@ -35,7 +35,7 @@ Kubernetes: `>= 1.13.0`
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | basicAuthSecretOverride.password | string | `nil` |  |
 | basicAuthSecretOverride.username | string | `nil` |  |
-| config.configMap | object | `{"DB_PORT":"5432","KC_IDENTITYKEY":null,"KC_PUBLICKEY":null,"KC_REALM":null,"KC_SERVERURL":null,"OBJECTSTORAGE_BUCKET":null,"OBJECTSTORAGE_ENDPOINT":null,"OBJECTSTORAGE_KEY":null,"OBJECTSTORAGE_TEMP_EXPIRESIN":"300","SERVER_BODYLIMIT":"30mb","SERVER_LOGLEVEL":"http","SERVER_PORT":"3000"}` | These values will be wholesale added to the configmap as is; refer to the coms documentation for what each of these values mean and whether you need them defined. Ensure that all values are represented explicitly as strings, as non-string values will not translate over as expected into container environment variables. For configuration keys named `*_ENABLED`, either leave them commented/undefined, or set them to string value "true". |
+| config.configMap | object | `{"DB_PORT":"5432","KC_IDENTITYKEY":null,"KC_PUBLICKEY":null,"KC_REALM":null,"KC_SERVERURL":null,"OBJECTSTORAGE_BUCKET":null,"OBJECTSTORAGE_ENDPOINT":null,"OBJECTSTORAGE_KEY":null,"SERVER_BODYLIMIT":"30mb","SERVER_LOGLEVEL":"http","SERVER_PORT":"3000","SERVER_TEMP_EXPIRESIN":"300"}` | These values will be wholesale added to the configmap as is; refer to the coms documentation for what each of these values mean and whether you need them defined. Ensure that all values are represented explicitly as strings, as non-string values will not translate over as expected into container environment variables. For configuration keys named `*_ENABLED`, either leave them commented/undefined, or set them to string value "true". |
 | config.enabled | bool | `false` |  |
 | config.releaseScoped | bool | `false` | This should be set to true if and only if you require configmaps and secrets to be release scoped. In the event you want all instances in the same namespace to share a similar configuration, this should be set to false |
 | dbSecretOverride.password | string | `nil` |  |

charts/coms/values.yaml

@@ -139,7 +139,6 @@ config:
     KC_SERVERURL: ~
 
     OBJECTSTORAGE_BUCKET: ~
-    OBJECTSTORAGE_TEMP_EXPIRESIN: "300"
     OBJECTSTORAGE_ENDPOINT: ~
     OBJECTSTORAGE_KEY: ~
 
@@ -149,6 +148,7 @@ config:
     SERVER_LOGLEVEL: "http"
     SERVER_PORT: "3000"
     # SERVER_PRIVACY_MASK: "true"
+    SERVER_TEMP_EXPIRESIN: "300"
 
 # Modify the following variables if you need to acquire secret values from a custom-named resource
 basicAuthSecretOverride: