remove google_com_proxy.yaml

Signed-off-by: Ryan Northey <ryan@synca.io>
envoyproxy · Oct 22, 2020 · 547e216 · 547e216
1 parent 034a7e2
commit 547e216
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 62 deletions.
diff --git a/configs/configgen.py b/configs/configgen.py
@@ -138,6 +138,6 @@ def generate_config(template_path, template, output_file, **context):
                 external_virtual_hosts=external_virtual_hosts,
                 mongos_servers=mongos_servers)
 
-shutil.copy(os.path.join(SCRIPT_DIR, 'google_com_proxy.yaml'), OUT_DIR)
+shutil.copy(os.path.join(SCRIPT_DIR, 'envoyproxy_io_proxy.yaml'), OUT_DIR)
 shutil.copy(os.path.join(SCRIPT_DIR, 'encapsulate_in_connect.yaml'), OUT_DIR)
 shutil.copy(os.path.join(SCRIPT_DIR, 'terminate_connect.yaml'), OUT_DIR)
diff --git a/configs/google_com_proxy.yaml b/configs/google_com_proxy.yaml
diff --git a/docs/root/start/start.rst b/docs/root/start/start.rst
@@ -32,7 +32,7 @@ more detailed explanation of the configuration file and execution steps for
 the same configuration.
 
 A very minimal Envoy configuration that can be used to validate basic plain HTTP
-proxying is available in :repo:`configs/google_com_proxy.yaml`. This is not
+proxying is available in :repo:`configs/envoyproxy_io_proxy.yaml`. This is not
 intended to represent a realistic Envoy deployment:
 
 .. substitution-code-block:: none
@@ -43,7 +43,7 @@ intended to represent a realistic Envoy deployment:
 
 The Docker image used will contain the latest version of Envoy
 and a basic Envoy configuration. This basic configuration tells
-Envoy to route incoming requests to \*.google.com.
+Envoy to route incoming requests to www.envoyproxy.io.
 
 Simple Configuration
 --------------------

diff --git a/test/config_test/config_test.cc b/test/config_test/config_test.cc
@@ -160,7 +160,7 @@ void testMerge() {
   Api::ApiPtr api = Api::createApiForTest();
 
   const std::string overlay = "static_resources: { clusters: [{name: 'foo'}]}";
-  OptionsImpl options(Server::createTestOptionsImpl("google_com_proxy.yaml", overlay,
+  OptionsImpl options(Server::createTestOptionsImpl("envoyproxy_io_proxy.yaml", overlay,
                                                     Network::Address::IpVersion::v6));
   envoy::config::bootstrap::v3::Bootstrap bootstrap;
   Server::InstanceUtil::loadBootstrapConfig(bootstrap, options,

diff --git a/test/server/config_validation/server_test.cc b/test/server/config_validation/server_test.cc
@@ -134,7 +134,7 @@ TEST_P(ValidationServerTest, NoopLifecycleNotifier) {
 // as-is. (Note, /dev/stdout as an access log file is invalid on Windows, no equivalent /dev/
 // exists.)
 
-auto testing_values = ::testing::Values("front-proxy_front-envoy.yaml", "google_com_proxy.yaml",
+auto testing_values = ::testing::Values("front-proxy_front-envoy.yaml", "envoyproxy_io_proxy.yaml",
 #ifndef WIN32
                                         "grpc-bridge_server_envoy-proxy.yaml",
 #endif

diff --git a/tools/config_validation/validate_fragment.py b/tools/config_validation/validate_fragment.py
@@ -3,7 +3,7 @@
 # Example usage:
 #
 # bazel run //tools/config_validation:validate_fragment -- \
-#   envoy.config.bootstrap.v3.Bootstrap $PWD/configs/google_com_proxy.yaml
+#   envoy.config.bootstrap.v3.Bootstrap $PWD/configs/envoyproxy_io_proxy.yaml
 
 import json
 import pathlib

diff --git a/tools/envoy_collect/envoy_collect.py b/tools/envoy_collect/envoy_collect.py
@@ -4,7 +4,7 @@
 Example use:
 
   ./tools/envoy_collect.py --output-path=./envoy.tar -c
-  ./configs/google_com_proxy.yaml --service-node foo
+  ./configs/envoyproxy_io_proxy.yaml --service-node foo
   <Ctrl-C>
   tar -tvf ./envoy.tar
   -rw------- htuch/eng         0 2017-08-13 21:13 access_0.log