Merge pull request #2930 from weseek/feat/GW-4166-refactor-setup-updator

feat/GW-4166-refactor-setup-uploader

src/server/service/config-loader.js

@@ -27,7 +27,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     ns:      'crowi',
     key:     'app:fileUploadType',
     type:    TYPES.STRING,
-    default: null,
+    default: 'aws',
   },
   // HACKMD_URI: {
   //   ns:      ,

src/server/service/config-manager.js

@@ -24,6 +24,10 @@ const KEYS_FOR_SAML_USE_ONLY_ENV_OPTION = [
   'security:passport-saml:ABLCRule',
 ];
 
+const KEYS_FOR_FIEL_UPLOAD_USE_ONLY_ENV_OPTION = [
+  'app:fileUploadType',
+];
+
 const KEYS_FOR_GCP_USE_ONLY_ENV_OPTION = [
   'gcs:apiKeyJsonPath',
   'gcs:bucket',
@@ -224,6 +228,9 @@ class ConfigManager extends S2sMessageHandlable {
         KEYS_FOR_SAML_USE_ONLY_ENV_OPTION.includes(key)
         && 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)
       // gcp option
       || (
         KEYS_FOR_GCP_USE_ONLY_ENV_OPTION.includes(key)

src/server/service/file-uploader/index.js

@@ -14,10 +14,7 @@ const envToModuleMappings = {
 class FileUploadServiceFactory {
 
   initializeUploader(crowi) {
-    // temporarily use envToModuleMappings [remove in GW-4136]
-    const fileUplodeTypeInConfig = envToModuleMappings[crowi.configManager.getConfig('crowi', 'app:fileUploadType')];
-
-    const method = envToModuleMappings[process.env.FILE_UPLOAD] || fileUplodeTypeInConfig || 'aws';
+    const method = envToModuleMappings[crowi.configManager.getConfig('crowi', 'app:fileUploadType')];
     const modulePath = `./${method}`;
     this.uploader = require(modulePath)(crowi);