tap: fix upstream streamed transport socket taps (#13638)

Fixes https://github.com/envoyproxy/envoy/issues/13608

Signed-off-by: Matt Klein <mklein@lyft.com>

Mirrored from https://github.com/envoyproxy/envoy @ b0cf5f6a272e4f79f2287a22364b65a791f8981e

envoy/config/common/tap/v2alpha/BUILD

@@ -6,7 +6,6 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "//envoy/api/v2/core:pkg",
         "//envoy/service/tap/v2alpha:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],

envoy/config/common/tap/v2alpha/common.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.config.common.tap.v2alpha;
 
-import "envoy/api/v2/core/config_source.proto";
 import "envoy/service/tap/v2alpha/common.proto";
 
 import "udpa/annotations/migrate.proto";
@@ -19,15 +18,6 @@ option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // Common configuration for all tap extensions.
 message CommonExtensionConfig {
-  // [#not-implemented-hide:]
-  message TapDSConfig {
-    // Configuration for the source of TapDS updates for this Cluster.
-    api.v2.core.ConfigSource config_source = 1 [(validate.rules).message = {required: true}];
-
-    // Tap config to request from XDS server.
-    string name = 2 [(validate.rules).string = {min_bytes: 1}];
-  }
-
   oneof config_type {
     option (validate.required) = true;
 
@@ -37,9 +27,6 @@ message CommonExtensionConfig {
     // If specified, the tap filter will be configured via a static configuration that cannot be
     // changed.
     service.tap.v2alpha.TapConfig static_config = 2;
-
-    // [#not-implemented-hide:] Configuration to use for TapDS updates for the filter.
-    TapDSConfig tapds_config = 3;
   }
 }
 

envoy/extensions/common/tap/v3/BUILD

@@ -7,7 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/common/tap/v2alpha:pkg",
-        "//envoy/config/core/v3:pkg",
         "//envoy/config/tap/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
         "@com_github_cncf_udpa//udpa/core/v1:pkg",

envoy/extensions/common/tap/v3/common.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.extensions.common.tap.v3;
 
-import "envoy/config/core/v3/config_source.proto";
 import "envoy/config/tap/v3/common.proto";
 
 import "udpa/core/v1/resource_locator.proto";
@@ -24,23 +23,6 @@ message CommonExtensionConfig {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.config.common.tap.v2alpha.CommonExtensionConfig";
 
-  // [#not-implemented-hide:]
-  message TapDSConfig {
-    option (udpa.annotations.versioning).previous_message_type =
-        "envoy.config.common.tap.v2alpha.CommonExtensionConfig.TapDSConfig";
-
-    // Configuration for the source of TapDS updates for this Cluster.
-    config.core.v3.ConfigSource config_source = 1 [(validate.rules).message = {required: true}];
-
-    // Tap config to request from XDS server.
-    string name = 2 [(udpa.annotations.field_migrate).oneof_promotion = "name_specifier"];
-
-    // Resource locator for TAP. This is mutually exclusive to *name*.
-    // [#not-implemented-hide:]
-    udpa.core.v1.ResourceLocator tap_resource_locator = 3
-        [(udpa.annotations.field_migrate).oneof_promotion = "name_specifier"];
-  }
-
   oneof config_type {
     option (validate.required) = true;
 
@@ -50,9 +32,6 @@ message CommonExtensionConfig {
     // If specified, the tap filter will be configured via a static configuration that cannot be
     // changed.
     config.tap.v3.TapConfig static_config = 2;
-
-    // [#not-implemented-hide:] Configuration to use for TapDS updates for the filter.
-    TapDSConfig tapds_config = 3;
   }
 }
 

envoy/extensions/common/tap/v4alpha/BUILD

@@ -6,7 +6,6 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "//envoy/config/core/v4alpha:pkg",
         "//envoy/config/tap/v4alpha:pkg",
         "//envoy/extensions/common/tap/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",

envoy/extensions/common/tap/v4alpha/common.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package envoy.extensions.common.tap.v4alpha;
 
-import "envoy/config/core/v4alpha/config_source.proto";
 import "envoy/config/tap/v4alpha/common.proto";
 
 import "udpa/core/v1/resource_locator.proto";
@@ -23,25 +22,6 @@ message CommonExtensionConfig {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.extensions.common.tap.v3.CommonExtensionConfig";
 
-  // [#not-implemented-hide:]
-  message TapDSConfig {
-    option (udpa.annotations.versioning).previous_message_type =
-        "envoy.extensions.common.tap.v3.CommonExtensionConfig.TapDSConfig";
-
-    // Configuration for the source of TapDS updates for this Cluster.
-    config.core.v4alpha.ConfigSource config_source = 1
-        [(validate.rules).message = {required: true}];
-
-    oneof name_specifier {
-      // Tap config to request from XDS server.
-      string name = 2;
-
-      // Resource locator for TAP. This is mutually exclusive to *name*.
-      // [#not-implemented-hide:]
-      udpa.core.v1.ResourceLocator tap_resource_locator = 3;
-    }
-  }
-
   oneof config_type {
     option (validate.required) = true;
 
@@ -51,9 +31,6 @@ message CommonExtensionConfig {
     // If specified, the tap filter will be configured via a static configuration that cannot be
     // changed.
     config.tap.v4alpha.TapConfig static_config = 2;
-
-    // [#not-implemented-hide:] Configuration to use for TapDS updates for the filter.
-    TapDSConfig tapds_config = 3;
   }
 }