Update dependencies and err msg (#13)

* Improve error message

* Update dependencies

* Fix tests

Author: jaredoconnell

go.mod

@@ -3,17 +3,17 @@ module go.flow.arcalot.io/pythondeployer
 go 1.18
 
 require (
-	go.arcalot.io/assert v1.3.0
+	go.arcalot.io/assert v1.4.0
 	go.arcalot.io/lang v1.0.0
 )
 
 require (
-	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.5.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 )
 
 require (
 	go.arcalot.io/log/v2 v2.0.0
 	go.flow.arcalot.io/deployer v0.2.0
-	go.flow.arcalot.io/pluginsdk v0.1.3
+	go.flow.arcalot.io/pluginsdk v0.4.1
 )

go.sum

@@ -1,15 +1,15 @@
-github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
-github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
+github.com/fxamacker/cbor/v2 v2.5.0 h1:oHsG0V/Q6E/wqTS2O1Cozzsy69nqCiguo5Q1a1ADivE=
+github.com/fxamacker/cbor/v2 v2.5.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
-go.arcalot.io/assert v1.3.0 h1:+uQex4s9gezATpTyFxUY5dlAcrwI1Me5fSmdcydGHho=
-go.arcalot.io/assert v1.3.0/go.mod h1:Xy3ScX0p9IMY89gdsgexOKxnmDr0nGHG9dV7p8Uxg7w=
+go.arcalot.io/assert v1.4.0 h1:X7ptZSl4WrB+jUn53Kzvp3aPWCSsCgUp4iW2wdLEOv4=
+go.arcalot.io/assert v1.4.0/go.mod h1:Xy3ScX0p9IMY89gdsgexOKxnmDr0nGHG9dV7p8Uxg7w=
 go.arcalot.io/lang v1.0.0 h1:mgDaieT4wWdZTnR4V7+/pgYRmzfU7VZZgIzHccuxAbY=
 go.arcalot.io/lang v1.0.0/go.mod h1:ALqfYEhAzC2WoGLaycmJoNJd5NmkR7V1PSKp/c5D278=
 go.arcalot.io/log/v2 v2.0.0 h1:mbmsWDVBXZNWrDzUh5JLzeGCQ59kTuMFs+pyfJGc1hk=
 go.arcalot.io/log/v2 v2.0.0/go.mod h1:1V8jnFIIGwh2CtcGkHNOmy1nCo7LbazQNkUcnKYNMn4=
 go.flow.arcalot.io/deployer v0.2.0 h1:CpkCYlB8NfpmELIEPdw3/al8XknCSfD/L2vie2lJBJo=
 go.flow.arcalot.io/deployer v0.2.0/go.mod h1:xVSB+svHVPmX6yTZIU0K4U/pDbs+rezsWa69vYA+E6k=
-go.flow.arcalot.io/pluginsdk v0.1.3 h1:o6v1YJmirRNcflh9ZQr5bMuhBavk8CzARjrNodU/XHA=
-go.flow.arcalot.io/pluginsdk v0.1.3/go.mod h1:ceY4HhUbnhZyQa3C7lXu25TNVCbsWGuYZapsV5RuIrk=
+go.flow.arcalot.io/pluginsdk v0.4.1 h1:sooyHRNCH/EIQJe+842qZJAgXHuffclFbc3hPMgbhCc=
+go.flow.arcalot.io/pluginsdk v0.4.1/go.mod h1:8Gp8Q0Eo0s+2I4nNl3uQ95jPi2zFKEX7JqyjhmK7BiI=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

internal/cliwrapper/cliwrapper.go

@@ -161,7 +161,7 @@ func (p *cliWrapper) Deploy(fullModuleName string) (io.WriteCloser, io.ReadClose
 
 func (p *cliWrapper) KillAndClean() error {
 	if p.stdErrBuff.Len() > 0 {
-		p.logger.Errorf("stderr present after plugin execution: %s", p.stdErrBuff.String())
+		p.logger.Errorf("stderr present after plugin execution: '%s'", p.stdErrBuff.String())
 	} else {
 		p.logger.Infof("stderr empty")
 	}

tests/cliwrapper_test.go

@@ -2,17 +2,17 @@ package tests
 
 import (
 	"fmt"
-	"go.flow.arcalot.io/pythondeployer/internal/cliwrapper"
 	"go.arcalot.io/assert"
 	"go.arcalot.io/log/v2"
-	"os/exec"
+	"go.flow.arcalot.io/pythondeployer/internal/cliwrapper"
 	"testing"
 )
 
 func TestPullImage(t *testing.T) {
 	module := "arcaflow-plugin-template-python@git+https://github.com/arcalot/arcaflow-plugin-template-python.git"
 	workDir := createWorkdir(t)
-	pythonPath, err := exec.LookPath("python")
+
+	pythonPath, err := getPythonPath()
 	assert.NoError(t, err)
 	logger := log.NewTestLogger(t)
 	python := cliwrapper.NewCliWrapper(pythonPath, workDir, logger)
@@ -26,7 +26,7 @@ func TestPullImage(t *testing.T) {
 func TestImageExists(t *testing.T) {
 	module := "arcaflow-plugin-template-python@git+https://github.com/arcalot/arcaflow-plugin-template-python.git"
 	workDir := createWorkdir(t)
-	pythonPath, err := exec.LookPath("python")
+	pythonPath, err := getPythonPath()
 	assert.NoError(t, err)
 	logger := log.NewTestLogger(t)
 	python := cliwrapper.NewCliWrapper(pythonPath, workDir, logger)
@@ -50,7 +50,7 @@ func TestImageFormatValidation(t *testing.T) {
 	moduleWrongFormat := "https://arcalot.io"
 	wrongFormatMessage := "wrong module name format, please use <module-name>@git+<repo_url>[@<commit_sha>]"
 	workDir := createWorkdir(t)
-	pythonPath, err := exec.LookPath("python")
+	pythonPath, err := getPythonPath()
 	assert.NoError(t, err)
 	logger := log.NewTestLogger(t)
 	wrapperGit := cliwrapper.NewCliWrapper(pythonPath, workDir, logger)

tests/connector_test.go

@@ -6,6 +6,7 @@ import (
 	"go.arcalot.io/assert"
 	"go.flow.arcalot.io/deployer"
 	"go.flow.arcalot.io/pluginsdk/atp"
+	"go.flow.arcalot.io/pluginsdk/schema"
 	"os"
 	"testing"
 )
@@ -87,8 +88,6 @@ func RunStep(t *testing.T, connector deployer.Connector, moduleName string) (*st
 	stepID := "hello-world"
 	input := map[string]any{"name": templatePluginInput}
 
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
 	plugin, err := connector.Deploy(context.Background(), moduleName)
 
 	if err != nil {
@@ -112,7 +111,13 @@ func RunStep(t *testing.T, connector deployer.Connector, moduleName string) (*st
 	assert.NoError(t, err)
 
 	// Executes the step and validates that the output is correct.
-	outputID, outputData, err := atpClient.Execute(ctx, stepID, input)
+	receivedSignals := make(chan schema.Input)
+	emittedSignals := make(chan schema.Input)
+	outputID, outputData, err := atpClient.Execute(
+		schema.Input{ID: stepID, InputData: input},
+		receivedSignals,
+		emittedSignals,
+	)
 	return &outputID, outputData, err
 
 }

tests/test_common.go

@@ -3,17 +3,30 @@ package tests
 import (
 	"encoding/json"
 	"fmt"
-	pythondeployer "go.flow.arcalot.io/pythondeployer"
-	wrapper "go.flow.arcalot.io/pythondeployer/internal/cliwrapper"
-	"go.flow.arcalot.io/pythondeployer/internal/config"
 	"go.arcalot.io/assert"
 	"go.arcalot.io/log/v2"
 	"go.flow.arcalot.io/deployer"
+	pythondeployer "go.flow.arcalot.io/pythondeployer"
+	wrapper "go.flow.arcalot.io/pythondeployer/internal/cliwrapper"
+	"go.flow.arcalot.io/pythondeployer/internal/config"
 	"math/rand"
 	"os"
+	"os/exec"
 	"testing"
 )
 
+func getPythonPath() (string, error) {
+	python3Path, errPython3 := exec.LookPath("python3")
+	if errPython3 != nil {
+		pythonPath, errPython := exec.LookPath("python")
+		if errPython != nil {
+			return "", fmt.Errorf("error getting Python3 (%s) and python (%s)", errPython3, errPython)
+		}
+		return pythonPath, nil
+	}
+	return python3Path, nil
+}
+
 func createWorkdir(t *testing.T) string {
 	workdir := fmt.Sprintf("/tmp/%s", randString(10))
 	if _, err := os.Stat(workdir); !os.IsNotExist(err) {
@@ -52,7 +65,7 @@ func pullModule(python wrapper.CliWrapper, module string, workDir string, t *tes
 }
 
 func getCliWrapper(t *testing.T, workdir string) wrapper.CliWrapper {
-        workDir := workdir
+	workDir := workdir
 	pythonPath := "/usr/bin/python3.9"
 	logger := log.NewTestLogger(t)
 	return wrapper.NewCliWrapper(pythonPath, workDir, logger)
@@ -67,6 +80,9 @@ func getConnector(t *testing.T, configJSON string, workdir *string) (deployer.Co
 	schema := factory.ConfigurationSchema()
 	unserializedConfig, err := schema.UnserializeType(serializedConfig)
 	assert.NoError(t, err)
+	pythonPath, err := getPythonPath()
+	assert.NoError(t, err)
+	unserializedConfig.PythonPath = pythonPath
 	// NOTE: randomizing Workdir to avoid parallel tests to
 	// remove python folders while other tests are running
 	// causing the test to fail