fix: Fix two SonarQube scan failures

1. go:S117
2. go:S1186

Signed-off-by: Jude Hung <[email protected]>

Author: judehung

internal/pkg/infrastructure/postgres/device.go

@@ -255,21 +255,21 @@ func (c *Client) DeviceTree(parent string, levels int, offset int, limit int, la
 	} else {
 		maxLevels = levels
 	}
-	all_devices, err := deviceSubTree(context.Background(), c.ConnPool, parent, maxLevels, labels)
+	allDevices, err := deviceSubTree(context.Background(), c.ConnPool, parent, maxLevels, labels)
 	if err != nil {
 		return 0, emptyList, err
 	}
 	if offset < 0 {
 		offset = 0
 	}
-	if offset >= len(all_devices) {
-		return uint32(len(all_devices)), emptyList, nil
+	if offset >= len(allDevices) {
+		return uint32(len(allDevices)), emptyList, nil
 	}
-	numToReturn := len(all_devices) - offset
+	numToReturn := len(allDevices) - offset
 	if limit > 0 && limit < numToReturn {
 		numToReturn = limit
 	}
-	return uint32(len(all_devices)), all_devices[offset : offset+numToReturn], nil
+	return uint32(len(allDevices)), allDevices[offset : offset+numToReturn], nil
 }
 
 func deviceNameExists(ctx context.Context, connPool *pgxpool.Pool, name string) (bool, errors.EdgeX) {

internal/pkg/infrastructure/redis/device.go

@@ -345,19 +345,19 @@ func deviceTree(conn redis.Conn, parent string, levels int, offset int, limit in
 	} else {
 		maxLevels = levels
 	}
-	all_devices, err := deviceSubTree(conn, parent, maxLevels, labels)
+	allDevices, err := deviceSubTree(conn, parent, maxLevels, labels)
 	if err != nil {
 		return 0, emptyList, err
 	}
 	if offset < 0 {
 		offset = 0
 	}
-	if offset >= len(all_devices) {
-		return uint32(len(all_devices)), emptyList, nil
+	if offset >= len(allDevices) {
+		return uint32(len(allDevices)), emptyList, nil
 	}
-	numToReturn := len(all_devices) - offset
+	numToReturn := len(allDevices) - offset
 	if limit > 0 && limit < numToReturn {
 		numToReturn = limit
 	}
-	return uint32(len(all_devices)), all_devices[offset : offset+numToReturn], nil
+	return uint32(len(allDevices)), allDevices[offset : offset+numToReturn], nil
 }

internal/security/config/command/proxy/shared/proxyuser.go

@@ -97,8 +97,9 @@ func NewProxyUserCommon(
 // LoadServiceToken loads a token from SecretStore.TokenFile (secrets-token.json)
 func (vb *ProxyUserCommon) LoadServiceToken() (string, func(), error) {
 
-	// This is not a root token; don't need to revoke when we're done with it
-	revokeFunc := func() {}
+	revokeFunc := func() {
+		// This is not a root token; don't need to revoke when we're done with it
+	}
 
 	tokenLoader := authtokenloader.NewAuthTokenLoader(vb.fileOpener)