Omit version in order grouping if empty

Author: Sophie Wigmore

cargo/jam/commands/update_builder.go

@@ -53,7 +53,9 @@ func updateBuilderRun(flags updateBuilderFlags) error {
 		for j, order := range builder.Order {
 			for k, group := range order.Group {
 				if group.ID == image.Path {
-					builder.Order[j].Group[k].Version = image.Version
+					if builder.Order[j].Group[k].Version != "" {
+						builder.Order[j].Group[k].Version = image.Version
+					}
 				}
 			}
 		}

cargo/jam/internal/builder_config.go

@@ -32,7 +32,7 @@ type BuilderConfigOrder struct {
 
 type BuilderConfigOrderGroup struct {
 	ID       string `toml:"id"`
-	Version  string `toml:"version"`
+	Version  string `toml:"version,omitempty"`
 	Optional bool   `toml:"optional,omitempty"`
 }
 type BuilderConfigStack struct {

cargo/jam/internal/builder_config_test.go

@@ -43,7 +43,6 @@ description = "Some description"
 
   [[order.group]]
     id = "some-repository/other-buildpack-id"
-    version = "0.20.22"
 
 [[order]]
 
@@ -89,8 +88,7 @@ description = "Some description"
 					{
 						Group: []internal.BuilderConfigOrderGroup{
 							{
-								ID:      "some-repository/other-buildpack-id",
-								Version: "0.20.22",
+								ID: "some-repository/other-buildpack-id",
 							},
 						},
 					},

cargo/jam/internal/buildpack_config.go

@@ -20,7 +20,7 @@ type BuildpackConfigOrder struct {
 
 type BuildpackConfigOrderGroup struct {
 	ID       string `toml:"id"`
-	Version  string `toml:"version"`
+	Version  string `toml:"version,omitempty"`
 	Optional bool   `toml:"optional,omitempty"`
 }
 

cargo/jam/internal/buildpack_config_test.go

@@ -43,7 +43,6 @@ func testBuildpackConfig(t *testing.T, context spec.G, it spec.S) {
 
 					[[order.group]]
 						id = "some-repository/last-buildpack-id"
-						version = "0.2.0"
 
 				[[order]]
 					[[order.group]]
@@ -81,8 +80,7 @@ func testBuildpackConfig(t *testing.T, context spec.G, it spec.S) {
 								Version: "0.20.1",
 							},
 							{
-								ID:      "some-repository/last-buildpack-id",
-								Version: "0.2.0",
+								ID: "some-repository/last-buildpack-id",
 							},
 						},
 					},

cargo/jam/update_builder_test.go

@@ -123,7 +123,6 @@ description = "Some description"
 
   [[order.group]]
     id = "some-repository/other-buildpack-id"
-    version = "0.20.22"
 
 [[order]]
 
@@ -179,7 +178,6 @@ description = "Some description"
 
   [[order.group]]
     id = "some-repository/other-buildpack-id"
-    version = "0.20.22"
 
 [[order]]