From 5bf8c42e1f48c7daf8d1a4dbcfbb8ddef8d0bbbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Tue, 23 Jul 2024 09:39:39 +0200 Subject: [PATCH] build(deps): go run github.com/daixiang0/gci@latest write . MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- cmd/zb/helper.go | 1 - cmd/zb/main.go | 1 - cmd/zb/main_test.go | 1 - cmd/zb/perf.go | 1 - cmd/zli/main_test.go | 1 - cmd/zot/main_test.go | 1 - pkg/api/authn.go | 1 - pkg/api/authn_test.go | 1 - pkg/api/authz.go | 1 - pkg/api/config/config.go | 1 - pkg/api/config/config_elevated_test.go | 1 - pkg/api/config/config_test.go | 1 - pkg/api/controller.go | 1 - pkg/api/controller_test.go | 1 - pkg/api/cookiestore.go | 1 - pkg/api/errors/errors_test.go | 1 - pkg/api/ldap.go | 1 - pkg/api/proxy.go | 1 - pkg/api/proxy_test.go | 1 - pkg/api/recovery.go | 1 - pkg/api/routes.go | 1 - pkg/api/routes_test.go | 1 - pkg/api/session.go | 1 - pkg/cli/client/client.go | 1 - pkg/cli/client/client_test.go | 1 - pkg/cli/client/config_cmd.go | 1 - pkg/cli/client/config_cmd_test.go | 1 - pkg/cli/client/cve_cmd_internal_test.go | 1 - pkg/cli/client/cve_cmd_test.go | 1 - pkg/cli/client/cves_sub_cmd.go | 1 - pkg/cli/client/discover.go | 1 - pkg/cli/client/elevated_test.go | 1 - pkg/cli/client/flags_test.go | 1 - pkg/cli/client/gql_queries_test.go | 1 - pkg/cli/client/image_cmd_internal_test.go | 1 - pkg/cli/client/image_cmd_test.go | 1 - pkg/cli/client/image_sub_cmd.go | 1 - pkg/cli/client/repo_test.go | 1 - pkg/cli/client/root.go | 1 - pkg/cli/client/root_test.go | 1 - pkg/cli/client/search_cmd_internal_test.go | 1 - pkg/cli/client/search_cmd_test.go | 1 - pkg/cli/client/search_functions_internal_test.go | 1 - pkg/cli/client/search_sub_cmd.go | 1 - pkg/cli/client/server_info_cmd.go | 1 - pkg/cli/client/server_info_cmd_test.go | 1 - pkg/cli/client/service.go | 1 - pkg/cli/client/utils.go | 1 - pkg/cli/client/utils_internal_test.go | 1 - pkg/cli/server/config_reloader.go | 1 - pkg/cli/server/config_reloader_test.go | 1 - pkg/cli/server/extensions_test.go | 1 - pkg/cli/server/root.go | 1 - pkg/cli/server/root_test.go | 1 - pkg/cli/server/stress_test.go | 1 - pkg/cluster/cluster_test.go | 1 - pkg/common/common_test.go | 1 - pkg/common/http_client_test.go | 1 - pkg/common/http_server.go | 1 - pkg/common/oci.go | 1 - pkg/common/oci_test.go | 1 - pkg/compliance/v1_0_0/check.go | 1 - pkg/compliance/v1_0_0/check_test.go | 1 - pkg/debug/gqlplayground/gqlplayground.go | 1 - pkg/debug/gqlplayground/gqlplayground_disabled.go | 1 - pkg/debug/pprof/pprof.go | 1 - pkg/debug/pprof/pprof_disabled.go | 1 - pkg/debug/pprof/pprof_test.go | 1 - pkg/debug/swagger/swagger.go | 1 - pkg/debug/swagger/swagger_disabled.go | 1 - pkg/exporter/api/controller_test.go | 1 - pkg/exporter/api/exporter.go | 1 - pkg/exporter/cli/cli.go | 1 - pkg/exporter/cli/cli_test.go | 1 - pkg/extensions/extension_image_trust.go | 1 - pkg/extensions/extension_image_trust_disabled.go | 1 - pkg/extensions/extension_image_trust_disabled_test.go | 1 - pkg/extensions/extension_image_trust_test.go | 1 - pkg/extensions/extension_metrics.go | 1 - pkg/extensions/extension_metrics_disabled.go | 1 - pkg/extensions/extension_mgmt.go | 1 - pkg/extensions/extension_mgmt_disabled.go | 1 - pkg/extensions/extension_search.go | 1 - pkg/extensions/extension_search_disabled.go | 1 - pkg/extensions/extension_ui.go | 1 - pkg/extensions/extension_ui_disabled.go | 1 - pkg/extensions/extension_ui_test.go | 1 - pkg/extensions/extension_userprefs.go | 1 - pkg/extensions/extension_userprefs_disable.go | 1 - pkg/extensions/extension_userprefs_test.go | 1 - pkg/extensions/extensions_test.go | 1 - pkg/extensions/get_extensions.go | 1 - pkg/extensions/get_extensions_disabled_test.go | 1 - pkg/extensions/imagetrust/cosign.go | 1 - pkg/extensions/imagetrust/image_trust.go | 1 - pkg/extensions/imagetrust/image_trust_disabled.go | 1 - pkg/extensions/imagetrust/image_trust_disabled_test.go | 1 - pkg/extensions/imagetrust/image_trust_test.go | 1 - pkg/extensions/imagetrust/notation.go | 1 - pkg/extensions/lint/lint.go | 1 - pkg/extensions/lint/lint_disabled.go | 1 - pkg/extensions/lint/lint_test.go | 1 - pkg/extensions/monitoring/extension.go | 1 - pkg/extensions/monitoring/monitoring_test.go | 1 - pkg/extensions/scrub/scrub_test.go | 1 - pkg/extensions/search/convert/convert_internal_test.go | 1 - pkg/extensions/search/convert/convert_test.go | 1 - pkg/extensions/search/convert/cve.go | 1 - pkg/extensions/search/convert/metadb.go | 1 - pkg/extensions/search/convert/oci.go | 1 - pkg/extensions/search/cve/cache/cache.go | 1 - pkg/extensions/search/cve/cve.go | 1 - pkg/extensions/search/cve/cve_internal_test.go | 1 - pkg/extensions/search/cve/cve_test.go | 1 - pkg/extensions/search/cve/pagination_test.go | 1 - pkg/extensions/search/cve/scan_test.go | 1 - pkg/extensions/search/cve/trivy/scanner.go | 1 - pkg/extensions/search/cve/trivy/scanner_internal_test.go | 1 - pkg/extensions/search/cve/trivy/scanner_test.go | 1 - pkg/extensions/search/cve/update_test.go | 1 - pkg/extensions/search/digest_test.go | 1 - pkg/extensions/search/pagination/pagination_test.go | 1 - pkg/extensions/search/resolver.go | 1 - pkg/extensions/search/resolver_test.go | 1 - pkg/extensions/search/search_test.go | 1 - pkg/extensions/search/userprefs_test.go | 1 - pkg/extensions/sync/content.go | 1 - pkg/extensions/sync/content_internal_test.go | 1 - pkg/extensions/sync/destination.go | 1 - pkg/extensions/sync/httpclient/client_internal_test.go | 1 - pkg/extensions/sync/oci_layout.go | 1 - pkg/extensions/sync/on_demand.go | 1 - pkg/extensions/sync/references/cosign.go | 1 - pkg/extensions/sync/references/oci.go | 1 - pkg/extensions/sync/references/references.go | 1 - pkg/extensions/sync/references/references_internal_test.go | 1 - pkg/extensions/sync/references/referrers_tag.go | 1 - pkg/extensions/sync/remote.go | 1 - pkg/extensions/sync/service.go | 1 - pkg/extensions/sync/sync.go | 1 - pkg/extensions/sync/sync_disabled_test.go | 1 - pkg/extensions/sync/sync_internal_test.go | 1 - pkg/extensions/sync/sync_test.go | 1 - pkg/extensions/sync/utils.go | 1 - pkg/log/log_test.go | 1 - pkg/meta/boltdb/boltdb.go | 1 - pkg/meta/boltdb/boltdb_test.go | 1 - pkg/meta/common/common.go | 1 - pkg/meta/common/common_test.go | 1 - pkg/meta/convert/convert.go | 1 - pkg/meta/convert/convert_proto.go | 1 - pkg/meta/convert/convert_test.go | 1 - pkg/meta/dynamodb/dynamodb.go | 1 - pkg/meta/dynamodb/dynamodb_internal_test.go | 1 - pkg/meta/dynamodb/dynamodb_test.go | 1 - pkg/meta/dynamodb/iterator.go | 1 - pkg/meta/hooks.go | 1 - pkg/meta/hooks_test.go | 1 - pkg/meta/meta.go | 1 - pkg/meta/meta_test.go | 1 - pkg/meta/parse.go | 1 - pkg/meta/parse_test.go | 1 - pkg/meta/proto/gen/config.pb.go | 5 +++-- pkg/meta/proto/gen/descriptor.pb.go | 5 +++-- pkg/meta/proto/gen/index.pb.go | 5 +++-- pkg/meta/proto/gen/manifest.pb.go | 5 +++-- pkg/meta/proto/gen/meta.pb.go | 5 +++-- pkg/meta/proto/gen/versioned.pb.go | 5 +++-- pkg/meta/version/version_test.go | 1 - pkg/requestcontext/user_access_control.go | 1 - pkg/retention/retention.go | 1 - pkg/retention/types/types.go | 1 - pkg/scheduler/scheduler_test.go | 1 - pkg/storage/cache/boltdb.go | 1 - pkg/storage/cache/boltdb_internal_test.go | 1 - pkg/storage/cache/boltdb_test.go | 1 - pkg/storage/cache/dynamodb.go | 1 - pkg/storage/cache/dynamodb_test.go | 1 - pkg/storage/cache_benchmark_test.go | 1 - pkg/storage/cache_test.go | 1 - pkg/storage/common/common.go | 1 - pkg/storage/common/common_test.go | 1 - pkg/storage/common/lint_interface.go | 1 - pkg/storage/gc/gc.go | 1 - pkg/storage/gc/gc_internal_test.go | 1 - pkg/storage/gc/gc_test.go | 1 - pkg/storage/imagestore/imagestore.go | 1 - pkg/storage/local/driver.go | 1 - pkg/storage/local/driver_test.go | 1 - pkg/storage/local/local_elevated_test.go | 1 - pkg/storage/local/local_test.go | 1 - pkg/storage/s3/driver.go | 1 - pkg/storage/s3/s3.go | 1 - pkg/storage/s3/s3_test.go | 1 - pkg/storage/scrub.go | 1 - pkg/storage/scrub_test.go | 1 - pkg/storage/storage.go | 1 - pkg/storage/storage_test.go | 1 - pkg/storage/types/types.go | 1 - pkg/test/auth/bearer_test.go | 1 - pkg/test/common/fs_test.go | 1 - pkg/test/common/utils_test.go | 1 - pkg/test/image-utils/images.go | 1 - pkg/test/image-utils/images_test.go | 1 - pkg/test/image-utils/multiarch.go | 1 - pkg/test/image-utils/upload.go | 1 - pkg/test/image-utils/upload_test.go | 1 - pkg/test/image-utils/utils.go | 1 - pkg/test/image-utils/write.go | 1 - pkg/test/image-utils/write_test.go | 1 - pkg/test/inject/inject_test.go | 1 - pkg/test/mocks/image_store_mock.go | 1 - pkg/test/mocks/lint_mock.go | 1 - pkg/test/mocks/oci_mock.go | 1 - pkg/test/mocks/repo_db_mock.go | 1 - pkg/test/oci-utils/oci_layout.go | 1 - pkg/test/oci-utils/oci_layout_test.go | 1 - pkg/test/oci-utils/repo_test.go | 1 - pkg/test/oci-utils/store.go | 1 - pkg/test/signature/notation.go | 1 - pkg/test/signature/notation_test.go | 1 - pkg/test/skip/skip_test.go | 1 - swagger/docs_test.go | 1 - 223 files changed, 18 insertions(+), 229 deletions(-) diff --git a/cmd/zb/helper.go b/cmd/zb/helper.go index ba8a4b94..53008608 100644 --- a/cmd/zb/helper.go +++ b/cmd/zb/helper.go @@ -19,7 +19,6 @@ import ( imeta "github.com/opencontainers/image-spec/specs-go" ispec "github.com/opencontainers/image-spec/specs-go/v1" "gopkg.in/resty.v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/common" ) diff --git a/cmd/zb/main.go b/cmd/zb/main.go index 0846b4a1..a6584b55 100644 --- a/cmd/zb/main.go +++ b/cmd/zb/main.go @@ -6,7 +6,6 @@ import ( distspec "github.com/opencontainers/distribution-spec/specs-go" "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "zotregistry.dev/zot/pkg/api/config" ) diff --git a/cmd/zb/main_test.go b/cmd/zb/main_test.go index bcf1f580..91f7bca4 100644 --- a/cmd/zb/main_test.go +++ b/cmd/zb/main_test.go @@ -4,7 +4,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" ) diff --git a/cmd/zb/perf.go b/cmd/zb/perf.go index 2cc61fce..b2256a04 100644 --- a/cmd/zb/perf.go +++ b/cmd/zb/perf.go @@ -20,7 +20,6 @@ import ( jsoniter "github.com/json-iterator/go" godigest "github.com/opencontainers/go-digest" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api/constants" ) diff --git a/cmd/zli/main_test.go b/cmd/zli/main_test.go index 4b31b09c..14870f99 100644 --- a/cmd/zli/main_test.go +++ b/cmd/zli/main_test.go @@ -7,7 +7,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" cli "zotregistry.dev/zot/pkg/cli/client" diff --git a/cmd/zot/main_test.go b/cmd/zot/main_test.go index dccca8f3..f392ae28 100644 --- a/cmd/zot/main_test.go +++ b/cmd/zot/main_test.go @@ -4,7 +4,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" cli "zotregistry.dev/zot/pkg/cli/server" diff --git a/pkg/api/authn.go b/pkg/api/authn.go index 47724198..a56fcfcf 100644 --- a/pkg/api/authn.go +++ b/pkg/api/authn.go @@ -30,7 +30,6 @@ import ( "golang.org/x/crypto/bcrypt" "golang.org/x/oauth2" githubOAuth "golang.org/x/oauth2/github" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/api/authn_test.go b/pkg/api/authn_test.go index 2900e2f0..8f1cb936 100644 --- a/pkg/api/authn_test.go +++ b/pkg/api/authn_test.go @@ -20,7 +20,6 @@ import ( "github.com/project-zot/mockoidc" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/api/authz.go b/pkg/api/authz.go index 5d32533e..f79c40d5 100644 --- a/pkg/api/authz.go +++ b/pkg/api/authz.go @@ -6,7 +6,6 @@ import ( glob "github.com/bmatcuk/doublestar/v4" "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" "zotregistry.dev/zot/pkg/common" diff --git a/pkg/api/config/config.go b/pkg/api/config/config.go index 18899e1a..e95c996e 100644 --- a/pkg/api/config/config.go +++ b/pkg/api/config/config.go @@ -6,7 +6,6 @@ import ( "time" distspec "github.com/opencontainers/distribution-spec/specs-go" - extconf "zotregistry.dev/zot/pkg/extensions/config" storageConstants "zotregistry.dev/zot/pkg/storage/constants" ) diff --git a/pkg/api/config/config_elevated_test.go b/pkg/api/config/config_elevated_test.go index 32ebee5b..a7ab1e2d 100644 --- a/pkg/api/config/config_elevated_test.go +++ b/pkg/api/config/config_elevated_test.go @@ -8,7 +8,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api/config" ) diff --git a/pkg/api/config/config_test.go b/pkg/api/config/config_test.go index 34962638..2abb70e4 100644 --- a/pkg/api/config/config_test.go +++ b/pkg/api/config/config_test.go @@ -5,7 +5,6 @@ import ( "time" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api/config" ) diff --git a/pkg/api/controller.go b/pkg/api/controller.go index d86d697a..0d0933c8 100644 --- a/pkg/api/controller.go +++ b/pkg/api/controller.go @@ -16,7 +16,6 @@ import ( "github.com/gorilla/mux" "github.com/zitadel/oidc/pkg/client/rp" - "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/common" diff --git a/pkg/api/controller_test.go b/pkg/api/controller_test.go index 9437fc35..985aecec 100644 --- a/pkg/api/controller_test.go +++ b/pkg/api/controller_test.go @@ -46,7 +46,6 @@ import ( "github.com/stretchr/testify/assert" "go.etcd.io/bbolt" "gopkg.in/resty.v1" - "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" diff --git a/pkg/api/cookiestore.go b/pkg/api/cookiestore.go index b8d40d7e..a2653819 100644 --- a/pkg/api/cookiestore.go +++ b/pkg/api/cookiestore.go @@ -13,7 +13,6 @@ import ( "github.com/gorilla/securecookie" "github.com/gorilla/sessions" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/scheduler" "zotregistry.dev/zot/pkg/storage" diff --git a/pkg/api/errors/errors_test.go b/pkg/api/errors/errors_test.go index da938682..76330ffd 100644 --- a/pkg/api/errors/errors_test.go +++ b/pkg/api/errors/errors_test.go @@ -4,7 +4,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - apiErr "zotregistry.dev/zot/pkg/api/errors" ) diff --git a/pkg/api/ldap.go b/pkg/api/ldap.go index 1e209ea7..68b15422 100644 --- a/pkg/api/ldap.go +++ b/pkg/api/ldap.go @@ -10,7 +10,6 @@ import ( "time" "github.com/go-ldap/ldap/v3" - "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/log" ) diff --git a/pkg/api/proxy.go b/pkg/api/proxy.go index 96d35bfb..371ab367 100644 --- a/pkg/api/proxy.go +++ b/pkg/api/proxy.go @@ -9,7 +9,6 @@ import ( "net/http" "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/constants" "zotregistry.dev/zot/pkg/cluster" "zotregistry.dev/zot/pkg/common" diff --git a/pkg/api/proxy_test.go b/pkg/api/proxy_test.go index f11daede..be4f6f8a 100644 --- a/pkg/api/proxy_test.go +++ b/pkg/api/proxy_test.go @@ -7,7 +7,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" ) diff --git a/pkg/api/recovery.go b/pkg/api/recovery.go index 3f2aceb8..542f6222 100644 --- a/pkg/api/recovery.go +++ b/pkg/api/recovery.go @@ -6,7 +6,6 @@ import ( "runtime" "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/log" ) diff --git a/pkg/api/routes.go b/pkg/api/routes.go index 1314f5f5..c4989ce4 100644 --- a/pkg/api/routes.go +++ b/pkg/api/routes.go @@ -31,7 +31,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/zitadel/oidc/pkg/client/rp" "github.com/zitadel/oidc/pkg/oidc" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/api/routes_test.go b/pkg/api/routes_test.go index a4dd62c3..5652d68a 100644 --- a/pkg/api/routes_test.go +++ b/pkg/api/routes_test.go @@ -22,7 +22,6 @@ import ( "github.com/zitadel/oidc/pkg/client/rp" "github.com/zitadel/oidc/pkg/oidc" "golang.org/x/oauth2" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" diff --git a/pkg/api/session.go b/pkg/api/session.go index 604f9594..069c0e29 100644 --- a/pkg/api/session.go +++ b/pkg/api/session.go @@ -9,7 +9,6 @@ import ( "github.com/didip/tollbooth/v6" "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/extensions/monitoring" "zotregistry.dev/zot/pkg/log" ) diff --git a/pkg/cli/client/client.go b/pkg/cli/client/client.go index 4ef1f3a5..860e1a90 100644 --- a/pkg/cli/client/client.go +++ b/pkg/cli/client/client.go @@ -18,7 +18,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sigstore/cosign/v2/pkg/oci/remote" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/common" ) diff --git a/pkg/cli/client/client_test.go b/pkg/cli/client/client_test.go index 00b5c5a0..fb929549 100644 --- a/pkg/cli/client/client_test.go +++ b/pkg/cli/client/client_test.go @@ -15,7 +15,6 @@ import ( . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/cli/client/config_cmd.go b/pkg/cli/client/config_cmd.go index 12b41696..0c8bb5ec 100644 --- a/pkg/cli/client/config_cmd.go +++ b/pkg/cli/client/config_cmd.go @@ -14,7 +14,6 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/spf13/cobra" - zerr "zotregistry.dev/zot/errors" ) diff --git a/pkg/cli/client/config_cmd_test.go b/pkg/cli/client/config_cmd_test.go index 8051ac4b..9a107b7c 100644 --- a/pkg/cli/client/config_cmd_test.go +++ b/pkg/cli/client/config_cmd_test.go @@ -12,7 +12,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/cli/client" ) diff --git a/pkg/cli/client/cve_cmd_internal_test.go b/pkg/cli/client/cve_cmd_internal_test.go index 327f776c..127b3eb6 100644 --- a/pkg/cli/client/cve_cmd_internal_test.go +++ b/pkg/cli/client/cve_cmd_internal_test.go @@ -15,7 +15,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" diff --git a/pkg/cli/client/cve_cmd_test.go b/pkg/cli/client/cve_cmd_test.go index e06a6c91..6bc6ddf1 100644 --- a/pkg/cli/client/cve_cmd_test.go +++ b/pkg/cli/client/cve_cmd_test.go @@ -21,7 +21,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" diff --git a/pkg/cli/client/cves_sub_cmd.go b/pkg/cli/client/cves_sub_cmd.go index 171d0dd1..8f2d9e8d 100644 --- a/pkg/cli/client/cves_sub_cmd.go +++ b/pkg/cli/client/cves_sub_cmd.go @@ -8,7 +8,6 @@ import ( "strings" "github.com/spf13/cobra" - zerr "zotregistry.dev/zot/errors" zcommon "zotregistry.dev/zot/pkg/common" ) diff --git a/pkg/cli/client/discover.go b/pkg/cli/client/discover.go index 21be4925..1402ba1c 100644 --- a/pkg/cli/client/discover.go +++ b/pkg/cli/client/discover.go @@ -8,7 +8,6 @@ import ( "fmt" distext "github.com/opencontainers/distribution-spec/specs-go/v1/extensions" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/constants" zcommon "zotregistry.dev/zot/pkg/common" diff --git a/pkg/cli/client/elevated_test.go b/pkg/cli/client/elevated_test.go index f40fb8f3..5e4d7428 100644 --- a/pkg/cli/client/elevated_test.go +++ b/pkg/cli/client/elevated_test.go @@ -15,7 +15,6 @@ import ( . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/cli/client/flags_test.go b/pkg/cli/client/flags_test.go index 1fe80b16..bc129bd9 100644 --- a/pkg/cli/client/flags_test.go +++ b/pkg/cli/client/flags_test.go @@ -7,7 +7,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - . "zotregistry.dev/zot/pkg/cli/client" gql_gen "zotregistry.dev/zot/pkg/extensions/search/gql_generated" ) diff --git a/pkg/cli/client/gql_queries_test.go b/pkg/cli/client/gql_queries_test.go index bce94150..a04b2271 100644 --- a/pkg/cli/client/gql_queries_test.go +++ b/pkg/cli/client/gql_queries_test.go @@ -8,7 +8,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/cli/client" diff --git a/pkg/cli/client/image_cmd_internal_test.go b/pkg/cli/client/image_cmd_internal_test.go index 242835a4..fa670f82 100644 --- a/pkg/cli/client/image_cmd_internal_test.go +++ b/pkg/cli/client/image_cmd_internal_test.go @@ -21,7 +21,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" diff --git a/pkg/cli/client/image_cmd_test.go b/pkg/cli/client/image_cmd_test.go index e7ba0735..078740fa 100644 --- a/pkg/cli/client/image_cmd_test.go +++ b/pkg/cli/client/image_cmd_test.go @@ -22,7 +22,6 @@ import ( "github.com/sigstore/cosign/v2/cmd/cosign/cli/sign" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/cli/client" diff --git a/pkg/cli/client/image_sub_cmd.go b/pkg/cli/client/image_sub_cmd.go index 9b1202e7..77342acb 100644 --- a/pkg/cli/client/image_sub_cmd.go +++ b/pkg/cli/client/image_sub_cmd.go @@ -7,7 +7,6 @@ import ( "fmt" "github.com/spf13/cobra" - zerr "zotregistry.dev/zot/errors" zcommon "zotregistry.dev/zot/pkg/common" ) diff --git a/pkg/cli/client/repo_test.go b/pkg/cli/client/repo_test.go index 908de7fe..589212ca 100644 --- a/pkg/cli/client/repo_test.go +++ b/pkg/cli/client/repo_test.go @@ -12,7 +12,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/cli/client" diff --git a/pkg/cli/client/root.go b/pkg/cli/client/root.go index 030bc422..3fb6051d 100644 --- a/pkg/cli/client/root.go +++ b/pkg/cli/client/root.go @@ -7,7 +7,6 @@ import ( distspec "github.com/opencontainers/distribution-spec/specs-go" "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "zotregistry.dev/zot/pkg/api/config" ) diff --git a/pkg/cli/client/root_test.go b/pkg/cli/client/root_test.go index f7a0a1e1..01217f7a 100644 --- a/pkg/cli/client/root_test.go +++ b/pkg/cli/client/root_test.go @@ -8,7 +8,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/cli/client" ) diff --git a/pkg/cli/client/search_cmd_internal_test.go b/pkg/cli/client/search_cmd_internal_test.go index 5cc628df..b7dd443c 100644 --- a/pkg/cli/client/search_cmd_internal_test.go +++ b/pkg/cli/client/search_cmd_internal_test.go @@ -12,7 +12,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" extconf "zotregistry.dev/zot/pkg/extensions/config" diff --git a/pkg/cli/client/search_cmd_test.go b/pkg/cli/client/search_cmd_test.go index 36ab1a0d..1ff385f7 100644 --- a/pkg/cli/client/search_cmd_test.go +++ b/pkg/cli/client/search_cmd_test.go @@ -14,7 +14,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/cli/client" diff --git a/pkg/cli/client/search_functions_internal_test.go b/pkg/cli/client/search_functions_internal_test.go index 97f5e163..e0e31e88 100644 --- a/pkg/cli/client/search_functions_internal_test.go +++ b/pkg/cli/client/search_functions_internal_test.go @@ -20,7 +20,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" "github.com/spf13/cobra" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/common" ) diff --git a/pkg/cli/client/search_sub_cmd.go b/pkg/cli/client/search_sub_cmd.go index a94a5f03..cce2ef2b 100644 --- a/pkg/cli/client/search_sub_cmd.go +++ b/pkg/cli/client/search_sub_cmd.go @@ -7,7 +7,6 @@ import ( "fmt" "github.com/spf13/cobra" - zerr "zotregistry.dev/zot/errors" zcommon "zotregistry.dev/zot/pkg/common" ) diff --git a/pkg/cli/client/server_info_cmd.go b/pkg/cli/client/server_info_cmd.go index e126d9f6..157bd8bc 100644 --- a/pkg/cli/client/server_info_cmd.go +++ b/pkg/cli/client/server_info_cmd.go @@ -12,7 +12,6 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/constants" ) diff --git a/pkg/cli/client/server_info_cmd_test.go b/pkg/cli/client/server_info_cmd_test.go index 607bdf53..554b4a56 100644 --- a/pkg/cli/client/server_info_cmd_test.go +++ b/pkg/cli/client/server_info_cmd_test.go @@ -13,7 +13,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" diff --git a/pkg/cli/client/service.go b/pkg/cli/client/service.go index dffbc593..c102324d 100644 --- a/pkg/cli/client/service.go +++ b/pkg/cli/client/service.go @@ -19,7 +19,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" "gopkg.in/yaml.v2" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/constants" "zotregistry.dev/zot/pkg/common" diff --git a/pkg/cli/client/utils.go b/pkg/cli/client/utils.go index dc7a5752..934c0718 100644 --- a/pkg/cli/client/utils.go +++ b/pkg/cli/client/utils.go @@ -15,7 +15,6 @@ import ( "github.com/briandowns/spinner" "github.com/spf13/cobra" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/constants" ) diff --git a/pkg/cli/client/utils_internal_test.go b/pkg/cli/client/utils_internal_test.go index 2068c394..47125553 100644 --- a/pkg/cli/client/utils_internal_test.go +++ b/pkg/cli/client/utils_internal_test.go @@ -16,7 +16,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - test "zotregistry.dev/zot/pkg/test/common" ) diff --git a/pkg/cli/server/config_reloader.go b/pkg/cli/server/config_reloader.go index 5d2ccbe6..adf4fdcf 100644 --- a/pkg/cli/server/config_reloader.go +++ b/pkg/cli/server/config_reloader.go @@ -8,7 +8,6 @@ import ( "github.com/fsnotify/fsnotify" "github.com/rs/zerolog/log" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" ) diff --git a/pkg/cli/server/config_reloader_test.go b/pkg/cli/server/config_reloader_test.go index aa8f0f94..25462be5 100644 --- a/pkg/cli/server/config_reloader_test.go +++ b/pkg/cli/server/config_reloader_test.go @@ -11,7 +11,6 @@ import ( "time" . "github.com/smartystreets/goconvey/convey" - cli "zotregistry.dev/zot/pkg/cli/server" test "zotregistry.dev/zot/pkg/test/common" ) diff --git a/pkg/cli/server/extensions_test.go b/pkg/cli/server/extensions_test.go index 5546473f..a34455fc 100644 --- a/pkg/cli/server/extensions_test.go +++ b/pkg/cli/server/extensions_test.go @@ -12,7 +12,6 @@ import ( . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api/config" cli "zotregistry.dev/zot/pkg/cli/server" . "zotregistry.dev/zot/pkg/test/common" diff --git a/pkg/cli/server/root.go b/pkg/cli/server/root.go index 46f16b0d..708b5da4 100644 --- a/pkg/cli/server/root.go +++ b/pkg/cli/server/root.go @@ -20,7 +20,6 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" diff --git a/pkg/cli/server/root_test.go b/pkg/cli/server/root_test.go index 9e7fab4e..702bf235 100644 --- a/pkg/cli/server/root_test.go +++ b/pkg/cli/server/root_test.go @@ -10,7 +10,6 @@ import ( "time" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" cli "zotregistry.dev/zot/pkg/cli/server" diff --git a/pkg/cli/server/stress_test.go b/pkg/cli/server/stress_test.go index e749b443..12f954e8 100644 --- a/pkg/cli/server/stress_test.go +++ b/pkg/cli/server/stress_test.go @@ -13,7 +13,6 @@ import ( "time" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" cli "zotregistry.dev/zot/pkg/cli/server" diff --git a/pkg/cluster/cluster_test.go b/pkg/cluster/cluster_test.go index 9252688e..868c6a4b 100644 --- a/pkg/cluster/cluster_test.go +++ b/pkg/cluster/cluster_test.go @@ -4,7 +4,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/cluster" ) diff --git a/pkg/common/common_test.go b/pkg/common/common_test.go index 3d7b5e9e..73062612 100644 --- a/pkg/common/common_test.go +++ b/pkg/common/common_test.go @@ -8,7 +8,6 @@ import ( notreg "github.com/notaryproject/notation-go/registry" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/common" ) diff --git a/pkg/common/http_client_test.go b/pkg/common/http_client_test.go index c74473dd..d0e3c7aa 100644 --- a/pkg/common/http_client_test.go +++ b/pkg/common/http_client_test.go @@ -8,7 +8,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/common" test "zotregistry.dev/zot/pkg/test/common" ) diff --git a/pkg/common/http_server.go b/pkg/common/http_server.go index 31551127..06069075 100644 --- a/pkg/common/http_server.go +++ b/pkg/common/http_server.go @@ -9,7 +9,6 @@ import ( "github.com/gorilla/mux" jsoniter "github.com/json-iterator/go" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" apiErr "zotregistry.dev/zot/pkg/api/errors" diff --git a/pkg/common/oci.go b/pkg/common/oci.go index 6e3c518b..27111fbd 100644 --- a/pkg/common/oci.go +++ b/pkg/common/oci.go @@ -6,7 +6,6 @@ import ( "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" ) diff --git a/pkg/common/oci_test.go b/pkg/common/oci_test.go index e01941ad..37bd994f 100644 --- a/pkg/common/oci_test.go +++ b/pkg/common/oci_test.go @@ -4,7 +4,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/common" ) diff --git a/pkg/compliance/v1_0_0/check.go b/pkg/compliance/v1_0_0/check.go index b0a49a75..0dd5bcb7 100644 --- a/pkg/compliance/v1_0_0/check.go +++ b/pkg/compliance/v1_0_0/check.go @@ -18,7 +18,6 @@ import ( . "github.com/smartystreets/goconvey/convey" "github.com/smartystreets/goconvey/convey/reporting" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/constants" "zotregistry.dev/zot/pkg/compliance" diff --git a/pkg/compliance/v1_0_0/check_test.go b/pkg/compliance/v1_0_0/check_test.go index d4821c08..271fce06 100644 --- a/pkg/compliance/v1_0_0/check_test.go +++ b/pkg/compliance/v1_0_0/check_test.go @@ -8,7 +8,6 @@ import ( "time" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/compliance" diff --git a/pkg/debug/gqlplayground/gqlplayground.go b/pkg/debug/gqlplayground/gqlplayground.go index 9d929d55..92edbdb9 100644 --- a/pkg/debug/gqlplayground/gqlplayground.go +++ b/pkg/debug/gqlplayground/gqlplayground.go @@ -9,7 +9,6 @@ import ( "net/http" "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/constants" debugCst "zotregistry.dev/zot/pkg/debug/constants" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/debug/gqlplayground/gqlplayground_disabled.go b/pkg/debug/gqlplayground/gqlplayground_disabled.go index bec22002..e513c483 100644 --- a/pkg/debug/gqlplayground/gqlplayground_disabled.go +++ b/pkg/debug/gqlplayground/gqlplayground_disabled.go @@ -5,7 +5,6 @@ package debug import ( "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/log" "zotregistry.dev/zot/pkg/storage" ) diff --git a/pkg/debug/pprof/pprof.go b/pkg/debug/pprof/pprof.go index c2e6bd94..9a0f5850 100644 --- a/pkg/debug/pprof/pprof.go +++ b/pkg/debug/pprof/pprof.go @@ -16,7 +16,6 @@ import ( "strings" "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/config" registryConst "zotregistry.dev/zot/pkg/api/constants" zcommon "zotregistry.dev/zot/pkg/common" diff --git a/pkg/debug/pprof/pprof_disabled.go b/pkg/debug/pprof/pprof_disabled.go index ef553a11..4f1b0a55 100644 --- a/pkg/debug/pprof/pprof_disabled.go +++ b/pkg/debug/pprof/pprof_disabled.go @@ -5,7 +5,6 @@ package pprof import ( "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/log" //nolint:goimports ) diff --git a/pkg/debug/pprof/pprof_test.go b/pkg/debug/pprof/pprof_test.go index f5166de3..14841b5d 100644 --- a/pkg/debug/pprof/pprof_test.go +++ b/pkg/debug/pprof/pprof_test.go @@ -10,7 +10,6 @@ import ( . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/debug/swagger/swagger.go b/pkg/debug/swagger/swagger.go index e59af94e..d801b3ec 100644 --- a/pkg/debug/swagger/swagger.go +++ b/pkg/debug/swagger/swagger.go @@ -10,7 +10,6 @@ package debug import ( "github.com/gorilla/mux" httpSwagger "github.com/swaggo/http-swagger" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/log" //nolint:goimports // as required by swaggo. diff --git a/pkg/debug/swagger/swagger_disabled.go b/pkg/debug/swagger/swagger_disabled.go index 9da16d07..26699d96 100644 --- a/pkg/debug/swagger/swagger_disabled.go +++ b/pkg/debug/swagger/swagger_disabled.go @@ -9,7 +9,6 @@ package debug import ( "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/log" ) diff --git a/pkg/exporter/api/controller_test.go b/pkg/exporter/api/controller_test.go index 16c31ed9..748eaaf4 100644 --- a/pkg/exporter/api/controller_test.go +++ b/pkg/exporter/api/controller_test.go @@ -21,7 +21,6 @@ import ( dto "github.com/prometheus/client_model/go" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - zotapi "zotregistry.dev/zot/pkg/api" zotcfg "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/exporter/api" diff --git a/pkg/exporter/api/exporter.go b/pkg/exporter/api/exporter.go index 251faf76..d99c8e32 100644 --- a/pkg/exporter/api/exporter.go +++ b/pkg/exporter/api/exporter.go @@ -14,7 +14,6 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "zotregistry.dev/zot/pkg/extensions/monitoring" "zotregistry.dev/zot/pkg/log" ) diff --git a/pkg/exporter/cli/cli.go b/pkg/exporter/cli/cli.go index c9bb1211..facd4a71 100644 --- a/pkg/exporter/cli/cli.go +++ b/pkg/exporter/cli/cli.go @@ -8,7 +8,6 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/exporter/api" ) diff --git a/pkg/exporter/cli/cli_test.go b/pkg/exporter/cli/cli_test.go index 3ceee64c..117c5fef 100644 --- a/pkg/exporter/cli/cli_test.go +++ b/pkg/exporter/cli/cli_test.go @@ -8,7 +8,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/exporter/cli" ) diff --git a/pkg/extensions/extension_image_trust.go b/pkg/extensions/extension_image_trust.go index 7520dfda..11976451 100644 --- a/pkg/extensions/extension_image_trust.go +++ b/pkg/extensions/extension_image_trust.go @@ -10,7 +10,6 @@ import ( "time" "github.com/gorilla/mux" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/extensions/extension_image_trust_disabled.go b/pkg/extensions/extension_image_trust_disabled.go index baa424ef..8131942f 100644 --- a/pkg/extensions/extension_image_trust_disabled.go +++ b/pkg/extensions/extension_image_trust_disabled.go @@ -5,7 +5,6 @@ package extensions import ( "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/log" mTypes "zotregistry.dev/zot/pkg/meta/types" diff --git a/pkg/extensions/extension_image_trust_disabled_test.go b/pkg/extensions/extension_image_trust_disabled_test.go index bc860fc6..3ca4f5f0 100644 --- a/pkg/extensions/extension_image_trust_disabled_test.go +++ b/pkg/extensions/extension_image_trust_disabled_test.go @@ -7,7 +7,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" extconf "zotregistry.dev/zot/pkg/extensions/config" diff --git a/pkg/extensions/extension_image_trust_test.go b/pkg/extensions/extension_image_trust_test.go index 6ba6c18b..dda02ded 100644 --- a/pkg/extensions/extension_image_trust_test.go +++ b/pkg/extensions/extension_image_trust_test.go @@ -22,7 +22,6 @@ import ( "github.com/sigstore/cosign/v2/cmd/cosign/cli/sign" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/extensions/extension_metrics.go b/pkg/extensions/extension_metrics.go index 0555ef0b..66c11b23 100644 --- a/pkg/extensions/extension_metrics.go +++ b/pkg/extensions/extension_metrics.go @@ -6,7 +6,6 @@ package extensions import ( "github.com/gorilla/mux" "github.com/prometheus/client_golang/prometheus/promhttp" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/extensions/monitoring" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/extensions/extension_metrics_disabled.go b/pkg/extensions/extension_metrics_disabled.go index 3b5b935b..d7eaa055 100644 --- a/pkg/extensions/extension_metrics_disabled.go +++ b/pkg/extensions/extension_metrics_disabled.go @@ -7,7 +7,6 @@ import ( "net/http" "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/config" zcommon "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/monitoring" diff --git a/pkg/extensions/extension_mgmt.go b/pkg/extensions/extension_mgmt.go index 85882ea1..43013a80 100644 --- a/pkg/extensions/extension_mgmt.go +++ b/pkg/extensions/extension_mgmt.go @@ -8,7 +8,6 @@ import ( "net/http" "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" zcommon "zotregistry.dev/zot/pkg/common" diff --git a/pkg/extensions/extension_mgmt_disabled.go b/pkg/extensions/extension_mgmt_disabled.go index 59739c6b..943a2dcc 100644 --- a/pkg/extensions/extension_mgmt_disabled.go +++ b/pkg/extensions/extension_mgmt_disabled.go @@ -5,7 +5,6 @@ package extensions import ( "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/log" ) diff --git a/pkg/extensions/extension_search.go b/pkg/extensions/extension_search.go index e9523e5a..06cf8aa8 100644 --- a/pkg/extensions/extension_search.go +++ b/pkg/extensions/extension_search.go @@ -9,7 +9,6 @@ import ( gqlHandler "github.com/99designs/gqlgen/graphql/handler" "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" zcommon "zotregistry.dev/zot/pkg/common" diff --git a/pkg/extensions/extension_search_disabled.go b/pkg/extensions/extension_search_disabled.go index 6f57e34d..7038674d 100644 --- a/pkg/extensions/extension_search_disabled.go +++ b/pkg/extensions/extension_search_disabled.go @@ -5,7 +5,6 @@ package extensions import ( "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/log" mTypes "zotregistry.dev/zot/pkg/meta/types" diff --git a/pkg/extensions/extension_ui.go b/pkg/extensions/extension_ui.go index abb7a362..1818a5e4 100644 --- a/pkg/extensions/extension_ui.go +++ b/pkg/extensions/extension_ui.go @@ -10,7 +10,6 @@ import ( "strings" "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/config" zcommon "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/extensions/extension_ui_disabled.go b/pkg/extensions/extension_ui_disabled.go index 76e765f8..a51c3f48 100644 --- a/pkg/extensions/extension_ui_disabled.go +++ b/pkg/extensions/extension_ui_disabled.go @@ -5,7 +5,6 @@ package extensions import ( "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/log" ) diff --git a/pkg/extensions/extension_ui_test.go b/pkg/extensions/extension_ui_test.go index b4c39991..4e205bd9 100644 --- a/pkg/extensions/extension_ui_test.go +++ b/pkg/extensions/extension_ui_test.go @@ -12,7 +12,6 @@ import ( . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" extconf "zotregistry.dev/zot/pkg/extensions/config" diff --git a/pkg/extensions/extension_userprefs.go b/pkg/extensions/extension_userprefs.go index f21a0088..5e3d9e8f 100644 --- a/pkg/extensions/extension_userprefs.go +++ b/pkg/extensions/extension_userprefs.go @@ -8,7 +8,6 @@ import ( "net/http" "github.com/gorilla/mux" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/extensions/extension_userprefs_disable.go b/pkg/extensions/extension_userprefs_disable.go index 9c74fc3a..e77584d5 100644 --- a/pkg/extensions/extension_userprefs_disable.go +++ b/pkg/extensions/extension_userprefs_disable.go @@ -5,7 +5,6 @@ package extensions import ( "github.com/gorilla/mux" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/log" mTypes "zotregistry.dev/zot/pkg/meta/types" diff --git a/pkg/extensions/extension_userprefs_test.go b/pkg/extensions/extension_userprefs_test.go index 6db5ec2a..409eac1a 100644 --- a/pkg/extensions/extension_userprefs_test.go +++ b/pkg/extensions/extension_userprefs_test.go @@ -14,7 +14,6 @@ import ( "github.com/gorilla/mux" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" diff --git a/pkg/extensions/extensions_test.go b/pkg/extensions/extensions_test.go index dc61cf90..add6a0d4 100644 --- a/pkg/extensions/extensions_test.go +++ b/pkg/extensions/extensions_test.go @@ -14,7 +14,6 @@ import ( . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/extensions/get_extensions.go b/pkg/extensions/get_extensions.go index 47dfef13..534312b1 100644 --- a/pkg/extensions/get_extensions.go +++ b/pkg/extensions/get_extensions.go @@ -2,7 +2,6 @@ package extensions import ( distext "github.com/opencontainers/distribution-spec/specs-go/v1/extensions" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/extensions/get_extensions_disabled_test.go b/pkg/extensions/get_extensions_disabled_test.go index 92d1facc..828ccab7 100644 --- a/pkg/extensions/get_extensions_disabled_test.go +++ b/pkg/extensions/get_extensions_disabled_test.go @@ -10,7 +10,6 @@ import ( distext "github.com/opencontainers/distribution-spec/specs-go/v1/extensions" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/extensions/imagetrust/cosign.go b/pkg/extensions/imagetrust/cosign.go index 8c8ddbc5..769685c7 100644 --- a/pkg/extensions/imagetrust/cosign.go +++ b/pkg/extensions/imagetrust/cosign.go @@ -21,7 +21,6 @@ import ( "github.com/sigstore/sigstore/pkg/cryptoutils" sigstoreSigs "github.com/sigstore/sigstore/pkg/signature" "github.com/sigstore/sigstore/pkg/signature/options" - zerr "zotregistry.dev/zot/errors" ) diff --git a/pkg/extensions/imagetrust/image_trust.go b/pkg/extensions/imagetrust/image_trust.go index e9f256d2..3cf5ad5c 100644 --- a/pkg/extensions/imagetrust/image_trust.go +++ b/pkg/extensions/imagetrust/image_trust.go @@ -21,7 +21,6 @@ import ( smithy "github.com/aws/smithy-go" godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" zcommon "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/extensions/imagetrust/image_trust_disabled.go b/pkg/extensions/imagetrust/image_trust_disabled.go index b28fe694..beb87567 100644 --- a/pkg/extensions/imagetrust/image_trust_disabled.go +++ b/pkg/extensions/imagetrust/image_trust_disabled.go @@ -7,7 +7,6 @@ import ( "time" godigest "github.com/opencontainers/go-digest" - mTypes "zotregistry.dev/zot/pkg/meta/types" ) diff --git a/pkg/extensions/imagetrust/image_trust_disabled_test.go b/pkg/extensions/imagetrust/image_trust_disabled_test.go index 32242078..00a89ffe 100644 --- a/pkg/extensions/imagetrust/image_trust_disabled_test.go +++ b/pkg/extensions/imagetrust/image_trust_disabled_test.go @@ -8,7 +8,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/extensions/imagetrust" . "zotregistry.dev/zot/pkg/test/image-utils" ) diff --git a/pkg/extensions/imagetrust/image_trust_test.go b/pkg/extensions/imagetrust/image_trust_test.go index 87f1e430..d3c2c9a9 100644 --- a/pkg/extensions/imagetrust/image_trust_test.go +++ b/pkg/extensions/imagetrust/image_trust_test.go @@ -32,7 +32,6 @@ import ( "github.com/sigstore/cosign/v2/cmd/cosign/cli/sign" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" diff --git a/pkg/extensions/imagetrust/notation.go b/pkg/extensions/imagetrust/notation.go index 5b382830..2911a79a 100644 --- a/pkg/extensions/imagetrust/notation.go +++ b/pkg/extensions/imagetrust/notation.go @@ -30,7 +30,6 @@ import ( "github.com/notaryproject/notation-go/verifier/truststore" godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" ) diff --git a/pkg/extensions/lint/lint.go b/pkg/extensions/lint/lint.go index 3ea0be74..22d39298 100644 --- a/pkg/extensions/lint/lint.go +++ b/pkg/extensions/lint/lint.go @@ -9,7 +9,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/extensions/config" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/extensions/lint/lint_disabled.go b/pkg/extensions/lint/lint_disabled.go index 9e35bcf0..773108e4 100644 --- a/pkg/extensions/lint/lint_disabled.go +++ b/pkg/extensions/lint/lint_disabled.go @@ -5,7 +5,6 @@ package lint import ( godigest "github.com/opencontainers/go-digest" - storageTypes "zotregistry.dev/zot/pkg/storage/types" ) diff --git a/pkg/extensions/lint/lint_test.go b/pkg/extensions/lint/lint_test.go index 88402605..8f3440a5 100644 --- a/pkg/extensions/lint/lint_test.go +++ b/pkg/extensions/lint/lint_test.go @@ -15,7 +15,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" extconf "zotregistry.dev/zot/pkg/extensions/config" diff --git a/pkg/extensions/monitoring/extension.go b/pkg/extensions/monitoring/extension.go index e9c8eacf..b835daaa 100644 --- a/pkg/extensions/monitoring/extension.go +++ b/pkg/extensions/monitoring/extension.go @@ -9,7 +9,6 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/log" ) diff --git a/pkg/extensions/monitoring/monitoring_test.go b/pkg/extensions/monitoring/monitoring_test.go index fad46c8a..3da814ea 100644 --- a/pkg/extensions/monitoring/monitoring_test.go +++ b/pkg/extensions/monitoring/monitoring_test.go @@ -15,7 +15,6 @@ import ( . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" extconf "zotregistry.dev/zot/pkg/extensions/config" diff --git a/pkg/extensions/scrub/scrub_test.go b/pkg/extensions/scrub/scrub_test.go index eb4f3c72..8f76af44 100644 --- a/pkg/extensions/scrub/scrub_test.go +++ b/pkg/extensions/scrub/scrub_test.go @@ -12,7 +12,6 @@ import ( "time" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" extconf "zotregistry.dev/zot/pkg/extensions/config" diff --git a/pkg/extensions/search/convert/convert_internal_test.go b/pkg/extensions/search/convert/convert_internal_test.go index 9b54b8bb..f2ab466a 100644 --- a/pkg/extensions/search/convert/convert_internal_test.go +++ b/pkg/extensions/search/convert/convert_internal_test.go @@ -10,7 +10,6 @@ import ( "github.com/99designs/gqlgen/graphql" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - cvemodel "zotregistry.dev/zot/pkg/extensions/search/cve/model" "zotregistry.dev/zot/pkg/extensions/search/gql_generated" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/extensions/search/convert/convert_test.go b/pkg/extensions/search/convert/convert_test.go index 9e4106c9..35e6b080 100644 --- a/pkg/extensions/search/convert/convert_test.go +++ b/pkg/extensions/search/convert/convert_test.go @@ -11,7 +11,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/extensions/search/convert" "zotregistry.dev/zot/pkg/extensions/search/gql_generated" "zotregistry.dev/zot/pkg/extensions/search/pagination" diff --git a/pkg/extensions/search/convert/cve.go b/pkg/extensions/search/convert/cve.go index cea29793..329c15c9 100644 --- a/pkg/extensions/search/convert/cve.go +++ b/pkg/extensions/search/convert/cve.go @@ -6,7 +6,6 @@ import ( "github.com/99designs/gqlgen/graphql" ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/vektah/gqlparser/v2/gqlerror" - cveinfo "zotregistry.dev/zot/pkg/extensions/search/cve" cvemodel "zotregistry.dev/zot/pkg/extensions/search/cve/model" "zotregistry.dev/zot/pkg/extensions/search/gql_generated" diff --git a/pkg/extensions/search/convert/metadb.go b/pkg/extensions/search/convert/metadb.go index 90faf7f6..21c7b128 100644 --- a/pkg/extensions/search/convert/metadb.go +++ b/pkg/extensions/search/convert/metadb.go @@ -9,7 +9,6 @@ import ( "github.com/99designs/gqlgen/graphql" ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/vektah/gqlparser/v2/gqlerror" - zerr "zotregistry.dev/zot/errors" zcommon "zotregistry.dev/zot/pkg/common" cveinfo "zotregistry.dev/zot/pkg/extensions/search/cve" diff --git a/pkg/extensions/search/convert/oci.go b/pkg/extensions/search/convert/oci.go index d5b7f11b..febd839c 100644 --- a/pkg/extensions/search/convert/oci.go +++ b/pkg/extensions/search/convert/oci.go @@ -4,7 +4,6 @@ import ( "strconv" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/extensions/search/gql_generated" ) diff --git a/pkg/extensions/search/cve/cache/cache.go b/pkg/extensions/search/cve/cache/cache.go index 92866d45..8c84ebb5 100644 --- a/pkg/extensions/search/cve/cache/cache.go +++ b/pkg/extensions/search/cve/cache/cache.go @@ -2,7 +2,6 @@ package cache import ( lru "github.com/hashicorp/golang-lru/v2" - cvemodel "zotregistry.dev/zot/pkg/extensions/search/cve/model" "zotregistry.dev/zot/pkg/log" ) diff --git a/pkg/extensions/search/cve/cve.go b/pkg/extensions/search/cve/cve.go index 1ebf530e..171b4426 100644 --- a/pkg/extensions/search/cve/cve.go +++ b/pkg/extensions/search/cve/cve.go @@ -8,7 +8,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" zcommon "zotregistry.dev/zot/pkg/common" cvemodel "zotregistry.dev/zot/pkg/extensions/search/cve/model" diff --git a/pkg/extensions/search/cve/cve_internal_test.go b/pkg/extensions/search/cve/cve_internal_test.go index 4f902cfd..3733e0b7 100644 --- a/pkg/extensions/search/cve/cve_internal_test.go +++ b/pkg/extensions/search/cve/cve_internal_test.go @@ -10,7 +10,6 @@ import ( "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - cvemodel "zotregistry.dev/zot/pkg/extensions/search/cve/model" "zotregistry.dev/zot/pkg/meta/types" "zotregistry.dev/zot/pkg/test/mocks" diff --git a/pkg/extensions/search/cve/cve_test.go b/pkg/extensions/search/cve/cve_test.go index 252d5d3b..52fbcdbb 100644 --- a/pkg/extensions/search/cve/cve_test.go +++ b/pkg/extensions/search/cve/cve_test.go @@ -21,7 +21,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" diff --git a/pkg/extensions/search/cve/pagination_test.go b/pkg/extensions/search/cve/pagination_test.go index 53a43e29..7ff7bb55 100644 --- a/pkg/extensions/search/cve/pagination_test.go +++ b/pkg/extensions/search/cve/pagination_test.go @@ -12,7 +12,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - cveinfo "zotregistry.dev/zot/pkg/extensions/search/cve" cvemodel "zotregistry.dev/zot/pkg/extensions/search/cve/model" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/extensions/search/cve/scan_test.go b/pkg/extensions/search/cve/scan_test.go index bcc41978..b7162747 100644 --- a/pkg/extensions/search/cve/scan_test.go +++ b/pkg/extensions/search/cve/scan_test.go @@ -15,7 +15,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/config" zcommon "zotregistry.dev/zot/pkg/common" diff --git a/pkg/extensions/search/cve/trivy/scanner.go b/pkg/extensions/search/cve/trivy/scanner.go index e04d076a..82ff9be8 100644 --- a/pkg/extensions/search/cve/trivy/scanner.go +++ b/pkg/extensions/search/cve/trivy/scanner.go @@ -22,7 +22,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" _ "modernc.org/sqlite" - zerr "zotregistry.dev/zot/errors" zcommon "zotregistry.dev/zot/pkg/common" cvecache "zotregistry.dev/zot/pkg/extensions/search/cve/cache" diff --git a/pkg/extensions/search/cve/trivy/scanner_internal_test.go b/pkg/extensions/search/cve/trivy/scanner_internal_test.go index 00c94a43..ce485076 100644 --- a/pkg/extensions/search/cve/trivy/scanner_internal_test.go +++ b/pkg/extensions/search/cve/trivy/scanner_internal_test.go @@ -13,7 +13,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/monitoring" diff --git a/pkg/extensions/search/cve/trivy/scanner_test.go b/pkg/extensions/search/cve/trivy/scanner_test.go index 3597a0dc..7c90b018 100644 --- a/pkg/extensions/search/cve/trivy/scanner_test.go +++ b/pkg/extensions/search/cve/trivy/scanner_test.go @@ -12,7 +12,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" extconf "zotregistry.dev/zot/pkg/extensions/config" diff --git a/pkg/extensions/search/cve/update_test.go b/pkg/extensions/search/cve/update_test.go index cbb9a0e5..01aa84d0 100644 --- a/pkg/extensions/search/cve/update_test.go +++ b/pkg/extensions/search/cve/update_test.go @@ -12,7 +12,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/extensions/monitoring" cveinfo "zotregistry.dev/zot/pkg/extensions/search/cve" diff --git a/pkg/extensions/search/digest_test.go b/pkg/extensions/search/digest_test.go index 4731b2b2..b4cff44c 100644 --- a/pkg/extensions/search/digest_test.go +++ b/pkg/extensions/search/digest_test.go @@ -14,7 +14,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/extensions/search/pagination/pagination_test.go b/pkg/extensions/search/pagination/pagination_test.go index 2a024e1d..3884610d 100644 --- a/pkg/extensions/search/pagination/pagination_test.go +++ b/pkg/extensions/search/pagination/pagination_test.go @@ -7,7 +7,6 @@ import ( "time" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/extensions/search/gql_generated" "zotregistry.dev/zot/pkg/extensions/search/pagination" ) diff --git a/pkg/extensions/search/resolver.go b/pkg/extensions/search/resolver.go index 349932ae..bb49dd8a 100644 --- a/pkg/extensions/search/resolver.go +++ b/pkg/extensions/search/resolver.go @@ -14,7 +14,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/vektah/gqlparser/v2/gqlerror" - zerr "zotregistry.dev/zot/errors" zcommon "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/search/convert" diff --git a/pkg/extensions/search/resolver_test.go b/pkg/extensions/search/resolver_test.go index 16651604..b96b51ae 100644 --- a/pkg/extensions/search/resolver_test.go +++ b/pkg/extensions/search/resolver_test.go @@ -13,7 +13,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/search/convert" diff --git a/pkg/extensions/search/search_test.go b/pkg/extensions/search/search_test.go index 088ea839..42a2da03 100644 --- a/pkg/extensions/search/search_test.go +++ b/pkg/extensions/search/search_test.go @@ -26,7 +26,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" diff --git a/pkg/extensions/search/userprefs_test.go b/pkg/extensions/search/userprefs_test.go index 9d6fab30..24fc434e 100644 --- a/pkg/extensions/search/userprefs_test.go +++ b/pkg/extensions/search/userprefs_test.go @@ -12,7 +12,6 @@ import ( . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/extensions/sync/content.go b/pkg/extensions/sync/content.go index 3a1de48a..08450ac9 100644 --- a/pkg/extensions/sync/content.go +++ b/pkg/extensions/sync/content.go @@ -9,7 +9,6 @@ import ( "github.com/Masterminds/semver" glob "github.com/bmatcuk/doublestar/v4" - "zotregistry.dev/zot/pkg/common" syncconf "zotregistry.dev/zot/pkg/extensions/config/sync" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/extensions/sync/content_internal_test.go b/pkg/extensions/sync/content_internal_test.go index 118ee46c..b334167b 100644 --- a/pkg/extensions/sync/content_internal_test.go +++ b/pkg/extensions/sync/content_internal_test.go @@ -7,7 +7,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - syncconf "zotregistry.dev/zot/pkg/extensions/config/sync" "zotregistry.dev/zot/pkg/log" ) diff --git a/pkg/extensions/sync/destination.go b/pkg/extensions/sync/destination.go index 400a73a6..9d33551a 100644 --- a/pkg/extensions/sync/destination.go +++ b/pkg/extensions/sync/destination.go @@ -16,7 +16,6 @@ import ( "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/monitoring" diff --git a/pkg/extensions/sync/httpclient/client_internal_test.go b/pkg/extensions/sync/httpclient/client_internal_test.go index 48ec04da..8f8f5b5b 100644 --- a/pkg/extensions/sync/httpclient/client_internal_test.go +++ b/pkg/extensions/sync/httpclient/client_internal_test.go @@ -7,7 +7,6 @@ import ( "time" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/log" ) diff --git a/pkg/extensions/sync/oci_layout.go b/pkg/extensions/sync/oci_layout.go index c44a955c..30f47980 100644 --- a/pkg/extensions/sync/oci_layout.go +++ b/pkg/extensions/sync/oci_layout.go @@ -11,7 +11,6 @@ import ( "github.com/containers/image/v5/oci/layout" "github.com/containers/image/v5/types" "github.com/gofrs/uuid" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/extensions/sync/constants" "zotregistry.dev/zot/pkg/storage" diff --git a/pkg/extensions/sync/on_demand.go b/pkg/extensions/sync/on_demand.go index 02ef21be..fbcb6211 100644 --- a/pkg/extensions/sync/on_demand.go +++ b/pkg/extensions/sync/on_demand.go @@ -10,7 +10,6 @@ import ( "time" "github.com/containers/common/pkg/retry" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/extensions/sync/references/cosign.go b/pkg/extensions/sync/references/cosign.go index eaa6008c..185725bc 100644 --- a/pkg/extensions/sync/references/cosign.go +++ b/pkg/extensions/sync/references/cosign.go @@ -13,7 +13,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sigstore/cosign/v2/pkg/oci/remote" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/sync/constants" diff --git a/pkg/extensions/sync/references/oci.go b/pkg/extensions/sync/references/oci.go index 16c78f4d..b2867d62 100644 --- a/pkg/extensions/sync/references/oci.go +++ b/pkg/extensions/sync/references/oci.go @@ -12,7 +12,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/sync/constants" diff --git a/pkg/extensions/sync/references/references.go b/pkg/extensions/sync/references/references.go index 3e7ec274..8f26a324 100644 --- a/pkg/extensions/sync/references/references.go +++ b/pkg/extensions/sync/references/references.go @@ -13,7 +13,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sigstore/cosign/v2/pkg/oci/static" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/sync/constants" diff --git a/pkg/extensions/sync/references/references_internal_test.go b/pkg/extensions/sync/references/references_internal_test.go index a17020ce..a2bed569 100644 --- a/pkg/extensions/sync/references/references_internal_test.go +++ b/pkg/extensions/sync/references/references_internal_test.go @@ -11,7 +11,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - zerr "zotregistry.dev/zot/errors" client "zotregistry.dev/zot/pkg/extensions/sync/httpclient" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/extensions/sync/references/referrers_tag.go b/pkg/extensions/sync/references/referrers_tag.go index 21ffd275..95df0060 100644 --- a/pkg/extensions/sync/references/referrers_tag.go +++ b/pkg/extensions/sync/references/referrers_tag.go @@ -12,7 +12,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/sync/constants" diff --git a/pkg/extensions/sync/remote.go b/pkg/extensions/sync/remote.go index fef205d4..24e1a6db 100644 --- a/pkg/extensions/sync/remote.go +++ b/pkg/extensions/sync/remote.go @@ -14,7 +14,6 @@ import ( "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - "zotregistry.dev/zot/pkg/api/constants" "zotregistry.dev/zot/pkg/common" client "zotregistry.dev/zot/pkg/extensions/sync/httpclient" diff --git a/pkg/extensions/sync/service.go b/pkg/extensions/sync/service.go index 75bf56f7..a7be8c59 100644 --- a/pkg/extensions/sync/service.go +++ b/pkg/extensions/sync/service.go @@ -11,7 +11,6 @@ import ( "github.com/containers/common/pkg/retry" "github.com/containers/image/v5/copy" "github.com/opencontainers/go-digest" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/extensions/sync/sync.go b/pkg/extensions/sync/sync.go index b0e67b25..9bb64565 100644 --- a/pkg/extensions/sync/sync.go +++ b/pkg/extensions/sync/sync.go @@ -12,7 +12,6 @@ import ( "github.com/containers/common/pkg/retry" "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" - "zotregistry.dev/zot/pkg/log" "zotregistry.dev/zot/pkg/scheduler" ) diff --git a/pkg/extensions/sync/sync_disabled_test.go b/pkg/extensions/sync/sync_disabled_test.go index f9a274c6..bee94c0f 100644 --- a/pkg/extensions/sync/sync_disabled_test.go +++ b/pkg/extensions/sync/sync_disabled_test.go @@ -9,7 +9,6 @@ import ( . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" extconf "zotregistry.dev/zot/pkg/extensions/config" diff --git a/pkg/extensions/sync/sync_internal_test.go b/pkg/extensions/sync/sync_internal_test.go index ed79e59e..82c0e321 100644 --- a/pkg/extensions/sync/sync_internal_test.go +++ b/pkg/extensions/sync/sync_internal_test.go @@ -19,7 +19,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/rs/zerolog" . "github.com/smartystreets/goconvey/convey" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/extensions/config" syncconf "zotregistry.dev/zot/pkg/extensions/config/sync" diff --git a/pkg/extensions/sync/sync_test.go b/pkg/extensions/sync/sync_test.go index 0a901d65..5e9d82c7 100644 --- a/pkg/extensions/sync/sync_test.go +++ b/pkg/extensions/sync/sync_test.go @@ -33,7 +33,6 @@ import ( "github.com/sigstore/cosign/v2/pkg/oci/remote" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/extensions/sync/utils.go b/pkg/extensions/sync/utils.go index 16aab5e6..7f20b4af 100644 --- a/pkg/extensions/sync/utils.go +++ b/pkg/extensions/sync/utils.go @@ -21,7 +21,6 @@ import ( "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/common" syncconf "zotregistry.dev/zot/pkg/extensions/config/sync" diff --git a/pkg/log/log_test.go b/pkg/log/log_test.go index 79216d70..48211528 100644 --- a/pkg/log/log_test.go +++ b/pkg/log/log_test.go @@ -19,7 +19,6 @@ import ( "github.com/rs/zerolog" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/api/constants" diff --git a/pkg/meta/boltdb/boltdb.go b/pkg/meta/boltdb/boltdb.go index 736e7152..1a531c4a 100644 --- a/pkg/meta/boltdb/boltdb.go +++ b/pkg/meta/boltdb/boltdb.go @@ -13,7 +13,6 @@ import ( "go.etcd.io/bbolt" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/constants" zcommon "zotregistry.dev/zot/pkg/common" diff --git a/pkg/meta/boltdb/boltdb_test.go b/pkg/meta/boltdb/boltdb_test.go index f2e8428c..0280c682 100644 --- a/pkg/meta/boltdb/boltdb_test.go +++ b/pkg/meta/boltdb/boltdb_test.go @@ -13,7 +13,6 @@ import ( . "github.com/smartystreets/goconvey/convey" "go.etcd.io/bbolt" "google.golang.org/protobuf/proto" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/log" "zotregistry.dev/zot/pkg/meta/boltdb" diff --git a/pkg/meta/common/common.go b/pkg/meta/common/common.go index 67aefd3b..bf11f625 100644 --- a/pkg/meta/common/common.go +++ b/pkg/meta/common/common.go @@ -6,7 +6,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" zcommon "zotregistry.dev/zot/pkg/common" mConvert "zotregistry.dev/zot/pkg/meta/convert" diff --git a/pkg/meta/common/common_test.go b/pkg/meta/common/common_test.go index 39c010d8..858f92ae 100644 --- a/pkg/meta/common/common_test.go +++ b/pkg/meta/common/common_test.go @@ -6,7 +6,6 @@ import ( "time" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/meta/common" mTypes "zotregistry.dev/zot/pkg/meta/types" ) diff --git a/pkg/meta/convert/convert.go b/pkg/meta/convert/convert.go index 9d55f1c0..a40137c4 100644 --- a/pkg/meta/convert/convert.go +++ b/pkg/meta/convert/convert.go @@ -7,7 +7,6 @@ import ( "github.com/opencontainers/image-spec/specs-go" ispec "github.com/opencontainers/image-spec/specs-go/v1" "google.golang.org/protobuf/types/known/timestamppb" - "zotregistry.dev/zot/pkg/common" proto_go "zotregistry.dev/zot/pkg/meta/proto/gen" mTypes "zotregistry.dev/zot/pkg/meta/types" diff --git a/pkg/meta/convert/convert_proto.go b/pkg/meta/convert/convert_proto.go index c68a2aca..40dc2eab 100644 --- a/pkg/meta/convert/convert_proto.go +++ b/pkg/meta/convert/convert_proto.go @@ -6,7 +6,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" "google.golang.org/protobuf/types/known/timestamppb" - "zotregistry.dev/zot/pkg/common" proto_go "zotregistry.dev/zot/pkg/meta/proto/gen" mTypes "zotregistry.dev/zot/pkg/meta/types" diff --git a/pkg/meta/convert/convert_test.go b/pkg/meta/convert/convert_test.go index b6a40274..ebe9c8fa 100644 --- a/pkg/meta/convert/convert_test.go +++ b/pkg/meta/convert/convert_test.go @@ -6,7 +6,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/meta/convert" "zotregistry.dev/zot/pkg/meta/proto/gen" ) diff --git a/pkg/meta/dynamodb/dynamodb.go b/pkg/meta/dynamodb/dynamodb.go index f023a417..c47f06e5 100644 --- a/pkg/meta/dynamodb/dynamodb.go +++ b/pkg/meta/dynamodb/dynamodb.go @@ -15,7 +15,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/constants" zcommon "zotregistry.dev/zot/pkg/common" diff --git a/pkg/meta/dynamodb/dynamodb_internal_test.go b/pkg/meta/dynamodb/dynamodb_internal_test.go index d73c284f..c4223c61 100644 --- a/pkg/meta/dynamodb/dynamodb_internal_test.go +++ b/pkg/meta/dynamodb/dynamodb_internal_test.go @@ -11,7 +11,6 @@ import ( guuid "github.com/gofrs/uuid" "github.com/rs/zerolog" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/log" "zotregistry.dev/zot/pkg/meta/version" tskip "zotregistry.dev/zot/pkg/test/skip" diff --git a/pkg/meta/dynamodb/dynamodb_test.go b/pkg/meta/dynamodb/dynamodb_test.go index 39a60c65..c19f0480 100644 --- a/pkg/meta/dynamodb/dynamodb_test.go +++ b/pkg/meta/dynamodb/dynamodb_test.go @@ -16,7 +16,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/rs/zerolog" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/extensions/imagetrust" "zotregistry.dev/zot/pkg/log" mdynamodb "zotregistry.dev/zot/pkg/meta/dynamodb" diff --git a/pkg/meta/dynamodb/iterator.go b/pkg/meta/dynamodb/iterator.go index 969f4339..aeecb3de 100644 --- a/pkg/meta/dynamodb/iterator.go +++ b/pkg/meta/dynamodb/iterator.go @@ -6,7 +6,6 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/dynamodb" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" - "zotregistry.dev/zot/pkg/log" ) diff --git a/pkg/meta/hooks.go b/pkg/meta/hooks.go index 74fe3e0d..48d7f709 100644 --- a/pkg/meta/hooks.go +++ b/pkg/meta/hooks.go @@ -5,7 +5,6 @@ import ( godigest "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" - zcommon "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/log" mTypes "zotregistry.dev/zot/pkg/meta/types" diff --git a/pkg/meta/hooks_test.go b/pkg/meta/hooks_test.go index 03d74207..22631b40 100644 --- a/pkg/meta/hooks_test.go +++ b/pkg/meta/hooks_test.go @@ -7,7 +7,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/extensions/monitoring" "zotregistry.dev/zot/pkg/log" "zotregistry.dev/zot/pkg/meta" diff --git a/pkg/meta/meta.go b/pkg/meta/meta.go index c4ab4b53..2b40b530 100644 --- a/pkg/meta/meta.go +++ b/pkg/meta/meta.go @@ -3,7 +3,6 @@ package meta import ( "github.com/aws/aws-sdk-go-v2/service/dynamodb" "go.etcd.io/bbolt" - "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/meta/meta_test.go b/pkg/meta/meta_test.go index 7749c04d..a959debe 100644 --- a/pkg/meta/meta_test.go +++ b/pkg/meta/meta_test.go @@ -19,7 +19,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - zcommon "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/imagetrust" "zotregistry.dev/zot/pkg/extensions/search/convert" diff --git a/pkg/meta/parse.go b/pkg/meta/parse.go index ab671c00..9125704b 100644 --- a/pkg/meta/parse.go +++ b/pkg/meta/parse.go @@ -8,7 +8,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" zcommon "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/meta/parse_test.go b/pkg/meta/parse_test.go index 7c997f18..290351fe 100644 --- a/pkg/meta/parse_test.go +++ b/pkg/meta/parse_test.go @@ -14,7 +14,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - zcommon "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/monitoring" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/meta/proto/gen/config.pb.go b/pkg/meta/proto/gen/config.pb.go index 60cafd21..585edb9d 100644 --- a/pkg/meta/proto/gen/config.pb.go +++ b/pkg/meta/proto/gen/config.pb.go @@ -7,11 +7,12 @@ package gen import ( + reflect "reflect" + sync "sync" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" timestamppb "google.golang.org/protobuf/types/known/timestamppb" - reflect "reflect" - sync "sync" ) const ( diff --git a/pkg/meta/proto/gen/descriptor.pb.go b/pkg/meta/proto/gen/descriptor.pb.go index e2c1a054..86439123 100644 --- a/pkg/meta/proto/gen/descriptor.pb.go +++ b/pkg/meta/proto/gen/descriptor.pb.go @@ -7,10 +7,11 @@ package gen import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/pkg/meta/proto/gen/index.pb.go b/pkg/meta/proto/gen/index.pb.go index 9e5d2a2b..758cd0ed 100644 --- a/pkg/meta/proto/gen/index.pb.go +++ b/pkg/meta/proto/gen/index.pb.go @@ -7,10 +7,11 @@ package gen import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/pkg/meta/proto/gen/manifest.pb.go b/pkg/meta/proto/gen/manifest.pb.go index f4640ced..9208077d 100644 --- a/pkg/meta/proto/gen/manifest.pb.go +++ b/pkg/meta/proto/gen/manifest.pb.go @@ -7,10 +7,11 @@ package gen import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/pkg/meta/proto/gen/meta.pb.go b/pkg/meta/proto/gen/meta.pb.go index 4c7b1eca..3d55e887 100644 --- a/pkg/meta/proto/gen/meta.pb.go +++ b/pkg/meta/proto/gen/meta.pb.go @@ -7,11 +7,12 @@ package gen import ( + reflect "reflect" + sync "sync" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" timestamppb "google.golang.org/protobuf/types/known/timestamppb" - reflect "reflect" - sync "sync" ) const ( diff --git a/pkg/meta/proto/gen/versioned.pb.go b/pkg/meta/proto/gen/versioned.pb.go index df7d9272..630747f5 100644 --- a/pkg/meta/proto/gen/versioned.pb.go +++ b/pkg/meta/proto/gen/versioned.pb.go @@ -7,10 +7,11 @@ package gen import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/pkg/meta/version/version_test.go b/pkg/meta/version/version_test.go index 630877e1..3bf3c9fe 100644 --- a/pkg/meta/version/version_test.go +++ b/pkg/meta/version/version_test.go @@ -14,7 +14,6 @@ import ( guuid "github.com/gofrs/uuid" . "github.com/smartystreets/goconvey/convey" "go.etcd.io/bbolt" - "zotregistry.dev/zot/pkg/log" "zotregistry.dev/zot/pkg/meta/boltdb" mdynamodb "zotregistry.dev/zot/pkg/meta/dynamodb" diff --git a/pkg/requestcontext/user_access_control.go b/pkg/requestcontext/user_access_control.go index 794111f7..bba2afe3 100644 --- a/pkg/requestcontext/user_access_control.go +++ b/pkg/requestcontext/user_access_control.go @@ -5,7 +5,6 @@ import ( "net/http" glob "github.com/bmatcuk/doublestar/v4" //nolint:gci - "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/constants" ) diff --git a/pkg/retention/retention.go b/pkg/retention/retention.go index efeaa508..298f85a8 100644 --- a/pkg/retention/retention.go +++ b/pkg/retention/retention.go @@ -6,7 +6,6 @@ import ( glob "github.com/bmatcuk/doublestar/v4" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/config" zcommon "zotregistry.dev/zot/pkg/common" diff --git a/pkg/retention/types/types.go b/pkg/retention/types/types.go index 172770b2..0e59f7da 100644 --- a/pkg/retention/types/types.go +++ b/pkg/retention/types/types.go @@ -5,7 +5,6 @@ import ( "time" ispec "github.com/opencontainers/image-spec/specs-go/v1" - mTypes "zotregistry.dev/zot/pkg/meta/types" ) diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go index 8a3adaf2..90e7b36a 100644 --- a/pkg/scheduler/scheduler_test.go +++ b/pkg/scheduler/scheduler_test.go @@ -11,7 +11,6 @@ import ( "time" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/extensions/monitoring" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/storage/cache/boltdb.go b/pkg/storage/cache/boltdb.go index b80bbcb8..4a0eefbb 100644 --- a/pkg/storage/cache/boltdb.go +++ b/pkg/storage/cache/boltdb.go @@ -9,7 +9,6 @@ import ( godigest "github.com/opencontainers/go-digest" "go.etcd.io/bbolt" - zerr "zotregistry.dev/zot/errors" zlog "zotregistry.dev/zot/pkg/log" "zotregistry.dev/zot/pkg/storage/constants" diff --git a/pkg/storage/cache/boltdb_internal_test.go b/pkg/storage/cache/boltdb_internal_test.go index 8d1690d8..c7b48f5d 100644 --- a/pkg/storage/cache/boltdb_internal_test.go +++ b/pkg/storage/cache/boltdb_internal_test.go @@ -7,7 +7,6 @@ import ( "github.com/opencontainers/go-digest" . "github.com/smartystreets/goconvey/convey" "go.etcd.io/bbolt" - "zotregistry.dev/zot/pkg/storage/constants" ) diff --git a/pkg/storage/cache/boltdb_test.go b/pkg/storage/cache/boltdb_test.go index 7c6a9a39..6d0f72f1 100644 --- a/pkg/storage/cache/boltdb_test.go +++ b/pkg/storage/cache/boltdb_test.go @@ -5,7 +5,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/log" "zotregistry.dev/zot/pkg/storage" diff --git a/pkg/storage/cache/dynamodb.go b/pkg/storage/cache/dynamodb.go index ea8def92..e62b3f52 100644 --- a/pkg/storage/cache/dynamodb.go +++ b/pkg/storage/cache/dynamodb.go @@ -10,7 +10,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/dynamodb" "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" godigest "github.com/opencontainers/go-digest" - zerr "zotregistry.dev/zot/errors" zlog "zotregistry.dev/zot/pkg/log" ) diff --git a/pkg/storage/cache/dynamodb_test.go b/pkg/storage/cache/dynamodb_test.go index 3f4158a5..3c85eb55 100644 --- a/pkg/storage/cache/dynamodb_test.go +++ b/pkg/storage/cache/dynamodb_test.go @@ -7,7 +7,6 @@ import ( godigest "github.com/opencontainers/go-digest" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/log" "zotregistry.dev/zot/pkg/storage" "zotregistry.dev/zot/pkg/storage/cache" diff --git a/pkg/storage/cache_benchmark_test.go b/pkg/storage/cache_benchmark_test.go index d48905fc..e3fda7c0 100644 --- a/pkg/storage/cache_benchmark_test.go +++ b/pkg/storage/cache_benchmark_test.go @@ -7,7 +7,6 @@ import ( "time" godigest "github.com/opencontainers/go-digest" - "zotregistry.dev/zot/pkg/log" "zotregistry.dev/zot/pkg/storage" "zotregistry.dev/zot/pkg/storage/cache" diff --git a/pkg/storage/cache_test.go b/pkg/storage/cache_test.go index 16d06374..0d7e1e18 100644 --- a/pkg/storage/cache_test.go +++ b/pkg/storage/cache_test.go @@ -5,7 +5,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/log" "zotregistry.dev/zot/pkg/storage" diff --git a/pkg/storage/common/common.go b/pkg/storage/common/common.go index 3565e857..4540b79e 100644 --- a/pkg/storage/common/common.go +++ b/pkg/storage/common/common.go @@ -16,7 +16,6 @@ import ( "github.com/opencontainers/image-spec/schema" imeta "github.com/opencontainers/image-spec/specs-go" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" zcommon "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/monitoring" diff --git a/pkg/storage/common/common_test.go b/pkg/storage/common/common_test.go index af340084..911ae35c 100644 --- a/pkg/storage/common/common_test.go +++ b/pkg/storage/common/common_test.go @@ -11,7 +11,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/rs/zerolog" . "github.com/smartystreets/goconvey/convey" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/extensions/monitoring" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/storage/common/lint_interface.go b/pkg/storage/common/lint_interface.go index 3d5890e0..5010b3b4 100644 --- a/pkg/storage/common/lint_interface.go +++ b/pkg/storage/common/lint_interface.go @@ -2,7 +2,6 @@ package storage import ( godigest "github.com/opencontainers/go-digest" - storageTypes "zotregistry.dev/zot/pkg/storage/types" ) diff --git a/pkg/storage/gc/gc.go b/pkg/storage/gc/gc.go index cc693d81..9ee1ae77 100644 --- a/pkg/storage/gc/gc.go +++ b/pkg/storage/gc/gc.go @@ -12,7 +12,6 @@ import ( "github.com/docker/distribution/registry/storage/driver" godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/config" zcommon "zotregistry.dev/zot/pkg/common" diff --git a/pkg/storage/gc/gc_internal_test.go b/pkg/storage/gc/gc_internal_test.go index ba535f16..9873cf56 100644 --- a/pkg/storage/gc/gc_internal_test.go +++ b/pkg/storage/gc/gc_internal_test.go @@ -13,7 +13,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api/config" zcommon "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/monitoring" diff --git a/pkg/storage/gc/gc_test.go b/pkg/storage/gc/gc_test.go index 737c0ad8..ca36f2ef 100644 --- a/pkg/storage/gc/gc_test.go +++ b/pkg/storage/gc/gc_test.go @@ -13,7 +13,6 @@ import ( guuid "github.com/gofrs/uuid" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/extensions/monitoring" zlog "zotregistry.dev/zot/pkg/log" diff --git a/pkg/storage/imagestore/imagestore.go b/pkg/storage/imagestore/imagestore.go index 86ea2e76..ebe80308 100644 --- a/pkg/storage/imagestore/imagestore.go +++ b/pkg/storage/imagestore/imagestore.go @@ -17,7 +17,6 @@ import ( guuid "github.com/gofrs/uuid" godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" zcommon "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/monitoring" diff --git a/pkg/storage/local/driver.go b/pkg/storage/local/driver.go index 528152ed..e95d1802 100644 --- a/pkg/storage/local/driver.go +++ b/pkg/storage/local/driver.go @@ -12,7 +12,6 @@ import ( "unicode/utf8" storagedriver "github.com/docker/distribution/registry/storage/driver" - zerr "zotregistry.dev/zot/errors" storageConstants "zotregistry.dev/zot/pkg/storage/constants" "zotregistry.dev/zot/pkg/test/inject" diff --git a/pkg/storage/local/driver_test.go b/pkg/storage/local/driver_test.go index 4e0e5aca..c6c742ad 100644 --- a/pkg/storage/local/driver_test.go +++ b/pkg/storage/local/driver_test.go @@ -8,7 +8,6 @@ import ( storagedriver "github.com/docker/distribution/registry/storage/driver" . "github.com/smartystreets/goconvey/convey" - storageConstants "zotregistry.dev/zot/pkg/storage/constants" "zotregistry.dev/zot/pkg/storage/local" ) diff --git a/pkg/storage/local/local_elevated_test.go b/pkg/storage/local/local_elevated_test.go index a9b0eef3..78e6795d 100644 --- a/pkg/storage/local/local_elevated_test.go +++ b/pkg/storage/local/local_elevated_test.go @@ -15,7 +15,6 @@ import ( godigest "github.com/opencontainers/go-digest" "github.com/rs/zerolog" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/extensions/monitoring" "zotregistry.dev/zot/pkg/log" "zotregistry.dev/zot/pkg/storage" diff --git a/pkg/storage/local/local_test.go b/pkg/storage/local/local_test.go index 1c5ae89b..b96235dd 100644 --- a/pkg/storage/local/local_test.go +++ b/pkg/storage/local/local_test.go @@ -23,7 +23,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/rs/zerolog" . "github.com/smartystreets/goconvey/convey" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/common" diff --git a/pkg/storage/s3/driver.go b/pkg/storage/s3/driver.go index 8c75a623..fb164c1b 100644 --- a/pkg/storage/s3/driver.go +++ b/pkg/storage/s3/driver.go @@ -7,7 +7,6 @@ import ( // Add s3 support. "github.com/docker/distribution/registry/storage/driver" _ "github.com/docker/distribution/registry/storage/driver/s3-aws" - storageConstants "zotregistry.dev/zot/pkg/storage/constants" ) diff --git a/pkg/storage/s3/s3.go b/pkg/storage/s3/s3.go index 53724118..c98f60e1 100644 --- a/pkg/storage/s3/s3.go +++ b/pkg/storage/s3/s3.go @@ -5,7 +5,6 @@ import ( "github.com/docker/distribution/registry/storage/driver" // Load s3 driver. _ "github.com/docker/distribution/registry/storage/driver/s3-aws" - "zotregistry.dev/zot/pkg/extensions/monitoring" zlog "zotregistry.dev/zot/pkg/log" "zotregistry.dev/zot/pkg/storage/cache" diff --git a/pkg/storage/s3/s3_test.go b/pkg/storage/s3/s3_test.go index a0ec1eb6..349a883c 100644 --- a/pkg/storage/s3/s3_test.go +++ b/pkg/storage/s3/s3_test.go @@ -23,7 +23,6 @@ import ( "github.com/rs/zerolog" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" diff --git a/pkg/storage/scrub.go b/pkg/storage/scrub.go index f00c9c0e..726f29cc 100644 --- a/pkg/storage/scrub.go +++ b/pkg/storage/scrub.go @@ -12,7 +12,6 @@ import ( "github.com/olekukonko/tablewriter" godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/common" storageTypes "zotregistry.dev/zot/pkg/storage/types" diff --git a/pkg/storage/scrub_test.go b/pkg/storage/scrub_test.go index 11c9f392..e2eec08b 100644 --- a/pkg/storage/scrub_test.go +++ b/pkg/storage/scrub_test.go @@ -16,7 +16,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/extensions/monitoring" "zotregistry.dev/zot/pkg/log" diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index 9391f7bc..1528cc0d 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -8,7 +8,6 @@ import ( "github.com/docker/distribution/registry/storage/driver/factory" godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/config" zcommon "zotregistry.dev/zot/pkg/common" diff --git a/pkg/storage/storage_test.go b/pkg/storage/storage_test.go index 12aee9ac..c62237d8 100644 --- a/pkg/storage/storage_test.go +++ b/pkg/storage/storage_test.go @@ -26,7 +26,6 @@ import ( "github.com/rs/zerolog" . "github.com/smartystreets/goconvey/convey" "gopkg.in/resty.v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api/config" "zotregistry.dev/zot/pkg/extensions/monitoring" diff --git a/pkg/storage/types/types.go b/pkg/storage/types/types.go index b4e24488..e7e9616f 100644 --- a/pkg/storage/types/types.go +++ b/pkg/storage/types/types.go @@ -8,7 +8,6 @@ import ( storagedriver "github.com/docker/distribution/registry/storage/driver" godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - "zotregistry.dev/zot/pkg/scheduler" ) diff --git a/pkg/test/auth/bearer_test.go b/pkg/test/auth/bearer_test.go index 148e2f73..7be28329 100644 --- a/pkg/test/auth/bearer_test.go +++ b/pkg/test/auth/bearer_test.go @@ -4,7 +4,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - auth "zotregistry.dev/zot/pkg/test/auth" ) diff --git a/pkg/test/common/fs_test.go b/pkg/test/common/fs_test.go index 0c1f73ec..829278bb 100644 --- a/pkg/test/common/fs_test.go +++ b/pkg/test/common/fs_test.go @@ -12,7 +12,6 @@ import ( ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" "golang.org/x/crypto/bcrypt" - tcommon "zotregistry.dev/zot/pkg/test/common" ) diff --git a/pkg/test/common/utils_test.go b/pkg/test/common/utils_test.go index c863b07c..f16ee7f9 100644 --- a/pkg/test/common/utils_test.go +++ b/pkg/test/common/utils_test.go @@ -7,7 +7,6 @@ import ( "time" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" tcommon "zotregistry.dev/zot/pkg/test/common" diff --git a/pkg/test/image-utils/images.go b/pkg/test/image-utils/images.go index 9f555bf2..5487a11d 100644 --- a/pkg/test/image-utils/images.go +++ b/pkg/test/image-utils/images.go @@ -10,7 +10,6 @@ import ( godigest "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/specs-go" ispec "github.com/opencontainers/image-spec/specs-go/v1" - "zotregistry.dev/zot/pkg/common" mTypes "zotregistry.dev/zot/pkg/meta/types" storageConstants "zotregistry.dev/zot/pkg/storage/constants" diff --git a/pkg/test/image-utils/images_test.go b/pkg/test/image-utils/images_test.go index 11fc123a..e62c5348 100644 --- a/pkg/test/image-utils/images_test.go +++ b/pkg/test/image-utils/images_test.go @@ -7,7 +7,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/common" . "zotregistry.dev/zot/pkg/test/image-utils" ) diff --git a/pkg/test/image-utils/multiarch.go b/pkg/test/image-utils/multiarch.go index b7663951..dfeed6bf 100644 --- a/pkg/test/image-utils/multiarch.go +++ b/pkg/test/image-utils/multiarch.go @@ -6,7 +6,6 @@ import ( godigest "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/specs-go" ispec "github.com/opencontainers/image-spec/specs-go/v1" - mTypes "zotregistry.dev/zot/pkg/meta/types" ) diff --git a/pkg/test/image-utils/upload.go b/pkg/test/image-utils/upload.go index f07dab07..b610cd7c 100644 --- a/pkg/test/image-utils/upload.go +++ b/pkg/test/image-utils/upload.go @@ -9,7 +9,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" "gopkg.in/resty.v1" - tcommon "zotregistry.dev/zot/pkg/test/common" "zotregistry.dev/zot/pkg/test/inject" ) diff --git a/pkg/test/image-utils/upload_test.go b/pkg/test/image-utils/upload_test.go index 07e94b97..5f218421 100644 --- a/pkg/test/image-utils/upload_test.go +++ b/pkg/test/image-utils/upload_test.go @@ -10,7 +10,6 @@ import ( "github.com/opencontainers/image-spec/specs-go" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" tcommon "zotregistry.dev/zot/pkg/test/common" diff --git a/pkg/test/image-utils/utils.go b/pkg/test/image-utils/utils.go index f4484937..9efb0af9 100644 --- a/pkg/test/image-utils/utils.go +++ b/pkg/test/image-utils/utils.go @@ -12,7 +12,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - tcommon "zotregistry.dev/zot/pkg/test/common" ) diff --git a/pkg/test/image-utils/write.go b/pkg/test/image-utils/write.go index 2bf083e1..cf9d15fe 100644 --- a/pkg/test/image-utils/write.go +++ b/pkg/test/image-utils/write.go @@ -6,7 +6,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - stypes "zotregistry.dev/zot/pkg/storage/types" ) diff --git a/pkg/test/image-utils/write_test.go b/pkg/test/image-utils/write_test.go index f8df7813..0dfbe82f 100644 --- a/pkg/test/image-utils/write_test.go +++ b/pkg/test/image-utils/write_test.go @@ -7,7 +7,6 @@ import ( godigest "github.com/opencontainers/go-digest" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/storage" . "zotregistry.dev/zot/pkg/test/image-utils" "zotregistry.dev/zot/pkg/test/mocks" diff --git a/pkg/test/inject/inject_test.go b/pkg/test/inject/inject_test.go index dda24b5e..91ef0071 100644 --- a/pkg/test/inject/inject_test.go +++ b/pkg/test/inject/inject_test.go @@ -10,7 +10,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/test/inject" ) diff --git a/pkg/test/mocks/image_store_mock.go b/pkg/test/mocks/image_store_mock.go index ff18afab..f1084b6f 100644 --- a/pkg/test/mocks/image_store_mock.go +++ b/pkg/test/mocks/image_store_mock.go @@ -7,7 +7,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - "zotregistry.dev/zot/pkg/scheduler" ) diff --git a/pkg/test/mocks/lint_mock.go b/pkg/test/mocks/lint_mock.go index 47ac43a5..dcd3e479 100644 --- a/pkg/test/mocks/lint_mock.go +++ b/pkg/test/mocks/lint_mock.go @@ -2,7 +2,6 @@ package mocks import ( godigest "github.com/opencontainers/go-digest" - storageTypes "zotregistry.dev/zot/pkg/storage/types" ) diff --git a/pkg/test/mocks/oci_mock.go b/pkg/test/mocks/oci_mock.go index b50b2214..3bea7e99 100644 --- a/pkg/test/mocks/oci_mock.go +++ b/pkg/test/mocks/oci_mock.go @@ -3,7 +3,6 @@ package mocks import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - "zotregistry.dev/zot/pkg/common" cvemodel "zotregistry.dev/zot/pkg/extensions/search/cve/model" ) diff --git a/pkg/test/mocks/repo_db_mock.go b/pkg/test/mocks/repo_db_mock.go index 73d3035a..49be5aba 100644 --- a/pkg/test/mocks/repo_db_mock.go +++ b/pkg/test/mocks/repo_db_mock.go @@ -5,7 +5,6 @@ import ( "time" godigest "github.com/opencontainers/go-digest" - mTypes "zotregistry.dev/zot/pkg/meta/types" ) diff --git a/pkg/test/oci-utils/oci_layout.go b/pkg/test/oci-utils/oci_layout.go index d217760e..642a40a4 100644 --- a/pkg/test/oci-utils/oci_layout.go +++ b/pkg/test/oci-utils/oci_layout.go @@ -15,7 +15,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/common" "zotregistry.dev/zot/pkg/extensions/search/convert" diff --git a/pkg/test/oci-utils/oci_layout_test.go b/pkg/test/oci-utils/oci_layout_test.go index cb63dc8d..c29f9122 100644 --- a/pkg/test/oci-utils/oci_layout_test.go +++ b/pkg/test/oci-utils/oci_layout_test.go @@ -14,7 +14,6 @@ import ( godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/smartystreets/goconvey/convey" - zerr "zotregistry.dev/zot/errors" "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" diff --git a/pkg/test/oci-utils/repo_test.go b/pkg/test/oci-utils/repo_test.go index 97b9848e..81b4baf7 100644 --- a/pkg/test/oci-utils/repo_test.go +++ b/pkg/test/oci-utils/repo_test.go @@ -6,7 +6,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/meta/types" "zotregistry.dev/zot/pkg/test/image-utils" "zotregistry.dev/zot/pkg/test/mocks" diff --git a/pkg/test/oci-utils/store.go b/pkg/test/oci-utils/store.go index afb0e913..c1fa5c49 100644 --- a/pkg/test/oci-utils/store.go +++ b/pkg/test/oci-utils/store.go @@ -2,7 +2,6 @@ package ociutils import ( godigest "github.com/opencontainers/go-digest" - "zotregistry.dev/zot/pkg/extensions/monitoring" zLog "zotregistry.dev/zot/pkg/log" "zotregistry.dev/zot/pkg/storage" diff --git a/pkg/test/signature/notation.go b/pkg/test/signature/notation.go index 9a379cb3..94b51e4a 100644 --- a/pkg/test/signature/notation.go +++ b/pkg/test/signature/notation.go @@ -30,7 +30,6 @@ import ( "oras.land/oras-go/v2/registry" "oras.land/oras-go/v2/registry/remote" "oras.land/oras-go/v2/registry/remote/auth" - tcommon "zotregistry.dev/zot/pkg/test/common" ) diff --git a/pkg/test/signature/notation_test.go b/pkg/test/signature/notation_test.go index 57b7d685..342d7054 100644 --- a/pkg/test/signature/notation_test.go +++ b/pkg/test/signature/notation_test.go @@ -12,7 +12,6 @@ import ( notconfig "github.com/notaryproject/notation-go/config" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/pkg/api" "zotregistry.dev/zot/pkg/api/config" tcommon "zotregistry.dev/zot/pkg/test/common" diff --git a/pkg/test/skip/skip_test.go b/pkg/test/skip/skip_test.go index 0aba04cb..c9282bba 100644 --- a/pkg/test/skip/skip_test.go +++ b/pkg/test/skip/skip_test.go @@ -5,7 +5,6 @@ import ( "testing" "github.com/stretchr/testify/assert" - tskip "zotregistry.dev/zot/pkg/test/skip" ) diff --git a/swagger/docs_test.go b/swagger/docs_test.go index 56a70668..2b5c47b9 100644 --- a/swagger/docs_test.go +++ b/swagger/docs_test.go @@ -4,7 +4,6 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - "zotregistry.dev/zot/swagger" )