add /api/v1 to urls

Author: Eslam-Nawara

tools/zos-update-worker/internal/update_worker.go

@@ -3,7 +3,6 @@ package internal
 import (
 	"context"
 	"fmt"
-	"net/url"
 	"os"
 	"path/filepath"
 	"time"
@@ -65,38 +64,23 @@ func NewWorker(src string, dst string, params Params) (*Worker, error) {
 	clients := map[Network]client.RegistrarClient{}
 
 	if params.QAUrl != "" {
-		url, err := url.JoinPath(params.QAUrl, "v1")
-		if err != nil {
-			return nil, err
-		}
-
-		cli, err := client.NewRegistrarClient(url)
+		cli, err := client.NewRegistrarClient(params.QAUrl)
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to create new registrar client for qa net")
 		}
 		clients[QANetwork] = cli
 	}
 
 	if params.TestUrl != "" {
-		url, err := url.JoinPath(params.TestUrl, "v1")
-		if err != nil {
-			return nil, err
-		}
-
-		cli, err := client.NewRegistrarClient(url)
+		cli, err := client.NewRegistrarClient(params.TestUrl)
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to create new registrar client for test net")
 		}
 		clients[TestNetwork] = cli
 	}
 
 	if params.MainUrl != "" {
-		url, err := url.JoinPath(params.MainUrl, "v1")
-		if err != nil {
-			return nil, err
-		}
-
-		cli, err := client.NewRegistrarClient(url)
+		cli, err := client.NewRegistrarClient(params.MainUrl)
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to create new registrar client for main net")
 		}

tools/zos-update-worker/internal/worker_test.go

@@ -11,9 +11,9 @@ func TestWorker(t *testing.T) {
 
 	params := Params{
 		Interval: 1 * time.Second,
-		QAUrl:    "https://registrar.qa4.grid.tf",
-		TestUrl:  "https://registrar.test4.grid.tf",
-		MainUrl:  "https://registrar.prod4.grid.tf",
+		QAUrl:    "https://registrar.qa4.grid.tf/api/v1",
+		TestUrl:  "https://registrar.test4.grid.tf/api/v1",
+		MainUrl:  "https://registrar.prod4.grid.tf/api/v1",
 	}
 	src := testDir + "/tf-autobuilder"
 	dst := testDir + "/tf-zos"