clean up

integration/test/Testlib/Run.hs

@@ -147,28 +147,25 @@ runTests tests mXMLOutput cfg = do
 
 deleteFederationV0AndV1Queues :: GlobalEnv -> IO ()
 deleteFederationV0AndV1Queues env = do
-  putStrLn "Attempting to delete federation V0 and V1 queues..."
-  do
-    (mV0User, mV0Pass) <- readV0CredsFromEnv
-    fromMaybe (putStrLn "No or incomplete credentials for fed V0 RabbitMQ") $ deleteFederationQueues env <$> env.gRabbitMQConfigV0 <*> mV0User <*> mV0Pass
-  do
-    (mV1User, mV1Pass) <- readV1CredsFromEnv
-    fromMaybe (putStrLn "No or incomplete credentials for fed V1 RabbitMQ") $ deleteFederationQueues env <$> env.gRabbitMQConfigV1 <*> mV1User <*> mV1Pass
+  let testDomains = env.gDomain1 : env.gDomain2 : env.gDynamicDomains
+  putStrLn "Attempting to delete federation V0 queues..."
+  (mV0User, mV0Pass) <- readCredsFromEnvWithSuffix "V0"
+  fromMaybe (putStrLn "No or incomplete credentials for fed V0 RabbitMQ") $
+    deleteFederationQueues testDomains env.gRabbitMQConfigV0 <$> mV0User <*> mV0Pass
+
+  putStrLn "Attempting to delete federation V1 queues..."
+  (mV1User, mV1Pass) <- readCredsFromEnvWithSuffix "V1"
+  fromMaybe (putStrLn "No or incomplete credentials for fed V1 RabbitMQ") $
+    deleteFederationQueues testDomains env.gRabbitMQConfigV1 <$> mV1User <*> mV1Pass
   where
-    readV0CredsFromEnv :: IO (Maybe Text, Maybe Text)
-    readV0CredsFromEnv =
+    readCredsFromEnvWithSuffix :: String -> IO (Maybe Text, Maybe Text)
+    readCredsFromEnvWithSuffix suffix =
       (,)
-        <$> (fmap fromString <$> lookupEnv "RABBITMQ_USERNAME_V0")
-        <*> (fmap fromString <$> lookupEnv "RABBITMQ_PASSWORD_V0")
+        <$> (fmap fromString <$> lookupEnv ("RABBITMQ_USERNAME_" <> suffix))
+        <*> (fmap fromString <$> lookupEnv ("RABBITMQ_PASSWORD_"<> suffix))
 
-    readV1CredsFromEnv :: IO (Maybe Text, Maybe Text)
-    readV1CredsFromEnv =
-      (,)
-        <$> (fmap fromString <$> lookupEnv "RABBITMQ_USERNAME_V1")
-        <*> (fmap fromString <$> lookupEnv "RABBITMQ_PASSWORD_V1")
-
-deleteFederationQueues :: GlobalEnv -> RabbitMQConfig -> Text -> Text -> IO ()
-deleteFederationQueues genv rc username password = do
+deleteFederationQueues :: [String] -> RabbitMQConfig -> Text -> Text -> IO ()
+deleteFederationQueues testDomains rc username password = do
   let opts =
         RabbitMqAdminOpts
           { host = rc.host,
@@ -181,7 +178,7 @@ deleteFederationQueues genv rc username password = do
                 else Nothing
           }
   client <- mkRabbitMqAdminClientEnvWithCreds opts username password
-  for_ (genv.gDomain1 : genv.gDomain2 : genv.gDynamicDomains) $ \domain -> do
+  for_ testDomains $ \domain -> do
     page <- client.listQueuesByVHost (fromString rc.vHost) (fromString $ "^backend-notifications\\." <> domain <> "$") True 100 1
     for_ page.items $ \queue -> do
       putStrLn $ "Deleting queue " <> T.unpack queue.name

integration/test/Testlib/Types.hs

@@ -119,8 +119,8 @@ data GlobalEnv = GlobalEnv
     gServicesCwdBase :: Maybe FilePath,
     gBackendResourcePool :: ResourcePool BackendResource,
     gRabbitMQConfig :: RabbitMQConfig,
-    gRabbitMQConfigV0 :: Maybe RabbitMQConfig,
-    gRabbitMQConfigV1 :: Maybe RabbitMQConfig,
+    gRabbitMQConfigV0 :: RabbitMQConfig,
+    gRabbitMQConfigV1 :: RabbitMQConfig,
     gTempDir :: FilePath,
     gTimeOutSeconds :: Int
   }
@@ -133,8 +133,8 @@ data IntegrationConfig = IntegrationConfig
     integrationTestHostName :: String,
     dynamicBackends :: Map String DynamicBackendConfig,
     rabbitmq :: RabbitMQConfig,
-    rabbitmqV0 :: Maybe RabbitMQConfig,
-    rabbitmqV1 :: Maybe RabbitMQConfig,
+    rabbitmqV0 :: RabbitMQConfig,
+    rabbitmqV1 :: RabbitMQConfig,
     cassandra :: CassandraConfig
   }
   deriving (Show, Generic)
@@ -150,8 +150,8 @@ instance FromJSON IntegrationConfig where
         <*> o .: fromString "integrationTestHostName"
         <*> o .: fromString "dynamicBackends"
         <*> o .: fromString "rabbitmq"
-        <*> o .:? fromString "rabbitmq-v0"
-        <*> o .:? fromString "rabbitmq-v1"
+        <*> o .: fromString "rabbitmq-v0"
+        <*> o .: fromString "rabbitmq-v1"
         <*> o .: fromString "cassandra"
 
 data ServiceMap = ServiceMap