Skip to content

Commit

Permalink
remove arg handling changes (committed by mistake)
Browse files Browse the repository at this point in the history
Signed-off-by: Edoardo Vacchi <[email protected]>
  • Loading branch information
evacchi committed Jul 27, 2023
1 parent ca502f7 commit c259ddb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
9 changes: 1 addition & 8 deletions bindings/wasm/output.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ package wasm
import (
"bytes"
"context"
"encoding/csv"
"fmt"
"io"
"reflect"
Expand Down Expand Up @@ -116,13 +115,7 @@ func (out *outputBinding) Invoke(ctx context.Context, req *bindings.InvokeReques

// Get any remaining args from configuration
if args := req.Metadata["args"]; args != "" {
parser := csv.NewReader(strings.NewReader(args))
parser.Comma = ' '
records, err := parser.ReadAll()
if err != nil {
return nil, err
}
argsSlice = append(argsSlice, records[0]...)
argsSlice = append(argsSlice, strings.Split(args, ",")...)
}
moduleConfig = moduleConfig.WithArgs(argsSlice...)

Expand Down
6 changes: 2 additions & 4 deletions bindings/wasm/output_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
)

const (
ruby = "https://github.com/vmware-labs/webassembly-language-runtimes/releases/download/ruby%2F3.2.0%2B20230215-1349da9/ruby-3.2.0-slim.wasm"
urlArgsFile = "file://testdata/args/main.wasm"
urlExampleFile = "file://testdata/example/main.wasm"
urlLoopFile = "file://testdata/loop/main.wasm"
Expand Down Expand Up @@ -117,11 +116,10 @@ func Test_Invoke(t *testing.T) {
},
{
name: "args",
url: ruby,
url: urlArgsFile,
request: &bindings.InvokeRequest{
Metadata: map[string]string{"args": `-ne 'print "Hello ";print '`},
Metadata: map[string]string{"args": "1,2"},
Operation: ExecuteOperation,
Data: []byte("salaboy"),
},
expectedData: "main\n1\n2",
},
Expand Down

0 comments on commit c259ddb

Please sign in to comment.