refactor package structure

redradrat · Oct 15, 2020 · 0e8b47b · 0e8b47b
1 parent c8138d3
commit 0e8b47b
Show file tree

Hide file tree

Showing 21 changed files with 23 additions and 24 deletions.
diff --git a/cmd/addRepo.go b/cmd/addRepo.go
@@ -21,9 +21,8 @@ import (
 	"os"
 	"regexp"
 
-	"github.com/redradrat/kable/repositories"
-
-	errors2 "github.com/redradrat/kable/errors"
+	kableerrors "github.com/redradrat/kable/pkg/errors"
+	"github.com/redradrat/kable/pkg/repositories"
 
 	"github.com/spf13/cobra"
 )
@@ -62,7 +61,7 @@ var addRepoCmd = &cobra.Command{
 				}
 				err = repositories.AddAuthRepository(name, repoUrl, user, pw, "master")
 				if err != nil {
-					if !errors.Is(err, errors2.RepositoryAlreadyExistsError) {
+					if !errors.Is(err, kableerrors.RepositoryAlreadyExistsError) {
 						PrintError("unable to add repository: %s", err)
 					} else {
 						PrintSuccess("Repository already configured!")

diff --git a/cmd/helmConcept.go b/cmd/helmConcept.go
@@ -18,7 +18,7 @@ package cmd
 import (
 	"errors"
 
-	"github.com/redradrat/kable/helm"
+	"github.com/redradrat/kable/pkg/helm"
 
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/helmImport.go b/cmd/helmImport.go
@@ -18,9 +18,9 @@ package cmd
 import (
 	"errors"
 
-	"github.com/redradrat/kable/concepts"
+	"github.com/redradrat/kable/pkg/concepts"
 
-	"github.com/redradrat/kable/helm"
+	"github.com/redradrat/kable/pkg/helm"
 
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/initConcept.go b/cmd/initConcept.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/redradrat/kable/concepts"
+	"github.com/redradrat/kable/pkg/concepts"
 
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/inputDialog.go b/cmd/inputDialog.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 
-	"github.com/redradrat/kable/concepts"
+	"github.com/redradrat/kable/pkg/concepts"
 )
 
 type InputDialog struct {

diff --git a/cmd/listConcept.go b/cmd/listConcept.go
@@ -16,7 +16,7 @@ limitations under the License.
 package cmd
 
 import (
-	concepts2 "github.com/redradrat/kable/concepts"
+	concepts2 "github.com/redradrat/kable/pkg/concepts"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/listRepo.go b/cmd/listRepo.go
@@ -18,7 +18,7 @@ package cmd
 import (
 	"strconv"
 
-	"github.com/redradrat/kable/repositories"
+	"github.com/redradrat/kable/pkg/repositories"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/removeRepo.go b/cmd/removeRepo.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 	"regexp"
 
-	"github.com/redradrat/kable/repositories"
+	"github.com/redradrat/kable/pkg/repositories"
 
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/renderConcept.go b/cmd/renderConcept.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/redradrat/kable/concepts"
+	"github.com/redradrat/kable/pkg/concepts"
 
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/root.go b/cmd/root.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/redradrat/kable/config"
+	"github.com/redradrat/kable/pkg/config"
 
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/tidyRepo.go b/cmd/tidyRepo.go
@@ -16,7 +16,7 @@ limitations under the License.
 package cmd
 
 import (
-	"github.com/redradrat/kable/repositories"
+	"github.com/redradrat/kable/pkg/repositories"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/updateRepo.go b/cmd/updateRepo.go
@@ -16,7 +16,7 @@ limitations under the License.
 package cmd
 
 import (
-	"github.com/redradrat/kable/repositories"
+	"github.com/redradrat/kable/pkg/repositories"
 	"github.com/spf13/cobra"
 )
 

diff --git a/concepts/concepts.go → pkg/concepts/concepts.go b/concepts/concepts.go → pkg/concepts/concepts.go
@@ -10,9 +10,9 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/redradrat/kable/repositories"
+	"github.com/redradrat/kable/pkg/repositories"
 
-	"github.com/redradrat/kable/errors"
+	"github.com/redradrat/kable/pkg/errors"
 
 	"github.com/go-git/go-git/v5"
 	giturls "github.com/whilp/git-urls"

diff --git a/concepts/rendering.go → pkg/concepts/rendering.go b/concepts/rendering.go → pkg/concepts/rendering.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/redradrat/kable/errors"
+	"github.com/redradrat/kable/pkg/errors"
 )
 
 const (

diff --git a/concepts/targets.go → pkg/concepts/targets.go b/concepts/targets.go → pkg/concepts/targets.go
@@ -10,7 +10,7 @@ import (
 	"github.com/grafana/tanka/pkg/process"
 	"github.com/grafana/tanka/pkg/tanka"
 
-	"github.com/redradrat/kable/errors"
+	"github.com/redradrat/kable/pkg/errors"
 )
 
 const (

diff --git a/config/config.go → pkg/config/config.go b/config/config.go → pkg/config/config.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/redradrat/kable/errors"
+	"github.com/redradrat/kable/pkg/errors"
 
 	"github.com/mitchellh/go-homedir"
 )

diff --git a/errors/errors.go → pkg/errors/errors.go b/errors/errors.go → pkg/errors/errors.go
diff --git a/helm/checkout.go → pkg/helm/checkout.go b/helm/checkout.go → pkg/helm/checkout.go
diff --git a/helm/import.go → pkg/helm/import.go b/helm/import.go → pkg/helm/import.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/grafana/tanka/pkg/helm"
 
-	"github.com/redradrat/kable/concepts"
+	"github.com/redradrat/kable/pkg/concepts"
 
 	"github.com/jsonnet-bundler/jsonnet-bundler/spec/v1/deps"
 

diff --git a/repositories/clone.go → pkg/repositories/clone.go b/repositories/clone.go → pkg/repositories/clone.go
diff --git a/repositories/repositories.go → pkg/repositories/repositories.go b/repositories/repositories.go → pkg/repositories/repositories.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/go-git/go-git/v5/plumbing/transport/http"
 
-	"github.com/redradrat/kable/config"
+	"github.com/redradrat/kable/pkg/config"
 
-	errors2 "github.com/redradrat/kable/errors"
+	errors2 "github.com/redradrat/kable/pkg/errors"
 
 	"github.com/google/uuid"
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ import ( @@
     	"fmt"
     	"os"
-    	"github.com/redradrat/kable/config"
+    	"github.com/redradrat/kable/pkg/config"
     	"github.com/spf13/cobra"
     )
@@ Expand Down @@