refactor: remove unused cacheConfigStore field from Reconciler

Author: waveywaves

pkg/remoteresolution/resolver/framework/cache/setup_test.go

@@ -20,28 +20,12 @@ import (
 	"context"
 	"testing"
 
+	pipelinev1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
 	_ "knative.dev/pkg/system/testing" // Setup system.Namespace()
 
 	logtesting "knative.dev/pkg/logging/testing"
 )
 
-func TestGet(t *testing.T) {
-	ctx := logtesting.TestContextWithLogger(t)
-
-	// Test getting cache from context
-	resolverCache := Get(ctx)
-	if resolverCache == nil {
-		t.Error("Expected resolver cache but got nil")
-	}
-
-	// Get creates a new wrapper with logger each time
-	// but the underlying cache data is shared
-	resolverCache2 := Get(ctx)
-	if resolverCache2 == nil {
-		t.Error("Expected resolver cache but got nil on second call")
-	}
-}
-
 func TestGetWithContextValue(t *testing.T) {
 	logger := logtesting.TestLogger(t)
 	ctx := t.Context()
@@ -61,17 +45,6 @@ func TestGetWithContextValue(t *testing.T) {
 	}
 }
 
-func TestGetFallback(t *testing.T) {
-	// Create a plain context without any injected cache
-	ctx := logtesting.TestContextWithLogger(t)
-
-	// Should fall back to shared cache
-	resolverCache := Get(ctx)
-	if resolverCache == nil {
-		t.Error("Expected resolver cache but got nil")
-	}
-}
-
 func TestCacheSharing(t *testing.T) {
 	// Create two different contexts
 	ctx1 := logtesting.TestContextWithLogger(t)
@@ -89,10 +62,23 @@ func TestCacheSharing(t *testing.T) {
 		t.Fatal("Expected cache from ctx2")
 	}
 
-	// Both contexts should share the same underlying cache storage
-	// even though they have different logger wrappers
-	// We can verify this by checking they're both non-nil and functional
-	if cache1 == nil || cache2 == nil {
-		t.Error("Cache instances should be available from both contexts")
+	// Verify they share the same underlying cache storage by adding data
+	// to cache1 and checking it appears in cache2
+	testParams := []pipelinev1.Param{
+		{Name: "url", Value: pipelinev1.ParamValue{Type: pipelinev1.ParamTypeString, StringVal: "https://example.com"}},
+	}
+	testResource := &mockResolvedResource{data: []byte("test-data")}
+
+	// Add to cache1
+	cache1.Add("test-resolver", testParams, testResource)
+
+	// Verify it exists in cache2 (proving they share the same underlying storage)
+	retrieved, found := cache2.Get("test-resolver", testParams)
+	if !found {
+		t.Fatal("Expected to find resource in cache2 that was added to cache1 - caches are not shared")
+	}
+
+	if string(retrieved.Data()) != string(testResource.Data()) {
+		t.Errorf("Expected data %q, got %q", string(testResource.Data()), string(retrieved.Data()))
 	}
 }

pkg/remoteresolution/resolver/framework/controller.go

@@ -121,8 +121,8 @@ func watchCacheConfigChanges(ctx context.Context, reconciler *Reconciler, cmw co
 		return
 	}
 
-	reconciler.cacheConfigStore = rrcache.NewCacheConfigStore(cacheConfigName, logger)
-	reconciler.cacheConfigStore.WatchConfigs(cmw)
+	cacheConfigStore := rrcache.NewCacheConfigStore(cacheConfigName, logger)
+	cacheConfigStore.WatchConfigs(cmw)
 }
 
 // applyModifiersAndDefaults applies the given modifiers to

pkg/remoteresolution/resolver/framework/reconciler.go

@@ -76,8 +76,7 @@ type Reconciler struct {
 	resolutionRequestLister    rrv1beta1.ResolutionRequestLister
 	resolutionRequestClientSet rrclient.Interface
 
-	configStore      *framework.ConfigStore
-	cacheConfigStore *rrcache.CacheConfigStore
+	configStore *framework.ConfigStore
 }
 
 var _ reconciler.LeaderAware = &Reconciler{}

test/resolver_cache_test.go

@@ -244,33 +244,6 @@ spec:
 `, name, namespace, repo, taskName, cacheMode))
 }
 
-func createGitTaskRun(t *testing.T, namespace, name, revision string) *v1.TaskRun {
-	t.Helper()
-	return parse.MustParseV1TaskRun(t, fmt.Sprintf(`
-metadata:
-  name: %s
-  namespace: %s
-spec:
-  workspaces:
-    - name: output
-      emptyDir: {}
-  taskRef:
-    resolver: git
-    params:
-    - name: url
-      value: https://github.com/tektoncd/catalog.git
-    - name: pathInRepo
-      value: task/git-clone/0.10/git-clone.yaml
-    - name: revision
-      value: %s
-  params:
-    - name: url
-      value: https://github.com/tektoncd/pipeline
-    - name: deleteExisting
-      value: "true"
-`, name, namespace, revision))
-}
-
 func createGitTaskRunWithCache(t *testing.T, namespace, name, revision, cacheMode string) *v1.TaskRun {
 	t.Helper()
 	return parse.MustParseV1TaskRun(t, fmt.Sprintf(`
@@ -760,107 +733,3 @@ func createTaskRunAndWait(ctx context.Context, t *testing.T, c *clients, tr *v1.
 		t.Fatalf("Error waiting for TaskRun %s to finish: %s", tr.Name, err)
 	}
 }
-
-// getImageDigest gets the digest of an image from the local registry
-func getImageDigest(ctx context.Context, t *testing.T, c *clients, namespace, imageRef string) string {
-	t.Helper()
-
-	// Create a pod to run skopeo inspect
-	podName := "get-digest-" + helpers.ObjectNameForTest(t)
-	po, err := c.KubeClient.CoreV1().Pods(namespace).Create(ctx, &corev1.Pod{
-		ObjectMeta: metav1.ObjectMeta{
-			Namespace: namespace,
-			Name:      podName,
-		},
-		Spec: corev1.PodSpec{
-			Containers: []corev1.Container{{
-				Name:    "skopeo",
-				Image:   "ghcr.io/tektoncd/catalog/upstream/tasks/skopeo-copy:latest",
-				Command: []string{"/bin/sh", "-c"},
-				Args:    []string{"skopeo inspect --tls-verify=false docker://" + imageRef + " | jq -r '.Digest'"},
-			}},
-			RestartPolicy: corev1.RestartPolicyNever,
-		},
-	}, metav1.CreateOptions{})
-	if err != nil {
-		t.Fatalf("Failed to create digest pod: %v", err)
-	}
-
-	// Wait for pod to complete
-	if err := WaitForPodState(ctx, c, po.Name, namespace, func(pod *corev1.Pod) (bool, error) {
-		return pod.Status.Phase == "Succeeded", nil
-	}, "PodContainersTerminated"); err != nil {
-		req := c.KubeClient.CoreV1().Pods(namespace).GetLogs(po.GetName(), &corev1.PodLogOptions{Container: "skopeo"})
-		logs, err := req.DoRaw(ctx)
-		if err != nil {
-			t.Fatalf("Error getting pod logs: %v", err)
-		}
-		t.Fatalf("Failed to get digest. Pod logs: \n%s", string(logs))
-	}
-
-	// Get the digest from pod logs
-	req := c.KubeClient.CoreV1().Pods(namespace).GetLogs(po.GetName(), &corev1.PodLogOptions{Container: "skopeo"})
-	logs, err := req.DoRaw(ctx)
-	if err != nil {
-		t.Fatalf("Error getting pod logs: %v", err)
-	}
-
-	digest := strings.TrimSpace(string(logs))
-	if digest == "" {
-		t.Fatalf("Empty digest returned")
-	}
-
-	return digest
-}
-
-// getGitCommitHash gets the commit hash for a branch in the catalog repository
-func getGitCommitHash(ctx context.Context, t *testing.T, c *clients, namespace, branch string) string {
-	t.Helper()
-
-	// Create a pod to run git ls-remote
-	podName := "get-commit-" + helpers.ObjectNameForTest(t)
-	po, err := c.KubeClient.CoreV1().Pods(namespace).Create(ctx, &corev1.Pod{
-		ObjectMeta: metav1.ObjectMeta{
-			Namespace: namespace,
-			Name:      podName,
-		},
-		Spec: corev1.PodSpec{
-			Containers: []corev1.Container{{
-				Name:    "git",
-				Image:   "alpine/git:latest",
-				Command: []string{"/bin/sh", "-c"},
-				Args:    []string{"git ls-remote https://github.com/tektoncd/catalog.git " + branch + " | cut -f1"},
-			}},
-			RestartPolicy: corev1.RestartPolicyNever,
-		},
-	}, metav1.CreateOptions{})
-	if err != nil {
-		t.Fatalf("Failed to create git pod: %v", err)
-	}
-
-	// Wait for pod to complete
-	if err := WaitForPodState(ctx, c, po.Name, namespace, func(pod *corev1.Pod) (bool, error) {
-		return pod.Status.Phase == "Succeeded", nil
-	}, "PodContainersTerminated"); err != nil {
-		req := c.KubeClient.CoreV1().Pods(namespace).GetLogs(po.GetName(), &corev1.PodLogOptions{Container: "git"})
-		logs, err := req.DoRaw(ctx)
-		if err != nil {
-			t.Fatalf("Error getting pod logs: %v", err)
-		}
-		t.Fatalf("Failed to get commit hash. Pod logs: \n%s", string(logs))
-	}
-
-	// Get the commit hash from pod logs
-	req := c.KubeClient.CoreV1().Pods(namespace).GetLogs(po.GetName(), &corev1.PodLogOptions{Container: "git"})
-	logs, err := req.DoRaw(ctx)
-	if err != nil {
-		t.Fatalf("Error getting pod logs: %v", err)
-	}
-
-	commitHash := strings.TrimSpace(string(logs))
-	if commitHash == "" {
-		t.Fatalf("Empty commit hash returned")
-	}
-
-	return commitHash
-}