diff options
| author | Martin Polden <mpolden@mpolden.no> | 2023-08-22 13:07:56 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2023-08-23 09:05:53 +0200 |
| commit | da92d923ce927d7b1b4587c649dbbf01f048fd51 (patch) | |
| tree | 8079d952485c5b1b0bb71d902d9d1fe11895c120 /client/go/internal/vespa/target_cloud.go | |
| parent | 14f78d0376bbfc84b1ca13bb57558cbc9eadba48 (diff) | |
Build URLs in one place
Diffstat (limited to 'client/go/internal/vespa/target_cloud.go')
| -rw-r--r-- | client/go/internal/vespa/target_cloud.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/client/go/internal/vespa/target_cloud.go b/client/go/internal/vespa/target_cloud.go index 24133ba5fc3..bc4934ea6fd 100644 --- a/client/go/internal/vespa/target_cloud.go +++ b/client/go/internal/vespa/target_cloud.go @@ -246,10 +246,7 @@ func (t *cloudTarget) deployServiceWait(fn responseFunc, reqFn requestFunc, time } func (t *cloudTarget) discoverLatestRun(timeout time.Duration) (int64, error) { - runsURL := fmt.Sprintf("%s/application/v4/tenant/%s/application/%s/instance/%s/job/%s-%s?limit=1", - t.apiOptions.System.URL, - t.deploymentOptions.Deployment.Application.Tenant, t.deploymentOptions.Deployment.Application.Application, t.deploymentOptions.Deployment.Application.Instance, - t.deploymentOptions.Deployment.Zone.Environment, t.deploymentOptions.Deployment.Zone.Region) + runsURL := t.apiOptions.System.RunsURL(t.deploymentOptions.Deployment) + "?limit=1" req, err := http.NewRequest("GET", runsURL, nil) if err != nil { return 0, err @@ -282,10 +279,7 @@ func (t *cloudTarget) AwaitDeployment(runID int64, timeout time.Duration) (int64 } runID = lastRunID } - runURL := fmt.Sprintf("%s/application/v4/tenant/%s/application/%s/instance/%s/job/%s-%s/run/%d", - t.apiOptions.System.URL, - t.deploymentOptions.Deployment.Application.Tenant, t.deploymentOptions.Deployment.Application.Application, t.deploymentOptions.Deployment.Application.Instance, - t.deploymentOptions.Deployment.Zone.Environment, t.deploymentOptions.Deployment.Zone.Region, runID) + runURL := t.apiOptions.System.RunURL(t.deploymentOptions.Deployment, runID) req, err := http.NewRequest("GET", runURL, nil) if err != nil { return 0, err |