Skip to content

Commit

Permalink
routine envoy update (#6)
Browse files Browse the repository at this point in the history
* update to latest envoy

* update build container

* add foreign cc

* timeSystem -> timeSource

* more timeSystem -> timeSource

* time is time
  • Loading branch information
yuval-k authored Mar 1, 2019
1 parent b696ded commit ba8d02d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
6 changes: 5 additions & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ envoy_gloo_dependencies()
load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
load("@envoy//bazel:cc_configure.bzl", "cc_configure")

envoy_dependencies()
envoy_dependencies(path = "//ci/prebuilt")

load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies")
rules_foreign_cc_dependencies()


cc_configure()

Expand Down
2 changes: 1 addition & 1 deletion bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
REPOSITORY_LOCATIONS = dict(
envoy = dict(
commit = "79dca84543663c3058574f519667d71f4111840e",
commit = "caf7ab123964cedd172a2d4cb29b2f2e05ca9156",
remote = "https://github.com/envoyproxy/envoy",
),
inja = dict(
Expand Down
4 changes: 2 additions & 2 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
steps:
- name: 'envoyproxy/envoy-build:a734887ad06609cf0b3c023d38239bf3e79d3717'
- name: 'envoyproxy/envoy-build:698009170e362f9ca0594f2b1927fbbee199bf98'
args: ['ci/do_ci.sh', 'test']
volumes:
- name: 'vol-build'
Expand All @@ -8,7 +8,7 @@ steps:
- 'COMMIT_SHA=$COMMIT_SHA'
timeout: 900s

- name: 'envoyproxy/envoy-build:a734887ad06609cf0b3c023d38239bf3e79d3717'
- name: 'envoyproxy/envoy-build:698009170e362f9ca0594f2b1927fbbee199bf98'
args: ['ci/do_ci.sh', 'build']
volumes:
- name: 'vol-build'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Http::FilterFactoryCb AWSLambdaFilterConfigFactory::createFilter(
const std::string &, Server::Configuration::FactoryContext &context) {
return [&context](Http::FilterChainFactoryCallbacks &callbacks) -> void {
auto filter = new AWSLambdaFilter(context.clusterManager(),
context.dispatcher().timeSystem());
context.dispatcher().timeSource());
callbacks.addStreamDecoderFilter(
Http::StreamDecoderFilterSharedPtr{filter});
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class AWSLambdaFilterTest : public testing::Test {

filter_ = std::make_unique<AWSLambdaFilter>(
factory_context_.cluster_manager_,
factory_context_.dispatcher().timeSystem());
factory_context_.dispatcher().timeSource());
filter_->setDecoderFilterCallbacks(filter_callbacks_);
}

Expand Down

0 comments on commit ba8d02d

Please sign in to comment.