py/tools: Namespace repo packages to prevent conflict (#29787)

Signed-off-by: Ryan Northey <ryan@synca.io> Signed-off-by: phlax <phlax@users.noreply.github.com>
envoyproxy · Oct 3, 2023 · 8e87aa5 · 8e87aa5
1 parent 770dc85
commit 8e87aa5
Show file tree

Hide file tree

Showing 13 changed files with 125 additions and 225 deletions.
diff --git a/BUILD b/BUILD
@@ -1,5 +1,12 @@
+load("//bazel:envoy_build_system.bzl", "envoy_package")
+load("//tools/base:envoy_python.bzl", "envoy_py_namespace")
+
 licenses(["notice"])  # Apache 2
 
+envoy_package()
+
+envoy_py_namespace()
+
 exports_files([
     "VERSION.txt",
     "API_VERSION.txt",

diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
@@ -108,6 +108,7 @@ envoy_entry_point(
     name = "get_project_json",
     pkg = "envoy.base.utils",
     script = "envoy.project_data",
+    init_data = [":__init__.py"],
 )
 
 genrule(
@@ -132,6 +133,7 @@ envoy_entry_point(
     ],
     pkg = "envoy.base.utils",
     script = "envoy.project",
+    init_data = [":__init__.py"],
 )
 
 envoy_entry_point(
@@ -142,6 +144,7 @@ envoy_entry_point(
     ],
     pkg = "envoy.base.utils",
     script = "envoy.project",
+    init_data = [":__init__.py"],
 )
 
 envoy_entry_point(
@@ -152,6 +155,7 @@ envoy_entry_point(
     ],
     pkg = "envoy.base.utils",
     script = "envoy.project",
+    init_data = [":__init__.py"],
 )
 
 envoy_entry_point(
@@ -162,6 +166,7 @@ envoy_entry_point(
     ],
     pkg = "envoy.base.utils",
     script = "envoy.project",
+    init_data = [":__init__.py"],
 )
 
 envoy_entry_point(
@@ -172,6 +177,7 @@ envoy_entry_point(
     ],
     pkg = "envoy.base.utils",
     script = "envoy.project",
+    init_data = [":__init__.py"],
 )
 
 ''')

diff --git a/distribution/dockerhub/BUILD b/distribution/dockerhub/BUILD
@@ -1,10 +1,12 @@
 load("//bazel:envoy_build_system.bzl", "envoy_package")
-load("//tools/base:envoy_python.bzl", "envoy_gencontent")
+load("//tools/base:envoy_python.bzl", "envoy_gencontent", "envoy_py_namespace")
 
 licenses(["notice"])  # Apache 2
 
 envoy_package()
 
+envoy_py_namespace()
+
 envoy_gencontent(
     name = "readme",
     srcs = ["@envoy_repo//:project"],

diff --git a/mobile/BUILD b/mobile/BUILD
diff --git a/tools/BUILD b/tools/BUILD
@@ -5,11 +5,14 @@ load(
     "envoy_package",
     "envoy_py_test_binary",
 )
+load("//tools/base:envoy_python.bzl", "envoy_py_namespace")
 
 licenses(["notice"])  # Apache 2
 
 envoy_package()
 
+envoy_py_namespace()
+
 exports_files([
     "gen_git_sha.sh",
     "check_repositories.sh",