Move to internal

nlewo · Jan 30, 2024 · 9778444 · 9778444
1 parent cef7b0f
commit 9778444
Show file tree

Hide file tree

Showing 28 changed files with 34 additions and 43 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 → internal/config/config.go b/config/config.go → 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 → internal/config/config_test.go b/config/config_test.go → 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 → internal/config/configuration.yaml b/config/configuration.yaml → internal/config/configuration.yaml
diff --git a/config/secret → internal/config/secret b/config/secret → internal/config/secret
diff --git a/deployment/deployment.go → internal/deployment/deployment.go b/deployment/deployment.go → 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 → internal/deployment/deployment_test.go b/deployment/deployment_test.go → internal/deployment/deployment_test.go
diff --git a/generation/generation.go → internal/generation/generation.go b/generation/generation.go → 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 → internal/generation/generation_test.go b/generation/generation_test.go → 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 → internal/generation/generations.go b/generation/generations.go → internal/generation/generations.go
diff --git a/http/http.go → internal/http/http.go b/http/http.go → 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 → internal/manager/manager.go b/manager/manager.go → 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 → internal/manager/manager_test.go b/manager/manager_test.go → 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 → internal/nix/nix.go b/nix/nix.go → internal/nix/nix.go
diff --git a/poller/poller.go → internal/poller/poller.go b/poller/poller.go → 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 → internal/repository/git.go b/repository/git.go → 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 → internal/repository/git_test.go b/repository/git_test.go → 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 → internal/repository/repository.go b/repository/repository.go → 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 → internal/repository/repository_status.go b/repository/repository_status.go → 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 → internal/repository/repository_test.go b/repository/repository_test.go → 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 → internal/types/types.go b/types/types.go → internal/types/types.go
diff --git a/utils/utils.go → internal/utils/utils.go b/utils/utils.go → internal/utils/utils.go
diff --git a/utils/utils_test.go → internal/utils/utils_test.go b/utils/utils_test.go → internal/utils/utils_test.go
diff --git a/main.go b/main.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2022 NAME HERE <EMAIL ADDRESS>
+Copyright © 2023 Antoine Eiche <[email protected]>
 */
 package main
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@