diff --git a/docs/cmd/tkn_hub_get.md b/docs/cmd/tkn_hub_get.md index ffe75a2f1e..8dac0d615e 100644 --- a/docs/cmd/tkn_hub_get.md +++ b/docs/cmd/tkn_hub_get.md @@ -29,6 +29,6 @@ Get resource manifest by its name, kind, catalog, and version ### SEE ALSO * [tkn hub](tkn_hub.md) - Interact with tekton hub -* [tkn hub get pipeline](tkn_hub_get_pipeline.md) - Get pipeline by name, catalog and version -* [tkn hub get task](tkn_hub_get_task.md) - Get task by name, catalog and version +* [tkn hub get pipeline](tkn_hub_get_pipeline.md) - Get Pipeline by name, catalog and version +* [tkn hub get task](tkn_hub_get_task.md) - Get Task by name, catalog and version diff --git a/docs/cmd/tkn_hub_get_pipeline.md b/docs/cmd/tkn_hub_get_pipeline.md index 85dfccf4c4..41579c4dc1 100644 --- a/docs/cmd/tkn_hub_get_pipeline.md +++ b/docs/cmd/tkn_hub_get_pipeline.md @@ -1,6 +1,6 @@ ## tkn hub get pipeline -Get pipeline by name, catalog and version +Get Pipeline by name, catalog and version ### Usage @@ -10,18 +10,18 @@ tkn hub get pipeline ### Synopsis -Get pipeline by name, catalog and version +Get Pipeline by name, catalog and version ### Examples -Get a pipeline of name 'foo': +Get a Pipeline of name 'foo': tkn hub get pipeline foo or -Get a pipeline of name 'foo' of version '0.3': +Get a Pipeline of name 'foo' of version '0.3': tkn hub get pipeline foo --version 0.3 diff --git a/docs/cmd/tkn_hub_get_task.md b/docs/cmd/tkn_hub_get_task.md index 70ce4d587e..01d4d1959a 100644 --- a/docs/cmd/tkn_hub_get_task.md +++ b/docs/cmd/tkn_hub_get_task.md @@ -1,6 +1,6 @@ ## tkn hub get task -Get task by name, catalog and version +Get Task by name, catalog and version ### Usage @@ -10,18 +10,18 @@ tkn hub get task ### Synopsis -Get task by name, catalog and version +Get Task by name, catalog and version ### Examples -Get a task of name 'foo': +Get a Task of name 'foo': tkn hub get task foo or -Get a task of name 'foo' of version '0.3': +Get a Task of name 'foo' of version '0.3': tkn hub get task foo --version 0.3 diff --git a/docs/man/man1/tkn-hub-get-pipeline.1 b/docs/man/man1/tkn-hub-get-pipeline.1 index 0856db8bd3..00516cb89c 100644 --- a/docs/man/man1/tkn-hub-get-pipeline.1 +++ b/docs/man/man1/tkn-hub-get-pipeline.1 @@ -5,7 +5,7 @@ .SH NAME .PP -tkn\-hub\-get\-pipeline \- Get pipeline by name, catalog and version +tkn\-hub\-get\-pipeline \- Get Pipeline by name, catalog and version .SH SYNOPSIS @@ -15,7 +15,7 @@ tkn\-hub\-get\-pipeline \- Get pipeline by name, catalog and version .SH DESCRIPTION .PP -Get pipeline by name, catalog and version +Get Pipeline by name, catalog and version .SH OPTIONS @@ -41,7 +41,7 @@ Get pipeline by name, catalog and version .SH EXAMPLE .PP -Get a pipeline of name 'foo': +Get a Pipeline of name 'foo': .PP .RS @@ -56,7 +56,7 @@ tkn hub get pipeline foo or .PP -Get a pipeline of name 'foo' of version '0.3': +Get a Pipeline of name 'foo' of version '0.3': .PP .RS diff --git a/docs/man/man1/tkn-hub-get-task.1 b/docs/man/man1/tkn-hub-get-task.1 index fe5727f061..5096eb2830 100644 --- a/docs/man/man1/tkn-hub-get-task.1 +++ b/docs/man/man1/tkn-hub-get-task.1 @@ -5,7 +5,7 @@ .SH NAME .PP -tkn\-hub\-get\-task \- Get task by name, catalog and version +tkn\-hub\-get\-task \- Get Task by name, catalog and version .SH SYNOPSIS @@ -15,7 +15,7 @@ tkn\-hub\-get\-task \- Get task by name, catalog and version .SH DESCRIPTION .PP -Get task by name, catalog and version +Get Task by name, catalog and version .SH OPTIONS @@ -41,7 +41,7 @@ Get task by name, catalog and version .SH EXAMPLE .PP -Get a task of name 'foo': +Get a Task of name 'foo': .PP .RS @@ -56,7 +56,7 @@ tkn hub get task foo or .PP -Get a task of name 'foo' of version '0.3': +Get a Task of name 'foo' of version '0.3': .PP .RS diff --git a/go.mod b/go.mod index ae33921714..ae53b3544c 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.0.0 github.com/spf13/pflag v1.0.5 - github.com/tektoncd/hub/api v0.0.0-20201021041518-f3b44fba7d18 + github.com/tektoncd/hub/api v0.0.0-20201027094520-f56d79d14d70 github.com/tektoncd/pipeline v0.17.1-0.20201007165454-9611f3e4509e github.com/tektoncd/plumbing v0.0.0-20200430135134-e53521e1d887 github.com/tektoncd/triggers v0.8.2-0.20201007153255-cb1879311818 diff --git a/go.sum b/go.sum index 746b27290c..ff2ab51ee1 100644 --- a/go.sum +++ b/go.sum @@ -1249,10 +1249,8 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= -github.com/tektoncd/hub/api v0.0.0-20201019045143-d9a32160df56 h1:W0UJpnGH1O2aPZzgbxEOwSO6+mDUA0RpgipDFMy+IwA= -github.com/tektoncd/hub/api v0.0.0-20201019045143-d9a32160df56/go.mod h1:wwlAvyj5lS0efH9FjduQFy/Po2sDtLG+46ok8YOBBtM= -github.com/tektoncd/hub/api v0.0.0-20201021041518-f3b44fba7d18 h1:cbm1BWN2w+FERrrhynZEANibQyPhDty4nMr1CG0q13I= -github.com/tektoncd/hub/api v0.0.0-20201021041518-f3b44fba7d18/go.mod h1:wwlAvyj5lS0efH9FjduQFy/Po2sDtLG+46ok8YOBBtM= +github.com/tektoncd/hub/api v0.0.0-20201027094520-f56d79d14d70 h1:R2bdW6G8mzLgRWSGXholVoVtYr7ng0vGQMtTa6o/mpE= +github.com/tektoncd/hub/api v0.0.0-20201027094520-f56d79d14d70/go.mod h1:wwlAvyj5lS0efH9FjduQFy/Po2sDtLG+46ok8YOBBtM= github.com/tektoncd/pipeline v0.8.0/go.mod h1:IZzJdiX9EqEMuUcgdnElozdYYRh0/ZRC+NKMLj1K3Yw= github.com/tektoncd/pipeline v0.10.1/go.mod h1:D2X0exT46zYx95BU7ByM8+erpjoN7thmUBvlKThOszU= github.com/tektoncd/pipeline v0.11.0/go.mod h1:hlkH32S92+/UODROH0dmxzyuMxfRFp/Nc3e29MewLn8= diff --git a/vendor/github.com/tektoncd/hub/api/gen/http/resource/client/encode_decode.go b/vendor/github.com/tektoncd/hub/api/gen/http/resource/client/encode_decode.go index d54ca6d49e..bc8eccff32 100644 --- a/vendor/github.com/tektoncd/hub/api/gen/http/resource/client/encode_decode.go +++ b/vendor/github.com/tektoncd/hub/api/gen/http/resource/client/encode_decode.go @@ -90,13 +90,13 @@ func DecodeQueryResponse(decoder func(*http.Response) goahttp.Decoder, restoreBo if err != nil { return nil, goahttp.ErrDecodingError("resource", "Query", err) } - p := NewQueryResourceCollectionOK(body) - view := "withoutVersion" - vres := resourceviews.ResourceCollection{Projected: p, View: view} - if err = resourceviews.ValidateResourceCollection(vres); err != nil { + p := NewQueryResourcesOK(&body) + view := "default" + vres := &resourceviews.Resources{Projected: p, View: view} + if err = resourceviews.ValidateResources(vres); err != nil { return nil, goahttp.ErrValidationError("resource", "Query", err) } - res := resource.NewResourceCollection(vres) + res := resource.NewResources(vres) return res, nil case http.StatusInternalServerError: var ( @@ -207,13 +207,13 @@ func DecodeListResponse(decoder func(*http.Response) goahttp.Decoder, restoreBod if err != nil { return nil, goahttp.ErrDecodingError("resource", "List", err) } - p := NewListResourceCollectionOK(body) - view := "withoutVersion" - vres := resourceviews.ResourceCollection{Projected: p, View: view} - if err = resourceviews.ValidateResourceCollection(vres); err != nil { + p := NewListResourcesOK(&body) + view := "default" + vres := &resourceviews.Resources{Projected: p, View: view} + if err = resourceviews.ValidateResources(vres); err != nil { return nil, goahttp.ErrValidationError("resource", "List", err) } - res := resource.NewResourceCollection(vres) + res := resource.NewResources(vres) return res, nil case http.StatusInternalServerError: var ( @@ -292,13 +292,13 @@ func DecodeVersionsByIDResponse(decoder func(*http.Response) goahttp.Decoder, re if err != nil { return nil, goahttp.ErrDecodingError("resource", "VersionsByID", err) } - p := NewVersionsByIDVersionsOK(&body) + p := NewVersionsByIDResourceVersionsOK(&body) view := "default" - vres := &resourceviews.Versions{Projected: p, View: view} - if err = resourceviews.ValidateVersions(vres); err != nil { + vres := &resourceviews.ResourceVersions{Projected: p, View: view} + if err = resourceviews.ValidateResourceVersions(vres); err != nil { return nil, goahttp.ErrValidationError("resource", "VersionsByID", err) } - res := resource.NewVersions(vres) + res := resource.NewResourceVersions(vres) return res, nil case http.StatusInternalServerError: var ( @@ -398,13 +398,13 @@ func DecodeByCatalogKindNameVersionResponse(decoder func(*http.Response) goahttp if err != nil { return nil, goahttp.ErrDecodingError("resource", "ByCatalogKindNameVersion", err) } - p := NewByCatalogKindNameVersionVersionOK(&body) + p := NewByCatalogKindNameVersionResourceVersionOK(&body) view := "default" - vres := &resourceviews.Version{Projected: p, View: view} - if err = resourceviews.ValidateVersion(vres); err != nil { + vres := &resourceviews.ResourceVersion{Projected: p, View: view} + if err = resourceviews.ValidateResourceVersion(vres); err != nil { return nil, goahttp.ErrValidationError("resource", "ByCatalogKindNameVersion", err) } - res := resource.NewVersion(vres) + res := resource.NewResourceVersion(vres) return res, nil case http.StatusInternalServerError: var ( @@ -497,13 +497,13 @@ func DecodeByVersionIDResponse(decoder func(*http.Response) goahttp.Decoder, res if err != nil { return nil, goahttp.ErrDecodingError("resource", "ByVersionId", err) } - p := NewByVersionIDVersionOK(&body) + p := NewByVersionIDResourceVersionOK(&body) view := "default" - vres := &resourceviews.Version{Projected: p, View: view} - if err = resourceviews.ValidateVersion(vres); err != nil { + vres := &resourceviews.ResourceVersion{Projected: p, View: view} + if err = resourceviews.ValidateResourceVersion(vres); err != nil { return nil, goahttp.ErrValidationError("resource", "ByVersionId", err) } - res := resource.NewVersion(vres) + res := resource.NewResourceVersion(vres) return res, nil case http.StatusInternalServerError: var ( @@ -742,32 +742,33 @@ func DecodeByIDResponse(decoder func(*http.Response) goahttp.Decoder, restoreBod } } -// unmarshalResourceResponseToResourceviewsResourceView builds a value of type -// *resourceviews.ResourceView from a value of type *ResourceResponse. -func unmarshalResourceResponseToResourceviewsResourceView(v *ResourceResponse) *resourceviews.ResourceView { - res := &resourceviews.ResourceView{ +// unmarshalResourceDataResponseBodyToResourceviewsResourceDataView builds a +// value of type *resourceviews.ResourceDataView from a value of type +// *ResourceDataResponseBody. +func unmarshalResourceDataResponseBodyToResourceviewsResourceDataView(v *ResourceDataResponseBody) *resourceviews.ResourceDataView { + res := &resourceviews.ResourceDataView{ ID: v.ID, Name: v.Name, Kind: v.Kind, Rating: v.Rating, } - res.Catalog = unmarshalCatalogResponseToResourceviewsCatalogView(v.Catalog) - res.LatestVersion = unmarshalVersionResponseToResourceviewsVersionView(v.LatestVersion) + res.Catalog = unmarshalCatalogResponseBodyToResourceviewsCatalogView(v.Catalog) + res.LatestVersion = unmarshalResourceVersionDataResponseBodyToResourceviewsResourceVersionDataView(v.LatestVersion) res.Tags = make([]*resourceviews.TagView, len(v.Tags)) for i, val := range v.Tags { - res.Tags[i] = unmarshalTagResponseToResourceviewsTagView(val) + res.Tags[i] = unmarshalTagResponseBodyToResourceviewsTagView(val) } - res.Versions = make([]*resourceviews.VersionView, len(v.Versions)) + res.Versions = make([]*resourceviews.ResourceVersionDataView, len(v.Versions)) for i, val := range v.Versions { - res.Versions[i] = unmarshalVersionResponseToResourceviewsVersionView(val) + res.Versions[i] = unmarshalResourceVersionDataResponseBodyToResourceviewsResourceVersionDataView(val) } return res } -// unmarshalCatalogResponseToResourceviewsCatalogView builds a value of type -// *resourceviews.CatalogView from a value of type *CatalogResponse. -func unmarshalCatalogResponseToResourceviewsCatalogView(v *CatalogResponse) *resourceviews.CatalogView { +// unmarshalCatalogResponseBodyToResourceviewsCatalogView builds a value of +// type *resourceviews.CatalogView from a value of type *CatalogResponseBody. +func unmarshalCatalogResponseBodyToResourceviewsCatalogView(v *CatalogResponseBody) *resourceviews.CatalogView { res := &resourceviews.CatalogView{ ID: v.ID, Name: v.Name, @@ -777,39 +778,11 @@ func unmarshalCatalogResponseToResourceviewsCatalogView(v *CatalogResponse) *res return res } -// unmarshalVersionResponseToResourceviewsVersionView builds a value of type -// *resourceviews.VersionView from a value of type *VersionResponse. -func unmarshalVersionResponseToResourceviewsVersionView(v *VersionResponse) *resourceviews.VersionView { - res := &resourceviews.VersionView{ - ID: v.ID, - Version: v.Version, - DisplayName: v.DisplayName, - Description: v.Description, - MinPipelinesVersion: v.MinPipelinesVersion, - RawURL: v.RawURL, - WebURL: v.WebURL, - UpdatedAt: v.UpdatedAt, - } - res.Resource = unmarshalResourceResponseToResourceviewsResourceView(v.Resource) - - return res -} - -// unmarshalTagResponseToResourceviewsTagView builds a value of type -// *resourceviews.TagView from a value of type *TagResponse. -func unmarshalTagResponseToResourceviewsTagView(v *TagResponse) *resourceviews.TagView { - res := &resourceviews.TagView{ - ID: v.ID, - Name: v.Name, - } - - return res -} - -// unmarshalVersionResponseBodyToResourceviewsVersionView builds a value of -// type *resourceviews.VersionView from a value of type *VersionResponseBody. -func unmarshalVersionResponseBodyToResourceviewsVersionView(v *VersionResponseBody) *resourceviews.VersionView { - res := &resourceviews.VersionView{ +// unmarshalResourceVersionDataResponseBodyToResourceviewsResourceVersionDataView +// builds a value of type *resourceviews.ResourceVersionDataView from a value +// of type *ResourceVersionDataResponseBody. +func unmarshalResourceVersionDataResponseBodyToResourceviewsResourceVersionDataView(v *ResourceVersionDataResponseBody) *resourceviews.ResourceVersionDataView { + res := &resourceviews.ResourceVersionDataView{ ID: v.ID, Version: v.Version, DisplayName: v.DisplayName, @@ -819,42 +792,7 @@ func unmarshalVersionResponseBodyToResourceviewsVersionView(v *VersionResponseBo WebURL: v.WebURL, UpdatedAt: v.UpdatedAt, } - res.Resource = unmarshalResourceResponseBodyToResourceviewsResourceView(v.Resource) - - return res -} - -// unmarshalResourceResponseBodyToResourceviewsResourceView builds a value of -// type *resourceviews.ResourceView from a value of type *ResourceResponseBody. -func unmarshalResourceResponseBodyToResourceviewsResourceView(v *ResourceResponseBody) *resourceviews.ResourceView { - res := &resourceviews.ResourceView{ - ID: v.ID, - Name: v.Name, - Kind: v.Kind, - Rating: v.Rating, - } - res.Catalog = unmarshalCatalogResponseBodyToResourceviewsCatalogView(v.Catalog) - res.LatestVersion = unmarshalVersionResponseBodyToResourceviewsVersionView(v.LatestVersion) - res.Tags = make([]*resourceviews.TagView, len(v.Tags)) - for i, val := range v.Tags { - res.Tags[i] = unmarshalTagResponseBodyToResourceviewsTagView(val) - } - res.Versions = make([]*resourceviews.VersionView, len(v.Versions)) - for i, val := range v.Versions { - res.Versions[i] = unmarshalVersionResponseBodyToResourceviewsVersionView(val) - } - - return res -} - -// unmarshalCatalogResponseBodyToResourceviewsCatalogView builds a value of -// type *resourceviews.CatalogView from a value of type *CatalogResponseBody. -func unmarshalCatalogResponseBodyToResourceviewsCatalogView(v *CatalogResponseBody) *resourceviews.CatalogView { - res := &resourceviews.CatalogView{ - ID: v.ID, - Name: v.Name, - Type: v.Type, - } + res.Resource = unmarshalResourceDataResponseBodyToResourceviewsResourceDataView(v.Resource) return res } @@ -870,86 +808,14 @@ func unmarshalTagResponseBodyToResourceviewsTagView(v *TagResponseBody) *resourc return res } -// unmarshalByCatalogKindNameVersionResponseBodyToResourceviewsVersionView -// builds a value of type *resourceviews.VersionView from a value of type -// *ByCatalogKindNameVersionResponseBody. -func unmarshalByCatalogKindNameVersionResponseBodyToResourceviewsVersionView(v *ByCatalogKindNameVersionResponseBody) *resourceviews.VersionView { - res := &resourceviews.VersionView{ - ID: v.ID, - Version: v.Version, - DisplayName: v.DisplayName, - Description: v.Description, - MinPipelinesVersion: v.MinPipelinesVersion, - RawURL: v.RawURL, - WebURL: v.WebURL, - UpdatedAt: v.UpdatedAt, - } - res.Resource = unmarshalResourceResponseBodyToResourceviewsResourceView(v.Resource) - - return res -} - -// unmarshalByVersionIDResponseBodyToResourceviewsVersionView builds a value of -// type *resourceviews.VersionView from a value of type -// *ByVersionIDResponseBody. -func unmarshalByVersionIDResponseBodyToResourceviewsVersionView(v *ByVersionIDResponseBody) *resourceviews.VersionView { - res := &resourceviews.VersionView{ - ID: v.ID, - Version: v.Version, - DisplayName: v.DisplayName, - Description: v.Description, - MinPipelinesVersion: v.MinPipelinesVersion, - RawURL: v.RawURL, - WebURL: v.WebURL, - UpdatedAt: v.UpdatedAt, - } - res.Resource = unmarshalResourceResponseBodyToResourceviewsResourceView(v.Resource) - - return res -} - -// unmarshalByCatalogKindNameResponseBodyToResourceviewsResourceView builds a -// value of type *resourceviews.ResourceView from a value of type -// *ByCatalogKindNameResponseBody. -func unmarshalByCatalogKindNameResponseBodyToResourceviewsResourceView(v *ByCatalogKindNameResponseBody) *resourceviews.ResourceView { - res := &resourceviews.ResourceView{ - ID: v.ID, - Name: v.Name, - Kind: v.Kind, - Rating: v.Rating, - } - res.Catalog = unmarshalCatalogResponseBodyToResourceviewsCatalogView(v.Catalog) - res.LatestVersion = unmarshalVersionResponseBodyToResourceviewsVersionView(v.LatestVersion) - res.Tags = make([]*resourceviews.TagView, len(v.Tags)) - for i, val := range v.Tags { - res.Tags[i] = unmarshalTagResponseBodyToResourceviewsTagView(val) - } - res.Versions = make([]*resourceviews.VersionView, len(v.Versions)) - for i, val := range v.Versions { - res.Versions[i] = unmarshalVersionResponseBodyToResourceviewsVersionView(val) - } - - return res -} - -// unmarshalByIDResponseBodyToResourceviewsResourceView builds a value of type -// *resourceviews.ResourceView from a value of type *ByIDResponseBody. -func unmarshalByIDResponseBodyToResourceviewsResourceView(v *ByIDResponseBody) *resourceviews.ResourceView { - res := &resourceviews.ResourceView{ - ID: v.ID, - Name: v.Name, - Kind: v.Kind, - Rating: v.Rating, - } - res.Catalog = unmarshalCatalogResponseBodyToResourceviewsCatalogView(v.Catalog) - res.LatestVersion = unmarshalVersionResponseBodyToResourceviewsVersionView(v.LatestVersion) - res.Tags = make([]*resourceviews.TagView, len(v.Tags)) - for i, val := range v.Tags { - res.Tags[i] = unmarshalTagResponseBodyToResourceviewsTagView(val) - } - res.Versions = make([]*resourceviews.VersionView, len(v.Versions)) +// unmarshalVersionsResponseBodyToResourceviewsVersionsView builds a value of +// type *resourceviews.VersionsView from a value of type *VersionsResponseBody. +func unmarshalVersionsResponseBodyToResourceviewsVersionsView(v *VersionsResponseBody) *resourceviews.VersionsView { + res := &resourceviews.VersionsView{} + res.Latest = unmarshalResourceVersionDataResponseBodyToResourceviewsResourceVersionDataView(v.Latest) + res.Versions = make([]*resourceviews.ResourceVersionDataView, len(v.Versions)) for i, val := range v.Versions { - res.Versions[i] = unmarshalVersionResponseBodyToResourceviewsVersionView(val) + res.Versions[i] = unmarshalResourceVersionDataResponseBodyToResourceviewsResourceVersionDataView(val) } return res diff --git a/vendor/github.com/tektoncd/hub/api/gen/http/resource/client/types.go b/vendor/github.com/tektoncd/hub/api/gen/http/resource/client/types.go index 2a51dc60a9..2e593ff794 100644 --- a/vendor/github.com/tektoncd/hub/api/gen/http/resource/client/types.go +++ b/vendor/github.com/tektoncd/hub/api/gen/http/resource/client/types.go @@ -14,107 +14,44 @@ import ( // QueryResponseBody is the type of the "resource" service "Query" endpoint // HTTP response body. -type QueryResponseBody []*ResourceResponse +type QueryResponseBody struct { + Data ResourceDataCollectionResponseBody `form:"data,omitempty" json:"data,omitempty" xml:"data,omitempty"` +} // ListResponseBody is the type of the "resource" service "List" endpoint HTTP // response body. -type ListResponseBody []*ResourceResponse +type ListResponseBody struct { + Data ResourceDataCollectionResponseBody `form:"data,omitempty" json:"data,omitempty" xml:"data,omitempty"` +} // VersionsByIDResponseBody is the type of the "resource" service // "VersionsByID" endpoint HTTP response body. type VersionsByIDResponseBody struct { - // Latest Version of resource - Latest *VersionResponseBody `form:"latest,omitempty" json:"latest,omitempty" xml:"latest,omitempty"` - // List of all versions of resource - Versions []*VersionResponseBody `form:"versions,omitempty" json:"versions,omitempty" xml:"versions,omitempty"` + Data *VersionsResponseBody `form:"data,omitempty" json:"data,omitempty" xml:"data,omitempty"` } // ByCatalogKindNameVersionResponseBody is the type of the "resource" service // "ByCatalogKindNameVersion" endpoint HTTP response body. type ByCatalogKindNameVersionResponseBody struct { - // ID is the unique id of resource's version - ID *uint `form:"id,omitempty" json:"id,omitempty" xml:"id,omitempty"` - // Version of resource - Version *string `form:"version,omitempty" json:"version,omitempty" xml:"version,omitempty"` - // Display name of version - DisplayName *string `form:"displayName,omitempty" json:"displayName,omitempty" xml:"displayName,omitempty"` - // Description of version - Description *string `form:"description,omitempty" json:"description,omitempty" xml:"description,omitempty"` - // Minimum pipelines version the resource's version is compatible with - MinPipelinesVersion *string `form:"minPipelinesVersion,omitempty" json:"minPipelinesVersion,omitempty" xml:"minPipelinesVersion,omitempty"` - // Raw URL of resource's yaml file of the version - RawURL *string `form:"rawURL,omitempty" json:"rawURL,omitempty" xml:"rawURL,omitempty"` - // Web URL of resource's yaml file of the version - WebURL *string `form:"webURL,omitempty" json:"webURL,omitempty" xml:"webURL,omitempty"` - // Timestamp when version was last updated - UpdatedAt *string `form:"updatedAt,omitempty" json:"updatedAt,omitempty" xml:"updatedAt,omitempty"` - // Resource to which the version belongs - Resource *ResourceResponseBody `form:"resource,omitempty" json:"resource,omitempty" xml:"resource,omitempty"` + Data *ResourceVersionDataResponseBody `form:"data,omitempty" json:"data,omitempty" xml:"data,omitempty"` } // ByVersionIDResponseBody is the type of the "resource" service "ByVersionId" // endpoint HTTP response body. type ByVersionIDResponseBody struct { - // ID is the unique id of resource's version - ID *uint `form:"id,omitempty" json:"id,omitempty" xml:"id,omitempty"` - // Version of resource - Version *string `form:"version,omitempty" json:"version,omitempty" xml:"version,omitempty"` - // Display name of version - DisplayName *string `form:"displayName,omitempty" json:"displayName,omitempty" xml:"displayName,omitempty"` - // Description of version - Description *string `form:"description,omitempty" json:"description,omitempty" xml:"description,omitempty"` - // Minimum pipelines version the resource's version is compatible with - MinPipelinesVersion *string `form:"minPipelinesVersion,omitempty" json:"minPipelinesVersion,omitempty" xml:"minPipelinesVersion,omitempty"` - // Raw URL of resource's yaml file of the version - RawURL *string `form:"rawURL,omitempty" json:"rawURL,omitempty" xml:"rawURL,omitempty"` - // Web URL of resource's yaml file of the version - WebURL *string `form:"webURL,omitempty" json:"webURL,omitempty" xml:"webURL,omitempty"` - // Timestamp when version was last updated - UpdatedAt *string `form:"updatedAt,omitempty" json:"updatedAt,omitempty" xml:"updatedAt,omitempty"` - // Resource to which the version belongs - Resource *ResourceResponseBody `form:"resource,omitempty" json:"resource,omitempty" xml:"resource,omitempty"` + Data *ResourceVersionDataResponseBody `form:"data,omitempty" json:"data,omitempty" xml:"data,omitempty"` } // ByCatalogKindNameResponseBody is the type of the "resource" service // "ByCatalogKindName" endpoint HTTP response body. type ByCatalogKindNameResponseBody struct { - // ID is the unique id of the resource - ID *uint `form:"id,omitempty" json:"id,omitempty" xml:"id,omitempty"` - // Name of resource - Name *string `form:"name,omitempty" json:"name,omitempty" xml:"name,omitempty"` - // Type of catalog to which resource belongs - Catalog *CatalogResponseBody `form:"catalog,omitempty" json:"catalog,omitempty" xml:"catalog,omitempty"` - // Kind of resource - Kind *string `form:"kind,omitempty" json:"kind,omitempty" xml:"kind,omitempty"` - // Latest version of resource - LatestVersion *VersionResponseBody `form:"latestVersion,omitempty" json:"latestVersion,omitempty" xml:"latestVersion,omitempty"` - // Tags related to resource - Tags []*TagResponseBody `form:"tags,omitempty" json:"tags,omitempty" xml:"tags,omitempty"` - // Rating of resource - Rating *float64 `form:"rating,omitempty" json:"rating,omitempty" xml:"rating,omitempty"` - // List of all versions of a resource - Versions []*VersionResponseBody `form:"versions,omitempty" json:"versions,omitempty" xml:"versions,omitempty"` + Data *ResourceDataResponseBody `form:"data,omitempty" json:"data,omitempty" xml:"data,omitempty"` } // ByIDResponseBody is the type of the "resource" service "ById" endpoint HTTP // response body. type ByIDResponseBody struct { - // ID is the unique id of the resource - ID *uint `form:"id,omitempty" json:"id,omitempty" xml:"id,omitempty"` - // Name of resource - Name *string `form:"name,omitempty" json:"name,omitempty" xml:"name,omitempty"` - // Type of catalog to which resource belongs - Catalog *CatalogResponseBody `form:"catalog,omitempty" json:"catalog,omitempty" xml:"catalog,omitempty"` - // Kind of resource - Kind *string `form:"kind,omitempty" json:"kind,omitempty" xml:"kind,omitempty"` - // Latest version of resource - LatestVersion *VersionResponseBody `form:"latestVersion,omitempty" json:"latestVersion,omitempty" xml:"latestVersion,omitempty"` - // Tags related to resource - Tags []*TagResponseBody `form:"tags,omitempty" json:"tags,omitempty" xml:"tags,omitempty"` - // Rating of resource - Rating *float64 `form:"rating,omitempty" json:"rating,omitempty" xml:"rating,omitempty"` - // List of all versions of a resource - Versions []*VersionResponseBody `form:"versions,omitempty" json:"versions,omitempty" xml:"versions,omitempty"` + Data *ResourceDataResponseBody `form:"data,omitempty" json:"data,omitempty" xml:"data,omitempty"` } // QueryInternalErrorResponseBody is the type of the "resource" service "Query" @@ -372,28 +309,32 @@ type ByIDNotFoundResponseBody struct { Fault *bool `form:"fault,omitempty" json:"fault,omitempty" xml:"fault,omitempty"` } -// ResourceResponse is used to define fields on response body types. -type ResourceResponse struct { +// ResourceDataCollectionResponseBody is used to define fields on response body +// types. +type ResourceDataCollectionResponseBody []*ResourceDataResponseBody + +// ResourceDataResponseBody is used to define fields on response body types. +type ResourceDataResponseBody struct { // ID is the unique id of the resource ID *uint `form:"id,omitempty" json:"id,omitempty" xml:"id,omitempty"` // Name of resource Name *string `form:"name,omitempty" json:"name,omitempty" xml:"name,omitempty"` // Type of catalog to which resource belongs - Catalog *CatalogResponse `form:"catalog,omitempty" json:"catalog,omitempty" xml:"catalog,omitempty"` + Catalog *CatalogResponseBody `form:"catalog,omitempty" json:"catalog,omitempty" xml:"catalog,omitempty"` // Kind of resource Kind *string `form:"kind,omitempty" json:"kind,omitempty" xml:"kind,omitempty"` // Latest version of resource - LatestVersion *VersionResponse `form:"latestVersion,omitempty" json:"latestVersion,omitempty" xml:"latestVersion,omitempty"` + LatestVersion *ResourceVersionDataResponseBody `form:"latestVersion,omitempty" json:"latestVersion,omitempty" xml:"latestVersion,omitempty"` // Tags related to resource - Tags []*TagResponse `form:"tags,omitempty" json:"tags,omitempty" xml:"tags,omitempty"` + Tags []*TagResponseBody `form:"tags,omitempty" json:"tags,omitempty" xml:"tags,omitempty"` // Rating of resource Rating *float64 `form:"rating,omitempty" json:"rating,omitempty" xml:"rating,omitempty"` // List of all versions of a resource - Versions []*VersionResponse `form:"versions,omitempty" json:"versions,omitempty" xml:"versions,omitempty"` + Versions []*ResourceVersionDataResponseBody `form:"versions,omitempty" json:"versions,omitempty" xml:"versions,omitempty"` } -// CatalogResponse is used to define fields on response body types. -type CatalogResponse struct { +// CatalogResponseBody is used to define fields on response body types. +type CatalogResponseBody struct { // ID is the unique id of the catalog ID *uint `form:"id,omitempty" json:"id,omitempty" xml:"id,omitempty"` // Name of catalog @@ -402,8 +343,9 @@ type CatalogResponse struct { Type *string `form:"type,omitempty" json:"type,omitempty" xml:"type,omitempty"` } -// VersionResponse is used to define fields on response body types. -type VersionResponse struct { +// ResourceVersionDataResponseBody is used to define fields on response body +// types. +type ResourceVersionDataResponseBody struct { // ID is the unique id of resource's version ID *uint `form:"id,omitempty" json:"id,omitempty" xml:"id,omitempty"` // Version of resource @@ -421,67 +363,7 @@ type VersionResponse struct { // Timestamp when version was last updated UpdatedAt *string `form:"updatedAt,omitempty" json:"updatedAt,omitempty" xml:"updatedAt,omitempty"` // Resource to which the version belongs - Resource *ResourceResponse `form:"resource,omitempty" json:"resource,omitempty" xml:"resource,omitempty"` -} - -// TagResponse is used to define fields on response body types. -type TagResponse struct { - // ID is the unique id of tag - ID *uint `form:"id,omitempty" json:"id,omitempty" xml:"id,omitempty"` - // Name of tag - Name *string `form:"name,omitempty" json:"name,omitempty" xml:"name,omitempty"` -} - -// VersionResponseBody is used to define fields on response body types. -type VersionResponseBody struct { - // ID is the unique id of resource's version - ID *uint `form:"id,omitempty" json:"id,omitempty" xml:"id,omitempty"` - // Version of resource - Version *string `form:"version,omitempty" json:"version,omitempty" xml:"version,omitempty"` - // Display name of version - DisplayName *string `form:"displayName,omitempty" json:"displayName,omitempty" xml:"displayName,omitempty"` - // Description of version - Description *string `form:"description,omitempty" json:"description,omitempty" xml:"description,omitempty"` - // Minimum pipelines version the resource's version is compatible with - MinPipelinesVersion *string `form:"minPipelinesVersion,omitempty" json:"minPipelinesVersion,omitempty" xml:"minPipelinesVersion,omitempty"` - // Raw URL of resource's yaml file of the version - RawURL *string `form:"rawURL,omitempty" json:"rawURL,omitempty" xml:"rawURL,omitempty"` - // Web URL of resource's yaml file of the version - WebURL *string `form:"webURL,omitempty" json:"webURL,omitempty" xml:"webURL,omitempty"` - // Timestamp when version was last updated - UpdatedAt *string `form:"updatedAt,omitempty" json:"updatedAt,omitempty" xml:"updatedAt,omitempty"` - // Resource to which the version belongs - Resource *ResourceResponseBody `form:"resource,omitempty" json:"resource,omitempty" xml:"resource,omitempty"` -} - -// ResourceResponseBody is used to define fields on response body types. -type ResourceResponseBody struct { - // ID is the unique id of the resource - ID *uint `form:"id,omitempty" json:"id,omitempty" xml:"id,omitempty"` - // Name of resource - Name *string `form:"name,omitempty" json:"name,omitempty" xml:"name,omitempty"` - // Type of catalog to which resource belongs - Catalog *CatalogResponseBody `form:"catalog,omitempty" json:"catalog,omitempty" xml:"catalog,omitempty"` - // Kind of resource - Kind *string `form:"kind,omitempty" json:"kind,omitempty" xml:"kind,omitempty"` - // Latest version of resource - LatestVersion *VersionResponseBody `form:"latestVersion,omitempty" json:"latestVersion,omitempty" xml:"latestVersion,omitempty"` - // Tags related to resource - Tags []*TagResponseBody `form:"tags,omitempty" json:"tags,omitempty" xml:"tags,omitempty"` - // Rating of resource - Rating *float64 `form:"rating,omitempty" json:"rating,omitempty" xml:"rating,omitempty"` - // List of all versions of a resource - Versions []*VersionResponseBody `form:"versions,omitempty" json:"versions,omitempty" xml:"versions,omitempty"` -} - -// CatalogResponseBody is used to define fields on response body types. -type CatalogResponseBody struct { - // ID is the unique id of the catalog - ID *uint `form:"id,omitempty" json:"id,omitempty" xml:"id,omitempty"` - // Name of catalog - Name *string `form:"name,omitempty" json:"name,omitempty" xml:"name,omitempty"` - // Type of catalog - Type *string `form:"type,omitempty" json:"type,omitempty" xml:"type,omitempty"` + Resource *ResourceDataResponseBody `form:"resource,omitempty" json:"resource,omitempty" xml:"resource,omitempty"` } // TagResponseBody is used to define fields on response body types. @@ -492,13 +374,23 @@ type TagResponseBody struct { Name *string `form:"name,omitempty" json:"name,omitempty" xml:"name,omitempty"` } -// NewQueryResourceCollectionOK builds a "resource" service "Query" endpoint -// result from a HTTP "OK" response. -func NewQueryResourceCollectionOK(body QueryResponseBody) resourceviews.ResourceCollectionView { - v := make([]*resourceviews.ResourceView, len(body)) - for i, val := range body { - v[i] = unmarshalResourceResponseToResourceviewsResourceView(val) +// VersionsResponseBody is used to define fields on response body types. +type VersionsResponseBody struct { + // Latest Version of resource + Latest *ResourceVersionDataResponseBody `form:"latest,omitempty" json:"latest,omitempty" xml:"latest,omitempty"` + // List of all versions of resource + Versions []*ResourceVersionDataResponseBody `form:"versions,omitempty" json:"versions,omitempty" xml:"versions,omitempty"` +} + +// NewQueryResourcesOK builds a "resource" service "Query" endpoint result from +// a HTTP "OK" response. +func NewQueryResourcesOK(body *QueryResponseBody) *resourceviews.ResourcesView { + v := &resourceviews.ResourcesView{} + v.Data = make([]*resourceviews.ResourceDataView, len(body.Data)) + for i, val := range body.Data { + v.Data[i] = unmarshalResourceDataResponseBodyToResourceviewsResourceDataView(val) } + return v } @@ -546,13 +438,15 @@ func NewQueryNotFound(body *QueryNotFoundResponseBody) *goa.ServiceError { return v } -// NewListResourceCollectionOK builds a "resource" service "List" endpoint -// result from a HTTP "OK" response. -func NewListResourceCollectionOK(body ListResponseBody) resourceviews.ResourceCollectionView { - v := make([]*resourceviews.ResourceView, len(body)) - for i, val := range body { - v[i] = unmarshalResourceResponseToResourceviewsResourceView(val) +// NewListResourcesOK builds a "resource" service "List" endpoint result from a +// HTTP "OK" response. +func NewListResourcesOK(body *ListResponseBody) *resourceviews.ResourcesView { + v := &resourceviews.ResourcesView{} + v.Data = make([]*resourceviews.ResourceDataView, len(body.Data)) + for i, val := range body.Data { + v.Data[i] = unmarshalResourceDataResponseBodyToResourceviewsResourceDataView(val) } + return v } @@ -571,15 +465,11 @@ func NewListInternalError(body *ListInternalErrorResponseBody) *goa.ServiceError return v } -// NewVersionsByIDVersionsOK builds a "resource" service "VersionsByID" +// NewVersionsByIDResourceVersionsOK builds a "resource" service "VersionsByID" // endpoint result from a HTTP "OK" response. -func NewVersionsByIDVersionsOK(body *VersionsByIDResponseBody) *resourceviews.VersionsView { - v := &resourceviews.VersionsView{} - v.Latest = unmarshalVersionResponseBodyToResourceviewsVersionView(body.Latest) - v.Versions = make([]*resourceviews.VersionView, len(body.Versions)) - for i, val := range body.Versions { - v.Versions[i] = unmarshalVersionResponseBodyToResourceviewsVersionView(val) - } +func NewVersionsByIDResourceVersionsOK(body *VersionsByIDResponseBody) *resourceviews.ResourceVersionsView { + v := &resourceviews.ResourceVersionsView{} + v.Data = unmarshalVersionsResponseBodyToResourceviewsVersionsView(body.Data) return v } @@ -614,20 +504,11 @@ func NewVersionsByIDNotFound(body *VersionsByIDNotFoundResponseBody) *goa.Servic return v } -// NewByCatalogKindNameVersionVersionOK builds a "resource" service +// NewByCatalogKindNameVersionResourceVersionOK builds a "resource" service // "ByCatalogKindNameVersion" endpoint result from a HTTP "OK" response. -func NewByCatalogKindNameVersionVersionOK(body *ByCatalogKindNameVersionResponseBody) *resourceviews.VersionView { - v := &resourceviews.VersionView{ - ID: body.ID, - Version: body.Version, - DisplayName: body.DisplayName, - Description: body.Description, - MinPipelinesVersion: body.MinPipelinesVersion, - RawURL: body.RawURL, - WebURL: body.WebURL, - UpdatedAt: body.UpdatedAt, - } - v.Resource = unmarshalResourceResponseBodyToResourceviewsResourceView(body.Resource) +func NewByCatalogKindNameVersionResourceVersionOK(body *ByCatalogKindNameVersionResponseBody) *resourceviews.ResourceVersionView { + v := &resourceviews.ResourceVersionView{} + v.Data = unmarshalResourceVersionDataResponseBodyToResourceviewsResourceVersionDataView(body.Data) return v } @@ -662,20 +543,11 @@ func NewByCatalogKindNameVersionNotFound(body *ByCatalogKindNameVersionNotFoundR return v } -// NewByVersionIDVersionOK builds a "resource" service "ByVersionId" endpoint -// result from a HTTP "OK" response. -func NewByVersionIDVersionOK(body *ByVersionIDResponseBody) *resourceviews.VersionView { - v := &resourceviews.VersionView{ - ID: body.ID, - Version: body.Version, - DisplayName: body.DisplayName, - Description: body.Description, - MinPipelinesVersion: body.MinPipelinesVersion, - RawURL: body.RawURL, - WebURL: body.WebURL, - UpdatedAt: body.UpdatedAt, - } - v.Resource = unmarshalResourceResponseBodyToResourceviewsResourceView(body.Resource) +// NewByVersionIDResourceVersionOK builds a "resource" service "ByVersionId" +// endpoint result from a HTTP "OK" response. +func NewByVersionIDResourceVersionOK(body *ByVersionIDResponseBody) *resourceviews.ResourceVersionView { + v := &resourceviews.ResourceVersionView{} + v.Data = unmarshalResourceVersionDataResponseBodyToResourceviewsResourceVersionDataView(body.Data) return v } @@ -713,22 +585,8 @@ func NewByVersionIDNotFound(body *ByVersionIDNotFoundResponseBody) *goa.ServiceE // NewByCatalogKindNameResourceOK builds a "resource" service // "ByCatalogKindName" endpoint result from a HTTP "OK" response. func NewByCatalogKindNameResourceOK(body *ByCatalogKindNameResponseBody) *resourceviews.ResourceView { - v := &resourceviews.ResourceView{ - ID: body.ID, - Name: body.Name, - Kind: body.Kind, - Rating: body.Rating, - } - v.Catalog = unmarshalCatalogResponseBodyToResourceviewsCatalogView(body.Catalog) - v.LatestVersion = unmarshalVersionResponseBodyToResourceviewsVersionView(body.LatestVersion) - v.Tags = make([]*resourceviews.TagView, len(body.Tags)) - for i, val := range body.Tags { - v.Tags[i] = unmarshalTagResponseBodyToResourceviewsTagView(val) - } - v.Versions = make([]*resourceviews.VersionView, len(body.Versions)) - for i, val := range body.Versions { - v.Versions[i] = unmarshalVersionResponseBodyToResourceviewsVersionView(val) - } + v := &resourceviews.ResourceView{} + v.Data = unmarshalResourceDataResponseBodyToResourceviewsResourceDataView(body.Data) return v } @@ -766,22 +624,8 @@ func NewByCatalogKindNameNotFound(body *ByCatalogKindNameNotFoundResponseBody) * // NewByIDResourceOK builds a "resource" service "ById" endpoint result from a // HTTP "OK" response. func NewByIDResourceOK(body *ByIDResponseBody) *resourceviews.ResourceView { - v := &resourceviews.ResourceView{ - ID: body.ID, - Name: body.Name, - Kind: body.Kind, - Rating: body.Rating, - } - v.Catalog = unmarshalCatalogResponseBodyToResourceviewsCatalogView(body.Catalog) - v.LatestVersion = unmarshalVersionResponseBodyToResourceviewsVersionView(body.LatestVersion) - v.Tags = make([]*resourceviews.TagView, len(body.Tags)) - for i, val := range body.Tags { - v.Tags[i] = unmarshalTagResponseBodyToResourceviewsTagView(val) - } - v.Versions = make([]*resourceviews.VersionView, len(body.Versions)) - for i, val := range body.Versions { - v.Versions[i] = unmarshalVersionResponseBodyToResourceviewsVersionView(val) - } + v := &resourceviews.ResourceView{} + v.Data = unmarshalResourceDataResponseBodyToResourceviewsResourceDataView(body.Data) return v } @@ -1151,8 +995,22 @@ func ValidateByIDNotFoundResponseBody(body *ByIDNotFoundResponseBody) (err error return } -// ValidateResourceResponse runs the validations defined on ResourceResponse -func ValidateResourceResponse(body *ResourceResponse) (err error) { +// ValidateResourceDataCollectionResponseBody runs the validations defined on +// ResourceDataCollectionResponseBody +func ValidateResourceDataCollectionResponseBody(body ResourceDataCollectionResponseBody) (err error) { + for _, e := range body { + if e != nil { + if err2 := ValidateResourceDataResponseBody(e); err2 != nil { + err = goa.MergeErrors(err, err2) + } + } + } + return +} + +// ValidateResourceDataResponseBody runs the validations defined on +// ResourceDataResponseBody +func ValidateResourceDataResponseBody(body *ResourceDataResponseBody) (err error) { if body.ID == nil { err = goa.MergeErrors(err, goa.MissingFieldError("id", "body")) } @@ -1178,25 +1036,25 @@ func ValidateResourceResponse(body *ResourceResponse) (err error) { err = goa.MergeErrors(err, goa.MissingFieldError("versions", "body")) } if body.Catalog != nil { - if err2 := ValidateCatalogResponse(body.Catalog); err2 != nil { + if err2 := ValidateCatalogResponseBody(body.Catalog); err2 != nil { err = goa.MergeErrors(err, err2) } } if body.LatestVersion != nil { - if err2 := ValidateVersionResponse(body.LatestVersion); err2 != nil { + if err2 := ValidateResourceVersionDataResponseBody(body.LatestVersion); err2 != nil { err = goa.MergeErrors(err, err2) } } for _, e := range body.Tags { if e != nil { - if err2 := ValidateTagResponse(e); err2 != nil { + if err2 := ValidateTagResponseBody(e); err2 != nil { err = goa.MergeErrors(err, err2) } } } for _, e := range body.Versions { if e != nil { - if err2 := ValidateVersionResponse(e); err2 != nil { + if err2 := ValidateResourceVersionDataResponseBody(e); err2 != nil { err = goa.MergeErrors(err, err2) } } @@ -1204,8 +1062,9 @@ func ValidateResourceResponse(body *ResourceResponse) (err error) { return } -// ValidateCatalogResponse runs the validations defined on CatalogResponse -func ValidateCatalogResponse(body *CatalogResponse) (err error) { +// ValidateCatalogResponseBody runs the validations defined on +// CatalogResponseBody +func ValidateCatalogResponseBody(body *CatalogResponseBody) (err error) { if body.ID == nil { err = goa.MergeErrors(err, goa.MissingFieldError("id", "body")) } @@ -1223,8 +1082,9 @@ func ValidateCatalogResponse(body *CatalogResponse) (err error) { return } -// ValidateVersionResponse runs the validations defined on VersionResponse -func ValidateVersionResponse(body *VersionResponse) (err error) { +// ValidateResourceVersionDataResponseBody runs the validations defined on +// ResourceVersionDataResponseBody +func ValidateResourceVersionDataResponseBody(body *ResourceVersionDataResponseBody) (err error) { if body.ID == nil { err = goa.MergeErrors(err, goa.MissingFieldError("id", "body")) } @@ -1262,15 +1122,15 @@ func ValidateVersionResponse(body *VersionResponse) (err error) { err = goa.MergeErrors(err, goa.ValidateFormat("body.updatedAt", *body.UpdatedAt, goa.FormatDateTime)) } if body.Resource != nil { - if err2 := ValidateResourceResponse(body.Resource); err2 != nil { + if err2 := ValidateResourceDataResponseBody(body.Resource); err2 != nil { err = goa.MergeErrors(err, err2) } } return } -// ValidateTagResponse runs the validations defined on TagResponse -func ValidateTagResponse(body *TagResponse) (err error) { +// ValidateTagResponseBody runs the validations defined on TagResponseBody +func ValidateTagResponseBody(body *TagResponseBody) (err error) { if body.ID == nil { err = goa.MergeErrors(err, goa.MissingFieldError("id", "body")) } @@ -1280,134 +1140,26 @@ func ValidateTagResponse(body *TagResponse) (err error) { return } -// ValidateVersionResponseBody runs the validations defined on -// VersionResponseBody -func ValidateVersionResponseBody(body *VersionResponseBody) (err error) { - if body.ID == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("id", "body")) - } - if body.Version == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("version", "body")) - } - if body.DisplayName == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("displayName", "body")) - } - if body.Description == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("description", "body")) - } - if body.MinPipelinesVersion == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("minPipelinesVersion", "body")) - } - if body.RawURL == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("rawURL", "body")) - } - if body.WebURL == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("webURL", "body")) - } - if body.UpdatedAt == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("updatedAt", "body")) - } - if body.Resource == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("resource", "body")) - } - if body.RawURL != nil { - err = goa.MergeErrors(err, goa.ValidateFormat("body.rawURL", *body.RawURL, goa.FormatURI)) - } - if body.WebURL != nil { - err = goa.MergeErrors(err, goa.ValidateFormat("body.webURL", *body.WebURL, goa.FormatURI)) - } - if body.UpdatedAt != nil { - err = goa.MergeErrors(err, goa.ValidateFormat("body.updatedAt", *body.UpdatedAt, goa.FormatDateTime)) - } - if body.Resource != nil { - if err2 := ValidateResourceResponseBody(body.Resource); err2 != nil { - err = goa.MergeErrors(err, err2) - } - } - return -} - -// ValidateResourceResponseBody runs the validations defined on -// ResourceResponseBody -func ValidateResourceResponseBody(body *ResourceResponseBody) (err error) { - if body.ID == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("id", "body")) - } - if body.Name == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("name", "body")) - } - if body.Catalog == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("catalog", "body")) - } - if body.Kind == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("kind", "body")) - } - if body.LatestVersion == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("latestVersion", "body")) - } - if body.Tags == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("tags", "body")) - } - if body.Rating == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("rating", "body")) +// ValidateVersionsResponseBody runs the validations defined on +// VersionsResponseBody +func ValidateVersionsResponseBody(body *VersionsResponseBody) (err error) { + if body.Latest == nil { + err = goa.MergeErrors(err, goa.MissingFieldError("latest", "body")) } if body.Versions == nil { err = goa.MergeErrors(err, goa.MissingFieldError("versions", "body")) } - if body.Catalog != nil { - if err2 := ValidateCatalogResponseBody(body.Catalog); err2 != nil { - err = goa.MergeErrors(err, err2) - } - } - if body.LatestVersion != nil { - if err2 := ValidateVersionResponseBody(body.LatestVersion); err2 != nil { + if body.Latest != nil { + if err2 := ValidateResourceVersionDataResponseBody(body.Latest); err2 != nil { err = goa.MergeErrors(err, err2) } } - for _, e := range body.Tags { - if e != nil { - if err2 := ValidateTagResponseBody(e); err2 != nil { - err = goa.MergeErrors(err, err2) - } - } - } for _, e := range body.Versions { if e != nil { - if err2 := ValidateVersionResponseBody(e); err2 != nil { + if err2 := ValidateResourceVersionDataResponseBody(e); err2 != nil { err = goa.MergeErrors(err, err2) } } } return } - -// ValidateCatalogResponseBody runs the validations defined on -// CatalogResponseBody -func ValidateCatalogResponseBody(body *CatalogResponseBody) (err error) { - if body.ID == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("id", "body")) - } - if body.Name == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("name", "body")) - } - if body.Type == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("type", "body")) - } - if body.Type != nil { - if !(*body.Type == "official" || *body.Type == "community") { - err = goa.MergeErrors(err, goa.InvalidEnumValueError("body.type", *body.Type, []interface{}{"official", "community"})) - } - } - return -} - -// ValidateTagResponseBody runs the validations defined on TagResponseBody -func ValidateTagResponseBody(body *TagResponseBody) (err error) { - if body.ID == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("id", "body")) - } - if body.Name == nil { - err = goa.MergeErrors(err, goa.MissingFieldError("name", "body")) - } - return -} diff --git a/vendor/github.com/tektoncd/hub/api/gen/resource/client.go b/vendor/github.com/tektoncd/hub/api/gen/resource/client.go index 351565318e..79ff72fdc5 100644 --- a/vendor/github.com/tektoncd/hub/api/gen/resource/client.go +++ b/vendor/github.com/tektoncd/hub/api/gen/resource/client.go @@ -38,54 +38,54 @@ func NewClient(query, list, versionsByID, byCatalogKindNameVersion, byVersionID, } // Query calls the "Query" endpoint of the "resource" service. -func (c *Client) Query(ctx context.Context, p *QueryPayload) (res ResourceCollection, err error) { +func (c *Client) Query(ctx context.Context, p *QueryPayload) (res *Resources, err error) { var ires interface{} ires, err = c.QueryEndpoint(ctx, p) if err != nil { return } - return ires.(ResourceCollection), nil + return ires.(*Resources), nil } // List calls the "List" endpoint of the "resource" service. -func (c *Client) List(ctx context.Context, p *ListPayload) (res ResourceCollection, err error) { +func (c *Client) List(ctx context.Context, p *ListPayload) (res *Resources, err error) { var ires interface{} ires, err = c.ListEndpoint(ctx, p) if err != nil { return } - return ires.(ResourceCollection), nil + return ires.(*Resources), nil } // VersionsByID calls the "VersionsByID" endpoint of the "resource" service. -func (c *Client) VersionsByID(ctx context.Context, p *VersionsByIDPayload) (res *Versions, err error) { +func (c *Client) VersionsByID(ctx context.Context, p *VersionsByIDPayload) (res *ResourceVersions, err error) { var ires interface{} ires, err = c.VersionsByIDEndpoint(ctx, p) if err != nil { return } - return ires.(*Versions), nil + return ires.(*ResourceVersions), nil } // ByCatalogKindNameVersion calls the "ByCatalogKindNameVersion" endpoint of // the "resource" service. -func (c *Client) ByCatalogKindNameVersion(ctx context.Context, p *ByCatalogKindNameVersionPayload) (res *Version, err error) { +func (c *Client) ByCatalogKindNameVersion(ctx context.Context, p *ByCatalogKindNameVersionPayload) (res *ResourceVersion, err error) { var ires interface{} ires, err = c.ByCatalogKindNameVersionEndpoint(ctx, p) if err != nil { return } - return ires.(*Version), nil + return ires.(*ResourceVersion), nil } // ByVersionID calls the "ByVersionId" endpoint of the "resource" service. -func (c *Client) ByVersionID(ctx context.Context, p *ByVersionIDPayload) (res *Version, err error) { +func (c *Client) ByVersionID(ctx context.Context, p *ByVersionIDPayload) (res *ResourceVersion, err error) { var ires interface{} ires, err = c.ByVersionIDEndpoint(ctx, p) if err != nil { return } - return ires.(*Version), nil + return ires.(*ResourceVersion), nil } // ByCatalogKindName calls the "ByCatalogKindName" endpoint of the "resource" diff --git a/vendor/github.com/tektoncd/hub/api/gen/resource/endpoints.go b/vendor/github.com/tektoncd/hub/api/gen/resource/endpoints.go index f2554d6f10..dea6f82599 100644 --- a/vendor/github.com/tektoncd/hub/api/gen/resource/endpoints.go +++ b/vendor/github.com/tektoncd/hub/api/gen/resource/endpoints.go @@ -57,7 +57,7 @@ func NewQueryEndpoint(s Service) goa.Endpoint { if err != nil { return nil, err } - vres := NewViewedResourceCollection(res, "withoutVersion") + vres := NewViewedResources(res, "default") return vres, nil } } @@ -71,7 +71,7 @@ func NewListEndpoint(s Service) goa.Endpoint { if err != nil { return nil, err } - vres := NewViewedResourceCollection(res, "withoutVersion") + vres := NewViewedResources(res, "default") return vres, nil } } @@ -85,7 +85,7 @@ func NewVersionsByIDEndpoint(s Service) goa.Endpoint { if err != nil { return nil, err } - vres := NewViewedVersions(res, "default") + vres := NewViewedResourceVersions(res, "default") return vres, nil } } @@ -99,7 +99,7 @@ func NewByCatalogKindNameVersionEndpoint(s Service) goa.Endpoint { if err != nil { return nil, err } - vres := NewViewedVersion(res, "default") + vres := NewViewedResourceVersion(res, "default") return vres, nil } } @@ -113,7 +113,7 @@ func NewByVersionIDEndpoint(s Service) goa.Endpoint { if err != nil { return nil, err } - vres := NewViewedVersion(res, "default") + vres := NewViewedResourceVersion(res, "default") return vres, nil } } diff --git a/vendor/github.com/tektoncd/hub/api/gen/resource/service.go b/vendor/github.com/tektoncd/hub/api/gen/resource/service.go index c92b2e977e..8e20487b15 100644 --- a/vendor/github.com/tektoncd/hub/api/gen/resource/service.go +++ b/vendor/github.com/tektoncd/hub/api/gen/resource/service.go @@ -17,15 +17,15 @@ import ( // The resource service provides details about all kind of resources type Service interface { // Find resources by a combination of name, kind and tags - Query(context.Context, *QueryPayload) (res ResourceCollection, err error) + Query(context.Context, *QueryPayload) (res *Resources, err error) // List all resources sorted by rating and name - List(context.Context, *ListPayload) (res ResourceCollection, err error) + List(context.Context, *ListPayload) (res *Resources, err error) // Find all versions of a resource by its id - VersionsByID(context.Context, *VersionsByIDPayload) (res *Versions, err error) + VersionsByID(context.Context, *VersionsByIDPayload) (res *ResourceVersions, err error) // Find resource using name of catalog & name, kind and version of resource - ByCatalogKindNameVersion(context.Context, *ByCatalogKindNameVersionPayload) (res *Version, err error) + ByCatalogKindNameVersion(context.Context, *ByCatalogKindNameVersionPayload) (res *ResourceVersion, err error) // Find a resource using its version's id - ByVersionID(context.Context, *ByVersionIDPayload) (res *Version, err error) + ByVersionID(context.Context, *ByVersionIDPayload) (res *ResourceVersion, err error) // Find resources using name of catalog, resource name and kind of resource ByCatalogKindName(context.Context, *ByCatalogKindNamePayload) (res *Resource, err error) // Find a resource using it's id @@ -56,8 +56,10 @@ type QueryPayload struct { Match string } -// ResourceCollection is the result type of the resource service Query method. -type ResourceCollection []*Resource +// Resources is the result type of the resource service Query method. +type Resources struct { + Data ResourceDataCollection +} // ListPayload is the payload type of the resource service List method. type ListPayload struct { @@ -72,12 +74,10 @@ type VersionsByIDPayload struct { ID uint } -// Versions is the result type of the resource service VersionsByID method. -type Versions struct { - // Latest Version of resource - Latest *Version - // List of all versions of resource - Versions []*Version +// ResourceVersions is the result type of the resource service VersionsByID +// method. +type ResourceVersions struct { + Data *Versions } // ByCatalogKindNameVersionPayload is the payload type of the resource service @@ -93,27 +93,10 @@ type ByCatalogKindNameVersionPayload struct { Version string } -// Version is the result type of the resource service ByCatalogKindNameVersion -// method. -type Version struct { - // ID is the unique id of resource's version - ID uint - // Version of resource - Version string - // Display name of version - DisplayName string - // Description of version - Description string - // Minimum pipelines version the resource's version is compatible with - MinPipelinesVersion string - // Raw URL of resource's yaml file of the version - RawURL string - // Web URL of resource's yaml file of the version - WebURL string - // Timestamp when version was last updated - UpdatedAt string - // Resource to which the version belongs - Resource *Resource +// ResourceVersion is the result type of the resource service +// ByCatalogKindNameVersion method. +type ResourceVersion struct { + Data *ResourceVersionData } // ByVersionIDPayload is the payload type of the resource service ByVersionId @@ -136,6 +119,19 @@ type ByCatalogKindNamePayload struct { // Resource is the result type of the resource service ByCatalogKindName method. type Resource struct { + Data *ResourceData +} + +// ByIDPayload is the payload type of the resource service ById method. +type ByIDPayload struct { + // ID of a resource + ID uint +} + +type ResourceDataCollection []*ResourceData + +// The resource type describes resource information. +type ResourceData struct { // ID is the unique id of the resource ID uint // Name of resource @@ -145,19 +141,13 @@ type Resource struct { // Kind of resource Kind string // Latest version of resource - LatestVersion *Version + LatestVersion *ResourceVersionData // Tags related to resource Tags []*Tag // Rating of resource Rating float64 // List of all versions of a resource - Versions []*Version -} - -// ByIDPayload is the payload type of the resource service ById method. -type ByIDPayload struct { - // ID of a resource - ID uint + Versions []*ResourceVersionData } type Catalog struct { @@ -169,6 +159,28 @@ type Catalog struct { Type string } +// The Version result type describes resource's version information. +type ResourceVersionData struct { + // ID is the unique id of resource's version + ID uint + // Version of resource + Version string + // Display name of version + DisplayName string + // Description of version + Description string + // Minimum pipelines version the resource's version is compatible with + MinPipelinesVersion string + // Raw URL of resource's yaml file of the version + RawURL string + // Web URL of resource's yaml file of the version + WebURL string + // Timestamp when version was last updated + UpdatedAt string + // Resource to which the version belongs + Resource *ResourceData +} + type Tag struct { // ID is the unique id of tag ID uint @@ -176,6 +188,14 @@ type Tag struct { Name string } +// The Versions type describes response for versions by resource id API. +type Versions struct { + // Latest Version of resource + Latest *ResourceVersionData + // List of all versions of resource + Versions []*ResourceVersionData +} + // MakeInternalError builds a goa.ServiceError from an error. func MakeInternalError(err error) *goa.ServiceError { return &goa.ServiceError{ @@ -203,186 +223,143 @@ func MakeInvalidKind(err error) *goa.ServiceError { } } -// NewResourceCollection initializes result type ResourceCollection from viewed -// result type ResourceCollection. -func NewResourceCollection(vres resourceviews.ResourceCollection) ResourceCollection { - var res ResourceCollection - switch vres.View { - case "info": - res = newResourceCollectionInfo(vres.Projected) - case "withoutVersion": - res = newResourceCollectionWithoutVersion(vres.Projected) - case "default", "": - res = newResourceCollection(vres.Projected) - } - return res +// NewResources initializes result type Resources from viewed result type +// Resources. +func NewResources(vres *resourceviews.Resources) *Resources { + return newResources(vres.Projected) } -// NewViewedResourceCollection initializes viewed result type -// ResourceCollection from result type ResourceCollection using the given view. -func NewViewedResourceCollection(res ResourceCollection, view string) resourceviews.ResourceCollection { - var vres resourceviews.ResourceCollection - switch view { - case "info": - p := newResourceCollectionViewInfo(res) - vres = resourceviews.ResourceCollection{Projected: p, View: "info"} - case "withoutVersion": - p := newResourceCollectionViewWithoutVersion(res) - vres = resourceviews.ResourceCollection{Projected: p, View: "withoutVersion"} - case "default", "": - p := newResourceCollectionView(res) - vres = resourceviews.ResourceCollection{Projected: p, View: "default"} - } - return vres +// NewViewedResources initializes viewed result type Resources from result type +// Resources using the given view. +func NewViewedResources(res *Resources, view string) *resourceviews.Resources { + p := newResourcesView(res) + return &resourceviews.Resources{Projected: p, View: "default"} } -// NewVersions initializes result type Versions from viewed result type -// Versions. -func NewVersions(vres *resourceviews.Versions) *Versions { - return newVersions(vres.Projected) +// NewResourceVersions initializes result type ResourceVersions from viewed +// result type ResourceVersions. +func NewResourceVersions(vres *resourceviews.ResourceVersions) *ResourceVersions { + return newResourceVersions(vres.Projected) } -// NewViewedVersions initializes viewed result type Versions from result type -// Versions using the given view. -func NewViewedVersions(res *Versions, view string) *resourceviews.Versions { - p := newVersionsView(res) - return &resourceviews.Versions{Projected: p, View: "default"} +// NewViewedResourceVersions initializes viewed result type ResourceVersions +// from result type ResourceVersions using the given view. +func NewViewedResourceVersions(res *ResourceVersions, view string) *resourceviews.ResourceVersions { + p := newResourceVersionsView(res) + return &resourceviews.ResourceVersions{Projected: p, View: "default"} } -// NewVersion initializes result type Version from viewed result type Version. -func NewVersion(vres *resourceviews.Version) *Version { - var res *Version - switch vres.View { - case "tiny": - res = newVersionTiny(vres.Projected) - case "min": - res = newVersionMin(vres.Projected) - case "withoutResource": - res = newVersionWithoutResource(vres.Projected) - case "default", "": - res = newVersion(vres.Projected) - } - return res +// NewResourceVersion initializes result type ResourceVersion from viewed +// result type ResourceVersion. +func NewResourceVersion(vres *resourceviews.ResourceVersion) *ResourceVersion { + return newResourceVersion(vres.Projected) } -// NewViewedVersion initializes viewed result type Version from result type -// Version using the given view. -func NewViewedVersion(res *Version, view string) *resourceviews.Version { - var vres *resourceviews.Version - switch view { - case "tiny": - p := newVersionViewTiny(res) - vres = &resourceviews.Version{Projected: p, View: "tiny"} - case "min": - p := newVersionViewMin(res) - vres = &resourceviews.Version{Projected: p, View: "min"} - case "withoutResource": - p := newVersionViewWithoutResource(res) - vres = &resourceviews.Version{Projected: p, View: "withoutResource"} - case "default", "": - p := newVersionView(res) - vres = &resourceviews.Version{Projected: p, View: "default"} - } - return vres +// NewViewedResourceVersion initializes viewed result type ResourceVersion from +// result type ResourceVersion using the given view. +func NewViewedResourceVersion(res *ResourceVersion, view string) *resourceviews.ResourceVersion { + p := newResourceVersionView(res) + return &resourceviews.ResourceVersion{Projected: p, View: "default"} } // NewResource initializes result type Resource from viewed result type // Resource. func NewResource(vres *resourceviews.Resource) *Resource { - var res *Resource - switch vres.View { - case "info": - res = newResourceInfo(vres.Projected) - case "withoutVersion": - res = newResourceWithoutVersion(vres.Projected) - case "default", "": - res = newResource(vres.Projected) - } - return res + return newResource(vres.Projected) } // NewViewedResource initializes viewed result type Resource from result type // Resource using the given view. func NewViewedResource(res *Resource, view string) *resourceviews.Resource { - var vres *resourceviews.Resource - switch view { - case "info": - p := newResourceViewInfo(res) - vres = &resourceviews.Resource{Projected: p, View: "info"} - case "withoutVersion": - p := newResourceViewWithoutVersion(res) - vres = &resourceviews.Resource{Projected: p, View: "withoutVersion"} - case "default", "": - p := newResourceView(res) - vres = &resourceviews.Resource{Projected: p, View: "default"} + p := newResourceView(res) + return &resourceviews.Resource{Projected: p, View: "default"} +} + +// newResources converts projected type Resources to service type Resources. +func newResources(vres *resourceviews.ResourcesView) *Resources { + res := &Resources{} + if vres.Data != nil { + res.Data = newResourceDataCollectionWithoutVersion(vres.Data) + } + return res +} + +// newResourcesView projects result type Resources to projected type +// ResourcesView using the "default" view. +func newResourcesView(res *Resources) *resourceviews.ResourcesView { + vres := &resourceviews.ResourcesView{} + if res.Data != nil { + vres.Data = newResourceDataCollectionViewWithoutVersion(res.Data) } return vres } -// newResourceCollectionInfo converts projected type ResourceCollection to -// service type ResourceCollection. -func newResourceCollectionInfo(vres resourceviews.ResourceCollectionView) ResourceCollection { - res := make(ResourceCollection, len(vres)) +// newResourceDataCollectionInfo converts projected type ResourceDataCollection +// to service type ResourceDataCollection. +func newResourceDataCollectionInfo(vres resourceviews.ResourceDataCollectionView) ResourceDataCollection { + res := make(ResourceDataCollection, len(vres)) for i, n := range vres { - res[i] = newResourceInfo(n) + res[i] = newResourceDataInfo(n) } return res } -// newResourceCollectionWithoutVersion converts projected type -// ResourceCollection to service type ResourceCollection. -func newResourceCollectionWithoutVersion(vres resourceviews.ResourceCollectionView) ResourceCollection { - res := make(ResourceCollection, len(vres)) +// newResourceDataCollectionWithoutVersion converts projected type +// ResourceDataCollection to service type ResourceDataCollection. +func newResourceDataCollectionWithoutVersion(vres resourceviews.ResourceDataCollectionView) ResourceDataCollection { + res := make(ResourceDataCollection, len(vres)) for i, n := range vres { - res[i] = newResourceWithoutVersion(n) + res[i] = newResourceDataWithoutVersion(n) } return res } -// newResourceCollection converts projected type ResourceCollection to service -// type ResourceCollection. -func newResourceCollection(vres resourceviews.ResourceCollectionView) ResourceCollection { - res := make(ResourceCollection, len(vres)) +// newResourceDataCollection converts projected type ResourceDataCollection to +// service type ResourceDataCollection. +func newResourceDataCollection(vres resourceviews.ResourceDataCollectionView) ResourceDataCollection { + res := make(ResourceDataCollection, len(vres)) for i, n := range vres { - res[i] = newResource(n) + res[i] = newResourceData(n) } return res } -// newResourceCollectionViewInfo projects result type ResourceCollection to -// projected type ResourceCollectionView using the "info" view. -func newResourceCollectionViewInfo(res ResourceCollection) resourceviews.ResourceCollectionView { - vres := make(resourceviews.ResourceCollectionView, len(res)) +// newResourceDataCollectionViewInfo projects result type +// ResourceDataCollection to projected type ResourceDataCollectionView using +// the "info" view. +func newResourceDataCollectionViewInfo(res ResourceDataCollection) resourceviews.ResourceDataCollectionView { + vres := make(resourceviews.ResourceDataCollectionView, len(res)) for i, n := range res { - vres[i] = newResourceViewInfo(n) + vres[i] = newResourceDataViewInfo(n) } return vres } -// newResourceCollectionViewWithoutVersion projects result type -// ResourceCollection to projected type ResourceCollectionView using the -// "withoutVersion" view. -func newResourceCollectionViewWithoutVersion(res ResourceCollection) resourceviews.ResourceCollectionView { - vres := make(resourceviews.ResourceCollectionView, len(res)) +// newResourceDataCollectionViewWithoutVersion projects result type +// ResourceDataCollection to projected type ResourceDataCollectionView using +// the "withoutVersion" view. +func newResourceDataCollectionViewWithoutVersion(res ResourceDataCollection) resourceviews.ResourceDataCollectionView { + vres := make(resourceviews.ResourceDataCollectionView, len(res)) for i, n := range res { - vres[i] = newResourceViewWithoutVersion(n) + vres[i] = newResourceDataViewWithoutVersion(n) } return vres } -// newResourceCollectionView projects result type ResourceCollection to -// projected type ResourceCollectionView using the "default" view. -func newResourceCollectionView(res ResourceCollection) resourceviews.ResourceCollectionView { - vres := make(resourceviews.ResourceCollectionView, len(res)) +// newResourceDataCollectionView projects result type ResourceDataCollection to +// projected type ResourceDataCollectionView using the "default" view. +func newResourceDataCollectionView(res ResourceDataCollection) resourceviews.ResourceDataCollectionView { + vres := make(resourceviews.ResourceDataCollectionView, len(res)) for i, n := range res { - vres[i] = newResourceView(n) + vres[i] = newResourceDataView(n) } return vres } -// newResourceInfo converts projected type Resource to service type Resource. -func newResourceInfo(vres *resourceviews.ResourceView) *Resource { - res := &Resource{} +// newResourceDataInfo converts projected type ResourceData to service type +// ResourceData. +func newResourceDataInfo(vres *resourceviews.ResourceDataView) *ResourceData { + res := &ResourceData{} if vres.ID != nil { res.ID = *vres.ID } @@ -405,15 +382,15 @@ func newResourceInfo(vres *resourceviews.ResourceView) *Resource { } } if vres.LatestVersion != nil { - res.LatestVersion = newVersion(vres.LatestVersion) + res.LatestVersion = newResourceVersionData(vres.LatestVersion) } return res } -// newResourceWithoutVersion converts projected type Resource to service type -// Resource. -func newResourceWithoutVersion(vres *resourceviews.ResourceView) *Resource { - res := &Resource{} +// newResourceDataWithoutVersion converts projected type ResourceData to +// service type ResourceData. +func newResourceDataWithoutVersion(vres *resourceviews.ResourceDataView) *ResourceData { + res := &ResourceData{} if vres.ID != nil { res.ID = *vres.ID } @@ -436,14 +413,15 @@ func newResourceWithoutVersion(vres *resourceviews.ResourceView) *Resource { } } if vres.LatestVersion != nil { - res.LatestVersion = newVersionWithoutResource(vres.LatestVersion) + res.LatestVersion = newResourceVersionDataWithoutResource(vres.LatestVersion) } return res } -// newResource converts projected type Resource to service type Resource. -func newResource(vres *resourceviews.ResourceView) *Resource { - res := &Resource{} +// newResourceData converts projected type ResourceData to service type +// ResourceData. +func newResourceData(vres *resourceviews.ResourceDataView) *ResourceData { + res := &ResourceData{} if vres.ID != nil { res.ID = *vres.ID } @@ -466,21 +444,21 @@ func newResource(vres *resourceviews.ResourceView) *Resource { } } if vres.Versions != nil { - res.Versions = make([]*Version, len(vres.Versions)) + res.Versions = make([]*ResourceVersionData, len(vres.Versions)) for i, val := range vres.Versions { - res.Versions[i] = transformResourceviewsVersionViewToVersion(val) + res.Versions[i] = transformResourceviewsResourceVersionDataViewToResourceVersionData(val) } } if vres.LatestVersion != nil { - res.LatestVersion = newVersionWithoutResource(vres.LatestVersion) + res.LatestVersion = newResourceVersionDataWithoutResource(vres.LatestVersion) } return res } -// newResourceViewInfo projects result type Resource to projected type -// ResourceView using the "info" view. -func newResourceViewInfo(res *Resource) *resourceviews.ResourceView { - vres := &resourceviews.ResourceView{ +// newResourceDataViewInfo projects result type ResourceData to projected type +// ResourceDataView using the "info" view. +func newResourceDataViewInfo(res *ResourceData) *resourceviews.ResourceDataView { + vres := &resourceviews.ResourceDataView{ ID: &res.ID, Name: &res.Name, Kind: &res.Kind, @@ -498,10 +476,10 @@ func newResourceViewInfo(res *Resource) *resourceviews.ResourceView { return vres } -// newResourceViewWithoutVersion projects result type Resource to projected -// type ResourceView using the "withoutVersion" view. -func newResourceViewWithoutVersion(res *Resource) *resourceviews.ResourceView { - vres := &resourceviews.ResourceView{ +// newResourceDataViewWithoutVersion projects result type ResourceData to +// projected type ResourceDataView using the "withoutVersion" view. +func newResourceDataViewWithoutVersion(res *ResourceData) *resourceviews.ResourceDataView { + vres := &resourceviews.ResourceDataView{ ID: &res.ID, Name: &res.Name, Kind: &res.Kind, @@ -517,15 +495,15 @@ func newResourceViewWithoutVersion(res *Resource) *resourceviews.ResourceView { } } if res.LatestVersion != nil { - vres.LatestVersion = newVersionViewWithoutResource(res.LatestVersion) + vres.LatestVersion = newResourceVersionDataViewWithoutResource(res.LatestVersion) } return vres } -// newResourceView projects result type Resource to projected type ResourceView -// using the "default" view. -func newResourceView(res *Resource) *resourceviews.ResourceView { - vres := &resourceviews.ResourceView{ +// newResourceDataView projects result type ResourceData to projected type +// ResourceDataView using the "default" view. +func newResourceDataView(res *ResourceData) *resourceviews.ResourceDataView { + vres := &resourceviews.ResourceDataView{ ID: &res.ID, Name: &res.Name, Kind: &res.Kind, @@ -541,20 +519,21 @@ func newResourceView(res *Resource) *resourceviews.ResourceView { } } if res.Versions != nil { - vres.Versions = make([]*resourceviews.VersionView, len(res.Versions)) + vres.Versions = make([]*resourceviews.ResourceVersionDataView, len(res.Versions)) for i, val := range res.Versions { - vres.Versions[i] = transformVersionToResourceviewsVersionView(val) + vres.Versions[i] = transformResourceVersionDataToResourceviewsResourceVersionDataView(val) } } if res.LatestVersion != nil { - vres.LatestVersion = newVersionViewWithoutResource(res.LatestVersion) + vres.LatestVersion = newResourceVersionDataViewWithoutResource(res.LatestVersion) } return vres } -// newVersionTiny converts projected type Version to service type Version. -func newVersionTiny(vres *resourceviews.VersionView) *Version { - res := &Version{} +// newResourceVersionDataTiny converts projected type ResourceVersionData to +// service type ResourceVersionData. +func newResourceVersionDataTiny(vres *resourceviews.ResourceVersionDataView) *ResourceVersionData { + res := &ResourceVersionData{} if vres.ID != nil { res.ID = *vres.ID } @@ -562,14 +541,15 @@ func newVersionTiny(vres *resourceviews.VersionView) *Version { res.Version = *vres.Version } if vres.Resource != nil { - res.Resource = newResource(vres.Resource) + res.Resource = newResourceData(vres.Resource) } return res } -// newVersionMin converts projected type Version to service type Version. -func newVersionMin(vres *resourceviews.VersionView) *Version { - res := &Version{} +// newResourceVersionDataMin converts projected type ResourceVersionData to +// service type ResourceVersionData. +func newResourceVersionDataMin(vres *resourceviews.ResourceVersionDataView) *ResourceVersionData { + res := &ResourceVersionData{} if vres.ID != nil { res.ID = *vres.ID } @@ -583,15 +563,15 @@ func newVersionMin(vres *resourceviews.VersionView) *Version { res.WebURL = *vres.WebURL } if vres.Resource != nil { - res.Resource = newResource(vres.Resource) + res.Resource = newResourceData(vres.Resource) } return res } -// newVersionWithoutResource converts projected type Version to service type -// Version. -func newVersionWithoutResource(vres *resourceviews.VersionView) *Version { - res := &Version{} +// newResourceVersionDataWithoutResource converts projected type +// ResourceVersionData to service type ResourceVersionData. +func newResourceVersionDataWithoutResource(vres *resourceviews.ResourceVersionDataView) *ResourceVersionData { + res := &ResourceVersionData{} if vres.ID != nil { res.ID = *vres.ID } @@ -617,14 +597,15 @@ func newVersionWithoutResource(vres *resourceviews.VersionView) *Version { res.UpdatedAt = *vres.UpdatedAt } if vres.Resource != nil { - res.Resource = newResource(vres.Resource) + res.Resource = newResourceData(vres.Resource) } return res } -// newVersion converts projected type Version to service type Version. -func newVersion(vres *resourceviews.VersionView) *Version { - res := &Version{} +// newResourceVersionData converts projected type ResourceVersionData to +// service type ResourceVersionData. +func newResourceVersionData(vres *resourceviews.ResourceVersionDataView) *ResourceVersionData { + res := &ResourceVersionData{} if vres.ID != nil { res.ID = *vres.ID } @@ -650,25 +631,25 @@ func newVersion(vres *resourceviews.VersionView) *Version { res.UpdatedAt = *vres.UpdatedAt } if vres.Resource != nil { - res.Resource = newResourceInfo(vres.Resource) + res.Resource = newResourceDataInfo(vres.Resource) } return res } -// newVersionViewTiny projects result type Version to projected type -// VersionView using the "tiny" view. -func newVersionViewTiny(res *Version) *resourceviews.VersionView { - vres := &resourceviews.VersionView{ +// newResourceVersionDataViewTiny projects result type ResourceVersionData to +// projected type ResourceVersionDataView using the "tiny" view. +func newResourceVersionDataViewTiny(res *ResourceVersionData) *resourceviews.ResourceVersionDataView { + vres := &resourceviews.ResourceVersionDataView{ ID: &res.ID, Version: &res.Version, } return vres } -// newVersionViewMin projects result type Version to projected type VersionView -// using the "min" view. -func newVersionViewMin(res *Version) *resourceviews.VersionView { - vres := &resourceviews.VersionView{ +// newResourceVersionDataViewMin projects result type ResourceVersionData to +// projected type ResourceVersionDataView using the "min" view. +func newResourceVersionDataViewMin(res *ResourceVersionData) *resourceviews.ResourceVersionDataView { + vres := &resourceviews.ResourceVersionDataView{ ID: &res.ID, Version: &res.Version, RawURL: &res.RawURL, @@ -677,10 +658,11 @@ func newVersionViewMin(res *Version) *resourceviews.VersionView { return vres } -// newVersionViewWithoutResource projects result type Version to projected type -// VersionView using the "withoutResource" view. -func newVersionViewWithoutResource(res *Version) *resourceviews.VersionView { - vres := &resourceviews.VersionView{ +// newResourceVersionDataViewWithoutResource projects result type +// ResourceVersionData to projected type ResourceVersionDataView using the +// "withoutResource" view. +func newResourceVersionDataViewWithoutResource(res *ResourceVersionData) *resourceviews.ResourceVersionDataView { + vres := &resourceviews.ResourceVersionDataView{ ID: &res.ID, Version: &res.Version, DisplayName: &res.DisplayName, @@ -693,10 +675,10 @@ func newVersionViewWithoutResource(res *Version) *resourceviews.VersionView { return vres } -// newVersionView projects result type Version to projected type VersionView -// using the "default" view. -func newVersionView(res *Version) *resourceviews.VersionView { - vres := &resourceviews.VersionView{ +// newResourceVersionDataView projects result type ResourceVersionData to +// projected type ResourceVersionDataView using the "default" view. +func newResourceVersionDataView(res *ResourceVersionData) *resourceviews.ResourceVersionDataView { + vres := &resourceviews.ResourceVersionDataView{ ID: &res.ID, Version: &res.Version, DisplayName: &res.DisplayName, @@ -707,7 +689,27 @@ func newVersionView(res *Version) *resourceviews.VersionView { UpdatedAt: &res.UpdatedAt, } if res.Resource != nil { - vres.Resource = newResourceViewInfo(res.Resource) + vres.Resource = newResourceDataViewInfo(res.Resource) + } + return vres +} + +// newResourceVersions converts projected type ResourceVersions to service type +// ResourceVersions. +func newResourceVersions(vres *resourceviews.ResourceVersionsView) *ResourceVersions { + res := &ResourceVersions{} + if vres.Data != nil { + res.Data = newVersions(vres.Data) + } + return res +} + +// newResourceVersionsView projects result type ResourceVersions to projected +// type ResourceVersionsView using the "default" view. +func newResourceVersionsView(res *ResourceVersions) *resourceviews.ResourceVersionsView { + vres := &resourceviews.ResourceVersionsView{} + if res.Data != nil { + vres.Data = newVersionsView(res.Data) } return vres } @@ -716,13 +718,13 @@ func newVersionView(res *Version) *resourceviews.VersionView { func newVersions(vres *resourceviews.VersionsView) *Versions { res := &Versions{} if vres.Versions != nil { - res.Versions = make([]*Version, len(vres.Versions)) + res.Versions = make([]*ResourceVersionData, len(vres.Versions)) for i, val := range vres.Versions { - res.Versions[i] = transformResourceviewsVersionViewToVersion(val) + res.Versions[i] = transformResourceviewsResourceVersionDataViewToResourceVersionData(val) } } if vres.Latest != nil { - res.Latest = newVersionMin(vres.Latest) + res.Latest = newResourceVersionDataMin(vres.Latest) } return res } @@ -732,13 +734,52 @@ func newVersions(vres *resourceviews.VersionsView) *Versions { func newVersionsView(res *Versions) *resourceviews.VersionsView { vres := &resourceviews.VersionsView{} if res.Versions != nil { - vres.Versions = make([]*resourceviews.VersionView, len(res.Versions)) + vres.Versions = make([]*resourceviews.ResourceVersionDataView, len(res.Versions)) for i, val := range res.Versions { - vres.Versions[i] = transformVersionToResourceviewsVersionView(val) + vres.Versions[i] = transformResourceVersionDataToResourceviewsResourceVersionDataView(val) } } if res.Latest != nil { - vres.Latest = newVersionViewMin(res.Latest) + vres.Latest = newResourceVersionDataViewMin(res.Latest) + } + return vres +} + +// newResourceVersion converts projected type ResourceVersion to service type +// ResourceVersion. +func newResourceVersion(vres *resourceviews.ResourceVersionView) *ResourceVersion { + res := &ResourceVersion{} + if vres.Data != nil { + res.Data = newResourceVersionData(vres.Data) + } + return res +} + +// newResourceVersionView projects result type ResourceVersion to projected +// type ResourceVersionView using the "default" view. +func newResourceVersionView(res *ResourceVersion) *resourceviews.ResourceVersionView { + vres := &resourceviews.ResourceVersionView{} + if res.Data != nil { + vres.Data = newResourceVersionDataView(res.Data) + } + return vres +} + +// newResource converts projected type Resource to service type Resource. +func newResource(vres *resourceviews.ResourceView) *Resource { + res := &Resource{} + if vres.Data != nil { + res.Data = newResourceData(vres.Data) + } + return res +} + +// newResourceView projects result type Resource to projected type ResourceView +// using the "default" view. +func newResourceView(res *Resource) *resourceviews.ResourceView { + vres := &resourceviews.ResourceView{} + if res.Data != nil { + vres.Data = newResourceDataView(res.Data) } return vres } @@ -772,13 +813,14 @@ func transformResourceviewsTagViewToTag(v *resourceviews.TagView) *Tag { return res } -// transformResourceviewsVersionViewToVersion builds a value of type *Version -// from a value of type *resourceviews.VersionView. -func transformResourceviewsVersionViewToVersion(v *resourceviews.VersionView) *Version { +// transformResourceviewsResourceVersionDataViewToResourceVersionData builds a +// value of type *ResourceVersionData from a value of type +// *resourceviews.ResourceVersionDataView. +func transformResourceviewsResourceVersionDataViewToResourceVersionData(v *resourceviews.ResourceVersionDataView) *ResourceVersionData { if v == nil { return nil } - res := &Version{ + res := &ResourceVersionData{ ID: *v.ID, Version: *v.Version, DisplayName: *v.DisplayName, @@ -789,16 +831,16 @@ func transformResourceviewsVersionViewToVersion(v *resourceviews.VersionView) *V UpdatedAt: *v.UpdatedAt, } if v.Resource != nil { - res.Resource = transformResourceviewsResourceViewToResource(v.Resource) + res.Resource = transformResourceviewsResourceDataViewToResourceData(v.Resource) } return res } -// transformResourceviewsResourceViewToResource builds a value of type -// *Resource from a value of type *resourceviews.ResourceView. -func transformResourceviewsResourceViewToResource(v *resourceviews.ResourceView) *Resource { - res := &Resource{} +// transformResourceviewsResourceDataViewToResourceData builds a value of type +// *ResourceData from a value of type *resourceviews.ResourceDataView. +func transformResourceviewsResourceDataViewToResourceData(v *resourceviews.ResourceDataView) *ResourceData { + res := &ResourceData{} if v.ID != nil { res.ID = *v.ID } @@ -821,9 +863,9 @@ func transformResourceviewsResourceViewToResource(v *resourceviews.ResourceView) } } if v.Versions != nil { - res.Versions = make([]*Version, len(v.Versions)) + res.Versions = make([]*ResourceVersionData, len(v.Versions)) for i, val := range v.Versions { - res.Versions[i] = transformResourceviewsVersionViewToVersion(val) + res.Versions[i] = transformResourceviewsResourceVersionDataViewToResourceVersionData(val) } } @@ -853,10 +895,11 @@ func transformTagToResourceviewsTagView(v *Tag) *resourceviews.TagView { return res } -// transformVersionToResourceviewsVersionView builds a value of type -// *resourceviews.VersionView from a value of type *Version. -func transformVersionToResourceviewsVersionView(v *Version) *resourceviews.VersionView { - res := &resourceviews.VersionView{ +// transformResourceVersionDataToResourceviewsResourceVersionDataView builds a +// value of type *resourceviews.ResourceVersionDataView from a value of type +// *ResourceVersionData. +func transformResourceVersionDataToResourceviewsResourceVersionDataView(v *ResourceVersionData) *resourceviews.ResourceVersionDataView { + res := &resourceviews.ResourceVersionDataView{ ID: &v.ID, Version: &v.Version, DisplayName: &v.DisplayName, @@ -867,16 +910,16 @@ func transformVersionToResourceviewsVersionView(v *Version) *resourceviews.Versi UpdatedAt: &v.UpdatedAt, } if v.Resource != nil { - res.Resource = transformResourceToResourceviewsResourceView(v.Resource) + res.Resource = transformResourceDataToResourceviewsResourceDataView(v.Resource) } return res } -// transformResourceToResourceviewsResourceView builds a value of type -// *resourceviews.ResourceView from a value of type *Resource. -func transformResourceToResourceviewsResourceView(v *Resource) *resourceviews.ResourceView { - res := &resourceviews.ResourceView{ +// transformResourceDataToResourceviewsResourceDataView builds a value of type +// *resourceviews.ResourceDataView from a value of type *ResourceData. +func transformResourceDataToResourceviewsResourceDataView(v *ResourceData) *resourceviews.ResourceDataView { + res := &resourceviews.ResourceDataView{ ID: &v.ID, Name: &v.Name, Kind: &v.Kind, @@ -892,9 +935,9 @@ func transformResourceToResourceviewsResourceView(v *Resource) *resourceviews.Re } } if v.Versions != nil { - res.Versions = make([]*resourceviews.VersionView, len(v.Versions)) + res.Versions = make([]*resourceviews.ResourceVersionDataView, len(v.Versions)) for i, val := range v.Versions { - res.Versions[i] = transformVersionToResourceviewsVersionView(val) + res.Versions[i] = transformResourceVersionDataToResourceviewsResourceVersionDataView(val) } } diff --git a/vendor/github.com/tektoncd/hub/api/gen/resource/views/view.go b/vendor/github.com/tektoncd/hub/api/gen/resource/views/view.go index da74d8b3fb..376e69148e 100644 --- a/vendor/github.com/tektoncd/hub/api/gen/resource/views/view.go +++ b/vendor/github.com/tektoncd/hub/api/gen/resource/views/view.go @@ -11,27 +11,26 @@ import ( goa "goa.design/goa/v3/pkg" ) -// ResourceCollection is the viewed result type that is projected based on a -// view. -type ResourceCollection struct { +// Resources is the viewed result type that is projected based on a view. +type Resources struct { // Type to project - Projected ResourceCollectionView + Projected *ResourcesView // View to render View string } -// Versions is the viewed result type that is projected based on a view. -type Versions struct { +// ResourceVersions is the viewed result type that is projected based on a view. +type ResourceVersions struct { // Type to project - Projected *VersionsView + Projected *ResourceVersionsView // View to render View string } -// Version is the viewed result type that is projected based on a view. -type Version struct { +// ResourceVersion is the viewed result type that is projected based on a view. +type ResourceVersion struct { // Type to project - Projected *VersionView + Projected *ResourceVersionView // View to render View string } @@ -44,11 +43,17 @@ type Resource struct { View string } -// ResourceCollectionView is a type that runs validations on a projected type. -type ResourceCollectionView []*ResourceView +// ResourcesView is a type that runs validations on a projected type. +type ResourcesView struct { + Data ResourceDataCollectionView +} -// ResourceView is a type that runs validations on a projected type. -type ResourceView struct { +// ResourceDataCollectionView is a type that runs validations on a projected +// type. +type ResourceDataCollectionView []*ResourceDataView + +// ResourceDataView is a type that runs validations on a projected type. +type ResourceDataView struct { // ID is the unique id of the resource ID *uint // Name of resource @@ -58,13 +63,13 @@ type ResourceView struct { // Kind of resource Kind *string // Latest version of resource - LatestVersion *VersionView + LatestVersion *ResourceVersionDataView // Tags related to resource Tags []*TagView // Rating of resource Rating *float64 // List of all versions of a resource - Versions []*VersionView + Versions []*ResourceVersionDataView } // CatalogView is a type that runs validations on a projected type. @@ -77,8 +82,8 @@ type CatalogView struct { Type *string } -// VersionView is a type that runs validations on a projected type. -type VersionView struct { +// ResourceVersionDataView is a type that runs validations on a projected type. +type ResourceVersionDataView struct { // ID is the unique id of resource's version ID *uint // Version of resource @@ -96,7 +101,7 @@ type VersionView struct { // Timestamp when version was last updated UpdatedAt *string // Resource to which the version belongs - Resource *ResourceView + Resource *ResourceDataView } // TagView is a type that runs validations on a projected type. @@ -107,18 +112,61 @@ type TagView struct { Name *string } +// ResourceVersionsView is a type that runs validations on a projected type. +type ResourceVersionsView struct { + Data *VersionsView +} + // VersionsView is a type that runs validations on a projected type. type VersionsView struct { // Latest Version of resource - Latest *VersionView + Latest *ResourceVersionDataView // List of all versions of resource - Versions []*VersionView + Versions []*ResourceVersionDataView +} + +// ResourceVersionView is a type that runs validations on a projected type. +type ResourceVersionView struct { + Data *ResourceVersionDataView +} + +// ResourceView is a type that runs validations on a projected type. +type ResourceView struct { + Data *ResourceDataView } var ( - // ResourceCollectionMap is a map of attribute names in result type - // ResourceCollection indexed by view name. - ResourceCollectionMap = map[string][]string{ + // ResourcesMap is a map of attribute names in result type Resources indexed by + // view name. + ResourcesMap = map[string][]string{ + "default": []string{ + "data", + }, + } + // ResourceVersionsMap is a map of attribute names in result type + // ResourceVersions indexed by view name. + ResourceVersionsMap = map[string][]string{ + "default": []string{ + "data", + }, + } + // ResourceVersionMap is a map of attribute names in result type + // ResourceVersion indexed by view name. + ResourceVersionMap = map[string][]string{ + "default": []string{ + "data", + }, + } + // ResourceMap is a map of attribute names in result type Resource indexed by + // view name. + ResourceMap = map[string][]string{ + "default": []string{ + "data", + }, + } + // ResourceDataCollectionMap is a map of attribute names in result type + // ResourceDataCollection indexed by view name. + ResourceDataCollectionMap = map[string][]string{ "info": []string{ "id", "name", @@ -147,17 +195,40 @@ var ( "versions", }, } - // VersionsMap is a map of attribute names in result type Versions indexed by - // view name. - VersionsMap = map[string][]string{ + // ResourceDataMap is a map of attribute names in result type ResourceData + // indexed by view name. + ResourceDataMap = map[string][]string{ + "info": []string{ + "id", + "name", + "catalog", + "kind", + "tags", + "rating", + }, + "withoutVersion": []string{ + "id", + "name", + "catalog", + "kind", + "latestVersion", + "tags", + "rating", + }, "default": []string{ - "latest", + "id", + "name", + "catalog", + "kind", + "latestVersion", + "tags", + "rating", "versions", }, } - // VersionMap is a map of attribute names in result type Version indexed by - // view name. - VersionMap = map[string][]string{ + // ResourceVersionDataMap is a map of attribute names in result type + // ResourceVersionData indexed by view name. + ResourceVersionDataMap = map[string][]string{ "tiny": []string{ "id", "version", @@ -190,81 +261,48 @@ var ( "resource", }, } - // ResourceMap is a map of attribute names in result type Resource indexed by + // VersionsMap is a map of attribute names in result type Versions indexed by // view name. - ResourceMap = map[string][]string{ - "info": []string{ - "id", - "name", - "catalog", - "kind", - "tags", - "rating", - }, - "withoutVersion": []string{ - "id", - "name", - "catalog", - "kind", - "latestVersion", - "tags", - "rating", - }, + VersionsMap = map[string][]string{ "default": []string{ - "id", - "name", - "catalog", - "kind", - "latestVersion", - "tags", - "rating", + "latest", "versions", }, } ) -// ValidateResourceCollection runs the validations defined on the viewed result -// type ResourceCollection. -func ValidateResourceCollection(result ResourceCollection) (err error) { +// ValidateResources runs the validations defined on the viewed result type +// Resources. +func ValidateResources(result *Resources) (err error) { switch result.View { - case "info": - err = ValidateResourceCollectionViewInfo(result.Projected) - case "withoutVersion": - err = ValidateResourceCollectionViewWithoutVersion(result.Projected) case "default", "": - err = ValidateResourceCollectionView(result.Projected) + err = ValidateResourcesView(result.Projected) default: - err = goa.InvalidEnumValueError("view", result.View, []interface{}{"info", "withoutVersion", "default"}) + err = goa.InvalidEnumValueError("view", result.View, []interface{}{"default"}) } return } -// ValidateVersions runs the validations defined on the viewed result type -// Versions. -func ValidateVersions(result *Versions) (err error) { +// ValidateResourceVersions runs the validations defined on the viewed result +// type ResourceVersions. +func ValidateResourceVersions(result *ResourceVersions) (err error) { switch result.View { case "default", "": - err = ValidateVersionsView(result.Projected) + err = ValidateResourceVersionsView(result.Projected) default: err = goa.InvalidEnumValueError("view", result.View, []interface{}{"default"}) } return } -// ValidateVersion runs the validations defined on the viewed result type -// Version. -func ValidateVersion(result *Version) (err error) { +// ValidateResourceVersion runs the validations defined on the viewed result +// type ResourceVersion. +func ValidateResourceVersion(result *ResourceVersion) (err error) { switch result.View { - case "tiny": - err = ValidateVersionViewTiny(result.Projected) - case "min": - err = ValidateVersionViewMin(result.Projected) - case "withoutResource": - err = ValidateVersionViewWithoutResource(result.Projected) case "default", "": - err = ValidateVersionView(result.Projected) + err = ValidateResourceVersionView(result.Projected) default: - err = goa.InvalidEnumValueError("view", result.View, []interface{}{"tiny", "min", "withoutResource", "default"}) + err = goa.InvalidEnumValueError("view", result.View, []interface{}{"default"}) } return } @@ -273,54 +311,62 @@ func ValidateVersion(result *Version) (err error) { // Resource. func ValidateResource(result *Resource) (err error) { switch result.View { - case "info": - err = ValidateResourceViewInfo(result.Projected) - case "withoutVersion": - err = ValidateResourceViewWithoutVersion(result.Projected) case "default", "": err = ValidateResourceView(result.Projected) default: - err = goa.InvalidEnumValueError("view", result.View, []interface{}{"info", "withoutVersion", "default"}) + err = goa.InvalidEnumValueError("view", result.View, []interface{}{"default"}) + } + return +} + +// ValidateResourcesView runs the validations defined on ResourcesView using +// the "default" view. +func ValidateResourcesView(result *ResourcesView) (err error) { + + if result.Data != nil { + if err2 := ValidateResourceDataCollectionViewWithoutVersion(result.Data); err2 != nil { + err = goa.MergeErrors(err, err2) + } } return } -// ValidateResourceCollectionViewInfo runs the validations defined on -// ResourceCollectionView using the "info" view. -func ValidateResourceCollectionViewInfo(result ResourceCollectionView) (err error) { +// ValidateResourceDataCollectionViewInfo runs the validations defined on +// ResourceDataCollectionView using the "info" view. +func ValidateResourceDataCollectionViewInfo(result ResourceDataCollectionView) (err error) { for _, item := range result { - if err2 := ValidateResourceViewInfo(item); err2 != nil { + if err2 := ValidateResourceDataViewInfo(item); err2 != nil { err = goa.MergeErrors(err, err2) } } return } -// ValidateResourceCollectionViewWithoutVersion runs the validations defined on -// ResourceCollectionView using the "withoutVersion" view. -func ValidateResourceCollectionViewWithoutVersion(result ResourceCollectionView) (err error) { +// ValidateResourceDataCollectionViewWithoutVersion runs the validations +// defined on ResourceDataCollectionView using the "withoutVersion" view. +func ValidateResourceDataCollectionViewWithoutVersion(result ResourceDataCollectionView) (err error) { for _, item := range result { - if err2 := ValidateResourceViewWithoutVersion(item); err2 != nil { + if err2 := ValidateResourceDataViewWithoutVersion(item); err2 != nil { err = goa.MergeErrors(err, err2) } } return } -// ValidateResourceCollectionView runs the validations defined on -// ResourceCollectionView using the "default" view. -func ValidateResourceCollectionView(result ResourceCollectionView) (err error) { +// ValidateResourceDataCollectionView runs the validations defined on +// ResourceDataCollectionView using the "default" view. +func ValidateResourceDataCollectionView(result ResourceDataCollectionView) (err error) { for _, item := range result { - if err2 := ValidateResourceView(item); err2 != nil { + if err2 := ValidateResourceDataView(item); err2 != nil { err = goa.MergeErrors(err, err2) } } return } -// ValidateResourceViewInfo runs the validations defined on ResourceView using -// the "info" view. -func ValidateResourceViewInfo(result *ResourceView) (err error) { +// ValidateResourceDataViewInfo runs the validations defined on +// ResourceDataView using the "info" view. +func ValidateResourceDataViewInfo(result *ResourceDataView) (err error) { if result.ID == nil { err = goa.MergeErrors(err, goa.MissingFieldError("id", "result")) } @@ -354,9 +400,9 @@ func ValidateResourceViewInfo(result *ResourceView) (err error) { return } -// ValidateResourceViewWithoutVersion runs the validations defined on -// ResourceView using the "withoutVersion" view. -func ValidateResourceViewWithoutVersion(result *ResourceView) (err error) { +// ValidateResourceDataViewWithoutVersion runs the validations defined on +// ResourceDataView using the "withoutVersion" view. +func ValidateResourceDataViewWithoutVersion(result *ResourceDataView) (err error) { if result.ID == nil { err = goa.MergeErrors(err, goa.MissingFieldError("id", "result")) } @@ -388,16 +434,16 @@ func ValidateResourceViewWithoutVersion(result *ResourceView) (err error) { } } if result.LatestVersion != nil { - if err2 := ValidateVersionViewWithoutResource(result.LatestVersion); err2 != nil { + if err2 := ValidateResourceVersionDataViewWithoutResource(result.LatestVersion); err2 != nil { err = goa.MergeErrors(err, err2) } } return } -// ValidateResourceView runs the validations defined on ResourceView using the -// "default" view. -func ValidateResourceView(result *ResourceView) (err error) { +// ValidateResourceDataView runs the validations defined on ResourceDataView +// using the "default" view. +func ValidateResourceDataView(result *ResourceDataView) (err error) { if result.ID == nil { err = goa.MergeErrors(err, goa.MissingFieldError("id", "result")) } @@ -433,13 +479,13 @@ func ValidateResourceView(result *ResourceView) (err error) { } for _, e := range result.Versions { if e != nil { - if err2 := ValidateVersionView(e); err2 != nil { + if err2 := ValidateResourceVersionDataView(e); err2 != nil { err = goa.MergeErrors(err, err2) } } } if result.LatestVersion != nil { - if err2 := ValidateVersionViewWithoutResource(result.LatestVersion); err2 != nil { + if err2 := ValidateResourceVersionDataViewWithoutResource(result.LatestVersion); err2 != nil { err = goa.MergeErrors(err, err2) } } @@ -465,9 +511,9 @@ func ValidateCatalogView(result *CatalogView) (err error) { return } -// ValidateVersionViewTiny runs the validations defined on VersionView using -// the "tiny" view. -func ValidateVersionViewTiny(result *VersionView) (err error) { +// ValidateResourceVersionDataViewTiny runs the validations defined on +// ResourceVersionDataView using the "tiny" view. +func ValidateResourceVersionDataViewTiny(result *ResourceVersionDataView) (err error) { if result.ID == nil { err = goa.MergeErrors(err, goa.MissingFieldError("id", "result")) } @@ -477,9 +523,9 @@ func ValidateVersionViewTiny(result *VersionView) (err error) { return } -// ValidateVersionViewMin runs the validations defined on VersionView using the -// "min" view. -func ValidateVersionViewMin(result *VersionView) (err error) { +// ValidateResourceVersionDataViewMin runs the validations defined on +// ResourceVersionDataView using the "min" view. +func ValidateResourceVersionDataViewMin(result *ResourceVersionDataView) (err error) { if result.ID == nil { err = goa.MergeErrors(err, goa.MissingFieldError("id", "result")) } @@ -501,9 +547,9 @@ func ValidateVersionViewMin(result *VersionView) (err error) { return } -// ValidateVersionViewWithoutResource runs the validations defined on -// VersionView using the "withoutResource" view. -func ValidateVersionViewWithoutResource(result *VersionView) (err error) { +// ValidateResourceVersionDataViewWithoutResource runs the validations defined +// on ResourceVersionDataView using the "withoutResource" view. +func ValidateResourceVersionDataViewWithoutResource(result *ResourceVersionDataView) (err error) { if result.ID == nil { err = goa.MergeErrors(err, goa.MissingFieldError("id", "result")) } @@ -540,9 +586,9 @@ func ValidateVersionViewWithoutResource(result *VersionView) (err error) { return } -// ValidateVersionView runs the validations defined on VersionView using the -// "default" view. -func ValidateVersionView(result *VersionView) (err error) { +// ValidateResourceVersionDataView runs the validations defined on +// ResourceVersionDataView using the "default" view. +func ValidateResourceVersionDataView(result *ResourceVersionDataView) (err error) { if result.ID == nil { err = goa.MergeErrors(err, goa.MissingFieldError("id", "result")) } @@ -577,7 +623,7 @@ func ValidateVersionView(result *VersionView) (err error) { err = goa.MergeErrors(err, goa.ValidateFormat("result.updatedAt", *result.UpdatedAt, goa.FormatDateTime)) } if result.Resource != nil { - if err2 := ValidateResourceViewInfo(result.Resource); err2 != nil { + if err2 := ValidateResourceDataViewInfo(result.Resource); err2 != nil { err = goa.MergeErrors(err, err2) } } @@ -595,6 +641,18 @@ func ValidateTagView(result *TagView) (err error) { return } +// ValidateResourceVersionsView runs the validations defined on +// ResourceVersionsView using the "default" view. +func ValidateResourceVersionsView(result *ResourceVersionsView) (err error) { + + if result.Data != nil { + if err2 := ValidateVersionsView(result.Data); err2 != nil { + err = goa.MergeErrors(err, err2) + } + } + return +} + // ValidateVersionsView runs the validations defined on VersionsView using the // "default" view. func ValidateVersionsView(result *VersionsView) (err error) { @@ -603,13 +661,37 @@ func ValidateVersionsView(result *VersionsView) (err error) { } for _, e := range result.Versions { if e != nil { - if err2 := ValidateVersionView(e); err2 != nil { + if err2 := ValidateResourceVersionDataView(e); err2 != nil { err = goa.MergeErrors(err, err2) } } } if result.Latest != nil { - if err2 := ValidateVersionViewMin(result.Latest); err2 != nil { + if err2 := ValidateResourceVersionDataViewMin(result.Latest); err2 != nil { + err = goa.MergeErrors(err, err2) + } + } + return +} + +// ValidateResourceVersionView runs the validations defined on +// ResourceVersionView using the "default" view. +func ValidateResourceVersionView(result *ResourceVersionView) (err error) { + + if result.Data != nil { + if err2 := ValidateResourceVersionDataView(result.Data); err2 != nil { + err = goa.MergeErrors(err, err2) + } + } + return +} + +// ValidateResourceView runs the validations defined on ResourceView using the +// "default" view. +func ValidateResourceView(result *ResourceView) (err error) { + + if result.Data != nil { + if err2 := ValidateResourceDataView(result.Data); err2 != nil { err = goa.MergeErrors(err, err2) } } diff --git a/vendor/github.com/tektoncd/hub/api/pkg/cli/cmd/get/get.go b/vendor/github.com/tektoncd/hub/api/pkg/cli/cmd/get/get.go index b0bbff5e28..f907a1365b 100644 --- a/vendor/github.com/tektoncd/hub/api/pkg/cli/cmd/get/get.go +++ b/vendor/github.com/tektoncd/hub/api/pkg/cli/cmd/get/get.go @@ -33,13 +33,13 @@ type options struct { } var cmdExamples string = ` -Get a %s of name 'foo': +Get a %S of name 'foo': tkn hub get %s foo or -Get a %s of name 'foo' of version '0.3': +Get a %S of name 'foo' of version '0.3': tkn hub get %s foo --version 0.3 ` @@ -75,7 +75,7 @@ func commandForKind(kind string, opts *options) *cobra.Command { return &cobra.Command{ Use: kind, - Short: "Get " + kind + " by name, catalog and version", + Short: "Get " + strings.Title(kind) + " by name, catalog and version", Long: ``, SilenceUsage: true, Example: examples(kind), @@ -119,5 +119,6 @@ func (opts *options) name() string { } func examples(kind string) string { - return strings.ReplaceAll(cmdExamples, "%s", kind) + replacer := strings.NewReplacer("%s", kind, "%S", strings.Title(kind)) + return replacer.Replace(cmdExamples) } diff --git a/vendor/github.com/tektoncd/hub/api/pkg/cli/formatter/field.go b/vendor/github.com/tektoncd/hub/api/pkg/cli/formatter/field.go index 0ee14869e4..f34d91ca41 100644 --- a/vendor/github.com/tektoncd/hub/api/pkg/cli/formatter/field.go +++ b/vendor/github.com/tektoncd/hub/api/pkg/cli/formatter/field.go @@ -38,7 +38,7 @@ func FormatDesc(desc string) string { } // FormatTags returns list of tags seperated by comma -func FormatTags(tags []*client.TagResponse) string { +func FormatTags(tags []*client.TagResponseBody) string { var sb strings.Builder if len(tags) == 0 { return "---" diff --git a/vendor/github.com/tektoncd/hub/api/pkg/cli/hub/get_resource.go b/vendor/github.com/tektoncd/hub/api/pkg/cli/hub/get_resource.go index f3aa0eda25..821a94371c 100644 --- a/vendor/github.com/tektoncd/hub/api/pkg/cli/hub/get_resource.go +++ b/vendor/github.com/tektoncd/hub/api/pkg/cli/hub/get_resource.go @@ -39,6 +39,13 @@ type ResourceResult struct { version string } +// resourceResponse is the response of API when finding a resource +type resourceResponse = rclient.ByCatalogKindNameResponseBody + +// resourceWithVersionResponse is the response of API when finding a resource +// with a specific version +type resourceWithVersionResponse = rclient.ByCatalogKindNameVersionResponseBody + // GetResource queries the data using Hub Endpoint func (h *client) GetResource(opt ResourceOption) ResourceResult { data, status, err := h.Get(opt.Endpoint()) @@ -62,33 +69,33 @@ func (opt ResourceOption) Endpoint() string { } // RawURL returns the raw url of the resource yaml file -func (gr *ResourceResult) RawURL() (string, error) { - if gr.err != nil { - return "", gr.err +func (rr *ResourceResult) RawURL() (string, error) { + if rr.err != nil { + return "", rr.err } - if gr.status == http.StatusNotFound { + if rr.status == http.StatusNotFound { return "", fmt.Errorf("No Resource Found") } - if gr.version != "" { - resVersion := rclient.VersionResponse{} - if err := json.Unmarshal(gr.data, &resVersion); err != nil { + if rr.version != "" { + res := resourceWithVersionResponse{} + if err := json.Unmarshal(rr.data, &res); err != nil { return "", err } - return *resVersion.RawURL, nil + return *res.Data.RawURL, nil } - res := rclient.ResourceResponse{} - if err := json.Unmarshal(gr.data, &res); err != nil { + res := resourceResponse{} + if err := json.Unmarshal(rr.data, &res); err != nil { return "", err } - return *res.LatestVersion.RawURL, nil + return *res.Data.LatestVersion.RawURL, nil } // Manifest gets the resource from catalog -func (gr *ResourceResult) Manifest() ([]byte, error) { - rawURL, err := gr.RawURL() +func (rr *ResourceResult) Manifest() ([]byte, error) { + rawURL, err := rr.RawURL() if err != nil { return nil, err } diff --git a/vendor/github.com/tektoncd/hub/api/pkg/cli/hub/search.go b/vendor/github.com/tektoncd/hub/api/pkg/cli/hub/search.go index 01e0972148..bc16703e20 100644 --- a/vendor/github.com/tektoncd/hub/api/pkg/cli/hub/search.go +++ b/vendor/github.com/tektoncd/hub/api/pkg/cli/hub/search.go @@ -32,8 +32,11 @@ type SearchOption struct { Limit uint } -// SearchResponse is the array of ResourceResponse -type SearchResponse = []rclient.ResourceResponse +// SearchResponse is the data object which is the search result +type SearchResponse = rclient.ResourceDataCollectionResponseBody + +// queryAPIResponse is the response from the API +type queryAPIResponse = rclient.QueryResponseBody // SearchResult defines API raw response, unmarshalled reponse, and error type SearchResult struct { @@ -62,12 +65,14 @@ func (sr *SearchResult) Typed() (SearchResponse, error) { if sr.resources != nil || sr.err != nil { return sr.resources, sr.err } - sr.resources = SearchResponse{} + res := &queryAPIResponse{} if sr.status == http.StatusNotFound { return sr.resources, sr.err } - sr.err = json.Unmarshal(sr.data, &sr.resources) + sr.err = json.Unmarshal(sr.data, res) + sr.resources = res.Data + return sr.resources, sr.err } diff --git a/vendor/modules.txt b/vendor/modules.txt index 344165b3a1..5aae158928 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -334,7 +334,7 @@ github.com/sirupsen/logrus github.com/spf13/cobra # github.com/spf13/pflag v1.0.5 github.com/spf13/pflag -# github.com/tektoncd/hub/api v0.0.0-20201021041518-f3b44fba7d18 +# github.com/tektoncd/hub/api v0.0.0-20201027094520-f56d79d14d70 github.com/tektoncd/hub/api/gen/http/resource/client github.com/tektoncd/hub/api/gen/resource github.com/tektoncd/hub/api/gen/resource/views