mobile: Fix envoy_build_fixer.py bug (envoyproxy#30939)

This PR fixes a formatter bug that is supposed to automatically add envoy_mobile_package() as well as adding license() into Envoy Mobile BUILD files, mainly because for Envoy Mobile, we always run tools/check_format.sh from the mobile directory. Most of the changes in these files were made by running tools/check_format.sh fix with some manual modifications. Risk Level: low (formatting fixes only) Testing: CI Docs Changes: n/a Release Notes: n/a Platform Specific Features: mobile Signed-off-by: Fredy Wijaya <[email protected]>
fredyw · Nov 17, 2023 · 5bddb4d · 5bddb4d
1 parent 2a13227
commit 5bddb4d
Show file tree

Hide file tree

Showing 99 changed files with 251 additions and 147 deletions.
diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl
@@ -61,7 +61,6 @@ load(
     "@envoy_build_config//:extensions_build_config.bzl",
     "CONTRIB_EXTENSION_PACKAGE_VISIBILITY",
     "EXTENSION_PACKAGE_VISIBILITY",
-    "MOBILE_PACKAGE_VISIBILITY",
 )
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 
@@ -81,10 +80,8 @@ def envoy_extension_package(enabled_default = True, default_visibility = EXTENSI
         flag_values = {":enabled": "True"},
     )
 
-def envoy_mobile_package():
-    # Mobile packages should only be visible to other mobile packages, not any other
-    # parts of the Envoy codebase.
-    envoy_extension_package(default_visibility = MOBILE_PACKAGE_VISIBILITY)
+def envoy_mobile_package(default_visibility = ["//visibility:public"]):
+    envoy_extension_package(default_visibility = default_visibility)
 
 def envoy_contrib_package():
     envoy_extension_package(default_visibility = CONTRIB_EXTENSION_PACKAGE_VISIBILITY)

diff --git a/mobile/bazel/BUILD b/mobile/bazel/BUILD
@@ -1,9 +1,9 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_package")
 load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 config_setting(
     name = "envoy_mobile_swift_cxx_interop",

diff --git a/mobile/docs/BUILD b/mobile/docs/BUILD
@@ -1,13 +1,13 @@
 load("@base_pip3//:requirements.bzl", "requirement")
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_package")
 load("@envoy//tools/base:envoy_python.bzl", "envoy_entry_point")
 load("@envoy//tools/python:namespace.bzl", "envoy_py_namespace")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
 load("@rules_pkg//pkg:pkg.bzl", "pkg_tar")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_py_namespace()
 

diff --git a/mobile/envoy_build_config/BUILD b/mobile/envoy_build_config/BUILD
@@ -1,8 +1,9 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package", "envoy_select_enable_http3", "envoy_select_envoy_mobile_listener", "envoy_select_envoy_mobile_request_compression")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_select_enable_http3", "envoy_select_envoy_mobile_listener", "envoy_select_envoy_mobile_request_compression")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "extension_registry",

diff --git a/mobile/examples/BUILD b/mobile/examples/BUILD
@@ -3,9 +3,12 @@ load(
     "@com_github_buildbuddy_io_rules_xcodeproj//xcodeproj:defs.bzl",
     "xcode_provisioning_profile",
 )
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
+envoy_mobile_package()
+
 # Change to your Apple Developer Team ID as shown in
 # https://developer.apple.com/account/#!/membership
 TEAM_ID = "X4ST43AL9W"

diff --git a/mobile/examples/cc/fetch_client/BUILD b/mobile/examples/cc/fetch_client/BUILD
@@ -1,12 +1,12 @@
 load(
     "@envoy//bazel:envoy_build_system.bzl",
     "envoy_cc_library",
-    "envoy_package",
+    "envoy_mobile_package",
 )
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "fetch_client_lib",

diff --git a/mobile/examples/java/hello_world/BUILD b/mobile/examples/java/hello_world/BUILD
@@ -1,9 +1,12 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_package")
 load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 licenses(["notice"])  # Apache 2
 
+envoy_mobile_package()
+
 android_binary(
     name = "hello_envoy",
     custom_package = "io.envoyproxy.envoymobile.helloenvoy",

diff --git a/mobile/examples/kotlin/hello_world/BUILD b/mobile/examples/kotlin/hello_world/BUILD
@@ -1,10 +1,13 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_package")
 load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library")
 load("@rules_detekt//detekt:defs.bzl", "detekt")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 licenses(["notice"])  # Apache 2
 
+envoy_mobile_package()
+
 android_binary(
     name = "hello_envoy_kt",
     custom_package = "io.envoyproxy.envoymobile.helloenvoykotlin",

diff --git a/mobile/examples/kotlin/shared/BUILD b/mobile/examples/kotlin/shared/BUILD
@@ -1,8 +1,11 @@
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_package")
 load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 
 licenses(["notice"])  # Apache 2
 
+envoy_mobile_package()
+
 kt_android_library(
     name = "hello_envoy_shared_lib",
     srcs = [

diff --git a/mobile/examples/objective-c/hello_world/BUILD b/mobile/examples/objective-c/hello_world/BUILD
@@ -1,8 +1,11 @@
-load("//bazel:config.bzl", "MINIMUM_IOS_VERSION")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_package")
+load("//bazel:config.bzl", "MINIMUM_IOS_VERSION")
 
 licenses(["notice"])  # Apache 2
 
+envoy_mobile_package()
+
 objc_library(
     name = "appmain",
     srcs = glob([

diff --git a/mobile/examples/swift/async_await/BUILD b/mobile/examples/swift/async_await/BUILD
@@ -1,8 +1,11 @@
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
+envoy_mobile_package()
+
 swift_library(
     name = "appmain",
     srcs = glob(["*.swift"]),

diff --git a/mobile/examples/swift/hello_world/BUILD b/mobile/examples/swift/hello_world/BUILD
@@ -1,9 +1,12 @@
-load("//bazel:config.bzl", "MINIMUM_IOS_VERSION")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_package")
+load("//bazel:config.bzl", "MINIMUM_IOS_VERSION")
 
 licenses(["notice"])  # Apache 2
 
+envoy_mobile_package()
+
 swift_library(
     name = "appmain",
     srcs = glob(["*.swift"]),

diff --git a/mobile/experimental/swift/BUILD b/mobile/experimental/swift/BUILD
@@ -1,7 +1,10 @@
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_package")
 load("@envoy_mobile//bazel:apple.bzl", "envoy_mobile_swift_test")
 
 licenses(["notice"])  # Apache 2
 
+envoy_mobile_package()
+
 envoy_mobile_swift_test(
     name = "quic_stream_test",
     srcs = [

diff --git a/mobile/library/BUILD b/mobile/library/BUILD
@@ -1,5 +1,9 @@
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_package")
+
 licenses(["notice"])  # Apache 2
 
+envoy_mobile_package()
+
 filegroup(
     name = "proguard_rules",
     srcs = [

diff --git a/mobile/library/cc/BUILD b/mobile/library/cc/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package", "envoy_select_envoy_mobile_request_compression", "envoy_select_google_grpc")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package", "envoy_select_envoy_mobile_request_compression", "envoy_select_google_grpc")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "engine_builder_lib",

diff --git a/mobile/library/common/BUILD b/mobile/library/common/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package", "envoy_select_signal_trace")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package", "envoy_select_signal_trace")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "envoy_main_interface_lib",

diff --git a/mobile/library/common/api/BUILD b/mobile/library/common/api/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "external_api_lib",

diff --git a/mobile/library/common/bridge/BUILD b/mobile/library/common/bridge/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "utility_lib",

diff --git a/mobile/library/common/buffer/BUILD b/mobile/library/common/buffer/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "bridge_fragment_lib",

diff --git a/mobile/library/common/common/BUILD b/mobile/library/common/common/BUILD
@@ -1,9 +1,9 @@
 load("@bazel_skylib//lib:selects.bzl", "selects")
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 selects.config_setting_group(
     name = "use_android_system_helper",

diff --git a/mobile/library/common/config/BUILD b/mobile/library/common/config/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "certificates_lib",

diff --git a/mobile/library/common/data/BUILD b/mobile/library/common/data/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "utility_lib",

diff --git a/mobile/library/common/event/BUILD b/mobile/library/common/event/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "provisional_dispatcher_lib",

diff --git a/mobile/library/common/extensions/listener_managers/api_listener_manager/BUILD b/mobile/library/common/extensions/listener_managers/api_listener_manager/BUILD
@@ -22,5 +22,6 @@ envoy_cc_extension(
         "@envoy//envoy/server:listener_manager_interface",
         "@envoy//source/server:api_listener_lib",
         "@envoy//source/server:listener_manager_factory_lib",
+        "@envoy_api//envoy/config/listener/v3:pkg_cc_proto",
     ],
 )
diff --git a/mobile/library/common/http/BUILD b/mobile/library/common/http/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "client_lib",

diff --git a/mobile/library/common/jni/BUILD b/mobile/library/common/jni/BUILD
@@ -1,9 +1,9 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_defines", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_defines", "envoy_mobile_package")
 load("//bazel:android_debug_info.bzl", "android_debug_info")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 # TODO(jpsim): Migrate these to use `envoy_cc_library`
 

diff --git a/mobile/library/common/jni/import/BUILD b/mobile/library/common/jni/import/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 cc_library(
     name = "jni_import_lib",

diff --git a/mobile/library/common/jni/types/BUILD b/mobile/library/common/jni/types/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_defines", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_mobile_defines", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 cc_library(
     name = "jni_exception_lib",

diff --git a/mobile/library/common/network/BUILD b/mobile/library/common/network/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "connectivity_manager_lib",

diff --git a/mobile/library/common/stats/BUILD b/mobile/library/common/stats/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "utility_lib",

diff --git a/mobile/library/common/stream_info/BUILD b/mobile/library/common/stream_info/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "extra_stream_info_lib",

diff --git a/mobile/library/common/thread/BUILD b/mobile/library/common/thread/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "lock_guard_lib",

diff --git a/mobile/library/common/types/BUILD b/mobile/library/common/types/BUILD
@@ -1,8 +1,8 @@
-load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_package")
+load("@envoy//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_mobile_package")
 
 licenses(["notice"])  # Apache 2
 
-envoy_package()
+envoy_mobile_package()
 
 envoy_cc_library(
     name = "c_types_lib",