From 40e56f5316f3386b5d4bcf61e9b8a56d64acaa86 Mon Sep 17 00:00:00 2001
From: Yuval Kohavi <yuval.kohavi@gmail.com>
Date: Tue, 3 Sep 2019 08:05:32 -0400
Subject: [PATCH] update envoy gloo (#1105)

* update envoy
* changelog
* fix gRPC plugin
* update log line
* dep ensure
---
 Gopkg.lock                                    | 21 ++++++++++++-------
 changelog/v0.18.30/updaate-envoy-gloo.yaml    |  5 +++++
 projects/envoyinit/cmd/Dockerfile             |  2 +-
 projects/gloo/pkg/plugins/grpc/plugin.go      |  2 +-
 .../pkg/syncer/envoy_translator_syncer.go     |  2 +-
 5 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 changelog/v0.18.30/updaate-envoy-gloo.yaml

diff --git a/Gopkg.lock b/Gopkg.lock
index 92611b46bc7..b66d0f8ed60 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -508,12 +508,9 @@
   revision = "6f2cf27854a4a29e3811b0371547be335d411b8b"
 
 [[projects]]
-  digest = "1:a507e8646bf3775af6f7e7b2a62a5e67d1c6a8f00754f87e66b96181b7f3d747"
+  digest = "1:b60efdeb75d3c0ceed88783ac2495256aba3491a537d0f31401202579fd62a94"
   name = "github.com/golang/mock"
-  packages = [
-    "gomock",
-    "mockgen/model",
-  ]
+  packages = ["gomock"]
   pruneopts = "UT"
   revision = "51421b967af1f557f93a59e0057aaf15ca02e29c"
   version = "v1.2.0"
@@ -1034,6 +1031,17 @@
   revision = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"
   version = "v0.0.3"
 
+[[projects]]
+  digest = "1:36aebe90a13cf9128280ac834399b8bebf83685283c78df279d61c46bb2a8d83"
+  name = "github.com/mattn/go-zglob"
+  packages = [
+    ".",
+    "fastwalk",
+  ]
+  pruneopts = "UT"
+  revision = "2ea3427bfa539cca900ca2768d8663ecc8a708c1"
+  version = "v0.0.1"
+
 [[projects]]
   digest = "1:ff5ebae34cfbf047d505ee150de27e60570e8c394b3b8fdbb720ff6ac71985fc"
   name = "github.com/matttproud/golang_protobuf_extensions"
@@ -2525,7 +2533,6 @@
     "github.com/gogo/protobuf/protoc-gen-gogo/descriptor",
     "github.com/gogo/protobuf/types",
     "github.com/golang/mock/gomock",
-    "github.com/golang/mock/mockgen/model",
     "github.com/golang/protobuf/proto",
     "github.com/golang/protobuf/protoc-gen-go/descriptor",
     "github.com/golang/protobuf/ptypes/any",
@@ -2544,6 +2551,7 @@
     "github.com/jhump/protoreflect/grpcreflect",
     "github.com/k0kubun/pp",
     "github.com/keybase/go-ps",
+    "github.com/mattn/go-zglob",
     "github.com/mitchellh/hashstructure",
     "github.com/olekukonko/tablewriter",
     "github.com/onsi/ginkgo",
@@ -2591,7 +2599,6 @@
     "github.com/solo-io/solo-kit/pkg/api/v1/clients/kube/cache",
     "github.com/solo-io/solo-kit/pkg/api/v1/clients/kube/controller",
     "github.com/solo-io/solo-kit/pkg/api/v1/clients/kube/crd",
-    "github.com/solo-io/solo-kit/pkg/api/v1/clients/kube/crd/solo.io/v1",
     "github.com/solo-io/solo-kit/pkg/api/v1/clients/kubesecret",
     "github.com/solo-io/solo-kit/pkg/api/v1/clients/memory",
     "github.com/solo-io/solo-kit/pkg/api/v1/clients/vault",
diff --git a/changelog/v0.18.30/updaate-envoy-gloo.yaml b/changelog/v0.18.30/updaate-envoy-gloo.yaml
new file mode 100644
index 00000000000..0aa83497045
--- /dev/null
+++ b/changelog/v0.18.30/updaate-envoy-gloo.yaml
@@ -0,0 +1,5 @@
+changelog:
+- type: DEPENDENCY_BUMP
+  dependencyOwner: solo-io
+  dependencyRepo: envoy-gloo
+  dependencyTag: v0.1.13
\ No newline at end of file
diff --git a/projects/envoyinit/cmd/Dockerfile b/projects/envoyinit/cmd/Dockerfile
index 85d795bd64c..f03d3066eb2 100644
--- a/projects/envoyinit/cmd/Dockerfile
+++ b/projects/envoyinit/cmd/Dockerfile
@@ -1,4 +1,4 @@
-FROM soloio/envoy-gloo:0.1.10
+FROM soloio/envoy-gloo:0.1.13
 
 COPY envoyinit-linux-amd64 /usr/local/bin/envoyinit
 
diff --git a/projects/gloo/pkg/plugins/grpc/plugin.go b/projects/gloo/pkg/plugins/grpc/plugin.go
index f4d4d505be8..259be2b28e8 100644
--- a/projects/gloo/pkg/plugins/grpc/plugin.go
+++ b/projects/gloo/pkg/plugins/grpc/plugin.go
@@ -177,7 +177,7 @@ func (p *plugin) ProcessRoute(params plugins.RouteParams, in *v1.Route, out *env
 
 		// add query matcher to out path. kombina for now
 		// TODO: support query for matching
-		outPath += `?{{ default(query_string), "")}}`
+		outPath += `?{{ default(query_string, "")}}`
 
 		// Add param extractors back
 		var extractors map[string]*transformapi.Extraction
diff --git a/projects/gloo/pkg/syncer/envoy_translator_syncer.go b/projects/gloo/pkg/syncer/envoy_translator_syncer.go
index db5086f3a95..359a21bd80f 100644
--- a/projects/gloo/pkg/syncer/envoy_translator_syncer.go
+++ b/projects/gloo/pkg/syncer/envoy_translator_syncer.go
@@ -50,7 +50,7 @@ func (s *translatorSyncer) syncEnvoy(ctx context.Context, snap *v1.ApiSnapshot)
 	defer span.End()
 
 	s.latestSnap = snap
-	ctx = contextutils.WithLogger(ctx, "translatorSyncer")
+	ctx = contextutils.WithLogger(ctx, "envoyTranslatorSyncer")
 	logger := contextutils.LoggerFrom(ctx)
 	logger.Infof("begin sync %v (%v proxies, %v upstreams, %v endpoints, %v secrets, %v artifacts, )", snap.Hash(),
 		len(snap.Proxies), len(snap.Upstreams), len(snap.Endpoints), len(snap.Secrets), len(snap.Artifacts))