Skip to content

Commit

Permalink
ci(lint): enable prealloc linter
Browse files Browse the repository at this point in the history
  • Loading branch information
erikgb committed Jan 19, 2025
1 parent 75c32da commit caa49bc
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ linters:
- loggercheck
- misspell
- nolintlint
#- prealloc
- prealloc
- staticcheck
- stylecheck
- tenv
Expand Down
6 changes: 3 additions & 3 deletions core/clustersmngr/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ func (cle *ClusteredListError) Add(err ListError) {
}

func (cle ClusteredListError) Error() string {
var errs []string
for _, e := range cle.Errors {
errs = append(errs, e.Error())
errs := make([]string, len(cle.Errors))
for i, e := range cle.Errors {
errs[i] = e.Error()
}

return strings.Join(errs, "; ")
Expand Down
6 changes: 3 additions & 3 deletions core/fluxsync/adapters.go
Original file line number Diff line number Diff line change
Expand Up @@ -307,13 +307,13 @@ func (obj UnstructuredAdapter) GetConditions() []metav1.Condition {
return nil
}

var conditions []metav1.Condition
for _, c := range conditionsSlice {
conditions := make([]metav1.Condition, len(conditionsSlice))
for i, c := range conditionsSlice {
var condition metav1.Condition
if err := runtime.DefaultUnstructuredConverter.FromUnstructured(c.(map[string]interface{}), &condition); err != nil {
continue
}
conditions = append(conditions, condition)
conditions[i] = condition
}

return conditions
Expand Down
20 changes: 10 additions & 10 deletions core/server/policies.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ func policyToPolicyRespone(policyCRD pacv2beta2.Policy, clusterName string) (*pb
HowToSolve: policySpec.HowToSolve,
}

var policyLabels []*pb.PolicyTargetLabel
policyLabels := make([]*pb.PolicyTargetLabel, len(policySpec.Targets.Labels))
for i := range policySpec.Targets.Labels {
policyLabels = append(policyLabels, &pb.PolicyTargetLabel{
policyLabels[i] = &pb.PolicyTargetLabel{
Values: policySpec.Targets.Labels[i],
})
}
}

var policyParams []*pb.PolicyParam
for _, param := range policySpec.Parameters {
policyParams := make([]*pb.PolicyParam, len(policySpec.Parameters))
for i, param := range policySpec.Parameters {
policyParam := &pb.PolicyParam{
Name: param.Name,
Required: param.Required,
Expand All @@ -122,14 +122,14 @@ func policyToPolicyRespone(policyCRD pacv2beta2.Policy, clusterName string) (*pb
return nil, err
}
policyParam.Value = value
policyParams = append(policyParams, policyParam)
policyParams[i] = policyParam
}
var policyStandards []*pb.PolicyStandard
for _, standard := range policySpec.Standards {
policyStandards = append(policyStandards, &pb.PolicyStandard{
policyStandards := make([]*pb.PolicyStandard, len(policySpec.Standards))
for i, standard := range policySpec.Standards {
policyStandards[i] = &pb.PolicyStandard{
Id: standard.ID,
Controls: standard.Controls,
})
}
}

policy.Targets = &pb.PolicyTargets{
Expand Down
4 changes: 2 additions & 2 deletions core/server/policy_violations.go
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ func getPolicyValidationParam(raw []byte) ([]*pb.PolicyValidationParam, error) {
return nil, fmt.Errorf("failed to unmarshal policy validation parameter, error: %v", err)
}

var parameters []*pb.PolicyValidationParam
parameters := make([]*pb.PolicyValidationParam, len(paramsArr))
for i := range paramsArr {
param := pb.PolicyValidationParam{
Name: paramsArr[i]["name"].(string),
Expand All @@ -266,7 +266,7 @@ func getPolicyValidationParam(raw []byte) ([]*pb.PolicyValidationParam, error) {
return nil, err
}
param.Value = val
parameters = append(parameters, &param)
parameters[i] = &param
}
return parameters, nil
}
Expand Down
9 changes: 3 additions & 6 deletions core/server/session_logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import (
"encoding/json"
"fmt"
"io"
"maps"
"regexp"
"slices"
"sort"
"strconv"
"strings"
Expand Down Expand Up @@ -346,12 +348,7 @@ func getPodLogs(ctx context.Context, nextToken string, minioClient s3Reader, buc
lastToken = obj.Key
}

var logSources []string
for k := range tmpLogSources {
logSources = append(logSources, k)
}
sort.Strings(logSources)

logSources := slices.Sorted(maps.Keys(tmpLogSources))
return logs, lastToken, logSources, nil
}

Expand Down
19 changes: 12 additions & 7 deletions pkg/sourceignore/sourceignore.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"io"
"os"
"path/filepath"
"slices"
"strings"

"github.com/go-git/go-git/v5/plumbing/format/gitignore"
Expand All @@ -31,20 +32,24 @@ type IgnoreFilter func(p string, fi os.FileInfo) bool
// VCSPatterns returns a gitignore.Pattern slice with ExcludeVCS
// patterns.
func VCSPatterns(domain []string) []gitignore.Pattern {
var ps []gitignore.Pattern
for _, p := range strings.Split(ExcludeVCS, ",") {
ps = append(ps, gitignore.ParsePattern(p, domain))
all := strings.Split(ExcludeVCS, ",")
ps := make([]gitignore.Pattern, len(all))
for i, p := range all {
ps[i] = gitignore.ParsePattern(p, domain)
}
return ps
}

// DefaultPatterns returns a gitignore.Pattern slice with the default
// ExcludeCI, ExcludeExtra patterns.
func DefaultPatterns(domain []string) []gitignore.Pattern {
all := strings.Join([]string{ExcludeCI, ExcludeExtra}, ",")
var ps []gitignore.Pattern
for _, p := range strings.Split(all, ",") {
ps = append(ps, gitignore.ParsePattern(p, domain))
all := slices.Concat(
strings.Split(ExcludeCI, ","),
strings.Split(ExcludeExtra, ","),
)
ps := make([]gitignore.Pattern, len(all))
for i, p := range all {
ps[i] = gitignore.ParsePattern(p, domain)
}
return ps
}
Expand Down

0 comments on commit caa49bc

Please sign in to comment.