Ripout gogo (#3923)

* got proto to compile
* protos are compiling correctly
* sensitive log redaction works
* things are happening
* more tests passing
* merge with master
* a couple changes
* fixed up gateway translator tests
* working on gateway syncer
* fixed up the gateway syncer tests
* Merge refs/heads/master into ripout-gogo
* Merge refs/heads/master into ripout-gogo
* translator passing now
* some good stuff
* Merge refs/heads/master into ripout-gogo
* need to figure out helm gen
* Merge branch 'ripout-gogo' of github.com:solo-io/gloo into ripout-gogo
* Merge refs/heads/master into ripout-gogo
* need to fix k8s-utils to work with proto4
* Merge branch 'ripout-gogo' of github.com:solo-io/gloo into ripout-gogo
* updating deps
* merge with master
* get rid of V2
* merge with master
* should run in CI
* consul tests are passing
* fixed helm doc gen
* changelog
* fix changelog
* Merge refs/heads/master into ripout-gogo
* using prototime from solo-kitz
* merge with master
* Merge branch 'ripout-gogo' of github.com:solo-io/gloo into ripout-gogo
* PR comments
* remove go.mod replace
* Adding changelog file to new location
* Deleting changelog file from old location
* need to fix clusteringress
* merge latest tracing changes
* Merge branch 'ripout-gogo' of github.com:solo-io/gloo into ripout-gogo
* gloo can build
* ingress can compile
* remote solo-apis
* using new solo-apis
* fixed import
* fixed helm tests
* fixed coode-gen
* no longer need multi any resolver
* fixed a couple tests
* fixed one test compile issue
* Merge refs/heads/master into ripout-gogo
* fixed some tests
* Merge branch 'ripout-gogo' of github.com:solo-io/gloo into ripout-gogo
* fixed CLI tests, and compiler issues for gloo tests
* more gloo tests
* all gloo tests are passing
* knative tests
* compiler should work:
* Merge refs/heads/master into ripout-gogo
* this test...
* Merge branch 'ripout-gogo' of github.com:solo-io/gloo into ripout-gogo
* ...
* proto4 sucks too
* working on e2e
* fixed some possible nil panics
* fixed up some more e2e tests
* focused tests
* remove solo-kit go.mod edit
* inconsistent printing
* fixed up the rl tests
* Merge refs/heads/master into ripout-gogo
* regression tests passing
* Merge branch 'ripout-gogo' of github.com:solo-io/gloo into ripout-gogo
* no nulls
* what an error
* errors from cloning
* bumped go-control-plane
* Merge refs/heads/master into ripout-gogo
* Merge refs/heads/master into ripout-gogo
* fixed some imports
* removed focus
* PR comments
* merge with master
* Adding changelog file to new location
* Deleting changelog file from old location
* merge generate code
* Merge branch 'ripout-gogo' of github.com:solo-io/gloo into ripout-gogo

Makefile

@@ -101,12 +101,12 @@ install-go-tools: mod-download
 	mkdir -p $(DEPSGOBIN)
 	chmod +x $(shell go list -f '{{ .Dir }}' -m k8s.io/code-generator)/generate-groups.sh
 	GOBIN=$(DEPSGOBIN) go install github.com/solo-io/protoc-gen-ext
+	GOBIN=$(DEPSGOBIN) go install github.com/envoyproxy/protoc-gen-validate
+	GOBIN=$(DEPSGOBIN) go install github.com/golang/protobuf/protoc-gen-go
 	GOBIN=$(DEPSGOBIN) go install golang.org/x/tools/cmd/goimports
-	GOBIN=$(DEPSGOBIN) go install github.com/gogo/protobuf/protoc-gen-gogo
 	GOBIN=$(DEPSGOBIN) go install github.com/cratonica/2goarray
 	GOBIN=$(DEPSGOBIN) go install github.com/golang/mock/gomock
 	GOBIN=$(DEPSGOBIN) go install github.com/golang/mock/mockgen
-	GOBIN=$(DEPSGOBIN) go install github.com/gogo/protobuf/gogoproto
 	GOBIN=$(DEPSGOBIN) go install github.com/onsi/ginkgo/ginkgo
 
 # command to run regression tests with guaranteed access to $(DEPSGOBIN)/ginkgo

changelog/v1.6.0-beta19/ripout-gogo.yaml

@@ -0,0 +1,5 @@
+changelog:
+- type: FIX
+  description: Ripout gogo proto in favor of golang proto
+  issueLink: https://github.com/solo-io/gloo/issues/3926
+  resolvesIssue: false

ci/tools.go

@@ -19,7 +19,6 @@ package tools
 import (
 	_ "github.com/cratonica/2goarray"
 	_ "github.com/envoyproxy/protoc-gen-validate"
-	_ "github.com/gogo/protobuf/gogoproto"
 	_ "github.com/golang/mock/mockgen"
 	_ "github.com/solo-io/protoc-gen-ext"
 	_ "github.com/solo-io/solo-apis"

ci/upload_github_release_assets.go

@@ -9,13 +9,12 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/solo-io/gloo/pkg/utils/protoutils"
 	"github.com/solo-io/gloo/projects/gloo/pkg/api/grpc/version"
-	"github.com/solo-io/go-utils/pkgmgmtutils/formula_updater_types"
-	"github.com/solo-io/go-utils/protoutils"
-
 	"github.com/solo-io/go-utils/githubutils"
 	"github.com/solo-io/go-utils/log"
 	"github.com/solo-io/go-utils/pkgmgmtutils"
+	"github.com/solo-io/go-utils/pkgmgmtutils/formula_updater_types"
 	"github.com/solo-io/go-utils/versionutils"
 )
 

docs/cmd/test/generate_changelog_doc_suite_test.go

@@ -3,10 +3,9 @@ package main_test
 import (
 	"testing"
 
-	"github.com/solo-io/go-utils/testutils"
-
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"github.com/solo-io/go-utils/testutils"
 )
 
 func TestGenerateChangelogDoc(t *testing.T) {

docs/content/guides/dev/example-proxy-controller.md

@@ -385,7 +385,7 @@ import (
 	"time"
 
 	"github.com/solo-io/gloo/projects/gloo/pkg/api/v1"
-	"github.com/solo-io/go-utils/kubeutils"
+	"github.com/solo-io/k8s-utils/kubeutils"
 	"github.com/solo-io/solo-kit/pkg/api/v1/clients"
 	"github.com/solo-io/solo-kit/pkg/api/v1/clients/factory"
 	"github.com/solo-io/solo-kit/pkg/api/v1/clients/kube"

docs/content/guides/dev/gce.proto

@@ -3,8 +3,7 @@ package gce.plugins.gloo.solo.io;
 
 option go_package = "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/plugins/gce";
 
-import "gogoproto/gogo.proto";
-option (gogoproto.equal_all) = true;
+option (extproto.equal_all) = true;
 
 // Upstream Spec for Google Compute Engine Upstreams
 // GCE Upstreams represent a set of one or more addressable VM instances with

docs/content/guides/dev/plugins.proto

@@ -4,32 +4,33 @@ option go_package = "github.com/solo-io/gloo/projects/gloo/pkg/api/v1";
 
 import "google/protobuf/struct.proto";
 
-import "gogoproto/gogo.proto";
-option (gogoproto.equal_all) = true;
-
-import "gloo/projects/gloo/api/v1/ssl.proto";
-import "gloo/projects/gloo/api/v1/extensions.proto";
-import "gloo/projects/gloo/api/v1/circuit_breaker.proto";
-import "gloo/projects/gloo/api/v1/load_balancer.proto";
-import "gloo/projects/gloo/api/v1/connection.proto";
-
-import "gloo/projects/gloo/api/v1/plugins/aws/aws.proto";
-import "gloo/projects/gloo/api/v1/plugins/rest/rest.proto";
-import "gloo/projects/gloo/api/v1/plugins/grpc/grpc.proto";
-import "gloo/projects/gloo/api/v1/plugins/grpc_web/grpc_web.proto";
-import "gloo/projects/gloo/api/v1/plugins/hcm/hcm.proto";
-import "gloo/projects/gloo/api/v1/plugins/tcp/tcp.proto";
-import "gloo/projects/gloo/api/v1/plugins/azure/azure.proto";
-import "gloo/projects/gloo/api/v1/plugins/consul/consul.proto";
-import "gloo/projects/gloo/api/v1/plugins/kubernetes/kubernetes.proto";
-import "gloo/projects/gloo/api/v1/plugins/retries/retries.proto";
-import "gloo/projects/gloo/api/v1/plugins/static/static.proto";
-import "gloo/projects/gloo/api/v1/plugins/stats/stats.proto";
-import "gloo/projects/gloo/api/v1/plugins/transformation/prefix_rewrite.proto";
-import "gloo/projects/gloo/api/v1/plugins/transformation/transformation.proto";
-import "gloo/projects/gloo/api/v1/plugins/faultinjection/fault.proto";
+import "extproto/ext.proto";
+option (extproto.equal_all) = true;
+option (extproto.hash_all) = true;
+
+import "github.com/solo-io/gloo/projects/gloo/api/v1/ssl.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/extensions.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/circuit_breaker.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/load_balancer.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/connection.proto";
+
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/aws/aws.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/rest/rest.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/grpc/grpc.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/grpc_web/grpc_web.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/hcm/hcm.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/tcp/tcp.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/azure/azure.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/consul/consul.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/kubernetes/kubernetes.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/retries/retries.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/static/static.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/stats/stats.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/transformation/prefix_rewrite.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/transformation/transformation.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/faultinjection/fault.proto";
 // add the following line:
-import "gloo/projects/gloo/api/v1/plugins/gce/gce.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/gce/gce.proto";
 
 import "google/protobuf/duration.proto";
 
@@ -70,7 +71,7 @@ message RoutePlugins {
     envoy.api.v2.filter.http.RouteTransformations transformations = 1;
     fault.plugins.gloo.solo.io.RouteFaults faults = 2;
     transformation.plugins.gloo.solo.io.PrefixRewrite prefix_rewrite = 3;
-    google.protobuf.Duration timeout = 4 [(gogoproto.stdduration) = true];
+    google.protobuf.Duration timeout = 4;
     retries.plugins.gloo.solo.io.RetryPolicy retries = 5;
     Extensions extensions = 6;
 }

docs/content/guides/dev/writing-upstream-plugins.md

@@ -51,8 +51,7 @@ package gce.options.gloo.solo.io;
 
 option go_package = "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/plugins/gce";
 
-import "gogoproto/gogo.proto";
-option (gogoproto.equal_all) = true;
+option (extproto.equal_all) = true;
 
 // Upstream Spec for Google Compute Engine Upstreams
 // GCE Upstreams represent a set of one or more addressable VM instances with
@@ -84,8 +83,7 @@ package gce.options.gloo.solo.io;
 
 option go_package = "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/plugins/gce";
 
-import "gogoproto/gogo.proto";
-option (gogoproto.equal_all) = true;
+option (extproto.equal_all) = true;
 
 // Upstream Spec for Google Compute Engine Upstreams
 // GCE Upstreams represent a set of one or more addressable VM instances with
@@ -120,8 +118,7 @@ option go_package = "github.com/solo-io/gloo/projects/gloo/pkg/api/v1";
 
 import "google/protobuf/struct.proto";
 
-import "gogoproto/gogo.proto";
-option (gogoproto.equal_all) = true;
+option (extproto.equal_all) = true;
 
 import "github.com/solo-io/gloo/projects/gloo/api/v1/ssl.proto";
 import "github.com/solo-io/gloo/projects/gloo/api/v1/extensions.proto";

docs/content/guides/traffic_management/request_processing/upstream_health_checks/_index.md

@@ -8,7 +8,7 @@ As part of configuring an Upstream, Gloo Edge provides the option of adding *hea
 
 ## Configuration
 
-Descriptions of the options available for configuring health checks can be found {{< protobuf name="envoy.api.v2.core.HealthCheck" display="here" >}}.
+Descriptions of the options available for configuring health checks can be found {{< protobuf name="solo.io.envoy.api.v2.core.HealthCheck" display="here" >}}.
 
 ### Custom Headers for HttpHealthChecks
 

docs/content/reference/api/envoy/annotations/deprecation.proto.sk.md

@@ -7,7 +7,7 @@ weight: 5
 <!-- Code generated by solo-kit. DO NOT EDIT. -->
 
 
-### Package: `envoy.annotations`
+### Package: `solo.io.envoy.annotations`
 
 ##### Source File: `envoy/annotations/deprecation.proto`