marcel/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd.git synced 2026-02-20 01:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore(util): Fix modernize linter (#26300)

Browse Source 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
Matthieu MOREL
2026-02-06 23:17:17 +01:00
committed by GitHub
parent e2f7e7d27f
commit a369ae2cf6
7 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/argo/normalizers/knowntypes_normalizer_test.go
View File

@@ -275,7 +275,7 @@ func TestOverrideKeyWithoutGroup(t *testing.T) {
func TestKnownTypes(t *testing.T) {
typesData, err := os.ReadFile("./diffing_known_types.txt")
require.NoError(t, err)
for _, typeName := range strings.Split(string(typesData), "\n") {
for typeName := range strings.SplitSeq(string(typesData), "\n") {
if typeName = strings.TrimSpace(typeName); typeName == "" {
continue
}

2
util/db/certificate.go
View File

@@ -218,7 +218,7 @@ func (db *db) CreateRepoCertificate(ctx context.Context, certificates *appsv1.Re
}
// Make sure that we received a valid public host key by parsing it
_, hostnames, rawKeyData, _, _, err := ssh.ParseKnownHosts([]byte(fmt.Sprintf("%s %s %s", certificate.ServerName, certificate.CertSubType, certificate.CertData)))
_, hostnames, rawKeyData, _, _, err := ssh.ParseKnownHosts(fmt.Appendf(nil, "%s %s %s", certificate.ServerName, certificate.CertSubType, certificate.CertData))
if err != nil {
return nil, err
}

2
util/db/cluster.go
View File

@@ -405,7 +405,7 @@ func SecretToCluster(s *corev1.Secret) (*appv1.Cluster, error) {
}
var namespaces []string
for _, ns := range strings.Split(string(s.Data["namespaces"]), ",") {
for ns := range strings.SplitSeq(string(s.Data["namespaces"]), ",") {
if ns = strings.TrimSpace(ns); ns != "" {
namespaces = append(namespaces, ns)
}

2
util/rbac/rbac.go
View File

@@ -570,7 +570,7 @@ func newAdapter(builtinPolicy, userDefinedPolicy, runtimePolicy string) *argocdA
func (a *argocdAdapter) LoadPolicy(model model.Model) error {
for _, policyStr := range []string{a.builtinPolicy, a.userDefinedPolicy, a.runtimePolicy} {
for _, line := range strings.Split(policyStr, "\n") {
for line := range strings.SplitSeq(policyStr, "\n") {
if err := loadPolicyLine(strings.TrimSpace(line), model); err != nil {
return err
}

3
util/session/sessionmanager_norace_test.go
View File

@@ -1,5 +1,4 @@
//go:build !race
// +build !race
package session
@@ -27,7 +26,7 @@ func TestRandomPasswordVerificationDelay(t *testing.T) {
mgr.sleep = func(d time.Duration) {
sleptFor = d
}
for i := 0; i < 10; i++ {
for range 10 {
sleptFor = 0
start := time.Now()
require.NoError(t, mgr.VerifyUsernamePassword("admin", "password"))

2
util/settings/cluster_informer.go
View File

@@ -177,7 +177,7 @@ func secretToCluster(s *corev1.Secret) (*appv1.Cluster, error) {
}
var namespaces []string
for _, ns := range strings.Split(string(s.Data["namespaces"]), ",") {
for ns := range strings.SplitSeq(string(s.Data["namespaces"]), ",") {
if ns = strings.TrimSpace(ns); ns != "" {
namespaces = append(namespaces, ns)
}

2
util/templates/normalizers.go
View File

@@ -25,7 +25,7 @@ func (s normalizer) trim() normalizer {
func (s normalizer) indent() normalizer {
indentedLines := []string{}
for _, line := range strings.Split(s.string, "\n") {
for line := range strings.SplitSeq(s.string, "\n") {
trimmed := strings.TrimSpace(line)
indented := Indentation + trimmed
indentedLines = append(indentedLines, indented)