Update Hub ClI to use /v1 api's as preview api will be removed

Signed-off-by: Puneet Punamiya <ppunamiy@redhat.com>
tektoncd · Jan 28, 2022 · be6dbc1 · be6dbc1
1 parent ec969c3
commit be6dbc1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/api/pkg/cli/hub/get_resource.go b/api/pkg/cli/hub/get_resource.go
@@ -81,15 +81,15 @@ func (c *client) GetResource(opt ResourceOption) ResourceResult {
 func (opt ResourceOption) Endpoint() string {
 	if opt.Version != "" {
 		// API: /resource/<catalog>/<kind>/<name>/<version>
-		return fmt.Sprintf("/resource/%s/%s/%s/%s", opt.Catalog, opt.Kind, opt.Name, opt.Version)
+		return fmt.Sprintf("/v1/resource/%s/%s/%s/%s", opt.Catalog, opt.Kind, opt.Name, opt.Version)
 	}
 	if opt.PipelineVersion != "" {
 		opt.PipelineVersion = strings.TrimLeft(opt.PipelineVersion, "v")
 		// API: /resource/<catalog>/<kind>/<name>?pipelinesversion=<version>
-		return fmt.Sprintf("/resource/%s/%s/%s?pipelinesversion=%s", opt.Catalog, opt.Kind, opt.Name, opt.PipelineVersion)
+		return fmt.Sprintf("/v1/resource/%s/%s/%s?pipelinesversion=%s", opt.Catalog, opt.Kind, opt.Name, opt.PipelineVersion)
 	}
 	// API: /resource/<catalog>/<kind>/<name>
-	return fmt.Sprintf("/resource/%s/%s/%s", opt.Catalog, opt.Kind, opt.Name)
+	return fmt.Sprintf("/v1/resource/%s/%s/%s", opt.Catalog, opt.Kind, opt.Name)
 }
 
 func (rr *ResourceResult) unmarshalData() error {

diff --git a/api/pkg/cli/hub/get_resource_test.go b/api/pkg/cli/hub/get_resource_test.go
@@ -29,13 +29,13 @@ func TestGetResourceEndpoint(t *testing.T) {
 		Kind:    "task",
 	}
 	url := opt.Endpoint()
-	assert.Equal(t, "/resource/tekton/task/abc", url)
+	assert.Equal(t, "/v1/resource/tekton/task/abc", url)
 
 	opt.PipelineVersion = "0.17"
 	url = opt.Endpoint()
-	assert.Equal(t, "/resource/tekton/task/abc?pipelinesversion=0.17", url)
+	assert.Equal(t, "/v1/resource/tekton/task/abc?pipelinesversion=0.17", url)
 
 	opt.Version = "0.1.1"
 	url = opt.Endpoint()
-	assert.Equal(t, "/resource/tekton/task/abc/0.1.1", url)
+	assert.Equal(t, "/v1/resource/tekton/task/abc/0.1.1", url)
 }
diff --git a/api/pkg/cli/hub/get_resource_version.go b/api/pkg/cli/hub/get_resource_version.go
@@ -63,7 +63,7 @@ func (c *client) GetResourceVersions(opt ResourceOption) ResourceVersionResult {
 
 // Endpoint computes the endpoint url using input provided
 func resVersionsEndpoint(rID uint) string {
-	return fmt.Sprintf("/resource/%s/versions", strconv.FormatUint(uint64(rID), 10))
+	return fmt.Sprintf("/v1/resource/%s/versions", strconv.FormatUint(uint64(rID), 10))
 }
 
 func (rvr *ResourceVersionResult) unmarshalData() error {

diff --git a/api/pkg/cli/hub/get_resource_version_test.go b/api/pkg/cli/hub/get_resource_version_test.go
@@ -22,5 +22,5 @@ import (
 
 func TestGetResourceVersionEndpoint(t *testing.T) {
 	url := resVersionsEndpoint(43)
-	assert.Equal(t, "/resource/43/versions", url)
+	assert.Equal(t, "/v1/resource/43/versions", url)
 }
diff --git a/api/pkg/cli/hub/search.go b/api/pkg/cli/hub/search.go
@@ -108,7 +108,7 @@ func (so SearchOption) Endpoint() string {
 
 	v.Set("match", so.Match)
 
-	return "/query?" + v.Encode()
+	return "/v1/query?" + v.Encode()
 }
 
 func addArraytoURL(param string, arr []string, v url.Values) {

diff --git a/api/pkg/cli/hub/search_test.go b/api/pkg/cli/hub/search_test.go
@@ -28,7 +28,7 @@ func TestEndpoint(t *testing.T) {
 	}
 
 	url := opt.Endpoint()
-	assert.Equal(t, "/query?limit=100&match=contains", url)
+	assert.Equal(t, "/v1/query?limit=100&match=contains", url)
 
 	opt = SearchOption{
 		Name:  "res",
@@ -37,5 +37,5 @@ func TestEndpoint(t *testing.T) {
 		Match: "contains",
 	}
 	url = opt.Endpoint()
-	assert.Equal(t, "/query?kinds=k1&kinds=k2&kinds=k3&match=contains&name=res&tags=t1&tags=t2", url)
+	assert.Equal(t, "/v1/query?kinds=k1&kinds=k2&kinds=k3&match=contains&name=res&tags=t1&tags=t2", url)
 }