diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-03-17 12:02:18 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2023-03-23 12:13:44 +0100 |
commit | 489e1a1b5494bb75f8238084f9779d6cc465e660 (patch) | |
tree | e8013ae9e33b3dc86e2c0c13735d86f79bb0843c /client/go/internal/vespa/target_cloud.go | |
parent | 7e9bc236241a5b2b0261f897116de00b94e5a27f (diff) |
Expose HTTP transport
Diffstat (limited to 'client/go/internal/vespa/target_cloud.go')
-rw-r--r-- | client/go/internal/vespa/target_cloud.go | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/client/go/internal/vespa/target_cloud.go b/client/go/internal/vespa/target_cloud.go index 5d9e6d9272a..827d6c6a56a 100644 --- a/client/go/internal/vespa/target_cloud.go +++ b/client/go/internal/vespa/target_cloud.go @@ -118,9 +118,10 @@ func (t *cloudTarget) IsCloud() bool { return true } func (t *cloudTarget) Deployment() Deployment { return t.deploymentOptions.Deployment } func (t *cloudTarget) Service(name string, timeout time.Duration, runID int64, cluster string) (*Service, error) { + var service *Service switch name { case DeployService: - service := &Service{ + service = &Service{ Name: name, BaseURL: t.apiOptions.System.URL, TLSOptions: t.apiOptions.TLSOptions, @@ -136,7 +137,6 @@ func (t *cloudTarget) Service(name string, timeout time.Duration, runID int64, c return nil, fmt.Errorf("got status %d from deploy service at %s", status, service.BaseURL) } } - return service, nil case QueryService, DocumentService: if t.deploymentOptions.ClusterURLs == nil { if err := t.waitForEndpoints(timeout, runID); err != nil { @@ -148,15 +148,22 @@ func (t *cloudTarget) Service(name string, timeout time.Duration, runID int64, c return nil, err } t.deploymentOptions.TLSOptions.AthenzDomain = t.apiOptions.System.AthenzDomain - return &Service{ + service = &Service{ Name: name, BaseURL: url, TLSOptions: t.deploymentOptions.TLSOptions, zts: t.zts, httpClient: t.httpClient, - }, nil + } + + default: + return nil, fmt.Errorf("unknown service: %s", name) + + } + if service.TLSOptions.KeyPair.Certificate != nil { + util.SetCertificate(service, []tls.Certificate{service.TLSOptions.KeyPair}) } - return nil, fmt.Errorf("unknown service: %s", name) + return service, nil } func (t *cloudTarget) SignRequest(req *http.Request, keyID string) error { |