Moving the libraries back to pkg

It actually seems to be the case that the pkg dir is a convention for CLI/cobra tools
appuio · Mar 17, 2020 · a3d0df2 · a3d0df2
1 parent 948371c
commit a3d0df2
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 14 deletions.
diff --git a/cmd/common.go b/cmd/common.go
@@ -3,8 +3,8 @@ package cmd
 import (
 	"fmt"
 	"github.com/appuio/image-cleanup/cfg"
-	"github.com/appuio/image-cleanup/git"
-	"github.com/appuio/image-cleanup/openshift"
+	"github.com/appuio/image-cleanup/pkg/git"
+	"github.com/appuio/image-cleanup/pkg/openshift"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/history.go b/cmd/history.go
@@ -3,9 +3,9 @@ package cmd
 import (
 	"fmt"
 	"github.com/appuio/image-cleanup/cfg"
-	"github.com/appuio/image-cleanup/cleanup"
-	"github.com/appuio/image-cleanup/git"
-	"github.com/appuio/image-cleanup/openshift"
+	"github.com/appuio/image-cleanup/pkg/cleanup"
+	"github.com/appuio/image-cleanup/pkg/git"
+	"github.com/appuio/image-cleanup/pkg/openshift"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/orphans.go b/cmd/orphans.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 	"github.com/appuio/image-cleanup/cfg"
-	"github.com/appuio/image-cleanup/cleanup"
-	"github.com/appuio/image-cleanup/git"
-	"github.com/appuio/image-cleanup/openshift"
+	"github.com/appuio/image-cleanup/pkg/cleanup"
+	"github.com/appuio/image-cleanup/pkg/git"
+	"github.com/appuio/image-cleanup/pkg/openshift"
 	"github.com/karrick/tparse"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

diff --git a/cleanup/cleanup.go → pkg/cleanup/cleanup.go b/cleanup/cleanup.go → pkg/cleanup/cleanup.go
@@ -2,7 +2,7 @@ package cleanup
 
 import (
 	"fmt"
-	"github.com/appuio/image-cleanup/openshift"
+	"github.com/appuio/image-cleanup/pkg/openshift"
 	imagev1 "github.com/openshift/api/image/v1"
 	log "github.com/sirupsen/logrus"
 	"github.com/thoas/go-funk"

diff --git a/cleanup/cleanup_test.go → pkg/cleanup/cleanup_test.go b/cleanup/cleanup_test.go → pkg/cleanup/cleanup_test.go
diff --git a/docker/image.go → pkg/docker/image.go b/docker/image.go → pkg/docker/image.go
diff --git a/docker/image_test.go → pkg/docker/image_test.go b/docker/image_test.go → pkg/docker/image_test.go
diff --git a/git/git.go → pkg/git/git.go b/git/git.go → pkg/git/git.go
diff --git a/git/git_test.go → pkg/git/git_test.go b/git/git_test.go → pkg/git/git_test.go
@@ -8,15 +8,15 @@ import (
 
 func Test_GetCommitHashes(t *testing.T) {
 	commitLimit := 2
-	commitHashes, err := GetCommitHashes("../", commitLimit) // Open repository from root dir
+	commitHashes, err := GetCommitHashes("../../", commitLimit) // Open repository from root dir
 
 	assert.NoError(t, err)
 	assert.Len(t, commitHashes, commitLimit)
 }
 
 func Test_GetCommitHashesAll(t *testing.T) {
 	commitLimit := -1
-	_, err := GetCommitHashes("../", commitLimit) // Open repository from root dir
+	_, err := GetCommitHashes("../../", commitLimit) // Open repository from root dir
 
 	assert.NoError(t, err)
 }
@@ -48,7 +48,7 @@ func Test_GetTagsSortedByVersion(t *testing.T) {
 
 func Test_GetAllTags(t *testing.T) {
 	commitLimit := -1
-	_, err := GetTags("../", commitLimit, "version") // Open repository from root dir
+	_, err := GetTags("../../", commitLimit, "version") // Open repository from root dir
 
 	assert.NoError(t, err)
 }

diff --git a/git/sort.go → pkg/git/sort.go b/git/sort.go → pkg/git/sort.go
diff --git a/kubernetes/basic.go → pkg/kubernetes/basic.go b/kubernetes/basic.go → pkg/kubernetes/basic.go
diff --git a/kubernetes/clients.go → pkg/kubernetes/clients.go b/kubernetes/clients.go → pkg/kubernetes/clients.go
diff --git a/kubernetes/util.go → pkg/kubernetes/util.go b/kubernetes/util.go → pkg/kubernetes/util.go
diff --git a/kubernetes/util_test.go → pkg/kubernetes/util_test.go b/kubernetes/util_test.go → pkg/kubernetes/util_test.go
diff --git a/openshift/clients.go → pkg/openshift/clients.go b/openshift/clients.go → pkg/openshift/clients.go
@@ -1,7 +1,7 @@
 package openshift
 
 import (
-	"github.com/appuio/image-cleanup/kubernetes"
+	"github.com/appuio/image-cleanup/pkg/kubernetes"
 	image "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
 )
 

diff --git a/openshift/imagestream.go → pkg/openshift/imagestream.go b/openshift/imagestream.go → pkg/openshift/imagestream.go
@@ -1,7 +1,7 @@
 package openshift
 
 import (
-	"github.com/appuio/image-cleanup/kubernetes"
+	"github.com/appuio/image-cleanup/pkg/kubernetes"
 	imagev1 "github.com/openshift/api/image/v1"
 	"github.com/thoas/go-funk"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/openshift/imagestream_test.go → pkg/openshift/imagestream_test.go b/openshift/imagestream_test.go → pkg/openshift/imagestream_test.go