Add proxy support (opensearch-project#95)

* Add proxy support Add a new optional parameter to the provider configuration to allow for setting a proxy. Using a proxy can be an easier method for connecting to clusters within a VPC. Signed-off-by: Tim Wisbauer <[email protected]> * Add proxy support docs Signed-off-by: Tim Wisbauer <[email protected]> --------- Signed-off-by: Tim Wisbauer <[email protected]>
afrodidact · Nov 7, 2023 · d2845ac · d2845ac
1 parent f6bf397
commit d2845ac
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/provider/provider_test.go b/provider/provider_test.go
@@ -311,6 +311,9 @@ func getCreds(t *testing.T, region string, config *ProviderConf, endpoint string
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 97c7627 (Add proxy support (#95))
 // Given:
 // 1. A proxy URL is specified.
 // 2. No additional AWS configuration is provided to the provider
@@ -334,8 +337,11 @@ func TestAWSSocksProxy(t *testing.T) {
 	}
 }
 
+<<<<<<< HEAD
 =======
 >>>>>>> 0cfc9f2 (When the provider assumes a given role, don't use the default profile… (#87))
+=======
+>>>>>>> 97c7627 (Add proxy support (#95))
 type mockServer struct {
 	ResponseFixturePath string
 	ExpectedAccessKeyId string