github/zot
1
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2026-06-17 12:58:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: images command not truncating image name/tag (#851)

Browse Source 
Signed-off-by: Lisca Ana-Roberta <ana.kagome@yahoo.com>
This commit is contained in:
Lisca Ana-Roberta
2022-10-11 18:56:03 +03:00
committed by GitHub
parent 815366024b
commit 4bc7a2c824
4 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cli/service.go
+11 -7
View File
@@ -888,10 +888,10 @@ type layer struct {
Digest string `json:"digest"`
}
func (img imageStruct) string(format string) (string, error) {
func (img imageStruct) string(format string, maxImgNameLen, maxTagLen int) (string, error) {
switch strings.ToLower(format) {
case "", defaultOutoutFormat:
return img.stringPlainText()
return img.stringPlainText(maxImgNameLen, maxTagLen)
case "json":
return img.stringJSON()
case "yml", "yaml":
@@ -901,12 +901,14 @@ func (img imageStruct) string(format string) (string, error) {
}
}
func (img imageStruct) stringPlainText() (string, error) {
func (img imageStruct) stringPlainText(maxImgNameLen, maxTagLen int) (string, error) {
var builder strings.Builder
table := getImageTableWriter(&builder)
table.SetColMinWidth(colImageNameIndex, imageNameWidth)
table.SetColMinWidth(colTagIndex, tagWidth)
table.SetColMinWidth(colImageNameIndex, maxImgNameLen)
table.SetColMinWidth(colTagIndex, maxTagLen)
table.SetColMinWidth(colDigestIndex, digestWidth)
table.SetColMinWidth(colSizeIndex, sizeWidth)
@@ -915,8 +917,10 @@ func (img imageStruct) stringPlainText() (string, error) {
table.SetColMinWidth(colLayersIndex, layersWidth)
}
imageName := ellipsize(img.RepoName, imageNameWidth, ellipsis)
tagName := ellipsize(img.Tag, tagWidth, ellipsis)
var imageName, tagName string
imageName = img.RepoName
tagName = img.Tag
digest := ellipsize(img.Digest, digestWidth, "")
imgSize, _ := strconv.ParseUint(img.Size, 10, 64)
size := ellipsize(strings.ReplaceAll(humanize.Bytes(imgSize), " ", ""), sizeWidth, ellipsis)