test: fixing most tests for v2-config-only true

docs/root/intro/version_history.rst

@@ -3,6 +3,7 @@ Version history
 
 1.8.0 (Pending)
 ===============
+* config: v1 disabled by default (but still supported!)
 * http: response filters not applied to early error paths such as http_parser generated 400s.
 * ratelimit: added support for :repo:`api/envoy/service/ratelimit/v2/rls.proto`.
   Lyft's reference implementation of the `ratelimit <https://github.com/lyft/ratelimit>`_ service also supports the data-plane-api proto as of v1.1.0.

source/server/options_impl.cc

@@ -57,7 +57,7 @@ OptionsImpl::OptionsImpl(int argc, const char* const* argv,
   TCLAP::ValueArg<std::string> config_yaml(
       "", "config-yaml", "Inline YAML configuration, merges with the contents of --config-path",
       false, "", "string", cmd);
-  TCLAP::SwitchArg v2_config_only("", "v2-config-only", "parse config as v2 only", cmd, false);
+  TCLAP::SwitchArg v2_config_only("", "v2-config-only", "parse config as v2 only", cmd, true);
   TCLAP::ValueArg<std::string> admin_address_path("", "admin-address-path", "Admin address path",
                                                   false, "", "string", cmd);
   TCLAP::ValueArg<std::string> local_address_ip_version("", "local-address-ip-version",

test/config/integration/BUILD

@@ -10,6 +10,7 @@ envoy_package()
 exports_files([
     "echo_server.json",
     "server.json",
+    "server_v2.json",
     "server_ads.yaml",
     "server_cors_filter.json",
     "server_grpc_json_transcoder.json",
@@ -19,6 +20,7 @@ exports_files([
     "server_ssl.json",
     "server_uds.json",
     "server_unix_listener.json",
+    "server_unix_listener_v2.json",
     "server_xfcc.json",
     "tcp_proxy.json",
 ])
@@ -37,8 +39,8 @@ filegroup(
 filegroup(
     name = "server_config_files",
     srcs = [
-        "server.json",
-        "server_unix_listener.json",
+        "server_unix_listener_v2.json",
+        "server_v2.json",
     ],
 )
 

test/config/integration/server_unix_listener_v2.json

@@ -0,0 +1,82 @@
+{
+ "static_resources": {
+  "listeners": [
+   {
+    "address": {
+     "pipe": {
+      "path": "{{ socket_dir }}/unix-sockets.listener_0"
+     }
+    },
+    "filter_chains": [
+     {
+      "filters": [
+       {
+        "name": "envoy.http_connection_manager",
+        "config": {
+         "value": {
+          "filters": [
+           {
+            "type": "decoder",
+            "name": "router",
+            "config": {}
+           }
+          ],
+          "codec_type": "auto",
+          "stat_prefix": "router",
+          "drain_timeout_ms": 5000,
+          "route_config": {
+           "virtual_hosts": [
+            {
+             "domains": [
+              "*"
+             ],
+             "name": "vhost_0",
+             "routes": [
+              {
+               "prefix": "/",
+               "cluster": "cluster_0"
+              }
+             ]
+            }
+           ]
+          }
+         },
+         "deprecated_v1": true
+        },
+        "deprecated_v1": {
+         "type": "read"
+        }
+       }
+      ]
+     }
+    ]
+   }
+  ],
+  "clusters": [
+   {
+    "name": "cluster_0",
+    "connect_timeout": "5s",
+    "hosts": [
+     {
+      "socket_address": {
+       "address": "{{ ip_loopback_address }}",
+       "port_value": 0
+      }
+     }
+    ],
+    "dns_lookup_family": "V4_ONLY"
+   }
+  ]
+ },
+ "cluster_manager": {},
+ "watchdog": {},
+ "admin": {
+  "access_log_path": "/dev/null",
+  "address": {
+   "socket_address": {
+    "address": "{{ ip_loopback_address }}",
+    "port_value": 0
+   }
+  }
+ }
+}