Add check for empty version in git CloseDraft

Nordix · Nov 4, 2024 · 5acb87c · 5acb87c
1 parent 3eed742
commit 5acb87c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pkg/cache/memory/draft.go b/pkg/cache/memory/draft.go
@@ -21,7 +21,6 @@ import (
 	"github.com/nephio-project/porch/pkg/cache"
 	"github.com/nephio-project/porch/pkg/repository"
 	"go.opentelemetry.io/otel/trace"
-	"k8s.io/klog/v2"
 )
 
 type cachedDraft struct {
@@ -44,7 +43,6 @@ func (cd *cachedDraft) Close(ctx context.Context, version string) (repository.Pa
 		if err != nil {
 			return nil, err
 		}
-		klog.Infof("Pkgrev version mismatch in cache and repo - Refreshing cache.")
 	}
 
 	revisions, err := cd.cache.ListPackageRevisions(ctx, repository.ListPackageRevisionFilter{
@@ -61,12 +59,12 @@ func (cd *cachedDraft) Close(ctx context.Context, version string) (repository.Pa
 		}
 	}
 
-	v, err = repository.NextRevisionNumber(revs)
+	nextVersion, err := repository.NextRevisionNumber(revs)
 	if err != nil {
 		return nil, err
 	}
 
-	if closed, err := cd.PackageDraft.Close(ctx, v); err != nil {
+	if closed, err := cd.PackageDraft.Close(ctx, nextVersion); err != nil {
 		return nil, err
 	} else {
 		return cd.cache.update(ctx, closed)

diff --git a/pkg/git/git.go b/pkg/git/git.go
@@ -1493,6 +1493,9 @@ func (r *gitRepository) CloseDraft(ctx context.Context, version string, d *gitPa
 	switch d.lifecycle {
 	case v1alpha1.PackageRevisionLifecyclePublished, v1alpha1.PackageRevisionLifecycleDeletionProposed:
 
+		if version == "" {
+			return nil, errors.New("Version cannot be empty for the next package revision")
+		}
 		d.revision = version
 
 		// Finalize the package revision. Commit it to main branch.