dependencies: associate extensions with deps, validate use_category.

bazel/repositories.bzl

@@ -76,7 +76,8 @@ def _repository_locations():
             cpe = mutable_location.pop("cpe")
 
             # Starlark doesn't have regexes.
-            if cpe != "N/A" and (not cpe.startswith("cpe:2.3:a:") or not cpe.endswith(":*") and len(cpe.split(":")) != 6):
+            cpe_matches = (cpe != "N/A" and (not cpe.startswith("cpe:2.3:a:") or not cpe.endswith(":*") and len(cpe.split(":")) != 6))
+            if cpe_matches:
                 fail("CPE must match cpe:2.3:a:<facet>:<facet>:*: " + cpe)
         elif not [category for category in USE_CATEGORIES_WITH_CPE_OPTIONAL if category in location["use_category"]]:
             _fail_missing_attribute("cpe", key)

docs/generate_external_dep_rst.py

@@ -76,11 +76,8 @@ def RenderTitle(title):
     last_updated = v['last_updated']
     dep = Dep(name, project_name.lower(), version, cpe, last_updated)
     for category in v['use_category']:
-      if 'extensions' in v:
-        for ext in v['extensions']:
-          use_categories[category][ext].append(dep)
-      else:
-        use_categories[category]['core'].append(dep)
+      for ext in v.get('extensions', ['core']):
+        use_categories[category][ext].append(dep)
 
   def CsvRow(dep):
     return [dep.name, dep.version, dep.last_updated, dep.cpe]

source/exe/BUILD

@@ -108,7 +108,6 @@ envoy_cc_library(
     hdrs = ["main_common.h"],
     deps = [
         ":envoy_common_with_core_extensions_lib",
-        #":main_common_lib",
         ":platform_impl_lib",
         ":process_wide_lib",
         "//source/common/api:os_sys_calls_lib",

tools/dependency/validate.py

@@ -9,8 +9,8 @@
 import subprocess
 import sys
 
-from importlib.util import spec_from_loader, module_from_spec
 from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
 
 # bazel/repository_locations.bzl must have a .bzl suffix for Starlark import, so
 # we are forced to do this workaround.
@@ -59,11 +59,8 @@ def DepsByUseCategory(self, use_category):
     Returns:
       Set of dependency identifiers that match use_category.
     """
-    deps = set([])
-    for name, metadata in repository_locations.DEPENDENCY_REPOSITORIES.items():
-      if use_category in metadata['use_category']:
-        deps.add(name)
-    return deps
+    return set(name for name, metadata in repository_locations.DEPENDENCY_REPOSITORIES.items()
+               if use_category in metadata['use_category'])
 
   def GetMetadata(self, dependency):
     """Obtain repository metadata for a dependency.
@@ -75,7 +72,7 @@ def GetMetadata(self, dependency):
       A dictionary with the repository metadata as defined in
       bazel/repository_locations.bzl.
     """
-    return repository_locations.DEPENDENCY_REPOSITORIES.get(dependency, None)
+    return repository_locations.DEPENDENCY_REPOSITORIES.get(dependency)
 
 
 class BuildGraph(object):
@@ -93,7 +90,7 @@ def QueryExternalDeps(self, *targets):
     deps_query = ' union '.join(f'deps({l})' for l in targets)
     deps = subprocess.check_output(['bazel', 'query', deps_query],
                                    stderr=subprocess.PIPE).decode().splitlines()
-    ext_deps = set([])
+    ext_deps = set()
     for d in deps:
       match = BAZEL_QUERY_EXTERNAL_DEP_RE.match(d)
       if match:
@@ -131,7 +128,7 @@ def ValidateBuildGraphStructure(self):
         '//source/exe:envoy_main_common_with_core_extensions_lib', '//source/extensions/...')
     queried_all_deps = self._build_graph.QueryExternalDeps('//source/...')
     if queried_all_deps != queried_core_ext_deps:
-      raise DependencyError(f'Invalid build graph structure. deps(//source/...) != '
+      raise DependencyError('Invalid build graph structure. deps(//source/...) != '
                             'deps(//source/exe:envoy_main_common_with_core_extensions_lib) '
                             'union deps(//source/extensions/...)')
 
@@ -178,7 +175,8 @@ def ValidateDataPlaneCoreDeps(self):
   def ValidateControlPlaneDeps(self):
     """Validate controlplane dependencies.
 
-    Check that we at least tag as controlplane dependencies that match some well-known targets for
+    Check that we at least tag as controlplane dependencies that match some
+    well-known targets for
     the control-plane.
 
     Raises:
@@ -221,8 +219,9 @@ def ValidateExtensionDeps(self, name, target):
       metadata = self._dep_info.GetMetadata(d)
       if metadata:
         use_category = metadata['use_category']
-        if ('dataplane_ext' not in use_category and 'observability_ext' not in use_category and
-            'other' not in use_category):
+        valid_use_category = ('dataplane_ext' in use_category or
+                              'observability_ext' in use_category or 'other' in use_category)
+        if not valid_use_category:
           raise DependencyError(
               f'Extensions {name} depends on {d} with "use_category" not including '
               '["dataplane_ext", "observability_ext", "other"]')

tools/dependency/validate_test.py

@@ -16,7 +16,7 @@ def DepsByUseCategory(self, use_category):
     return set(n for n, m in self._deps.items() if use_category in m['use_category'])
 
   def GetMetadata(self, dependency):
-    return self._deps.get(dependency, None)
+    return self._deps.get(dependency)
 
 
 class FakeBuildGraph(object):