Thread SSL configuration through to index client

pinecone/control/pinecone.py

@@ -515,12 +515,26 @@ def Index(self, name: str = '', host: str = '', **kwargs):
             raise ValueError("Either name or host must be specified")
 
         pt = kwargs.pop('pool_threads', None) or self.pool_threads
+        api_key = self.config.api_key
+        openapi_config = self.config.openapi_config
 
         if host != '':
             # Use host url if it is provided
-            return Index(api_key=self.config.api_key, host=normalize_host(host), pool_threads=pt, **kwargs)
+            return Index(
+                host=normalize_host(host),
+                api_key=api_key,
+                pool_threads=pt,
+                openapi_config=openapi_config,
+                **kwargs
+            )
 
         if name != '':
             # Otherwise, get host url from describe_index using the index name
             index_host = self.index_host_store.get_host(self.index_api, self.config, name)
-            return Index(api_key=self.config.api_key, host=index_host, pool_threads=pt, **kwargs)
+            return Index(
+                host=index_host,
+                api_key=api_key,
+                pool_threads=pt,
+                openapi_config=openapi_config,
+                **kwargs
+            )

pinecone/data/index.py

@@ -75,12 +75,14 @@ def __init__(
             host: str,
             pool_threads: Optional[int] = 1,
             additional_headers: Optional[Dict[str, str]] = {},
+            openapi_config = None,
             **kwargs
         ):
         self._config = ConfigBuilder.build(
             api_key=api_key, 
             host=host, 
-            additional_headers=additional_headers, 
+            additional_headers=additional_headers,
+            openapi_config=openapi_config,
             **kwargs
         )
         self._vector_api = setup_openapi_client(DataPlaneApi, self._config, pool_threads)

tests/unit/test_config.py

@@ -6,6 +6,8 @@
 import pytest
 import os
 
+from urllib3 import make_headers
+
 class TestConfig:
     @pytest.fixture(autouse=True)
     def run_before_and_after_tests(tmpdir):
@@ -87,6 +89,21 @@ def test_config_pool_threads(self):
         assert idx._vector_api.api_client.pool_threads == 10
 
     def test_config_when_openapi_config_is_passed_merges_api_key(self):
-        oai_config = OpenApiConfiguration.get_default_copy()
+        oai_config = OpenApiConfiguration()
         pc = Pinecone(api_key='asdf', openapi_config=oai_config)
-        assert pc.config.openapi_config.api_key == {'ApiKeyAuth': 'asdf'}
+        assert pc.config.openapi_config.api_key == {'ApiKeyAuth': 'asdf'}
+
+    def test_ssl_config_passed_to_index_client(self):
+        oai_config = OpenApiConfiguration()
+        oai_config.ssl_ca_cert = 'path/to/cert'
+        proxy_headers = make_headers(proxy_basic_auth='asdf')
+        oai_config.proxy_headers = proxy_headers
+
+        pc = Pinecone(api_key='key', openapi_config=oai_config)
+
+        assert pc.config.openapi_config.ssl_ca_cert == 'path/to/cert'
+        assert pc.config.openapi_config.proxy_headers == proxy_headers
+
+        idx = pc.Index(host='host')
+        assert idx._vector_api.api_client.configuration.ssl_ca_cert == 'path/to/cert'
+        assert idx._vector_api.api_client.configuration.proxy_headers == proxy_headers