Move packages to internal

muhammedikinci · Feb 10, 2024 · 854e39c · 854e39c
1 parent 4495655
commit 854e39c
Show file tree

Hide file tree

Showing 21 changed files with 18 additions and 19 deletions.
diff --git a/cmd/cli/cmd/apply.go b/cmd/cli/cmd/apply.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	pin "github.com/muhammedikinci/pin/pkg"
+	"github.com/muhammedikinci/pin/internal/runner"
 	"github.com/spf13/cobra"
 )
 
@@ -19,7 +19,7 @@ Cobra is a CLI library for Go that empowers applications.
 This application is a tool to generate the needed files
 to quickly create a Cobra application.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		pin.Apply(pipelineName, pipelineFilePath)
+		runner.Apply(pipelineFilePath)
 	},
 }
 

diff --git a/pkg/container_manager/container_manager.go → ...al/container_manager/container_manager.go b/pkg/container_manager/container_manager.go → ...al/container_manager/container_manager.go
@@ -16,7 +16,7 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/go-connections/nat"
 	"github.com/fatih/color"
-	"github.com/muhammedikinci/pin/pkg/interfaces"
+	"github.com/muhammedikinci/pin/internal/interfaces"
 )
 
 type containerManager struct {

diff --git a/...ntainer_manager/container_manager_test.go → ...ntainer_manager/container_manager_test.go b/...ntainer_manager/container_manager_test.go → ...ntainer_manager/container_manager_test.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/docker/docker/api/types/container"
 	"github.com/golang/mock/gomock"
-	"github.com/muhammedikinci/pin/pkg/mocks"
+	"github.com/muhammedikinci/pin/internal/mocks"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/image_manager/image_manager.go → internal/image_manager/image_manager.go b/pkg/image_manager/image_manager.go → internal/image_manager/image_manager.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/fatih/color"
-	"github.com/muhammedikinci/pin/pkg/interfaces"
+	"github.com/muhammedikinci/pin/internal/interfaces"
 )
 
 func NewImageManager(cli interfaces.Client, log interfaces.Log) imageManager {

diff --git a/pkg/image_manager/image_manager_test.go → internal/image_manager/image_manager_test.go b/pkg/image_manager/image_manager_test.go → internal/image_manager/image_manager_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/golang/mock/gomock"
-	"github.com/muhammedikinci/pin/pkg/mocks"
+	"github.com/muhammedikinci/pin/internal/mocks"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/interfaces/client.go → internal/interfaces/client.go b/pkg/interfaces/client.go → internal/interfaces/client.go
diff --git a/pkg/interfaces/container_manager.go → internal/interfaces/container_manager.go b/pkg/interfaces/container_manager.go → internal/interfaces/container_manager.go
diff --git a/pkg/interfaces/image_manager.go → internal/interfaces/image_manager.go b/pkg/interfaces/image_manager.go → internal/interfaces/image_manager.go
diff --git a/pkg/interfaces/log.go → internal/interfaces/log.go b/pkg/interfaces/log.go → internal/interfaces/log.go
diff --git a/pkg/interfaces/shell_commander.go → internal/interfaces/shell_commander.go b/pkg/interfaces/shell_commander.go → internal/interfaces/shell_commander.go
diff --git a/pkg/mocks/mock_client.go → internal/mocks/mock_client.go b/pkg/mocks/mock_client.go → internal/mocks/mock_client.go
diff --git a/pkg/mocks/mock_container_manager.go → internal/mocks/mock_container_manager.go b/pkg/mocks/mock_container_manager.go → internal/mocks/mock_container_manager.go
diff --git a/pkg/mocks/mock_image_manager.go → internal/mocks/mock_image_manager.go b/pkg/mocks/mock_image_manager.go → internal/mocks/mock_image_manager.go
diff --git a/pkg/mocks/mock_log.go → internal/mocks/mock_log.go b/pkg/mocks/mock_log.go → internal/mocks/mock_log.go
diff --git a/pkg/mocks/mock_shell_commander.go → internal/mocks/mock_shell_commander.go b/pkg/mocks/mock_shell_commander.go → internal/mocks/mock_shell_commander.go
diff --git a/pkg/apply.go → internal/runner/apply.go b/pkg/apply.go → internal/runner/apply.go
@@ -1,4 +1,4 @@
-package pin
+package runner
 
 import (
 	"bytes"
@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-func Apply(name string, filepath string) error {
+func Apply(filepath string) error {
 	if err := checkFileExists(filepath); err != nil {
 		return err
 	}

diff --git a/pkg/job.go → internal/runner/job.go b/pkg/job.go → internal/runner/job.go
@@ -1,10 +1,10 @@
-package pin
+package runner
 
 import (
 	"log"
 
 	"github.com/docker/docker/api/types/container"
-	"github.com/muhammedikinci/pin/pkg/interfaces"
+	"github.com/muhammedikinci/pin/internal/interfaces"
 )
 
 type Job struct {

diff --git a/pkg/parser.go → internal/runner/parser.go b/pkg/parser.go → internal/runner/parser.go
@@ -1,4 +1,4 @@
-package pin
+package runner
 
 import (
 	"errors"

diff --git a/pkg/runner.go → internal/runner/runner.go b/pkg/runner.go → internal/runner/runner.go
@@ -1,12 +1,11 @@
-package pin
+package runner
 
 import (
 	"archive/tar"
 	"context"
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/signal"
@@ -17,10 +16,10 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
 	"github.com/fatih/color"
-	"github.com/muhammedikinci/pin/pkg/container_manager"
-	"github.com/muhammedikinci/pin/pkg/image_manager"
-	"github.com/muhammedikinci/pin/pkg/interfaces"
-	"github.com/muhammedikinci/pin/pkg/shell_commander"
+	"github.com/muhammedikinci/pin/internal/container_manager"
+	"github.com/muhammedikinci/pin/internal/image_manager"
+	"github.com/muhammedikinci/pin/internal/interfaces"
+	"github.com/muhammedikinci/pin/internal/shell_commander"
 )
 
 type Runner struct {
@@ -212,7 +211,7 @@ func (r Runner) commandRunner(command string, name string, currentJob Job) error
 		if reader, _, err := r.cli.CopyFromContainer(r.ctx, currentJob.Container.ID, "/shell_command_output.log"); err == nil {
 			tr := tar.NewReader(reader)
 			tr.Next()
-			b, _ := ioutil.ReadAll(tr)
+			b, _ := io.ReadAll(tr)
 			fmt.Println("\n" + string(b))
 		}
 		color.Unset()
@@ -235,7 +234,7 @@ func (r Runner) commandRunner(command string, name string, currentJob Job) error
 	if reader, _, err := r.cli.CopyFromContainer(r.ctx, currentJob.Container.ID, "/shell_command_output.log"); err == nil {
 		tr := tar.NewReader(reader)
 		tr.Next()
-		b, _ := ioutil.ReadAll(tr)
+		b, _ := io.ReadAll(tr)
 
 		if len(b) != 0 {
 			color.Set(color.FgGreen)

diff --git a/pkg/shell_commander/shell_commander.go → internal/shell_commander/shell_commander.go b/pkg/shell_commander/shell_commander.go → internal/shell_commander/shell_commander.go
diff --git a/pkg/shell_commander/shell_commander_test.go → ...l/shell_commander/shell_commander_test.go b/pkg/shell_commander/shell_commander_test.go → ...l/shell_commander/shell_commander_test.go