mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 02:50:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: address gocritic warnings

Browse Source 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2023-06-02 11:29:35 +02:00 committed by mergify[bot]
parent 4e6675df76
commit 53c94efc02
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/nfs/nodeserver/nodeserver.go
View File

@ -232,7 +232,7 @@ func (ns *NodeServer) mountNFS(
volumeID, source, mountPoint, mountOptions) volumeID, source, mountPoint, mountOptions)
if netNamespaceFilePath != "" { if netNamespaceFilePath != "" {
_, stderr, err = util.ExecuteCommandWithNSEnter( _, stderr, err = util.ExecuteCommandWithNSEnter(
ctx, netNamespaceFilePath, "mount", args[:]...) ctx, netNamespaceFilePath, "mount", args...)
} else { } else {
err = ns.Mounter.Mount(source, mountPoint, "nfs", mountOptions) err = ns.Mounter.Mount(source, mountPoint, "nfs", mountOptions)
} }

2
internal/rbd/rbd_util_test.go
View File

@ -297,7 +297,7 @@ func TestStrategicActionOnLogFile(t *testing.T) {
var err error var err error
switch tt.args.logStrategy { switch tt.args.logStrategy {
case "compress": case "compress":
newExt := strings.Replace(tt.args.logFile, ".log", ".gz", -1) newExt := strings.ReplaceAll(tt.args.logFile, ".log", ".gz")
if _, err = os.Stat(newExt); os.IsNotExist(err) { if _, err = os.Stat(newExt); os.IsNotExist(err) {
t.Errorf("compressed logFile (%s) not found: %v", newExt, err) t.Errorf("compressed logFile (%s) not found: %v", newExt, err)
} }

2
internal/util/crushlocation.go
View File

@ -64,7 +64,7 @@ func getCrushLocationMap(crushLocationLabels string, nodeLabels map[string]strin
crushLocationType = "host" crushLocationType = "host"
} }
// replace "." with "-" to satisfy ceph crush map. // replace "." with "-" to satisfy ceph crush map.
value = strings.Replace(strings.TrimSpace(value), ".", "-", -1) value = strings.ReplaceAll(strings.TrimSpace(value), ".", "-")
crushLocationMap[crushLocationType] = value crushLocationMap[crushLocationType] = value
} }

2
internal/util/log/log_utils.go
View File

@ -29,7 +29,7 @@ func GzipLogFile(pathToFile string) error {
} }
// Replace .log extension with .gz extension. // Replace .log extension with .gz extension.
newExt := strings.Replace(pathToFile, ".log", ".gz", -1) newExt := strings.ReplaceAll(pathToFile, ".log", ".gz")
// Open file for writing. // Open file for writing.
gf, err := os.OpenFile(newExt, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0o644) // #nosec:G304,G302, file inclusion & perms gf, err := os.OpenFile(newExt, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0o644) // #nosec:G304,G302, file inclusion & perms

2
internal/util/log/log_utils_test.go
View File

@ -37,7 +37,7 @@ func TestGzipLogFile(t *testing.T) {
t.Errorf("GzipLogFile failed: %v", err) t.Errorf("GzipLogFile failed: %v", err)
} }
newExt := strings.Replace(logFile.Name(), ".log", ".gz", -1) newExt := strings.ReplaceAll(logFile.Name(), ".log", ".gz")
if _, err = os.Stat(newExt); errors.Is(err, os.ErrNotExist) { if _, err = os.Stat(newExt); errors.Is(err, os.ErrNotExist) {
t.Errorf("compressed logFile (%s) not found: %v", newExt, err) t.Errorf("compressed logFile (%s) not found: %v", newExt, err)
} }

4
internal/util/topology.go
View File

@ -66,7 +66,7 @@ func GetTopologyFromDomainLabels(domainLabels, nodeName, driverName string) (map
// driverName is validated, and we are adding a lowercase "topology." to it, so no validation for conformance // driverName is validated, and we are adding a lowercase "topology." to it, so no validation for conformance
// Convert passed in labels to a map, and check for uniqueness // Convert passed in labels to a map, and check for uniqueness
labelsToRead := strings.SplitN(domainLabels, labelSeparator, -1) labelsToRead := strings.Split(domainLabels, labelSeparator)
log.DefaultLog("passed in node labels for processing: %+v", labelsToRead) log.DefaultLog("passed in node labels for processing: %+v", labelsToRead)
labelsIn := make(map[string]bool) labelsIn := make(map[string]bool)
@ -158,7 +158,7 @@ func GetTopologyFromRequest(
} }
// extract topology based pools configuration // extract topology based pools configuration
err := json.Unmarshal([]byte(strings.Replace(topologyPoolsStr, "\n", " ", -1)), &topologyPools) err := json.Unmarshal([]byte(strings.ReplaceAll(topologyPoolsStr, "\n", " ")), &topologyPools)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf( return nil, nil, fmt.Errorf(
"failed to parse JSON encoded topology constrained pools parameter (%s): %w", "failed to parse JSON encoded topology constrained pools parameter (%s): %w",