create-fw-bundle: Allow removing fw parts

`create-fw-bundle part:-` will remove part "part" from the bundle, if present

Author: rojer

cli/create_fw_bundle/create_fw_bundle.go

@@ -31,6 +31,7 @@ import (
 	flag "github.com/spf13/pflag"
 	"github.com/youmark/pkcs8"
 	"golang.org/x/crypto/ssh/terminal"
+	glog "k8s.io/klog/v2"
 
 	moscommon "github.com/mongoose-os/mos/cli/common"
 	"github.com/mongoose-os/mos/cli/dev"
@@ -88,11 +89,14 @@ func CreateFWBundle(ctx context.Context, devConn dev.DevConn) error {
 	}
 	if len(flag.Args()) > 1 {
 		for _, ps := range flag.Args()[1:] {
-			p, err := fwbundle.PartFromString(ps)
-			if err != nil {
+			pn, p, err := fwbundle.PartFromString(ps)
+			switch {
+			case err != nil:
 				return errors.Annotatef(err, "%s", ps)
-			}
-			if strings.HasSuffix(p.Src, ".hex") {
+			case p == nil:
+				err = fwb.RemovePart(pn)
+				glog.Infof("Removing partition %s: %v", pn, err)
+			case strings.HasSuffix(p.Src, ".hex"):
 				hpp, err := fwbundle.PartsFromHexFile(p.Src, p.Name, 255, 512)
 				if err != nil {
 					return errors.Annotatef(err, "%s", ps)
@@ -111,7 +115,7 @@ func CreateFWBundle(ctx context.Context, devConn dev.DevConn) error {
 					p1.SetData(data)
 					fwb.AddPart(&p1)
 				}
-			} else {
+			default:
 				p.SetDataProvider(func(name, src string) ([]byte, error) {
 					srcAbs := src
 					if !filepath.IsAbs(src) && *flags.SrcDir != "" {

common/fwbundle/fw_bundle.go

@@ -26,8 +26,9 @@ import (
 	"time"
 
 	"github.com/juju/errors"
-	"github.com/mongoose-os/mos/cli/ourutil"
 	glog "k8s.io/klog/v2"
+
+	"github.com/mongoose-os/mos/cli/ourutil"
 )
 
 const (
@@ -67,6 +68,14 @@ func (fwb *FirmwareBundle) AddPart(p *FirmwarePart) error {
 	return nil
 }
 
+func (fwb *FirmwareBundle) RemovePart(name string) error {
+	if _, ok := fwb.FirmwareManifest.Parts[name]; !ok {
+		return errors.New("not found")
+	}
+	delete(fwb.FirmwareManifest.Parts, name)
+	return nil
+}
+
 type partsByAddr []*FirmwarePart
 
 func (pp partsByAddr) Len() int      { return len(pp) }

common/fwbundle/fw_part.go

@@ -65,10 +65,13 @@ type firmwarePart struct {
 
 type DataProvider func(name, src string) ([]byte, error)
 
-func PartFromString(ps string) (*FirmwarePart, error) {
+func PartFromString(ps string) (string, *FirmwarePart, error) {
 	np := strings.SplitN(ps, ":", 2)
 	if len(np) < 2 {
-		return nil, errors.Errorf("invalid part spec '%s', must be 'name:prop=value,...'", ps)
+		return "", nil, errors.Errorf("invalid part spec '%s', must be 'name:prop=value,...'", ps)
+	}
+	if np[1] == "-" {
+		return np[0], nil, nil
 	}
 	// Create attrs JSON and re-parse it.
 	m := make(map[string]interface{})
@@ -78,7 +81,7 @@ func PartFromString(ps string) (*FirmwarePart, error) {
 		}
 		kv := strings.SplitN(prop, "=", 2)
 		if len(kv) < 2 {
-			return nil, errors.Errorf("invalid property spec '%s', must be 'prop=value'", prop)
+			return "", nil, errors.Errorf("invalid property spec '%s', must be 'prop=value'", prop)
 		}
 		k := kv[0]
 		v := kv[1]
@@ -104,10 +107,10 @@ func PartFromString(ps string) (*FirmwarePart, error) {
 	mb, _ := json.Marshal(&m)
 	var p FirmwarePart
 	if err := json.Unmarshal(mb, &p); err != nil {
-		return nil, err
+		return "", nil, err
 	}
 	p.Name = np[0]
-	return &p, nil
+	return p.Name, &p, nil
 }
 
 func computeSHA1(data []byte) string {

common/fwbundle/fw_part_test.go

@@ -18,10 +18,11 @@ package fwbundle
 
 import (
 	"fmt"
-	"reflect"
 	"testing"
 
 	"github.com/juju/errors"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestPartFromString(t *testing.T) {
@@ -33,6 +34,7 @@ func TestPartFromString(t *testing.T) {
 	}{
 		{s: ``, fail: true},
 		{s: `foo:`, p: &FirmwarePart{Name: "foo"}},
+		{s: `foo:-`, p: nil},
 		{s: `foo:type`, fail: true},
 		{s: `foo:type=bar`, p: &FirmwarePart{Name: "foo", Type: "bar"}},
 		{s: `foo:type="bar"`, p: &FirmwarePart{Name: "foo", Type: "bar"}},
@@ -49,17 +51,16 @@ func TestPartFromString(t *testing.T) {
 				attrs: map[string]interface{}{"update": false},
 			}},
 	}
-	for i, c := range cases {
-		p, err := PartFromString(c.s)
+	for _, c := range cases {
+		pn, p, err := PartFromString(c.s)
 		if c.fail {
-			if err == nil {
-				t.Fatalf("%d: %s: expected failure, got %#v", i, c.s, p)
-			}
+			assert.Errorf(t, err, "case %s, ret %+v", c.s, p)
+			assert.Nilf(t, p, "case %s", c.s)
 		} else {
-			if err != nil {
-				t.Fatalf("%d: %s: got error %s", i, c.s, err)
-			} else if !reflect.DeepEqual(p, c.p) {
-				t.Fatalf("%d: %s: expected \n%#v\n, got\n%#v", i, c.s, c.p, p)
+			require.NoError(t, err, "case %s, ret %+v", c.s, p)
+			assert.Equalf(t, c.p, p, "case %s", c.s)
+			if c.p != nil {
+				assert.Equalf(t, p.Name, pn, "case %s", c.s)
 			}
 		}
 	}

go.mod

@@ -36,6 +36,7 @@ require (
 	github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c
 	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/spf13/pflag v1.0.5
+	github.com/stretchr/testify v1.7.0
 	github.com/xanzy/ssh-agent v0.3.1 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a
 	goji.io v2.0.0+incompatible