alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

fnctl: fix how bump deal with tagged names (#279)

Browse Source
This commit is contained in:
C Cirello
2016-11-15 00:51:13 +01:00
committed by Travis Reeder
parent c6c378edcf
commit 63b362b419
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fnctl/bump.go
View File

@@ -49,9 +49,11 @@ func (b *bumpcmd) bump(path string) error {
return err
}
funcfile.Name = cleanImageName(funcfile.Name)
if funcfile.Version == "" {
funcfile.Version = initialVersion
}
s, err := storage.NewVersionStorage("local", funcfile.Version)
if err != nil {
return err
@@ -73,6 +75,12 @@ func (b *bumpcmd) bump(path string) error {
return nil
}
func cleanImageName(name string) string {
if i := strings.Index(name, ":"); i != -1 {
name = name[:i]
}
return name
}
func imageversion(image string) (name, ver string) {
tagpos := strings.Index(image, ":")
if tagpos == -1 {
@@ -83,13 +91,13 @@ func imageversion(image string) (name, ver string) {
s, err := storage.NewVersionStorage("local", imgver)
if err != nil {
return imgname, ""
return imgname, initialVersion
}
version := bumper.NewSemverBumper(s, "")
v, err := version.GetCurrentVersion()
if err != nil {
return imgname, ""
return imgname, initialVersion
}
return imgname, v.String()

2
fnctl/bump_test.go
View File

@@ -13,7 +13,7 @@ func TestImageversion(t *testing.T) {
wantVer string
}{
{"tag absent", args{"owner/imagename"}, "owner/imagename", initialVersion},
{"non semver tag", args{"owner/imagename:tag"}, "owner/imagename", ""},
{"non semver tag", args{"owner/imagename:tag"}, "owner/imagename", "0.0.1"},
{"semver tag (M.m.p)", args{"owner/imagename:0.0.1"}, "owner/imagename", "0.0.1"},
{"semver tag (vM.m.p)", args{"owner/imagename:v0.0.1"}, "owner/imagename", "0.0.1"},
}