diff options
Diffstat (limited to 'client/go/internal/curl')
-rw-r--r-- | client/go/internal/curl/curl.go | 4 | ||||
-rw-r--r-- | client/go/internal/curl/curl_test.go | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/client/go/internal/curl/curl.go b/client/go/internal/curl/curl.go index b70e0f824a3..daa60e6ff14 100644 --- a/client/go/internal/curl/curl.go +++ b/client/go/internal/curl/curl.go @@ -7,7 +7,7 @@ import ( "os/exec" "runtime" - "github.com/kballard/go-shellquote" + "github.com/alessio/shellescape" "github.com/vespa-engine/vespa/client/go/internal/util" ) @@ -77,7 +77,7 @@ func (c *Command) Args() []string { func (c *Command) String() string { args := []string{c.Path} args = append(args, c.Args()...) - return shellquote.Join(args...) + return shellescape.QuoteCommand(args) } func (c *Command) Header(key, value string) { diff --git a/client/go/internal/curl/curl_test.go b/client/go/internal/curl/curl_test.go index 448e1e5199f..c8bcfb7f56b 100644 --- a/client/go/internal/curl/curl_test.go +++ b/client/go/internal/curl/curl_test.go @@ -5,13 +5,12 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestPost(t *testing.T) { c, err := Post("https://example.com") - if err != nil { - t.Fatal(err) - } + require.Nil(t, err) c.PrivateKey = "key.pem" c.Certificate = "cert.pem" c.WithBodyFile("file.json") @@ -22,22 +21,18 @@ func TestPost(t *testing.T) { func TestGet(t *testing.T) { c, err := Get("https://example.com") - if err != nil { - t.Fatal(err) - } + require.Nil(t, err) c.PrivateKey = "key.pem" c.Certificate = "cert.pem" c.Param("yql", "select * from sources * where title contains 'foo';") c.Param("hits", "5") - assert.Equal(t, `curl --key key.pem --cert cert.pem https://example.com\?hits=5\&yql=select+%2A+from+sources+%2A+where+title+contains+%27foo%27%3B`, c.String()) + assert.Equal(t, `curl --key key.pem --cert cert.pem 'https://example.com?hits=5&yql=select+%2A+from+sources+%2A+where+title+contains+%27foo%27%3B'`, c.String()) } func TestRawArgs(t *testing.T) { c, err := RawArgs("https://example.com/search", "-v", "-m", "10", "-H", "foo: bar") - if err != nil { - t.Fatal(err) - } + assert.Nil(t, err) c.PrivateKey = "key.pem" c.Certificate = "cert.pem" |