From 11dddf12218780d0fe2255cba773faee083851cc Mon Sep 17 00:00:00 2001 From: Tudor Macari Date: Thu, 27 Feb 2025 05:18:50 +0000 Subject: [PATCH] feat: [AH-349]: remove isLatest field (#3482) * feat: [AH-349]: fix lint issues * feat: [AH-349]: remove isLatest field --- .../controller/metadata/artifact_mapper.go | 107 +++--- .../metadata/get_artifacts_docker_details.go | 8 +- .../metadata/get_artifacts_helm_details.go | 5 +- .../metadata/get_artifacts_version_summary.go | 28 +- .../metadata/get_artifacts_versions.go | 8 +- registry/app/api/openapi/api.yaml | 10 - .../contracts/artifact/services.gen.go | 314 +++++++++--------- .../openapi/contracts/artifact/types.gen.go | 63 ++-- .../app/remote/controller/proxy/controller.go | 1 - registry/app/store/database.go | 34 +- registry/app/store/database/artifact.go | 69 ++-- registry/app/store/database/tag.go | 62 ++-- registry/types/artifact.go | 13 +- registry/types/tag.go | 21 +- 14 files changed, 339 insertions(+), 404 deletions(-) diff --git a/registry/app/api/controller/metadata/artifact_mapper.go b/registry/app/api/controller/metadata/artifact_mapper.go index 1faed9f13..e9c0f4fb9 100644 --- a/registry/app/api/controller/metadata/artifact_mapper.go +++ b/registry/app/api/controller/metadata/artifact_mapper.go @@ -56,8 +56,10 @@ func GetRegistryArtifactMetadata(artifacts []types.ArtifactMetadata) []artifacta return artifactMetadataList } -func GetMavenArtifactDetail(image *types.Image, artifact *types.Artifact, - metadata database.MavenMetadata) artifactapi.ArtifactDetail { +func GetMavenArtifactDetail( + image *types.Image, artifact *types.Artifact, + metadata database.MavenMetadata, +) artifactapi.ArtifactDetail { createdAt := GetTimeInMs(artifact.CreatedAt) modifiedAt := GetTimeInMs(artifact.UpdatedAt) var size int64 @@ -127,7 +129,6 @@ func toPackageType(packageTypeStr string) (artifactapi.PackageType, error) { func GetTagMetadata( ctx context.Context, tags *[]types.TagMetadata, - latestTag string, image string, registryURL string, ) []artifactapi.ArtifactVersionMetadata { @@ -136,7 +137,6 @@ func GetTagMetadata( modifiedAt := GetTimeInMs(tag.ModifiedAt) size := GetImageSize(tag.Size) digestCount := tag.DigestCount - isLatestVersion := latestTag == tag.Name command := GetPullCommand(image, tag.Name, string(tag.PackageType), registryURL) packageType, err := toPackageType(string(tag.PackageType)) downloadCount := tag.DownloadCount @@ -145,14 +145,13 @@ func GetTagMetadata( continue } artifactVersionMetadata := &artifactapi.ArtifactVersionMetadata{ - PackageType: &packageType, - Name: tag.Name, - Size: &size, - LastModified: &modifiedAt, - DigestCount: &digestCount, - IslatestVersion: &isLatestVersion, - PullCommand: &command, - DownloadsCount: &downloadCount, + PackageType: &packageType, + Name: tag.Name, + Size: &size, + LastModified: &modifiedAt, + DigestCount: &digestCount, + PullCommand: &command, + DownloadsCount: &downloadCount, } artifactVersionMetadataList = append(artifactVersionMetadataList, *artifactVersionMetadata) } @@ -216,7 +215,8 @@ func GetAllArtifactFilesResponse( } } -func GetArtifactFilesMetadata(metadata *[]types.FileNodeMetadata, +func GetArtifactFilesMetadata( + metadata *[]types.FileNodeMetadata, registryURL string, artifactName string, version string, @@ -307,7 +307,6 @@ func GetAllArtifactLabelsResponse( func GetAllArtifactVersionResponse( ctx context.Context, tags *[]types.TagMetadata, - latestTag string, image string, count int64, pageNumber int64, @@ -315,7 +314,7 @@ func GetAllArtifactVersionResponse( registryURL string, ) *artifactapi.ListArtifactVersionResponseJSONResponse { artifactVersionMetadataList := GetTagMetadata( - ctx, tags, latestTag, image, registryURL, + ctx, tags, image, registryURL, ) pageCount := GetPageCount(count, pageSize) listArtifactVersions := &artifactapi.ListArtifactVersion{ @@ -335,7 +334,6 @@ func GetAllArtifactVersionResponse( func GetNonOCIAllArtifactVersionResponse( ctx context.Context, artifacts *[]types.NonOCIArtifactMetadata, - latestTag string, image string, count int64, pageNumber int64, @@ -343,7 +341,7 @@ func GetNonOCIAllArtifactVersionResponse( registryURL string, ) *artifactapi.ListArtifactVersionResponseJSONResponse { artifactVersionMetadataList := GetNonOCIArtifactMetadata( - ctx, artifacts, latestTag, image, registryURL, + ctx, artifacts, image, registryURL, ) pageCount := GetPageCount(count, pageSize) listArtifactVersions := &artifactapi.ListArtifactVersion{ @@ -363,7 +361,6 @@ func GetNonOCIAllArtifactVersionResponse( func GetNonOCIArtifactMetadata( ctx context.Context, tags *[]types.NonOCIArtifactMetadata, - latestTag string, image string, registryURL string, ) []artifactapi.ArtifactVersionMetadata { @@ -371,7 +368,6 @@ func GetNonOCIArtifactMetadata( for _, tag := range *tags { modifiedAt := GetTimeInMs(tag.ModifiedAt) size := GetImageSize(tag.Size) - isLatestVersion := latestTag == tag.Name command := GetPullCommand(image, tag.Name, string(tag.PackageType), registryURL) packageType, err := toPackageType(string(tag.PackageType)) downloadCount := tag.DownloadCount @@ -381,14 +377,13 @@ func GetNonOCIArtifactMetadata( } fileCount := tag.FileCount artifactVersionMetadata := &artifactapi.ArtifactVersionMetadata{ - PackageType: &packageType, - FileCount: &fileCount, - Name: tag.Name, - Size: &size, - LastModified: &modifiedAt, - IslatestVersion: &isLatestVersion, - PullCommand: &command, - DownloadsCount: &downloadCount, + PackageType: &packageType, + FileCount: &fileCount, + Name: tag.Name, + Size: &size, + LastModified: &modifiedAt, + PullCommand: &command, + DownloadsCount: &downloadCount, } artifactVersionMetadataList = append(artifactVersionMetadataList, *artifactVersionMetadata) } @@ -399,7 +394,6 @@ func GetDockerArtifactDetails( registry *types.Registry, tag *types.TagDetail, manifest *types.Manifest, - isLatestTag bool, registryURL string, ) *artifactapi.DockerArtifactDetailResponseJSONResponse { repoPath := getRepoPath(registry.Name, tag.ImageName, manifest.Digest.String()) @@ -408,17 +402,16 @@ func GetDockerArtifactDetails( modifiedAt := GetTimeInMs(tag.UpdatedAt) size := GetSize(manifest.TotalSize) artifactDetail := &artifactapi.DockerArtifactDetail{ - ImageName: tag.ImageName, - Version: tag.Name, - PackageType: registry.PackageType, - IsLatestVersion: &isLatestTag, - CreatedAt: &createdAt, - ModifiedAt: &modifiedAt, - RegistryPath: repoPath, - PullCommand: &pullCommand, - Url: GetTagURL(tag.ImageName, tag.Name, registryURL), - Size: &size, - DownloadsCount: &tag.DownloadCount, + ImageName: tag.ImageName, + Version: tag.Name, + PackageType: registry.PackageType, + CreatedAt: &createdAt, + ModifiedAt: &modifiedAt, + RegistryPath: repoPath, + PullCommand: &pullCommand, + Url: GetTagURL(tag.ImageName, tag.Name, registryURL), + Size: &size, + DownloadsCount: &tag.DownloadCount, } response := &artifactapi.DockerArtifactDetailResponseJSONResponse{ @@ -432,7 +425,6 @@ func GetHelmArtifactDetails( registry *types.Registry, tag *types.TagDetail, manifest *types.Manifest, - isLatestTag bool, registryURL string, ) *artifactapi.HelmArtifactDetailResponseJSONResponse { repoPath := getRepoPath(registry.Name, tag.ImageName, manifest.Digest.String()) @@ -442,17 +434,16 @@ func GetHelmArtifactDetails( size := GetSize(manifest.TotalSize) downloadCount := tag.DownloadCount artifactDetail := &artifactapi.HelmArtifactDetail{ - Artifact: &tag.ImageName, - Version: tag.Name, - PackageType: registry.PackageType, - IsLatestVersion: &isLatestTag, - CreatedAt: &createdAt, - ModifiedAt: &modifiedAt, - RegistryPath: repoPath, - PullCommand: &pullCommand, - Url: GetTagURL(tag.ImageName, tag.Name, registryURL), - Size: &size, - DownloadsCount: &downloadCount, + Artifact: &tag.ImageName, + Version: tag.Name, + PackageType: registry.PackageType, + CreatedAt: &createdAt, + ModifiedAt: &modifiedAt, + RegistryPath: repoPath, + PullCommand: &pullCommand, + Url: GetTagURL(tag.ImageName, tag.Name, registryURL), + Size: &size, + DownloadsCount: &downloadCount, } response := &artifactapi.HelmArtifactDetailResponseJSONResponse{ @@ -462,8 +453,10 @@ func GetHelmArtifactDetails( return response } -func GetGenericArtifactDetail(image *types.Image, artifact *types.Artifact, - metadata database.GenericMetadata) artifactapi.ArtifactDetail { +func GetGenericArtifactDetail( + image *types.Image, artifact *types.Artifact, + metadata database.GenericMetadata, +) artifactapi.ArtifactDetail { createdAt := GetTimeInMs(artifact.CreatedAt) modifiedAt := GetTimeInMs(artifact.UpdatedAt) artifactDetail := &artifactapi.ArtifactDetail{ @@ -503,13 +496,11 @@ func GetArtifactVersionSummary( artifactName string, packageType artifactapi.PackageType, version string, - isLatestTag bool, ) *artifactapi.ArtifactVersionSummaryResponseJSONResponse { artifactVersionSummary := &artifactapi.ArtifactVersionSummary{ - ImageName: artifactName, - IsLatestVersion: &isLatestTag, - PackageType: packageType, - Version: version, + ImageName: artifactName, + PackageType: packageType, + Version: version, } response := &artifactapi.ArtifactVersionSummaryResponseJSONResponse{ Data: *artifactVersionSummary, diff --git a/registry/app/api/controller/metadata/get_artifacts_docker_details.go b/registry/app/api/controller/metadata/get_artifacts_docker_details.go index ef0325b37..d94e77551 100644 --- a/registry/app/api/controller/metadata/get_artifacts_docker_details.go +++ b/registry/app/api/controller/metadata/get_artifacts_docker_details.go @@ -98,15 +98,9 @@ func (c *APIController) GetDockerArtifactDetails( return getArtifactDetailsErrResponse(err) } - latestTag, err := c.TagStore.GetLatestTag(ctx, registry.ID, image) - if err != nil { - return getArtifactDetailsErrResponse(err) - } - return artifact.GetDockerArtifactDetails200JSONResponse{ DockerArtifactDetailResponseJSONResponse: *GetDockerArtifactDetails( - registry, tag, m, - latestTag.ID == tag.ID, c.URLProvider.RegistryURL(ctx, regInfo.RootIdentifier, registry.Name), + registry, tag, m, c.URLProvider.RegistryURL(ctx, regInfo.RootIdentifier, registry.Name), ), }, nil } diff --git a/registry/app/api/controller/metadata/get_artifacts_helm_details.go b/registry/app/api/controller/metadata/get_artifacts_helm_details.go index b27aedcfa..69e743860 100644 --- a/registry/app/api/controller/metadata/get_artifacts_helm_details.go +++ b/registry/app/api/controller/metadata/get_artifacts_helm_details.go @@ -89,12 +89,9 @@ func (c *APIController) GetHelmArtifactDetails( return getHelmArtifactDetailsErrResponse(err) } - latestTag, _ := c.TagStore.GetLatestTag(ctx, registry.ID, image) - return artifact.GetHelmArtifactDetails200JSONResponse{ HelmArtifactDetailResponseJSONResponse: *GetHelmArtifactDetails( - registry, tag, m, - latestTag.ID == tag.ID, c.URLProvider.RegistryURL(ctx, regInfo.RootIdentifier, regInfo.RegistryIdentifier), + registry, tag, m, c.URLProvider.RegistryURL(ctx, regInfo.RootIdentifier, regInfo.RegistryIdentifier), ), }, nil } diff --git a/registry/app/api/controller/metadata/get_artifacts_version_summary.go b/registry/app/api/controller/metadata/get_artifacts_version_summary.go index 61e49dc67..cf31fbb8f 100644 --- a/registry/app/api/controller/metadata/get_artifacts_version_summary.go +++ b/registry/app/api/controller/metadata/get_artifacts_version_summary.go @@ -29,7 +29,7 @@ func (c *APIController) GetArtifactVersionSummary( ctx context.Context, r artifact.GetArtifactVersionSummaryRequestObject, ) (artifact.GetArtifactVersionSummaryResponseObject, error) { - image, version, pkgType, isLatestTag, err := c.FetchArtifactSummary(ctx, r) + image, version, pkgType, err := c.FetchArtifactSummary(ctx, r) if err != nil { return artifact.GetArtifactVersionSummary500JSONResponse{ InternalServerErrorJSONResponse: artifact.InternalServerErrorJSONResponse( @@ -39,7 +39,7 @@ func (c *APIController) GetArtifactVersionSummary( } return artifact.GetArtifactVersionSummary200JSONResponse{ - ArtifactVersionSummaryResponseJSONResponse: *GetArtifactVersionSummary(image, pkgType, version, isLatestTag), + ArtifactVersionSummaryResponseJSONResponse: *GetArtifactVersionSummary(image, pkgType, version), }, nil } @@ -47,16 +47,16 @@ func (c *APIController) GetArtifactVersionSummary( func (c *APIController) FetchArtifactSummary( ctx context.Context, r artifact.GetArtifactVersionSummaryRequestObject, -) (string, string, artifact.PackageType, bool, error) { +) (string, string, artifact.PackageType, error) { regInfo, err := c.GetRegistryRequestBaseInfo(ctx, "", string(r.RegistryRef)) if err != nil { - return "", "", "", false, fmt.Errorf("failed to get registry request base info: %w", err) + return "", "", "", fmt.Errorf("failed to get registry request base info: %w", err) } space, err := c.SpaceFinder.FindByRef(ctx, regInfo.ParentRef) if err != nil { - return "", "", "", false, err + return "", "", "", err } session, _ := request.AuthSessionFrom(ctx) @@ -67,7 +67,7 @@ func (c *APIController) FetchArtifactSummary( session, permissionChecks..., ); err != nil { - return "", "", "", false, err + return "", "", "", err } image := string(r.Artifact) @@ -75,29 +75,23 @@ func (c *APIController) FetchArtifactSummary( registry, err := c.RegistryRepository.Get(ctx, regInfo.RegistryID) if err != nil { - return "", "", "", false, err + return "", "", "", err } if registry.PackageType == artifact.PackageTypeDOCKER || registry.PackageType == artifact.PackageTypeHELM { tag, err := c.TagStore.GetTagMetadata(ctx, regInfo.parentID, regInfo.RegistryIdentifier, image, version) if err != nil { - return "", "", "", false, err + return "", "", "", err } - latestTag, _ := c.TagStore.GetLatestTagName(ctx, regInfo.parentID, regInfo.RegistryIdentifier, image) - isLatestTag := latestTag == version - - return image, tag.Name, tag.PackageType, isLatestTag, nil + return image, tag.Name, tag.PackageType, nil } artifact, err := c.ArtifactStore.GetArtifactMetadata(ctx, regInfo.parentID, regInfo.RegistryIdentifier, image, version) if err != nil { - return "", "", "", false, err + return "", "", "", err } - latestTag, _ := c.ArtifactStore.GetLatestVersionName(ctx, regInfo.parentID, regInfo.RegistryIdentifier, image) - isLatestTag := latestTag == version - - return image, artifact.Name, artifact.PackageType, isLatestTag, nil + return image, artifact.Name, artifact.PackageType, nil } diff --git a/registry/app/api/controller/metadata/get_artifacts_versions.go b/registry/app/api/controller/metadata/get_artifacts_versions.go index 59545b2b5..1e913d92c 100644 --- a/registry/app/api/controller/metadata/get_artifacts_versions.go +++ b/registry/app/api/controller/metadata/get_artifacts_versions.go @@ -88,8 +88,6 @@ func (c *APIController) GetAllArtifactVersions( image, regInfo.sortByField, regInfo.sortByOrder, regInfo.limit, regInfo.offset, regInfo.searchTerm, ) - latestTag, _ := c.TagStore.GetLatestTagName(ctx, regInfo.parentID, regInfo.RegistryIdentifier, image) - count, _ := c.TagStore.CountAllTagsByRepoAndImage( ctx, regInfo.parentID, regInfo.RegistryIdentifier, image, regInfo.searchTerm, @@ -105,7 +103,7 @@ func (c *APIController) GetAllArtifactVersions( return artifact.GetAllArtifactVersions200JSONResponse{ ListArtifactVersionResponseJSONResponse: *GetAllArtifactVersionResponse( - ctx, tags, latestTag, image, count, regInfo.pageNumber, regInfo.limit, + ctx, tags, image, count, regInfo.pageNumber, regInfo.limit, c.URLProvider.RegistryURL(ctx, regInfo.RootIdentifier, regInfo.RegistryIdentifier), ), }, nil @@ -118,8 +116,6 @@ func (c *APIController) GetAllArtifactVersions( return throw500Error(err) } - latestVersion, _ := c.ArtifactStore.GetLatestVersionName(ctx, regInfo.parentID, regInfo.RegistryIdentifier, image) - cnt, _ := c.ArtifactStore.CountAllVersionsByRepoAndImage( ctx, regInfo.parentID, regInfo.RegistryIdentifier, image, regInfo.searchTerm, @@ -127,7 +123,7 @@ func (c *APIController) GetAllArtifactVersions( return artifact.GetAllArtifactVersions200JSONResponse{ ListArtifactVersionResponseJSONResponse: *GetNonOCIAllArtifactVersionResponse( - ctx, metadata, latestVersion, image, cnt, regInfo.pageNumber, regInfo.limit, + ctx, metadata, image, cnt, regInfo.pageNumber, regInfo.limit, c.URLProvider.RegistryURL(ctx, regInfo.RootIdentifier, regInfo.RegistryIdentifier), ), }, nil diff --git a/registry/app/api/openapi/api.yaml b/registry/app/api/openapi/api.yaml index 61bf1716a..3bd5d90b5 100644 --- a/registry/app/api/openapi/api.yaml +++ b/registry/app/api/openapi/api.yaml @@ -1672,8 +1672,6 @@ components: fileCount: type: integer format: int64 - islatestVersion: - type: boolean lastModified: type: string packageType: @@ -1916,8 +1914,6 @@ components: type: string modifiedAt: type: string - isLatestVersion: - type: boolean required: - imageName - version @@ -1971,8 +1967,6 @@ components: type: string modifiedAt: type: string - isLatestVersion: - type: boolean required: - imageName - version @@ -2011,8 +2005,6 @@ components: type: string packageType: $ref: "#/components/schemas/PackageType" - isLatestVersion: - type: boolean required: - imageName - version @@ -2070,8 +2062,6 @@ components: type: string version: type: string - isLatestVersion: - type: boolean manifests: type: array items: diff --git a/registry/app/api/openapi/contracts/artifact/services.gen.go b/registry/app/api/openapi/contracts/artifact/services.gen.go index 55264f5ee..2e56fb82f 100644 --- a/registry/app/api/openapi/contracts/artifact/services.gen.go +++ b/registry/app/api/openapi/contracts/artifact/services.gen.go @@ -1,6 +1,6 @@ // Package artifact provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.16.3 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.1.0 DO NOT EDIT. package artifact import ( @@ -381,7 +381,7 @@ func (siw *ServerInterfaceWrapper) DeleteRegistry(w http.ResponseWriter, r *http // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -407,7 +407,7 @@ func (siw *ServerInterfaceWrapper) GetRegistry(w http.ResponseWriter, r *http.Re // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -433,7 +433,7 @@ func (siw *ServerInterfaceWrapper) ModifyRegistry(w http.ResponseWriter, r *http // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -459,7 +459,7 @@ func (siw *ServerInterfaceWrapper) ListArtifactLabels(w http.ResponseWriter, r * // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -512,7 +512,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactStatsForRegistry(w http.ResponseWr // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -557,7 +557,7 @@ func (siw *ServerInterfaceWrapper) DeleteArtifact(w http.ResponseWriter, r *http // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -566,7 +566,7 @@ func (siw *ServerInterfaceWrapper) DeleteArtifact(w http.ResponseWriter, r *http // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -592,7 +592,7 @@ func (siw *ServerInterfaceWrapper) UpdateArtifactLabels(w http.ResponseWriter, r // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -601,7 +601,7 @@ func (siw *ServerInterfaceWrapper) UpdateArtifactLabels(w http.ResponseWriter, r // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -627,7 +627,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactStats(w http.ResponseWriter, r *ht // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -636,7 +636,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactStats(w http.ResponseWriter, r *ht // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -681,7 +681,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactSummary(w http.ResponseWriter, r * // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -690,7 +690,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactSummary(w http.ResponseWriter, r * // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -716,7 +716,7 @@ func (siw *ServerInterfaceWrapper) DeleteArtifactVersion(w http.ResponseWriter, // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -725,7 +725,7 @@ func (siw *ServerInterfaceWrapper) DeleteArtifactVersion(w http.ResponseWriter, // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -734,7 +734,7 @@ func (siw *ServerInterfaceWrapper) DeleteArtifactVersion(w http.ResponseWriter, // ------------- Path parameter "version" ------------- var version VersionPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "version", runtime.ParamLocationPath, chi.URLParam(r, "version"), &version) + err = runtime.BindStyledParameterWithOptions("simple", "version", chi.URLParam(r, "version"), &version, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "version", Err: err}) return @@ -760,7 +760,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactDetails(w http.ResponseWriter, r * // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -769,7 +769,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactDetails(w http.ResponseWriter, r * // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -778,7 +778,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactDetails(w http.ResponseWriter, r * // ------------- Path parameter "version" ------------- var version VersionPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "version", runtime.ParamLocationPath, chi.URLParam(r, "version"), &version) + err = runtime.BindStyledParameterWithOptions("simple", "version", chi.URLParam(r, "version"), &version, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "version", Err: err}) return @@ -815,7 +815,7 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactDetails(w http.ResponseWrite // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -824,7 +824,7 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactDetails(w http.ResponseWrite // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -833,7 +833,7 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactDetails(w http.ResponseWrite // ------------- Path parameter "version" ------------- var version VersionPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "version", runtime.ParamLocationPath, chi.URLParam(r, "version"), &version) + err = runtime.BindStyledParameterWithOptions("simple", "version", chi.URLParam(r, "version"), &version, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "version", Err: err}) return @@ -877,7 +877,7 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactLayers(w http.ResponseWriter // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -886,7 +886,7 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactLayers(w http.ResponseWriter // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -895,7 +895,7 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactLayers(w http.ResponseWriter // ------------- Path parameter "version" ------------- var version VersionPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "version", runtime.ParamLocationPath, chi.URLParam(r, "version"), &version) + err = runtime.BindStyledParameterWithOptions("simple", "version", chi.URLParam(r, "version"), &version, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "version", Err: err}) return @@ -939,7 +939,7 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactManifest(w http.ResponseWrit // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -948,7 +948,7 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactManifest(w http.ResponseWrit // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -957,7 +957,7 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactManifest(w http.ResponseWrit // ------------- Path parameter "version" ------------- var version VersionPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "version", runtime.ParamLocationPath, chi.URLParam(r, "version"), &version) + err = runtime.BindStyledParameterWithOptions("simple", "version", chi.URLParam(r, "version"), &version, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "version", Err: err}) return @@ -1001,7 +1001,7 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactManifests(w http.ResponseWri // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1010,7 +1010,7 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactManifests(w http.ResponseWri // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -1019,7 +1019,7 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactManifests(w http.ResponseWri // ------------- Path parameter "version" ------------- var version VersionPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "version", runtime.ParamLocationPath, chi.URLParam(r, "version"), &version) + err = runtime.BindStyledParameterWithOptions("simple", "version", chi.URLParam(r, "version"), &version, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "version", Err: err}) return @@ -1045,7 +1045,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactFiles(w http.ResponseWriter, r *ht // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1054,7 +1054,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactFiles(w http.ResponseWriter, r *ht // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -1063,7 +1063,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactFiles(w http.ResponseWriter, r *ht // ------------- Path parameter "version" ------------- var version VersionPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "version", runtime.ParamLocationPath, chi.URLParam(r, "version"), &version) + err = runtime.BindStyledParameterWithOptions("simple", "version", chi.URLParam(r, "version"), &version, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "version", Err: err}) return @@ -1132,7 +1132,7 @@ func (siw *ServerInterfaceWrapper) GetHelmArtifactDetails(w http.ResponseWriter, // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1141,7 +1141,7 @@ func (siw *ServerInterfaceWrapper) GetHelmArtifactDetails(w http.ResponseWriter, // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -1150,7 +1150,7 @@ func (siw *ServerInterfaceWrapper) GetHelmArtifactDetails(w http.ResponseWriter, // ------------- Path parameter "version" ------------- var version VersionPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "version", runtime.ParamLocationPath, chi.URLParam(r, "version"), &version) + err = runtime.BindStyledParameterWithOptions("simple", "version", chi.URLParam(r, "version"), &version, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "version", Err: err}) return @@ -1176,7 +1176,7 @@ func (siw *ServerInterfaceWrapper) GetHelmArtifactManifest(w http.ResponseWriter // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1185,7 +1185,7 @@ func (siw *ServerInterfaceWrapper) GetHelmArtifactManifest(w http.ResponseWriter // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -1194,7 +1194,7 @@ func (siw *ServerInterfaceWrapper) GetHelmArtifactManifest(w http.ResponseWriter // ------------- Path parameter "version" ------------- var version VersionPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "version", runtime.ParamLocationPath, chi.URLParam(r, "version"), &version) + err = runtime.BindStyledParameterWithOptions("simple", "version", chi.URLParam(r, "version"), &version, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "version", Err: err}) return @@ -1220,7 +1220,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactVersionSummary(w http.ResponseWrit // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1229,7 +1229,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactVersionSummary(w http.ResponseWrit // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -1238,7 +1238,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactVersionSummary(w http.ResponseWrit // ------------- Path parameter "version" ------------- var version VersionPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "version", runtime.ParamLocationPath, chi.URLParam(r, "version"), &version) + err = runtime.BindStyledParameterWithOptions("simple", "version", chi.URLParam(r, "version"), &version, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "version", Err: err}) return @@ -1264,7 +1264,7 @@ func (siw *ServerInterfaceWrapper) GetAllArtifactVersions(w http.ResponseWriter, // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1273,7 +1273,7 @@ func (siw *ServerInterfaceWrapper) GetAllArtifactVersions(w http.ResponseWriter, // ------------- Path parameter "artifact" ------------- var artifact ArtifactPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "artifact", runtime.ParamLocationPath, chi.URLParam(r, "artifact"), &artifact) + err = runtime.BindStyledParameterWithOptions("simple", "artifact", chi.URLParam(r, "artifact"), &artifact, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "artifact", Err: err}) return @@ -1342,7 +1342,7 @@ func (siw *ServerInterfaceWrapper) GetAllArtifactsByRegistry(w http.ResponseWrit // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1419,7 +1419,7 @@ func (siw *ServerInterfaceWrapper) GetClientSetupDetails(w http.ResponseWriter, // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1464,7 +1464,7 @@ func (siw *ServerInterfaceWrapper) ListWebhooks(w http.ResponseWriter, r *http.R // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1533,7 +1533,7 @@ func (siw *ServerInterfaceWrapper) CreateWebhook(w http.ResponseWriter, r *http. // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1559,7 +1559,7 @@ func (siw *ServerInterfaceWrapper) DeleteWebhook(w http.ResponseWriter, r *http. // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1568,7 +1568,7 @@ func (siw *ServerInterfaceWrapper) DeleteWebhook(w http.ResponseWriter, r *http. // ------------- Path parameter "webhook_identifier" ------------- var webhookIdentifier WebhookIdentifierPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "webhook_identifier", runtime.ParamLocationPath, chi.URLParam(r, "webhook_identifier"), &webhookIdentifier) + err = runtime.BindStyledParameterWithOptions("simple", "webhook_identifier", chi.URLParam(r, "webhook_identifier"), &webhookIdentifier, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "webhook_identifier", Err: err}) return @@ -1594,7 +1594,7 @@ func (siw *ServerInterfaceWrapper) GetWebhook(w http.ResponseWriter, r *http.Req // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1603,7 +1603,7 @@ func (siw *ServerInterfaceWrapper) GetWebhook(w http.ResponseWriter, r *http.Req // ------------- Path parameter "webhook_identifier" ------------- var webhookIdentifier WebhookIdentifierPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "webhook_identifier", runtime.ParamLocationPath, chi.URLParam(r, "webhook_identifier"), &webhookIdentifier) + err = runtime.BindStyledParameterWithOptions("simple", "webhook_identifier", chi.URLParam(r, "webhook_identifier"), &webhookIdentifier, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "webhook_identifier", Err: err}) return @@ -1629,7 +1629,7 @@ func (siw *ServerInterfaceWrapper) UpdateWebhook(w http.ResponseWriter, r *http. // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1638,7 +1638,7 @@ func (siw *ServerInterfaceWrapper) UpdateWebhook(w http.ResponseWriter, r *http. // ------------- Path parameter "webhook_identifier" ------------- var webhookIdentifier WebhookIdentifierPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "webhook_identifier", runtime.ParamLocationPath, chi.URLParam(r, "webhook_identifier"), &webhookIdentifier) + err = runtime.BindStyledParameterWithOptions("simple", "webhook_identifier", chi.URLParam(r, "webhook_identifier"), &webhookIdentifier, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "webhook_identifier", Err: err}) return @@ -1664,7 +1664,7 @@ func (siw *ServerInterfaceWrapper) ListWebhookExecutions(w http.ResponseWriter, // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1673,7 +1673,7 @@ func (siw *ServerInterfaceWrapper) ListWebhookExecutions(w http.ResponseWriter, // ------------- Path parameter "webhook_identifier" ------------- var webhookIdentifier WebhookIdentifierPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "webhook_identifier", runtime.ParamLocationPath, chi.URLParam(r, "webhook_identifier"), &webhookIdentifier) + err = runtime.BindStyledParameterWithOptions("simple", "webhook_identifier", chi.URLParam(r, "webhook_identifier"), &webhookIdentifier, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "webhook_identifier", Err: err}) return @@ -1718,7 +1718,7 @@ func (siw *ServerInterfaceWrapper) GetWebhookExecution(w http.ResponseWriter, r // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1727,7 +1727,7 @@ func (siw *ServerInterfaceWrapper) GetWebhookExecution(w http.ResponseWriter, r // ------------- Path parameter "webhook_identifier" ------------- var webhookIdentifier WebhookIdentifierPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "webhook_identifier", runtime.ParamLocationPath, chi.URLParam(r, "webhook_identifier"), &webhookIdentifier) + err = runtime.BindStyledParameterWithOptions("simple", "webhook_identifier", chi.URLParam(r, "webhook_identifier"), &webhookIdentifier, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "webhook_identifier", Err: err}) return @@ -1736,7 +1736,7 @@ func (siw *ServerInterfaceWrapper) GetWebhookExecution(w http.ResponseWriter, r // ------------- Path parameter "webhook_execution_id" ------------- var webhookExecutionId WebhookExecutionIdPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "webhook_execution_id", runtime.ParamLocationPath, chi.URLParam(r, "webhook_execution_id"), &webhookExecutionId) + err = runtime.BindStyledParameterWithOptions("simple", "webhook_execution_id", chi.URLParam(r, "webhook_execution_id"), &webhookExecutionId, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "webhook_execution_id", Err: err}) return @@ -1762,7 +1762,7 @@ func (siw *ServerInterfaceWrapper) ReTriggerWebhookExecution(w http.ResponseWrit // ------------- Path parameter "registry_ref" ------------- var registryRef RegistryRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "registry_ref", runtime.ParamLocationPath, chi.URLParam(r, "registry_ref"), ®istryRef) + err = runtime.BindStyledParameterWithOptions("simple", "registry_ref", chi.URLParam(r, "registry_ref"), ®istryRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "registry_ref", Err: err}) return @@ -1771,7 +1771,7 @@ func (siw *ServerInterfaceWrapper) ReTriggerWebhookExecution(w http.ResponseWrit // ------------- Path parameter "webhook_identifier" ------------- var webhookIdentifier WebhookIdentifierPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "webhook_identifier", runtime.ParamLocationPath, chi.URLParam(r, "webhook_identifier"), &webhookIdentifier) + err = runtime.BindStyledParameterWithOptions("simple", "webhook_identifier", chi.URLParam(r, "webhook_identifier"), &webhookIdentifier, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "webhook_identifier", Err: err}) return @@ -1780,7 +1780,7 @@ func (siw *ServerInterfaceWrapper) ReTriggerWebhookExecution(w http.ResponseWrit // ------------- Path parameter "webhook_execution_id" ------------- var webhookExecutionId WebhookExecutionIdPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "webhook_execution_id", runtime.ParamLocationPath, chi.URLParam(r, "webhook_execution_id"), &webhookExecutionId) + err = runtime.BindStyledParameterWithOptions("simple", "webhook_execution_id", chi.URLParam(r, "webhook_execution_id"), &webhookExecutionId, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "webhook_execution_id", Err: err}) return @@ -1806,7 +1806,7 @@ func (siw *ServerInterfaceWrapper) GetArtifactStatsForSpace(w http.ResponseWrite // ------------- Path parameter "space_ref" ------------- var spaceRef SpaceRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "space_ref", runtime.ParamLocationPath, chi.URLParam(r, "space_ref"), &spaceRef) + err = runtime.BindStyledParameterWithOptions("simple", "space_ref", chi.URLParam(r, "space_ref"), &spaceRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "space_ref", Err: err}) return @@ -1851,7 +1851,7 @@ func (siw *ServerInterfaceWrapper) GetAllArtifacts(w http.ResponseWriter, r *htt // ------------- Path parameter "space_ref" ------------- var spaceRef SpaceRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "space_ref", runtime.ParamLocationPath, chi.URLParam(r, "space_ref"), &spaceRef) + err = runtime.BindStyledParameterWithOptions("simple", "space_ref", chi.URLParam(r, "space_ref"), &spaceRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "space_ref", Err: err}) return @@ -1944,7 +1944,7 @@ func (siw *ServerInterfaceWrapper) GetAllRegistries(w http.ResponseWriter, r *ht // ------------- Path parameter "space_ref" ------------- var spaceRef SpaceRefPathParam - err = runtime.BindStyledParameterWithLocation("simple", false, "space_ref", runtime.ParamLocationPath, chi.URLParam(r, "space_ref"), &spaceRef) + err = runtime.BindStyledParameterWithOptions("simple", "space_ref", chi.URLParam(r, "space_ref"), &spaceRef, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "space_ref", Err: err}) return @@ -5768,96 +5768,96 @@ func (sh *strictHandler) GetAllRegistries(w http.ResponseWriter, r *http.Request // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "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", - "lmWvxX2uaC+38deP6/8PAAD//4C6fVFS4wAA", + "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", + "tv7/AAAA//8STZpMmeIAAA==", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/registry/app/api/openapi/contracts/artifact/types.gen.go b/registry/app/api/openapi/contracts/artifact/types.gen.go index c521f3f37..52ccbe65f 100644 --- a/registry/app/api/openapi/contracts/artifact/types.gen.go +++ b/registry/app/api/openapi/contracts/artifact/types.gen.go @@ -1,6 +1,6 @@ // Package artifact provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.16.3 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.1.0 DO NOT EDIT. package artifact import ( @@ -156,12 +156,11 @@ type ArtifactSummary struct { // ArtifactVersionMetadata Artifact Version Metadata type ArtifactVersionMetadata struct { - DigestCount *int `json:"digestCount,omitempty"` - DownloadsCount *int64 `json:"downloadsCount,omitempty"` - FileCount *int64 `json:"fileCount,omitempty"` - IslatestVersion *bool `json:"islatestVersion,omitempty"` - LastModified *string `json:"lastModified,omitempty"` - Name string `json:"name"` + DigestCount *int `json:"digestCount,omitempty"` + DownloadsCount *int64 `json:"downloadsCount,omitempty"` + FileCount *int64 `json:"fileCount,omitempty"` + LastModified *string `json:"lastModified,omitempty"` + Name string `json:"name"` // PackageType refers to package PackageType *PackageType `json:"packageType,omitempty"` @@ -173,8 +172,7 @@ type ArtifactVersionMetadata struct { // ArtifactVersionSummary Docker Artifact Version Summary type ArtifactVersionSummary struct { - ImageName string `json:"imageName"` - IsLatestVersion *bool `json:"isLatestVersion,omitempty"` + ImageName string `json:"imageName"` // PackageType refers to package PackageType PackageType `json:"packageType"` @@ -234,11 +232,10 @@ type ClientSetupStepType string // DockerArtifactDetail Docker Artifact Detail type DockerArtifactDetail struct { - CreatedAt *string `json:"createdAt,omitempty"` - DownloadsCount *int64 `json:"downloadsCount,omitempty"` - ImageName string `json:"imageName"` - IsLatestVersion *bool `json:"isLatestVersion,omitempty"` - ModifiedAt *string `json:"modifiedAt,omitempty"` + CreatedAt *string `json:"createdAt,omitempty"` + DownloadsCount *int64 `json:"downloadsCount,omitempty"` + ImageName string `json:"imageName"` + ModifiedAt *string `json:"modifiedAt,omitempty"` // PackageType refers to package PackageType PackageType `json:"packageType"` @@ -283,10 +280,9 @@ type DockerManifestDetails struct { // DockerManifests Harness Manifests type DockerManifests struct { - ImageName string `json:"imageName"` - IsLatestVersion *bool `json:"isLatestVersion,omitempty"` - Manifests *[]DockerManifestDetails `json:"manifests,omitempty"` - Version string `json:"version"` + ImageName string `json:"imageName"` + Manifests *[]DockerManifestDetails `json:"manifests,omitempty"` + Version string `json:"version"` } // Error defines model for Error. @@ -323,11 +319,10 @@ type GenericArtifactDetailConfig struct { // HelmArtifactDetail Helm Artifact Detail type HelmArtifactDetail struct { - Artifact *string `json:"artifact,omitempty"` - CreatedAt *string `json:"createdAt,omitempty"` - DownloadsCount *int64 `json:"downloadsCount,omitempty"` - IsLatestVersion *bool `json:"isLatestVersion,omitempty"` - ModifiedAt *string `json:"modifiedAt,omitempty"` + Artifact *string `json:"artifact,omitempty"` + CreatedAt *string `json:"createdAt,omitempty"` + DownloadsCount *int64 `json:"downloadsCount,omitempty"` + ModifiedAt *string `json:"modifiedAt,omitempty"` // PackageType refers to package PackageType PackageType `json:"packageType"` @@ -1261,7 +1256,7 @@ func (t *ArtifactDetail) MergeDockerArtifactDetailConfig(v DockerArtifactDetailC return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -1291,7 +1286,7 @@ func (t *ArtifactDetail) MergeHelmArtifactDetailConfig(v HelmArtifactDetailConfi return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -1321,7 +1316,7 @@ func (t *ArtifactDetail) MergeGenericArtifactDetailConfig(v GenericArtifactDetai return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -1351,7 +1346,7 @@ func (t *ArtifactDetail) MergeMavenArtifactDetailConfig(v MavenArtifactDetailCon return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -1547,7 +1542,7 @@ func (t *ClientSetupSection) MergeClientSetupStepConfig(v ClientSetupStepConfig) return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -1577,7 +1572,7 @@ func (t *ClientSetupSection) MergeTabSetupStepConfig(v TabSetupStepConfig) error return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -1701,7 +1696,7 @@ func (t *RegistryConfig) MergeVirtualConfig(v VirtualConfig) error { return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -1731,7 +1726,7 @@ func (t *RegistryConfig) MergeUpstreamConfig(v UpstreamConfig) error { return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -1823,7 +1818,7 @@ func (t *UpstreamConfig_Auth) MergeUserPassword(v UserPassword) error { return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -1849,7 +1844,7 @@ func (t *UpstreamConfig_Auth) MergeAnonymous(v Anonymous) error { return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } @@ -1875,7 +1870,7 @@ func (t *UpstreamConfig_Auth) MergeAccessKeySecretKey(v AccessKeySecretKey) erro return err } - merged, err := runtime.JsonMerge(t.union, b) + merged, err := runtime.JSONMerge(t.union, b) t.union = merged return err } diff --git a/registry/app/remote/controller/proxy/controller.go b/registry/app/remote/controller/proxy/controller.go index f54836e3f..7964bcc9d 100644 --- a/registry/app/remote/controller/proxy/controller.go +++ b/registry/app/remote/controller/proxy/controller.go @@ -293,7 +293,6 @@ func (c *controller) HeadManifest( func (c *controller) ProxyBlob( ctx context.Context, art pkg.RegistryInfo, repoKey string, proxy types.UpstreamProxy, ) (int64, io.ReadCloser, error) { - rHelper, err := NewRemoteHelper(ctx, c.spaceFinder, c.secretService, repoKey, proxy) if err != nil { return 0, nil, err diff --git a/registry/app/store/database.go b/registry/app/store/database.go index 41a91856b..ea1800bbc 100644 --- a/registry/app/store/database.go +++ b/registry/app/store/database.go @@ -442,10 +442,12 @@ type ArtifactRepository interface { // Create an Artifact CreateOrUpdate(ctx context.Context, artifact *types.Artifact) error Count(ctx context.Context) (int64, error) - GetAllArtifactsByParentID(ctx context.Context, id int64, + GetAllArtifactsByParentID( + ctx context.Context, id int64, i *[]string, field string, order string, limit int, offset int, term string, - version bool, packageTypes []string) (*[]types.ArtifactMetadata, error) + version bool, packageTypes []string, + ) (*[]types.ArtifactMetadata, error) CountAllArtifactsByParentID( ctx context.Context, parentID int64, registryIDs *[]string, search string, latestVersion bool, packageTypes []string, @@ -459,17 +461,22 @@ type ArtifactRepository interface { ctx context.Context, parentID int64, repoKey string, search string, labels []string, ) (int64, error) - GetLatestArtifactMetadata(ctx context.Context, id int64, identifier string, - image string) (*types.ArtifactMetadata, error) - GetAllVersionsByRepoAndImage(ctx context.Context, id int64, identifier string, image string, - field string, order string, limit int, offset int, term string) (*[]types.NonOCIArtifactMetadata, error) - GetLatestVersionName(ctx context.Context, id int64, identifier string, image string) (string, error) + GetLatestArtifactMetadata( + ctx context.Context, id int64, identifier string, + image string, + ) (*types.ArtifactMetadata, error) + GetAllVersionsByRepoAndImage( + ctx context.Context, id int64, identifier string, image string, + field string, order string, limit int, offset int, term string, + ) (*[]types.NonOCIArtifactMetadata, error) CountAllVersionsByRepoAndImage( ctx context.Context, parentID int64, repoKey string, image string, search string, ) (int64, error) - GetArtifactMetadata(ctx context.Context, id int64, identifier string, - image string, version string) (*types.ArtifactMetadata, error) + GetArtifactMetadata( + ctx context.Context, id int64, identifier string, + image string, version string, + ) (*types.ArtifactMetadata, error) } type DownloadStatRepository interface { @@ -523,10 +530,12 @@ type NodesRepository interface { name string, ) (*types.Node, error) - FindByPathAndRegistryID(ctx context.Context, registryID int64, path string, + FindByPathAndRegistryID( + ctx context.Context, registryID int64, path string, ) (*types.Node, error) - CountByPathAndRegistryID(ctx context.Context, registryID int64, path string, + CountByPathAndRegistryID( + ctx context.Context, registryID int64, path string, ) (int64, error) // Create a node Create(ctx context.Context, node *types.Node) error @@ -540,7 +549,8 @@ type NodesRepository interface { path string, ) (*types.Node, error) - GetFilesMetadataByPathAndRegistryID(ctx context.Context, registryID int64, path string, + GetFilesMetadataByPathAndRegistryID( + ctx context.Context, registryID int64, path string, sortByField string, sortByOrder string, limit int, diff --git a/registry/app/store/database/artifact.go b/registry/app/store/database/artifact.go index 26cce4879..b08d4e025 100644 --- a/registry/app/store/database/artifact.go +++ b/registry/app/store/database/artifact.go @@ -241,7 +241,7 @@ func (a ArtifactDao) GetAllArtifactsByParentID( if sortByField == downloadCount { sortField = downloadCount } - q = q.OrderBy(sortField + " " + sortByOrder).Limit(uint64(limit)).Offset(uint64(offset)) + q = q.OrderBy(sortField + " " + sortByOrder).Limit(uint64(limit)).Offset(uint64(offset)) //nolint:gosec sql, args, err := q.ToSql() if err != nil { @@ -358,7 +358,7 @@ func (a ArtifactDao) GetAllArtifactsByRepo( } else if sortByField == imageName { sortField = name } - q = q.OrderBy(sortField + " " + sortByOrder).Limit(uint64(limit)).Offset(uint64(offset)) + q = q.OrderBy(sortField + " " + sortByOrder).Limit(uint64(limit)).Offset(uint64(offset)) //nolint:gosec sql, args, err := q.ToSql() if err != nil { @@ -579,7 +579,7 @@ func (a ArtifactDao) GetAllVersionsByRepoAndImage( } else if sortByField == name { sortField = name } - q = q.OrderBy(sortField + " " + sortByOrder).Limit(uint64(limit)).Offset(uint64(offset)) + q = q.OrderBy(sortField + " " + sortByOrder).Limit(uint64(limit)).Offset(uint64(offset)) //nolint:gosec sql, args, err := q.ToSql() if err != nil { @@ -627,37 +627,6 @@ func (a ArtifactDao) CountAllVersionsByRepoAndImage( return count, nil } -func (a ArtifactDao) GetLatestVersionName( - ctx context.Context, - parentID int64, - repoKey string, - imageName string, -) (string, error) { - q := databaseg.Builder.Select("artifact_version as name"). - From("artifacts a"). - Join("images ON i.image_id = a.artifact_image_id"). - Join("registries ON i.image_registry_id = registry_id"). - Where( - "registry_parent_id = ? AND registry_name = ? AND i.image_name = ?", - parentID, repoKey, imageName, - ). - OrderBy("artifact_updated_at DESC").Limit(1) - - sql, args, err := q.ToSql() - if err != nil { - return "", errors.Wrap(err, "Failed to convert query to sql") - } - - db := dbtx.GetAccessor(ctx, a.db) - - var tag string - err = db.QueryRowContext(ctx, sql, args...).Scan(&tag) - if err != nil { - return tag, databaseg.ProcessSQLErrorf(ctx, err, "Failed executing get tag name query") - } - return tag, nil -} - func (a ArtifactDao) GetArtifactMetadata( ctx context.Context, parentID int64, @@ -709,7 +678,8 @@ func (a ArtifactDao) mapToArtifactMetadata( } func (a ArtifactDao) mapToNonOCIMetadata( - dst *nonOCIArtifactMetadataDB) *types.NonOCIArtifactMetadata { + dst *nonOCIArtifactMetadataDB, +) *types.NonOCIArtifactMetadata { var size string var fileCount int64 @@ -721,18 +691,18 @@ func (a ArtifactDao) mapToNonOCIMetadata( fileCount = *dst.FileCount } return &types.NonOCIArtifactMetadata{ - Name: dst.Name, - DownloadCount: dst.DownloadCount, - PackageType: dst.PackageType, - Size: size, - FileCount: fileCount, - IsLatestVersion: dst.IsLatestVersion, - ModifiedAt: time.UnixMilli(dst.ModifiedAt), + Name: dst.Name, + DownloadCount: dst.DownloadCount, + PackageType: dst.PackageType, + Size: size, + FileCount: fileCount, + ModifiedAt: time.UnixMilli(dst.ModifiedAt), } } func (a ArtifactDao) mapToNonOCIMetadataList( - dst []*nonOCIArtifactMetadataDB) (*[]types.NonOCIArtifactMetadata, error) { + dst []*nonOCIArtifactMetadataDB, +) (*[]types.NonOCIArtifactMetadata, error) { metadataList := make([]types.NonOCIArtifactMetadata, 0, len(dst)) for _, d := range dst { metadata := a.mapToNonOCIMetadata(d) @@ -742,13 +712,12 @@ func (a ArtifactDao) mapToNonOCIMetadataList( } type nonOCIArtifactMetadataDB struct { - Name string `db:"name"` - Size *string `db:"size"` - PackageType artifact.PackageType `db:"package_type"` - FileCount *int64 `db:"file_count"` - IsLatestVersion bool `db:"is_latest_version"` - ModifiedAt int64 `db:"modified_at"` - DownloadCount int64 `db:"download_count"` + Name string `db:"name"` + Size *string `db:"size"` + PackageType artifact.PackageType `db:"package_type"` + FileCount *int64 `db:"file_count"` + ModifiedAt int64 `db:"modified_at"` + DownloadCount int64 `db:"download_count"` } type GenericMetadata struct { diff --git a/registry/app/store/database/tag.go b/registry/app/store/database/tag.go index 40c17d676..e499dc109 100644 --- a/registry/app/store/database/tag.go +++ b/registry/app/store/database/tag.go @@ -86,17 +86,16 @@ type artifactMetadataDB struct { } type tagMetadataDB struct { - Name string `db:"name"` - Size string `db:"size"` - PackageType artifact.PackageType `db:"package_type"` - DigestCount int `db:"digest_count"` - IsLatestVersion bool `db:"latest_version"` - ModifiedAt int64 `db:"modified_at"` - SchemaVersion int `db:"manifest_schema_version"` - NonConformant bool `db:"manifest_non_conformant"` - Payload []byte `db:"manifest_payload"` - MediaType string `db:"mt_media_type"` - DownloadCount int64 `db:"download_count"` + Name string `db:"name"` + Size string `db:"size"` + PackageType artifact.PackageType `db:"package_type"` + DigestCount int `db:"digest_count"` + ModifiedAt int64 `db:"modified_at"` + SchemaVersion int `db:"manifest_schema_version"` + NonConformant bool `db:"manifest_non_conformant"` + Payload []byte `db:"manifest_payload"` + MediaType string `db:"mt_media_type"` + DownloadCount int64 `db:"download_count"` } type tagDetailDB struct { @@ -266,7 +265,7 @@ func (t tagDao) TagsPaginated( "tag_registry_id = ? AND tag_image_name = ? AND tag_name > ?", repoID, image, filters.LastEntry, ). - OrderBy("tag_name").Limit(uint64(filters.MaxEntries)) + OrderBy("tag_name").Limit(uint64(filters.MaxEntries)) //nolint:gosec db := dbtx.GetAccessor(ctx, t.db) @@ -306,7 +305,7 @@ func (t tagDao) HasTagsAfterName( filters.PublishedAt, filters.LastEntry, ) } - stmt = stmt.OrderBy("tag_name").GroupBy("tag_name").Limit(uint64(filters.MaxEntries)) + stmt = stmt.OrderBy("tag_name").GroupBy("tag_name").Limit(uint64(filters.MaxEntries)) //nolint:gosec db := dbtx.GetAccessor(ctx, t.db) @@ -399,8 +398,10 @@ func (t tagDao) GetAllArtifactsByParentID( return t.mapToArtifactMetadataList(ctx, dst) } -func (t tagDao) GetAllArtifactsQueryByParentIDForOCI(parentID int64, latestVersion bool, registryIDs *[]string, - packageTypes []string, search string) sq.SelectBuilder { +func (t tagDao) GetAllArtifactsQueryByParentIDForOCI( + parentID int64, latestVersion bool, registryIDs *[]string, + packageTypes []string, search string, +) sq.SelectBuilder { q2 := databaseg.Builder.Select( `r.registry_name as repo_name, t.tag_image_name as name, @@ -453,8 +454,10 @@ func (t tagDao) GetAllArtifactsQueryByParentIDForOCI(parentID int64, latestVersi return q2 } -func (t tagDao) GetAllArtifactOnParentIDQueryForNonOCI(parentID int64, latestVersion bool, registryIDs *[]string, - packageTypes []string, search string) sq.SelectBuilder { +func (t tagDao) GetAllArtifactOnParentIDQueryForNonOCI( + parentID int64, latestVersion bool, registryIDs *[]string, + packageTypes []string, search string, +) sq.SelectBuilder { q1 := databaseg.Builder.Select( `r.registry_name as repo_name, i.image_name as name, @@ -900,7 +903,7 @@ func (t tagDao) GetAllArtifactsByRepo( if sortByField == downloadCount { sortField = downloadCount } - q = q.OrderBy(sortField + " " + sortByOrder).Limit(uint64(limit)).Offset(uint64(offset)) + q = q.OrderBy(sortField + " " + sortByOrder).Limit(uint64(limit)).Offset(uint64(offset)) //nolint:gosec sql, args, err := q.ToSql() if err != nil { @@ -1010,7 +1013,7 @@ func (t tagDao) GetAllTagsByRepoAndImage( if sortByField == downloadCount { sortField = downloadCount } - q = q.OrderBy(sortField + " " + sortByOrder).Limit(uint64(limit)).Offset(uint64(offset)) + q = q.OrderBy(sortField + " " + sortByOrder).Limit(uint64(limit)).Offset(uint64(offset)) //nolint:gosec sql, args, err := q.ToSql() if err != nil { @@ -1197,17 +1200,16 @@ func (t tagDao) mapToTagMetadata( dst *tagMetadataDB, ) (*types.TagMetadata, error) { return &types.TagMetadata{ - Name: dst.Name, - Size: dst.Size, - PackageType: dst.PackageType, - DigestCount: dst.DigestCount, - IsLatestVersion: dst.IsLatestVersion, - ModifiedAt: time.UnixMilli(dst.ModifiedAt), - SchemaVersion: dst.SchemaVersion, - NonConformant: dst.NonConformant, - MediaType: dst.MediaType, - Payload: dst.Payload, - DownloadCount: dst.DownloadCount, + Name: dst.Name, + Size: dst.Size, + PackageType: dst.PackageType, + DigestCount: dst.DigestCount, + ModifiedAt: time.UnixMilli(dst.ModifiedAt), + SchemaVersion: dst.SchemaVersion, + NonConformant: dst.NonConformant, + MediaType: dst.MediaType, + Payload: dst.Payload, + DownloadCount: dst.DownloadCount, }, nil } diff --git a/registry/types/artifact.go b/registry/types/artifact.go index c4f722f0a..b3f2af019 100644 --- a/registry/types/artifact.go +++ b/registry/types/artifact.go @@ -34,11 +34,10 @@ type Artifact struct { } type NonOCIArtifactMetadata struct { - Name string - Size string - PackageType artifact.PackageType - FileCount int64 - IsLatestVersion bool - ModifiedAt time.Time - DownloadCount int64 + Name string + Size string + PackageType artifact.PackageType + FileCount int64 + ModifiedAt time.Time + DownloadCount int64 } diff --git a/registry/types/tag.go b/registry/types/tag.go index 3a106ef1d..ede657565 100644 --- a/registry/types/tag.go +++ b/registry/types/tag.go @@ -46,17 +46,16 @@ type ArtifactMetadata struct { } type TagMetadata struct { - Name string - Size string - PackageType artifact.PackageType - DigestCount int - IsLatestVersion bool - ModifiedAt time.Time - SchemaVersion int - NonConformant bool - Payload Payload - MediaType string - DownloadCount int64 + Name string + Size string + PackageType artifact.PackageType + DigestCount int + ModifiedAt time.Time + SchemaVersion int + NonConformant bool + Payload Payload + MediaType string + DownloadCount int64 } type TagDetail struct {