Skip to content

Update Envoy to 665b4d5 #2373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Augustyniak merged 5 commits into from
Jun 24, 2022
Merged

Update Envoy to 665b4d5 #2373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ceeb6a
Update Envoy
jpsim Jun 20, 2022
0bf4729
update tests
Augustyniak Jun 24, 2022
b693180
Bump Envoy sha to 665b4d5
Augustyniak Jun 24, 2022
9bfccd3
Merge branch 'main' into update-envoy-218e317
Augustyniak Jun 24, 2022
8995333
lint fix
Augustyniak Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion envoy
Open in desktop
Submodule envoy updated 428 files
7 changes: 4 additions & 3 deletions test/common/integration/autonomous_upstream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,14 @@ using AutonomousHttpConnectionPtr = std::unique_ptr<AutonomousHttpConnection>;
// An upstream which creates AutonomousHttpConnection for new incoming connections.
class AutonomousUpstream : public FakeUpstream {
public:
AutonomousUpstream(Network::TransportSocketFactoryPtr&& transport_socket_factory,
AutonomousUpstream(Network::DownstreamTransportSocketFactoryPtr&& transport_socket_factory,
const Network::Address::InstanceConstSharedPtr& address,
const FakeUpstreamConfig& config)
: FakeUpstream(std::move(transport_socket_factory), address, config) {}

AutonomousUpstream(Network::TransportSocketFactoryPtr&& transport_socket_factory, uint32_t port,
Network::Address::IpVersion version, const FakeUpstreamConfig& config)
AutonomousUpstream(Network::DownstreamTransportSocketFactoryPtr&& transport_socket_factory,
uint32_t port, Network::Address::IpVersion version,
const FakeUpstreamConfig& config)
: FakeUpstream(std::move(transport_socket_factory), port, version, config) {}

~AutonomousUpstream() override;
Expand Down
4 changes: 2 additions & 2 deletions test/common/integration/quic_test_server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Envoy {

Network::TransportSocketFactoryPtr QuicTestServer::createUpstreamTlsContext(
Network::DownstreamTransportSocketFactoryPtr QuicTestServer::createUpstreamTlsContext(
testing::NiceMock<Server::Configuration::MockTransportSocketFactoryContext>& factory_context) {
envoy::extensions::transport_sockets::tls::v3::DownstreamTlsContext tls_context;
Extensions::TransportSockets::Tls::ContextManagerImpl context_manager{time_system_};
Expand Down Expand Up @@ -47,7 +47,7 @@ void QuicTestServer::startQuicTestServer() {

upstream_config_.upstream_protocol_ = Http::CodecType::HTTP3;

Network::TransportSocketFactoryPtr factory = createUpstreamTlsContext(factory_context_);
Network::DownstreamTransportSocketFactoryPtr factory = createUpstreamTlsContext(factory_context_);

upstream_ =
std::make_unique<AutonomousUpstream>(std::move(factory), port_, version_, upstream_config_);
Expand Down
2 changes: 1 addition & 1 deletion test/common/integration/quic_test_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class QuicTestServer {
ProcessWide process_wide;
Thread::MutexBasicLockable lock;

Network::TransportSocketFactoryPtr createUpstreamTlsContext(
Network::DownstreamTransportSocketFactoryPtr createUpstreamTlsContext(
testing::NiceMock<Server::Configuration::MockTransportSocketFactoryContext>&);

public:
Expand Down