fixed sample configurations

docs/templates/.env-sample

-# environment identifier, e.g. evd
-APP_ENVIRONMENT_IDENTIFIER=
-# set to ON if running on gcp
-GCLOUD_PROJECT=
-# project identifier, e.g. '$SERVICE_ENV-seistore-services'
-SERVICE_CLOUD_PROJECT=
-# options: google
-CLOUDPROVIDER=
-PORT=5000
-OAUTH_CLIENT_ID=
-
-# IMP signer address
-IMP_SERVICE_ACCOUNT_SIGNER=
-
-# redis server info
-LOCKSMAP_REDIS_INSTANCE_ADDRESS=
-LOCKSMAP_REDIS_INSTANCE_PORT=
-
-# DES connection info
-SEISTORE_DES_HOST=
-SEISTORE_DES_APPKEY=
-SEISTORE_DES_TARGET_AUDIENCE=
-SEISTORE_DES_SUBDOMAIN_SUFFIX=
-SYSTEM_ADMIN_EMAIL_SUFFIX=
-
-# JWT validation
-JWKS_URL=
-JWT_EXCLUDE_PATHS=
-JWT_AUDIENCE=
-JWT_ENABLE_FEATURE=
-
-# set to ON if running unit tests
-UTEST=
-# options: google
-UTEST_PROVIDER=

docs/templates/.env-sample-azure

-#cloud provider is set to azure
+# cloud provider is set to azure
 CLOUDPROVIDER= "azure"
 
-#KeyVault where secrets are stored, secret values used to seed AzureConfig
+# the central KeyVault, secret values used to seed AzureConfig
 KEYVAULT_URL=
 
-#service principal (SP) to leverage managed identity (when running locally)
+# the service principal (SP) with right to access the previous keyvault
 AZURE_CLIENT_ID=
 AZURE_CLIENT_SECRET=
 AZURE_TENANT_ID=
 
-#Azure storage account name, note: the above SP should have Storage Blob Data Contributor role
-STORAGE_ACCOUNT_NAME=
+# specify service port, default is 5000
+PORT= 5000
 
-#specify service port, default is 5000
-PORT=
+# e.g. 'evd'
+APP_ENVIRONMENT_IDENTIFIER=
 
-#e.g. 'evd-seistore-services'
-SERVICE_CLOUD_PROJECT=
+# redis default port (osdu default 6380)
+REDIS_INSTANCE_PORT= 6380
 
-#e.g. 'evd'
-APP_ENVIRONMENT_IDENTIFIER=
+# DataEcosystem deployment URL (example https://evd.osdu.cloud.com")
+DES_SERVICE_HOST=
+
+# Features to disable ONLY the service run locally
+FEATURE_FLAG_TRACE= "false"
+FEATURE_FLAG_LOGGING= "false"
+FEATURE_FLAG_STACKDRIVER_EXPORTER= "false"

docs/templates/.env-sample-google

+# cloud provider is set to google
+CLOUDPROVIDER= "google"
+
+# e.g. 'evd'
+APP_ENVIRONMENT_IDENTIFIER=
+
+# the service google cloud project (gcp-id)
+SERVICE_CLOUD_PROJECT=
+
+# the path of the json keyfile of the service agent (service account) ONLY for local run
+SERVICE_IDENTITY_KEY_FILENAME=
+
+# specify service port, default is 5000
+PORT= 5000
+
+# redis instance url (defautl port 6379)
+LOCKSMAP_REDIS_INSTANCE_ADDRESS=
+LOCKSMAP_REDIS_INSTANCE_PORT= 6379
+
+# DataEcosystem deployment URL and APPKEY 
+SEISTORE_DES_HOST=
+SEISTORE_DES_APPKEY=
+
+# Target audience for enable communication service to service with DE
+SEISTORE_DES_TARGET_AUDIENCE=
+
+# service account (email) to use for sign impersonation token
+IMP_SERVICE_ACCOUNT_SIGNER=
+
+# Features to disable ONLY the service run locally
+FEATURE_FLAG_TRACE= "false"
+FEATURE_FLAG_LOGGING= "false"
+FEATURE_FLAG_STACKDRIVER_EXPORTER= "false"

src/cloud/providers/google/config.ts

@@ -32,8 +32,6 @@ export class ConfigGoogle extends Config {
     public static GOOGLE_EP_ROBOT = 'https://www.googleapis.com/robot/v1';
     public static GOOGLE_EP_RESOURCES = 'https://cloudresourcemanager.googleapis.com/v1';
 
-    // System Admin user agent email
-    public static SYSTEM_ADMIN_EMAIL_SUFFIX: string;
     // System admin role (tenant provisioning required role)
     public static SEISTORE_SYSTEM_ADMIN_ROLE = 'seismic_store.system.admin';
     // DE target audiance for service to service communication
@@ -57,10 +55,6 @@ export class ConfigGoogle extends Config {
 
     public async init(): Promise<void> {
 
-        // load system admins (a system admin can create a tenant)
-        ConfigGoogle.SYSTEM_ADMIN_EMAIL_SUFFIX = process.env.SYSTEM_ADMIN_EMAIL_SUFFIX;
-        Config.checkRequiredConfig(ConfigGoogle.SYSTEM_ADMIN_EMAIL_SUFFIX, 'SYSTEM_ADMIN_EMAIL_SUFFIX');
-
         // load des target audiance for service to service communication
         ConfigGoogle.DES_SERVICE_TARGET_AUDIENCE = process.env.SEISTORE_DES_TARGET_AUDIENCE;
         Config.checkRequiredConfig(ConfigGoogle.DES_SERVICE_TARGET_AUDIENCE, 'DES_SERVICE_TARGET_AUDIENCE');