LoaderOpts

Author: Duologic

cmd/tk/env.go

@@ -77,7 +77,7 @@ func envSetCmd() *cli.Command {
 			tmp.Spec.APIServer = server
 		}
 
-		cfg, err := tanka.Peek(path, tanka.JsonnetOpts{})
+		cfg, err := tanka.Peek(path, tanka.Opts{})
 		if err != nil {
 			return err
 		}

cmd/tk/export.go

@@ -84,7 +84,7 @@ func exportCmd() *cli.Command {
 			}
 
 			// validate environment
-			if _, err := tanka.LoadEnvironment(path, opts.Opts); err != nil {
+			if _, err := tanka.Peek(path, opts.Opts); err != nil {
 				switch err.(type) {
 				case tanka.ErrMultipleEnvs:
 					fmt.Println("Please use --name to export a single environment or --recursive to export multiple environments.")

pkg/tanka/find.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/grafana/tanka/pkg/jsonnet"
 	"github.com/grafana/tanka/pkg/spec/v1alpha1"
 	"k8s.io/apimachinery/pkg/labels"
 )
@@ -45,7 +44,7 @@ func FindEnvs(path string, opts FindOpts) ([]*v1alpha1.Environment, error) {
 // find implements the actual functionality described at 'FindEnvs'
 func find(path string) ([]*v1alpha1.Environment, error) {
 	// try if this has envs
-	list, err := List(path, jsonnet.Opts{})
+	list, err := List(path, Opts{})
 	if len(list) != 0 && err == nil {
 		// it has. don't search deeper
 		return list, nil

pkg/tanka/inline.go

@@ -17,8 +17,12 @@ import (
 // Kubernetes resources are expected at the `data` key of this very type
 type InlineLoader struct{}
 
-func (i *InlineLoader) Load(path string, opts JsonnetOpts) (*v1alpha1.Environment, error) {
-	envs, err := inlineEval(path, opts)
+func (i *InlineLoader) Load(path string, opts LoaderOpts) (*v1alpha1.Environment, error) {
+	if opts.Name != "" {
+		opts.JsonnetOpts.EvalScript = fmt.Sprintf(SingleEnvEvalScript, opts.Name)
+	}
+
+	envs, err := inlineEval(path, opts.JsonnetOpts)
 	if err != nil {
 		return nil, err
 	}
@@ -49,14 +53,20 @@ func (i *InlineLoader) Load(path string, opts JsonnetOpts) (*v1alpha1.Environmen
 	return env, nil
 }
 
-func (i *InlineLoader) Peek(path string, opts JsonnetOpts) (*v1alpha1.Environment, error) {
-	opts.EvalScript = EnvsOnlyEvalScript
+func (i *InlineLoader) Peek(path string, opts LoaderOpts) (*v1alpha1.Environment, error) {
+	opts.JsonnetOpts.EvalScript = EnvsOnlyEvalScript
+	if opts.Name != "" {
+		opts.JsonnetOpts.EvalScript = fmt.Sprintf(SingleEnvEvalScript, opts.Name)
+	}
 	return i.Load(path, opts)
 }
 
-func (i *InlineLoader) List(path string, opts JsonnetOpts) ([]*v1alpha1.Environment, error) {
-	opts.EvalScript = EnvsOnlyEvalScript
-	list, err := inlineEval(path, opts)
+func (i *InlineLoader) List(path string, opts LoaderOpts) ([]*v1alpha1.Environment, error) {
+	opts.JsonnetOpts.EvalScript = EnvsOnlyEvalScript
+	if opts.Name != "" {
+		opts.JsonnetOpts.EvalScript = fmt.Sprintf(SingleEnvEvalScript, opts.Name)
+	}
+	list, err := inlineEval(path, opts.JsonnetOpts)
 	if err != nil {
 		return nil, err
 	}

pkg/tanka/load.go

@@ -36,10 +36,7 @@ func LoadEnvironment(path string, opts Opts) (*v1alpha1.Environment, error) {
 		return nil, err
 	}
 
-	if opts.Name != "" {
-		opts.JsonnetOpts.EvalScript = fmt.Sprintf(SingleEnvEvalScript, opts.Name)
-	}
-	env, err := loader.Load(path, opts.JsonnetOpts)
+	env, err := loader.Load(path, LoaderOpts{opts.JsonnetOpts, opts.Name})
 	if err != nil {
 		return nil, err
 	}
@@ -62,25 +59,25 @@ func LoadManifests(env *v1alpha1.Environment, filters process.Matchers) (*LoadRe
 
 // Peek loads the metadata of the environment at path. To get resources as well,
 // use Load
-func Peek(path string, opts JsonnetOpts) (*v1alpha1.Environment, error) {
+func Peek(path string, opts Opts) (*v1alpha1.Environment, error) {
 	loader, err := DetectLoader(path)
 	if err != nil {
 		return nil, err
 	}
 
-	return loader.Peek(path, opts)
+	return loader.Peek(path, LoaderOpts{opts.JsonnetOpts, opts.Name})
 }
 
 // List finds metadata of all environments at path that could possibly be
 // loaded. List can be used to deal with multiple inline environments, by first
 // listing them, choosing the right one and then only loading that one
-func List(path string, opts JsonnetOpts) ([]*v1alpha1.Environment, error) {
+func List(path string, opts Opts) ([]*v1alpha1.Environment, error) {
 	loader, err := DetectLoader(path)
 	if err != nil {
 		return nil, err
 	}
 
-	return loader.List(path, opts)
+	return loader.List(path, LoaderOpts{opts.JsonnetOpts, opts.Name})
 }
 
 // DetectLoader detects whether the environment is inline or static and picks
@@ -105,14 +102,19 @@ func DetectLoader(path string) (Loader, error) {
 // Loader is an abstraction over the process of loading Environments
 type Loader interface {
 	// Load a single environment at path
-	Load(path string, opts JsonnetOpts) (*v1alpha1.Environment, error)
+	Load(path string, opts LoaderOpts) (*v1alpha1.Environment, error)
 
 	// Peek only loads metadata and omits the actual resources
-	Peek(path string, opts JsonnetOpts) (*v1alpha1.Environment, error)
+	Peek(path string, opts LoaderOpts) (*v1alpha1.Environment, error)
 
 	// List returns metadata of all possible environments at path that can be
 	// loaded
-	List(path string, opts JsonnetOpts) ([]*v1alpha1.Environment, error)
+	List(path string, opts LoaderOpts) ([]*v1alpha1.Environment, error)
+}
+
+type LoaderOpts struct {
+	JsonnetOpts
+	Name string
 }
 
 type LoadResult struct {

pkg/tanka/static.go

@@ -12,13 +12,13 @@ import (
 // Jsonnet is evaluated as normal
 type StaticLoader struct{}
 
-func (s StaticLoader) Load(path string, opts JsonnetOpts) (*v1alpha1.Environment, error) {
+func (s StaticLoader) Load(path string, opts LoaderOpts) (*v1alpha1.Environment, error) {
 	config, err := s.Peek(path, opts)
 	if err != nil {
 		return nil, err
 	}
 
-	data, err := EvalJsonnet(path, opts)
+	data, err := EvalJsonnet(path, opts.JsonnetOpts)
 	if err != nil {
 		return nil, err
 	}
@@ -30,7 +30,7 @@ func (s StaticLoader) Load(path string, opts JsonnetOpts) (*v1alpha1.Environment
 	return config, nil
 }
 
-func (s StaticLoader) Peek(path string, opts JsonnetOpts) (*v1alpha1.Environment, error) {
+func (s StaticLoader) Peek(path string, opts LoaderOpts) (*v1alpha1.Environment, error) {
 	config, err := parseStaticSpec(path)
 	if err != nil {
 		return nil, err
@@ -39,7 +39,7 @@ func (s StaticLoader) Peek(path string, opts JsonnetOpts) (*v1alpha1.Environment
 	return config, nil
 }
 
-func (s StaticLoader) List(path string, opts JsonnetOpts) ([]*v1alpha1.Environment, error) {
+func (s StaticLoader) List(path string, opts LoaderOpts) ([]*v1alpha1.Environment, error) {
 	env, err := s.Peek(path, opts)
 	if err != nil {
 		return nil, err