build: Support tags[] arg for more specific build control (envoyproxy#8233)

Support tags[] arg for more specific build control.
Where the underlying bazel primitives support tags[], envoy_() should support them.

Risk Level: Low
Testing: Local on Windows and Linux CI

Signed-off-by: Yechiel Kalmenson <[email protected]>

Author: achasveachas

api/bazel/api_build_system.bzl

@@ -105,6 +105,7 @@ def api_proto_library(
         visibility = ["//visibility:private"],
         srcs = [],
         deps = [],
+        tags = [],
         external_proto_deps = [],
         external_cc_proto_deps = [],
         external_py_proto_deps = [],
@@ -116,6 +117,7 @@ def api_proto_library(
         name = name,
         srcs = srcs,
         deps = deps + external_proto_deps + _COMMON_PROTO_DEPS,
+        tags = tags,
         visibility = visibility,
     )
     cc_proto_library_name = _Suffix(name, _CC_SUFFIX)

bazel/envoy_binary.bzl

@@ -19,7 +19,8 @@ def envoy_cc_binary(
         repository = "",
         stamped = False,
         deps = [],
-        linkopts = []):
+        linkopts = [],
+        tags = []):
     if not linkopts:
         linkopts = _envoy_linkopts()
     if stamped:
@@ -38,6 +39,7 @@ def envoy_cc_binary(
         malloc = tcmalloc_external_dep(repository),
         stamp = 1,
         deps = deps,
+        tags = tags,
     )
 
 # Select the given values if exporting is enabled in the current build.

bazel/envoy_test.bzl

@@ -93,6 +93,7 @@ def envoy_cc_fuzz_test(
             repository + "//bazel:dynamic_stdlib",
         ],
         repository = repository,
+        tags = tags,
         **kwargs
     )
     native.cc_test(
@@ -155,21 +156,24 @@ def envoy_cc_test(
         coverage = True,
         local = False,
         size = "medium"):
-    test_lib_tags = []
     if coverage:
-        test_lib_tags.append("coverage_test_lib")
+        coverage_tags = tags + ["coverage_test_lib"]
+    else:
+        coverage_tags = tags
     _envoy_cc_test_infrastructure_library(
         name = name + "_lib_internal_only",
         srcs = srcs,
         data = data,
         external_deps = external_deps,
         deps = deps + [repository + "//test/test_common:printers_includes"],
         repository = repository,
-        tags = test_lib_tags,
+        tags = coverage_tags,
         copts = copts,
         # Allow public visibility so these can be consumed in coverage tests in external projects.
         visibility = ["//visibility:public"],
     )
+    if coverage:
+        coverage_tags = tags + ["coverage_test"]
     native.cc_test(
         name = name,
         copts = envoy_copts(repository, test = True) + copts,
@@ -183,7 +187,7 @@ def envoy_cc_test(
         # from https://github.com/google/googletest/blob/6e1970e2376c14bf658eb88f655a054030353f9f/googlemock/src/gmock.cc#L51
         # 2 - by default, mocks act as StrictMocks.
         args = args + ["--gmock_default_mock_behavior=2"],
-        tags = tags + ["coverage_test"],
+        tags = coverage_tags,
         local = local,
         shard_count = shard_count,
         size = size,
@@ -254,6 +258,7 @@ def envoy_sh_test(
         srcs = [],
         data = [],
         coverage = True,
+        tags = [],
         **kargs):
     if coverage:
         test_runner_cc = name + "_test_runner.cc"
@@ -268,13 +273,14 @@ def envoy_sh_test(
             name = name + "_lib",
             srcs = [test_runner_cc],
             data = srcs + data,
-            tags = ["coverage_test_lib"],
+            tags = tags + ["coverage_test_lib"],
             deps = ["//test/test_common:environment_lib"],
         )
     native.sh_test(
         name = name,
         srcs = ["//bazel:sh_test_wrapper.sh"],
         data = srcs + data,
         args = srcs,
+        tags = tags,
         **kargs
     )