Feature : Listener Filter Chain Discovery Service

.azure-pipelines/pipelines.yml

@@ -195,6 +195,7 @@ stages:
         ENVOY_RBE: "true"
         BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --jobs=$(RbeJobs)"
         AZP_BRANCH: $(Build.SourceBranch)
+        AZP_COMMIT_SHA: $(system.pullRequest.sourceCommitId)
         ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
         BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com
         BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance
@@ -687,6 +688,7 @@ stages:
       workingDirectory: $(Build.SourcesDirectory)
       condition: eq(variables['isDev'], 'false')
       env:
+        AZP_BRANCH: $(Build.SourceBranch)
         GITHUB_TOKEN: $(GitHubPublicRepoOnlyAccessToken)
 
   - job: assets

.bazelignore

@@ -1,6 +1,7 @@
 # only directories can be ignored, and no globbing
 api
 examples/grpc-bridge/script
+mobile
 tools/clang_tools
 tools/dev/src
 .project

.bazelrc

@@ -295,7 +295,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl
 
 # Docker sandbox
 # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
-build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM gcr.io/envoy-ci/envoy-build:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+FROM gcr.io/envoy-ci/envoy-build:7304f974de2724617b7492ccb4c9c58cd420353a
 
 ARG USERNAME=vscode
 ARG USER_UID=501

.gitattributes

@@ -1,4 +1,3 @@
-/changelogs/*.yaml merge=union
 /generated_api_shadow/envoy/** linguist-generated=true
 /generated_api_shadow/bazel/** linguist-generated=true
 *.svg binary

.github/dependabot.yml

@@ -51,11 +51,6 @@ updates:
   schedule:
     interval: "daily"
 
-- package-ecosystem: "pip"
-  directory: "/tools/dependency"
-  schedule:
-    interval: "daily"
-
 - package-ecosystem: "docker"
   directory: "/.devcontainer"
   schedule:

.github/workflows/android_build.yml

@@ -12,6 +12,7 @@ concurrency:
 
 jobs:
   androidbuild:
+    if: github.repository == 'envoyproxy/envoy'
     name: android_build
     runs-on: macos-12
     timeout-minutes: 90
@@ -41,6 +42,7 @@ jobs:
           --fat_apk_cpu=x86_64 \
           //:android_dist
   javahelloworld:
+    if: github.repository == 'envoyproxy/envoy'
     name: java_helloworld
     needs: androidbuild
     runs-on: macos-12
@@ -86,6 +88,7 @@ jobs:
       if: steps.should_run.outputs.run_ci_job == 'true'
       run: adb logcat -e "received headers with status 200" -m 1
   kotlinhelloworld:
+    if: github.repository == 'envoyproxy/envoy'
     name: kotlin_helloworld
     needs: androidbuild
     runs-on: macos-12
@@ -131,6 +134,7 @@ jobs:
       if: steps.should_run.outputs.run_ci_job == 'true'
       run: adb logcat -e "received headers with status 200" -m 1
   kotlinbaselineapp:
+    if: github.repository == 'envoyproxy/envoy'
     name: kotlin_baseline_app
     needs: androidbuild
     runs-on: macos-12
@@ -176,6 +180,7 @@ jobs:
       if: steps.should_run.outputs.run_ci_job == 'true'
       run: adb logcat -e "received headers with status 301" -m 1
   kotlinexperimentalapp:
+    if: github.repository == 'envoyproxy/envoy'
     name: kotlin_experimental_app
     needs: androidbuild
     runs-on: macos-12
@@ -214,6 +219,7 @@ jobs:
             $([ -z $GITHUB_TOKEN ] || echo "--config=remote-ci-macos") \
             --remote_header="Authorization=Bearer $GITHUB_TOKEN" \
             --fat_apk_cpu=x86_64 \
+            --define=admin_functionality=enabled \
             //test/kotlin/apps/experimental:hello_envoy_kt
           adb install -r --no-incremental bazel-bin/test/kotlin/apps/experimental/hello_envoy_kt.apk
           adb shell am start -n io.envoyproxy.envoymobile.helloenvoyexperimentaltest/.MainActivity

.github/workflows/android_tests.yml

@@ -12,6 +12,7 @@ concurrency:
 
 jobs:
   kotlintestsmac:
+    if: github.repository == 'envoyproxy/envoy'
     # revert to //test/kotlin/... once fixed
     # https://github.com/envoyproxy/envoy-mobile/issues/1932
     name: kotlin_tests_mac
@@ -45,6 +46,7 @@ jobs:
             --remote_header="Authorization=Bearer $GITHUB_TOKEN" \
             //test/kotlin/io/...
   javatestsmac:
+    if: github.repository == 'envoyproxy/envoy'
     name: java_tests_mac
     runs-on: macos-12
     timeout-minutes: 120
@@ -78,13 +80,14 @@ jobs:
             --define=signal_trace=disabled \
             //test/java/...
   kotlintestslinux:
+    if: github.repository == 'envoyproxy/envoy'
     # Only kotlin tests are executed since with linux:
     # https://github.com/envoyproxy/envoy-mobile/issues/1418.
     name: kotlin_tests_linux
     runs-on: ubuntu-20.04
     timeout-minutes: 90
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++

.github/workflows/asan.yml

@@ -12,11 +12,12 @@ concurrency:
 
 jobs:
   asan:
+    if: github.repository == 'envoyproxy/envoy'
     name: asan
     runs-on: ubuntu-20.04
     timeout-minutes: 180
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
       env:
         CC: /opt/llvm/bin/clang
         CXX: /opt/llvm/bin/clang++

.github/workflows/cc_tests.yml

@@ -12,11 +12,12 @@ concurrency:
 
 jobs:
   cctests:
+    if: github.repository == 'envoyproxy/envoy'
     name: cc_tests
     runs-on: ubuntu-20.04
     timeout-minutes: 120
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
     steps:
     - uses: actions/checkout@v1
     - name: Add safe directory

.github/workflows/codeql-daily.yml

@@ -32,7 +32,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@a34ca99b4610d924e04c68db79e503e1f79f9f02
+      uses: github/codeql-action/init@39d8d7e78f59cf6b40ac3b9fbebef0c753d7c9e5
       # Override language selection by uncommenting this and choosing your languages
       with:
         languages: cpp
@@ -63,4 +63,4 @@ jobs:
         git clean -xdf
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@a34ca99b4610d924e04c68db79e503e1f79f9f02
+      uses: github/codeql-action/analyze@39d8d7e78f59cf6b40ac3b9fbebef0c753d7c9e5

.github/workflows/codeql-push.yml

@@ -45,7 +45,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@a34ca99b4610d924e04c68db79e503e1f79f9f02
+      uses: github/codeql-action/init@39d8d7e78f59cf6b40ac3b9fbebef0c753d7c9e5
       # Override language selection by uncommenting this and choosing your languages
       with:
         languages: cpp
@@ -78,4 +78,4 @@ jobs:
 
     - name: Perform CodeQL Analysis
       if: env.BUILD_TARGETS != ''
-      uses: github/codeql-action/analyze@a34ca99b4610d924e04c68db79e503e1f79f9f02
+      uses: github/codeql-action/analyze@39d8d7e78f59cf6b40ac3b9fbebef0c753d7c9e5

.github/workflows/commands.yml

@@ -5,6 +5,7 @@ on:
 
 jobs:
   retest:
+    if: github.repository == 'envoyproxy/envoy'
     name: Retest
     runs-on: ubuntu-latest
     steps:

.github/workflows/compile_time_options.yml

@@ -0,0 +1,99 @@
+name: mobile_compile_time_options
+
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+
+concurrency:
+  group: ${{ github.head_ref-github.workflow || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  cc_build:
+    if: github.repository == 'envoyproxy/envoy'
+    name: cc_build
+    runs-on: ubuntu-20.04
+    timeout-minutes: 120
+    container:
+      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+    steps:
+    - uses: actions/checkout@v1
+    - name: Add safe directory
+      run: git config --global --add safe.directory /__w/envoy/envoy
+    - id: should_run
+      name: 'Check whether to run'
+      run: ./mobile/tools/should_run_ci.sh
+    - name: 'Build C++ library'
+      if: steps.should_run.outputs.run_ci_job == 'true'
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        cd mobile && ./bazelw build \
+            $([ -z $GITHUB_TOKEN ] || echo "--config=remote-ci-linux") \
+            --remote_header="Authorization=Bearer $GITHUB_TOKEN" \
+            --define=admin_html=enabled \
+            --define=envoy_mobile_request_compression=disabled \
+            --@envoy//bazel:http3=False \
+            //library/cc/...
+  swift_build:
+    if: github.repository == 'envoyproxy/envoy'
+    name: swift_build
+    runs-on: macos-12
+    timeout-minutes: 120
+    steps:
+    - uses: actions/checkout@v1
+    - id: should_run
+      name: 'Check whether to run'
+      run: ./mobile/tools/should_run_ci.sh
+    - run: cd mobile && ./ci/mac_ci_setup.sh
+      if: steps.should_run.outputs.run_ci_job == 'true'
+      name: 'Install dependencies'
+    - name: 'Build Swift library'
+      if: steps.should_run.outputs.run_ci_job == 'true'
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        cd mobile && ./bazelw shutdown
+          ./bazelw build \
+            --config=ios \
+            $([ -z $GITHUB_TOKEN ] || echo "--config=remote-ci-macos") \
+            --remote_header="Authorization=Bearer $GITHUB_TOKEN" \
+            --define=admin_html=enabled \
+            --define=envoy_mobile_request_compression=disabled \
+            --@envoy//bazel:http3=False \
+            //library/swift:ios_framework
+  kotlin_build:
+    if: github.repository == 'envoyproxy/envoy'
+    name: kotlin_build
+    runs-on: macos-12
+    timeout-minutes: 90
+    steps:
+    - uses: actions/checkout@v1
+    - id: should_run
+      name: 'Check whether to run'
+      run: ./mobile/tools/should_run_ci.sh
+    - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c
+      if: steps.should_run.outputs.run_ci_job == 'true'
+      with:
+        java-version: '8'
+        java-package: jdk
+        architecture: x64
+        distribution: zulu
+    - name: 'Install dependencies'
+      if: steps.should_run.outputs.run_ci_job == 'true'
+      run: cd mobile && ./ci/mac_ci_setup.sh --android
+    - name: 'Build Kotlin library'
+      if: steps.should_run.outputs.run_ci_job == 'true'
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        cd mobile && ./bazelw build \
+        $([ -z $GITHUB_TOKEN ] || echo "--config=remote-ci-macos") \
+          --remote_header="Authorization=Bearer $GITHUB_TOKEN" \
+          --fat_apk_cpu=x86_64 \
+          --define=admin_html=enabled \
+          --define=envoy_mobile_request_compression=disabled \
+          --@envoy//bazel:http3=False \
+          //:android_dist

.github/workflows/core.yml

@@ -12,6 +12,7 @@ concurrency:
 
 jobs:
   unittests:
+    if: github.repository == 'envoyproxy/envoy'
     name: unit_tests
     runs-on: ubuntu-20.04
     timeout-minutes: 120

.github/workflows/coverage.yml

@@ -12,14 +12,15 @@ concurrency:
 
 jobs:
   coverage:
+    if: github.repository == 'envoyproxy/envoy'
     name: coverage
     runs-on: ubuntu-20.04
     timeout-minutes: 120
     defaults:
       run:
         shell: bash
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
     steps:
     - uses: actions/checkout@v1
     - name: Add safe directory

.github/workflows/docs.yml

@@ -12,10 +12,11 @@ concurrency:
 
 jobs:
   docs:
+    if: github.repository == 'envoyproxy/envoy'
     runs-on: ubuntu-20.04
     timeout-minutes: 20
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
     steps:
     - uses: actions/checkout@v3
     - name: Add safe directory

.github/workflows/format.yml

@@ -12,11 +12,12 @@ concurrency:
 
 jobs:
   formatall:
+    if: github.repository == 'envoyproxy/envoy'
     name: format_all
     runs-on: ubuntu-20.04
     timeout-minutes: 45
     container:
-      image: envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
+      image: envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
       env:
         CLANG_FORMAT: /opt/llvm/bin/clang-format
         BUILDIFIER_BIN: /usr/local/bin/buildifier
@@ -33,6 +34,7 @@ jobs:
       if: steps.should_run.outputs.run_ci_job == 'true'
       run: cd mobile && ./tools/check_format.sh
   precommit:
+    if: github.repository == 'envoyproxy/envoy'
     name: precommit
     runs-on: macos-12
     timeout-minutes: 45
@@ -48,6 +50,7 @@ jobs:
       if: steps.should_run.outputs.run_ci_job == 'true'
       run: cd mobile && find mobile/* | pre-commit run --files
   swiftlint:
+    if: github.repository == 'envoyproxy/envoy'
     name: swift_lint
     runs-on: ubuntu-latest
     timeout-minutes: 5
@@ -59,6 +62,7 @@ jobs:
       run: swiftlint lint --strict
       working-directory: mobile
   drstring:
+    if: github.repository == 'envoyproxy/envoy'
     name: drstring
     runs-on: macos-12
     timeout-minutes: 10
@@ -73,6 +77,7 @@ jobs:
         DEVELOPER_DIR: /Applications/Xcode_14.1.app
       run: cd mobile && ./bazelw run @DrString//:drstring check
   kotlinlint:
+    if: github.repository == 'envoyproxy/envoy'
     name: kotlin_lint
     runs-on: macos-12
     timeout-minutes: 45