release: 1.18.1 (#16020)

Signed-off-by: Alyssa Wilk <[email protected]>
envoyproxy · Apr 15, 2021 · 9614605 · 9614605
1 parent 345ffe3
commit 9614605
Show file tree

Hide file tree

Showing 8 changed files with 218 additions and 212 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.18.0
+1.18.1
diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst
diff --git a/docs/root/version_history/v1.18.0.rst b/docs/root/version_history/v1.18.0.rst
diff --git a/docs/root/version_history/version_history.rst b/docs/root/version_history/version_history.rst
@@ -7,6 +7,7 @@ Version history
   :titlesonly:
 
   current
+  v1.18.0
   v1.17.2
   v1.17.1
   v1.17.0

diff --git a/source/common/common/interval_value.h b/source/common/common/interval_value.h
@@ -25,11 +25,10 @@ template <typename T, typename Interval> class ClosedIntervalValue {
   // Returns a value that is as far from max as the original value is from min.
   // This guarantees that max().invert() == min() and min().invert() == max().
   ClosedIntervalValue invert() const {
-    return ClosedIntervalValue(value_ == Interval::max_value
-                                   ? Interval::min_value
-                                   : value_ == Interval::min_value
-                                         ? Interval::max_value
-                                         : Interval::max_value - (value_ - Interval::min_value));
+    return ClosedIntervalValue(value_ == Interval::max_value ? Interval::min_value
+                               : value_ == Interval::min_value
+                                   ? Interval::max_value
+                                   : Interval::max_value - (value_ - Interval::min_value));
   }
 
   // Comparisons are performed using the same operators on the underlying value

diff --git a/source/common/local_reply/local_reply.cc b/source/common/local_reply/local_reply.cc
@@ -25,12 +25,11 @@ class BodyFormatter {
   BodyFormatter(const envoy::config::core::v3::SubstitutionFormatString& config, Api::Api& api)
       : formatter_(Formatter::SubstitutionFormatStringUtils::fromProtoConfig(config, api)),
         content_type_(
-            !config.content_type().empty()
-                ? config.content_type()
-                : config.format_case() ==
-                          envoy::config::core::v3::SubstitutionFormatString::FormatCase::kJsonFormat
-                      ? Http::Headers::get().ContentTypeValues.Json
-                      : Http::Headers::get().ContentTypeValues.Text) {}
+            !config.content_type().empty() ? config.content_type()
+            : config.format_case() ==
+                    envoy::config::core::v3::SubstitutionFormatString::FormatCase::kJsonFormat
+                ? Http::Headers::get().ContentTypeValues.Json
+                : Http::Headers::get().ContentTypeValues.Text) {}
 
   void format(const Http::RequestHeaderMap& request_headers,
               const Http::ResponseHeaderMap& response_headers,

diff --git a/test/common/network/apple_dns_impl_test.cc b/test/common/network/apple_dns_impl_test.cc
@@ -350,12 +350,12 @@ TEST_F(AppleDnsImplFakeApiTest, SynchronousErrorInGetAddrInfo) {
   // The Query's sd ref will be deallocated.
   EXPECT_CALL(dns_service_, dnsServiceRefDeallocate(_));
 
-  EXPECT_EQ(nullptr, resolver_->resolve(
-                         "foo.com", Network::DnsLookupFamily::Auto,
-                         [](DnsResolver::ResolutionStatus, std::list<DnsResponse> &&) -> void {
-                           // This callback should never be executed.
-                           FAIL();
-                         }));
+  EXPECT_EQ(nullptr,
+            resolver_->resolve("foo.com", Network::DnsLookupFamily::Auto,
+                               [](DnsResolver::ResolutionStatus, std::list<DnsResponse>&&) -> void {
+                                 // This callback should never be executed.
+                                 FAIL();
+                               }));
 }
 
 TEST_F(AppleDnsImplFakeApiTest, QuerySynchronousCompletion) {
@@ -428,7 +428,7 @@ TEST_F(AppleDnsImplFakeApiTest, IncorrectInterfaceIndexReturned) {
 
   resolver_->resolve(
       hostname, Network::DnsLookupFamily::Auto,
-      [](DnsResolver::ResolutionStatus, std::list<DnsResponse> &&) -> void { FAIL(); });
+      [](DnsResolver::ResolutionStatus, std::list<DnsResponse>&&) -> void { FAIL(); });
 }
 
 TEST_F(AppleDnsImplFakeApiTest, QueryCompletedWithError) {
@@ -785,7 +785,7 @@ TEST_F(AppleDnsImplFakeApiTest, ResultWithNullAddress) {
 
   auto query = resolver_->resolve(
       hostname, Network::DnsLookupFamily::Auto,
-      [](DnsResolver::ResolutionStatus, std::list<DnsResponse> &&) -> void { FAIL(); });
+      [](DnsResolver::ResolutionStatus, std::list<DnsResponse>&&) -> void { FAIL(); });
   ASSERT_NE(nullptr, query);
 
   EXPECT_DEATH(reply_callback(nullptr, kDNSServiceFlagsAdd, 0, kDNSServiceErr_NoError,

diff --git a/test/test_common/environment.cc b/test/test_common/environment.cc
@@ -362,9 +362,9 @@ std::string TestEnvironment::temporaryFileSubstitute(const std::string& path,
   out_json_string = substitute(out_json_string, version);
 
   auto name = Filesystem::fileSystemForTest().splitPathFromFilename(path).file_;
-  const std::string extension = absl::EndsWith(name, ".yaml")
-                                    ? ".yaml"
-                                    : absl::EndsWith(name, ".pb_text") ? ".pb_text" : ".json";
+  const std::string extension = absl::EndsWith(name, ".yaml")      ? ".yaml"
+                                : absl::EndsWith(name, ".pb_text") ? ".pb_text"
+                                                                   : ".json";
   const std::string out_json_path =
       TestEnvironment::temporaryPath(name) + ".with.ports" + extension;
   {
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ Version history @@
       :titlesonly:
       current
+      v1.18.0
       v1.17.2
       v1.17.1
       v1.17.0
@@ Expand Down @@