it wasnt the destroyed load?

This reverts commit c502bfa.
zarf-dev · Sep 24, 2024 · 0fbab7d · 0fbab7d
1 parent c502bfa
commit 0fbab7d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/internal/packager2/load.go b/src/internal/packager2/load.go
@@ -239,6 +239,20 @@ func packageFromSourceOrCluster(ctx context.Context, cluster *cluster.Cluster, s
 		}
 		return depPkg.Data, nil
 	}
-	//todo(schristoff): :/
-	return v1alpha1.ZarfPackage{}, nil
+
+	loadOpt := LoadOptions{
+		Source:                  src,
+		SkipSignatureValidation: skipSignatureValidation,
+		Filter:                  filters.Empty(),
+	}
+	pkgPaths, err := LoadPackage(ctx, loadOpt)
+	if err != nil {
+		return v1alpha1.ZarfPackage{}, err
+	}
+	defer os.RemoveAll(pkgPaths.Base)
+	pkg, _, err := pkgPaths.ReadZarfYAML()
+	if err != nil {
+		return v1alpha1.ZarfPackage{}, err
+	}
+	return pkg, nil
 }
diff --git a/src/internal/packager2/load_test.go b/src/internal/packager2/load_test.go
@@ -154,7 +154,7 @@ func TestPackageFromSourceOrCluster(t *testing.T) {
 	}
 	_, err = c.RecordPackageDeployment(ctx, pkg, nil, 1)
 	require.NoError(t, err)
-	// pkg, err = packageFromSourceOrCluster(ctx, c, "test", false)
-	// require.NoError(t, err)
-	// require.Equal(t, "test", pkg.Metadata.Name)
+	pkg, err = packageFromSourceOrCluster(ctx, c, "test", false)
+	require.NoError(t, err)
+	require.Equal(t, "test", pkg.Metadata.Name)
 }