From 97784445ca52d28165eb39bdd387143396e2246a Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Wed, 31 Jan 2024 00:03:01 +0100 Subject: [PATCH] Move to internal --- cmd/build.go | 2 +- cmd/eval.go | 2 +- cmd/list.go | 2 +- cmd/run.go | 12 ++++++------ cmd/status.go | 4 ++-- {config => internal/config}/config.go | 2 +- {config => internal/config}/config_test.go | 2 +- {config => internal/config}/configuration.yaml | 0 {config => internal/config}/secret | 0 {deployment => internal/deployment}/deployment.go | 2 +- .../deployment}/deployment_test.go | 0 {generation => internal/generation}/generation.go | 2 +- .../generation}/generation_test.go | 2 +- .../generation}/generations.go | 0 {http => internal/http}/http.go | 2 +- {manager => internal/manager}/manager.go | 10 +++++----- {manager => internal/manager}/manager_test.go | 4 ++-- {nix => internal/nix}/nix.go | 0 {poller => internal/poller}/poller.go | 4 ++-- {repository => internal/repository}/git.go | 2 +- {repository => internal/repository}/git_test.go | 2 +- {repository => internal/repository}/repository.go | 2 +- .../repository}/repository_status.go | 2 +- .../repository}/repository_test.go | 15 +++------------ {types => internal/types}/types.go | 0 {utils => internal/utils}/utils.go | 0 {utils => internal/utils}/utils_test.go | 0 main.go | 2 +- 28 files changed, 34 insertions(+), 43 deletions(-) rename {config => internal/config}/config.go (96%) rename {config => internal/config}/config_test.go (95%) rename {config => internal/config}/configuration.yaml (100%) rename {config => internal/config}/secret (100%) rename {deployment => internal/deployment}/deployment.go (97%) rename {deployment => internal/deployment}/deployment_test.go (100%) rename {generation => internal/generation}/generation.go (98%) rename {generation => internal/generation}/generation_test.go (96%) rename {generation => internal/generation}/generations.go (100%) rename {http => internal/http}/http.go (95%) rename {manager => internal/manager}/manager.go (96%) rename {manager => internal/manager}/manager_test.go (97%) rename {nix => internal/nix}/nix.go (100%) rename {poller => internal/poller}/poller.go (87%) rename {repository => internal/repository}/git.go (99%) rename {repository => internal/repository}/git_test.go (98%) rename {repository => internal/repository}/repository.go (99%) rename {repository => internal/repository}/repository_status.go (98%) rename {repository => internal/repository}/repository_test.go (98%) rename {types => internal/types}/types.go (100%) rename {utils => internal/utils}/utils.go (100%) rename {utils => internal/utils}/utils_test.go (100%) diff --git a/cmd/build.go b/cmd/build.go index 3103fdb..88088b1 100644 --- a/cmd/build.go +++ b/cmd/build.go @@ -3,7 +3,7 @@ package cmd import ( "context" - "github.com/nlewo/comin/nix" + "github.com/nlewo/comin/internal/nix" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/eval.go b/cmd/eval.go index afebc1d..2719f9f 100644 --- a/cmd/eval.go +++ b/cmd/eval.go @@ -3,7 +3,7 @@ package cmd import ( "context" - "github.com/nlewo/comin/nix" + "github.com/nlewo/comin/internal/nix" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/list.go b/cmd/list.go index 86da634..f852429 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -2,7 +2,7 @@ package cmd import ( "fmt" - "github.com/nlewo/comin/nix" + "github.com/nlewo/comin/internal/nix" "github.com/spf13/cobra" ) diff --git a/cmd/run.go b/cmd/run.go index 502c5cf..4c91b69 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -3,12 +3,12 @@ package cmd import ( "os" - "github.com/nlewo/comin/config" - "github.com/nlewo/comin/http" - "github.com/nlewo/comin/manager" - "github.com/nlewo/comin/poller" - "github.com/nlewo/comin/repository" - "github.com/nlewo/comin/utils" + "github.com/nlewo/comin/internal/config" + "github.com/nlewo/comin/internal/http" + "github.com/nlewo/comin/internal/manager" + "github.com/nlewo/comin/internal/poller" + "github.com/nlewo/comin/internal/repository" + "github.com/nlewo/comin/internal/utils" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/status.go b/cmd/status.go index f7539b8..54dc96b 100644 --- a/cmd/status.go +++ b/cmd/status.go @@ -9,8 +9,8 @@ import ( "github.com/dustin/go-humanize" - "github.com/nlewo/comin/manager" - "github.com/nlewo/comin/utils" + "github.com/nlewo/comin/internal/manager" + "github.com/nlewo/comin/internal/utils" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/config/config.go b/internal/config/config.go similarity index 96% rename from config/config.go rename to internal/config/config.go index 6e07f7b..09ddc50 100644 --- a/config/config.go +++ b/internal/config/config.go @@ -1,7 +1,7 @@ package config import ( - "github.com/nlewo/comin/types" + "github.com/nlewo/comin/internal/types" "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" "os" diff --git a/config/config_test.go b/internal/config/config_test.go similarity index 95% rename from config/config_test.go rename to internal/config/config_test.go index 11dbc70..76a4015 100644 --- a/config/config_test.go +++ b/internal/config/config_test.go @@ -1,7 +1,7 @@ package config import ( - "github.com/nlewo/comin/types" + "github.com/nlewo/comin/internal/types" "github.com/stretchr/testify/assert" "testing" ) diff --git a/config/configuration.yaml b/internal/config/configuration.yaml similarity index 100% rename from config/configuration.yaml rename to internal/config/configuration.yaml diff --git a/config/secret b/internal/config/secret similarity index 100% rename from config/secret rename to internal/config/secret diff --git a/deployment/deployment.go b/internal/deployment/deployment.go similarity index 97% rename from deployment/deployment.go rename to internal/deployment/deployment.go index 5d2e9f6..6c56944 100644 --- a/deployment/deployment.go +++ b/internal/deployment/deployment.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/nlewo/comin/generation" + "github.com/nlewo/comin/internal/generation" "github.com/sirupsen/logrus" ) diff --git a/deployment/deployment_test.go b/internal/deployment/deployment_test.go similarity index 100% rename from deployment/deployment_test.go rename to internal/deployment/deployment_test.go diff --git a/generation/generation.go b/internal/generation/generation.go similarity index 98% rename from generation/generation.go rename to internal/generation/generation.go index 10c8a76..83ed828 100644 --- a/generation/generation.go +++ b/internal/generation/generation.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/nlewo/comin/repository" + "github.com/nlewo/comin/internal/repository" ) // We consider each created genration is legit to be deployed: hard diff --git a/generation/generation_test.go b/internal/generation/generation_test.go similarity index 96% rename from generation/generation_test.go rename to internal/generation/generation_test.go index 2805ed8..c64d4f5 100644 --- a/generation/generation_test.go +++ b/internal/generation/generation_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/nlewo/comin/repository" + "github.com/nlewo/comin/internal/repository" "github.com/stretchr/testify/assert" ) diff --git a/generation/generations.go b/internal/generation/generations.go similarity index 100% rename from generation/generations.go rename to internal/generation/generations.go diff --git a/http/http.go b/internal/http/http.go similarity index 95% rename from http/http.go rename to internal/http/http.go index f5509eb..e248568 100644 --- a/http/http.go +++ b/internal/http/http.go @@ -7,7 +7,7 @@ import ( "net/http" "os" - "github.com/nlewo/comin/manager" + "github.com/nlewo/comin/internal/manager" "github.com/sirupsen/logrus" ) diff --git a/manager/manager.go b/internal/manager/manager.go similarity index 96% rename from manager/manager.go rename to internal/manager/manager.go index e031b81..3730c78 100644 --- a/manager/manager.go +++ b/internal/manager/manager.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/nlewo/comin/deployment" - "github.com/nlewo/comin/generation" - "github.com/nlewo/comin/nix" - "github.com/nlewo/comin/repository" - "github.com/nlewo/comin/utils" + "github.com/nlewo/comin/internal/deployment" + "github.com/nlewo/comin/internal/generation" + "github.com/nlewo/comin/internal/nix" + "github.com/nlewo/comin/internal/repository" + "github.com/nlewo/comin/internal/utils" "github.com/sirupsen/logrus" ) diff --git a/manager/manager_test.go b/internal/manager/manager_test.go similarity index 97% rename from manager/manager_test.go rename to internal/manager/manager_test.go index 29ad119..ca712ba 100644 --- a/manager/manager_test.go +++ b/internal/manager/manager_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/nlewo/comin/deployment" - "github.com/nlewo/comin/repository" + "github.com/nlewo/comin/internal/deployment" + "github.com/nlewo/comin/internal/repository" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/nix/nix.go b/internal/nix/nix.go similarity index 100% rename from nix/nix.go rename to internal/nix/nix.go diff --git a/poller/poller.go b/internal/poller/poller.go similarity index 87% rename from poller/poller.go rename to internal/poller/poller.go index 7a9ff5e..5e59a62 100644 --- a/poller/poller.go +++ b/internal/poller/poller.go @@ -3,8 +3,8 @@ package poller import ( "time" - "github.com/nlewo/comin/manager" - "github.com/nlewo/comin/types" + "github.com/nlewo/comin/internal/manager" + "github.com/nlewo/comin/internal/types" "github.com/sirupsen/logrus" ) diff --git a/repository/git.go b/internal/repository/git.go similarity index 99% rename from repository/git.go rename to internal/repository/git.go index aa6d551..8bdf595 100644 --- a/repository/git.go +++ b/internal/repository/git.go @@ -7,7 +7,7 @@ import ( "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" "github.com/go-git/go-git/v5/plumbing/transport/http" - "github.com/nlewo/comin/types" + "github.com/nlewo/comin/internal/types" "github.com/sirupsen/logrus" "io/ioutil" ) diff --git a/repository/git_test.go b/internal/repository/git_test.go similarity index 98% rename from repository/git_test.go rename to internal/repository/git_test.go index 53ff5d0..1b32a04 100644 --- a/repository/git_test.go +++ b/internal/repository/git_test.go @@ -4,7 +4,7 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" - // "github.com/nlewo/comin/types" + // "github.com/nlewo/comin/internal/types" "github.com/stretchr/testify/assert" "io/ioutil" "path/filepath" diff --git a/repository/repository.go b/internal/repository/repository.go similarity index 99% rename from repository/repository.go rename to internal/repository/repository.go index b15b313..604fb9c 100644 --- a/repository/repository.go +++ b/internal/repository/repository.go @@ -7,7 +7,7 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" - "github.com/nlewo/comin/types" + "github.com/nlewo/comin/internal/types" "github.com/sirupsen/logrus" ) diff --git a/repository/repository_status.go b/internal/repository/repository_status.go similarity index 98% rename from repository/repository_status.go rename to internal/repository/repository_status.go index 9eee203..942433d 100644 --- a/repository/repository_status.go +++ b/internal/repository/repository_status.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" deepcopy "github.com/barkimedes/go-deepcopy" - "github.com/nlewo/comin/types" + "github.com/nlewo/comin/internal/types" "time" ) diff --git a/repository/repository_test.go b/internal/repository/repository_test.go similarity index 98% rename from repository/repository_test.go rename to internal/repository/repository_test.go index 61116ae..e7e1a09 100644 --- a/repository/repository_test.go +++ b/internal/repository/repository_test.go @@ -1,21 +1,12 @@ package repository import ( - // "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" - // "github.com/go-git/go-git/v5/plumbing/object" - "github.com/nlewo/comin/types" + "github.com/nlewo/comin/internal/types" "github.com/stretchr/testify/assert" - // "io/ioutil" - // "path/filepath" "testing" - // "time" ) -// func TestNew(t *testing.T) { - -// } - func TestNew(t *testing.T) { var err error r1Dir := t.TempDir() @@ -24,7 +15,7 @@ func TestNew(t *testing.T) { gitConfig := types.GitConfig{ Path: cominRepositoryDir, Remotes: []types.Remote{ - types.Remote{ + { Name: "r1", URL: r1Dir, Branches: types.Branches{ @@ -52,7 +43,7 @@ func TestPreferMain(t *testing.T) { gitConfig := types.GitConfig{ Path: cominRepositoryDir, Remotes: []types.Remote{ - types.Remote{ + { Name: "r1", URL: r1Dir, Branches: types.Branches{ diff --git a/types/types.go b/internal/types/types.go similarity index 100% rename from types/types.go rename to internal/types/types.go diff --git a/utils/utils.go b/internal/utils/utils.go similarity index 100% rename from utils/utils.go rename to internal/utils/utils.go diff --git a/utils/utils_test.go b/internal/utils/utils_test.go similarity index 100% rename from utils/utils_test.go rename to internal/utils/utils_test.go diff --git a/main.go b/main.go index 516b270..0af57fd 100644 --- a/main.go +++ b/main.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright © 2023 Antoine Eiche */ package main