improved error handling of defer functions to include possible previous errors

controller/config/gnmiSubscriptionConfig.go

@@ -36,7 +36,8 @@ func ReadGnmiSubscriptionPaths() (err error) {
 
 	defer func() {
 		if ferr := f.Close(); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 

controller/nucleus/databaseDeviceStore.go

@@ -53,7 +53,8 @@ func (s *DatabaseDeviceStore) getByID(idOfDevice uuid.UUID) (loadedDevice device
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 	db := client.Database(database.DatabaseName)
@@ -77,7 +78,8 @@ func (s *DatabaseDeviceStore) getByName(nameOfDevice string) (loadedDevice devic
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 	db := client.Database(database.DatabaseName)
@@ -102,7 +104,8 @@ func (s *DatabaseDeviceStore) GetAll() (loadedDevices []device.LoadedDevice, err
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -115,7 +118,8 @@ func (s *DatabaseDeviceStore) GetAll() (loadedDevices []device.LoadedDevice, err
 	}
 	defer func() {
 		if ferr := cursor.Close(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -135,7 +139,8 @@ func (s *DatabaseDeviceStore) Add(deviceToAdd device.Device) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -158,7 +163,8 @@ func (s *DatabaseDeviceStore) Update(deviceToUpdate device.Device) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -191,7 +197,8 @@ func (s *DatabaseDeviceStore) Delete(deviceToDelete device.Device) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 

controller/nucleus/databasePndStore.go

 package nucleus
 
 import (
+	"fmt"
+
 	"code.fbi.h-da.de/danet/gosdn/controller/interfaces/device"
 	"code.fbi.h-da.de/danet/gosdn/controller/interfaces/networkdomain"
 
@@ -33,7 +35,8 @@ func (s *DatabasePndStore) Get(query store.Query) (newPnd networkdomain.NetworkD
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 	db := client.Database(database.DatabaseName)
@@ -77,7 +80,8 @@ func (s *DatabasePndStore) GetAll() (pnds []networkdomain.NetworkDomain, err err
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -90,7 +94,8 @@ func (s *DatabasePndStore) GetAll() (pnds []networkdomain.NetworkDomain, err err
 	}
 	defer func() {
 		if ferr := cursor.Close(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -130,7 +135,8 @@ func (s *DatabasePndStore) Add(pndToAdd networkdomain.NetworkDomain) (err error)
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -151,7 +157,8 @@ func (s *DatabasePndStore) Delete(pndToDelete networkdomain.NetworkDomain) (err
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 	db := client.Database(database.DatabaseName)

controller/nucleus/databaseSbiStore.go

 package nucleus
 
 import (
+	"fmt"
+
 	"code.fbi.h-da.de/danet/gosdn/controller/interfaces/southbound"
 	"code.fbi.h-da.de/danet/gosdn/controller/nucleus/database"
 	"code.fbi.h-da.de/danet/gosdn/controller/nucleus/errors"
@@ -23,7 +25,8 @@ func (s *DatabaseSbiStore) Add(sbiToAdd southbound.SouthboundInterface) (err err
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -47,7 +50,8 @@ func (s *DatabaseSbiStore) Delete(sbiToDelete southbound.SouthboundInterface) (e
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -68,7 +72,8 @@ func (s *DatabaseSbiStore) Get(query store.Query) (loadedSbi southbound.LoadedSb
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -97,7 +102,8 @@ func (s *DatabaseSbiStore) GetAll() (loadedSbis []southbound.LoadedSbi, err erro
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 	db := client.Database(database.DatabaseName)
@@ -109,7 +115,8 @@ func (s *DatabaseSbiStore) GetAll() (loadedSbis []southbound.LoadedSbi, err erro
 	}
 	defer func() {
 		if ferr := cursor.Close(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 

controller/nucleus/principalNetworkDomain.go

@@ -852,7 +852,7 @@ type StreamClient interface {
 // gRPC stream. A 'gostructs.go' file is created within the goSDN's
 // 'plugin-folder'. Each 'gostructs.go' file is stored in its own folder based
 // on a new uuid.UUID.
-func saveStreamToFile[T StreamClient](sc T, filename string, id uuid.UUID) error {
+func saveStreamToFile[T StreamClient](sc T, filename string, id uuid.UUID) (err error) {
 	folderName := viper.GetString("plugin-folder")
 	path := filepath.Join(folderName, id.String(), filename)
 
@@ -876,8 +876,9 @@ func saveStreamToFile[T StreamClient](sc T, filename string, id uuid.UUID) error
 	}
 
 	defer func() {
-		if err := f.Close(); err != nil {
-			log.Error("error closing file: ", err)
+		if ferr := f.Close(); ferr != nil {
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w error closing file:%+s", err, fErrString)
 		}
 	}()
 

controller/rbac/databaseRoleStore.go

 package rbac
 
 import (
+	"fmt"
+
 	"code.fbi.h-da.de/danet/gosdn/controller/interfaces/rbac"
 	"code.fbi.h-da.de/danet/gosdn/controller/nucleus/database"
 	"code.fbi.h-da.de/danet/gosdn/controller/nucleus/errors"
@@ -24,7 +26,8 @@ func (s *DatabaseRoleStore) Add(roleToAdd rbac.Role) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -48,7 +51,8 @@ func (s *DatabaseRoleStore) Delete(roleToDelete rbac.Role) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -89,7 +93,8 @@ func (s *DatabaseRoleStore) getByID(idOfRole uuid.UUID) (loadedRole rbac.LoadedR
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -114,7 +119,8 @@ func (s *DatabaseRoleStore) getByName(nameOfRole string) (loadedRole rbac.Loaded
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -140,7 +146,8 @@ func (s *DatabaseRoleStore) GetAll() (loadedRoles []rbac.LoadedRole, err error)
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -153,7 +160,8 @@ func (s *DatabaseRoleStore) GetAll() (loadedRoles []rbac.LoadedRole, err error)
 	}
 	defer func() {
 		if ferr := cursor.Close(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -174,7 +182,8 @@ func (s *DatabaseRoleStore) Update(roleToUpdate rbac.Role) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 	update := bson.D{primitive.E{Key: "$set", Value: roleToUpdate}}

controller/rbac/databaseUserStore.go

 package rbac
 
 import (
+	"fmt"
+
 	"code.fbi.h-da.de/danet/gosdn/controller/interfaces/rbac"
 	"code.fbi.h-da.de/danet/gosdn/controller/nucleus/database"
 	"code.fbi.h-da.de/danet/gosdn/controller/nucleus/errors"
@@ -24,7 +26,8 @@ func (s *DatabaseUserStore) Add(userToAdd rbac.User) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -48,7 +51,8 @@ func (s *DatabaseUserStore) Delete(userToDelete rbac.User) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -89,7 +93,8 @@ func (s *DatabaseUserStore) getByID(idOfUser uuid.UUID) (loadedUser rbac.LoadedU
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -114,7 +119,8 @@ func (s *DatabaseUserStore) getByName(nameOfUser string) (loadedUser rbac.Loaded
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -140,7 +146,8 @@ func (s *DatabaseUserStore) GetAll() (loadedUsers []rbac.LoadedUser, err error)
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -153,7 +160,8 @@ func (s *DatabaseUserStore) GetAll() (loadedUsers []rbac.LoadedUser, err error)
 	}
 	defer func() {
 		if ferr := cursor.Close(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -174,7 +182,8 @@ func (s *DatabaseUserStore) Update(userToUpdate rbac.User) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 

controller/topology/nodes/nodeStore.go

@@ -60,7 +60,8 @@ func (s *DatabaseNodeStore) getByID(idOfNode uuid.UUID) (loadedNode Node, err er
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -86,7 +87,8 @@ func (s *DatabaseNodeStore) getByName(nameOfNode string) (loadedNode Node, err e
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -111,7 +113,8 @@ func (s *DatabaseNodeStore) GetAll() (loadedNode []Node, err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 	db := client.Database(database.DatabaseName)
@@ -123,7 +126,8 @@ func (s *DatabaseNodeStore) GetAll() (loadedNode []Node, err error) {
 	}
 	defer func() {
 		if ferr := cursor.Close(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -141,7 +145,8 @@ func (s *DatabaseNodeStore) Add(node Node) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -163,7 +168,8 @@ func (s *DatabaseNodeStore) Update(node Node) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -194,7 +200,8 @@ func (s *DatabaseNodeStore) Delete(node Node) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 

controller/topology/ports/portStore.go

@@ -61,7 +61,8 @@ func (s *DatabasePortStore) getByID(idOfPort uuid.UUID) (loadedPort Port, err er
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -87,7 +88,8 @@ func (s *DatabasePortStore) getByName(nameOfPort string) (loadedPort Port, err e
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -112,7 +114,8 @@ func (s *DatabasePortStore) GetAll() (loadedPorts []Port, err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -125,7 +128,8 @@ func (s *DatabasePortStore) GetAll() (loadedPorts []Port, err error) {
 	}
 	defer func() {
 		if ferr := cursor.Close(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -143,7 +147,8 @@ func (s *DatabasePortStore) Add(port Port) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -165,7 +170,8 @@ func (s *DatabasePortStore) Update(port Port) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -196,7 +202,8 @@ func (s *DatabasePortStore) Delete(port Port) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 

controller/topology/routing-tables/routingTableStore.go

@@ -60,7 +60,8 @@ func (s *DatabaseRoutingTableStore) getByID(idOfRoutingTable uuid.UUID) (routing
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -84,7 +85,8 @@ func (s *DatabaseRoutingTableStore) getByName(nameOfRoutingTable string) (loaded
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -109,7 +111,8 @@ func (s *DatabaseRoutingTableStore) GetAll() (loadedRoutingTable []RoutingTable,
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -122,7 +125,8 @@ func (s *DatabaseRoutingTableStore) GetAll() (loadedRoutingTable []RoutingTable,
 	}
 	defer func() {
 		if ferr := cursor.Close(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -140,7 +144,8 @@ func (s *DatabaseRoutingTableStore) Add(routingTable RoutingTable) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -162,7 +167,8 @@ func (s *DatabaseRoutingTableStore) Update(routingTable RoutingTable) (err error
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -193,7 +199,8 @@ func (s *DatabaseRoutingTableStore) Delete(routingTable RoutingTable) (err error
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 

controller/topology/topologyStore.go

@@ -61,7 +61,8 @@ func (s *DatabaseTopologyStore) getByID(idOfTopology uuid.UUID) (loadedTopology
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -85,7 +86,8 @@ func (s *DatabaseTopologyStore) getByName(nameOfTopology string) (loadedTopology
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -110,7 +112,8 @@ func (s *DatabaseTopologyStore) GetAll() (loadedTopology []links.Link, err error
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -123,7 +126,8 @@ func (s *DatabaseTopologyStore) GetAll() (loadedTopology []links.Link, err error
 	}
 	defer func() {
 		if ferr := cursor.Close(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -141,7 +145,8 @@ func (s *DatabaseTopologyStore) Add(link links.Link) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -163,7 +168,8 @@ func (s *DatabaseTopologyStore) Update(linkToUpdate links.Link) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 
@@ -194,7 +200,8 @@ func (s *DatabaseTopologyStore) Delete(linkToDelete links.Link) (err error) {
 	defer cancel()
 	defer func() {
 		if ferr := client.Disconnect(ctx); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 

csbi/build.go

@@ -54,7 +54,8 @@ func buildImage(d Deployment, dockerClient *client.Client) (err error) {
 	}
 	defer func() {
 		if ferr := res.Body.Close(); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()
 

csbi/grpc.go

@@ -108,7 +108,8 @@ func (s server) GetFile(req *pb.GetPayloadRequest, stream pb.CsbiService_GetFile
 	var file *os.File
 	defer func() {
 		if ferr := file.Close(); ferr != nil {
-			err = ferr
+			fErrString := ferr.Error()
+			err = fmt.Errorf("InternalError=%w DeferError=%+s", err, fErrString)
 		}
 	}()