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: enable noctx linter (#24765)

Browse Source 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
Matthieu MOREL
2025-09-29 20:20:53 +02:00
committed by GitHub
parent 116707bed1
commit 7357465ea6
60 changed files with 507 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gitops-engine/agent/main.go
View File

@@ -59,8 +59,8 @@ func (s *settings) getGCMark(key kube.ResourceKey) string {
return "sha256." + base64.RawURLEncoding.EncodeToString(h.Sum(nil))
}
func (s *settings) parseManifests() ([]*unstructured.Unstructured, string, error) {
cmd := exec.Command("git", "rev-parse", "HEAD")
func (s *settings) parseManifests(ctx context.Context) ([]*unstructured.Unstructured, string, error) {
cmd := exec.CommandContext(ctx, "git", "rev-parse", "HEAD")
cmd.Dir = s.repoPath
revision, err := cmd.CombinedOutput()
if err != nil {
@@ -134,6 +134,7 @@ func newCmd(log logr.Logger) *cobra.Command {
os.Exit(1)
}
s := settings{args[0], paths}
ctx := cmd.Context()
config, err := clientConfig.ClientConfig()
checkError(err, log)
if namespace == "" {
@@ -184,13 +185,13 @@ func newCmd(log logr.Logger) *cobra.Command {
}()
for ; true; <-resync {
target, revision, err := s.parseManifests()
target, revision, err := s.parseManifests(ctx)
if err != nil {
log.Error(err, "Failed to parse target state")
continue
}
result, err := gitOpsEngine.Sync(context.Background(), target, func(r *cache.Resource) bool {
result, err := gitOpsEngine.Sync(ctx, target, func(r *cache.Resource) bool {
return r.Info.(*resourceInfo).gcMark == s.getGCMark(r.ResourceKey())
}, revision, namespace, sync.WithPrune(prune), sync.WithLogr(log))
if err != nil {

48
gitops-engine/pkg/diff/diff_test.go
View File

@@ -31,7 +31,7 @@ import (
"github.com/argoproj/gitops-engine/pkg/diff/testdata"
)
func printDiff(result *DiffResult) (string, error) {
func printDiff(ctx context.Context, result *DiffResult) (string, error) {
var live unstructured.Unstructured
if err := json.Unmarshal(result.NormalizedLive, &live); err != nil {
return "", fmt.Errorf("failed to unmarshal live object: %w", err)
@@ -40,12 +40,12 @@ func printDiff(result *DiffResult) (string, error) {
if err := json.Unmarshal(result.PredictedLive, &target); err != nil {
return "", fmt.Errorf("failed to unmarshal target object: %w", err)
}
out, _ := printDiffInternal("diff", &live, &target)
out, _ := printDiffInternal(ctx, "diff", &live, &target)
return string(out), nil
}
// printDiffInternal prints a diff between two unstructured objects using an external diff utility and returns the output.
func printDiffInternal(name string, live *unstructured.Unstructured, target *unstructured.Unstructured) ([]byte, error) {
func printDiffInternal(ctx context.Context, name string, live *unstructured.Unstructured, target *unstructured.Unstructured) ([]byte, error) {
tempDir, err := os.MkdirTemp("", "argocd-diff")
if err != nil {
return nil, fmt.Errorf("failed to create temp directory: %w", err)
@@ -74,7 +74,7 @@ func printDiffInternal(name string, live *unstructured.Unstructured, target *uns
if err != nil {
return nil, fmt.Errorf("failed to write live object: %w", err)
}
cmd := exec.Command("diff", liveFile, targetFile)
cmd := exec.CommandContext(ctx, "diff", liveFile, targetFile)
out, err := cmd.Output()
if err != nil {
// return output even if there's an error
@@ -168,7 +168,7 @@ func TestDiff(t *testing.T) {
diffRes := diff(t, leftUn, leftUn, diffOptionsForTest()...)
assert.False(t, diffRes.Modified)
ascii, err := printDiff(diffRes)
ascii, err := printDiff(t.Context(), diffRes)
require.NoError(t, err)
if ascii != "" {
t.Log(ascii)
@@ -183,7 +183,7 @@ func TestDiff_KnownTypeInvalidValue(t *testing.T) {
t.Run("NoDifference", func(t *testing.T) {
diffRes := diff(t, leftUn, leftUn, diffOptionsForTest()...)
assert.False(t, diffRes.Modified)
ascii, err := printDiff(diffRes)
ascii, err := printDiff(t.Context(), diffRes)
require.NoError(t, err)
if ascii != "" {
t.Log(ascii)
@@ -294,7 +294,7 @@ func TestThreeWayDiff(t *testing.T) {
liveUn := mustToUnstructured(liveDep)
res := diff(t, configUn, liveUn, diffOptionsForTest()...)
if !assert.False(t, res.Modified) {
ascii, err := printDiff(res)
ascii, err := printDiff(t.Context(), res)
require.NoError(t, err)
t.Log(ascii)
}
@@ -308,7 +308,7 @@ func TestThreeWayDiff(t *testing.T) {
liveUn = mustToUnstructured(liveDep)
res = diff(t, configUn, liveUn, diffOptionsForTest()...)
if !assert.False(t, res.Modified) {
ascii, err := printDiff(res)
ascii, err := printDiff(t.Context(), res)
require.NoError(t, err)
t.Log(ascii)
}
@@ -329,7 +329,7 @@ func TestThreeWayDiff(t *testing.T) {
configUn = mustToUnstructured(configDep)
liveUn = mustToUnstructured(liveDep)
res = diff(t, configUn, liveUn, diffOptionsForTest()...)
ascii, err := printDiff(res)
ascii, err := printDiff(t.Context(), res)
require.NoError(t, err)
if ascii != "" {
t.Log(ascii)
@@ -388,7 +388,7 @@ func TestThreeWayDiffExample1(t *testing.T) {
require.NoError(t, err)
dr := diff(t, &configUn, &liveUn, diffOptionsForTest()...)
assert.False(t, dr.Modified)
ascii, err := printDiff(dr)
ascii, err := printDiff(t.Context(), dr)
require.NoError(t, err)
if ascii != "" {
t.Log(ascii)
@@ -403,7 +403,7 @@ func TestDiffOptionIgnoreAggregateRoles(t *testing.T) {
liveUn := unmarshalFile("testdata/aggr-clusterrole-live.json")
dr := diff(t, configUn, liveUn, IgnoreAggregatedRoles(true))
assert.False(t, dr.Modified)
ascii, err := printDiff(dr)
ascii, err := printDiff(t.Context(), dr)
require.NoError(t, err)
t.Log(ascii)
}
@@ -413,7 +413,7 @@ func TestDiffOptionIgnoreAggregateRoles(t *testing.T) {
liveUn := unmarshalFile("testdata/aggr-clusterrole-live.json")
dr := diff(t, configUn, liveUn, IgnoreAggregatedRoles(false))
assert.True(t, dr.Modified)
ascii, err := printDiff(dr)
ascii, err := printDiff(t.Context(), dr)
require.NoError(t, err)
t.Log(ascii)
}
@@ -424,7 +424,7 @@ func TestThreeWayDiffExample2(t *testing.T) {
liveUn := unmarshalFile("testdata/elasticsearch-live.json")
dr := diff(t, configUn, liveUn, diffOptionsForTest()...)
assert.False(t, dr.Modified)
ascii, err := printDiff(dr)
ascii, err := printDiff(t.Context(), dr)
require.NoError(t, err)
t.Log(ascii)
}
@@ -436,7 +436,7 @@ func TestThreeWayDiffExample3(t *testing.T) {
dr := diff(t, configUn, liveUn, diffOptionsForTest()...)
assert.False(t, dr.Modified)
ascii, err := printDiff(dr)
ascii, err := printDiff(t.Context(), dr)
require.NoError(t, err)
if ascii != "" {
t.Log(ascii)
@@ -449,7 +449,7 @@ func TestThreeWayDiffExample4(t *testing.T) {
dr := diff(t, configUn, liveUn, diffOptionsForTest()...)
assert.False(t, dr.Modified)
ascii, err := printDiff(dr)
ascii, err := printDiff(t.Context(), dr)
require.NoError(t, err)
if ascii != "" {
t.Log(ascii)
@@ -471,7 +471,7 @@ func TestThreeWayDiffExample2WithDifference(t *testing.T) {
dr := diff(t, configUn, liveUn, diffOptionsForTest()...)
assert.True(t, dr.Modified)
ascii, err := printDiff(dr)
ascii, err := printDiff(t.Context(), dr)
require.NoError(t, err, ascii)
t.Log(ascii)
@@ -503,7 +503,7 @@ func TestThreeWayDiffExplicitNamespace(t *testing.T) {
liveUn := unmarshalFile("testdata/spinnaker-sa-live.json")
dr := diff(t, configUn, liveUn, diffOptionsForTest()...)
assert.False(t, dr.Modified)
ascii, err := printDiff(dr)
ascii, err := printDiff(t.Context(), dr)
require.NoError(t, err)
t.Log(ascii)
}
@@ -530,7 +530,7 @@ func TestDiffResourceWithInvalidField(t *testing.T) {
diffRes := diff(t, &leftUn, rightUn, diffOptionsForTest()...)
assert.True(t, diffRes.Modified)
ascii, err := printDiff(diffRes)
ascii, err := printDiff(t.Context(), diffRes)
require.NoError(t, err)
assert.Contains(t, ascii, "invalidKey")
@@ -646,7 +646,7 @@ func TestSecretStringData(t *testing.T) {
dr := diff(t, &configUn, &liveUn, diffOptionsForTest()...)
if !assert.False(t, dr.Modified) {
ascii, err := printDiff(dr)
ascii, err := printDiff(t.Context(), dr)
require.NoError(t, err)
t.Log(ascii)
}
@@ -697,7 +697,7 @@ func TestNullSecretData(t *testing.T) {
liveUn := unmarshalFile("testdata/wordpress-live.json")
dr := diff(t, configUn, liveUn, diffOptionsForTest()...)
if !assert.False(t, dr.Modified) {
ascii, err := printDiff(dr)
ascii, err := printDiff(t.Context(), dr)
require.NoError(t, err)
t.Log(ascii)
}
@@ -716,7 +716,7 @@ func TestRedactedSecretData(t *testing.T) {
liveData["smtp-password"] = "++++++++++++"
dr := diff(t, configUn, liveUn, diffOptionsForTest()...)
if !assert.True(t, dr.Modified) {
ascii, err := printDiff(dr)
ascii, err := printDiff(t.Context(), dr)
require.NoError(t, err)
t.Log(ascii)
}
@@ -727,7 +727,7 @@ func TestNullRoleRule(t *testing.T) {
liveUn := unmarshalFile("testdata/grafana-clusterrole-live.json")
dr := diff(t, configUn, liveUn, diffOptionsForTest()...)
if !assert.False(t, dr.Modified) {
ascii, err := printDiff(dr)
ascii, err := printDiff(t.Context(), dr)
require.NoError(t, err)
t.Log(ascii)
}
@@ -738,7 +738,7 @@ func TestNullCreationTimestamp(t *testing.T) {
liveUn := unmarshalFile("testdata/sealedsecret-live.json")
dr := diff(t, configUn, liveUn, diffOptionsForTest()...)
if !assert.False(t, dr.Modified) {
ascii, err := printDiff(dr)
ascii, err := printDiff(t.Context(), dr)
require.NoError(t, err)
t.Log(ascii)
}
@@ -749,7 +749,7 @@ func TestUnsortedEndpoints(t *testing.T) {
liveUn := unmarshalFile("testdata/endpoints-live.json")
dr := diff(t, configUn, liveUn, diffOptionsForTest()...)
if !assert.False(t, dr.Modified) {
ascii, err := printDiff(dr)
ascii, err := printDiff(t.Context(), dr)
require.NoError(t, err)
t.Log(ascii)
}