renderer/jsonnet: Allow configuring jpaths

main.go

@@ -79,6 +79,7 @@ func Main() int {
 
 		rendererFileDirectory     string
 		rendererFileRollout       string
+		rendererJsonnetJpaths     stringList
 		rendererJsonnetEntrypoint string
 		rendererJsonnetExtStrs    stringList
 
@@ -104,7 +105,8 @@ func Main() int {
 	s.StringVar(&rendererFileDirectory, "renderer.file.dir", "manifests/", "Directory to read files from.")
 	s.StringVar(&rendererFileRollout, "renderer.file.rollout", "rollout.yaml", "Plain rollout spec to read.")
 	s.StringVar(&rendererJsonnetEntrypoint, "renderer.jsonnet.entrypoint", "jsonnet/main.jsonnet", "Jsonnet file to execute to render.")
-	s.Var(&rendererJsonnetExtStrs, "renderer.jsonnet.ext-str", "Jsonnet ext-str to pass to the jsonnot VM.")
+	s.Var(&rendererJsonnetExtStrs, "renderer.jsonnet.ext-str", "Jsonnet ext-str to pass to the jsonnet VM.")
+	s.Var(&rendererJsonnetJpaths, "renderer.jsonnet.jpaths", "Jsonnet jpaths to pass to the jsonnet VM.")
 
 	s.StringVar(&sourceDatabaseFile, "source.database.file", "", "File to read database queries from as sources.")
 
@@ -230,7 +232,13 @@ func Main() int {
 	{
 		switch renderProviderName {
 		case "jsonnet":
-			renderer, err = jsonnet.NewRenderer(logger, rendererJsonnetEntrypoint, sources, []string(rendererJsonnetExtStrs))
+			renderer, err = jsonnet.NewRenderer(
+				logger,
+				rendererJsonnetEntrypoint,
+				sources,
+				[]string(rendererJsonnetExtStrs),
+				[]string(rendererJsonnetJpaths),
+			)
 			if err != nil {
 				logger.Log("msg", "failed to create jsonnet renderer", "err", err)
 				return 1

render/jsonnet/jsonnet.go

@@ -21,13 +21,15 @@ type Renderer struct {
 	entrypoint string
 	sources    map[string]func(context.Context) ([]byte, error)
 	extStrs    map[string]string
+	jpaths     []string
 }
 
 func NewRenderer(
 	logger log.Logger,
 	entrypoint string,
 	sources map[string]func(context.Context) ([]byte, error),
 	extStrsList []string,
+	jpaths []string,
 ) (*Renderer, error) {
 	extStrs := map[string]string{}
 	for _, extStr := range extStrsList {
@@ -43,6 +45,7 @@ func NewRenderer(
 		entrypoint: entrypoint,
 		sources:    sources,
 		extStrs:    extStrs,
+		jpaths:     jpaths,
 	}, nil
 }
 
@@ -53,7 +56,7 @@ type result struct {
 
 func (r *Renderer) Render(ctx context.Context, config []byte) (*render.Result, error) {
 	jsonnetMain := r.entrypoint
-	jpaths := []string{"vendor"}
+	jpaths := r.jpaths
 	jsonnetMainContent, err := ioutil.ReadFile(jsonnetMain)
 	if err != nil {
 		return nil, fmt.Errorf("could not read main jsonnet file: %s", jsonnetMain)