Skip to content
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.

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

Detachable slot #11

Closed
wants to merge 68 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
a896a66
resolve the life-cycle race between a slotImpl and callbacks pointing…
stevenzzzz Sep 3, 2019
e7436c6
add minor comment
stevenzzzz Sep 3, 2019
6fe9bcb
fixes for feedbacks from Matt
stevenzzzz Sep 4, 2019
2d1538c
fix format
stevenzzzz Sep 4, 2019
fe349bd
add tidy error fixes
stevenzzzz Sep 5, 2019
11e1d85
fixes for Matt feedbacks, 2
stevenzzzz Sep 5, 2019
038cb7c
fixes for feedbacks matt 3
stevenzzzz Sep 5, 2019
0b5292c
fix clang-tidy errors.
stevenzzzz Sep 5, 2019
76fbf31
refactor out the schedule-cleanup-callback complexity by firing a pos…
stevenzzzz Sep 10, 2019
e59f479
fix header order
stevenzzzz Sep 10, 2019
d9db13f
fix comment
stevenzzzz Sep 10, 2019
9458453
add more comment to the tls
stevenzzzz Sep 10, 2019
4c05c8b
Merge branch 'master' of https://github.com/envoyproxy/envoy into det…
stevenzzzz Sep 10, 2019
07a3bbc
Merge branch 'master' of https://github.com/envoyproxy/envoy into det…
stevenzzzz Sep 11, 2019
b02bc34
if only I know how to run typo CI locally
stevenzzzz Sep 11, 2019
8c28a4f
http inspector: rename h2 to h2c (#8227)
yxue Sep 17, 2019
616347f
route check tool: add support for outputting missing tests (#8240)
Sep 17, 2019
4d19eda
docs: minor deprecation note (#8207)
kyessenov Sep 17, 2019
fbd9aa5
bazel: Update protobuf and other needed dependencies (#8196)
vadorovsky Sep 17, 2019
99004b8
http inspector:inline the recv in the onAccept (#8111)
lambdai Sep 17, 2019
2f5f947
added tracing capability to ext-authz http client (#8142)
Sep 17, 2019
3351107
api: remove vNalphaM as style guide recommendation. (#8269)
htuch Sep 17, 2019
0bce3a1
build: Support tags[] arg for more specific build control (#8233)
achasveachas Sep 17, 2019
358793b
api: remove v2-api-diff annotation. (#8270)
htuch Sep 17, 2019
9041978
test: remove CONSTRUCT_ON_FIRST_USE from ads_integration_test (#8272)
fredlas Sep 18, 2019
c62625b
Upgrade opencensus-cpp to get Stackdriver exporter improvements. (#8277)
g-easy Sep 18, 2019
069f50c
tests: fix negative private key sync test. (#8264)
ipuustin Sep 18, 2019
166b0fa
http: only accept HTTP client magic at the start of buffer (#8232)
zuercher Sep 18, 2019
2a5aac5
Merge branch 'master' of https://github.com/envoyproxy/envoy into det…
stevenzzzz Sep 18, 2019
40fdb42
add wrapper around new slot
stevenzzzz Sep 18, 2019
43c91d8
access_log: check for reopen flag on flush interval (#8261)
zuercher Sep 19, 2019
1f8c137
access log: add support downstream direct remote address (#8278)
lizan Sep 19, 2019
0e63f5a
make test/integration:http_subset_lb_integration_test IP version envi…
stevenzzzz Sep 19, 2019
272ee70
quiche: implement QUIC specific TransportSocketFactory for TLS contex…
danzh2010 Sep 19, 2019
d42e14e
xDS: gRPC connection failure shouldn't make Envoy continue startup (#…
l8huang Sep 19, 2019
32e6018
api: add go proto generation script (#8155)
kyessenov Sep 19, 2019
219e8b9
grpc-json: add option to convert gRPC status into JSON body (#3383) (…
ascheglov Sep 19, 2019
b7233cb
docs: fix email cc typo (#8296)
asraa Sep 19, 2019
3c4e5bf
add debug log (#8294)
ramaraochavali Sep 19, 2019
35b459f
doc: fix formatting of regexes, disconnected comment (#8285)
zuercher Sep 19, 2019
6e8b312
stats: In StatNameSet, differentiate between dynamic and builtin name…
jmarantz Sep 19, 2019
22712d2
api: some comment cleanups in preparation for v3 proto transforms. (#…
htuch Sep 20, 2019
647aea1
proto: re-implement MessageUtil::hash function to consistently hash A…
lizan Sep 20, 2019
a743395
server: expose ProcessContext via the Api interface (#8258)
eziskind Sep 20, 2019
ca3056b
cds: Configure LRS in CDS response (#7953)
markdroth Sep 20, 2019
483aa09
per-worker listener and watchdog stats (#8263)
mattklein123 Sep 20, 2019
72fc360
xds: Add self config source type. (#8201)
markdroth Sep 20, 2019
98c35ef
ci: temporarily disable go_mirror while figuring out SSH keys (#8311)
lizan Sep 20, 2019
081b0b9
lds: Add HTTP API listener. (#8170)
markdroth Sep 23, 2019
08b123a
api: protoxform tool and API reformat. (#8309)
htuch Sep 23, 2019
2fd5fe6
grpc: Separate out grpc_init into its own class (#8293)
jmarantz Sep 23, 2019
733abbe
http: turning on absolute url support by default (#8329)
alyssawilk Sep 23, 2019
24668f2
build: update rules_foreign_cc (#8330)
asraa Sep 23, 2019
bbae4a7
Continuous Fuzzing Integration with Fuzzit (#7509)
yevgenypats Sep 23, 2019
74ced53
ci: add protoxform as a check/fix_format step. (#8331)
htuch Sep 23, 2019
5518034
protoxform: remove blank line spacing in any enum with no comments. (…
htuch Sep 23, 2019
1f7f90f
Add a transport socket match in cluster. (#8100)
Sep 23, 2019
7d8e9de
config: handling deprecated enum values (#8281)
alyssawilk Sep 24, 2019
e07dc53
api: fixing format build (#8345)
alyssawilk Sep 24, 2019
7bd7c46
runtime: Add getDouble functionality to snapshot (#8265)
Sep 24, 2019
c41cfbf
api: sync v2 -> v3alpha. (#8346)
htuch Sep 24, 2019
7eb6a5b
check_format: remove proto options handling. (#8347)
htuch Sep 24, 2019
ccb303f
Fix grpc transcoding content type not matching response body (#8312)
nareddyt Sep 24, 2019
00bfaf9
update fuzzit CLI to v2.4.57 (#8342)
Sep 24, 2019
7ca15c4
ci: move format check to azp (#8353)
lizan Sep 24, 2019
c1d1b8a
api: improve performance of protodoc and protoxform file copies. (#8336)
htuch Sep 24, 2019
26dce9f
Merge branch 'master' of https://github.com/envoyproxy/envoy into det…
stevenzzzz Sep 25, 2019
bedd479
add unit test to thread_local_impl
stevenzzzz Oct 3, 2019
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
Prev Previous commit
Next Next commit
check_format: remove proto options handling. (envoyproxy#8347)
This has been subsumed into protoxform.

Risk level: Low (developer formatting tool)
Testing: check/fix_format.

Signed-off-by: Harvey Tuch <[email protected]>
  • Loading branch information
htuch authored Sep 24, 2019
commit 7eb6a5b7e7ea1987d30b832ea25818e5ff57aef4
59 changes: 0 additions & 59 deletions tools/check_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@
INCLUDE_ANGLE_LEN = len(INCLUDE_ANGLE)
PROTO_PACKAGE_REGEX = re.compile(r"^package (\S+);\n*", re.MULTILINE)
X_ENVOY_USED_DIRECTLY_REGEX = re.compile(r'.*\"x-envoy-.*\".*')
PROTO_OPTION_JAVA_PACKAGE = "option java_package = \""
PROTO_OPTION_JAVA_OUTER_CLASSNAME = "option java_outer_classname = \""
PROTO_OPTION_JAVA_MULTIPLE_FILES = "option java_multiple_files = "
PROTO_OPTION_GO_PACKAGE = "option go_package = \""

# yapf: disable
PROTOBUF_TYPE_ERRORS = {
Expand Down Expand Up @@ -253,21 +249,6 @@ def checkNamespace(file_path):
return []


# If the substring is not found in the file, then insert to_add
def insertProtoOptionIfNotFound(substring, file_path, to_add):
text = None
with open(file_path) as f:
text = f.read()

if not substring in text:

def repl(m):
return m.group(0).rstrip() + "\n\n" + to_add + "\n"

with open(file_path, "w") as f:
f.write(re.sub(PROTO_PACKAGE_REGEX, repl, text))


def packageNameForProto(file_path):
package_name = None
error_message = []
Expand All @@ -281,32 +262,6 @@ def packageNameForProto(file_path):
return [package_name, error_message]


def fixJavaPackageProtoOption(file_path):
package_name = packageNameForProto(file_path)[0]
to_add = PROTO_OPTION_JAVA_PACKAGE + "io.envoyproxy.{}\";".format(package_name)
insertProtoOptionIfNotFound("\n" + PROTO_OPTION_JAVA_PACKAGE, file_path, to_add)
return []


# Add "option java_outer_classname = FooBarProto;" for foo_bar.proto
def fixJavaOuterClassnameProtoOption(file_path):
file_name = os.path.basename(file_path)[:-len(".proto")]
if "-" in file_name or "." in file_name or not file_name.islower():
return ["Unable to decide java_outer_classname for proto file: %s" % file_path]

to_add = PROTO_OPTION_JAVA_OUTER_CLASSNAME \
+ "".join(x.title() for x in file_name.split("_")) \
+ "Proto\";"
insertProtoOptionIfNotFound("\n" + PROTO_OPTION_JAVA_OUTER_CLASSNAME, file_path, to_add)
return []


def fixJavaMultipleFilesProtoOption(file_path):
to_add = PROTO_OPTION_JAVA_MULTIPLE_FILES + "true;"
insertProtoOptionIfNotFound("\n" + PROTO_OPTION_JAVA_MULTIPLE_FILES, file_path, to_add)
return []


# To avoid breaking the Lyft import, we just check for path inclusion here.
def whitelistedForProtobufDeps(file_path):
return (file_path.endswith(PROTO_SUFFIX) or file_path.endswith(REPOSITORIES_BZL) or \
Expand Down Expand Up @@ -677,10 +632,6 @@ def fixSourcePath(file_path):
package_name, error_message = packageNameForProto(file_path)
if package_name is None:
error_messages += error_message
else:
error_messages += fixJavaMultipleFilesProtoOption(file_path)
error_messages += fixJavaOuterClassnameProtoOption(file_path)
error_messages += fixJavaPackageProtoOption(file_path)
return error_messages


Expand All @@ -700,16 +651,6 @@ def checkSourcePath(file_path):
package_name, error_message = packageNameForProto(file_path)
if package_name is None:
error_messages += error_message
else:
error_messages += errorIfNoSubstringFound("\n" + PROTO_OPTION_JAVA_PACKAGE, file_path,
"Java proto option 'java_package' not set")
error_messages += errorIfNoSubstringFound("\n" + PROTO_OPTION_JAVA_OUTER_CLASSNAME, file_path,
"Java proto option 'java_outer_classname' not set")
error_messages += errorIfNoSubstringFound("\n" + PROTO_OPTION_JAVA_MULTIPLE_FILES, file_path,
"Java proto option 'java_multiple_files' not set")
with open(file_path) as f:
if PROTO_OPTION_GO_PACKAGE in f.read():
error_messages += ["go_package option should not be set in %s" % file_path]
return error_messages


Expand Down
2 changes: 0 additions & 2 deletions tools/check_format_test_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,6 @@ def checkFileExpectingOK(filename):
errors += checkAndFixError("license.BUILD", "envoy_build_fixer check failed")
errors += checkAndFixError("bad_envoy_build_sys_ref.BUILD", "Superfluous '@envoy//' prefix")
errors += checkAndFixError("proto_format.proto", "clang-format check failed")
errors += checkAndFixError("api/java_options.proto", "Java proto option")
errors += checkFileExpectingError("api/go_package.proto", "go_package option should not be set")
errors += checkAndFixError(
"cpp_std.cc",
"term absl::make_unique< should be replaced with standard library term std::make_unique<")
Expand Down
5 changes: 0 additions & 5 deletions tools/testdata/check_format/api/go_package.proto

This file was deleted.

1 change: 0 additions & 1 deletion tools/testdata/check_format/api/java_options.proto

This file was deleted.

5 changes: 0 additions & 5 deletions tools/testdata/check_format/api/java_options.proto.gold

This file was deleted.