Nordix
diff --git a/‎.mockery.yaml‎
Lines changed: 1 addition & 0 deletions b/‎.mockery.yaml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.mockery.yaml.bak‎
Lines changed: 0 additions & 62 deletions b/‎.mockery.yaml.bak‎
Lines changed: 0 additions & 62 deletions
diff --git a/‎.vscode/launch.json‎
Lines changed: 9 additions & 7 deletions b/‎.vscode/launch.json‎
Lines changed: 9 additions & 7 deletions
diff --git a/‎Makefile‎
Lines changed: 1 addition & 1 deletion b/‎Makefile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎api/porch/v1alpha1/types.go‎
Lines changed: 22 additions & 4 deletions b/‎api/porch/v1alpha1/types.go‎
Lines changed: 22 additions & 4 deletions
diff --git a/‎api/porch/v1alpha1/util.go‎
Lines changed: 16 additions & 0 deletions b/‎api/porch/v1alpha1/util.go‎
Lines changed: 16 additions & 0 deletions
diff --git a/‎pkg/cache/crcache/packagerevision.go‎
Lines changed: 4 additions & 0 deletions b/‎pkg/cache/crcache/packagerevision.go‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎pkg/cache/crcache/repository_test.go‎
Lines changed: 1 addition & 0 deletions b/‎pkg/cache/crcache/repository_test.go‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎pkg/cache/crcache/util.go‎
Lines changed: 3 additions & 3 deletions b/‎pkg/cache/crcache/util.go‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎pkg/cache/dbcache/dbpackagerevision.go‎
Lines changed: 4 additions & 0 deletions b/‎pkg/cache/dbcache/dbpackagerevision.go‎
Lines changed: 4 additions & 0 deletions
@@ -44,3 +44,4 @@ packages:
   github.com/nephio-project/porch/pkg/engine:
     interfaces:
       CaDEngine: {}
+      WatcherManager: {}
@@ -5,15 +5,17 @@
     "version": "0.2.0",
 
     "configurations": [
-        // A configuration for running the porch server through vscode for the use of debugging.
+        // A configuration for running the porch server through VS Code for the use of debugging.
         // Assumes a cluster is set up alongside Git (./scripts/setup-dev-env.sh) and porch components (make ../porch/run-in-kind-no-server) are pre-configured
-        // With the configuration above one can use Vscode (Run & Debug) and launch server.
-        // This launches the porch server through vscode outside the cluster and the logs can be viewed in the debug console.
+        // With the configuration above one can use VS Code (Run & Debug) and launch server.
+        // This launches the porch server through VS Code outside the cluster and the logs can be viewed in the debug console.
         // Breakpoints can be added throughout the porch server code to debug.
 
         // CGO_ENABLED & buildFlags
-        // Enables race condition checking (Slows down porch-server processing) NOTE: The Go race detector uses C code under the hood (via cgo),
-        // and to build it, your system needs a C toolchain—i.e., a compiler like gcc and other basic build tools.
+        // Enables race condition checking (Slows down porch-server processing)
+        // 
+        // NOTE: The Go race detector uses C code under the hood (via cgo),
+        // and to build it, your system needs a C toolchain - i.e., a compiler like gcc and other basic build tools.
         // on a linux distro e.g. ubuntu these can be installed with (sudo apt install build-essential),
         //  this will install the (gcc = GNU C Compiler, g++ = GNU C++ Compiler, make, libc6-dev etc...)
         {
@@ -77,9 +79,9 @@
                 "ENABLE_PACKAGEVARIANTSETS": "true"
             }
         },
-        // A configuration for running a porchctl command using the vscode debugger.
+        // A configuration for running a porchctl command using the VS Code debugger.
         // Assumes a cluster is set up alongside Git (scripts/setup-dev-env.sh) and porch components (make run-in-kind) in the /porch directory are pre-configured
-        // This allows for the running of porchctl commands through vscode outside the cluster and the logs can be viewed in the debug console.
+        // This allows for the running of porchctl commands through VS Code outside the cluster and the logs can be viewed in the debug console.
         // Breakpoints can be added throughout the porch server code to debug.
         {
             "name": "Run Porchctl command",
 
@@ -282,7 +282,7 @@ run-in-kind-no-controller: load-images-to-kind deployment-config-no-controller d
 run-in-kind-db-cache-no-controller: IMAGE_REPO=porch-kind
 run-in-kind-db-cache-no-controller: IMAGE_TAG=test
 run-in-kind-db-cache-no-controller: SKIP_CONTROLLER_BUILD=true
-run-in-kind-db-cache-no-controller: load-images-to-kind deployment-config-db-cache deployment-config-no-controller deploy-current-config ## Build and deploy porch without the controllers into a kind cluster
+run-in-kind-db-cache-no-controller: load-images-to-kind deployment-config-db-cache deployment-config-no-controller deploy-current-config ## Build and deploy porch without the controllers into a kind cluster with postgres backend
 
 .PHONY: destroy
 destroy: ## Deletes all porch resources installed by the last run-in-kind-* command
 
@@ -31,17 +31,35 @@ type PackageRevision struct {
 	Status PackageRevisionStatus `json:"status,omitempty"`
 }
 
-func (pr *PackageRevision) IsPublished() bool {
-	return LifecycleIsPublished(pr.Spec.Lifecycle)
-}
-
 // Key and value of the latest package revision label:
 
 const (
 	LatestPackageRevisionKey   = "kpt.dev/latest-revision"
 	LatestPackageRevisionValue = "true"
 )
 
+type PkgRevFieldSelector string
+
+const (
+	PkgRevSelectorName          PkgRevFieldSelector = "metadata.name"
+	PkgRevSelectorNamespace     PkgRevFieldSelector = "metadata.namespace"
+	PkgRevSelectorRevision      PkgRevFieldSelector = "spec.revision"
+	PkgRevSelectorPackageName   PkgRevFieldSelector = "spec.packageName"
+	PkgRevSelectorRepository    PkgRevFieldSelector = "spec.repository"
+	PkgRevSelectorWorkspaceName PkgRevFieldSelector = "spec.workspaceName"
+	PkgRevSelectorLifecycle     PkgRevFieldSelector = "spec.lifecycle"
+)
+
+var PackageRevisionSelectableFields = []PkgRevFieldSelector{
+	PkgRevSelectorName,
+	PkgRevSelectorNamespace,
+	PkgRevSelectorRevision,
+	PkgRevSelectorPackageName,
+	PkgRevSelectorRepository,
+	PkgRevSelectorWorkspaceName,
+	PkgRevSelectorLifecycle,
+}
+
 // PackageRevisionList
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type PackageRevisionList struct {
 
@@ -16,10 +16,26 @@ package v1alpha1
 
 import "slices"
 
+func (pr *PackageRevision) IsPublished() bool {
+	return LifecycleIsPublished(pr.Spec.Lifecycle)
+}
+
 func LifecycleIsPublished(lifecycle PackageRevisionLifecycle) bool {
 	return lifecycle == PackageRevisionLifecyclePublished || lifecycle == PackageRevisionLifecycleDeletionProposed
 }
 
+func (l *PackageRevisionLifecycle) IsValid() bool {
+	switch *l {
+	case PackageRevisionLifecycleDraft,
+		PackageRevisionLifecycleProposed,
+		PackageRevisionLifecyclePublished,
+		PackageRevisionLifecycleDeletionProposed:
+		return true
+	default:
+		return false
+	}
+}
+
 // Check ReadinessGates checks if the package has met all readiness gates
 func PackageRevisionIsReady(readinessGates []ReadinessGate, conditions []Condition) bool {
 	// Index our conditions
 
@@ -101,3 +101,7 @@ func (c *cachedPackageRevision) SetMeta(ctx context.Context, pkgRevMeta metav1.O
 
 	return c.PackageRevision.SetMeta(ctx, storedMeta)
 }
+
+func (c *cachedPackageRevision) IsLatestRevision() bool {
+	return c.isLatestRevision
+}
@@ -84,6 +84,7 @@ func TestCachedRepoRefresh(t *testing.T) {
 		metadataStore:    mockMeta,
 		isLatestRevision: false,
 	}
+	assert.False(t, cr.cachedPackageRevisions[prKey].IsLatestRevision())
 
 	err := cr.Refresh(context.TODO())
 	assert.True(t, err == nil)
 
@@ -70,16 +70,16 @@ func toPackageRevisionSlice(
 		}
 	}
 	sort.Slice(result, func(i, j int) bool {
-		ki, kl := result[i].Key(), result[j].Key()
-		switch res := strings.Compare(ki.PkgKey.Package, kl.PkgKey.Package); {
+		ki, kj := result[i].Key(), result[j].Key()
+		switch res := strings.Compare(ki.PkgKey.Package, kj.PkgKey.Package); {
 		case res < 0:
 			return true
 		case res > 0:
 			return false
 		default:
 			// Equal. Compare next element
 		}
-		res := ki.Revision - kl.Revision
+		res := ki.Revision - kj.Revision
 		if res != 0 {
 			return res < 0
 		}
 
@@ -305,6 +305,10 @@ func (pr *dbPackageRevision) SetMeta(ctx context.Context, meta metav1.ObjectMeta
 	return pkgRevUpdateDB(ctx, pr, false)
 }
 
+func (pr *dbPackageRevision) IsLatestRevision() bool {
+	return pr.latest
+}
+
 func (pr *dbPackageRevision) GetKptfile(ctx context.Context) (kptfile.KptFile, error) {
 	_, span := tracer.Start(ctx, "dbPackageRevision::GetKptfile", trace.WithAttributes())
 	defer span.End()
Original file line number	Diff line number	Diff line change
`@@ -101,3 +101,7 @@ func (c *cachedPackageRevision) SetMeta(ctx context.Context, pkgRevMeta metav1.O`
`101`	`101`
`102`	`102`	`return c.PackageRevision.SetMeta(ctx, storedMeta)`
`103`	`103`	`}`
	`104`	`+`
	`105`	`+func (c *cachedPackageRevision) IsLatestRevision() bool {`
	`106`	`+ return c.isLatestRevision`
	`107`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ func TestCachedRepoRefresh(t *testing.T) {`
`84`	`84`	`metadataStore: mockMeta,`
`85`	`85`	`isLatestRevision: false,`
`86`	`86`	`}`
	`87`	`+ assert.False(t, cr.cachedPackageRevisions[prKey].IsLatestRevision())`
`87`	`88`
`88`	`89`	`err := cr.Refresh(context.TODO())`
`89`	`90`	`assert.True(t, err == nil)`
Original file line number	Diff line number	Diff line change
`@@ -70,16 +70,16 @@ func toPackageRevisionSlice(`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`sort.Slice(result, func(i, j int) bool {`
`73`		`- ki, kl := result[i].Key(), result[j].Key()`
`74`		`- switch res := strings.Compare(ki.PkgKey.Package, kl.PkgKey.Package); {`
	`73`	`+ ki, kj := result[i].Key(), result[j].Key()`
	`74`	`+ switch res := strings.Compare(ki.PkgKey.Package, kj.PkgKey.Package); {`
`75`	`75`	`case res < 0:`
`76`	`76`	`return true`
`77`	`77`	`case res > 0:`
`78`	`78`	`return false`
`79`	`79`	`default:`
`80`	`80`	`// Equal. Compare next element`
`81`	`81`	`}`
`82`		`- res := ki.Revision - kl.Revision`
	`82`	`+ res := ki.Revision - kj.Revision`
`83`	`83`	`if res != 0 {`
`84`	`84`	`return res < 0`
`85`	`85`	`}`