tooling: Fix format check (#2698)

Fix #2697

Signed-off-by: Ryan Northey ryan@synca.io

Author: phlax

library/cc/engine_builder.cc

@@ -70,8 +70,7 @@ EngineBuilder& EngineBuilder::addDnsQueryTimeoutSeconds(int dns_query_timeout_se
   return *this;
 }
 
-EngineBuilder&
-EngineBuilder::addDnsPreresolveHostnames(std::string dns_preresolve_hostnames) {
+EngineBuilder& EngineBuilder::addDnsPreresolveHostnames(std::string dns_preresolve_hostnames) {
   this->dns_preresolve_hostnames_ = std::move(dns_preresolve_hostnames);
   return *this;
 }
@@ -207,8 +206,7 @@ EngineBuilder& EngineBuilder::addStringAccessor(std::string name,
   return *this;
 }
 
-EngineBuilder& EngineBuilder::addNativeFilter(std::string name,
-                                              std::string typed_config) {
+EngineBuilder& EngineBuilder::addNativeFilter(std::string name, std::string typed_config) {
   native_filter_chain_.emplace_back(std::move(name), std::move(typed_config));
   return *this;
 }

library/cc/headers_builder.cc

@@ -11,8 +11,7 @@ HeadersBuilder& HeadersBuilder::add(std::string name, std::string value) {
   return *this;
 }
 
-HeadersBuilder& HeadersBuilder::set(std::string name,
-                                    std::vector<std::string> values) {
+HeadersBuilder& HeadersBuilder::set(std::string name, std::vector<std::string> values) {
   if (this->isRestrictedHeader(name)) {
     return *this;
   }
@@ -30,8 +29,7 @@ HeadersBuilder& HeadersBuilder::remove(const std::string& name) {
 
 HeadersBuilder::HeadersBuilder() {}
 
-HeadersBuilder& HeadersBuilder::internalSet(std::string name,
-                                            std::vector<std::string> values) {
+HeadersBuilder& HeadersBuilder::internalSet(std::string name, std::vector<std::string> values) {
   this->headers_[std::move(name)] = std::move(values);
   return *this;
 }

library/cc/request_headers_builder.cc

@@ -3,10 +3,8 @@
 namespace Envoy {
 namespace Platform {
 
-RequestHeadersBuilder::RequestHeadersBuilder(RequestMethod request_method,
-                                             std::string scheme,
-                                             std::string authority,
-                                             std::string path) {
+RequestHeadersBuilder::RequestHeadersBuilder(RequestMethod request_method, std::string scheme,
+                                             std::string authority, std::string path) {
   this->internalSet(":method", {requestMethodToString(request_method)});
   this->internalSet(":scheme", {std::move(scheme)});
   this->internalSet(":authority", {std::move(authority)});

library/cc/request_headers_builder.h

@@ -16,8 +16,8 @@ struct RetryPolicy;
 
 class RequestHeadersBuilder : public HeadersBuilder {
 public:
-  RequestHeadersBuilder(RequestMethod request_method, std::string scheme,
-                        std::string authority, std::string path);
+  RequestHeadersBuilder(RequestMethod request_method, std::string scheme, std::string authority,
+                        std::string path);
 
   RequestHeadersBuilder& addRetryPolicy(const RetryPolicy& retry_policy);
   RequestHeadersBuilder& addUpstreamHttpProtocol(UpstreamHttpProtocol upstream_http_protocol);

library/common/extensions/cert_validator/platform_bridge/platform_bridge.proto

@@ -2,4 +2,5 @@ syntax = "proto3";
 
 package envoy_mobile.extensions.cert_validator.platform_bridge;
 
-message PlatformBridgeCertValidator {}
+message PlatformBridgeCertValidator {
+}

tools/check_format.sh

@@ -22,9 +22,29 @@ TARGET_PATH="$2"
 
 # TODO(mattklein123): WORKSPACE is excluded due to warning about @bazel_tools reference. Fix here
 #                     or in the upstream checker.
-ENVOY_BAZEL_PREFIX=@envoy envoy/tools/code_format/check_format.py \
-    --config_path envoy/tools/code_format/config.yaml \
-    --add-excluded-prefixes ./envoy/ ./envoy_build_config/extensions_build_config.bzl ./WORKSPACE ./Envoy.xcodeproj/ ./dist/ ./library/common/config_template.cc ./bazel/envoy_mobile_swift_bazel_support.bzl ./bazel/envoy_mobile_repositories.bzl ./examples/swift/swiftpm/Packages/Envoy.xcframework \
-    --skip_envoy_build_rule_check "$ENVOY_FORMAT_ACTION" "$TARGET_PATH" \
-    --namespace_check_excluded_paths ./envoy ./examples/ ./library/java/ ./library/kotlin ./library/objective-c ./test/java ./test/java ./test/objective-c ./test/swift ./experimental/swift \
-    --build_fixer_check_excluded_paths ./envoy ./BUILD ./dist ./examples ./library/java ./library/kotlin ./library/objective-c ./library/swift ./library/common/extensions ./test/java ./test/kotlin ./test/objective-c ./test/swift ./experimental/swift
+
+FORMAT_ARGS=(
+    --config_path envoy/tools/code_format/config.yaml
+    --add-excluded-prefixes
+    ./envoy/ ./envoy_build_config/extensions_build_config.bzl ./WORKSPACE
+    ./Envoy.xcodeproj/ ./dist/ ./library/common/config_template.cc
+    ./bazel/envoy_mobile_swift_bazel_support.bzl
+    ./bazel/envoy_mobile_repositories.bzl
+    ./examples/swift/swiftpm/Packages/Envoy.xcframework
+    --skip_envoy_build_rule_check
+    "$ENVOY_FORMAT_ACTION")
+if [[ -n "$TARGET_PATH" ]]; then
+    FORMAT_ARGS+=("$TARGET_PATH")
+fi
+FORMAT_ARGS+=(
+    --namespace_check_excluded_paths
+    ./envoy ./examples/ ./library/java/ ./library/kotlin
+    ./library/objective-c ./test/java ./test/java
+    ./test/objective-c ./test/swift ./experimental/swift
+    --build_fixer_check_excluded_paths
+    ./envoy ./BUILD ./dist ./examples ./library/java
+    ./library/kotlin ./library/objective-c ./library/swift
+    ./library/common/extensions ./test/java ./test/kotlin ./test/objective-c
+    ./test/swift ./experimental/swift)
+
+ENVOY_BAZEL_PREFIX=@envoy envoy/tools/code_format/check_format.py "${FORMAT_ARGS[@]}"