Skip to content

Commit f7b850e

Browse files
authored
Allow : in the source tag and add pinecone_test as a source tag for all integration tests (#137)
## Problem Some customers have requested to allow : in the source tag field and for all internal pinecone integration tests, add source tag as pinecone_test. ## Solution Allow : as a part of source tag and set pinecone_test as a source tag for integration test ## Type of Change - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update - [ ] Infrastructure change (CI configs, etc) - [ ] Non-code change (docs, etc) - [X] None of the above: (explain here) ## Test Plan Updated unit test and ran integration tests
1 parent c7c02ee commit f7b850e

File tree

7 files changed

+27
-12
lines changed

7 files changed

+27
-12
lines changed

src/integration/java/io/pinecone/helpers/TestResourcesManager.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class TestResourcesManager {
5858
private static final String region = System.getenv("REGION") == null
5959
? "us-west-2"
6060
: System.getenv("REGION");
61-
private Pinecone pineconeClient;
61+
private final Pinecone pineconeClient;
6262
private String podIndexName;
6363
private IndexModel podIndexModel;
6464
private IndexModel serverlessIndexModel;
@@ -73,7 +73,10 @@ public class TestResourcesManager {
7373

7474

7575
private TestResourcesManager() {
76-
pineconeClient = new Pinecone.Builder(apiKey).build();
76+
pineconeClient = new Pinecone
77+
.Builder(apiKey)
78+
.withSourceTag("pinecone_test")
79+
.build();
7780
}
7881

7982
/**

src/integration/java/io/pinecone/integration/controlPlane/pod/CollectionTest.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@
2424

2525
public class CollectionTest {
2626
private static final TestResourcesManager indexManager = TestResourcesManager.getInstance();
27-
private static final Pinecone pineconeClient = new Pinecone.Builder(System.getenv("PINECONE_API_KEY")).build();
27+
private static final Pinecone pineconeClient = new Pinecone
28+
.Builder(System.getenv("PINECONE_API_KEY"))
29+
.withSourceTag("pinecone_test")
30+
.build();
2831
private static final Logger logger = LoggerFactory.getLogger(CollectionTest.class);
2932
private static final ArrayList<String> indexesToCleanUp = new ArrayList<>();
3033
private static final String sourceIndexMetric = indexManager.getMetric();

src/integration/java/io/pinecone/integration/controlPlane/pod/ConfigureIndexTest.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
public class ConfigureIndexTest {
2121
private static final Logger logger = LoggerFactory.getLogger(ConfigureIndexTest.class);
2222
private static final TestResourcesManager indexManager = TestResourcesManager.getInstance();
23-
private static final Pinecone controlPlaneClient = new Pinecone.Builder(System.getenv("PINECONE_API_KEY")).build();
23+
private static final Pinecone controlPlaneClient = new Pinecone
24+
.Builder(System.getenv("PINECONE_API_KEY"))
25+
.withSourceTag("pinecone_test")
26+
.build();
2427
private static String indexName;
2528

2629
@BeforeAll

src/integration/java/io/pinecone/integration/controlPlane/pod/CreateDescribeListAndDeleteIndexTest.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
public class CreateDescribeListAndDeleteIndexTest {
1414

1515
private static final TestResourcesManager indexManager = TestResourcesManager.getInstance();
16-
private static Pinecone controlPlaneClient = new Pinecone.Builder(System.getenv("PINECONE_API_KEY")).build();
16+
private static final Pinecone controlPlaneClient = new Pinecone
17+
.Builder(System.getenv("PINECONE_API_KEY"))
18+
.withSourceTag("pinecone_test")
19+
.build();
1720
private static String indexName;
1821
private static int indexDimension;
1922
private static String indexPodType;

src/integration/java/io/pinecone/integration/controlPlane/serverless/CreateDescribeListAndDeleteIndexTest.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
public class CreateDescribeListAndDeleteIndexTest {
1717

1818
private static final TestResourcesManager indexManager = TestResourcesManager.getInstance();
19-
private static final Pinecone controlPlaneClient = new Pinecone.Builder(System.getenv("PINECONE_API_KEY")).build();
19+
private static final Pinecone controlPlaneClient = new Pinecone
20+
.Builder(System.getenv("PINECONE_API_KEY"))
21+
.withSourceTag("pinecone_test")
22+
.build();
2023
private static String indexName;
2124
private static int dimension;
2225

src/main/java/io/pinecone/configs/PineconeConfig.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,12 @@ private String normalizeSourceTag(String input) {
191191
/*
192192
* Normalize the source tag
193193
* 1. Lowercase
194-
* 2. Limit charset to [a-z0-9_ ]
194+
* 2. Limit charset to [a-z0-9_: ]
195195
* 3. Trim left/right empty space
196196
* 4. Condense multiple spaces to one, and replace with underscore
197197
*/
198198
return input.toLowerCase()
199-
.replaceAll("[^a-z0-9_ ]", "")
199+
.replaceAll("[^a-z0-9_: ]", "")
200200
.trim()
201201
.replaceAll("\\s+", "_");
202202
}

src/test/java/io/pinecone/PineconeConfigTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ public void testGetUserAgentGrpcWithSourceTag() {
5555
@Test
5656
public void testSourceTagIsNormalized() {
5757
PineconeConfig config = new PineconeConfig("testApiKey");
58-
config.setSourceTag("test source tag !! @@ ##");
59-
assertEquals(config.getSourceTag(), "test_source_tag");
58+
config.setSourceTag("test source tag !! @@ ## :");
59+
assertEquals(config.getSourceTag(), "test_source_tag_:");
6060

61-
config.setSourceTag("TEST SOURCE Tag ----");
62-
assertEquals(config.getSourceTag(), "test_source_tag");
61+
config.setSourceTag("TEST SOURCE : Tag ----");
62+
assertEquals(config.getSourceTag(), "test_source_:_tag");
6363

6464
config.setSourceTag("TEST SOURCE TAG 2.4.5");
6565
assertEquals(config.getSourceTag(), "test_source_tag_245");

0 commit comments

Comments
 (0)