Merge remote-tracking branch 'origin/main' into ios-remove-forceipv6-…

…builder-function * origin/main: remove the use of deprecated flag (#2658) Cronvoy: Map EM Errors to Cronet API Errors II (#1594) (#2633) build: revert boring patch (#2651) Bump Lyft Support Rotation (#2654) fix one issue blocking bumping Envoy (#2649) ci: remove Snow from Lyft EM rotation (#2650) ci: increasing timeouts (#2653) python: Apply Envoy python-yapf formatting (#2648) repo: Shellcheck cleanups (#2646) repo: Switch `pip_install` -> `pip_parse` (#2647) Use safe_malloc instead of new when creating new_envoy_map_entry (#2632) python: Pin requirement hashes (#2643) Disable flaky TestConfig.StringAccessors (#2642) ci: migrate from set-output to GITHUB_OUTPUT (#2625) Add a comment to addPlatformFilter (#2634) Allow Cronvoy to build with proguard. (#2635) Update Envoy (#2630) Add support for Platform and Native filters to C++ EngineBuilder (#2626) Register getaddrinfo in extension_registry (#2627) dns: stop using cares DNS resolver (#2618) Signed-off-by: JP Simard <[email protected]>
envoyproxy · Nov 4, 2022 · 82af348 · 82af348
2 parents 303043d + b22710b
commit 82af348
Show file tree

Hide file tree

Showing 84 changed files with 921 additions and 679 deletions.
diff --git a/.github/actions/pr_notifier/pr_notifier.py b/.github/actions/pr_notifier/pr_notifier.py
@@ -31,6 +31,7 @@
     'snowp': 'U93KTPQP6',
 }
 
+
 def get_slo_hours():
     # on Monday, allow for 24h + 48h
     if datetime.date.today().weekday() == 0:
@@ -58,8 +59,7 @@ def pr_message(pr_age, pr_url, pr_title, delta_days, delta_hours):
 
 # Adds reminder lines to the appropriate assignee to review the assigned PRs
 # Returns true if one of the assignees is in the primary_assignee_map, false otherwise.
-def add_reminders(
-        assignees, assignees_and_prs, message, primary_assignee_map):
+def add_reminders(assignees, assignees_and_prs, message, primary_assignee_map):
     has_primary_assignee = False
     for assignee_info in assignees:
         assignee = assignee_info.login
@@ -92,7 +92,7 @@ def track_prs():
         if pr_info.draft:
             continue
         # envoy-mobile currently doesn't triage unassigned PRs.
-        if not(pr_info.assignees):
+        if not (pr_info.assignees):
             continue
 
         # Update the time based on the time zone delta from github's

diff --git a/.github/lyft_maintainers.yml b/.github/lyft_maintainers.yml
@@ -1,5 +1,4 @@
-current: Augustyniak
+current: jpsim
 maintainers:
   - Augustyniak
-  - snowp
   - jpsim
diff --git a/.github/workflows/android_tests.yml b/.github/workflows/android_tests.yml
@@ -22,10 +22,10 @@ jobs:
         run: |
           if git rev-parse --abbrev-ref HEAD | grep -q ^main$ || git diff --name-only origin/main | grep -qe common/ -e java/ -e kotlin/ -e bazel/ -e ^\.bazelrc$ -e ^envoy$ -e ^WORKSPACE$ -e ^.github/workflows/android_tests.yml$ ; then
             echo "Tests will run."
-            echo "::set-output name=run_tests::true"
+            echo "run_tests=true" >> $GITHUB_OUTPUT
           else
             echo "Skipping tests."
-            echo "::set-output name=run_tests::false"
+            echo "run_tests=false" >> $GITHUB_OUTPUT
           fi
       - name: 'Java setup'
         if: steps.check_context.outputs.run_tests == 'true'
@@ -61,10 +61,10 @@ jobs:
         run: |
           if git rev-parse --abbrev-ref HEAD | grep -q ^main$ || git diff --name-only origin/main | grep -qe common/ -e java/ -e kotlin/ -e bazel/ -e ^\.bazelrc$ -e ^envoy$ -e ^WORKSPACE$ -e ^.github/workflows/android_tests.yml$ ; then
             echo "Tests will run."
-            echo "::set-output name=run_tests::true"
+            echo "run_tests=true" >> $GITHUB_OUTPUT
           else
             echo "Skipping tests."
-            echo "::set-output name=run_tests::false"
+            echo "run_tests=false" >> $GITHUB_OUTPUT
           fi
       - name: 'Java setup'
         if: steps.check_context.outputs.run_tests == 'true'
@@ -110,10 +110,10 @@ jobs:
         run: |
           if git rev-parse --abbrev-ref HEAD | grep -q ^main$ || git diff --name-only origin/main | grep -qe common/ -e java/ -e kotlin/ -e bazel/ -e ^\.bazelrc$ -e ^envoy$ -e ^WORKSPACE$ -e ^.github/workflows/android_tests.yml$ ; then
             echo "Tests will run."
-            echo "::set-output name=run_tests::true"
+            echo "run_tests=true" >> $GITHUB_OUTPUT
           else
             echo "Skipping tests."
-            echo "::set-output name=run_tests::false"
+            echo "run_tests=false" >> $GITHUB_OUTPUT
           fi
       - name: 'Java setup'
         if: steps.check_context.outputs.run_tests == 'true'

diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
@@ -27,10 +27,10 @@ jobs:
         run: |
           if git rev-parse --abbrev-ref HEAD | grep -q ^main$ || git diff --name-only origin/main | grep -qe common/ -e bazel/ -e ^\.bazelrc$ -e ^envoy$ -e ^WORKSPACE$ -e ^.github/workflows/asan.yml$ ; then
             echo "Tests will run."
-            echo "::set-output name=run_tests::true"
+            echo "run_tests=true" >> $GITHUB_OUTPUT
           else
             echo "Skipping tests."
-            echo "::set-output name=run_tests::false"
+            echo "run_tests=false" >> $GITHUB_OUTPUT
           fi
       - uses: actions/setup-java@v1
         if: steps.check-cache.outputs.cache-hit != 'true'

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -27,10 +27,10 @@ jobs:
         run: |
           if git rev-parse --abbrev-ref HEAD | grep -q ^main$ || git diff --name-only origin/main | grep -qe common/ -e ^.github/workflows/coverage.yml ; then
             echo "Coverage will run."
-            echo "::set-output name=run_coverage::true"
+            echo "run_coverage=true" >> $GITHUB_OUTPUT
           else
             echo "Skipping coverage."
-            echo "::set-output name=run_coverage::false"
+            echo "run_coverage=false" >> $GITHUB_OUTPUT
           fi
       - name: 'Run coverage'
         if: steps.check_context.outputs.run_coverage == 'true'

diff --git a/.github/workflows/ios_build.yml b/.github/workflows/ios_build.yml
@@ -31,7 +31,7 @@ jobs:
     name: swift_helloworld
     needs: iosbuild
     runs-on: macos-12
-    timeout-minutes: 25
+    timeout-minutes: 35
     steps:
       - uses: actions/checkout@v1
         with:
@@ -136,7 +136,7 @@ jobs:
     name: swift_async_await
     needs: iosbuild
     runs-on: macos-12
-    timeout-minutes: 25
+    timeout-minutes: 35
     steps:
       - uses: actions/checkout@v1
         with:

diff --git a/.github/workflows/ios_tests.yml b/.github/workflows/ios_tests.yml
@@ -20,10 +20,10 @@ jobs:
         run: |
           if git rev-parse --abbrev-ref HEAD | grep -q ^main$ || git diff --name-only origin/main | grep -qe common/ -e objective-c/ -e swift/ -e bazel/ -e ^\.bazelrc$ -e ^envoy$ -e ^WORKSPACE$ -e ^.github/workflows/ios_tests.yml$ ; then
             echo "Tests will run."
-            echo "::set-output name=run_tests::true"
+            echo "run_tests=true" >> $GITHUB_OUTPUT
           else
             echo "Skipping tests."
-            echo "::set-output name=run_tests::false"
+            echo "run_tests=false" >> $GITHUB_OUTPUT
           fi
       - name: 'Install dependencies'
         run: ./ci/mac_ci_setup.sh
@@ -53,10 +53,10 @@ jobs:
         run: |
           if git rev-parse --abbrev-ref HEAD | grep -q ^main$ || git diff --name-only origin/main | grep -qe common/ -e objective-c/ -e swift/ -e bazel/ -e ^\.bazelrc$ -e ^envoy$ -e ^WORKSPACE$ -e ^.github/workflows/ios_tests.yml$ ; then
             echo "Tests will run."
-            echo "::set-output name=run_tests::true"
+            echo "run_tests=true" >> $GITHUB_OUTPUT
           else
             echo "Skipping tests."
-            echo "::set-output name=run_tests::false"
+            echo "run_tests=false" >> $GITHUB_OUTPUT
           fi
       - name: 'Install dependencies'
         run: ./ci/mac_ci_setup.sh

diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml
@@ -24,10 +24,10 @@ jobs:
         run: |
           if git rev-parse --abbrev-ref HEAD | grep -q ^main$ || git diff --name-only origin/main | grep -qe common/ -e cc/ -e python/ -e bazel/ -e ^\.bazelrc$ -e ^envoy$ -e ^WORKSPACE$ -e ^.github/workflows/python_tests.yml$ ; then
             echo "Tests will run."
-            echo "::set-output name=run_tests::true"
+            echo "run_tests=true" >> $GITHUB_OUTPUT
           else
             echo "Skipping tests."
-            echo "::set-output name=run_tests::false"
+            echo "run_tests=false" >> $GITHUB_OUTPUT
           fi
       - name: 'Run tests'
         if: steps.check_context.outputs.run_tests == 'true'

diff --git a/.github/workflows/submodule_update.yml b/.github/workflows/submodule_update.yml
@@ -22,7 +22,7 @@ jobs:
       run: |
         if ! git diff-index --quiet HEAD --; then
           echo "Detected changes..."
-          echo "::set-output name=dirty::true"
+          echo "dirty=true" >> $GITHUB_OUTPUT
         fi
     - name: Get current support maintainer
       if: steps.state.outputs.dirty == 'true'
@@ -31,7 +31,7 @@ jobs:
         maintainers_file=".github/lyft_maintainers.yml"
         first_line="$(head -n 1 "$maintainers_file")"
         current=${first_line#"current: "}
-        echo "::set-output name=maintainer::$current"
+        echo "maintainer=$current" >> $GITHUB_OUTPUT
     - name: Create PR
       if: steps.state.outputs.dirty == 'true'
       uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27

diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml
@@ -27,10 +27,10 @@ jobs:
         run: |
           if git rev-parse --abbrev-ref HEAD | grep -q ^main$ || git diff --name-only origin/main | grep -qe common/ -e bazel/ -e ^\.bazelrc$ -e ^envoy$ -e ^WORKSPACE$ -e ^.github/workflows/tsan.yml$ ; then
             echo "Tests will run."
-            echo "::set-output name=run_tests::true"
+            echo "run_tests=true" >> $GITHUB_OUTPUT
           else
             echo "Skipping tests."
-            echo "::set-output name=run_tests::false"
+            echo "run_tests=false" >> $GITHUB_OUTPUT
           fi
       - uses: actions/setup-java@v1
         if: steps.check-cache.outputs.cache-hit != 'true'

diff --git a/WORKSPACE b/WORKSPACE
@@ -66,6 +66,9 @@ python_configure(name = "local_config_python", python_version = "3")
 load("//bazel:python.bzl", "declare_python_abi")
 declare_python_abi(name = "python_abi", python_version = "3")
 
+load("@mobile_pip3//:requirements.bzl", pip_dependencies = "install_deps")
+pip_dependencies()
+
 load("//bazel:android_configure.bzl", "android_configure")
 android_configure(
     name = "local_config_android",

diff --git a/bazel/boringssl.patch b/bazel/boringssl.patch
diff --git a/bazel/envoy_mobile_dependencies.bzl b/bazel/envoy_mobile_dependencies.bzl
@@ -6,7 +6,7 @@ load("@rules_detekt//detekt:dependencies.bzl", "rules_detekt_dependencies")
 load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories")
 load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_repos", "rules_proto_grpc_toolchains")
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
-load("@rules_python//python:pip.bzl", "pip_install")
+load("@rules_python//python:pip.bzl", "pip_parse")
 load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
 load("@rules_java//java:repositories.bzl", "rules_java_dependencies")
 
@@ -110,7 +110,8 @@ def python_dependencies():
     # pip_install(
     #     requirements = ":dev_requirements.txt",
     # )
-    pip_install(
-        requirements = "//third_party/python:requirements.txt",
+    pip_parse(
+        name = "mobile_pip3",
+        requirements_lock = "//third_party/python:requirements.txt",
         timeout = 1000,
     )
diff --git a/bazel/envoy_mobile_repositories.bzl b/bazel/envoy_mobile_repositories.bzl
@@ -55,7 +55,6 @@ def upstream_envoy_overrides():
     # Remove this once https://boringssl-review.googlesource.com/c/boringssl/+/37804 is in master-with-bazel
     http_archive(
         name = "boringssl",
-        patches = ["@envoy_mobile//bazel:boringssl.patch"],
         sha256 = "579cb415458e9f3642da0a39a72f79fdfe6dc9c1713b3a823f1e276681b9703e",
         strip_prefix = "boringssl-648cbaf033401b7fe7acdce02f275b06a88aab5c",
         urls = ["https://github.com/google/boringssl/archive/648cbaf033401b7fe7acdce02f275b06a88aab5c.tar.gz"],

diff --git a/bazelw b/bazelw
@@ -10,7 +10,8 @@ else
   readonly bazel_os="linux"
 fi
 
-readonly raw_arch="$(uname -m)"
+raw_arch="$(uname -m)"
+readonly raw_arch
 if [[ "$raw_arch" == "aarch64" || "$raw_arch" == "arm64" ]]; then
   readonly bazel_arch="arm64"
 else

diff --git a/ci/linux_ci_setup.sh b/ci/linux_ci_setup.sh
@@ -24,6 +24,8 @@ echo "y" | $SDKMANAGER --install "ndk;21.4.7075529"
 $SDKMANAGER --install "platforms;android-30"
 $SDKMANAGER --install "build-tools;30.0.2"
 
-echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
-echo "ANDROID_SDK_ROOT=$ANDROID_HOME" >> $GITHUB_ENV
-echo "ANDROID_NDK_HOME=$ANDROID_HOME/ndk/21.4.7075529" >> $GITHUB_ENV
+{
+    echo "ANDROID_HOME=${ANDROID_HOME}"
+    echo "ANDROID_SDK_ROOT=${ANDROID_HOME}"
+    echo "ANDROID_NDK_HOME=${ANDROID_HOME}/ndk/21.4.7075529"
+}  >> "$GITHUB_ENV"
diff --git a/ci/mac_ci_setup.sh b/ci/mac_ci_setup.sh
@@ -54,9 +54,9 @@ if [[ "${1:-}" == "--android" ]]; then
   SDKMANAGER="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager"
   $SDKMANAGER --uninstall "ndk-bundle"
   echo "y" | $SDKMANAGER "ndk;21.4.7075529"
-  ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 "${ANDROID_SDK_ROOT}/ndk-bundle"
+  ln -sfn "${ANDROID_SDK_ROOT}/ndk/21.4.7075529" "${ANDROID_SDK_ROOT}/ndk-bundle"
 
   # Download and set up build-tools 30.0.3, 31.0.0 is missing dx.jar.
   $SDKMANAGER --install "build-tools;30.0.3"
-  echo "ANDROID_NDK_HOME=$ANDROID_HOME/ndk/21.4.7075529" >> $GITHUB_ENV
+  echo "ANDROID_NDK_HOME=${ANDROID_HOME}/ndk/21.4.7075529" >> "$GITHUB_ENV"
 fi
diff --git a/ci/mac_start_emulator.sh b/ci/mac_start_emulator.sh
@@ -2,7 +2,11 @@
 
 set -e
 
-echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'system-images;android-29;google_apis;x86_64' --channel=3
-echo "no" | $ANDROID_HOME/tools/bin/avdmanager create avd -n test_android_emulator -k 'system-images;android-29;google_apis;x86_64' --force
-ls $ANDROID_HOME/tools/bin/
-nohup $ANDROID_HOME/emulator/emulator -partition-size 1024 -avd test_android_emulator -no-snapshot > /dev/null 2>&1 & $ANDROID_HOME/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\r') ]]; do sleep 1; done; input keyevent 82'
+echo "y" | "${ANDROID_HOME}/tools/bin/sdkmanager" --install 'system-images;android-29;google_apis;x86_64' --channel=3
+echo "no" | "${ANDROID_HOME}/tools/bin/avdmanager" create avd -n test_android_emulator -k 'system-images;android-29;google_apis;x86_64' --force
+ls "${ANDROID_HOME}/tools/bin/"
+
+nohup "${ANDROID_HOME}/emulator/emulator" -partition-size 1024 -avd test_android_emulator -no-snapshot > /dev/null 2>&1 & {
+    # shellcheck disable=SC2016
+    "${ANDROID_HOME}/platform-tools/adb" wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\''\r'\'') ]]; do sleep 1; done; input keyevent 82'
+}