mirror of
https://github.com/project-zot/zot.git
synced 2026-06-15 11:37:56 +08:00
Luca Muscariello
2402296e9a
* fix: migrate to Go module v2 for proper semantic versioning This change updates the module path from 'zotregistry.dev/zot' to 'zotregistry.dev/zot/v2' to comply with Go's semantic versioning rules. According to Go's module versioning requirements, major version v2+ must include the major version in the module path. The current module path 'zotregistry.dev/zot' only supports v0.x.x and v1.x.x versions, making existing v2.x.x tags (like v2.1.8) unusable. Changes: - Updated go.mod module path to zotregistry.dev/zot/v2 - Updated all internal import paths across 280+ Go source files - Updated configuration files (golangcilint.yaml, gqlgen.yml) - Updated README.md Go reference badge This fix enables proper use of existing v2.x.x Git tags and allows external packages to import zot v2+ versions without compatibility errors. Resolves: Go module import compatibility for v2+ versions Fixes: #3071 Signed-off-by: Luca Muscariello <muscariello@ieee.org> * fix: regenerate GraphQL files with updated v2 import paths The gqlgen tool needs to regenerate the GraphQL schema files after the module path change to use the new v2 imports. Signed-off-by: Luca Muscariello <muscariello@ieee.org> --------- Signed-off-by: Luca Muscariello <muscariello@ieee.org>
106 lines
3.2 KiB
Go
106 lines
3.2 KiB
Go
//go:build search
|
|
// +build search
|
|
|
|
package client_test
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"os"
|
|
"regexp"
|
|
"strings"
|
|
"testing"
|
|
|
|
. "github.com/smartystreets/goconvey/convey"
|
|
|
|
"zotregistry.dev/zot/v2/pkg/api"
|
|
"zotregistry.dev/zot/v2/pkg/api/config"
|
|
"zotregistry.dev/zot/v2/pkg/cli/client"
|
|
test "zotregistry.dev/zot/v2/pkg/test/common"
|
|
. "zotregistry.dev/zot/v2/pkg/test/image-utils"
|
|
)
|
|
|
|
func TestReposCommand(t *testing.T) {
|
|
Convey("repos", t, func() {
|
|
port := test.GetFreePort()
|
|
baseURL := test.GetBaseURL(port)
|
|
conf := config.New()
|
|
conf.HTTP.Port = port
|
|
|
|
ctlr := api.NewController(conf)
|
|
ctlr.Config.Storage.RootDirectory = t.TempDir()
|
|
cm := test.NewControllerManager(ctlr)
|
|
|
|
cm.StartAndWait(conf.HTTP.Port)
|
|
defer cm.StopServer()
|
|
|
|
err := UploadImage(CreateRandomImage(), baseURL, "repo1", "tag1")
|
|
So(err, ShouldBeNil)
|
|
err = UploadImage(CreateRandomImage(), baseURL, "repo2", "tag2")
|
|
So(err, ShouldBeNil)
|
|
|
|
configPath := makeConfigFile(fmt.Sprintf(`{"configs":[{"_name":"repostest","url":"%s","showspinner":false}]}`,
|
|
baseURL))
|
|
defer os.Remove(configPath)
|
|
|
|
args := []string{"list", "--config", "repostest"}
|
|
cmd := client.NewRepoCommand(client.NewSearchService())
|
|
buff := bytes.NewBufferString("")
|
|
cmd.SetOut(buff)
|
|
cmd.SetErr(buff)
|
|
cmd.SetArgs(args)
|
|
err = cmd.Execute()
|
|
So(err, ShouldBeNil)
|
|
space := regexp.MustCompile(`\s+`)
|
|
str := space.ReplaceAllString(buff.String(), " ")
|
|
actual := strings.TrimSpace(str)
|
|
So(actual, ShouldContainSubstring, "repo1")
|
|
So(actual, ShouldContainSubstring, "repo2")
|
|
|
|
args = []string{"list", "--sort-by", "alpha-dsc", "--config", "repostest"}
|
|
cmd = client.NewRepoCommand(client.NewSearchService())
|
|
buff = bytes.NewBufferString("")
|
|
cmd.SetOut(buff)
|
|
cmd.SetErr(buff)
|
|
cmd.SetArgs(args)
|
|
err = cmd.Execute()
|
|
So(err, ShouldBeNil)
|
|
space = regexp.MustCompile(`\s+`)
|
|
str = space.ReplaceAllString(buff.String(), " ")
|
|
actual = strings.TrimSpace(str)
|
|
So(actual, ShouldContainSubstring, "repo1")
|
|
So(actual, ShouldContainSubstring, "repo2")
|
|
So(strings.Index(actual, "repo2"), ShouldBeLessThan, strings.Index(actual, "repo1"))
|
|
|
|
args = []string{"list", "--sort-by", "alpha-asc", "--config", "repostest"}
|
|
cmd = client.NewRepoCommand(client.NewSearchService())
|
|
buff = bytes.NewBufferString("")
|
|
cmd.SetOut(buff)
|
|
cmd.SetErr(buff)
|
|
cmd.SetArgs(args)
|
|
err = cmd.Execute()
|
|
So(err, ShouldBeNil)
|
|
space = regexp.MustCompile(`\s+`)
|
|
str = space.ReplaceAllString(buff.String(), " ")
|
|
actual = strings.TrimSpace(str)
|
|
So(actual, ShouldContainSubstring, "repo1")
|
|
So(actual, ShouldContainSubstring, "repo2")
|
|
So(strings.Index(actual, "repo1"), ShouldBeLessThan, strings.Index(actual, "repo2"))
|
|
})
|
|
}
|
|
|
|
func TestSuggestions(t *testing.T) {
|
|
Convey("Suggestions", t, func() {
|
|
space := regexp.MustCompile(`\s+`)
|
|
suggestion := client.ShowSuggestionsIfUnknownCommand(
|
|
client.NewRepoCommand(client.NewSearchService()), []string{"bad-command"})
|
|
str := space.ReplaceAllString(suggestion.Error(), " ")
|
|
So(str, ShouldContainSubstring, "unknown cli subcommand")
|
|
|
|
suggestion = client.ShowSuggestionsIfUnknownCommand(
|
|
client.NewRepoCommand(client.NewSearchService()), []string{"listt"})
|
|
str = space.ReplaceAllString(suggestion.Error(), " ")
|
|
So(str, ShouldContainSubstring, "Did you mean this? list")
|
|
})
|
|
}
|