Modifies the response of v1 Resources API's by adding array of Catego…

…ries - This patch updates the design of Resources by adding an array of Categories for the following API's - /v1/resource/{catalog}/{kind}/{name}/{version} - /v1/resource/version/{versionId} - Updates the v1 resources tests which adds category array in the response of CatalogKindNameVersion and ResourceBYVersionID Signed-off-by: Puneet Punamiya <ppunamiy@redhat.com>
tektoncd · Jul 5, 2021 · 480a06d · 480a06d
1 parent 12b908b
commit 480a06d
Show file tree

Hide file tree

Showing 11 changed files with 110 additions and 23 deletions.
diff --git a/api/v1/gen/http/openapi.json b/api/v1/gen/http/openapi.json
diff --git a/api/v1/gen/http/openapi.yaml b/api/v1/gen/http/openapi.yaml
@@ -725,6 +725,9 @@ definitions:
           catalog:
             id: 1
             type: community
+          categories:
+          - id: 1
+            name: Build Tools
           id: 1
           kind: task
           name: buildah
@@ -976,6 +979,9 @@ definitions:
           catalog:
             id: 1
             type: community
+          categories:
+          - id: 1
+            name: Build Tools
           id: 1
           kind: task
           name: buildah
@@ -1087,6 +1093,14 @@ definitions:
     properties:
       catalog:
         $ref: '#/definitions/CatalogResponseBodyMin'
+      categories:
+        type: array
+        items:
+          $ref: '#/definitions/CategoryResponseBody'
+        description: Categories related to resource
+        example:
+        - id: 1
+          name: image-build
       id:
         type: integer
         description: ID is the unique id of the resource
@@ -1119,6 +1133,9 @@ definitions:
         id: 1
         name: tekton
         type: community
+      categories:
+      - id: 1
+        name: image-build
       id: 1
       kind: task
       name: buildah
@@ -1130,6 +1147,7 @@ definitions:
     - id
     - name
     - catalog
+    - categories
     - kind
     - tags
     - rating
@@ -1728,6 +1746,9 @@ definitions:
         catalog:
           id: 1
           type: community
+        categories:
+        - id: 1
+          name: Build Tools
         id: 1
         kind: task
         name: buildah

diff --git a/api/v1/gen/http/openapi3.json b/api/v1/gen/http/openapi3.json
diff --git a/api/v1/gen/http/openapi3.yaml b/api/v1/gen/http/openapi3.yaml
@@ -426,6 +426,9 @@ paths:
                     catalog:
                       id: 1
                       type: community
+                    categories:
+                    - id: 1
+                      name: Build Tools
                     id: 1
                     kind: task
                     name: buildah
@@ -627,6 +630,9 @@ paths:
                     catalog:
                       id: 1
                       type: community
+                    categories:
+                    - id: 1
+                      name: Build Tools
                     id: 1
                     kind: task
                     name: buildah
@@ -1130,6 +1136,9 @@ components:
             catalog:
               id: 1
               type: community
+            categories:
+            - id: 1
+              name: Build Tools
             id: 1
             kind: task
             name: buildah
@@ -1196,6 +1205,9 @@ components:
           catalog:
             id: 1
             type: community
+          categories:
+          - id: 1
+            name: Build Tools
           id: 1
           kind: task
           name: buildah

diff --git a/api/v1/gen/http/resource/server/encode_decode.go b/api/v1/gen/http/resource/server/encode_decode.go
diff --git a/api/v1/gen/http/resource/server/types.go b/api/v1/gen/http/resource/server/types.go
diff --git a/api/v1/gen/resource/service.go b/api/v1/gen/resource/service.go
diff --git a/api/v1/gen/resource/views/view.go b/api/v1/gen/resource/views/view.go
diff --git a/api/v1/service/resource/resource.go b/api/v1/service/resource/resource.go
@@ -345,12 +345,22 @@ func versionInfoFromResource(r model.Resource) *resource.ResourceVersion {
 			Name: tag.Name,
 		})
 	}
+
+	var categories []*resource.Category
+	for _, category := range r.Categories {
+		categories = append(categories, &resource.Category{
+			ID:   category.ID,
+			Name: category.Name,
+		})
+	}
+
 	res := &resource.ResourceData{
-		ID:     r.ID,
-		Name:   r.Name,
-		Kind:   r.Kind,
-		Rating: r.Rating,
-		Tags:   tags,
+		ID:         r.ID,
+		Name:       r.Name,
+		Kind:       r.Kind,
+		Rating:     r.Rating,
+		Tags:       tags,
+		Categories: categories,
 		Catalog: &resource.Catalog{
 			ID:   r.Catalog.ID,
 			Name: r.Catalog.Name,

diff --git a/api/v1/service/resource/testdata/TestByCatalogKindNameVersion_Http.golden b/api/v1/service/resource/testdata/TestByCatalogKindNameVersion_Http.golden
@@ -16,6 +16,12 @@
 				"name": "catalog-official",
 				"type": "official"
 			},
+			"categories": [
+				{
+					"id": 3,
+					"name": "pqr"
+				}
+			],
 			"kind": "task",
 			"tags": [
 				{

diff --git a/api/v1/service/resource/testdata/TestByVersionID_Http.golden b/api/v1/service/resource/testdata/TestByVersionID_Http.golden
@@ -16,6 +16,12 @@
 				"name": "catalog-official",
 				"type": "official"
 			},
+			"categories": [
+				{
+					"id": 2,
+					"name": "abc"
+				}
+			],
 			"kind": "pipeline",
 			"tags": [
 				{