Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add staticcheck fixes (#3221)

Browse Source 
* Add staticcheck fixes

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* update golangci-lint version

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

---------

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Sanket Sudake
2025-05-18 22:27:45 +05:30
committed by GitHub
parent 6cc6498844
commit 2b13af0a5e
58 changed files with 228 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/util/portforward.go
+5 -5
View File
@@ -135,7 +135,7 @@ func runPortForward(ctx context.Context, client cmd.Client, labelSelector string
namespaces[p.Namespace] = append(namespaces[p.Namespace], &p)
}
if len(nsList) > 1 {
return nil, nil, fmt.Errorf("Found %v fission installs, set FISSION_NAMESPACE to one of: %v",
return nil, nil, fmt.Errorf("found %v fission installs, set FISSION_NAMESPACE to one of: %v",
len(namespaces), strings.Join(nsList, " "))
}
}
@@ -145,7 +145,7 @@ func runPortForward(ctx context.Context, client cmd.Client, labelSelector string
ns = nsList[0]
pods, ok := namespaces[ns]
if !ok {
return nil, nil, fmt.Errorf("Error finding fission install within the given namespace %v, please check FISSION_NAMESPACE is set properly", ns)
return nil, nil, fmt.Errorf("error finding fission install within the given namespace %v, please check FISSION_NAMESPACE is set properly", ns)
}
var podName, podNameSpace string
@@ -163,10 +163,10 @@ func runPortForward(ctx context.Context, client cmd.Client, labelSelector string
svcs, err := client.KubernetesClient.CoreV1().Services(podNameSpace).
List(ctx, metav1.ListOptions{LabelSelector: labelSelector})
if err != nil {
return nil, nil, fmt.Errorf("Error getting %v service: %w", labelSelector, err)
return nil, nil, fmt.Errorf("error getting %v service: %w", labelSelector, err)
}
if len(svcs.Items) == 0 {
return nil, nil, fmt.Errorf("Service %v not found", labelSelector)
return nil, nil, fmt.Errorf("service %v not found", labelSelector)
}
service := &svcs.Items[0]
@@ -191,7 +191,7 @@ func runPortForward(ctx context.Context, client cmd.Client, labelSelector string
// actually start the port-forwarding process here
transport, upgrader, err := spdy.RoundTripperFor(client.RestConfig)
if err != nil {
return nil, nil, fmt.Errorf("Failed to connect to Fission service on Kubernetes")
return nil, nil, fmt.Errorf("failed to connect to Fission service on Kubernetes")
}
dialer := spdy.NewDialer(upgrader, &http.Client{Transport: transport}, "POST", url)
pkg/fission-cli/util/util.go
+7 -7
View File
@@ -255,7 +255,7 @@ func GetResourceReqs(input cli.Input, resReqs *v1.ResourceRequirements) (*v1.Res
mincpu := input.Int(flagkey.RuntimeMincpu)
cpuRequest, err := resource.ParseQuantity(strconv.Itoa(mincpu) + "m")
if err != nil {
e = multierror.Append(e, fmt.Errorf("Failed to parse mincpu: %w", err))
e = multierror.Append(e, fmt.Errorf("failed to parse mincpu: %w", err))
}
r.Requests[v1.ResourceCPU] = cpuRequest
}
@@ -264,7 +264,7 @@ func GetResourceReqs(input cli.Input, resReqs *v1.ResourceRequirements) (*v1.Res
minmem := input.Int(flagkey.RuntimeMinmemory)
memRequest, err := resource.ParseQuantity(strconv.Itoa(minmem) + "Mi")
if err != nil {
e = multierror.Append(e, fmt.Errorf("Failed to parse minmemory: %w", err))
e = multierror.Append(e, fmt.Errorf("failed to parse minmemory: %w", err))
}
r.Requests[v1.ResourceMemory] = memRequest
}
@@ -273,7 +273,7 @@ func GetResourceReqs(input cli.Input, resReqs *v1.ResourceRequirements) (*v1.Res
maxcpu := input.Int(flagkey.RuntimeMaxcpu)
cpuLimit, err := resource.ParseQuantity(strconv.Itoa(maxcpu) + "m")
if err != nil {
e = multierror.Append(e, fmt.Errorf("Failed to parse maxcpu: %w", err))
e = multierror.Append(e, fmt.Errorf("failed to parse maxcpu: %w", err))
}
r.Limits[v1.ResourceCPU] = cpuLimit
}
@@ -282,7 +282,7 @@ func GetResourceReqs(input cli.Input, resReqs *v1.ResourceRequirements) (*v1.Res
maxmem := input.Int(flagkey.RuntimeMaxmemory)
memLimit, err := resource.ParseQuantity(strconv.Itoa(maxmem) + "Mi")
if err != nil {
e = multierror.Append(e, fmt.Errorf("Failed to parse maxmemory: %w", err))
e = multierror.Append(e, fmt.Errorf("failed to parse maxmemory: %w", err))
}
r.Limits[v1.ResourceMemory] = memLimit
}
@@ -293,7 +293,7 @@ func GetResourceReqs(input cli.Input, resReqs *v1.ResourceRequirements) (*v1.Res
if limitCPU.IsZero() && !requestCPU.IsZero() {
r.Limits[v1.ResourceCPU] = requestCPU
} else if limitCPU.Cmp(requestCPU) < 0 {
e = multierror.Append(e, fmt.Errorf("MinCPU (%v) cannot be greater than MaxCPU (%v)", requestCPU.String(), limitCPU.String()))
e = multierror.Append(e, fmt.Errorf("minCPU (%v) cannot be greater than MaxCPU (%v)", requestCPU.String(), limitCPU.String()))
}
limitMem := r.Limits[v1.ResourceMemory]
@@ -302,7 +302,7 @@ func GetResourceReqs(input cli.Input, resReqs *v1.ResourceRequirements) (*v1.Res
if limitMem.IsZero() && !requestMem.IsZero() {
r.Limits[v1.ResourceMemory] = requestMem
} else if limitMem.Cmp(requestMem) < 0 {
e = multierror.Append(e, fmt.Errorf("MinMemory (%v) cannot be greater than MaxMemory (%v)", requestMem.String(), limitMem.String()))
e = multierror.Append(e, fmt.Errorf("minMemory (%v) cannot be greater than MaxMemory (%v)", requestMem.String(), limitMem.String()))
}
if e.ErrorOrNil() != nil {
@@ -341,7 +341,7 @@ func GetSpecIgnoreParser(specDir, specIgnore string) (ignore.IgnoreParser, error
if _, err := os.Stat(specIgnorePath); errors.Is(err, os.ErrNotExist) {
// return error if it's custom spec ignore file
if specIgnore != SPEC_IGNORE_FILE {
return nil, fmt.Errorf("Spec ignore file '%s' doesn't exist. "+
return nil, fmt.Errorf("spec ignore file '%s' doesn't exist. "+
"Please check the file path: '%s'", specIgnore, specIgnorePath)
}
return ignore.CompileIgnoreLines(), nil