Merge branch 'main' into use-go-base-image

dell · Feb 20, 2024 · 2711a67 · 2711a67
2 parents 2fb39e0 + b004ef8
commit 2711a67
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/main.go b/main.go
@@ -57,9 +57,18 @@ func Run(
 	if v, ok := csictx.LookupEnv(ctx, gocsi.EnvVarDebug); ok {
 		/* #nosec G104 */
 		if ok, _ := strconv.ParseBool(v); ok {
-			csictx.Setenv(ctx, gocsi.EnvVarLogLevel, "debug")
-			csictx.Setenv(ctx, gocsi.EnvVarReqLogging, "true")
-			csictx.Setenv(ctx, gocsi.EnvVarRepLogging, "true")
+			err := csictx.Setenv(ctx, gocsi.EnvVarLogLevel, "debug")
+			if err != nil {
+				log.Warnf("failed to set EnvVarLogLevel")
+			}
+			err = csictx.Setenv(ctx, gocsi.EnvVarReqLogging, "true")
+			if err != nil {
+				log.Warnf("failed to set EnvVarReqLogging")
+			}
+			err = csictx.Setenv(ctx, gocsi.EnvVarRepLogging, "true")
+			if err != nil {
+				log.Warnf("failed to set EnvVarRepLogging")
+			}
 		}
 	}
 
@@ -130,7 +139,10 @@ func Run(
 			/* #nosec G104 */
 			if l.Addr().Network() == netUnix {
 				sockFile := l.Addr().String()
-				os.RemoveAll(sockFile)
+				err := os.RemoveAll(sockFile)
+				if err != nil {
+					log.Warnf("failed to remove sock file: %s", err)
+				}
 				log.WithField("path", sockFile).Info("removed sock file")
 			}
 		})

diff --git a/retriever/go-metadata-retreiver.go b/retriever/go-metadata-retreiver.go
@@ -359,8 +359,14 @@ func (sp *Plugin) initEnvVars(ctx context.Context) {
 	if v, ok := csictx.LookupEnv(ctx, gocsi.EnvVarDebug); ok {
 		/* #nosec G104 */
 		if ok, _ := strconv.ParseBool(v); ok {
-			csictx.Setenv(ctx, gocsi.EnvVarReqLogging, "true")
-			csictx.Setenv(ctx, gocsi.EnvVarRepLogging, "true")
+			err := csictx.Setenv(ctx, gocsi.EnvVarReqLogging, "true")
+			if err != nil {
+				log.Warnf("failed to set EnvVarReqLogging")
+			}
+			err = csictx.Setenv(ctx, gocsi.EnvVarRepLogging, "true")
+			if err != nil {
+				log.Warnf("failed to set EnvVarRepLogging")
+			}
 		}
 	}