github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

kubectl plugin: Expand environment variables in the command of plugin.yaml

Browse Source 
This commit improves kubectl plugins to expand environment variables in
the command of plugin.yaml.
This commit is contained in:
Kazuki Suda 2017-05-15 15:31:13 +09:00
parent c873e4a814
commit 9a36d5567a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/plugins/runner.go
View File

@ -18,6 +18,7 @@ package plugins
import ( import (
"io" "io"
"os"
"os/exec" "os/exec"
"strings" "strings"
@ -47,7 +48,7 @@ type ExecPluginRunner struct{}
// Run takes a given plugin and runs it in a given context using os/exec, returning // Run takes a given plugin and runs it in a given context using os/exec, returning
// any error found while running. // any error found while running.
func (r *ExecPluginRunner) Run(plugin *Plugin, ctx RunningContext) error { func (r *ExecPluginRunner) Run(plugin *Plugin, ctx RunningContext) error {
command := strings.Split(plugin.Command, " ") command := strings.Split(os.ExpandEnv(plugin.Command), " ")
base := command[0] base := command[0]
args := []string{} args := []string{}
if len(command) > 1 { if len(command) > 1 {

9
pkg/kubectl/plugins/runner_test.go
View File

@ -18,6 +18,7 @@ package plugins
import ( import (
"bytes" "bytes"
"os"
"testing" "testing"
) )
@ -38,8 +39,16 @@ func TestExecRunner(t *testing.T) {
command: "false", command: "false",
expectedErr: "exit status 1", expectedErr: "exit status 1",
}, },
{
name: "env",
command: "echo $KUBECTL_PLUGINS_TEST",
expectedMsg: "ok\n",
},
} }
os.Setenv("KUBECTL_PLUGINS_TEST", "ok")
defer os.Unsetenv("KUBECTL_PLUGINS_TEST")
for _, test := range tests { for _, test := range tests {
outBuf := bytes.NewBuffer([]byte{}) outBuf := bytes.NewBuffer([]byte{})