Attempt fixing brig index create tests

wireapp · Apr 23, 2024 · 55a5627 · 55a5627
1 parent 33acd46
commit 55a5627
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/services/brig/test/integration/Index/Create.hs b/services/brig/test/integration/Index/Create.hs
@@ -50,7 +50,6 @@ spec brigOpts =
 testCreateIndexWhenNotPresent :: BrigOpts.Opts -> Assertion
 testCreateIndexWhenNotPresent brigOpts = do
   let (ES.Server esURL) = brigOpts ^. BrigOpts.elasticsearchL . BrigOpts.urlL
-  let mCreds = BrigOpts.credentials . BrigOpts.elasticsearch $ brigOpts
   case parseURI strictURIParserOptions (Text.encodeUtf8 esURL) of
     Left e -> fail $ "Invalid ES URL: " <> show esURL <> "\nerror: " <> show e
     Right esURI -> do
@@ -62,9 +61,9 @@ testCreateIndexWhenNotPresent brigOpts = do
             ESConnectionSettings
               { esServer = esURI,
                 esIndex = indexName,
-                esCaCert = Nothing,
-                esInsecureSkipVerifyTls = False,
-                esCredentials = mCreds
+                esCaCert = brigOpts.elasticsearch.caCert,
+                esInsecureSkipVerifyTls = brigOpts.elasticsearch.insecureSkipVerifyTls,
+                esCredentials = brigOpts.elasticsearch.credentials
               }
       let esSettings =
             IndexOpts.localElasticSettings
@@ -92,7 +91,6 @@ testCreateIndexWhenNotPresent brigOpts = do
 testCreateIndexWhenPresent :: BrigOpts.Opts -> Assertion
 testCreateIndexWhenPresent brigOpts = do
   let (ES.Server esURL) = brigOpts ^. BrigOpts.elasticsearchL . BrigOpts.urlL
-  let mCreds = BrigOpts.credentials . BrigOpts.elasticsearch $ brigOpts
   case parseURI strictURIParserOptions (Text.encodeUtf8 esURL) of
     Left e -> fail $ "Invalid ES URL: " <> show esURL <> "\nerror: " <> show e
     Right esURI -> do
@@ -111,9 +109,9 @@ testCreateIndexWhenPresent brigOpts = do
             ESConnectionSettings
               { esServer = esURI,
                 esIndex = indexName,
-                esCaCert = Nothing,
-                esInsecureSkipVerifyTls = False,
-                esCredentials = mCreds
+                esCaCert = brigOpts.elasticsearch.caCert,
+                esInsecureSkipVerifyTls = brigOpts.elasticsearch.insecureSkipVerifyTls,
+                esCredentials = brigOpts.elasticsearch.credentials
               }
       let esSettings =
             IndexOpts.localElasticSettings