server: add default naming convention to TenantConfig

PR-URL: https://github.com/hasura/graphql-engine-mono/pull/4710
GitOrigin-RevId: c989bed76fb22eef13304b0d8ef02b53dd70fd59

server/src-lib/Hasura/App.hs

@@ -715,6 +715,7 @@ mkHGEServer setupHook env ServeOptions {..} ServeCtx {..} initTime postPollHook
           _scEnabledLogTypes
           soWebsocketConnectionInitTimeout
           soEnableMetadataQueryLogging
+          soDefaultNamingConvention
 
   let serverConfigCtx =
         ServerConfigCtx

server/src-lib/Hasura/Server/App.hs

@@ -786,6 +786,8 @@ mkWaiApp ::
   WSConnectionInitTimeout ->
   -- | is metadata query logging in http-log enabled
   MetadataQueryLoggingMode ->
+  -- | default naming convention
+  Maybe NamingCase ->
   m HasuraApp
 mkWaiApp
   setupHook
@@ -818,7 +820,8 @@ mkWaiApp
   experimentalFeatures
   enabledLogTypes
   wsConnInitTimeout
-  enableMetadataQueryLogging = do
+  enableMetadataQueryLogging
+  defaultNC = do
     let getSchemaCache' = first lastBuiltSchemaCache <$> readSchemaCacheRef schemaCacheRef
 
     let corsPolicy = mkDefaultCorsPolicy corsCfg
@@ -860,7 +863,7 @@ mkWaiApp
               scLoggingSettings = LoggingSettings enabledLogTypes enableMetadataQueryLogging,
               scEventingMode = eventingMode,
               scEnableReadOnlyMode = readOnlyMode,
-              scDefaultNamingConvention = readDefaultNamingCaseFromEnv env
+              scDefaultNamingConvention = defaultNC
             }
 
     spockApp <- liftWithStateless $ \lowerIO ->

server/src-lib/Hasura/Server/Init/Config.hs

@@ -33,7 +33,6 @@ module Hasura.Server.Init.Config
     rawConnDetailsToUrlText,
     readAPIs,
     readDefaultNamingCase,
-    readDefaultNamingCaseFromEnv,
     readExperimentalFeatures,
     readHookType,
     readJson,
@@ -49,7 +48,6 @@ import Data.Aeson qualified as J
 import Data.Aeson.Casing qualified as J
 import Data.Aeson.TH qualified as J
 import Data.Char (toLower)
-import Data.Environment (Environment, lookupEnv)
 import Data.HashSet qualified as Set
 import Data.String qualified as DataString
 import Data.Text qualified as T
@@ -384,15 +382,6 @@ readAPIs = mapM readAPI . T.splitOn "," . T.pack
 readDefaultNamingCase :: String -> Either String NamingCase
 readDefaultNamingCase = parseNamingConventionFromText . T.pack
 
-readDefaultNamingCaseFromEnv :: Environment -> Maybe NamingCase
-readDefaultNamingCaseFromEnv env =
-  case lookupEnv env "HASURA_GRAPHQL_DEFAULT_NAMING_CONVENTION" of
-    Nothing -> Nothing
-    (Just defaultNC) ->
-      case readDefaultNamingCase defaultNC of
-        Left _ -> Nothing
-        Right nc -> Just nc
-
 readExperimentalFeatures :: String -> Either String [ExperimentalFeature]
 readExperimentalFeatures = mapM readAPI . T.splitOn "," . T.pack
   where

server/src-test/Main.hs

@@ -195,7 +195,7 @@ buildPostgresSpecs = do
                 mempty
                 EventingEnabled
                 readOnlyMode
-                (readDefaultNamingCaseFromEnv envMap)
+                Nothing -- We are not testing the naming convention here, so defaulting to hasura-default
             cacheBuildParams = CacheBuildParams httpManager (mkPgSourceResolver print) mkMSSQLSourceResolver serverConfigCtx
             pgLogger = print