Make the cassandra version package an api sub-package

wallrj · wallrj · commit 635c5fc5f691 · 2018-04-26T16:33:30.000+01:00
diff --git a/hack/update-client-gen.sh b/hack/update-client-gen.sh
@@ -17,8 +17,8 @@ ${CODEGEN_PKG}/generate-internal-groups.sh all \
 
 echo "Generating other deepcopy funcs"
 ${GOPATH}/bin/deepcopy-gen \
-         --input-dirs github.com/jetstack/navigator/pkg/cassandra/version \
+         --input-dirs github.com/jetstack/navigator/pkg/api/version \
          -O zz_generated.deepcopy \
-         --bounding-dirs github.com/jetstack/navigator/pkg/cassandra/version \
+         --bounding-dirs github.com/jetstack/navigator/pkg/api/version \
          --output-base "${GOPATH}/src/" \
          --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt
diff --git a/internal/test/util/generate/generate.go b/internal/test/util/generate/generate.go
@@ -6,8 +6,8 @@ import (
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/jetstack/navigator/pkg/api/version"
 	"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
-	"github.com/jetstack/navigator/pkg/cassandra/version"
 )
 
 type PilotConfig struct {
diff --git a/pkg/api/version/version.go b/pkg/api/version/version.go
diff --git a/pkg/api/version/version_test.go b/pkg/api/version/version_test.go
@@ -3,7 +3,7 @@ package version_test
 import (
 	"testing"
 
-	"github.com/jetstack/navigator/pkg/cassandra/version"
+	"github.com/jetstack/navigator/pkg/api/version"
 )
 
 func TestUnmarshalJSON(t *testing.T) {
diff --git a/pkg/api/version/zz_generated.deepcopy.go b/pkg/api/version/zz_generated.deepcopy.go
diff --git a/pkg/apis/navigator/types.go b/pkg/apis/navigator/types.go
@@ -6,7 +6,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/jetstack/navigator/pkg/cassandra/version"
+	"github.com/jetstack/navigator/pkg/api/version"
 )
 
 // In this file we define the outer containing types for the ElasticsearchCluster
diff --git a/pkg/apis/navigator/v1alpha1/types.go b/pkg/apis/navigator/v1alpha1/types.go
@@ -6,7 +6,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/jetstack/navigator/pkg/cassandra/version"
+	"github.com/jetstack/navigator/pkg/api/version"
 )
 
 const (
diff --git a/pkg/apis/navigator/v1alpha1/zz_generated.conversion.go b/pkg/apis/navigator/v1alpha1/zz_generated.conversion.go
@@ -22,8 +22,8 @@ package v1alpha1
 
 import (
 	semver "github.com/coreos/go-semver/semver"
+	version "github.com/jetstack/navigator/pkg/api/version"
 	navigator "github.com/jetstack/navigator/pkg/apis/navigator"
-	version "github.com/jetstack/navigator/pkg/cassandra/version"
 	v1 "k8s.io/api/core/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
diff --git a/pkg/apis/navigator/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/navigator/v1alpha1/zz_generated.deepcopy.go
@@ -22,7 +22,7 @@ package v1alpha1
 
 import (
 	semver "github.com/coreos/go-semver/semver"
-	version "github.com/jetstack/navigator/pkg/cassandra/version"
+	version "github.com/jetstack/navigator/pkg/api/version"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
diff --git a/pkg/apis/navigator/validation/cassandra_test.go b/pkg/apis/navigator/validation/cassandra_test.go
@@ -6,9 +6,9 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/jetstack/navigator/pkg/api/version"
 	"github.com/jetstack/navigator/pkg/apis/navigator"
 	"github.com/jetstack/navigator/pkg/apis/navigator/validation"
-	"github.com/jetstack/navigator/pkg/cassandra/version"
 	"github.com/jetstack/navigator/pkg/util/ptr"
 )
 
diff --git a/pkg/apis/navigator/zz_generated.deepcopy.go b/pkg/apis/navigator/zz_generated.deepcopy.go
@@ -22,7 +22,7 @@ package navigator
 
 import (
 	semver "github.com/coreos/go-semver/semver"
-	version "github.com/jetstack/navigator/pkg/cassandra/version"
+	version "github.com/jetstack/navigator/pkg/api/version"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
diff --git a/pkg/cassandra/nodetool/client/client.go b/pkg/cassandra/nodetool/client/client.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/jetstack/navigator/pkg/cassandra/version"
+	"github.com/jetstack/navigator/pkg/api/version"
 )
 
 const (
diff --git a/pkg/cassandra/nodetool/fake/fake.go b/pkg/cassandra/nodetool/fake/fake.go
@@ -3,9 +3,9 @@ package fake
 import (
 	"fmt"
 
+	"github.com/jetstack/navigator/pkg/api/version"
 	"github.com/jetstack/navigator/pkg/cassandra/nodetool"
 	"github.com/jetstack/navigator/pkg/cassandra/nodetool/client"
-	"github.com/jetstack/navigator/pkg/cassandra/version"
 )
 
 type FakeNodeTool struct {
diff --git a/pkg/cassandra/nodetool/nodetool.go b/pkg/cassandra/nodetool/nodetool.go
@@ -8,8 +8,8 @@ import (
 	"github.com/pborman/uuid"
 	"k8s.io/apimachinery/pkg/util/sets"
 
+	"github.com/jetstack/navigator/pkg/api/version"
 	"github.com/jetstack/navigator/pkg/cassandra/nodetool/client"
-	"github.com/jetstack/navigator/pkg/cassandra/version"
 )
 
 // NodeState represents the cluster membership state of a C* node.
diff --git a/pkg/controllers/cassandra/nodepool/util.go b/pkg/controllers/cassandra/nodepool/util.go
@@ -3,8 +3,8 @@ package nodepool
 import (
 	corev1 "k8s.io/api/core/v1"
 
+	"github.com/jetstack/navigator/pkg/api/version"
 	"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
-	"github.com/jetstack/navigator/pkg/cassandra/version"
 )
 
 func cassImageToUse(spec *v1alpha1.CassandraClusterSpec) *v1alpha1.ImageSpec {
diff --git a/pkg/controllers/cassandra/testing/testing.go b/pkg/controllers/cassandra/testing/testing.go
@@ -1,8 +1,8 @@
 package testing
 
 import (
+	"github.com/jetstack/navigator/pkg/api/version"
 	"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
-	"github.com/jetstack/navigator/pkg/cassandra/version"
 	"github.com/jetstack/navigator/pkg/util/ptr"
 )
 
diff --git a/pkg/pilot/cassandra/v3/pilot_test.go b/pkg/pilot/cassandra/v3/pilot_test.go
@@ -3,10 +3,10 @@ package v3
 import (
 	"testing"
 
+	"github.com/jetstack/navigator/pkg/api/version"
 	"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
 	"github.com/jetstack/navigator/pkg/cassandra/nodetool"
 	fakenodetool "github.com/jetstack/navigator/pkg/cassandra/nodetool/fake"
-	"github.com/jetstack/navigator/pkg/cassandra/version"
 )
 
 func TestPilotSyncFunc(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`core "k8s.io/api/core/v1"`
`7`	`7`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`8`	`8`
	`9`	`+ "github.com/jetstack/navigator/pkg/api/version"`
`9`	`10`	`"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"`
`10`		`- "github.com/jetstack/navigator/pkg/cassandra/version"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`type PilotConfig struct {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package version_test`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "github.com/jetstack/navigator/pkg/cassandra/version"`
	`6`	`+ "github.com/jetstack/navigator/pkg/api/version"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func TestUnmarshalJSON(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"k8s.io/apimachinery/pkg/api/resource"`
`7`	`7`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`8`	`8`
`9`		`- "github.com/jetstack/navigator/pkg/cassandra/version"`
	`9`	`+ "github.com/jetstack/navigator/pkg/api/version"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// In this file we define the outer containing types for the ElasticsearchCluster`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ package v1alpha1`
`22`	`22`
`23`	`23`	`import (`
`24`	`24`	`semver "github.com/coreos/go-semver/semver"`
`25`		`- version "github.com/jetstack/navigator/pkg/cassandra/version"`
	`25`	`+ version "github.com/jetstack/navigator/pkg/api/version"`
`26`	`26`	`runtime "k8s.io/apimachinery/pkg/runtime"`
`27`	`27`	`)`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ import (`
`6`	`6`	`"k8s.io/apimachinery/pkg/api/resource"`
`7`	`7`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`8`	`8`
	`9`	`+ "github.com/jetstack/navigator/pkg/api/version"`
`9`	`10`	`"github.com/jetstack/navigator/pkg/apis/navigator"`
`10`	`11`	`"github.com/jetstack/navigator/pkg/apis/navigator/validation"`
`11`		`- "github.com/jetstack/navigator/pkg/cassandra/version"`
`12`	`12`	`"github.com/jetstack/navigator/pkg/util/ptr"`
`13`	`13`	`)`
`14`	`14`