From c97220f402937570b0b15a501237e255ae20d467 Mon Sep 17 00:00:00 2001
From: Jessica Yuen <im.jessicayuen@gmail.com>
Date: Mon, 13 Nov 2017 11:54:56 -0800
Subject: [PATCH] Provide access to ExtCodes when the '-f' flag is provided
Currently, ExtCodes are only provided when the 'env' flag is present in
commands. The result is errors occuring when we run commands such as `ks
show default -f components/guestbook-ui.jsonnet`, where the params
ExtVar is needed. This commit fixes that scenario.
---
cmd/root.go | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/cmd/root.go b/cmd/root.go
index 63b30166..52e777ff 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -407,15 +407,17 @@ func expandEnvCmdObjs(cmd *cobra.Command, envSpec *envSpec, cwd metadata.AbsPath
libPath, vendorPath, envLibPath, envComponentPath, envParamsPath := manager.LibPaths(*envSpec.env)
expander.FlagJpath = append([]string{string(libPath), string(vendorPath), string(envLibPath)}, expander.FlagJpath...)
+ componentPaths, err := manager.ComponentPaths()
+ if err != nil {
+ return nil, err
+ }
+
+ baseObj := constructBaseObj(componentPaths)
+ params := importParams(string(envParamsPath))
+ expander.ExtCodes = append([]string{baseObj, params}, expander.ExtCodes...)
+
if !filesPresent {
- componentPaths, err := manager.ComponentPaths()
- if err != nil {
- return nil, err
- }
-
- baseObj := constructBaseObj(componentPaths)
- params := importParams(string(envParamsPath))
- expander.ExtCodes = append([]string{baseObj, params}, expander.ExtCodes...)
+
fileNames = []string{string(envComponentPath)}
}
}
--
GitLab