Răsfoiți Sursa

Merge pull request #2754 from weseek/feat/GW-3751-add-IS_GCP_ENV_PRIORITIZED

Feat/gw 3751 add is gcp env prioritized
Yuki Takei 5 ani în urmă
părinte
comite
1d7f138de9

+ 6 - 0
src/server/service/config-loader.js

@@ -326,6 +326,12 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     type:    TYPES.STRING,
     default: null,
   },
+  IS_GCP_ENV_PRIORITIZED: {
+    ns:      'crowi',
+    key:     'gcs:isGcpEnvPrioritizes',
+    type:    TYPES.BOOLEAN,
+    default: false,
+  },
 };
 
 class ConfigLoader {

+ 11 - 0
src/server/service/config-manager.js

@@ -24,6 +24,12 @@ const KEYS_FOR_SAML_USE_ONLY_ENV_OPTION = [
   'security:passport-saml:ABLCRule',
 ];
 
+const KEYS_FOR_GCP_USE_ONLY_ENV_OPTION = [
+  'gcs:apiKeyJsonPath',
+  'gcs:bucket',
+  'gcs:uploadNamespace',
+];
+
 class ConfigManager extends S2sMessageHandlable {
 
   constructor(configModel) {
@@ -218,6 +224,11 @@ class ConfigManager extends S2sMessageHandlable {
         KEYS_FOR_SAML_USE_ONLY_ENV_OPTION.includes(key)
         && this.defaultSearch('crowi', 'security:passport-saml:useOnlyEnvVarsForSomeOptions')
       )
+      // gcp option
+      || (
+        KEYS_FOR_GCP_USE_ONLY_ENV_OPTION.includes(key)
+        && this.searchOnlyFromEnvVarConfigs('crowi', 'gcs:isGcpEnvPrioritizes')
+      )
     ));
   }