particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

blueprint: add default version

Browse source 
If the user creates a new blueprint with no version specified, the
blueprint struct uses "0.0.0" as the default version. Blueprint tests
for a blueprint with an empty version now expect no error.
This commit is contained in:
Jacob Kozol 2020-03-04 16:28:17 +01:00 • committed by Tom Gundersen
parent 571932db37
commit 4690320503
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/blueprint/blueprint.go
View file

@ -65,6 +65,9 @@ func (b *Blueprint) Initialize() error {
if b.Groups == nil {
b.Groups = []Group{}
}
if b.Version == "" {
b.Version = "0.0.0"
}
// Return an error if the version is not valid
_, err := semver.NewVersion(b.Version)
if err != nil {

2
internal/blueprint/blueprint_test.go
View file

@ -42,7 +42,7 @@ func TestBlueprintInitialize(t *testing.T) {
NewBlueprint Blueprint
ExpectedError bool
}{
{Blueprint{Name: "bp-test-1", Description: "Empty version", Version: ""}, true},
{Blueprint{Name: "bp-test-1", Description: "Empty version", Version: ""}, false},
{Blueprint{Name: "bp-test-2", Description: "Invalid version 1", Version: "0"}, true},
{Blueprint{Name: "bp-test-2", Description: "Invalid version 2", Version: "0.0"}, true},
{Blueprint{Name: "bp-test-3", Description: "Invalid version 3", Version: "0.0.0.0"}, true},

1
internal/weldr/api_test.go
View file

@ -71,6 +71,7 @@ func TestBlueprintsNew(t *testing.T) {
ExpectedStatus int
ExpectedJSON string
}{
{"POST", "/api/v0/blueprints/new", `{"name":"test","description":"Test","packages":[],"version":""}`, http.StatusOK, `{"status":true}`},
{"POST", "/api/v0/blueprints/new", `{"name":"test","description":"Test","packages":[{"name":"httpd","version":"2.4.*"}],"version":"0.0.0"}`, http.StatusOK, `{"status":true}`},
}