Skip to content

fix(registry): use RepositoryV2 displayer for list-v2 commands #1851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lohitkolluri wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −3
Open

fix(registry): use RepositoryV2 displayer for list-v2 commands #1851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion commands/displayers/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ type RepositoryV2 struct {
Repositories []do.RepositoryV2
}

var _ Displayable = &Repository{}
var _ Displayable = &RepositoryV2{}

func (r *RepositoryV2) JSON(out io.Writer) error {
return writeJSON(r.Repositories, out)
Expand Down
4 changes: 2 additions & 2 deletions commands/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ func Repository() *Command {
cmd,
RunListRepositoriesV2, "list-v2",
"List repositories for a container registry", listRepositoriesV2Desc,
Writer, aliasOpt("ls2"), displayerType(&displayers.Repository{}),
Writer, aliasOpt("ls2"), displayerType(&displayers.RepositoryV2{}),
)
cmdListRepositoriesV2.overrideNS = overrideNS
addRegistryFlag(cmdListRepositoriesV2)
Expand Down Expand Up @@ -1581,7 +1581,7 @@ func RegistriesRepository() *Command {
cmd,
RunRegistriesListRepositoriesV2, "list-v2 <registry-name>",
"List repositories for a container registry", listRepositoriesV2Desc,
Writer, aliasOpt("ls2"), displayerType(&displayers.Repository{}),
Writer, aliasOpt("ls2"), displayerType(&displayers.RepositoryV2{}),
)
cmdListRepositoriesV2.overrideNS = overrideNS
cmdListRepositoriesV2.Example = `The following example lists repositories in a registry named ` + "`" + `example-registry` + "`" + ` and uses the ` + "`" + `--format` + "`" + ` flag to return only the name and update time of each repository: doctl registries repository list-v2 example-registry --format Name,UpdatedAt`
Expand Down
18 changes: 18 additions & 0 deletions commands/registry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,24 @@ func TestRepositoryListV2(t *testing.T) {
assert.False(t, strings.Contains(output, testRepositoryV2NoTags.LatestManifest.Blobs[0].Digest))
})
})

t.Run("respects format and no-header flags", func(t *testing.T) {
withTestClient(t, func(config *CmdConfig, tm *tcMocks) {
tm.registry.EXPECT().Get().Return(&testRegistry, nil)
tm.registry.EXPECT().ListRepositoriesV2(testRepositoryV2.RegistryName).Return([]do.RepositoryV2{testRepositoryV2}, nil)

config.NS = "registry.repository.list-v2"
config.Doit.Set(config.NS, doctl.ArgFormat, "Name")
config.Doit.Set(config.NS, doctl.ArgNoHeader, true)

var buf bytes.Buffer
config.Out = &buf
err := RunListRepositoriesV2(config)
assert.NoError(t, err)

assert.Equal(t, testRepositoryV2.Name+"\n", buf.String())
})
})
}

func TestRepositoryListTags(t *testing.T) {
Expand Down