From 854e39cb69ba4d4416cde61a85ed7ad19ca9321b Mon Sep 17 00:00:00 2001 From: Muhammed Ikinci Date: Sat, 10 Feb 2024 15:17:56 +0300 Subject: [PATCH] Move packages to internal --- cmd/cli/cmd/apply.go | 4 ++-- .../container_manager/container_manager.go | 2 +- .../container_manager/container_manager_test.go | 2 +- {pkg => internal}/image_manager/image_manager.go | 2 +- .../image_manager/image_manager_test.go | 2 +- {pkg => internal}/interfaces/client.go | 0 {pkg => internal}/interfaces/container_manager.go | 0 {pkg => internal}/interfaces/image_manager.go | 0 {pkg => internal}/interfaces/log.go | 0 {pkg => internal}/interfaces/shell_commander.go | 0 {pkg => internal}/mocks/mock_client.go | 0 {pkg => internal}/mocks/mock_container_manager.go | 0 {pkg => internal}/mocks/mock_image_manager.go | 0 {pkg => internal}/mocks/mock_log.go | 0 {pkg => internal}/mocks/mock_shell_commander.go | 0 {pkg => internal/runner}/apply.go | 4 ++-- {pkg => internal/runner}/job.go | 4 ++-- {pkg => internal/runner}/parser.go | 2 +- {pkg => internal/runner}/runner.go | 15 +++++++-------- .../shell_commander/shell_commander.go | 0 .../shell_commander/shell_commander_test.go | 0 21 files changed, 18 insertions(+), 19 deletions(-) rename {pkg => internal}/container_manager/container_manager.go (98%) rename {pkg => internal}/container_manager/container_manager_test.go (99%) rename {pkg => internal}/image_manager/image_manager.go (96%) rename {pkg => internal}/image_manager/image_manager_test.go (98%) rename {pkg => internal}/interfaces/client.go (100%) rename {pkg => internal}/interfaces/container_manager.go (100%) rename {pkg => internal}/interfaces/image_manager.go (100%) rename {pkg => internal}/interfaces/log.go (100%) rename {pkg => internal}/interfaces/shell_commander.go (100%) rename {pkg => internal}/mocks/mock_client.go (100%) rename {pkg => internal}/mocks/mock_container_manager.go (100%) rename {pkg => internal}/mocks/mock_image_manager.go (100%) rename {pkg => internal}/mocks/mock_log.go (100%) rename {pkg => internal}/mocks/mock_shell_commander.go (100%) rename {pkg => internal/runner}/apply.go (93%) rename {pkg => internal/runner}/job.go (90%) rename {pkg => internal/runner}/parser.go (99%) rename {pkg => internal/runner}/runner.go (95%) rename {pkg => internal}/shell_commander/shell_commander.go (100%) rename {pkg => internal}/shell_commander/shell_commander_test.go (100%) diff --git a/cmd/cli/cmd/apply.go b/cmd/cli/cmd/apply.go index 888a36a..110bb06 100644 --- 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 b/internal/container_manager/container_manager.go similarity index 98% rename from pkg/container_manager/container_manager.go rename to internal/container_manager/container_manager.go index 01f7ef7..bff7d75 100644 --- a/pkg/container_manager/container_manager.go +++ b/internal/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/pkg/container_manager/container_manager_test.go b/internal/container_manager/container_manager_test.go similarity index 99% rename from pkg/container_manager/container_manager_test.go rename to internal/container_manager/container_manager_test.go index c40da8e..3823e6c 100644 --- a/pkg/container_manager/container_manager_test.go +++ b/internal/container_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 b/internal/image_manager/image_manager.go similarity index 96% rename from pkg/image_manager/image_manager.go rename to internal/image_manager/image_manager.go index 30a8ab6..b7ac92c 100644 --- a/pkg/image_manager/image_manager.go +++ b/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 b/internal/image_manager/image_manager_test.go similarity index 98% rename from pkg/image_manager/image_manager_test.go rename to internal/image_manager/image_manager_test.go index fca6643..dfd8871 100644 --- a/pkg/image_manager/image_manager_test.go +++ b/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 b/internal/interfaces/client.go similarity index 100% rename from pkg/interfaces/client.go rename to internal/interfaces/client.go diff --git a/pkg/interfaces/container_manager.go b/internal/interfaces/container_manager.go similarity index 100% rename from pkg/interfaces/container_manager.go rename to internal/interfaces/container_manager.go diff --git a/pkg/interfaces/image_manager.go b/internal/interfaces/image_manager.go similarity index 100% rename from pkg/interfaces/image_manager.go rename to internal/interfaces/image_manager.go diff --git a/pkg/interfaces/log.go b/internal/interfaces/log.go similarity index 100% rename from pkg/interfaces/log.go rename to internal/interfaces/log.go diff --git a/pkg/interfaces/shell_commander.go b/internal/interfaces/shell_commander.go similarity index 100% rename from pkg/interfaces/shell_commander.go rename to internal/interfaces/shell_commander.go diff --git a/pkg/mocks/mock_client.go b/internal/mocks/mock_client.go similarity index 100% rename from pkg/mocks/mock_client.go rename to internal/mocks/mock_client.go diff --git a/pkg/mocks/mock_container_manager.go b/internal/mocks/mock_container_manager.go similarity index 100% rename from pkg/mocks/mock_container_manager.go rename to internal/mocks/mock_container_manager.go diff --git a/pkg/mocks/mock_image_manager.go b/internal/mocks/mock_image_manager.go similarity index 100% rename from pkg/mocks/mock_image_manager.go rename to internal/mocks/mock_image_manager.go diff --git a/pkg/mocks/mock_log.go b/internal/mocks/mock_log.go similarity index 100% rename from pkg/mocks/mock_log.go rename to internal/mocks/mock_log.go diff --git a/pkg/mocks/mock_shell_commander.go b/internal/mocks/mock_shell_commander.go similarity index 100% rename from pkg/mocks/mock_shell_commander.go rename to internal/mocks/mock_shell_commander.go diff --git a/pkg/apply.go b/internal/runner/apply.go similarity index 93% rename from pkg/apply.go rename to internal/runner/apply.go index 1c5d7be..1db32e3 100644 --- a/pkg/apply.go +++ b/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 b/internal/runner/job.go similarity index 90% rename from pkg/job.go rename to internal/runner/job.go index 56e6ed7..61b827d 100644 --- a/pkg/job.go +++ b/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 b/internal/runner/parser.go similarity index 99% rename from pkg/parser.go rename to internal/runner/parser.go index b611200..76776b1 100644 --- a/pkg/parser.go +++ b/internal/runner/parser.go @@ -1,4 +1,4 @@ -package pin +package runner import ( "errors" diff --git a/pkg/runner.go b/internal/runner/runner.go similarity index 95% rename from pkg/runner.go rename to internal/runner/runner.go index cee4bd4..048d67f 100644 --- a/pkg/runner.go +++ b/internal/runner/runner.go @@ -1,4 +1,4 @@ -package pin +package runner import ( "archive/tar" @@ -6,7 +6,6 @@ import ( "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 b/internal/shell_commander/shell_commander.go similarity index 100% rename from pkg/shell_commander/shell_commander.go rename to internal/shell_commander/shell_commander.go diff --git a/pkg/shell_commander/shell_commander_test.go b/internal/shell_commander/shell_commander_test.go similarity index 100% rename from pkg/shell_commander/shell_commander_test.go rename to internal/shell_commander/shell_commander_test.go