fix(#1234): Fix lint errors

IntersectMBO · Jul 19, 2024 · 6060d6a · 6060d6a
1 parent 614e37d
commit 6060d6a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/govtool/backend/src/VVA/Config.hs b/govtool/backend/src/VVA/Config.hs
@@ -201,9 +201,9 @@ convertConfig VVAConfigInternal {..} =
       metadataValidationPort = vVAConfigInternalMetadataValidationPort,
       metadataValidationMaxConcurrentRequests = vVAConfigInternalMetadataValidationMaxConcurrentRequests,
       redisConfig = RedisConfig
-        { redisHost = redisInternalConfigHost $ vVAConfigInternalRedisConfig,
-          redisPort = redisInternalConfigPort $ vVAConfigInternalRedisConfig,
-          redisPassword = redisInternalConfigPassword $ vVAConfigInternalRedisConfig
+        { redisHost = redisInternalConfigHost vVAConfigInternalRedisConfig,
+          redisPort = redisInternalConfigPort vVAConfigInternalRedisConfig,
+          redisPassword = redisInternalConfigPassword vVAConfigInternalRedisConfig
         }
     }
 

diff --git a/govtool/backend/src/VVA/Metadata.hs b/govtool/backend/src/VVA/Metadata.hs
@@ -7,25 +7,26 @@
 
 module VVA.Metadata where
 
+import           Control.Concurrent         (threadDelay)
 import           Control.Exception          (Exception, try)
-import qualified Database.Redis as Redis
-import Control.Concurrent (threadDelay)
-import           Prelude hiding (lookup)
 import           Control.Monad.Except       (MonadError, throwError)
 import           Control.Monad.Reader
 
-import           Data.Aeson                 (Value (..), decode, encode, object, (.=))
+import           Data.Aeson                 ( Value(..), decode, encode, object, (.=), encode, object, (.=) )
 import           Data.Aeson.KeyMap          (lookup)
 import           Data.ByteString            (ByteString)
 import           Data.FileEmbed             (embedFile)
 import           Data.Has                   (Has, getter)
+import           Data.List                  (partition)
 import           Data.Maybe                 (fromJust)
+import           Data.Scientific
 import           Data.String                (fromString)
 import           Data.Text                  (Text, pack, unpack)
-import qualified Data.Text.Encoding         as Text
 import           Data.Time.Clock
-import           Data.List                  (partition)
+import qualified Data.Text.Encoding         as Text
+
 import qualified Database.PostgreSQL.Simple as SQL
+import qualified Database.Redis as Redis
 
 import           Network.HTTP.Client
 import           Network.HTTP.Client.TLS
@@ -35,10 +36,6 @@ import           Prelude                    hiding (lookup)
 import           VVA.Config
 import           VVA.Pool                   (ConnectionPool, withPool)
 import           VVA.Types
-import Network.HTTP.Client
-import Network.HTTP.Client.TLS
-import Data.Aeson (encode, object, (.=))
-import           Data.Scientific
 
 sqlFrom :: ByteString -> SQL.Query
 sqlFrom bs = fromString $ unpack $ Text.decodeUtf8 bs

diff --git a/scripts/govtool/config/templates/docker-compose.yml.tpl b/scripts/govtool/config/templates/docker-compose.yml.tpl
@@ -232,7 +232,7 @@ services:
   redis:
     image: docker.io/bitnami/redis:7.2
     ports:
-      - '8094:6379'
+      - '6379:8094'
     environment:
       - REDIS_PASSWORD=${REDIS_PASSWORD}
     volumes: