Merge branch 'spring-projects:main' into bug-1689

spring-projects · Nov 7, 2024 · f3964b6 · f3964b6
2 parents 65b3d33 + 7780411
commit f3964b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...earch-store/src/test/java/org/springframework/ai/vectorstore/OpenSearchVectorStoreIT.java b/...earch-store/src/test/java/org/springframework/ai/vectorstore/OpenSearchVectorStoreIT.java
@@ -31,6 +31,7 @@
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -356,6 +357,7 @@ public void searchThresholdTest(String similarityFunction) {
 	}
 
 	@Test
+	@Disabled("GH-1645")
 	public void searchDocumentsInTwoIndicesTest() {
 		getContextRunner().run(context -> {
 			// given

diff --git a/...-pinecone-store/src/main/java/org/springframework/ai/vectorstore/PineconeVectorStore.java b/...-pinecone-store/src/main/java/org/springframework/ai/vectorstore/PineconeVectorStore.java
@@ -324,7 +324,6 @@ public PineconeVectorStoreConfig(Builder builder) {
 			this.clientConfig = new PineconeClientConfig().withApiKey(builder.apiKey)
 				.withEnvironment(builder.environment)
 				.withProjectName(builder.projectId)
-				.withApiKey(builder.apiKey)
 				.withServerSideTimeoutSec((int) builder.serverSideTimeout.toSeconds());
 		}