feat: Added new mockery package config. Added shell command action.

Author: eddieowens

.editorconfig

@@ -0,0 +1,4 @@
+root = true
+
+[*]
+end_of_line = lf

.mockery.yaml

@@ -1,11 +1,12 @@
 recursive: true
 all: true
+dir: "pkg/mocks/{{.PackageName}}mocks"
 filename: "mock_{{.InterfaceNameSnake}}.go"
 mockname: "{{.InterfaceName}}"
-outpkg: "{{base .PackageName}}mocks"
+outpkg: "{{.PackageName}}mocks"
 with-expecter: true
-dir: "pkg/mocks/{{.PackageName}}mocks"
 packages:
-  "github.com/hostfactor/diazo/pkg/userfiles":
-    config:
-      recursive: false
+  github.com/hostfactor/diazo/pkg/userfiles:
+    config: { }
+  github.com/hostfactor/diazo/pkg/actions:
+    config: { }

go.mod

@@ -1,6 +1,6 @@
 module github.com/hostfactor/diazo
 
-go 1.20
+go 1.21
 
 require (
 	github.com/bxcodec/faker/v3 v3.8.0
@@ -11,7 +11,7 @@ require (
 	github.com/fsnotify/fsnotify v1.5.4
 	github.com/golang/protobuf v1.5.2
 	github.com/google/go-cmp v0.5.6
-	github.com/hostfactor/api/go v0.0.0-20230924204613-3eb5c78315d1
+	github.com/hostfactor/api/go v0.0.0-20231105200036-e2dbc3bafb8b
 	github.com/json-iterator/go v1.1.12
 	github.com/mattn/go-zglob v0.0.3
 	github.com/mholt/archiver/v3 v3.5.1

go.sum

@@ -578,6 +578,10 @@ github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKEN
 github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
 github.com/hostfactor/api/go v0.0.0-20230924204613-3eb5c78315d1 h1:um6z8aaa6wKe1JNelbNQRR/e5Q6nGMVyWL/NFHFb+NA=
 github.com/hostfactor/api/go v0.0.0-20230924204613-3eb5c78315d1/go.mod h1:BPl1fWTa0458aaL3TqjwbU7lgKgewJtUhoxfTMARMKM=
+github.com/hostfactor/api/go v0.0.0-20231104050646-334b46352923 h1:nGAG3LQct5u7gKZFSiwYCSk3sKL8l8xVOaQ7PmednPM=
+github.com/hostfactor/api/go v0.0.0-20231104050646-334b46352923/go.mod h1:BPl1fWTa0458aaL3TqjwbU7lgKgewJtUhoxfTMARMKM=
+github.com/hostfactor/api/go v0.0.0-20231105200036-e2dbc3bafb8b h1:Mov/utmfZxmQ3yNIrAoNbTkSs2nnLgYHCJtWjfBQ6rQ=
+github.com/hostfactor/api/go v0.0.0-20231105200036-e2dbc3bafb8b/go.mod h1:BPl1fWTa0458aaL3TqjwbU7lgKgewJtUhoxfTMARMKM=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

pkg/actions/fileactions/client.go pkg/actions/client.go

@@ -1,7 +1,8 @@
-package fileactions
+package actions
 
 import (
 	"archive/zip"
+	"context"
 	"fmt"
 	"github.com/hostfactor/api/go/blueprint/actions"
 	"github.com/hostfactor/api/go/blueprint/filesystem"
@@ -12,6 +13,7 @@ import (
 	"io"
 	"io/fs"
 	"os"
+	"os/exec"
 	"path"
 	"path/filepath"
 )
@@ -26,6 +28,7 @@ type Client interface {
 	Upload(root string, u *actions.UploadFile, opts UploadOpts) error
 	Zip(z *actions.ZipFile) error
 	MoveFile(a *actions.MoveFile) error
+	Shell(ctx context.Context, a *actions.Shell) ([]byte, error)
 }
 
 type OnError func(err error)
@@ -84,12 +87,21 @@ type OnDownloadFuncParams struct {
 
 type OnDownloadFunc func(params OnDownloadFuncParams)
 
+func New(c userfiles.Client) Client {
+	return &client{UserfilesClient: c}
+}
+
 type client struct {
 	UserfilesClient userfiles.Client
 }
 
-func New(c userfiles.Client) Client {
-	return &client{UserfilesClient: c}
+func (i *client) Shell(ctx context.Context, a *actions.Shell) ([]byte, error) {
+	cmd := exec.CommandContext(ctx, "/bin/sh", "-c", a.GetCommand())
+	if cmd.Err != nil {
+		return nil, cmd.Err
+	}
+
+	return cmd.CombinedOutput()
 }
 
 func (i *client) MoveFile(a *actions.MoveFile) error {
@@ -183,6 +195,10 @@ func Move(file *actions.MoveFile) error {
 	return Default.MoveFile(file)
 }
 
+func Shell(ctx context.Context, a *actions.Shell) ([]byte, error) {
+	return Default.Shell(ctx, a)
+}
+
 func move(fp fs.FS, f *actions.MoveFile) error {
 	found, err := Find(fp, f.GetFrom().GetMatches())
 	if err != nil {

pkg/actions/fileactions/client_test.go pkg/actions/client_test.go

@@ -1,4 +1,4 @@
-package fileactions
+package actions
 
 import (
 	"bytes"
@@ -7,9 +7,9 @@ import (
 	"github.com/hostfactor/api/go/blueprint/actions"
 	"github.com/hostfactor/api/go/blueprint/filesystem"
 	"github.com/hostfactor/diazo/pkg/fileutils"
+	"github.com/hostfactor/diazo/pkg/mocks/userfilesmocks"
 	"github.com/hostfactor/diazo/pkg/testutils"
 	"github.com/hostfactor/diazo/pkg/userfiles"
-	"github.com/hostfactor/diazo/pkg/userfiles/mocks"
 	"github.com/stretchr/testify/suite"
 	"io"
 	"io/fs"
@@ -24,12 +24,12 @@ import (
 type ClientTestSuite struct {
 	suite.Suite
 
-	UserfilesClient *mocks.Client
+	UserfilesClient *userfilesmocks.Client
 	Svc             *client
 }
 
 func (p *ClientTestSuite) BeforeTest(_, _ string) {
-	p.UserfilesClient = new(mocks.Client)
+	p.UserfilesClient = new(userfilesmocks.Client)
 	p.Svc = &client{UserfilesClient: p.UserfilesClient}
 	fileutils.IsTest = true
 	Default = p.Svc
@@ -536,7 +536,7 @@ func (p *ClientTestSuite) TestDownload() {
 		v.After(dir)
 		p.Equal(v.ExpectedError, err, "test %d", i)
 		p.UserfilesClient.AssertExpectations(p.T())
-		p.UserfilesClient = new(mocks.Client)
+		p.UserfilesClient = new(userfilesmocks.Client)
 		p.Svc.UserfilesClient = p.UserfilesClient
 	}
 }
@@ -603,7 +603,7 @@ func (p *ClientTestSuite) TestUpload() {
 		v.After(b)
 		p.Equal(err, v.ExpectedError, "test %d", i)
 		p.UserfilesClient.AssertExpectations(p.T())
-		p.UserfilesClient = new(mocks.Client)
+		p.UserfilesClient = new(userfilesmocks.Client)
 		p.Svc.UserfilesClient = p.UserfilesClient
 	}
 }

pkg/actions/fileactions/mocks/client.go

@@ -1,4 +1,4 @@
-package fileactions
+package actions
 
 import (
 	"github.com/hostfactor/api/go/blueprint/filesystem"