Fix "go generate ..." issues. (istio#16980)

* Fix "go generate ..." issues. * Fix lingering import.
WillardHu · Sep 10, 2019 · c10e3bf · c10e3bf
1 parent 7496ec0
commit c10e3bf
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 166 deletions.
diff --git a/galley/pkg/config/source/kube/fs/source_test.go b/galley/pkg/config/source/kube/fs/source_test.go
@@ -29,7 +29,6 @@ import (
 	"istio.io/istio/galley/pkg/config/source/kube/fs"
 	"istio.io/istio/galley/pkg/config/testing/basicmeta"
 	"istio.io/istio/galley/pkg/config/testing/data"
-	"istio.io/istio/galley/pkg/config/testing/data/builtin"
 	"istio.io/istio/galley/pkg/config/testing/fixtures"
 	"istio.io/istio/galley/pkg/config/testing/k8smeta"
 	"istio.io/pkg/appsignals"
@@ -188,7 +187,7 @@ func TestAddUpdateDelete_K8sResources(t *testing.T) {
 		event.FullSyncFor(k8smeta.K8SCoreV1Services)))
 
 	acc.Clear()
-	copyFile(t, dir, "bar.yaml", builtin.GetService())
+	copyFile(t, dir, "bar.yaml", data.GetService())
 	appsignals.Notify("test", syscall.SIGUSR1)
 
 	g.Eventually(acc.EventsWithoutOrigins).Should(HaveLen(1))

diff --git a/galley/pkg/config/source/kube/inmemory/kubesource_test.go b/galley/pkg/config/source/kube/inmemory/kubesource_test.go
@@ -23,7 +23,6 @@ import (
 	"istio.io/istio/galley/pkg/config/resource"
 	"istio.io/istio/galley/pkg/config/testing/basicmeta"
 	"istio.io/istio/galley/pkg/config/testing/data"
-	"istio.io/istio/galley/pkg/config/testing/data/builtin"
 	"istio.io/istio/galley/pkg/config/testing/fixtures"
 	"istio.io/istio/galley/pkg/config/testing/k8smeta"
 	"istio.io/istio/galley/pkg/config/util/kubeyaml"
@@ -261,7 +260,7 @@ func TestKubeSource_Service(t *testing.T) {
 	s.Start()
 	defer s.Stop()
 
-	err := s.ApplyContent("foo", builtin.GetService())
+	err := s.ApplyContent("foo", data.GetService())
 	g.Expect(err).To(BeNil())
 
 	actual := s.Get(k8smeta.K8SCoreV1Services).AllSorted()

diff --git a/galley/pkg/config/source/kube/rt/known_test.go b/galley/pkg/config/source/kube/rt/known_test.go
@@ -26,14 +26,14 @@ import (
 	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"istio.io/istio/galley/pkg/config/source/kube/rt"
-	"istio.io/istio/galley/pkg/config/testing/data/builtin"
+	"istio.io/istio/galley/pkg/config/testing/data"
 	"istio.io/istio/galley/pkg/config/testing/k8smeta"
 )
 
 func TestParse(t *testing.T) {
 	t.Run("Endpoints", func(t *testing.T) {
 		g := NewGomegaWithT(t)
-		input := builtin.GetEndpoints()
+		input := data.GetEndpoints()
 
 		objMeta, objResource := parse(t, []byte(input), "", "Endpoints")
 
@@ -47,7 +47,7 @@ func TestParse(t *testing.T) {
 
 	t.Run("Namespace", func(t *testing.T) {
 		g := NewGomegaWithT(t)
-		input := builtin.GetNamespace()
+		input := data.GetNamespace()
 
 		objMeta, objResource := parse(t, []byte(input), "", "Namespace")
 
@@ -61,7 +61,7 @@ func TestParse(t *testing.T) {
 
 	t.Run("Ingress", func(t *testing.T) {
 		g := NewGomegaWithT(t)
-		input := builtin.GetIngress()
+		input := data.GetIngress()
 
 		objMeta, objResource := parse(t, []byte(input), "extensions", "Ingress")
 
@@ -75,7 +75,7 @@ func TestParse(t *testing.T) {
 
 	t.Run("Node", func(t *testing.T) {
 		g := NewGomegaWithT(t)
-		input := builtin.GetNode()
+		input := data.GetNode()
 
 		objMeta, objResource := parse(t, []byte(input), "", "Node")
 
@@ -89,7 +89,7 @@ func TestParse(t *testing.T) {
 
 	t.Run("Pod", func(t *testing.T) {
 		g := NewGomegaWithT(t)
-		input := builtin.GetPod()
+		input := data.GetPod()
 
 		objMeta, objResource := parse(t, []byte(input), "", "Pod")
 
@@ -103,7 +103,7 @@ func TestParse(t *testing.T) {
 
 	t.Run("Service", func(t *testing.T) {
 		g := NewGomegaWithT(t)
-		input := builtin.GetService()
+		input := data.GetService()
 
 		objMeta, objResource := parse(t, []byte(input), "", "Service")
 

diff --git a/galley/pkg/config/testing/data/builtin.gen.go b/galley/pkg/config/testing/data/builtin.gen.go
diff --git a/galley/pkg/config/testing/data/builtin.go b/galley/pkg/config/testing/data/builtin.go
@@ -41,3 +41,8 @@ func GetService() string {
 func GetNamespace() string {
 	return string(MustAsset("builtin/namespace.yaml"))
 }
+
+// GetIngress returns Ingress test data
+func GetIngress() string {
+	return string(MustAsset("builtin/ingress.yaml"))
+}
diff --git a/galley/pkg/config/testing/data/builtin/get.go b/galley/pkg/config/testing/data/builtin/get.go
diff --git a/mixer/adapter/kubernetesenv/config/config.proto_descriptor b/mixer/adapter/kubernetesenv/config/config.proto_descriptor
diff --git a/mixer/adapter/kubernetesenv/config/kubernetesenv.yaml b/mixer/adapter/kubernetesenv/config/kubernetesenv.yaml