fix: remove panic statements and return errors

opiproject · Sep 19, 2024 · bdd3fb0 · bdd3fb0
1 parent e543632
commit bdd3fb0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/sztp-agent/pkg/dhcp/dbus.go b/sztp-agent/pkg/dhcp/dbus.go
@@ -19,7 +19,7 @@ import (
 func GetBootstrapURLsViaNetworkManager() ([]string, error) {
 	conn, err := dbus.SystemBus()
 	if err != nil {
-		panic(fmt.Errorf("failed to connect to system bus: %v", err))
+		return nil, fmt.Errorf("failed to connect to system bus: %v", err)
 	}
 
 	// Get NetworkManager object
@@ -28,7 +28,7 @@ func GetBootstrapURLsViaNetworkManager() ([]string, error) {
 	var activeConnPaths []dbus.ObjectPath
 	err = nm.Call("org.freedesktop.DBus.Properties.Get", 0, "org.freedesktop.NetworkManager", "ActiveConnections").Store(&activeConnPaths)
 	if err != nil {
-		panic(fmt.Errorf("failed to get ActiveConnections property: %v", err))
+		return nil, fmt.Errorf("failed to get ActiveConnections property: %v", err)
 	}
 
 	log.Println("[INFO] active connection paths: ", activeConnPaths)

diff --git a/sztp-agent/pkg/secureagent/daemon.go b/sztp-agent/pkg/secureagent/daemon.go
@@ -55,7 +55,7 @@ func (a *Agent) performBootstrapSequence() error {
 	urls := a.GetBootstrapURL()
 	log.Println("[INFO] Performing the Bootstrap Sequence on each URL")
 	for _, url := range urls {
-		urlCopy := url
+		urlCopy := url // found no other way to escape golangci-lint
 		err = a.doRequestBootstrapServerOnboardingInfo(&urlCopy)
 		if err != nil {
 			log.Println("[ERROR] ", err.Error())