Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history 
Signed-off-by: Pierre Fenoll <[email protected]>
  • Loading branch information
@fenollp
fenollp committed Jul 28, 2023
1 parent 6d4760f commit e923d79
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 60 deletions.
31 changes: 5 additions & 26 deletions pkg/resetter/shell/resetter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ type Resetter struct {
scriptsCreator sync.Once
scriptsPaths map[shellCmd]string
sherr chan error
i, o string
i string
stdin io.WriteCloser
rcoms *rcoms
}
Expand Down Expand Up @@ -214,15 +214,11 @@ func (s *Resetter) exec(ctx context.Context, stdout, stderr io.Writer, envRead m
if err = writeFile(i, nil); err != nil {
log.Println("[ERR]", err)
}
o := fmt.Sprintf("%s%s.txt", scriptPrefix, "main_o")
if err = writeFile(o, nil); err != nil {
log.Println("[ERR]", err)
}
main := fmt.Sprintf("%s%s.bash", scriptPrefix, "main")
if err = writeMainScript(main, i, o, paths); err != nil {
if err = writeMainScript(main, i, paths); err != nil {
return
}
s.i, s.o = i, o
s.i = i

s.sherr = make(chan error, 1)
var stdboth bytes.Buffer // TODO: mux stderr+stdout and fwd to server to track progress
Expand Down Expand Up @@ -275,7 +271,7 @@ func writeFile(name string, data []byte) error {
return os.WriteFile(name, data, 0640)
}

func writeMainScript(name, i, o string, paths []string) (err error) {
func writeMainScript(name, i string, paths []string) (err error) {
var script *os.File
if script, err = os.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0740); err != nil {
return
Expand Down Expand Up @@ -307,11 +303,10 @@ while read -r x; do
fi
source "$script"
echo $? >"%s"
echo "###:exit:$?"
done
`[1:]
code := fmt.Sprintf(mainCode, strings.Join(append(paths, i, o, name), `" "`), i, o)
code := fmt.Sprintf(mainCode, strings.Join(append(paths, i, name), `" "`), i)

fmt.Fprintln(script, code)
return
Expand All @@ -321,7 +316,6 @@ var _ io.Writer = (*rcoms)(nil)

type rcoms struct {
errcodes chan uint8
// chanfunc pong(pings <-chan string, pongs chan<- string) {
}

// FIXME: generalize from progress_writer
Expand Down Expand Up @@ -417,20 +411,5 @@ func (s *Resetter) execEach(ctx context.Context, stdin io.WriteCloser, scriptFil
}

log.Printf("[NFO] exec'd in %s", time.Since(start))

var data []byte
if data, err = os.ReadFile(s.o); err != nil {
log.Println("[ERR]", err)
return
}
var errcode int
if errcode, err = strconv.Atoi(strings.TrimSpace(string(data))); err != nil {
log.Println("[ERR]", err)
return
}
if errcode != 0 {
err = fmt.Errorf("script exited with non-zero code %d", errcode)
log.Println("[ERR]", err)
}
return
}
89 changes: 55 additions & 34 deletions pkg/runtime/monkey_shell_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package runtime

import (
"context"
"fmt"
"testing"
"time"

Expand Down Expand Up @@ -215,48 +216,68 @@ Error in shell: shell: for parameter "stop": got float, want string`[1:])
// execution

func TestShellResets(t *testing.T) {
rt, err := newFakeMonkey(t, `
type testcase struct {
code string
expected error
}

for _, tst := range []testcase{
{":", nil},
{"true", nil},
{"sleep 3", nil},
{"false", nil},
} {
t.Run(tst.code, func(t *testing.T) {
rt, err := newFakeMonkey(t, fmt.Sprintf(`
monkey.shell(
name = "blop",
provides = ["some_model"],
reset = "sleep 3",
reset = "%s",
)
`[1:]+someOpenAPI3Model)
require.NoError(t, err)
require.Len(t, rt.resetters, 1)
require.Equal(t, []string{"some_model"}, rt.resetters["blop"].Provides())
require.Contains(t, someOpenAPI3Model, `"some_model"`)
require.Len(t, rt.selectedResetters, 0)
`[1:]+someOpenAPI3Model, tst.code))
require.NoError(t, err)
require.Len(t, rt.resetters, 1)
require.Equal(t, []string{"some_model"}, rt.resetters["blop"].Provides())
require.Contains(t, someOpenAPI3Model, `"some_model"`)
require.Len(t, rt.selectedResetters, 0)

ctx := context.Background()
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel()
ctx := context.Background()
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel()

// In the order written in main.go
err = rt.Lint(ctx, false)
require.NoError(t, err)
err = rt.FilterEndpoints(nil)
require.NoError(t, err)
// In the order written in main.go
err = rt.Lint(ctx, false)
require.NoError(t, err)
err = rt.FilterEndpoints(nil)
require.NoError(t, err)

require.Len(t, rt.selectedResetters, 0)
var selected []string
err = rt.forEachSelectedResetter(ctx, func(name string, rsttr resetter.Interface) error {
selected = append(selected, name)
return nil
})
require.NoError(t, err)
require.Len(t, rt.selectedResetters, 1)
require.Equal(t, []string{"blop"}, selected)
//todo: move some code to lang_test.go + share with fuzz.go / exec.go

rt.progress = &ci.Progresser{}
rt.client = &fakeClient{}
require.Len(t, rt.selectedResetters, 0)
var selected []string
err = rt.forEachSelectedResetter(ctx, func(name string, rsttr resetter.Interface) error {
selected = append(selected, name)
return nil
})
require.NoError(t, err)
require.Len(t, rt.selectedResetters, 1)
require.Equal(t, []string{"blop"}, selected)

err = cwid.MakePwdID(rt.binTitle, ".", 0)
require.NoError(t, err)
require.NotEmpty(t, cwid.Prefixed())
rt.progress = &ci.Progresser{}
rt.client = &fakeClient{}

scriptErr, err := rt.reset(ctx)
require.NoError(t, err)
require.Len(t, rt.selectedResetters, 1)
require.NoError(t, scriptErr)
err = cwid.MakePwdID(rt.binTitle, ".", 0)
require.NoError(t, err)
require.NotEmpty(t, cwid.Prefixed())

scriptErr, err := rt.reset(ctx)
require.NoError(t, err)
require.Len(t, rt.selectedResetters, 1)
if tst.expected != nil {
require.ErrorContains(t, scriptErr, "bla")
} else {
require.NoError(t, scriptErr)
}
})
}
}

0 comments on commit e923d79

Please sign in to comment.