add newIndexParameters struct and swap to using that for newIndexConn…

…ection
pinecone-io · May 1, 2024 · e5753fb · e5753fb
1 parent 395be59
commit e5753fb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/pinecone/client.go b/pinecone/client.go
@@ -65,7 +65,7 @@ func (c *Client) IndexWithNamespace(host string, namespace string) (*IndexConnec
 }
 
 func (c *Client) IndexWithAdditionalMetadata(host string, namespace string, additionalMetadata map[string]string) (*IndexConnection, error) {
-	idx, err := newIndexConnection(c.apiKey, host, namespace, c.sourceTag, additionalMetadata)
+	idx, err := newIndexConnection(newIndexParameters{apiKey: c.apiKey, host: host, namespace: namespace, sourceTag: c.sourceTag, additionalMetadata: additionalMetadata})
 	if err != nil {
 		return nil, err
 	}
@@ -82,7 +82,7 @@ func (c *Client) ListIndexes(ctx context.Context) ([]*Index, error) {
 	if res.StatusCode != http.StatusOK {
 		return nil, fmt.Errorf("unexpected status code: %d", res.StatusCode)
 	}
-	
+
 	var indexList control.IndexList
 	err = json.NewDecoder(res.Body).Decode(&indexList)
 	if err != nil {

diff --git a/pinecone/index_connection.go b/pinecone/index_connection.go
@@ -21,15 +21,23 @@ type IndexConnection struct {
 	grpcConn   *grpc.ClientConn
 }
 
-func newIndexConnection(apiKey string, host string, namespace string, sourceTag string, additionalMetadata map[string]string) (*IndexConnection, error) {
+type newIndexParameters struct {
+	apiKey string
+	host string
+	namespace string
+	sourceTag string
+	additionalMetadata map[string]string
+}
+
+func newIndexConnection(in newIndexParameters) (*IndexConnection, error) {
 	config := &tls.Config{}
-	target := fmt.Sprintf("%s:443", host)
+	target := fmt.Sprintf("%s:443", in.host)
 	conn, err := grpc.Dial(
 		target,
 		grpc.WithTransportCredentials(credentials.NewTLS(config)),
 		grpc.WithAuthority(target),
 		grpc.WithBlock(),
-		grpc.WithUserAgent(useragent.BuildUserAgentGRPC(sourceTag)),
+		grpc.WithUserAgent(useragent.BuildUserAgentGRPC(in.sourceTag)),
 	)
 
 	if err != nil {
@@ -39,7 +47,7 @@ func newIndexConnection(apiKey string, host string, namespace string, sourceTag
 
 	dataClient := data.NewVectorServiceClient(conn)
 
-	idx := IndexConnection{Namespace: namespace, apiKey: apiKey, dataClient: &dataClient, grpcConn: conn, additionalMetadata: additionalMetadata}
+	idx := IndexConnection{Namespace: in.namespace, apiKey: in.apiKey, dataClient: &dataClient, grpcConn: conn, additionalMetadata: in.additionalMetadata}
 	return &idx, nil
 }
 

diff --git a/pinecone/index_connection_test.go b/pinecone/index_connection_test.go
@@ -71,12 +71,12 @@ func (ts *IndexConnectionTests) SetupSuite() {
 	namespace, err := uuid.NewV7()
 	assert.NoError(ts.T(), err)
 
-	idxConn, err := newIndexConnection(ts.apiKey, ts.host, namespace.String(), "", nil)
+	idxConn, err := newIndexConnection(newIndexParameters{apiKey: ts.apiKey, host: ts.host, namespace: namespace.String(), sourceTag: ""})
 	assert.NoError(ts.T(), err)
 	ts.idxConn = idxConn
 
 	ts.sourceTag = "test_source_tag"
-	idxConnSourceTag, err := newIndexConnection(ts.apiKey, ts.host, namespace.String(), ts.sourceTag, nil)
+	idxConnSourceTag, err := newIndexConnection(newIndexParameters{apiKey: ts.apiKey, host: ts.host, namespace: namespace.String(), sourceTag: ts.sourceTag})
 	assert.NoError(ts.T(), err)
 	ts.idxConnSourceTag = idxConnSourceTag
 
@@ -97,7 +97,7 @@ func (ts *IndexConnectionTests) TestNewIndexConnection() {
 	apiKey := "test-api-key"
 	namespace := ""
 	sourceTag := ""
-	idxConn, err := newIndexConnection(apiKey, ts.host, namespace, sourceTag, nil)
+	idxConn, err := newIndexConnection(newIndexParameters{apiKey: apiKey, host: ts.host, namespace: namespace, sourceTag: sourceTag})
 	assert.NoError(ts.T(), err)
 
 	if idxConn.apiKey != apiKey {
@@ -124,7 +124,7 @@ func (ts *IndexConnectionTests) TestNewIndexConnectionNamespace() {
 	apiKey := "test-api-key"
 	namespace := "test-namespace"
 	sourceTag := "test-source-tag"
-	idxConn, err := newIndexConnection(apiKey, ts.host, namespace, sourceTag, nil)
+	idxConn, err := newIndexConnection(newIndexParameters{apiKey: apiKey, host: ts.host, namespace: namespace, sourceTag: sourceTag})
 	assert.NoError(ts.T(), err)
 
 	if idxConn.apiKey != apiKey {
@@ -146,7 +146,7 @@ func (ts *IndexConnectionTests) TestNewIndexConnectionAdditionalMetadata() {
 	namespace := "test-namespace"
 	sourceTag := "test-source-tag"
 	additionalMetadata := map[string]string{"test-header": "test-value"}
-	idxConn, err := newIndexConnection(apiKey, ts.host, namespace, sourceTag, additionalMetadata)
+	idxConn, err := newIndexConnection(newIndexParameters{apiKey: apiKey, host: ts.host, namespace: namespace, sourceTag: sourceTag, additionalMetadata: additionalMetadata})
 	assert.NoError(ts.T(), err)
 
 	if idxConn.apiKey != apiKey {