Use modernize to use newer Golang features.

The rangeint suggestion is faster.
The maps.Copy and slices.Contains are just syntatic sugar.

Signed-off-by: Mads Jensen <atombrella@users.noreply.github.com>
pull/31562/head
Mads Jensen 10 months ago
parent df6aafeeee
commit 6cceead399

@ -93,7 +93,7 @@ func TestPassphraseFileFetcher_WithStdinAndMultipleFetches(t *testing.T) {
w.Write([]byte(passphrase + "\n")) w.Write([]byte(passphrase + "\n"))
}() }()
for i := 0; i < 4; i++ { for range 4 {
fetcher, err := testPkg.passphraseFileFetcher("-", stdin) fetcher, err := testPkg.passphraseFileFetcher("-", stdin)
if err != nil { if err != nil {
t.Errorf("Expected passphraseFileFetcher to not return an error, but got %v", err) t.Errorf("Expected passphraseFileFetcher to not return an error, but got %v", err)

@ -22,6 +22,7 @@ import (
"compress/gzip" "compress/gzip"
"fmt" "fmt"
"io" "io"
"maps"
"path/filepath" "path/filepath"
"strings" "strings"
"testing" "testing"
@ -40,9 +41,7 @@ func createChartArchive(t *testing.T, chartName, apiVersion string, extraFiles m
tw := tar.NewWriter(gw) tw := tar.NewWriter(gw)
files := make(map[string][]byte) files := make(map[string][]byte)
for k, v := range extraFiles { maps.Copy(files, extraFiles)
files[k] = v
}
if createChartYaml { if createChartYaml {
chartYAMLContent := fmt.Sprintf(`apiVersion: %s chartYAMLContent := fmt.Sprintf(`apiVersion: %s

@ -81,7 +81,7 @@ func newPackageCmd(out io.Writer) *cobra.Command {
return fmt.Errorf("missing registry client: %w", err) return fmt.Errorf("missing registry client: %w", err)
} }
for i := 0; i < len(args); i++ { for i := range args {
path, err := filepath.Abs(args[i]) path, err := filepath.Abs(args[i])
if err != nil { if err != nil {
return err return err

@ -199,7 +199,7 @@ func TestLoadPluginsWithSpace(t *testing.T) {
t.Fatalf("Expected %d plugins, got %d", len(tests), len(plugins)) t.Fatalf("Expected %d plugins, got %d", len(tests), len(plugins))
} }
for i := 0; i < len(plugins); i++ { for i := range plugins {
out.Reset() out.Reset()
tt := tests[i] tt := tests[i]
pp := plugins[i] pp := plugins[i]

@ -72,7 +72,7 @@ func newPullCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
} }
client.SetRegistryClient(registryClient) client.SetRegistryClient(registryClient)
for i := 0; i < len(args); i++ { for i := range args {
output, err := client.Run(args[i]) output, err := client.Run(args[i])
if err != nil { if err != nil {
return err return err

@ -200,7 +200,7 @@ func repoAddConcurrent(t *testing.T, testName, repoFile string) {
var wg sync.WaitGroup var wg sync.WaitGroup
wg.Add(3) wg.Add(3)
for i := 0; i < 3; i++ { for i := range 3 {
go func(name string) { go func(name string) {
defer wg.Done() defer wg.Done()
o := &repoAddOptions{ o := &repoAddOptions{
@ -227,7 +227,7 @@ func repoAddConcurrent(t *testing.T, testName, repoFile string) {
} }
var name string var name string
for i := 0; i < 3; i++ { for i := range 3 {
name = fmt.Sprintf("%s-%d", testName, i) name = fmt.Sprintf("%s-%d", testName, i)
if !f.Has(name) { if !f.Has(name) {
t.Errorf("%s was not successfully inserted into %s: %s", name, repoFile, f.Repositories[0]) t.Errorf("%s was not successfully inserted into %s: %s", name, repoFile, f.Repositories[0])

@ -39,13 +39,13 @@ func TestSortScore(t *testing.T) {
SortScore(in) SortScore(in)
// Test Score // Test Score
for i := 0; i < len(expectScore); i++ { for i := range expectScore {
if expectScore[i] != in[i].Score { if expectScore[i] != in[i].Score {
t.Errorf("Sort error on index %d: expected %d, got %d", i, expectScore[i], in[i].Score) t.Errorf("Sort error on index %d: expected %d, got %d", i, expectScore[i], in[i].Score)
} }
} }
// Test Name // Test Name
for i := 0; i < len(expect); i++ { for i := range expect {
if expect[i] != in[i].Name { if expect[i] != in[i].Name {
t.Errorf("Sort error: expected %s, got %s", expect[i], in[i].Name) t.Errorf("Sort error: expected %s, got %s", expect[i], in[i].Name)
} }

@ -55,7 +55,7 @@ func newUninstallCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
if validationErr != nil { if validationErr != nil {
return validationErr return validationErr
} }
for i := 0; i < len(args); i++ { for i := range args {
res, err := client.Run(args[i]) res, err := client.Run(args[i])
if err != nil { if err != nil {

@ -169,7 +169,7 @@ func TestRenderRefsOrdering(t *testing.T) {
"parent/templates/test.yaml": "parent value", "parent/templates/test.yaml": "parent value",
} }
for i := 0; i < 100; i++ { for i := range 100 {
out, err := Render(parentChart, common.Values{}) out, err := Render(parentChart, common.Values{})
if err != nil { if err != nil {
t.Fatalf("Failed to render templates: %s", err) t.Fatalf("Failed to render templates: %s", err)
@ -431,7 +431,7 @@ func TestParallelRenderInternals(t *testing.T) {
// Make sure that we can use one Engine to run parallel template renders. // Make sure that we can use one Engine to run parallel template renders.
e := new(Engine) e := new(Engine)
var wg sync.WaitGroup var wg sync.WaitGroup
for i := 0; i < 20; i++ { for i := range 20 {
wg.Add(1) wg.Add(1)
go func(i int) { go func(i int) {
tt := fmt.Sprintf("expect-%d", i) tt := fmt.Sprintf("expect-%d", i)
@ -1041,7 +1041,7 @@ func TestRenderRecursionLimit(t *testing.T) {
phrase := "All work and no play makes Jack a dull boy" phrase := "All work and no play makes Jack a dull boy"
printFunc := `{{define "overlook"}}{{printf "` + phrase + `\n"}}{{end}}` printFunc := `{{define "overlook"}}{{printf "` + phrase + `\n"}}{{end}}`
var repeatedIncl strings.Builder var repeatedIncl strings.Builder
for i := 0; i < times; i++ { for range times {
repeatedIncl.WriteString(`{{include "overlook" . }}`) repeatedIncl.WriteString(`{{include "overlook" . }}`)
} }
@ -1059,7 +1059,7 @@ func TestRenderRecursionLimit(t *testing.T) {
} }
var expect string var expect string
for i := 0; i < times; i++ { for range times {
expect += phrase + "\n" expect += phrase + "\n"
} }
if got := out["overlook/templates/quote"]; got != expect { if got := out["overlook/templates/quote"]; got != expect {

@ -20,6 +20,7 @@ import (
"context" "context"
"io" "io"
"net/http" "net/http"
"slices"
"sort" "sort"
"sync" "sync"
@ -124,10 +125,8 @@ func (c *GenericClient) PullGeneric(ref string, options GenericPullOptions) (*Ge
mediaType := desc.MediaType mediaType := desc.MediaType
// Skip media types if specified // Skip media types if specified
for _, skipType := range options.SkipMediaTypes { if slices.Contains(options.SkipMediaTypes, mediaType) {
if mediaType == skipType { return oras.SkipNode
return oras.SkipNode
}
} }
// Filter by allowed media types if specified // Filter by allowed media types if specified

@ -120,7 +120,7 @@ func TestSQLList(t *testing.T) {
sqlDriver, mock := newTestFixtureSQL(t) sqlDriver, mock := newTestFixtureSQL(t)
for i := 0; i < 3; i++ { for range 3 {
query := fmt.Sprintf( query := fmt.Sprintf(
"SELECT %s, %s, %s FROM %s WHERE %s = $1 AND %s = $2", "SELECT %s, %s, %s FROM %s WHERE %s = $1 AND %s = $2",
sqlReleaseTableKeyColumn, sqlReleaseTableKeyColumn,

Loading…
Cancel
Save