update keys for useOnlyEnvVars

apps/app/src/server/routes/apiv3/app-settings.js

@@ -439,7 +439,7 @@ module.exports = (crowi) => {
       fileUpload: configManager.getConfig('crowi', 'app:fileUpload'),
       isV5Compatible: configManager.getConfig('crowi', 'app:isV5Compatible'),
       siteUrl: configManager.getConfig('crowi', 'app:siteUrl'),
-      siteUrlUseOnlyEnvVars: configManager.getConfig('crowi', 'app:siteUrl:useOnlyEnvVars'),
+      siteUrlUseOnlyEnvVars: configManager.getConfig('crowi', 'env:useOnlyEnvVars:app:siteUrl'),
       envSiteUrl: configManager.getConfig('app:siteUrl', ConfigSource.env),
       isMailerSetup: crowi.mailService.isMailerSetup,
       fromAddress: configManager.getConfig('crowi', 'mail:from'),
@@ -454,7 +454,7 @@ module.exports = (crowi) => {
 
       fileUploadType: configManager.getConfig('crowi', 'app:fileUploadType'),
       envFileUploadType: configManager.getConfig('app:fileUploadType', ConfigSource.env),
-      useOnlyEnvVarForFileUploadType: configManager.getConfig('crowi', 'app:useOnlyEnvVarForFileUploadType'),
+      useOnlyEnvVarForFileUploadType: configManager.getConfig('crowi', 'env:useOnlyEnvVars:app:fileUploadType'),
 
       s3Region: configManager.getConfig('crowi', 'aws:s3Region'),
       s3CustomEndpoint: configManager.getConfig('crowi', 'aws:s3CustomEndpoint'),
@@ -462,7 +462,7 @@ module.exports = (crowi) => {
       s3AccessKeyId: configManager.getConfig('crowi', 'aws:s3AccessKeyId'),
       s3ReferenceFileWithRelayMode: configManager.getConfig('crowi', 'aws:referenceFileWithRelayMode'),
 
-      gcsUseOnlyEnvVars: configManager.getConfig('crowi', 'gcs:useOnlyEnvVarsForSomeOptions'),
+      gcsUseOnlyEnvVars: configManager.getConfig('crowi', 'env:useOnlyEnvVars:gcs'),
       gcsApiKeyJsonPath: configManager.getConfig('crowi', 'gcs:apiKeyJsonPath'),
       gcsBucket: configManager.getConfig('crowi', 'gcs:bucket'),
       gcsUploadNamespace: configManager.getConfig('crowi', 'gcs:uploadNamespace'),
@@ -472,7 +472,7 @@ module.exports = (crowi) => {
       envGcsBucket: configManager.getConfig('gcs:bucket', ConfigSource.env),
       envGcsUploadNamespace: configManager.getConfig('gcs:uploadNamespace', ConfigSource.env),
 
-      azureUseOnlyEnvVars: configManager.getConfig('crowi', 'azure:useOnlyEnvVarsForSomeOptions'),
+      azureUseOnlyEnvVars: configManager.getConfig('crowi', 'env:useOnlyEnvVars:azure'),
       azureTenantId: configManager.getConfig('azure:tenantId', ConfigSource.db),
       azureClientId: configManager.getConfig('azure:clientId', ConfigSource.db),
       azureClientSecret: configManager.getConfig('azure:clientSecret', ConfigSource.db),
@@ -594,7 +594,7 @@ module.exports = (crowi) => {
    */
   router.put('/site-url-setting', loginRequiredStrictly, adminRequired, addActivity, validator.siteUrlSetting, apiV3FormValidator, async(req, res) => {
 
-    const useOnlyEnvVars = configManager.getConfig('crowi', 'app:siteUrl:useOnlyEnvVars');
+    const useOnlyEnvVars = configManager.getConfig('crowi', 'env:useOnlyEnvVars:app:siteUrl');
 
     if (useOnlyEnvVars) {
       const msg = 'Updating the Site URL is prohibited on this system.';

apps/app/src/server/routes/apiv3/security-settings/index.js

@@ -368,7 +368,7 @@ module.exports = (crowi) => {
         disableLinkSharing: await configManager.getConfig('crowi', 'security:disableLinkSharing'),
       },
       localSetting: {
-        useOnlyEnvVarsForSomeOptions: await configManager.getConfig('crowi', 'security:passport-local:useOnlyEnvVarsForSomeOptions'),
+        useOnlyEnvVarsForSomeOptions: await configManager.getConfig('crowi', 'env:useOnlyEnvVars:security:passport-local'),
         registrationMode: await configManager.getConfig('crowi', 'security:registrationMode'),
         registrationWhitelist: await configManager.getConfig('crowi', 'security:registrationWhitelist'),
         isPasswordResetEnabled: await configManager.getConfig('crowi', 'security:passport-local:isPasswordResetEnabled'),
@@ -398,7 +398,7 @@ module.exports = (crowi) => {
       },
       samlAuth: {
         missingMandatoryConfigKeys: await crowi.passportService.getSamlMissingMandatoryConfigKeys(),
-        useOnlyEnvVarsForSomeOptions: await configManager.getConfig('security:passport-saml:useOnlyEnvVarsForSomeOptions', ConfigSource.env),
+        useOnlyEnvVarsForSomeOptions: await configManager.getConfig('env:useOnlyEnvVars:security:passport-saml', ConfigSource.env),
         samlEntryPoint: await configManager.getConfig('security:passport-saml:entryPoint', ConfigSource.db),
         samlEnvVarEntryPoint: await configManager.getConfig('security:passport-saml:entryPoint', ConfigSource.env),
         samlIssuer: await configManager.getConfig('security:passport-saml:issuer', ConfigSource.db),

apps/app/src/server/service/config-manager/legacy/config-loader.ts

@@ -58,7 +58,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO: Record<string, EnvConfig> = {
   },
   FILE_UPLOAD_USES_ONLY_ENV_VAR_FOR_FILE_UPLOAD_TYPE: {
     ns:      'crowi',
-    key:     'app:useOnlyEnvVarForFileUploadType',
+    key:     'env:useOnlyEnvVars:app:fileUploadType',
     type:    ValueType.BOOLEAN,
     default: false,
   },
@@ -124,7 +124,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO: Record<string, EnvConfig> = {
   },
   APP_SITE_URL_USES_ONLY_ENV_VARS: {
     ns:      'crowi',
-    key:     'app:siteUrl:useOnlyEnvVars',
+    key:     'env:useOnlyEnvVars:app:siteUrl',
     type:    ValueType.BOOLEAN,
     default: false,
   },
@@ -366,7 +366,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO: Record<string, EnvConfig> = {
   },
   LOCAL_STRATEGY_USES_ONLY_ENV_VARS_FOR_SOME_OPTIONS: {
     ns:      'crowi',
-    key:     'security:passport-local:useOnlyEnvVarsForSomeOptions',
+    key:     'env:useOnlyEnvVars:security:passport-local',
     type:    ValueType.BOOLEAN,
     default: false,
   },
@@ -384,7 +384,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO: Record<string, EnvConfig> = {
   },
   SAML_USES_ONLY_ENV_VARS_FOR_SOME_OPTIONS: {
     ns:      'crowi',
-    key:     'security:passport-saml:useOnlyEnvVarsForSomeOptions',
+    key:     'env:useOnlyEnvVars:security:passport-saml',
     type:    ValueType.BOOLEAN,
     default: false,
   },
@@ -530,7 +530,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO: Record<string, EnvConfig> = {
   },
   GCS_USES_ONLY_ENV_VARS_FOR_SOME_OPTIONS: {
     ns:      'crowi',
-    key:     'gcs:useOnlyEnvVarsForSomeOptions',
+    key:     'env:useOnlyEnvVars:gcs',
     type:    ValueType.BOOLEAN,
     default: false,
   },
@@ -581,7 +581,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO: Record<string, EnvConfig> = {
   },
   AZURE_USES_ONLY_ENV_VARS_FOR_SOME_OPTIONS: {
     ns:      'crowi',
-    key:     'azure:useOnlyEnvVarsForSomeOptions',
+    key:     'env:useOnlyEnvVars:azure',
     type:    ValueType.BOOLEAN,
     default: false,
   },

apps/app/src/server/service/config-manager/legacy/config-manager.ts

@@ -241,32 +241,32 @@ class ConfigManagerImpl implements ConfigManager, S2sMessageHandlable {
       // siteUrl
       (
         KEYS_FOR_APP_SITE_URL_USES_ONLY_ENV_OPTION.includes(key)
-        && this.defaultSearch('crowi', 'app:siteUrl:useOnlyEnvVars')
+        && this.defaultSearch('crowi', 'env:useOnlyEnvVars:app:siteUrl')
       )
       // local strategy
       || (
         KEYS_FOR_LOCAL_STRATEGY_USE_ONLY_ENV_OPTION.includes(key)
-        && this.defaultSearch('crowi', 'security:passport-local:useOnlyEnvVarsForSomeOptions')
+        && this.defaultSearch('crowi', 'env:useOnlyEnvVars:security:passport-local')
       )
       // saml strategy
       || (
         KEYS_FOR_SAML_USE_ONLY_ENV_OPTION.includes(key)
-        && this.defaultSearch('crowi', 'security:passport-saml:useOnlyEnvVarsForSomeOptions')
+        && this.defaultSearch('crowi', 'env:useOnlyEnvVars:security:passport-saml')
       )
       // file upload option
       || (
         KEYS_FOR_FIEL_UPLOAD_USE_ONLY_ENV_OPTION.includes(key)
-        && this.searchOnlyFromEnvVarConfigs('crowi', 'app:useOnlyEnvVarForFileUploadType')
+        && this.searchOnlyFromEnvVarConfigs('crowi', 'env:useOnlyEnvVars:app:fileUploadType')
       )
       // gcs option
       || (
         KEYS_FOR_GCS_USE_ONLY_ENV_OPTION.includes(key)
-        && this.searchOnlyFromEnvVarConfigs('crowi', 'gcs:useOnlyEnvVarsForSomeOptions')
+        && this.searchOnlyFromEnvVarConfigs('crowi', 'env:useOnlyEnvVars:gcs')
       )
       // azure option
       || (
         KEYS_FOR_AZURE_USE_ONLY_ENV_OPTION.includes(key)
-        && this.searchOnlyFromEnvVarConfigs('crowi', 'azure:useOnlyEnvVarsForSomeOptions')
+        && this.searchOnlyFromEnvVarConfigs('crowi', 'env:useOnlyEnvVars:azure')
       )
     ));
   }

apps/app/src/server/service/g2g-transfer.ts

@@ -40,18 +40,18 @@ export const X_GROWI_TRANSFER_KEY_HEADER_NAME = 'x-growi-transfer-key';
  */
 const UPLOAD_CONFIG_KEYS = [
   'app:fileUploadType',
-  'app:useOnlyEnvVarForFileUploadType',
+  'env:useOnlyEnvVars:app:fileUploadType',
   'aws:referenceFileWithRelayMode',
   'aws:lifetimeSecForTemporaryUrl',
   'gcs:apiKeyJsonPath',
   'gcs:bucket',
   'gcs:uploadNamespace',
   'gcs:referenceFileWithRelayMode',
-  'gcs:useOnlyEnvVarsForSomeOptions',
+  'env:useOnlyEnvVars:gcs',
   'azure:storageAccountName',
   'azure:storageContainerName',
   'azure:referenceFileWithRelayMode',
-  'azure:useOnlyEnvVarsForSomeOptions',
+  'env:useOnlyEnvVars:azure',
 ] satisfies ConfigKey[];
 
 /**