fix: linter

Signed-off-by: Boris Glimcher <[email protected]>
opiproject · Jun 7, 2024 · 7aab2e5 · 7aab2e5
1 parent 8f455c5
commit 7aab2e5
Show file tree

Hide file tree

Showing 24 changed files with 71 additions and 14 deletions.
diff --git a/sztp-agent/cmd/daemon_test.go b/sztp-agent/cmd/daemon_test.go
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2022-2023 Red Hat.
+
+// Package cmd implements the CLI commands
 package cmd
 
 import (

diff --git a/sztp-agent/cmd/disable.go b/sztp-agent/cmd/disable.go
@@ -4,6 +4,7 @@ Copyright (C) 2022-2023 Intel Corporation
 Copyright (c) 2022 Dell Inc, or its subsidiaries.
 Copyright (C) 2022 Red Hat.
 */
+
 // Package cmd implements the CLI commands
 package cmd
 

diff --git a/sztp-agent/cmd/disable_test.go b/sztp-agent/cmd/disable_test.go
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2022-2023 Red Hat.
+
+// Package cmd implements the CLI commands
 package cmd
 
 import (

diff --git a/sztp-agent/cmd/enable.go b/sztp-agent/cmd/enable.go
@@ -4,6 +4,7 @@ Copyright (C) 2022-2023 Intel Corporation
 Copyright (c) 2022 Dell Inc, or its subsidiaries.
 Copyright (C) 2022 Red Hat.
 */
+
 // Package cmd implements the CLI commands
 package cmd
 

diff --git a/sztp-agent/cmd/enable_test.go b/sztp-agent/cmd/enable_test.go
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2022-2023 Red Hat.
+
+// Package cmd implements the CLI commands
 package cmd
 
 import (

diff --git a/sztp-agent/cmd/run.go b/sztp-agent/cmd/run.go
@@ -4,6 +4,7 @@ Copyright (C) 2022-2023 Intel Corporation
 Copyright (c) 2022 Dell Inc, or its subsidiaries.
 Copyright (C) 2022 Red Hat.
 */
+
 // Package cmd implements the CLI commands
 package cmd
 

diff --git a/sztp-agent/cmd/run_test.go b/sztp-agent/cmd/run_test.go
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2022-2023 Red Hat.
+
+// Package cmd implements the CLI commands
 package cmd
 
 import (

diff --git a/sztp-agent/cmd/status.go b/sztp-agent/cmd/status.go
@@ -4,6 +4,7 @@ Copyright (C) 2022-2023 Intel Corporation
 Copyright (c) 2022 Dell Inc, or its subsidiaries.
 Copyright (C) 2022 Red Hat.
 */
+
 // Package cmd implements the CLI commands
 package cmd
 

diff --git a/sztp-agent/cmd/status_test.go b/sztp-agent/cmd/status_test.go
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2022-2023 Red Hat.
+
+// Package cmd implements the CLI commands
 package cmd
 
 import (

diff --git a/sztp-agent/main.go b/sztp-agent/main.go
@@ -5,6 +5,7 @@ Copyright (c) 2022 Dell Inc, or its subsidiaries.
 Copyright (C) 2022 Red Hat.
 */
 
+// Package main
 package main
 
 import (

diff --git a/sztp-agent/pkg/secureagent/agent.go b/sztp-agent/pkg/secureagent/agent.go
@@ -4,7 +4,8 @@ Copyright (C) 2022-2023 Intel Corporation
 Copyright (c) 2022 Dell Inc, or its subsidiaries.
 Copyright (C) 2022 Red Hat.
 */
-// Package secureAgent implements the secure agent
+
+// Package secureagent implements the secure agent
 package secureagent
 
 const (

diff --git a/sztp-agent/pkg/secureagent/agent_test.go b/sztp-agent/pkg/secureagent/agent_test.go
@@ -4,7 +4,8 @@ Copyright (C) 2022-2023 Intel Corporation
 Copyright (c) 2022 Dell Inc, or its subsidiaries.
 Copyright (C) 2022 Red Hat.
 */
-// Package secureAgent implements the secure agent
+
+// Package secureagent implements the secure agent
 package secureagent
 
 import (

diff --git a/sztp-agent/pkg/secureagent/daemon.go b/sztp-agent/pkg/secureagent/daemon.go
@@ -4,7 +4,8 @@ Copyright (C) 2022-2023 Intel Corporation
 Copyright (c) 2022 Dell Inc, or its subsidiaries.
 Copyright (C) 2022 Red Hat.
 */
-// Package secureAgent implements the secure agent
+
+// Package secureagent implements the secure agent
 package secureagent
 
 import (
@@ -246,8 +247,16 @@ func (a *Agent) downloadAndValidateImage() error {
 		if err != nil {
 			return err
 		}
-		defer file.Close()
-		defer response.Body.Close()
+		defer func() {
+			if err := file.Close(); err != nil {
+				log.Println("[ERROR] Error when closing:", err)
+			}
+		}()
+		defer func() {
+			if err := response.Body.Close(); err != nil {
+				log.Println("[ERROR] Error when closing:", err)
+			}
+		}()
 
 		log.Printf("[INFO] Downloaded file: %s with size: %d", ARTIFACTS_PATH+a.BootstrapServerOnboardingInfo.IetfSztpConveyedInfoOnboardingInformation.InfoTimestampReference+filepath.Base(item), size)
 		log.Println("[INFO] Verify the file checksum: ", ARTIFACTS_PATH+a.BootstrapServerOnboardingInfo.IetfSztpConveyedInfoOnboardingInformation.InfoTimestampReference+filepath.Base(item))
@@ -259,7 +268,11 @@ func (a *Agent) downloadAndValidateImage() error {
 				log.Panic(err)
 				return err
 			}
-			defer f.Close()
+			defer func() {
+				if err := f.Close(); err != nil {
+					log.Println("[ERROR] Error when closing:", err)
+				}
+			}()
 			h := sha256.New()
 			if _, err := io.Copy(h, f); err != nil {
 				return err
@@ -290,7 +303,11 @@ func (a *Agent) copyConfigurationFile() error {
 		log.Println("[ERROR] creating the configuration file", err.Error())
 		return err
 	}
-	defer file.Close()
+	defer func() {
+		if err := file.Close(); err != nil {
+			log.Println("[ERROR] Error when closing:", err)
+		}
+	}()
 
 	plainTest, _ := base64.StdEncoding.DecodeString(a.BootstrapServerOnboardingInfo.IetfSztpConveyedInfoOnboardingInformation.Configuration)
 	_, err = file.WriteString(string(plainTest))
@@ -330,7 +347,11 @@ func (a *Agent) launchScriptsConfiguration(typeOf string) error {
 		log.Println("[ERROR] creating the "+scriptName+"-configuration script", err.Error())
 		return err
 	}
-	defer file.Close()
+	defer func() {
+		if err := file.Close(); err != nil {
+			log.Println("[ERROR] Error when closing:", err)
+		}
+	}()
 
 	plainTest, _ := base64.StdEncoding.DecodeString(script)
 	_, err = file.WriteString(string(plainTest))

diff --git a/sztp-agent/pkg/secureagent/daemon_test.go b/sztp-agent/pkg/secureagent/daemon_test.go
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2022-2023 Red Hat.
 
-// Package secureAgent implements the secure agent
+// Package secureagent implements the secure agent
 package secureagent
 
 import (

diff --git a/sztp-agent/pkg/secureagent/disable.go b/sztp-agent/pkg/secureagent/disable.go
@@ -4,6 +4,7 @@ Copyright (C) 2022-2023 Intel Corporation
 Copyright (c) 2022 Dell Inc, or its subsidiaries.
 Copyright (C) 2022 Red Hat.
 */
+
 // Package secureAgent implements the secure agent
 package secureagent
 

diff --git a/sztp-agent/pkg/secureagent/disable_test.go b/sztp-agent/pkg/secureagent/disable_test.go
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2022-2023 Red Hat.
+
+// Package secureagent implements the secure agent
 package secureagent
 
 import "testing"

diff --git a/sztp-agent/pkg/secureagent/enable.go b/sztp-agent/pkg/secureagent/enable.go
@@ -4,7 +4,8 @@ Copyright (C) 2022-2023 Intel Corporation
 Copyright (c) 2022 Dell Inc, or its subsidiaries.
 Copyright (C) 2022 Red Hat.
 */
-// Package secureAgent implements the secure agent
+
+// Package secureagent implements the secure agent
 package secureagent
 
 import "log"

diff --git a/sztp-agent/pkg/secureagent/enable_test.go b/sztp-agent/pkg/secureagent/enable_test.go
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2022-2023 Red Hat.
+
+// Package secureagent implements the secure agent
 package secureagent
 
 import "testing"

diff --git a/sztp-agent/pkg/secureagent/run.go b/sztp-agent/pkg/secureagent/run.go
@@ -4,7 +4,8 @@ Copyright (C) 2022-2023 Intel Corporation
 Copyright (c) 2022 Dell Inc, or its subsidiaries.
 Copyright (C) 2022 Red Hat.
 */
-// Package secureAgent implements the secure agent
+
+// Package secureagent implements the secure agent
 package secureagent
 
 import "log"

diff --git a/sztp-agent/pkg/secureagent/run_test.go b/sztp-agent/pkg/secureagent/run_test.go
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2022-2023 Red Hat.
+
+// Package secureagent implements the secure agent
 package secureagent
 
 import "testing"

diff --git a/sztp-agent/pkg/secureagent/status.go b/sztp-agent/pkg/secureagent/status.go
@@ -4,7 +4,8 @@ Copyright (C) 2022-2023 Intel Corporation
 Copyright (c) 2022 Dell Inc, or its subsidiaries.
 Copyright (C) 2022 Red Hat.
 */
-// Package secureAgent implements the secure agent
+
+// Package secureagent implements the secure agent
 package secureagent
 
 import "log"

diff --git a/sztp-agent/pkg/secureagent/status_test.go b/sztp-agent/pkg/secureagent/status_test.go
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2022-2023 Red Hat.
+
+// Package secureagent implements the secure agent
 package secureagent
 
 import "testing"

diff --git a/sztp-agent/pkg/secureagent/utils.go b/sztp-agent/pkg/secureagent/utils.go
@@ -4,7 +4,8 @@ Copyright (C) 2022-2023 Intel Corporation
 Copyright (c) 2022 Dell Inc, or its subsidiaries.
 Copyright (C) 2022 Red Hat.
 */
-// Package secureAgent implements the secure agent
+
+// Package secureagent implements the secure agent
 package secureagent
 
 import (
@@ -81,7 +82,11 @@ func (a *Agent) doTLSRequest(input string, url string, empty bool) (*BootstrapSe
 		log.Println("Error doing the request", err.Error())
 		return nil, err
 	}
-	defer res.Body.Close()
+	defer func() {
+		if err := res.Body.Close(); err != nil {
+			log.Println("Error when closing:", err)
+		}
+	}()
 
 	bodyBytes, err := io.ReadAll(res.Body)
 	if err != nil {

diff --git a/sztp-agent/pkg/secureagent/utils_test.go b/sztp-agent/pkg/secureagent/utils_test.go
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2022-2023 Red Hat.
+
+// Package secureagent implements the secure agent
 package secureagent
 
 import (