fix db reset local index

wireapp · Apr 10, 2024 · e4eca8b · e4eca8b
1 parent 9ccd29c
commit e4eca8b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -285,29 +285,26 @@ db-migrate-package:
 .PHONY: db-reset
 db-reset: c
 	@echo "Make sure you have ./deploy/dockerephemeral/run.sh running in another window!"
-	# ./dist/brig-schema --keyspace brig_test --replication-factor 1 --reset
-	# ./dist/galley-schema --keyspace galley_test --replication-factor 1 --reset
-	# ./dist/gundeck-schema --keyspace gundeck_test --replication-factor 1 --reset
-	# ./dist/spar-schema --keyspace spar_test --replication-factor 1 --reset
-	# ./dist/brig-schema --keyspace brig_test2 --replication-factor 1 --reset
-	# ./dist/galley-schema --keyspace galley_test2 --replication-factor 1 --reset
-	# ./dist/gundeck-schema --keyspace gundeck_test2 --replication-factor 1 --reset
-	# ./dist/spar-schema --keyspace spar_test2 --replication-factor 1 --reset
-	# ./integration/scripts/integration-dynamic-backends-db-schemas.sh --replication-factor 1 --reset
+	./dist/brig-schema --keyspace brig_test --replication-factor 1 --reset
+	./dist/galley-schema --keyspace galley_test --replication-factor 1 --reset
+	./dist/gundeck-schema --keyspace gundeck_test --replication-factor 1 --reset
+	./dist/spar-schema --keyspace spar_test --replication-factor 1 --reset
+	./dist/brig-schema --keyspace brig_test2 --replication-factor 1 --reset
+	./dist/galley-schema --keyspace galley_test2 --replication-factor 1 --reset
+	./dist/gundeck-schema --keyspace gundeck_test2 --replication-factor 1 --reset
+	./dist/spar-schema --keyspace spar_test2 --replication-factor 1 --reset
+	./integration/scripts/integration-dynamic-backends-db-schemas.sh --replication-factor 1 --reset
 	./dist/brig-index reset \
 		--elasticsearch-index-prefix directory \
 		--elasticsearch-server https://localhost:9200 \
-		--elasticsearch-credentials ./services/brig/test/resources/elasticsearch-credentials.yaml
-		--elasticsearch-insecure-skip-tls-verify true > /dev/null
+		--elasticsearch-credentials ./services/brig/test/resources/elasticsearch-credentials.yaml > /dev/null
 	./dist/brig-index reset \
 		--elasticsearch-index-prefix directory2 \
 		--elasticsearch-server https://localhost:9200 \
-		--elasticsearch-credentials ./services/brig/test/resources/elasticsearch-credentials.yaml
-		--elasticsearch-insecure-skip-tls-verify true > /dev/null
-	# ./integration/scripts/integration-dynamic-backends-brig-index.sh \
-	# 	--elasticsearch-server https://localhost:9200 \
-	# 	--elasticsearch-credentials ./services/brig/test/resources/elasticsearch-credentials.yaml
-	# 	--elasticsearch-insecure-skip-tls-verify true > /dev/null
+		--elasticsearch-credentials ./services/brig/test/resources/elasticsearch-credentials.yaml > /dev/null
+	./integration/scripts/integration-dynamic-backends-brig-index.sh \
+		--elasticsearch-server https://localhost:9200 \
+		--elasticsearch-credentials ./services/brig/test/resources/elasticsearch-credentials.yaml > /dev/null
 
 
 
@@ -326,17 +323,14 @@ db-migrate: c
 	./dist/brig-index reset \
 		--elasticsearch-index-prefix directory \
 		--elasticsearch-server https://localhost:9200 \
-		--elasticsearch-credentials ./services/brig/test/resources/elasticsearch-credentials.yaml
-		--elasticsearch-insecure-skip-tls-verify true > /dev/null
+		--elasticsearch-credentials ./services/brig/test/resources/elasticsearch-credentials.yaml > /dev/null
 	./dist/brig-index reset \
 		--elasticsearch-index-prefix directory2 \
 		--elasticsearch-server https://localhost:9200 \
-		--elasticsearch-credentials ./services/brig/test/resources/elasticsearch-credentials.yaml
-		--elasticsearch-insecure-skip-tls-verify true > /dev/null
+		--elasticsearch-credentials ./services/brig/test/resources/elasticsearch-credentials.yaml > /dev/null
 	./integration/scripts/integration-dynamic-backends-brig-index.sh \
 		--elasticsearch-server https://localhost:9200 \
-		--elasticsearch-credentials ./services/brig/test/resources/elasticsearch-credentials.yaml
-		--elasticsearch-insecure-skip-tls-verify true > /dev/null
+		--elasticsearch-credentials ./services/brig/test/resources/elasticsearch-credentials.yaml > /dev/null
 
 #################################
 ## dependencies

diff --git a/services/brig/src/Brig/Index/Options.hs b/services/brig/src/Brig/Index/Options.hs
@@ -136,7 +136,7 @@ localElasticSettings =
           { esServer = [uri|http://localhost:9200|],
             esIndex = ES.IndexName "directory_test",
             esCaCert = Nothing,
-            esInsecureSkipVerifyTls = False,
+            esInsecureSkipVerifyTls = True,
             esCredentials = Just "test/resources/elasticsearch-credentials.yaml"
           },
       _esIndexShardCount = 1,