Merge pull request #871 from surajnarwade/stdin

Kompose will read input from stdin
This commit is contained in:
Hang Yan
2018-06-06 22:20:27 +08:00
committed by GitHub
8 changed files with 144 additions and 9 deletions
+1
View File
@@ -0,0 +1 @@
mode: atomic
+30
View File
@@ -0,0 +1,30 @@
package cmd
import (
"bytes"
"fmt"
"io/ioutil"
"os"
"os/exec"
"testing"
)
var ProjectPath = "$GOPATH/src/github.com/kubernetes/kompose/"
var BinaryLocation = os.ExpandEnv(ProjectPath + "kompose")
func Test_stdin(t *testing.T) {
if testing.Short() {
t.Skip("skipping test in short mode.")
}
kjson := `{"version": "2","services": {"redis": {"image": "redis:3.0","ports": ["6379"]}}}`
cmdStr := fmt.Sprintf("%s convert --stdout -j -f - <<EOF\n%s\nEOF\n", BinaryLocation, kjson)
subproc := exec.Command("/bin/sh", "-c", cmdStr)
output, err := subproc.Output()
if err != nil {
fmt.Println("error", err)
}
g, err := ioutil.ReadFile("/tmp/output-k8s.json")
if !bytes.Equal(output, g) {
t.Errorf("Test Failed")
}
}
+7
View File
@@ -758,5 +758,12 @@ cmd="kompose --provider=openshift convert --stdout -j -f $KOMPOSE_ROOT/script/te
sed -e "s;%VERSION%;$version;g" -e "s;%CMD%;$cmd;g" $KOMPOSE_ROOT/script/test/fixtures/controller/output-os-controller-v3-template.json > /tmp/output-os.json
convert::expect_success "$cmd" "/tmp/output-os.json"
# Testing stdin feature
cmd="$KOMPOSE_ROOT/kompose convert --stdout -j -f -"
sed -e "s;%VERSION%;$version;g" -e "s;%CMD%;$cmd;g" $KOMPOSE_ROOT/script/test/fixtures/stdin/output.json > /tmp/output-k8s.json
echo -e "\n"
go test -v github.com/kubernetes/kompose/script/test/cmd
rm /tmp/output-k8s.json /tmp/output-os.json
exit $EXIT_STATUS