From 67fb6069ea1c4431cd096ab0f3b553ae4c85ab64 Mon Sep 17 00:00:00 2001 From: "data-plane-api(Azure Pipelines)" Date: Mon, 13 Sep 2021 19:09:22 +0000 Subject: [PATCH] api: remove generated_api_shadow (#18091) Signed-off-by: Harvey Tuch Mirrored from https://github.com/envoyproxy/envoy @ b0e15260326d0d6175bc2271fb712f2f1efb029e --- STYLE.md | 5 ++--- tools/generate_listeners_test.py | 2 +- tools/tap2pcap.py | 2 +- tools/tap2pcap_test.py | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/STYLE.md b/STYLE.md index b185be97..485ab575 100644 --- a/STYLE.md +++ b/STYLE.md @@ -144,9 +144,8 @@ To add an extension config to the API, the steps below should be followed: (`option (udpa.annotations.file_status).package_version_status = ACTIVE;`). This is required to automatically include the config proto in [api/versioning/BUILD](versioning/BUILD). 1. Add a reference to the v3 extension config in (1) in [api/versioning/BUILD](versioning/BUILD) under `active_protos`. -1. Run `./tools/proto_format/proto_format.sh fix`. This should regenerate the `BUILD` file, - reformat `foobar.proto` as needed and also generate the shadow API protos. -1. `git add api/ generated_api_shadow/` to add any new files to your Git index. +1. Run `./tools/proto_format/proto_format.sh fix`. This should regenerate the `BUILD` file and + reformat `foobar.proto` as needed. ## API annotations diff --git a/tools/generate_listeners_test.py b/tools/generate_listeners_test.py index f67ef4bb..1defb3f6 100644 --- a/tools/generate_listeners_test.py +++ b/tools/generate_listeners_test.py @@ -5,7 +5,7 @@ import os import generate_listeners if __name__ == "__main__": - srcdir = os.path.join(os.getenv("TEST_SRCDIR"), 'envoy_api_canonical') + srcdir = os.path.join(os.getenv("TEST_SRCDIR"), 'envoy_api') generate_listeners.generate_listeners( os.path.join(srcdir, "examples/service_envoy/listeners.pb"), "/dev/stdout", "/dev/stdout", iter([os.path.join(srcdir, "examples/service_envoy/http_connection_manager.pb")])) diff --git a/tools/tap2pcap.py b/tools/tap2pcap.py index 93a86103..bcb13fdf 100644 --- a/tools/tap2pcap.py +++ b/tools/tap2pcap.py @@ -8,7 +8,7 @@ tap files; it is not a literal wire tap. Usage: -bazel run @envoy_api_canonical//tools:tap2pcap +bazel run @envoy_api//tools:tap2pcap Known issues: - IPv6 PCAP generation has malformed TCP packets. This appears to be a text2pcap diff --git a/tools/tap2pcap_test.py b/tools/tap2pcap_test.py index fd13cf32..c0151846 100644 --- a/tools/tap2pcap_test.py +++ b/tools/tap2pcap_test.py @@ -11,7 +11,7 @@ import tap2pcap # a golden output file for the tshark dump. Since we run tap2pcap in a # subshell with a limited environment, the inferred time zone should be UTC. if __name__ == '__main__': - srcdir = os.path.join(os.getenv('TEST_SRCDIR'), 'envoy_api_canonical') + srcdir = os.path.join(os.getenv('TEST_SRCDIR'), 'envoy_api') tap_path = os.path.join(srcdir, 'tools/data/tap2pcap_h2_ipv4.pb_text') expected_path = os.path.join(srcdir, 'tools/data/tap2pcap_h2_ipv4.txt') pcap_path = os.path.join(os.getenv('TEST_TMPDIR'), 'generated.pcap')