Merge pull request #2941 from weseek/feat/GW-4173-create-env-var-for-control-priority

Feat/gw 4173 create env var for control priority

src/server/service/config-loader.js

@@ -29,6 +29,12 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     type:    TYPES.STRING,
     default: 'aws',
   },
+  FILE_UPLOAD_PRIORITIZE_ENV_VAR: {
+    ns:      'crowi',
+    key:     'app:isFileUploadEnvPrioritized',
+    type:    TYPES.BOOLEAN,
+    default: false,
+  },
   // HACKMD_URI: {
   //   ns:      ,
   //   key:     ,
@@ -346,7 +352,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
   },
   IS_GCP_ENV_PRIORITIZED: {
     ns:      'crowi',
-    key:     'gcs:isGcpEnvPrioritizes',
+    key:     'gcs:isGcpEnvPrioritized',
     type:    TYPES.BOOLEAN,
     default: false,
   },

src/server/service/config-manager.js

@@ -229,12 +229,14 @@ class ConfigManager extends S2sMessageHandlable {
         && this.defaultSearch('crowi', 'security:passport-saml:useOnlyEnvVarsForSomeOptions')
       )
       // file upload option
-      // [TODO GW-4173] control with the env var gcs:isFileUploadEnvPrioritizes
-      || KEYS_FOR_FIEL_UPLOAD_USE_ONLY_ENV_OPTION.includes(key)
+      || (
+        KEYS_FOR_FIEL_UPLOAD_USE_ONLY_ENV_OPTION.includes(key)
+        && this.searchOnlyFromEnvVarConfigs('crowi', 'app:isFileUploadEnvPrioritized')
+      )
       // gcp option
       || (
         KEYS_FOR_GCP_USE_ONLY_ENV_OPTION.includes(key)
-        && this.searchOnlyFromEnvVarConfigs('crowi', 'gcs:isGcpEnvPrioritizes')
+        && this.searchOnlyFromEnvVarConfigs('crowi', 'gcs:isGcpEnvPrioritized')
       )
     ));
   }