Merge branch 'remove/generic-args' into 'main'

refactor: remove commandargs.GenericArgs

Closes #212

See merge request gitlab-org/gitlab-shell!506

2 files changed, 9 insertions, 7 deletions

diff --git a/internal/executable/executable.go b/internal/executable/executable.go
index c6355b9..8b6b586 100644
--- a/internal/executable/executable.go
+++ b/internal/executable/executable.go
@@ -14,8 +14,9 @@ const (
 )
 
 type Executable struct {
-	Name    string
-	RootDir string
+	Name       string
+	RootDir    string
+	AcceptArgs bool
 }
 
 var (
@@ -23,7 +24,7 @@ var (
 	osExecutable = os.Executable
 )
 
-func New(name string) (*Executable, error) {
+func New(name string, acceptArgs bool) (*Executable, error) {
 	path, err := osExecutable()
 	if err != nil {
 		return nil, err
@@ -35,8 +36,9 @@ func New(name string) (*Executable, error) {
 	}
 
 	executable := &Executable{
-		Name:    name,
-		RootDir: rootDir,
+		Name:       name,
+		RootDir:    rootDir,
+		AcceptArgs: acceptArgs,
 	}
 
 	return executable, nil
diff --git a/internal/executable/executable_test.go b/internal/executable/executable_test.go
index 3915f1a..71984c3 100644
--- a/internal/executable/executable_test.go
+++ b/internal/executable/executable_test.go
@@ -59,7 +59,7 @@ func TestNewSuccess(t *testing.T) {
 			fake.Setup()
 			defer fake.Cleanup()
 
-			result, err := New("gitlab-shell")
+			result, err := New("gitlab-shell", true)
 
 			require.NoError(t, err)
 			require.Equal(t, result.Name, "gitlab-shell")
@@ -96,7 +96,7 @@ func TestNewFailure(t *testing.T) {
 			fake.Setup()
 			defer fake.Cleanup()
 
-			_, err := New("gitlab-shell")
+			_, err := New("gitlab-shell", true)
 
 			require.Error(t, err)
 		})