Merge branch 'develop' into istaester/migrate-yang-models

cli/cmd/changeList.go

@@ -68,7 +68,11 @@ var changeListCmd = &cobra.Command{
 		}
 
 		spinner.Success()
-		pterm.DefaultTable.WithHasHeader().WithData(data).Render()
+		err = pterm.DefaultTable.WithHasHeader().WithData(data).Render()
+		if err != nil {
+			return err
+		}
+
 		return nil
 	},
 }

cli/cmd/deviceList.go

@@ -60,7 +60,11 @@ var deviceListCmd = &cobra.Command{
 
 		spinner.Success()
 
-		pterm.DefaultTable.WithHasHeader().WithData(data).Render()
+		err = pterm.DefaultTable.WithHasHeader().WithData(data).Render()
+		if err != nil {
+			return err
+		}
+
 		return nil
 	},
 }

cli/cmd/pndList.go

@@ -60,7 +60,11 @@ var pndListCmd = &cobra.Command{
 
 		spinner.Success()
 
-		pterm.DefaultTable.WithHasHeader().WithData(data).Render()
+		err = pterm.DefaultTable.WithHasHeader().WithData(data).Render()
+		if err != nil {
+			return err
+		}
+
 		return nil
 	},
 }

cli/cmd/root.go

@@ -67,7 +67,10 @@ The login command must be called for authorization.
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
-	rootCmd.Execute()
+	err := rootCmd.Execute()
+	if err != nil {
+		log.Error("Could not execute root command: ", err)
+	}
 	//cobra.CheckErr(rootCmd.Execute())
 }
 

controller/api/device.go

@@ -100,7 +100,12 @@ func GetSbiSchemaTree(ctx context.Context, addr string, pid, sid uuid.UUID) (map
 				break
 			}
 			log.Error(err)
-			sClient.CloseSend()
+
+			closeErr := sClient.CloseSend()
+			if closeErr != nil {
+				return nil, err
+			}
+
 			return map[string]*yang.Entry{}, err
 		}
 		sTreeBytes = append(sTreeBytes, payload.Chunk...)

controller/nucleus/principalNetworkDomain.go

@@ -86,7 +86,11 @@ func NewPND(
 
 	if len(existingSBIs) == 0 {
 		newSBI, _ := NewSBI(spb.Type_TYPE_OPENCONFIG)
-		pnd.sbic.Add(newSBI)
+		err = pnd.sbic.Add(newSBI)
+
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	return pnd, nil
@@ -718,7 +722,6 @@ func saveGenericClientStreamToFile(t GenericGrpcClient, filename string, id uuid
 			if err == io.EOF {
 				break
 			}
-			t.CloseSend()
 			closeErr := t.CloseSend()
 			if closeErr != nil {
 				return uuid.Nil, closeErr
@@ -728,7 +731,6 @@ func saveGenericClientStreamToFile(t GenericGrpcClient, filename string, id uuid
 		}
 		n, err := f.Write(payload.Chunk)
 		if err != nil {
-			t.CloseSend()
 			closeErr := t.CloseSend()
 			if closeErr != nil {
 				return uuid.Nil, closeErr

controller/nucleus/util/proto/message.go

@@ -3,6 +3,7 @@ package proto
 import (
 	"fmt"
 	"io/ioutil"
+	"path/filepath"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -29,7 +30,7 @@ func Write(message proto.Message, filename string) error {
 // Read reads a binary file (containing a marshaled protocol buffer message)
 // and unmarshals it back into a protocol buffer message
 func Read(filename string, message proto.Message) error {
-	data, err := ioutil.ReadFile(filename)
+	data, err := ioutil.ReadFile(filepath.Clean(filename))
 	if err != nil {
 		return fmt.Errorf("cannot read binary data from file: %w", err)
 	}