fix issues from code review

This commit is contained in:
Nestor
2019-01-17 15:49:35 +01:00
parent 6dd599a983
commit 6d56c1750f
8 changed files with 50 additions and 30 deletions

View File

@@ -29,7 +29,7 @@ import (
)
type setImageTagOptions struct {
imageTagMap map[string]image.Tag
imageTagMap map[string]image.ImageTag
}
var pattern = regexp.MustCompile("^(.*):([a-zA-Z0-9._-]*)$")
@@ -74,11 +74,11 @@ func (o *setImageTagOptions) Validate(args []string) error {
return errors.New("no image specified")
}
o.imageTagMap = make(map[string]image.Tag)
o.imageTagMap = make(map[string]image.ImageTag)
for _, arg := range args {
if s := strings.Split(arg, "@"); len(s) > 1 {
o.imageTagMap[s[0]] = image.Tag{
o.imageTagMap[s[0]] = image.ImageTag{
Name: s[0],
Digest: s[1],
}
@@ -89,7 +89,7 @@ func (o *setImageTagOptions) Validate(args []string) error {
if len(s) != 3 {
return errors.New("invalid format of imagetag, must specify it as <image>:<newtag> or <image>@<digest>")
}
o.imageTagMap[s[1]] = image.Tag{
o.imageTagMap[s[1]] = image.ImageTag{
Name: s[1],
NewTag: s[2],
}
@@ -116,7 +116,7 @@ func (o *setImageTagOptions) RunSetImageTags(fSys fs.FileSystem) error {
o.imageTagMap[it.Name] = it
}
var imageTags []image.Tag
var imageTags []image.ImageTag
for _, v := range o.imageTagMap {
imageTags = append(imageTags, v)
}