Remove dead code from production and test infrastructure (#1083)

Signed-off-by: Aravindhan Ayyanathan <aravindhan.a@est.tech>

Author: aravindtga

func/internal/podevaluator_podmanager_test.go

@@ -35,7 +35,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
-	"gopkg.in/yaml.v3"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -815,35 +814,6 @@ func TestMultipleEndpointsWithStuckPod(t *testing.T) {
 	}
 }
 
-// Fake client handles pod patches incorrectly in case the pod doesn't exist
-//
-//nolint:unused
-func fakeClientPatchFixInterceptor(ctx context.Context, kubeClient client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
-	if obj.GetObjectKind().GroupVersionKind().Kind == "Pod" {
-		var canary corev1.Pod
-		err := kubeClient.Get(ctx, client.ObjectKeyFromObject(obj), &canary)
-		if err != nil {
-			if apierrors.IsNotFound(err) {
-				err = kubeClient.Create(ctx, obj)
-				if err != nil {
-					return err
-				}
-				return nil
-			}
-			return err
-		}
-	}
-	return nil
-}
-
-func marshalToYamlOrPanic(obj interface{}) []byte {
-	data, err := yaml.Marshal(obj)
-	if err != nil {
-		panic(err)
-	}
-	return data
-}
-
 func deepCopyObject(in, out interface{}) {
 	buf := bytes.Buffer{}
 	if err := gob.NewEncoder(&buf).Encode(in); err != nil {

internal/cliutils/client.go

@@ -1,4 +1,4 @@
-// Copyright 2022 The kpt Authors
+// Copyright 2022, 2026 The kpt Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,16 +15,13 @@
 package porch
 
 import (
-	"context"
-
 	porchapi "github.com/kptdev/porch/api/porch/v1alpha1"
 	configapi "github.com/kptdev/porch/api/porchconfig/v1alpha1"
 	coreapi "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -56,51 +53,6 @@ func CreateClientWithFlags(flags *genericclioptions.ConfigFlags) (client.Client,
 	return CreateClient(config)
 }
 
-func CreateDynamicClient(flags *genericclioptions.ConfigFlags) (client.WithWatch, error) {
-	config, err := flags.ToRESTConfig()
-	if err != nil {
-		return nil, err
-	}
-
-	scheme, err := createScheme()
-	if err != nil {
-		return nil, err
-	}
-
-	c, err := client.NewWithWatch(config, client.Options{
-		Scheme: scheme,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return c, nil
-}
-
-// controller-runtime does not support subresources so we use REST client directly.
-// TODO: Separate Porch clientset into its own module (similar to k8s clientsets) to use it
-// without causing circular reference.
-func CreateRESTClient(flags *genericclioptions.ConfigFlags) (rest.Interface, error) {
-	config, err := flags.ToRESTConfig()
-	if err != nil {
-		return nil, err
-	}
-
-	scheme, err := createScheme()
-	if err != nil {
-		return nil, err
-	}
-
-	codecs := serializer.NewCodecFactory(scheme)
-
-	gv := porchapi.SchemeGroupVersion
-	config.GroupVersion = &gv
-	config.APIPath = "/apis"
-	config.NegotiatedSerializer = codecs.WithoutConversion()
-
-	return rest.RESTClientFor(config)
-}
-
 func createScheme() (*runtime.Scheme, error) {
 	scheme := runtime.NewScheme()
 
@@ -146,7 +98,3 @@ func createRESTMapper() meta.RESTMapper {
 
 	return rm
 }
-
-func Apply(ctx context.Context, api client.Client, obj client.Object) error {
-	return api.Patch(ctx, obj, client.Apply, client.FieldOwner("kubectl"))
-}

internal/telemetry/metrics_test.go

@@ -26,15 +26,6 @@ import (
 	"go.opentelemetry.io/otel/sdk/metric/metricdata"
 )
 
-type fakePackageRevision struct {
-	repository.PackageRevision
-	key       repository.PackageRevisionKey
-	namespace string
-}
-
-func (f *fakePackageRevision) KubeObjectNamespace() string        { return f.namespace }
-func (f *fakePackageRevision) Key() repository.PackageRevisionKey { return f.key }
-
 // Remaining interface methods are not called by RecordPackageRevisionResourcesSize,
 // so they can panic if invoked unexpectedly.
 

internal/telemetry/otel.go

@@ -87,14 +87,6 @@ func (r *OTelResources) ShutdownWithTimeout(timeout time.Duration) error {
 	return r.Shutdown(ctx)
 }
 
-// Flush forces a flush of the meter provider, useful in tests.
-func (r *OTelResources) Flush() error {
-	if r.meterProvider != nil {
-		return r.meterProvider.ForceFlush(context.Background())
-	}
-	return nil
-}
-
 // SetupOpenTelemetry is the single entry point for all OpenTelemetry setup.
 // It configures tracing, metrics (including the Prometheus HTTP server if
 // OTEL_EXPORTER_PROMETHEUS_HOST and OTEL_EXPORTER_PROMETHEUS_PORT are set),

pkg/cache/dbcache/dbpackagerevisionresourcessql.go

@@ -84,28 +84,6 @@ func pkgRevResourcesReadFromDB(ctx context.Context, prk repository.PackageRevisi
 	return resources, nil
 }
 
-func pkgRevResourceWriteToDB(ctx context.Context, prk repository.PackageRevisionKey, resKey, resVal string) error {
-	_, span := tracer.Start(ctx, "dbpackagerevisionresourcessql::pkgRevResourceWriteToDB", trace.WithAttributes())
-	defer span.End()
-
-	klog.V(5).Infof("pkgRevResourceWriteToDB: writing package revision resource %+v=%q for %q", resKey, resVal, prk)
-
-	sqlStatement := `
-		INSERT INTO resources (k8s_name_space, k8s_name, revision, resource_key, resource_value)
-			VALUES ($1, $2, $3, $4, $5)
-			ON CONFLICT (k8s_name_space, k8s_name, resource_key) 
-			DO UPDATE SET resource_value = EXCLUDED.resource_value`
-
-	klog.V(6).Infof("pkgRevResourceWriteToDB: running query %q on package revision %+v", sqlStatement, prk)
-	if _, err := GetDB().db.Exec(ctx, sqlStatement, prk.K8SNS(), prk.K8SName(), prk.Revision, resKey, resVal); err == nil {
-		klog.V(5).Infof("pkgRevResourceWriteToDB: query succeeded, row created/updated")
-		return nil
-	} else {
-		klog.Warningf("pkgRevResourceWriteToDB: query failed on package revision %+v: %q", prk, err)
-		return err
-	}
-}
-
 func pkgRevResourcesWriteToDB(ctx context.Context, pr *dbPackageRevision) error {
 	_, span := tracer.Start(ctx, "dbpackagerevisionresourcessql::pkgRevResourcesWriteToDB", trace.WithAttributes())
 	defer span.End()
@@ -166,23 +144,3 @@ func pkgRevResourcesDeleteFromDB(ctx context.Context, prk repository.PackageRevi
 	}
 	return err
 }
-
-func pkgRevResourceDeleteFromDB(ctx context.Context, prk repository.PackageRevisionKey, resKey string) error {
-	_, span := tracer.Start(ctx, "dbpackagerevisionresourcessql::pkgRevResourceDeleteFromDB", trace.WithAttributes())
-	defer span.End()
-
-	klog.V(5).Infof("pkgRevResourceDeleteFromDB: deleting package revision resource %q from %+v", resKey, prk)
-
-	sqlStatement := `DELETE FROM resources WHERE k8s_name_space=$1 AND k8s_name=$2 AND resource_key=$3`
-
-	klog.V(6).Infof("pkgRevResourceDeleteFromDB: running query %q on package revision %+v", sqlStatement, prk)
-	_, err := GetDB().db.Exec(ctx, sqlStatement, prk.K8SNS(), prk.K8SName(), resKey)
-
-	if err == nil {
-		klog.V(5).Infof("pkgRevResourceDeleteFromDB: deleted package revision resource %q from %+v", resKey, prk)
-	} else {
-		klog.Warningf("pkgRevResourceDeleteFromDB: deletion of package revision resource %q from %+v failed", resKey, prk)
-	}
-
-	return err
-}

pkg/cache/dbcache/dbpackagerevisionsql_test.go

@@ -1,4 +1,4 @@
-// Copyright 2025 The kpt Authors
+// Copyright 2025-2026 The kpt Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -240,6 +240,10 @@ func (t *DbTestSuite) TestPackageRevisionLatest() {
 }
 
 func (t *DbTestSuite) TestPackageRevisionResources() {
+	mockCache := mockcachetypes.NewMockCache(t.T())
+	cachetypes.CacheInstance = mockCache
+	mockCache.EXPECT().GetRepository(mock.Anything).Return(&dbRepository{})
+
 	dbRepo := t.createTestRepo("my-ns", "my-repo")
 	dbPkg := t.createTestPkg(dbRepo.Key(), "my-package")
 	dbPkg.repo = dbRepo
@@ -263,41 +267,51 @@ func (t *DbTestSuite) TestPackageRevisionResources() {
 	t.Equal("Goodbye.txt", resKey)
 	t.Equal("Goodbye", resVal)
 
-	err = pkgRevResourceDeleteFromDB(t.Context(), dbPR.Key(), "Goodbye.txt")
-	t.Require().NoError(err)
-
-	err = pkgRevResourceDeleteFromDB(t.Context(), dbPR.Key(), "Goodbye.txt")
+	// Remove "Goodbye.txt" by rewriting resources without it
+	dbPR.resources = map[string]string{"Hello.txt": "Hello"}
+	err = pkgRevResourcesWriteToDB(t.Context(), &dbPR)
 	t.Require().NoError(err)
 
 	_, _, err = pkgRevResourceReadFromDB(t.Context(), dbPR.Key(), "Goodbye.txt")
 	t.Require().ErrorContains(err, "no rows in result set")
 
-	err = pkgRevResourceWriteToDB(t.Context(), dbPR.Key(), "Goodbye.txt", "So long")
+	// Write "Goodbye.txt" back with a new value
+	dbPR.resources = map[string]string{"Hello.txt": "Hello", "Goodbye.txt": "So long"}
+	err = pkgRevResourcesWriteToDB(t.Context(), &dbPR)
 	t.Require().NoError(err)
 
 	resKey, resVal, err = pkgRevResourceReadFromDB(t.Context(), dbPR.Key(), "Goodbye.txt")
 	t.Require().NoError(err)
 	t.Equal("Goodbye.txt", resKey)
 	t.Equal("So long", resVal)
 
-	err = pkgRevResourceWriteToDB(t.Context(), dbPR.Key(), "Goodbye.txt", "See ya later")
+	// Update "Goodbye.txt" value again
+	dbPR.resources = map[string]string{"Hello.txt": "Hello", "Goodbye.txt": "See ya later"}
+	err = pkgRevResourcesWriteToDB(t.Context(), &dbPR)
 	t.Require().NoError(err)
 
 	resKey, resVal, err = pkgRevResourceReadFromDB(t.Context(), dbPR.Key(), "Goodbye.txt")
 	t.Require().NoError(err)
 	t.Equal("Goodbye.txt", resKey)
 	t.Equal("See ya later", resVal)
 
-	err = pkgRevResourceWriteToDB(t.Context(), dbPR.Key(), "Grand.txt", "Grand")
+	// Add a new resource "Grand.txt"
+	dbPR.resources = map[string]string{"Hello.txt": "Hello", "Goodbye.txt": "See ya later", "Grand.txt": "Grand"}
+	err = pkgRevResourcesWriteToDB(t.Context(), &dbPR)
 	t.Require().NoError(err)
 
 	resKey, resVal, err = pkgRevResourceReadFromDB(t.Context(), dbPR.Key(), "Grand.txt")
 	t.Require().NoError(err)
 	t.Equal("Grand.txt", resKey)
 	t.Equal("Grand", resVal)
 
-	dbPR.pkgRevKey.WorkspaceName = "bad"
-	err = pkgRevResourceWriteToDB(t.Context(), dbPR.Key(), "Grand.txt", "Grand")
+	// Verify that writing resources for a non-existent package revision fails with FK constraint violation
+	badPR := dbPackageRevision{
+		pkgRevKey: dbPR.pkgRevKey,
+		resources: map[string]string{"Bad.txt": "Bad"},
+	}
+	badPR.pkgRevKey.WorkspaceName = "non-existent"
+	err = pkgRevResourcesWriteToDB(t.Context(), &badPR)
 	t.Require().ErrorContains(err, "violates foreign key constraint")
 
 	err = repoDeleteFromDB(t.Context(), dbRepo.Key())