Removing ability to Watch on PackageRevisionResources (#553)

* removing watch functionality from packagerevisionresources

* comment change to retrigger build

---------

Co-authored-by: Liam Fallon <35595825+liamfallon@users.noreply.github.com>

Author: Catalin-Stratulat-Ericsson

pkg/registry/porch/packagerevisionresources.go

@@ -28,7 +28,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/watch"
 	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/klog/v2"
@@ -45,7 +44,6 @@ var _ rest.Getter = &packageRevisionResources{}
 var _ rest.Scoper = &packageRevisionResources{}
 var _ rest.Updater = &packageRevisionResources{}
 var _ rest.SingularNameProvider = &packageRevisionResources{}
-var _ rest.Watcher = &packageRevisionResources{}
 
 // GetSingularName implements the SingularNameProvider interface
 func (r *packageRevisionResources) GetSingularName() string {
@@ -218,22 +216,3 @@ func (r *packageRevisionResources) Update(ctx context.Context, name string, objI
 
 	return created, false, nil
 }
-
-// Watch supports watching for PackageRevisionResources changes.
-func (r *packageRevisionResources) Watch(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) {
-	ctx, span := tracer.Start(ctx, "[START]::packageRevisionResources::Watch", trace.WithAttributes())
-	defer span.End()
-
-	ctx = context1.WithNewRequestID(ctx)
-
-	ns, _ := genericapirequest.NamespaceFrom(ctx)
-
-	filter, err := parsePackageRevisionResourcesFieldSelector(options, ns)
-	if err != nil {
-		return nil, err
-	}
-
-	return createGenericWatch(ctx, r, *filter, func(ctx context.Context, pr repository.PackageRevision) (runtime.Object, error) {
-		return pr.GetResources(ctx)
-	}, options)
-}

pkg/registry/porch/packagerevisionresources_test.go

@@ -132,35 +132,3 @@ func TestGetResources(t *testing.T) {
 	assert.Error(t, err)
 	assert.Nil(t, result)
 }
-
-func TestWatchResources(t *testing.T) {
-	_, mockEngine := setupResourcesTest(t)
-	mockWatcherManager := mockengine.NewMockWatcherManager(t)
-	mockEngine.On("ObjectCache").Return(mockWatcherManager).Maybe()
-
-	mockWatcherManager.On("WatchPackageRevisions", mock.Anything, mock.Anything, mock.Anything).Return(nil).Maybe()
-	mockEngine.On("ListPackageRevisions", mock.Anything, mock.Anything).Return([]repository.PackageRevision{}, nil).Maybe()
-
-	watcher, err := packagerevisionresources.Watch(context.TODO(), &internalversion.ListOptions{})
-	assert.NoError(t, err)
-	if watcher != nil {
-		watcher.Stop()
-	}
-
-	//=========================================================================================
-
-	watcher, err = packagerevisionresources.Watch(context.TODO(), &internalversion.ListOptions{
-		FieldSelector: fields.OneTermEqualSelector("invalid.field", "somethingOffTheWall"),
-	})
-	assert.Equal(t, nil, watcher)
-	assert.ErrorContains(t, err, "unknown fieldSelector field")
-
-	//=========================================================================================
-
-	ctxWithConflictNamespace := genericapirequest.WithNamespace(context.TODO(), "foo")
-	watcher, err = packagerevisionresources.Watch(ctxWithConflictNamespace, &internalversion.ListOptions{
-		FieldSelector: fields.OneTermEqualSelector("metadata.namespace", "somethingOffTheWall"),
-	})
-	assert.Equal(t, nil, watcher)
-	assert.ErrorContains(t, err, "conflicting namespaces specified")
-}

pkg/registry/porch/watch.go

@@ -110,7 +110,7 @@ type packageReader interface {
 }
 
 // objectExtractor transforms a repository.PackageRevision into the appropriate
-// resource (PackageRevision or PackageRevisionResources).
+// resource (PackageRevision or others when implemented).
 type objectExtractor func(ctx context.Context, pr repository.PackageRevision) (runtime.Object, error)
 
 // listAndWatch implements watch by doing a list, then sending any observed changes.