cli: render library API returns structured result

kptdev · Oct 19, 2022 · d3adf9f · d3adf9f
1 parent d4ae450
commit d3adf9f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/commands/fn/render/cmdrender.go b/commands/fn/render/cmdrender.go
@@ -135,7 +135,7 @@ func (r *Runner) runE(c *cobra.Command, _ []string) error {
 		RunnerOptions:  r.RunnerOptions,
 		FileSystem:     filesys.FileSystemOrOnDisk{},
 	}
-	if err := executor.Execute(r.ctx); err != nil {
+	if _, err := executor.Execute(r.ctx); err != nil {
 		return err
 	}
 

diff --git a/internal/util/render/executor.go b/internal/util/render/executor.go
@@ -66,14 +66,14 @@ type Renderer struct {
 }
 
 // Execute runs a pipeline.
-func (e *Renderer) Execute(ctx context.Context) error {
+func (e *Renderer) Execute(ctx context.Context) (*fnresult.ResultList, error) {
 	const op errors.Op = "fn.render"
 
 	pr := printer.FromContextOrDie(ctx)
 
 	root, err := newPkgNode(e.FileSystem, e.PkgPath, nil)
 	if err != nil {
-		return errors.E(op, types.UniquePath(e.PkgPath), err)
+		return nil, errors.E(op, types.UniquePath(e.PkgPath), err)
 	}
 
 	// initialize hydration context
@@ -91,17 +91,17 @@ func (e *Renderer) Execute(ctx context.Context) error {
 		// to avoid masking the hydration error.
 		// don't disable the CLI output in case of error
 		_ = e.saveFnResults(ctx, hctx.fnResults)
-		return errors.E(op, root.pkg.UniquePath, err)
+		return hctx.fnResults, errors.E(op, root.pkg.UniquePath, err)
 	}
 
 	// adjust the relative paths of the resources.
 	err = adjustRelPath(hctx)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	if err = trackOutputFiles(hctx); err != nil {
-		return err
+		return nil, err
 	}
 
 	// add metrics annotation to output resources to track the usage as the resources
@@ -122,11 +122,11 @@ func (e *Renderer) Execute(ctx context.Context) error {
 		}
 		err = pkgWriter.Write(hctx.root.resources)
 		if err != nil {
-			return fmt.Errorf("failed to save resources: %w", err)
+			return nil, fmt.Errorf("failed to save resources: %w", err)
 		}
 
 		if err = pruneResources(e.FileSystem, hctx); err != nil {
-			return err
+			return nil, err
 		}
 		pr.Printf("Successfully executed %d function(s) in %d package(s).\n", hctx.executedFunctionCnt, len(hctx.pkgs))
 	} else {
@@ -140,11 +140,11 @@ func (e *Renderer) Execute(ctx context.Context) error {
 		}
 		err = writer.Write(hctx.root.resources)
 		if err != nil {
-			return fmt.Errorf("failed to write resources: %w", err)
+			return nil, fmt.Errorf("failed to write resources: %w", err)
 		}
 	}
 
-	return e.saveFnResults(ctx, hctx.fnResults)
+	return hctx.fnResults, e.saveFnResults(ctx, hctx.fnResults)
 }
 
 func (e *Renderer) saveFnResults(ctx context.Context, fnResults *fnresult.ResultList) error {

diff --git a/pkg/fn/render.go b/pkg/fn/render.go
@@ -17,6 +17,7 @@ package fn
 import (
 	"context"
 
+	fnresult "github.com/GoogleContainerTools/kpt/pkg/api/fnresult/v1"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
 )
 
@@ -26,5 +27,5 @@ type RenderOptions struct {
 }
 
 type Renderer interface {
-	Render(ctx context.Context, pkg filesys.FileSystem, opts RenderOptions) error
+	Render(ctx context.Context, pkg filesys.FileSystem, opts RenderOptions) (*fnresult.ResultList, error)
 }