Move main pkg revision creation into a function

Nordix · Nov 5, 2024 · 0c39b8b · 0c39b8b
1 parent 0f4b414
commit 0c39b8b
Showing 1 changed file with 45 additions and 39 deletions.
diff --git a/pkg/cache/memory/repository.go b/pkg/cache/memory/repository.go
@@ -264,59 +264,65 @@ func (r *cachedRepository) update(ctx context.Context, updated repository.Packag
 	r.cachedPackageRevisions[k] = cached
 
 	// Recompute latest package revisions.
-	// TODO: Just updated package?
 	identifyLatestRevisions(r.cachedPackageRevisions)
 
+	// Create the main package revision
 	if updated.Lifecycle() == (v1alpha1.PackageRevisionLifecyclePublished) {
 		updatedMain := updated.ToMainPackageRevision()
-		//Search and delete any old main pkgRev in the cache
-		for k := range r.cachedPackageRevisions {
-			if (k.Repository == updatedMain.Key().Repository) && (k.Package == updatedMain.Key().Package) && (k.Revision == updatedMain.Key().Revision) {
-				oldMainKey := repository.PackageRevisionKey{
-					Repository:    updatedMain.Key().Repository,
-					Package:       updatedMain.Key().Package,
-					Revision:      updatedMain.Key().Revision,
-					WorkspaceName: v1alpha1.WorkspaceName(string(k.WorkspaceName)),
-				}
-				delete(r.cachedPackageRevisions, oldMainKey)
+		r.createMainPackageRevision(ctx, updatedMain)
+	} else {
+		version, err := r.repo.Version(ctx)
+		if err != nil {
+			return nil, err
+		}
+		r.lastVersion = version
+	}
+
+	return cached, nil
+}
+
+func (r *cachedRepository) createMainPackageRevision(ctx context.Context, updatedMain repository.PackageRevision) error {
+
+	//Search and delete any old main pkgRev of an older worksapce in the cache
+	for k := range r.cachedPackageRevisions {
+		if (k.Repository == updatedMain.Key().Repository) && (k.Package == updatedMain.Key().Package) && (k.Revision == updatedMain.Key().Revision) {
+			oldMainKey := repository.PackageRevisionKey{
+				Repository:    updatedMain.Key().Repository,
+				Package:       updatedMain.Key().Package,
+				Revision:      updatedMain.Key().Revision,
+				WorkspaceName: v1alpha1.WorkspaceName(string(k.WorkspaceName)),
 			}
+			delete(r.cachedPackageRevisions, oldMainKey)
 		}
-		cachedMain := &cachedPackageRevision{PackageRevision: updatedMain}
-		r.cachedPackageRevisions[updatedMain.Key()] = cachedMain
+	}
+	cachedMain := &cachedPackageRevision{PackageRevision: updatedMain}
+	r.cachedPackageRevisions[updatedMain.Key()] = cachedMain
 
-		pkgRevMetaNN := types.NamespacedName{
+	pkgRevMetaNN := types.NamespacedName{
+		Name:      updatedMain.KubeObjectName(),
+		Namespace: updatedMain.KubeObjectNamespace(),
+	}
+
+	// Create the package if it doesn't exist
+	_, err := r.metadataStore.Get(ctx, pkgRevMetaNN)
+	if errors.IsNotFound(err) {
+		pkgRevMeta := meta.PackageRevisionMeta{
 			Name:      updatedMain.KubeObjectName(),
 			Namespace: updatedMain.KubeObjectNamespace(),
 		}
-		// TODO: error handling for metadataStore.Get
-		_, err := r.metadataStore.Get(ctx, pkgRevMetaNN)
-		// Error can be different
-		if errors.IsNotFound(err) {
-			pkgRevMeta := meta.PackageRevisionMeta{
-				Name:      updatedMain.KubeObjectName(),
-				Namespace: updatedMain.KubeObjectNamespace(),
-			}
-			_, err := r.metadataStore.Create(ctx, pkgRevMeta, r.repoSpec.Name, updatedMain.UID())
-			if err != nil {
-				klog.Warningf("unable to create PackageRev CR for %s/%s: %v",
-					updatedMain.KubeObjectNamespace(), updatedMain.KubeObjectName(), err)
-			}
-		}
-		version, err := r.repo.Version(ctx)
-		if err != nil {
-			return nil, err
-		}
-		r.lastVersion = version
-	} else {
-		version, err := r.repo.Version(ctx)
+		_, err := r.metadataStore.Create(ctx, pkgRevMeta, r.repoSpec.Name, updatedMain.UID())
 		if err != nil {
-			return nil, err
+			klog.Warningf("unable to create PackageRev CR for %s/%s: %v",
+				updatedMain.KubeObjectNamespace(), updatedMain.KubeObjectName(), err)
 		}
-		r.lastVersion = version
 	}
+	version, err := r.repo.Version(ctx)
+	if err != nil {
+		return err
+	}
+	r.lastVersion = version
 
-	// TODO: Update the latest revisions for the r.cachedPackages
-	return cached, nil
+	return nil
 }
 
 func (r *cachedRepository) DeletePackageRevision(ctx context.Context, old repository.PackageRevision) error {