move internal/executable/os/exec to pkg/execute/exec

apenella · Aug 16, 2024 · 96159a2 · 96159a2
1 parent 8b11ab6
commit 96159a2
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -26,7 +26,6 @@ vet: ## Executes the go vet
 	@echo "$(COLOR_GREEN) Executing go vet $(COLOR_END)"
 	@echo
 	@$(GOLANG_BINARY) vet ./pkg/...
-	@$(GOLANG_BINARY) vet ./internal/...
 
 golangci-lint: ## Executes golangci-lint
 	@echo
@@ -39,7 +38,6 @@ unit-test: ## Run unit tests
 	@echo "$(COLOR_GREEN) Running unit tests...$(COLOR_END)"
 	@echo
 	@$(GOLANG_BINARY) test ./pkg/... -cover -count=1
-	@$(GOLANG_BINARY) test ./internal/... -cover -count=1
 
 list-examples: ## List all examples
 	@echo

diff --git a/examples/ansibleplaybook-embed-python/ansibleplaybook-embed-python.go b/examples/ansibleplaybook-embed-python/ansibleplaybook-embed-python.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 
 	"github.com/apenella/go-ansible/v2/examples/ansibleplaybook-embed-python/internal/ansibleplaybook-embed-python/data"
-	executable "github.com/apenella/go-ansible/v2/internal/executable/os/exec"
 	"github.com/apenella/go-ansible/v2/pkg/execute"
+	executable "github.com/apenella/go-ansible/v2/pkg/execute/exec"
 	"github.com/apenella/go-ansible/v2/pkg/playbook"
 	"github.com/kluctl/go-embed-python/embed_util"
 	"github.com/kluctl/go-embed-python/python"

diff --git a/pkg/execute/defaultExecute.go b/pkg/execute/defaultExecute.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/apenella/go-ansible/v2/internal/executable/os/exec"
+	"github.com/apenella/go-ansible/v2/pkg/execute/exec"
 	"github.com/apenella/go-ansible/v2/pkg/execute/result"
 	defaultresults "github.com/apenella/go-ansible/v2/pkg/execute/result/default"
 	"github.com/apenella/go-ansible/v2/pkg/execute/result/transformer"

diff --git a/pkg/execute/defaultExecuteOptions_test.go b/pkg/execute/defaultExecuteOptions_test.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/apenella/go-ansible/v2/internal/executable/os/exec"
 	"github.com/apenella/go-ansible/v2/mocks"
+	"github.com/apenella/go-ansible/v2/pkg/execute/exec"
 	defaultresults "github.com/apenella/go-ansible/v2/pkg/execute/result/default"
 	"github.com/apenella/go-ansible/v2/pkg/execute/result/transformer"
 	"github.com/stretchr/testify/assert"

diff --git a/pkg/execute/defaultExecute_test.go b/pkg/execute/defaultExecute_test.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/apenella/go-ansible/v2/internal/executable/os/exec"
 	"github.com/apenella/go-ansible/v2/mocks"
+	"github.com/apenella/go-ansible/v2/pkg/execute/exec"
 	defaultresults "github.com/apenella/go-ansible/v2/pkg/execute/result/default"
 	"github.com/apenella/go-ansible/v2/pkg/execute/result/transformer"
 	errors "github.com/apenella/go-common-utils/error"

diff --git a/internal/executable/os/exec/cmd.go → pkg/execute/exec/cmd.go b/internal/executable/os/exec/cmd.go → pkg/execute/exec/cmd.go
diff --git a/internal/executable/os/exec/exec.go → pkg/execute/exec/exec.go b/internal/executable/os/exec/exec.go → pkg/execute/exec/exec.go
diff --git a/internal/executable/os/exec/interface.go → pkg/execute/exec/interface.go b/internal/executable/os/exec/interface.go → pkg/execute/exec/interface.go
diff --git a/internal/executable/os/exec/mockCmd.go → pkg/execute/exec/mockCmd.go b/internal/executable/os/exec/mockCmd.go → pkg/execute/exec/mockCmd.go
diff --git a/internal/executable/os/exec/mockExec.go → pkg/execute/exec/mockExec.go b/internal/executable/os/exec/mockExec.go → pkg/execute/exec/mockExec.go
diff --git a/pkg/execute/interface.go b/pkg/execute/interface.go
@@ -3,7 +3,7 @@ package execute
 import (
 	"context"
 
-	"github.com/apenella/go-ansible/v2/internal/executable/os/exec"
+	"github.com/apenella/go-ansible/v2/pkg/execute/exec"
 )
 
 // Executor interface to execute commands