Merge remote-tracking branch 'origin/main' into delta-xds-non-breaking-slonka-hash-bytes and resolve conflicts

Signed-off-by: radoslaw.chrzanowski <[email protected]>

Author: Ferdudas97

.circleci/config.yml

@@ -1,7 +1,8 @@
 version: 2
 jobs:
   build:
-    machine: true
+    machine:
+      image: ubuntu-2004:202201-02
 
     working_directory: ~/repo
 
@@ -40,7 +41,7 @@ jobs:
           command: |
             if [ "${CIRCLE_BRANCH}" == "main" ]; then
               echo $GPG_KEY | base64 --decode > signing-key
-              gpg --passphrase $GPG_PASSPHRASE --import signing-key
+              gpg --batch --passphrase $GPG_PASSPHRASE --import signing-key
               shred signing-key
 
               if [[ -n "${RELEASE}" && -n "${NEXT}" ]]; then
@@ -52,10 +53,9 @@ jobs:
               fi
             elif [[ -n "${DEPLOY_BRANCH}" ]]; then
               echo $GPG_KEY | base64 --decode > signing-key
-              gpg --passphrase $GPG_PASSPHRASE --import signing-key
+              gpg --batch --passphrase $GPG_PASSPHRASE --import signing-key
               shred signing-key
 
               mvn -B -s .circleci/settings-snapshots.xml deploy
             fi
-
       - run: bash <(curl -s https://codecov.io/bash)

.github/workflows/compare-envoy-versions.yml

@@ -0,0 +1,36 @@
+name: compare-envoy-versions
+on:
+  workflow_call:
+    outputs:
+      target-version:
+        description: "Envoy version we need to update to"
+        value: ${{ jobs.compare-envoy-versions.outputs.target-version }}
+
+jobs:
+  compare-envoy-versions:
+    runs-on: ubuntu-latest
+    outputs:
+      target-version: ${{ steps.compare-latest-to-current-version.outputs.target-version }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Fetch latest Envoy version
+        id: latest-envoy-version
+        run: |
+          echo 'ENVOY_LATEST<<EOF' >> $GITHUB_ENV
+          curl -s https://api.github.com/repos/envoyproxy/envoy/releases/latest | jq -r '.tag_name' >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+      - name: Read current Envoy version
+        id: current-envoy-version
+        run: |
+          echo 'ENVOY_CURRENT<<EOF' >> $GITHUB_ENV
+          cat ./tools/envoy_release >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+      - name: Compare latest to current
+        id: compare-latest-to-current-version
+        run: |
+          if [[ "${{ env.ENVOY_LATEST }}" > "${{ env.ENVOY_CURRENT }}" ]]
+          then
+            echo "::set-output name=target-version::${{ env.ENVOY_LATEST }}"
+          else
+            echo "::set-output name=target-version::noop"
+          fi

.github/workflows/scheduled.yml

@@ -0,0 +1,16 @@
+name: scheduled
+on:
+  schedule:
+    # every day at 10
+    - cron:  '0 10 * * *'
+
+jobs:
+  call-compare-envoy-versions-workflow:
+    uses: ./.github/workflows/compare-envoy-versions.yml
+
+  call-update-protobuf:
+    needs: call-compare-envoy-versions-workflow
+    if: ${{ needs.call-compare-envoy-versions-workflow.outputs.target-version != 'noop' }}
+    uses: ./.github/workflows/update-protobuf.yml
+    with:
+      envoy_version: ${{ needs.call-compare-envoy-versions-workflow.outputs.target-version }}

.github/workflows/update-protobuf.yml

@@ -1,10 +1,11 @@
 name: update-protobuf
 on:
-  workflow_dispatch:
+  workflow_call:
     inputs:
       envoy_version:
         description: 'Envoy version to update to'
         required: true
+        type: string
 
 jobs:
   update-protobuf:
@@ -14,14 +15,19 @@ jobs:
       - name: Run scripts
         working-directory: ./tools/
         run: |
-          ./update-sha.sh ${{ github.event.inputs.envoy_version }} | tee API_SHAS
+          ./update-sha.sh ${{ inputs.envoy_version }} | tee API_SHAS
           ./update-api.sh
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
-          branch: update-protobuf-to-${{ github.event.inputs.envoy_version }}
+          branch: update-protobuf-to-${{ inputs.envoy_version }}
+          base: main
+          author: envoy-bot <[email protected]>
+          committer: envoy-bot <[email protected]>
           signoff: true
-          title: '[protobuf] Update protobuf definitions to ${{ github.event.inputs.envoy_version }}'
+          title: '[protobuf] Update protobuf definitions to ${{ inputs.envoy_version }}'
+          commit-message: |
+            [protobuf] Update protobuf definitions to ${{ inputs.envoy_version }}
           body: |
             This is an automatic PR created by github action workflow:
             - Updated protobuf files

OWNERS.md

@@ -8,7 +8,6 @@
 * Rama Chavali ([ramaraochavali](https://github.com/ramaraochavali)) ([email protected])
 * Ben Hoyt ([b-hoyt](https://github.com/b-hoyt)) ([email protected])
 * Snow Pettersen ([snowp](https://github.com/snowp)) ([email protected])
-* Garrett Bourg ([baojr](https://github.com/baojr)) ([email protected])
 * Michael Puncel ([mpuncel](https://github.com/mpuncel)) ([email protected])
 * Dariusz Jędrzejczyk ([chemicL](https://github.com/chemicL)) ([email protected])
 * Krzysztof Słonka ([slonka](https://github.com/slonka)) ([email protected])

README.md

@@ -7,11 +7,11 @@ in [data-plane-api](https://github.com/envoyproxy/data-plane-api). It started li
 [go-control-plane](https://github.com/envoyproxy/go-control-plane), but building an idiomatic Java implementation is
 prioritized over exact interface parity with the Go implementation.
 
-Both v2 and v3 resources as well as transport versions are supported. Migrating
-to v3 is recommended as Envoy will drop v2 support at EOY 2020 (see
+Only v3 resources as well as transport versions are now supported. Migrating
+to v3 is necessary as Envoy dropped v2 support at EOY 2020 (see
 [API_VERSIONING.md](https://github.com/envoyproxy/envoy/blob/4c6206865061591155d18b55972b4d626e1703dd/api/API_VERSIONING.md))
 
-See the (v2-to-v3 migration guide)[V2_TO_V3_GUIDE.md] for an exmplanation of migration paths.
+See the [v2-to-v3 migration guide](https://github.com/envoyproxy/java-control-plane/blob/main/V2_TO_V3_GUIDE.md) for an explanation of migration paths.
 
 ### Requirements
 
@@ -27,26 +27,26 @@ mvn clean package
 More thorough usage examples are still TODO, but there is a basic test implementation in
 [TestMain](server/src/test/java/io/envoyproxy/controlplane/server/TestMain.java).
 
-#### Bring api up-to-date with data-plane-api
-To bring this repository's protobuf files up-to-date with the source
-of truth protobuf files in in envoyproxy/data-plane-api, do the
-following:
+### Envoy API
+There is automation built into this repo to keep the Envoy API (i.e. protobuf files)
+up to date with the latest available Envoy release.
 
-1. update [tools/API_SHAS](tools/API_SHAS) (instructions are in the
-   file) and then
-2. run [tools/update-api.sh](tools/update-api.sh) from the `tools`
-   directory.
-3. update envoy-alpine-dev docker image version [EnvoyContainer.java] according to envoy SHA in first point.
+This automation uses Github Workflows and works as follows: a scheduled workflow runs with
+weekly cadence, and calls a reusable workflow that fetches the latest available Envoy release
+and compares it with the version currently used in the repo.
 
-#### Releasing a new version
+If the latest available Envoy release doesn't match the version currently used, another
+reusable workflow is called which creates a PR that upgrades the Envoy API to the latest
+available release.
+
+### Releasing a new version
 To release and publish a new version, do the following:
 1. create a personal API token in CircleCI by following the instructions listed [here](https://circleci.com/docs/2.0/managing-api-tokens/#creating-a-personal-api-token)
 2. from terminal, curl the CircleCI API as follows
 
 ```
-curl --request POST \
-  --url https://circleci.com/api/v2/project/github/envoyproxy/java-control-plane/pipeline \
-  --header 'Circle-Token: <API token>' \
-  --header 'content-type: application/json' \
-  --data '{"branch":"main","parameters":{"RELEASE":"<e.g. 0.1.29>","NEXT":"<e.g. 0.1.30-SNAPSHOT>"}}'
+ curl -X POST \
+    -H "Content-Type: application/json" \
+    -d '{ "build_parameters": { "RELEASE": "<e.g. 0.1.29>", "NEXT": "<e.g. 0.1.30-SNAPSHOT>" } }' \
+    "https://circleci.com/api/v1.1/project/github/envoyproxy/java-control-plane/tree/main?circle-token=<API token>"
 ```

api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>java-control-plane</artifactId>
         <groupId>io.envoyproxy.controlplane</groupId>
-        <version>0.1.31-SNAPSHOT</version>
+        <version>0.1.33-SNAPSHOT</version>
     </parent>
 
     <artifactId>api</artifactId>

api/src/main/proto/envoy/admin/v2alpha/certs.proto

@@ -9,6 +9,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "CertsProto";
 option java_multiple_files = true;
+option go_package = "github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha";
 option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: Certificates]

api/src/main/proto/envoy/admin/v2alpha/clusters.proto

@@ -13,6 +13,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ClustersProto";
 option java_multiple_files = true;
+option go_package = "github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha";
 option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: Clusters]

api/src/main/proto/envoy/admin/v2alpha/config_dump.proto

@@ -12,6 +12,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ConfigDumpProto";
 option java_multiple_files = true;
+option go_package = "github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha";
 option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: ConfigDump]