Skip to content

Commit 35b6410

Browse files
authored
Merge unary mixer api (istio#346)
* add grpc call. * Make envoy grpc call. * add max_requests config. * Add grpc transport class. * move mixer_server. * Handle mixer_server cluster not configured. * Fix integration. * handle grpc fail open. * Fixed merge issue. * update to latest mixerclient
1 parent 9dd8f1a commit 35b6410

25 files changed

+895
-194
lines changed

WORKSPACE

Lines changed: 358 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,370 @@ http_file(
105105
# Following go repositories are for building go integration test for mixer filter.
106106
git_repository(
107107
name = "io_bazel_rules_go",
108-
commit = "2d9f328a9723baf2d037ba9db28d9d0e30683938", # Apr 6, 2017 (buildifier fix)
108+
commit = "87cdda3fc0fd65c63ef0316533be03ea4956f809", # April 7 2017 (0.4.2)
109109
remote = "https://github.com/bazelbuild/rules_go.git",
110110
)
111111

112112
git_repository(
113113
name = "org_pubref_rules_protobuf",
114-
commit = "d42e895387c658eda90276aea018056fcdcb30e4", # Mar 07 2017 (gogo* support)
115-
remote = "https://github.com/pubref/rules_protobuf",
114+
commit = "d8624842ab237a3f9fecbbe4fae1a33ae3215d2e",
115+
# forked with special fix: https://github.com/pubref/rules_protobuf/pull/93
116+
remote = "https://github.com/qiwzhang/rules_protobuf",
116117
)
117118

119+
###########################################
120+
# Following dependencies are needed for building istio/mixer for
121+
# //src/envoy/mixer/integration_test
122+
# They are directly copied from its WORKSPACE
123+
124+
load("@io_bazel_rules_go//go:def.bzl", "go_repositories", "new_go_repository")
125+
go_repositories()
126+
127+
load("@org_pubref_rules_protobuf//protobuf:rules.bzl", "proto_repositories")
128+
proto_repositories()
129+
130+
load("@org_pubref_rules_protobuf//cpp:rules.bzl", "cpp_proto_repositories")
131+
cpp_proto_repositories()
132+
133+
load("@org_pubref_rules_protobuf//gogo:rules.bzl", "gogo_proto_repositories")
134+
gogo_proto_repositories()
135+
136+
new_go_repository(
137+
name = "com_github_golang_glog",
138+
commit = "23def4e6c14b4da8ac2ed8007337bc5eb5007998", # Jan 26, 2016 (no releases)
139+
importpath = "github.com/golang/glog",
140+
)
141+
142+
new_go_repository(
143+
name = "com_github_ghodss_yaml",
144+
commit = "04f313413ffd65ce25f2541bfd2b2ceec5c0908c", # Dec 6, 2016 (no releases)
145+
importpath = "github.com/ghodss/yaml",
146+
)
147+
148+
new_go_repository(
149+
name = "in_gopkg_yaml_v2",
150+
commit = "14227de293ca979cf205cd88769fe71ed96a97e2", # Jan 24, 2017 (no releases)
151+
importpath = "gopkg.in/yaml.v2",
152+
)
153+
154+
new_go_repository(
155+
name = "com_github_golang_protobuf",
156+
commit = "8ee79997227bf9b34611aee7946ae64735e6fd93", # Nov 16, 2016 (no releases)
157+
importpath = "github.com/golang/protobuf",
158+
)
159+
160+
new_go_repository(
161+
name = "org_golang_google_grpc",
162+
commit = "cdee119ee21e61eef7093a41ba148fa83585e143", # Mar 14, 2017 (v1.2.0)
163+
importpath = "google.golang.org/grpc",
164+
)
165+
166+
new_go_repository(
167+
name = "com_github_spf13_cobra",
168+
commit = "35136c09d8da66b901337c6e86fd8e88a1a255bd", # Jan 30, 2017 (no releases)
169+
importpath = "github.com/spf13/cobra",
170+
)
171+
172+
new_go_repository(
173+
name = "com_github_spf13_pflag",
174+
commit = "9ff6c6923cfffbcd502984b8e0c80539a94968b7", # Jan 30, 2017 (no releases)
175+
importpath = "github.com/spf13/pflag",
176+
)
177+
178+
new_go_repository(
179+
name = "com_github_cpuguy83_go_md2man",
180+
commit = "648eed146d3f3beacb64063cd0daae908015eebd", # Mar 19, 2017 (no releases)
181+
importpath = "github.com/cpuguy83/go-md2man",
182+
)
183+
184+
new_go_repository(
185+
name = "com_github_russross_blackfriday",
186+
commit = "35eb537633d9950afc8ae7bdf0edb6134584e9fc", # Mar 19, 2017 (no releases)
187+
importpath = "github.com/russross/blackfriday",
188+
)
189+
190+
new_go_repository(
191+
name = "com_github_shurcooL_sanitized_anchor_name",
192+
commit = "10ef21a441db47d8b13ebcc5fd2310f636973c77", # Mar 19, 2017 (no releases)
193+
importpath = "github.com/shurcooL/sanitized_anchor_name",
194+
)
195+
196+
new_go_repository(
197+
name = "com_github_hashicorp_go_multierror",
198+
commit = "ed905158d87462226a13fe39ddf685ea65f1c11f", # Dec 16, 2016 (no releases)
199+
importpath = "github.com/hashicorp/go-multierror",
200+
)
201+
202+
new_go_repository(
203+
name = "com_github_hashicorp_errwrap",
204+
commit = "7554cd9344cec97297fa6649b055a8c98c2a1e55", # Oct 27, 2014 (no releases)
205+
importpath = "github.com/hashicorp/errwrap",
206+
)
207+
208+
new_go_repository(
209+
name = "com_github_opentracing_opentracing_go",
210+
commit = "0c3154a3c2ce79d3271985848659870599dfb77c", # Sep 26, 2016 (v1.0.0)
211+
importpath = "github.com/opentracing/opentracing-go",
212+
)
213+
214+
new_go_repository(
215+
name = "com_github_opentracing_basictracer",
216+
commit = "1b32af207119a14b1b231d451df3ed04a72efebf", # Sep 29, 2016 (no releases)
217+
importpath = "github.com/opentracing/basictracer-go",
218+
)
219+
220+
new_go_repository(
221+
name = "com_github_prometheus_client_golang",
222+
commit = "c5b7fccd204277076155f10851dad72b76a49317", # Aug 17, 2016 (v0.8.0)
223+
importpath = "github.com/prometheus/client_golang",
224+
)
225+
226+
new_go_repository(
227+
name = "com_github_prometheus_common",
228+
commit = "dd2f054febf4a6c00f2343686efb775948a8bff4", # Jan 8, 2017 (no releases)
229+
importpath = "github.com/prometheus/common",
230+
)
231+
232+
new_go_repository(
233+
name = "com_github_matttproud_golang_protobuf_extensions",
234+
commit = "c12348ce28de40eed0136aa2b644d0ee0650e56c", # Apr 24, 2016 (v1.0.0)
235+
importpath = "github.com/matttproud/golang_protobuf_extensions",
236+
)
237+
238+
new_go_repository(
239+
name = "com_github_prometheus_procfs",
240+
commit = "1878d9fbb537119d24b21ca07effd591627cd160", # Jan 28, 2017 (no releases)
241+
importpath = "github.com/prometheus/procfs",
242+
)
243+
244+
new_go_repository(
245+
name = "com_github_beorn7_perks",
246+
commit = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9", # Aug 4, 2016 (no releases)
247+
importpath = "github.com/beorn7/perks",
248+
)
249+
250+
new_go_repository(
251+
name = "com_github_prometheus_client_model",
252+
commit = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", # Feb 12, 2015 (only release too old)
253+
importpath = "github.com/prometheus/client_model",
254+
)
255+
256+
new_go_repository(
257+
name = "com_github_cactus_statsd_client",
258+
commit = "91c326c3f7bd20f0226d3d1c289dd9f8ce28d33d", # release 3.1.0, 5/30/2016
259+
importpath = "github.com/cactus/go-statsd-client",
260+
)
261+
262+
new_go_repository(
263+
name = "com_github_redis_client",
264+
commit = "1ac54a28f5934ea5e08f588647e734aba2383cb8", # Jan 28, 2017 (no releases)
265+
importpath = "github.com/mediocregopher/radix.v2",
266+
)
267+
268+
new_go_repository(
269+
name = "com_github_mini_redis",
270+
commit = "e9169f14d501184b6cc94e270e5a93e4bab203d7", # release 2.0.0, 4/15/2017
271+
importpath = "github.com/alicebob/miniredis",
272+
)
273+
274+
new_go_repository(
275+
name = "com_github_bsm_redeo",
276+
commit = "1ce09fc76693fb3c1ca9b529c66f38920beb6fb8", # Aug 17, 2016 (no releases)
277+
importpath = "github.com/bsm/redeo",
278+
)
279+
280+
new_go_repository(
281+
name = "io_k8s_client_go",
282+
commit = "243d8a9cb66a51ad8676157f79e71033b4014a2a", # Dec 11, 2016 (matches istio manager)
283+
importpath = "k8s.io/client-go",
284+
)
285+
286+
new_go_repository(
287+
name = "com_github_ugorji_go",
288+
commit = "708a42d246822952f38190a8d8c4e6b16a0e600c", # Mar 12, 2017 (no releases)
289+
importpath = "github.com/ugorji/go",
290+
)
291+
292+
new_go_repository(
293+
name = "in_gopkg_inf_v0",
294+
commit = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4", # Sep 11, 2015 (latest commit)
295+
importpath = "gopkg.in/inf.v0",
296+
)
297+
298+
new_go_repository(
299+
name = "com_github_docker_distribution",
300+
commit = "a25b9ef0c9fe242ac04bb20d3a028442b7d266b6", # Apr 5, 2017 (v2.6.1)
301+
importpath = "github.com/docker/distribution",
302+
)
303+
304+
new_go_repository(
305+
name = "com_github_davecgh_go_spew",
306+
commit = "346938d642f2ec3594ed81d874461961cd0faa76", # Oct 29, 2016 (v1.1.0)
307+
importpath = "github.com/davecgh/go-spew",
308+
)
309+
310+
new_go_repository(
311+
name = "com_github_go_openapi_spec",
312+
commit = "6aced65f8501fe1217321abf0749d354824ba2ff", # Aug 8, 2016 (no releases)
313+
importpath = "github.com/go-openapi/spec",
314+
)
315+
316+
new_go_repository(
317+
name = "com_github_google_gofuzz",
318+
commit = "44d81051d367757e1c7c6a5a86423ece9afcf63c", # Nov 22, 2016 (no releases)
319+
importpath = "github.com/google/gofuzz",
320+
)
321+
322+
new_go_repository(
323+
name = "com_github_emicklei_go_restful",
324+
commit = "09691a3b6378b740595c1002f40c34dd5f218a22", # Dec 12, 2016 (k8s deps)
325+
importpath = "github.com/emicklei/go-restful",
326+
)
327+
328+
new_go_repository(
329+
name = "com_github_go_openapi_jsonpointer",
330+
commit = "46af16f9f7b149af66e5d1bd010e3574dc06de98", # Jul 4, 2016 (no releases)
331+
importpath = "github.com/go-openapi/jsonpointer",
332+
)
333+
334+
new_go_repository(
335+
name = "com_github_go_openapi_jsonreference",
336+
commit = "13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272", # Jul 4, 2016 (no releases)
337+
importpath = "github.com/go-openapi/jsonreference",
338+
)
339+
340+
new_go_repository(
341+
name = "com_github_go_openapi_swag",
342+
commit = "1d0bd113de87027671077d3c71eb3ac5d7dbba72", # Jul 4, 2016 (no releases)
343+
importpath = "github.com/go-openapi/swag",
344+
)
345+
346+
new_go_repository(
347+
name = "org_golang_x_oauth2",
348+
commit = "3c3a985cb79f52a3190fbc056984415ca6763d01", # Aug 26, 2016 (no releases)
349+
importpath = "golang.org/x/oauth2",
350+
)
351+
352+
new_go_repository(
353+
name = "com_github_juju_ratelimit",
354+
commit = "acf38b000a03e4ab89e40f20f1e548f4e6ac7f72", # Mar 13, 2017 (no releases)
355+
importpath = "github.com/juju/ratelimit",
356+
)
357+
358+
new_go_repository(
359+
name = "com_github_opencontainers_go_digest",
360+
commit = "aa2ec055abd10d26d539eb630a92241b781ce4bc", # Jan 31, 2017 (v1.0.0-rc0)
361+
importpath = "github.com/opencontainers/go-digest",
362+
)
363+
364+
new_go_repository(
365+
name = "com_github_blang_semver",
366+
commit = "b38d23b8782a487059e8fc8773e9a5b228a77cb6", # Jan 30, 2017 (v3.5.0)
367+
importpath = "github.com/blang/semver",
368+
)
369+
370+
new_go_repository(
371+
name = "com_github_coreos_go_oidc",
372+
commit = "be73733bb8cc830d0205609b95d125215f8e9c70", # Mar 7, 2017 (no releases)
373+
importpath = "github.com/coreos/go-oidc",
374+
)
375+
376+
new_go_repository(
377+
name = "com_github_mailru_easyjson",
378+
commit = "2af9a745a611440bab0528e5ac19b2805a1c50eb", # Mar 28, 2017 (no releases)
379+
importpath = "github.com/mailru/easyjson",
380+
)
381+
382+
new_go_repository(
383+
name = "com_github_PuerkitoBio_purell",
384+
commit = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4", # Nov 14, 2016 (v1.1.0)
385+
importpath = "github.com/PuerkitoBio/purell",
386+
)
387+
388+
new_go_repository(
389+
name = "org_golang_x_text",
390+
build_file_name = "BUILD.bazel",
391+
commit = "f4b4367115ec2de254587813edaa901bc1c723a8", # Mar 31, 2017 (no releases)
392+
importpath = "golang.org/x/text",
393+
)
394+
395+
new_go_repository(
396+
name = "com_github_PuerkitoBio_urlesc",
397+
commit = "bbf7a2afc14f93e1e0a5c06df524fbd75e5031e5", # Mar 24, 2017 (no releases)
398+
importpath = "github.com/PuerkitoBio/urlesc",
399+
)
400+
401+
new_go_repository(
402+
name = "com_github_pborman_uuid",
403+
commit = "a97ce2ca70fa5a848076093f05e639a89ca34d06", # Feb 9, 2016 (v1.0)
404+
importpath = "github.com/pborman/uuid",
405+
)
406+
407+
new_go_repository(
408+
name = "com_google_cloud_go",
409+
commit = "2e6a95edb1071d750f6d7db777bf66cd2997af6c", # Mar 9, 2017 (v0.7.0)
410+
importpath = "cloud.google.com/go",
411+
)
412+
413+
new_go_repository(
414+
name = "com_github_coreos_pkg",
415+
commit = "1c941d73110817a80b9fa6e14d5d2b00d977ce2a", # Feb 6, 2017 (fix for build dir bazel issue)
416+
importpath = "github.com/coreos/pkg",
417+
)
418+
419+
new_go_repository(
420+
name = "com_github_jonboulle_clockwork",
421+
commit = "2eee05ed794112d45db504eb05aa693efd2b8b09", # Jul 6, 2016 (v0.1.0)
422+
importpath = "github.com/jonboulle/clockwork",
423+
)
424+
425+
new_go_repository(
426+
name = "com_github_imdario_mergo",
427+
commit = "3e95a51e0639b4cf372f2ccf74c86749d747fbdc", # Feb 16, 2016 (v0.2.2)
428+
importpath = "github.com/imdario/mergo",
429+
)
430+
431+
new_go_repository(
432+
name = "com_github_howeyc_gopass",
433+
commit = "bf9dde6d0d2c004a008c27aaee91170c786f6db8", # Jan 9, 2017 (no releases)
434+
importpath = "github.com/howeyc/gopass",
435+
)
436+
437+
new_go_repository(
438+
name = "org_golang_x_crypto",
439+
commit = "cbc3d0884eac986df6e78a039b8792e869bff863", # Apr 8, 2017 (no releases)
440+
importpath = "golang.org/x/crypto",
441+
)
442+
443+
new_go_repository(
444+
name = "com_github_googleapis_gax_go",
445+
commit = "9af46dd5a1713e8b5cd71106287eba3cefdde50b", # Mar 20, 2017 (no releases)
446+
importpath = "github.com/googleapis/gax-go",
447+
)
448+
449+
new_go_repository(
450+
name = "com_github_hashicorp_golang_lru",
451+
commit = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6", # Aug 13, 2016 (no releases)
452+
importpath = "github.com/hashicorp/golang-lru",
453+
)
454+
455+
new_go_repository(
456+
name = "com_github_grpcecosystem_opentracing",
457+
commit = "c94552f01d20ad74ec45a8cd967833a9d0b106cf", #
458+
importpath = "github.com/grpc-ecosystem/grpc-opentracing",
459+
)
460+
461+
##
462+
## Testing
463+
##
464+
465+
git_repository(
466+
name = "istio_test_infra",
467+
commit = "983183f98b79f8b67fe380fef4cdd21481830fd7", # Apr 13, 2017 (no releases)
468+
remote = "https://github.com/istio/test-infra.git",
469+
)
470+
471+
############################################################
472+
118473
load("//src/envoy/mixer/integration_test:repositories.bzl", "go_mixer_repositories")
119474
go_mixer_repositories()

src/envoy/mixer/BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ cc_library(
3232
srcs = [
3333
"config.cc",
3434
"config.h",
35+
"grpc_transport.cc",
36+
"grpc_transport.h",
3537
"http_control.cc",
3638
"http_control.h",
3739
"http_filter.cc",

0 commit comments

Comments
 (0)