diff --git a/.arclint b/.arclint index 5354b23cc8d..560c165400b 100644 --- a/.arclint +++ b/.arclint @@ -33,7 +33,7 @@ "(^src/ui/src/types/generated/)", "(^src/ui/src/types/schema\\.ts$)", "(^third_party/cpplint/cpplint.py$)", - "(^third_party/github.com/gogo/protobuf/gogoproto/gogo.proto$)", + "(^third_party/gogoproto/gogo.proto$)", "(c_cpp_properties.json$)", "(go\\.mod$)", "(go\\.sum$)" @@ -127,12 +127,6 @@ "script-and-regex.script": "./tools/linters/gazelle.sh", "script-and-regex.regex": "/^(?P[[:alpha:]]+)\n(?P[^\n]+)\n(?P[^\n]+)\n((?P\\d),(?P\\d)\n<<<<<\n(?P.*)=====\n(?P.*)>>>>>\n)$/s" }, - "goimports": { - "type": "goimports", - "include": [ - "(\\.go$)" - ] - }, "golangci-lint": { "type": "golangci-lint", "include": [ @@ -140,7 +134,7 @@ ], "flags": [ "--timeout=5m0s", - "--out-format=checkstyle" + "--output.checkstyle.path=stdout" ] }, "jshint-ui": { diff --git a/.bazelrc b/.bazelrc index 481079770c2..68733e7d35c 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,5 +1,9 @@ # Global bazelrc file, see https://docs.bazel.build/versions/master/guide.html#bazelrc. +# Use local Cache directory if building on a VM: +# On Chef VM, create a directory and comment in the following line: +# build --disk_cache= # Optional for multi-user cache: Make this directory owned by a group name e.g. "bazelcache" + # Use strict action env to prevent leaks of env vars. build --incompatible_strict_action_env @@ -20,6 +24,7 @@ build --remote_download_minimal test --remote_download_minimal run --remote_download_outputs=all coverage --build_runfile_links +coverage --nocache_test_results # Needed by rules_meta. # Follow https://github.com/fmeum/rules_meta/issues/1#issuecomment-1255828109 @@ -269,3 +274,4 @@ build:remote --build_metadata=VISIBILITY=PUBLIC coverage:remote --strategy=CoverageReport=local,remote coverage:remote --experimental_fetch_all_coverage_outputs coverage:remote --experimental_split_coverage_postprocessing +coverage:remote --experimental_remote_download_regex=.*/(coverage.dat$|_coverage/_coverage_report.dat$) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 9d837cee348..4e29338249a 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -36,7 +36,7 @@ jobs: image-base-name: "dev_image_with_extras" ref: ${{ needs.env-protect-setup.outputs.ref }} clang-tidy: - runs-on: ubuntu-latest-16-cores + runs-on: oracle-16cpu-64gb-x86-64 needs: [authorize, env-protect-setup, get-dev-image] container: image: ${{ needs.get-dev-image.outputs.image-with-tag }} @@ -64,7 +64,7 @@ jobs: code-coverage: if: github.event_name == 'push' needs: [authorize, env-protect-setup, get-dev-image] - runs-on: ubuntu-latest-16-cores + runs-on: oracle-16cpu-64gb-x86-64 container: image: ${{ needs.get-dev-image.outputs.image-with-tag }} steps: @@ -88,7 +88,7 @@ jobs: ./ci/collect_coverage.sh -u -b main -c "$(git rev-parse HEAD)" -r pixie-io/pixie generate-matrix: needs: [authorize, env-protect-setup, get-dev-image] - runs-on: ubuntu-latest-16-cores + runs-on: oracle-16cpu-64gb-x86-64 container: image: ${{ needs.get-dev-image.outputs.image-with-tag }} outputs: @@ -112,7 +112,7 @@ jobs: echo "Build & Test matrix: ${matrix}" echo "matrix=${matrix}" >> $GITHUB_OUTPUT - name: Upload Target Files - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: target_files path: | @@ -120,7 +120,7 @@ jobs: bazel_tests_* build-and-test: needs: [authorize, env-protect-setup, get-dev-image, generate-matrix] - runs-on: ubuntu-latest-16-cores + runs-on: oracle-16cpu-64gb-x86-64 permissions: contents: read actions: read @@ -138,7 +138,7 @@ jobs: ref: ${{ needs.env-protect-setup.outputs.ref }} - name: Add pwd to git safe dir run: git config --global --add safe.directory `pwd` - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 - name: get bazel config uses: ./.github/actions/bazelrc with: @@ -163,7 +163,7 @@ jobs: ./scripts/bazel_ignore_codes.sh test ${{ matrix.args }} --target_pattern_file=target_files/${{ matrix.tests }} \ 2> >(tee bazel_stderr) - name: Parse junit reports - uses: dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5 # v1.9.1 + uses: dorny/test-reporter@6e6a65b7a0bd2c9197df7d0ae36ac5cee784230c # v2.0.0 if: always() with: name: testlogs-${{ matrix.name }} tests diff --git a/.github/workflows/cacher.yaml b/.github/workflows/cacher.yaml index f324bbea2d3..584360a5ff3 100644 --- a/.github/workflows/cacher.yaml +++ b/.github/workflows/cacher.yaml @@ -12,7 +12,7 @@ jobs: with: image-base-name: "dev_image" populate-caches: - runs-on: ubuntu-latest-8-cores + runs-on: oracle-8cpu-32gb-x86-64 needs: get-dev-image container: image: ${{ needs.get-dev-image.outputs.image-with-tag }} @@ -20,14 +20,14 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: go cache - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2 with: path: /px/pkg/mod key: go-cache-${{ hashFiles('go.sum') }} restore-keys: | go-cache- - name: yarn cache - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2 with: path: ./src/ui/.yarn/cache key: yarn-cache-${{ hashFiles('src/ui/yarn.lock', 'src/ui/.yarnrc.yml') }} diff --git a/.github/workflows/cli_release.yaml b/.github/workflows/cli_release.yaml index 8871fca6873..ba7a5101002 100644 --- a/.github/workflows/cli_release.yaml +++ b/.github/workflows/cli_release.yaml @@ -15,7 +15,7 @@ jobs: image-base-name: "dev_image_with_extras" build-release: name: Build Release - runs-on: ubuntu-latest-16-cores + runs-on: oracle-16cpu-64gb-x86-64 needs: get-dev-image container: image: ${{ needs.get-dev-image.outputs.image-with-tag }} @@ -62,7 +62,7 @@ jobs: ./ci/save_version_info.sh ./ci/cli_build_release.sh - name: Upload Github Artifacts - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: linux-artifacts path: artifacts/ @@ -73,7 +73,7 @@ jobs: MANIFEST_UPDATES: "" GOOGLE_APPLICATION_CREDENTIALS: ${{ steps.gcloud-creds.outputs.gcloud-creds }} run: ./ci/update_artifact_manifest.sh - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: artifact-upload-log path: ${{ env.ARTIFACT_UPLOAD_LOG }} @@ -104,7 +104,7 @@ jobs: mkdir -p "artifacts/" export ARTIFACTS_DIR="$(pwd)/artifacts" ./ci/cli_merge_sign.sh - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: macos-artifacts path: artifacts/ @@ -120,10 +120,10 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 with: name: macos-artifacts - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 with: name: artifact-upload-log - name: Import GPG key @@ -150,11 +150,11 @@ jobs: mkdir -p "artifacts/" export ARTIFACTS_DIR="$(pwd)/artifacts" ./ci/cli_upload_signed.sh - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: macos-signed-artifacts path: artifacts/ - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: manifest-updates path: ${{ env.MANIFEST_UPDATES }} @@ -168,7 +168,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 - name: Create Release env: REF: ${{ github.event.ref }} @@ -188,7 +188,7 @@ jobs: --notes $'Pixie CLI Release:\n'"${changelog}" gh release upload "${TAG_NAME}" linux-artifacts/* macos-artifacts/* update-gh-artifacts-manifest: - runs-on: ubuntu-latest-8-cores + runs-on: oracle-8cpu-32gb-x86-64 needs: [get-dev-image, create-github-release] container: image: ${{ needs.get-dev-image.outputs.image-with-tag }} @@ -221,7 +221,7 @@ jobs: git config --global user.email 'build@pixielabs.ai' git config --global user.signingkey "${BUILDBOT_GPG_KEY_ID}" git config --global commit.gpgsign true - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 id: download-artifact with: name: manifest-updates diff --git a/.github/workflows/cloud_release.yaml b/.github/workflows/cloud_release.yaml index 8762496e0f1..ff49ea2cf35 100644 --- a/.github/workflows/cloud_release.yaml +++ b/.github/workflows/cloud_release.yaml @@ -15,7 +15,7 @@ jobs: image-base-name: "dev_image_with_extras" build-release: name: Build Release - runs-on: ubuntu-latest-16-cores + runs-on: oracle-16cpu-64gb-x86-64 needs: get-dev-image container: image: ${{ needs.get-dev-image.outputs.image-with-tag }} @@ -56,7 +56,7 @@ jobs: mkdir -p "${ARTIFACTS_DIR}" ./ci/save_version_info.sh ./ci/cloud_build_release.sh - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: cloud-artifacts path: artifacts/ @@ -71,7 +71,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 - name: Create Release env: REF: ${{ github.event.ref }} diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index f3885c18d89..20dc5700ef8 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -10,38 +10,51 @@ permissions: contents: read jobs: analyze-go: - runs-on: ubuntu-latest-16-cores + runs-on: oracle-16cpu-64gb-x86-64 permissions: actions: read contents: read security-events: write steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 + - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version-file: 'go.mod' - - uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9 + - uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13 with: languages: go - - uses: github/codeql-action/autobuild@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9 - - uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9 + - uses: github/codeql-action/autobuild@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13 + - uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13 with: category: "/language:go" - analyze: - runs-on: ubuntu-latest-8-cores + analyze-python: + runs-on: oracle-8cpu-32gb-x86-64 permissions: actions: read contents: read security-events: write - strategy: - fail-fast: false - matrix: - language: [python, javascript] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9 + - uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13 with: - languages: ${{ matrix.language }} - - uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9 + languages: python + - uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13 with: - category: "/language:${{matrix.language}}" + category: "/language:python" + analyze-javascript: + runs-on: oracle-8cpu-32gb-x86-64 + permissions: + actions: read + contents: read + security-events: write + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0 + with: + node-version: 18 + - uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13 + with: + languages: javascript + - uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13 + with: + category: "/language:javascript" diff --git a/.github/workflows/mirror_demos.yaml b/.github/workflows/mirror_demos.yaml index 7b53e3f1dca..0f2c5f46df4 100644 --- a/.github/workflows/mirror_demos.yaml +++ b/.github/workflows/mirror_demos.yaml @@ -9,24 +9,24 @@ jobs: permissions: contents: read packages: write - runs-on: ubuntu-latest-16-cores + runs-on: oracle-16cpu-64gb-x86-64 steps: - - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v2 + - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v2 with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v2 + - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v2 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v2 + - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v2 with: registry: quay.io username: ${{ secrets.QUAY_IO_USER }} password: ${{ secrets.QUAY_IO_PASSWORD }} - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 + - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version-file: 'go.mod' - name: install regbot diff --git a/.github/workflows/mirror_deps.yaml b/.github/workflows/mirror_deps.yaml index 8a70b885fe1..983b598927c 100644 --- a/.github/workflows/mirror_deps.yaml +++ b/.github/workflows/mirror_deps.yaml @@ -9,24 +9,24 @@ jobs: permissions: contents: read packages: write - runs-on: ubuntu-latest-16-cores + runs-on: oracle-16cpu-64gb-x86-64 steps: - - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v2 + - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v2 with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v2 + - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v2 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v2 + - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v2 with: registry: quay.io username: ${{ secrets.QUAY_IO_USER }} password: ${{ secrets.QUAY_IO_PASSWORD }} - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 + - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version-file: 'go.mod' - name: install regbot diff --git a/.github/workflows/mirror_releases.yaml b/.github/workflows/mirror_releases.yaml index 76033a7c5ec..f89ac612887 100644 --- a/.github/workflows/mirror_releases.yaml +++ b/.github/workflows/mirror_releases.yaml @@ -10,24 +10,24 @@ jobs: permissions: contents: read packages: write - runs-on: ubuntu-latest-16-cores + runs-on: oracle-16cpu-64gb-x86-64 steps: - - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v2 + - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v2 with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v2 + - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v2 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v2 + - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v2 with: registry: quay.io username: ${{ secrets.QUAY_IO_USER }} password: ${{ secrets.QUAY_IO_PASSWORD }} - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 + - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: go-version-file: 'go.mod' - name: install regbot diff --git a/.github/workflows/operator_release.yaml b/.github/workflows/operator_release.yaml index f955adc90ab..d5db686663d 100644 --- a/.github/workflows/operator_release.yaml +++ b/.github/workflows/operator_release.yaml @@ -15,7 +15,7 @@ jobs: image-base-name: "dev_image_with_extras" build-release: name: Build Release - runs-on: ubuntu-latest-16-cores + runs-on: oracle-16cpu-64gb-x86-64 needs: get-dev-image container: image: ${{ needs.get-dev-image.outputs.image-with-tag }} @@ -67,15 +67,15 @@ jobs: MANIFEST_UPDATES: "" GOOGLE_APPLICATION_CREDENTIALS: ${{ steps.gcloud-creds.outputs.gcloud-creds }} run: ./ci/update_artifact_manifest.sh - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: manifest-updates path: ${{ env.MANIFEST_UPDATES }} - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: operator-artifacts path: artifacts/ - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: index-artifacts path: index.yaml @@ -89,7 +89,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 - name: Create Release env: REF: ${{ github.event.ref }} @@ -121,7 +121,7 @@ jobs: with: fetch-depth: 0 ref: gh-pages - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 - name: Setup git shell: bash env: @@ -142,7 +142,7 @@ jobs: git commit -s -m "Release Helm chart ${VERSION}" git push origin "gh-pages" update-gh-artifacts-manifest: - runs-on: ubuntu-latest-8-cores + runs-on: oracle-8cpu-32gb-x86-64 needs: [get-dev-image, create-github-release] container: image: ${{ needs.get-dev-image.outputs.image-with-tag }} @@ -175,7 +175,7 @@ jobs: git config --global user.email 'build@pixielabs.ai' git config --global user.signingkey "${BUILDBOT_GPG_KEY_ID}" git config --global commit.gpgsign true - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 id: download-artifact with: name: manifest-updates diff --git a/.github/workflows/oss_scorecard.yaml b/.github/workflows/oss_scorecard.yaml index 5b148514e9c..4fd32c5994f 100644 --- a/.github/workflows/oss_scorecard.yaml +++ b/.github/workflows/oss_scorecard.yaml @@ -20,11 +20,11 @@ jobs: actions: read steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0 + - uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1 with: publish_results: true results_file: results.sarif results_format: sarif - - uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9 + - uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13 with: sarif_file: results.sarif diff --git a/.github/workflows/perf_common.yaml b/.github/workflows/perf_common.yaml index 8b5f46514b1..01083668873 100644 --- a/.github/workflows/perf_common.yaml +++ b/.github/workflows/perf_common.yaml @@ -34,7 +34,7 @@ jobs: ref: ${{ inputs.ref }} generate-perf-matrix: needs: get-dev-image-with-extras - runs-on: ubuntu-latest-16-cores + runs-on: oracle-16cpu-64gb-x86-64 container: image: ${{ needs.get-dev-image-with-extras.outputs.image-with-tag }} outputs: @@ -57,7 +57,7 @@ jobs: echo "matrix=${matrix}" >> $GITHUB_OUTPUT run-perf-eval: needs: [get-dev-image-with-extras, generate-perf-matrix] - runs-on: ubuntu-latest-16-cores + runs-on: oracle-16cpu-64gb-x86-64 container: image: ${{ needs.get-dev-image-with-extras.outputs.image-with-tag }} strategy: @@ -107,7 +107,7 @@ jobs: run: gcloud auth revoke # Github actions doesn't have native support for gathering outputs from matrix runs. # So we upload an artifact for each one and gather them ourselves in `get-perf-outputs`. - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: ${{ hashFiles('run_output') }} path: run_output @@ -119,7 +119,7 @@ jobs: outputs: experiments: ${{ steps.get-outputs.outputs.run_output }} steps: - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 - id: get-outputs run: | all_run_output="$(cat */run_output | jq --slurp -c '.[]')" diff --git a/.github/workflows/pr_genfiles.yml b/.github/workflows/pr_genfiles.yml index 622df7212c9..a76d3d65c36 100644 --- a/.github/workflows/pr_genfiles.yml +++ b/.github/workflows/pr_genfiles.yml @@ -13,7 +13,7 @@ jobs: with: image-base-name: "dev_image" run-genfiles: - runs-on: ubuntu-latest-8-cores + runs-on: oracle-8cpu-32gb-x86-64 needs: get-dev-image container: image: ${{ needs.get-dev-image.outputs.image-with-tag }} @@ -21,14 +21,14 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: go cache - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2 with: path: /px/pkg/mod key: go-cache-${{ hashFiles('go.sum') }} restore-keys: | go-cache- - name: yarn cache - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2 with: path: ./src/ui/.yarn/cache key: yarn-cache-${{ hashFiles('src/ui/yarn.lock', 'src/ui/.yarnrc.yml') }} diff --git a/.github/workflows/pr_linter.yml b/.github/workflows/pr_linter.yml index 8dd94954e4f..9769777a618 100644 --- a/.github/workflows/pr_linter.yml +++ b/.github/workflows/pr_linter.yml @@ -13,7 +13,7 @@ jobs: with: image-base-name: "linter_image" run-container-lint: - runs-on: ubuntu-latest-8-cores + runs-on: oracle-8cpu-32gb-x86-64 needs: get-linter-image container: image: ${{ needs.get-linter-image.outputs.image-with-tag }} @@ -23,7 +23,7 @@ jobs: with: fetch-depth: 100 - name: yarn cache - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2 with: path: ./src/ui/.yarn/cache key: yarn-cache-${{ hashFiles('src/ui/yarn.lock', 'src/ui/.yarnrc.yml') }} diff --git a/.github/workflows/release_update_docs_px_dev.yaml b/.github/workflows/release_update_docs_px_dev.yaml index b6842bc9f8f..2efec3b6445 100644 --- a/.github/workflows/release_update_docs_px_dev.yaml +++ b/.github/workflows/release_update_docs_px_dev.yaml @@ -13,7 +13,7 @@ jobs: image-base-name: "dev_image_with_extras" generate-docs: needs: get-dev-image - runs-on: ubuntu-latest-8-cores + runs-on: oracle-8cpu-32gb-x86-64 container: image: ${{ needs.get-dev-image.outputs.image-with-tag }} steps: @@ -30,7 +30,7 @@ jobs: run: | bazel run src/carnot/docstring:docstring -- \ --output_json=$(pwd)/pxl_documentation.json - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: pxl_documentation path: pxl_documentation.json @@ -68,7 +68,7 @@ jobs: git config --global user.name 'pixie-io-buildbot' git config --global user.email 'build@pixielabs.ai' git remote add fork git@github.com:pixie-io-buildbot/docs.px.dev.git - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 with: name: pxl_documentation path: external/ diff --git a/.github/workflows/trivy_fs.yaml b/.github/workflows/trivy_fs.yaml index 4005f505854..6e43472a835 100644 --- a/.github/workflows/trivy_fs.yaml +++ b/.github/workflows/trivy_fs.yaml @@ -32,7 +32,7 @@ jobs: - run: | jq '.runs[].tool.driver.name = "trivy-fs"' < trivy-results.sarif > tmp mv tmp trivy-results.sarif - - uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9 + - uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13 with: sarif_file: 'trivy-results.sarif' category: trivy-fs diff --git a/.github/workflows/trivy_images.yaml b/.github/workflows/trivy_images.yaml index 7083074847d..7527326ea7e 100644 --- a/.github/workflows/trivy_images.yaml +++ b/.github/workflows/trivy_images.yaml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: artifact: [cloud, operator, vizier] - runs-on: ubuntu-latest-8-cores + runs-on: oracle-8cpu-32gb-x86-64 needs: get-dev-image container: image: ${{ needs.get-dev-image.outputs.image-with-tag }} @@ -54,7 +54,7 @@ jobs: jq '.runs[].tool.driver.name = "trivy-images"' < "$f" > tmp mv tmp "$f" done - - uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9 + - uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13 with: sarif_file: sarif/${{ matrix.artifact }} category: trivy-images diff --git a/.github/workflows/update_script_bundle.yaml b/.github/workflows/update_script_bundle.yaml index e60999c9b58..1c3d4547841 100644 --- a/.github/workflows/update_script_bundle.yaml +++ b/.github/workflows/update_script_bundle.yaml @@ -34,7 +34,7 @@ jobs: export PATH="$PATH:$(pwd)" cd src/pxl_scripts make bundle-oss.json - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: bundle path: src/pxl_scripts/bundle-oss.json @@ -50,7 +50,7 @@ jobs: with: fetch-depth: 0 ref: gh-pages - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 - name: Import GPG key env: BUILDBOT_GPG_KEY_B64: ${{ secrets.BUILDBOT_GPG_KEY_B64 }} diff --git a/.github/workflows/vizier_release.yaml b/.github/workflows/vizier_release.yaml index 89199c2f91a..12d722cfaf4 100644 --- a/.github/workflows/vizier_release.yaml +++ b/.github/workflows/vizier_release.yaml @@ -15,7 +15,7 @@ jobs: image-base-name: "dev_image_with_extras" build-release: name: Build Release - runs-on: ubuntu-latest-16-cores + runs-on: oracle-16cpu-64gb-x86-64 needs: get-dev-image container: image: ${{ needs.get-dev-image.outputs.image-with-tag }} @@ -74,15 +74,15 @@ jobs: MANIFEST_UPDATES: "" GOOGLE_APPLICATION_CREDENTIALS: ${{ steps.gcloud-creds.outputs.gcloud-creds }} run: ./ci/update_artifact_manifest.sh - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: manifest-updates path: ${{ env.MANIFEST_UPDATES }} - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: vizier-artifacts path: artifacts/ - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: index-artifacts path: index.yaml @@ -96,7 +96,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 - name: Create Release env: REF: ${{ github.event.ref }} @@ -128,7 +128,7 @@ jobs: with: fetch-depth: 0 ref: gh-pages - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 - name: Setup git shell: bash env: @@ -149,7 +149,7 @@ jobs: git commit -s -m "Release Helm chart Vizier ${VERSION}" git push origin "gh-pages" update-gh-artifacts-manifest: - runs-on: ubuntu-latest-8-cores + runs-on: oracle-8cpu-32gb-x86-64 needs: [get-dev-image, create-github-release] container: image: ${{ needs.get-dev-image.outputs.image-with-tag }} @@ -182,7 +182,7 @@ jobs: git config --global user.email 'build@pixielabs.ai' git config --global user.signingkey "${BUILDBOT_GPG_KEY_ID}" git config --global commit.gpgsign true - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 id: download-artifact with: name: manifest-updates diff --git a/.golangci.yaml b/.golangci.yaml index 60a40769988..d6b08bc4ffe 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -1,34 +1,11 @@ --- +version: "2" run: - # Tell golangci-lint to not acquire a lock because - # arcanist will run multiple instances in parallel. allow-parallel-runners: true - # arcanist runs many of these in parallel causing - # CPU contention and longer runtimes. - timeout: 3m - -output: - sort-results: true - -issues: - max-issues-per-linter: 0 - max-same-issues: 0 - # TODO(ddelnano): Remove once typecheck is upgraded in next golangci-lint upgrade - # This error originates from the stdlib due to generics usage - exclude-rules: - - path: .*slices\/sort.go - linters: - - typecheck - text: "^(undefined: (min|max))" - linters: enable: - asciicheck - errcheck - # Although goimports includes gofmt, it doesn't support the simplify option. - # So we include gofmt here. - - gofmt - - gosimple - govet - ineffassign - makezero @@ -39,24 +16,62 @@ linters: - predeclared - revive - staticcheck - # https://github.com/golangci/golangci-lint/issues/2649 - # - structcheck - - typecheck - unused - # https://github.com/golangci/golangci-lint/issues/2649 - # - wastedassign - whitespace - disable: - # The following linters are run separately by arcanist at the moment. - # This is because we have autofix hooks for these linters. - - goimports - disable-all: false - -linters-settings: - errcheck: - # yamllint disable-line rule:line-length - ignore: io:Close,github.com/fatih/color,github.com/spf13/pflag:MarkHidden,github.com/spf13/viper:(BindEnv|BindPFlag),github.com/spf13/cobra:(Help|MarkFlagRequired|Usage),github.com/segmentio/analytics-go/v3:Enqueue,database/sql:Rollback,github.com/nats-io/nats.go:Unsubscribe - goimports: - local-prefixes: px.dev - nakedret: - max-func-lines: 0 + settings: + errcheck: + exclude-functions: + - io.Close + - (*github.com/spf13/pflag.FlagSet).MarkHidden + - github.com/spf13/viper.BindEnv + - github.com/spf13/viper.BindPFlag + - github.com/spf13/viper.BindPFlags + - (*github.com/spf13/cobra.Command).Help + - (*github.com/spf13/cobra.Command).MarkFlagRequired + - (*github.com/spf13/cobra.Command).Usage + - (github.com/segmentio/analytics-go/v3.Client).Enqueue + - (*database/sql.Tx).Rollback + - (*github.com/nats-io/nats.go.Subscription).Unsubscribe + revive: + rules: + - name: unused-parameter + disabled: true + staticcheck: + checks: + - all + - "-ST1005" # ignore the "ST1005: error strings should not be capitalized" check + - "-QF1008" # ignore omit embedded fields from selector expression + exclusions: + generated: lax + presets: + - comments + - common-false-positives + - legacy + - std-error-handling + paths: + - third_party$ + - builtin$ + - examples$ +issues: + max-issues-per-linter: 0 + max-same-issues: 0 +formatters: + enable: + - gci + - gofumpt + settings: + gci: + sections: + - standard + - default + - prefix(px.dev) + custom-order: true + goimports: + local-prefixes: + - px.dev + exclusions: + generated: lax + paths: + - third_party$ + - builtin$ + - examples$ diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index d061afd4936..87ec25a7bdd 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -10,6 +10,166 @@ This document outlines the process for setting up the development environment fo ## Setting up the Environment +Decide first if you'd like a full buildsystem (on a VM) or a containerized dev environment. + +### VM as buildsystem + +This utilizes `chef` to setup all dependencies and is based on `ubuntu`. +> [!Important] +> The below description defaults to using a `minikube` on this VM for the developer to have an `all-in-one` setup. The VM type must support nested virtualization for `minikube` to work. Please confirm that the nested virtualization really is turned on before you continue, not all VM-types support it. +> If you `bring-your-own-k8s`, you may disregard this. + +```yaml +advancedMachineFeatures: + enableNestedVirtualization: true +``` + +The following specifics were tested on GCP on a Ubuntu 24.04 (May 2025). Please see the latest [packer file](https://github.com/pixie-io/pixie/blob/main/tools/chef/Makefile#L56) for the current supported Ubuntu version: The initial compilation is CPU intense and `16vcpu` were a good trade-off, a balanced disk of 500 GB seems convenient and overall `n2-standard-16` works well. + +> [!Warning] +> The first `full build` takes several hours and at least 160 Gb of space +> The first `vizier build` on these parameters takes approx. 1 hr and 45 Gb of space. + + + + + +#### 1) Install chef and some dependencies + +First, install `chef` to cook your `recipies`: + +```bash +curl -L https://chefdownload-community.chef.io/install.sh | sudo bash +``` +You may find it helpful to use a terminal manager like `screen` or `tmux`, esp to detach the builds. +```bash +sudo apt install -y screen git +``` + +In order to very significantly speed up your work, you may opt for a local cache directory. This can be shared between users of the VM, if both are part of the same group. +Create a cache dir under such as e.g. /tmp/bazel +```sh +sudo groupadd bazelcache +sudo usermod -aG bazelcache $USER +sudo mkdir -p +sudo chown -R :bazelcache +sudo chmod -R 2775 +``` + + +Now, on this VM, clone pixie (or your fork of it) + +```bash +git clone https://github.com/pixie-io/pixie.git +cd pixie/tools/chef +sudo chef-solo -c solo.rb -j node_workstation.json +sudo usermod -aG libvirt $USER +``` + +Make permanent the env loading via your bashrc +```sh +echo "source /opt/px_dev/pxenv.inc " >> ~/.bashrc +``` + + +#### 2) If using cache, tell bazel about it + +Edit the `` into the .bazelrc and put it into your homedir: +``` +# Global bazelrc file, see https://docs.bazel.build/versions/master/guide.html#bazelrc. + +# Use local Cache directory if building on a VM: +# On Chef VM, create a directory and comment in the following line: + build --disk_cache=/tmp/bazel/ # Optional for multi-user cache: Make this directory owned by a group name e.g. "bazelcache" +``` + +```sh +cp .bazelrc ~/. +``` + +#### 3) Create/Use a registry you control and login + +```sh +docker login ghcr.io/ +``` + +#### 4) Prepare your kubernetes + +> [!Important] +> The below description defaults to using a `minikube` on this VM for the developer to have an `all-in-one` setup. +> If you `bring-your-own-k8s`, please prepare your preferred setup and go to Step 5 + +If you added your user to the libvirt group (`sudo usermod -aG libvirt $USER`), starting the development environment on this VM will now work (if you did this interactively: you need to refresh your group membership, e.g. by logout/login). The following command will, amongst other things, start minikube +```sh +make dev-env-start +``` + +#### 5) Deploy a vanilla pixie + +First deploy the upstream pixie (`vizier`, `kelvin` and `pem`) using the hosted cloud. Follow [these instructions](https://docs.px.dev/installing-pixie/install-schemes/cli) to install the `px` command line interface and Pixie: +```sh +px auth login +``` + +Once logged in to pixie, we found that limiting the memory is useful, thus after login, set the deploy option like so: +```sh +px deploy -p=1Gi +``` +For reference and further information https://docs.px.dev/installing-pixie/install-guides/hosted-pixie/cosmic-cloud. + +Optional on `minikube`: + +You may encounter the following WARNING, which is related to the kernel headers missing on the minikube node (this is not your VM node). This is safe to ignore if Pixie starts up properly and your cluster is queryable from Pixie's [Live UI](https://docs.px.dev/using-pixie/using-live-ui). Please see [pixie-issue2051](https://github.com/pixie-io/pixie/issues/2051) for further details. +``` +ERR: Detected missing kernel headers on your cluster's nodes. This may cause issues with the Pixie agent. Please install kernel headers on all nodes. +``` + +#### 6) Skaffold deploy your changes + +Once you make changes to the source code, or switch to another source code version, use Skaffold to deploy (after you have the vanilla setup working on minikube) + +Ensure that you have commented in the bazelcache-directory into the bazel config (see Step 2). + + +Review the compilation-mode suits your purposes: +``` +cat skaffold/skaffold_vizier.yaml +# Note: You will want to stick with a sysroot based build (-p x86_64_sysroot or -p aarch64_sysroot), +# but you may want to change the --complication_mode setting based on your needs. +# opt builds remove assert/debug checks, while dbg builds work with debuggers (gdb). +# See the bazel docs for more details https://bazel.build/docs/user-manual#compilation-mode +- name: x86_64_sysroot + patches: + - op: add + path: /build/artifacts/context=./bazel/args + value: + - --config=x86_64_sysroot + - --compilation_mode=dbg +# - --compilation_mode=opt +``` + +Optional: you can make permanent your in the skaffold config: +```sh +skaffold config set default-repo +skaffold run -f skaffold/skaffold_vizier.yaml -p x86_64_sysroot +``` + +Check that your docker login token is still valid, then + +```sh +skaffold run -f skaffold/skaffold_vizier.yaml -p x86_64_sysroot --default-repo= +``` + + + +#### 7) Golden Image + +Once all the above is working and the first cache has been built, bake an image of your VM for safekeeping. + + + + +### Containerized Devenv To set up the developer environment required to start building Pixie's components, run the `run_docker.sh` script. The following script will run the Docker container and dump you out inside the docker container console from which you can run all the necessary tools to build, test, and deploy Pixie in development mode. 1. Since this script runs a Docker container, you must have Docker installed. To install it follow these instructions [here](https://docs.docker.com/get-docker/). @@ -138,3 +298,10 @@ You will be able to run any of the CLI commands using `bazel run`. - `bazel run //src/pixie_cli:px -- deploy` will be equivalent to `px deploy` - `bazel run //src/pixie_cli:px -- run px/cluster` is the same as `px run px/cluster` + + +# Using a Custom Pixie without Development Environment +This section is on deploying pixie when it is in a state where parts are official and parts are self-developped, without setting up the Development environment + +First, get yourself a kubernetes and have helm, kubectl and your favourite tools in your favourite places. + diff --git a/PLATFORM.md b/PLATFORM.md new file mode 100644 index 00000000000..e04091a0223 --- /dev/null +++ b/PLATFORM.md @@ -0,0 +1,5 @@ +# Using a Custom Pixie without Development Environment +This section is on deploying pixie when it is in a state where parts are official and parts are self-developped, without setting up the Development environment + +First, get yourself a kubernetes and have helm, kubectl and your favourite tools in your favourite places. + diff --git a/WORKSPACE b/WORKSPACE index cd6909b64c1..f375888b5fe 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -33,7 +33,7 @@ pl_go_overrides() go_download_sdk( name = "go_sdk", - version = "1.21.0", + version = "1.24.0", ) go_rules_dependencies() @@ -251,8 +251,7 @@ go_download_sdk( go_download_sdk( name = "go_sdk_boringcrypto", experiments = ["boringcrypto"], - # TODO(james): update this to 1.21.0, once there is a 1.21.1 release. - version = "1.20.13", + version = "1.23.5", ) pip_parse( diff --git a/bazel/BUILD.bazel b/bazel/BUILD.bazel index c5d200b3841..b62ded018e5 100644 --- a/bazel/BUILD.bazel +++ b/bazel/BUILD.bazel @@ -122,7 +122,7 @@ platform( ], exec_properties = { "OSFamily": "Linux", - "Pool": "202305312341", + "Pool": "202504142133", }, ) diff --git a/bazel/external/opentelemetry.BUILD b/bazel/external/opentelemetry.BUILD index b90e8a758dc..888a797107e 100644 --- a/bazel/external/opentelemetry.BUILD +++ b/bazel/external/opentelemetry.BUILD @@ -123,3 +123,42 @@ cc_grpc_library( grpc_only = True, deps = [":metrics_service_proto_cc"], ) + +proto_library( + name = "logs_proto", + srcs = [ + "opentelemetry/proto/logs/v1/logs.proto", + ], + deps = [ + ":common_proto", + ":resource_proto", + ], +) + +cc_proto_library( + name = "logs_proto_cc", + deps = [":logs_proto"], +) + +proto_library( + name = "logs_service_proto", + srcs = [ + "opentelemetry/proto/collector/logs/v1/logs_service.proto", + ], + deps = [ + ":logs_proto", + ], +) + +cc_proto_library( + name = "logs_service_proto_cc", + deps = [":logs_service_proto"], +) + +cc_grpc_library( + name = "logs_service_grpc_cc", + srcs = [":logs_service_proto"], + generate_mocks = True, + grpc_only = True, + deps = [":logs_service_proto_cc"], +) diff --git a/bazel/external/protobuf_javascript.patch b/bazel/external/protobuf_javascript.patch index a4f5cf6fda3..7241159e2c6 100644 --- a/bazel/external/protobuf_javascript.patch +++ b/bazel/external/protobuf_javascript.patch @@ -6,7 +6,7 @@ index 97b5844..1351a54 100644 for (int i = 0; i < file->dependency_count(); i++) { const std::string& name = file->dependency(i)->name(); -+ if (ModuleAlias(name) == "github_com_gogo_protobuf_gogoproto_gogo_pb") { ++ if (ModuleAlias(name) == "gogoproto_gogo_pb") { + continue; + } printer->Print( diff --git a/bazel/get_workspace_status.sh b/bazel/get_workspace_status.sh index f71fbae43b1..ba3b7a42c86 100755 --- a/bazel/get_workspace_status.sh +++ b/bazel/get_workspace_status.sh @@ -64,7 +64,7 @@ else fi # Use 0.0.0-dev for all dev build versions. We don't have a version number that is -# shared accross all our binaries which makes it hard to semantically version. +# shared across all our binaries which makes it hard to semantically version. echo "STABLE_BUILD_SCM_REVISION ${git_rev}" echo "STABLE_BUILD_TAG 0.0.0-dev" echo "STABLE_BUILD_NUMBER 0" diff --git a/bazel/gogo.bzl b/bazel/gogo.bzl index 1b05adde909..363d073eef3 100644 --- a/bazel/gogo.bzl +++ b/bazel/gogo.bzl @@ -23,12 +23,12 @@ def _gogo_grpc_proto_impl(ctx): ctx.file("WORKSPACE", 'workspace(name = "{}")'.format(ctx.name)) ctx.file("BUILD.bazel", "") ctx.symlink( - ctx.path(Label("@com_github_gogo_protobuf//gogoproto:gogo.proto")), - "github.com/gogo/protobuf/gogoproto/gogo.proto", + ctx.path(Label("//third_party/gogoproto:gogo.proto")), + "gogoproto/gogo.proto", ) - ctx.file("github.com/gogo/protobuf/gogoproto/BUILD.bazel", """ + ctx.file("gogoproto/BUILD.bazel", """ -load("@px//bazel:proto_compile.bzl", "pl_proto_library", "pl_cc_proto_library") +load("@px//bazel:proto_compile.bzl", "pl_proto_library", "pl_cc_proto_library", "pl_py_proto_library") pl_proto_library( name = "gogo_pl_proto", @@ -44,6 +44,13 @@ pl_cc_proto_library( deps = [], ) +pl_py_proto_library( + name = "gogo_pl_py_proto", + proto = ":gogo_pl_proto", + visibility = ["//visibility:public"], + deps = [], +) + """) gogo_grpc_proto = repository_rule( diff --git a/bazel/pl_build_system.bzl b/bazel/pl_build_system.bzl index 30e12ab3dca..bee3aa46262 100644 --- a/bazel/pl_build_system.bzl +++ b/bazel/pl_build_system.bzl @@ -23,7 +23,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test") load("@rules_python//python:defs.bzl", "py_test") load("//bazel:toolchain_transitions.bzl", "qemu_interactive_runner") -pl_boringcrypto_go_sdk = ["1.20.13"] +pl_boringcrypto_go_sdk = ["1.23.5"] pl_supported_go_sdk_versions = ["1.18", "1.19", "1.20", "1.21", "1.22", "1.23"] # The last version in this list corresponds to the boringcrypto go sdk version. diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 21b056b3f85..55d23e61323 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -121,7 +121,7 @@ def _cc_deps(): # Dependencies with native bazel build files. _bazel_repo("upb") - _bazel_repo("com_google_protobuf", patches = ["//bazel/external:protobuf_gogo_hack.patch", "//bazel/external:protobuf_text_format.patch", "//bazel/external:protobuf_warning.patch"], patch_args = ["-p1"]) + _bazel_repo("com_google_protobuf", patches = ["//bazel/external:protobuf_text_format.patch", "//bazel/external:protobuf_warning.patch"], patch_args = ["-p1"]) _bazel_repo("com_github_grpc_grpc", patches = ["//bazel/external:grpc.patch", "//bazel/external:grpc_go_toolchain.patch", "//bazel/external:grpc_test_visibility.patch"], patch_args = ["-p1"]) _bazel_repo("boringssl", patches = ["//bazel/external:boringssl.patch"], patch_args = ["-p0"]) diff --git a/bazel/test_runners/qemu_with_kernel/create_sysroot_disk.sh b/bazel/test_runners/qemu_with_kernel/create_sysroot_disk.sh index 154e723137b..9c600e84220 100755 --- a/bazel/test_runners/qemu_with_kernel/create_sysroot_disk.sh +++ b/bazel/test_runners/qemu_with_kernel/create_sysroot_disk.sh @@ -24,11 +24,11 @@ SYSROOT="" EXTRAS="" usage() { - echo "Usage: $0 -o -s -b -e :,: -k " + echo "Usage: $0 -o -s -b -e :,: -k " echo " The generated ext2fs file system image as a qcow2 file" echo " The input sysroot to use for the disk" echo " Additional files that need to be written to the image" - echo " The tar.gz package of kernel and header files." + echo " The tar.gz package of kernel and header files." exit 1 } diff --git a/bazel/test_runners/qemu_with_kernel/exit_qemu_with_status/exit_qemu_with_status.c b/bazel/test_runners/qemu_with_kernel/exit_qemu_with_status/exit_qemu_with_status.c index a996d71f6f6..abfd1b02c43 100644 --- a/bazel/test_runners/qemu_with_kernel/exit_qemu_with_status/exit_qemu_with_status.c +++ b/bazel/test_runners/qemu_with_kernel/exit_qemu_with_status/exit_qemu_with_status.c @@ -38,7 +38,7 @@ int main(int argc, char** argv) { // QEMU transforms this into (status << 1) | 1; // We don't want to interfere with qemu error code, // so we further make sure the codes are > 128 for exit codes from our tests. - // If we shift by 6, the additinal shift of 1 by qemu will make the exit code > 128. + // If we shift by 6, the additional shift of 1 by qemu will make the exit code > 128. statusb |= (1 << 6); outb(statusb, EXIT_PORT); diff --git a/ci/collect_coverage.sh b/ci/collect_coverage.sh index ff9fead1f6c..59661a0c96e 100755 --- a/ci/collect_coverage.sh +++ b/ci/collect_coverage.sh @@ -138,12 +138,13 @@ check_config # Print config parameters. print_config -lcov_opts=(--rc lcov_branch_coverage=1) +# TODO: Try to track down the negative coverage issue. +lcov_opts=(--rc branch_coverage=1 --ignore-errors negative) cd $(bazel info workspace) # Get coverage from bazel targets. -bazel coverage --remote_download_outputs=all --combined_report=lcov //src/... +bazel coverage --combined_report=lcov //src/... # Copy the output file cp --no-preserve=mode "$(bazel info output_path)/_coverage/_coverage_report.dat" ${COVERAGE_FILE} @@ -153,13 +154,11 @@ lcov "${lcov_opts[@]}" --summary ${COVERAGE_FILE} # Remove test files from the coverage files. lcov "${lcov_opts[@]}" -r ${COVERAGE_FILE} '**/*_test.cc' -o ${COVERAGE_FILE} -lcov "${lcov_opts[@]}" -r ${COVERAGE_FILE} '**/*_mock.cc' -o ${COVERAGE_FILE} lcov "${lcov_opts[@]}" -r ${COVERAGE_FILE} '**/*_mock.h' -o ${COVERAGE_FILE} lcov "${lcov_opts[@]}" -r ${COVERAGE_FILE} '**/*_test.go' -o ${COVERAGE_FILE} lcov "${lcov_opts[@]}" -r ${COVERAGE_FILE} '**/*.gen.go' -o ${COVERAGE_FILE} lcov "${lcov_opts[@]}" -r ${COVERAGE_FILE} '**/*-mock.tsx' -o ${COVERAGE_FILE} lcov "${lcov_opts[@]}" -r ${COVERAGE_FILE} '**/*-mock.ts' -o ${COVERAGE_FILE} -lcov "${lcov_opts[@]}" -r ${COVERAGE_FILE} 'src/ui/src/types/generated/**' -o ${COVERAGE_FILE} # Print out the final summary. lcov "${lcov_opts[@]}" --summary ${COVERAGE_FILE} diff --git a/docker.properties b/docker.properties index 3ff98ed65d8..7ae5eb73573 100644 --- a/docker.properties +++ b/docker.properties @@ -1,4 +1,4 @@ -DOCKER_IMAGE_TAG=202409092344 -LINTER_IMAGE_DIGEST=18436897f607dd6b1926c12de13be7e9ed668a17cff133e4da90aad0112a406f -DEV_IMAGE_DIGEST=83eba02bf4ced64161276dee88dcd6f02de5951bb3ce5346a1182c70498156aa -DEV_IMAGE_WITH_EXTRAS_DIGEST=27ff4d9111b77516fdf73715ba6ea23d02de3b790d88f6f70a48c5e1ec53570c +DOCKER_IMAGE_TAG=202504142133 +LINTER_IMAGE_DIGEST=0129dd524203f95a25f4343ec4499919db4434752375624a4cdbd51d463acdaf +DEV_IMAGE_DIGEST=f669bf0bc9db3ce03a48365a41e87de1a8e3e9be01bc5a1e10816412c671665e +DEV_IMAGE_WITH_EXTRAS_DIGEST=65535207f2fb805d45bb7997cf0a71abbd756cf8763db02c57838f8ee18f0c66 diff --git a/go.mod b/go.mod index 4927aef0aef..82afe0d5e35 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module px.dev/pixie -go 1.21 +go 1.24.0 require ( cloud.google.com/go v0.81.0 @@ -79,7 +79,7 @@ require ( go.uber.org/zap v1.24.0 golang.org/x/exp v0.0.0-20230307190834-24139beb5833 golang.org/x/mod v0.20.0 - golang.org/x/net v0.33.0 + golang.org/x/net v0.36.0 golang.org/x/oauth2 v0.6.0 golang.org/x/sync v0.11.0 golang.org/x/sys v0.30.0 @@ -161,7 +161,7 @@ require ( github.com/go-openapi/validate v0.22.1 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/goccy/go-yaml v1.9.8 // indirect - github.com/golang-jwt/jwt/v4 v4.5.0 // indirect + github.com/golang-jwt/jwt/v4 v4.5.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect @@ -269,7 +269,7 @@ require ( go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.6.0 // indirect - golang.org/x/crypto v0.31.0 // indirect + golang.org/x/crypto v0.35.0 // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect golang.org/x/text v0.22.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect diff --git a/go.sum b/go.sum index 3a72a36e17a..734a4e36ba3 100644 --- a/go.sum +++ b/go.sum @@ -401,8 +401,8 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= -github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= -github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= +github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-migrate/migrate v3.5.4+incompatible h1:R7OzwvCJTCgwapPCiX6DyBiu2czIUMDCB118gFTKTUA= github.com/golang-migrate/migrate v3.5.4+incompatible/go.mod h1:IsVUlFN5puWOmXrqjgGUfIRIbU7mr8oNBE2tyERd9Wk= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -1059,8 +1059,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= +golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= @@ -1134,8 +1134,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA= +golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= diff --git a/go_deps.bzl b/go_deps.bzl index 2957bc1cddd..1a3ebade451 100644 --- a/go_deps.bzl +++ b/go_deps.bzl @@ -1505,8 +1505,8 @@ def pl_go_dependencies(): name = "com_github_golang_jwt_jwt_v4", build_directives = ["gazelle:map_kind go_binary pl_go_binary @px//bazel:pl_build_system.bzl", "gazelle:map_kind go_test pl_go_test @px//bazel:pl_build_system.bzl"], importpath = "github.com/golang-jwt/jwt/v4", - sum = "h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=", - version = "v4.5.0", + sum = "h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=", + version = "v4.5.2", ) go_repository( name = "com_github_golang_migrate_migrate", @@ -4434,8 +4434,8 @@ def pl_go_dependencies(): name = "org_golang_x_crypto", build_directives = ["gazelle:map_kind go_binary pl_go_binary @px//bazel:pl_build_system.bzl", "gazelle:map_kind go_test pl_go_test @px//bazel:pl_build_system.bzl"], importpath = "golang.org/x/crypto", - sum = "h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=", - version = "v0.31.0", + sum = "h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=", + version = "v0.35.0", ) go_repository( name = "org_golang_x_exp", @@ -4476,8 +4476,8 @@ def pl_go_dependencies(): name = "org_golang_x_net", build_directives = ["gazelle:map_kind go_binary pl_go_binary @px//bazel:pl_build_system.bzl", "gazelle:map_kind go_test pl_go_test @px//bazel:pl_build_system.bzl"], importpath = "golang.org/x/net", - sum = "h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=", - version = "v0.33.0", + sum = "h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=", + version = "v0.36.0", ) go_repository( name = "org_golang_x_oauth2", diff --git a/k8s/cloud/base/proxy_nginx_config.yaml b/k8s/cloud/base/proxy_nginx_config.yaml index 5d3e3b0321f..7fbc3c507ba 100644 --- a/k8s/cloud/base/proxy_nginx_config.yaml +++ b/k8s/cloud/base/proxy_nginx_config.yaml @@ -247,7 +247,7 @@ data: } # This is the server that we use for all the locations that don't have a subdomain. - # This just serves the minimal pages necessary to authenticate and get into a subdomain specfic site. + # This just serves the minimal pages necessary to authenticate and get into a subdomain specific site. server { listen [::]:56000 ssl http2; listen 56000 ssl http2; diff --git a/k8s/cloud_deps/base/elastic/operator/elastic_operator.yaml b/k8s/cloud_deps/base/elastic/operator/elastic_operator.yaml index 1b692fe568e..e5abaaa029c 100644 --- a/k8s/cloud_deps/base/elastic/operator/elastic_operator.yaml +++ b/k8s/cloud_deps/base/elastic/operator/elastic_operator.yaml @@ -337,7 +337,7 @@ spec: description: SelfSignedCertificate allows configuring the self-signed certificate generated by the operator. properties: disabled: - description: Disabled indicates that the provisioning of the self-signed certifcate should be disabled. + description: Disabled indicates that the provisioning of the self-signed certificate should be disabled. type: boolean subjectAltNames: description: SubjectAlternativeNames is a list of SANs to include in the generated HTTP TLS certificate. @@ -697,7 +697,7 @@ spec: description: SelfSignedCertificate allows configuring the self-signed certificate generated by the operator. properties: disabled: - description: Disabled indicates that the provisioning of the self-signed certifcate should be disabled. + description: Disabled indicates that the provisioning of the self-signed certificate should be disabled. type: boolean subjectAltNames: description: SubjectAlternativeNames is a list of SANs to include in the generated HTTP TLS certificate. @@ -1030,7 +1030,7 @@ spec: description: SelfSignedCertificate allows configuring the self-signed certificate generated by the operator. properties: disabled: - description: Disabled indicates that the provisioning of the self-signed certifcate should be disabled. + description: Disabled indicates that the provisioning of the self-signed certificate should be disabled. type: boolean subjectAltNames: description: SubjectAlternativeNames is a list of SANs to include in the generated HTTP TLS certificate. @@ -1622,7 +1622,7 @@ spec: description: SelfSignedCertificate allows configuring the self-signed certificate generated by the operator. properties: disabled: - description: Disabled indicates that the provisioning of the self-signed certifcate should be disabled. + description: Disabled indicates that the provisioning of the self-signed certificate should be disabled. type: boolean subjectAltNames: description: SubjectAlternativeNames is a list of SANs to include in the generated HTTP TLS certificate. @@ -1943,7 +1943,7 @@ spec: description: SelfSignedCertificate allows configuring the self-signed certificate generated by the operator. properties: disabled: - description: Disabled indicates that the provisioning of the self-signed certifcate should be disabled. + description: Disabled indicates that the provisioning of the self-signed certificate should be disabled. type: boolean subjectAltNames: description: SubjectAlternativeNames is a list of SANs to include in the generated HTTP TLS certificate. @@ -2766,7 +2766,7 @@ spec: description: SelfSignedCertificate allows configuring the self-signed certificate generated by the operator. properties: disabled: - description: Disabled indicates that the provisioning of the self-signed certifcate should be disabled. + description: Disabled indicates that the provisioning of the self-signed certificate should be disabled. type: boolean subjectAltNames: description: SubjectAlternativeNames is a list of SANs to include in the generated HTTP TLS certificate. @@ -3384,7 +3384,7 @@ spec: description: SelfSignedCertificate allows configuring the self-signed certificate generated by the operator. properties: disabled: - description: Disabled indicates that the provisioning of the self-signed certifcate should be disabled. + description: Disabled indicates that the provisioning of the self-signed certificate should be disabled. type: boolean subjectAltNames: description: SubjectAlternativeNames is a list of SANs to include in the generated HTTP TLS certificate. @@ -3677,7 +3677,7 @@ spec: description: SelfSignedCertificate allows configuring the self-signed certificate generated by the operator. properties: disabled: - description: Disabled indicates that the provisioning of the self-signed certifcate should be disabled. + description: Disabled indicates that the provisioning of the self-signed certificate should be disabled. type: boolean subjectAltNames: description: SubjectAlternativeNames is a list of SANs to include in the generated HTTP TLS certificate. @@ -4006,7 +4006,7 @@ spec: description: SelfSignedCertificate allows configuring the self-signed certificate generated by the operator. properties: disabled: - description: Disabled indicates that the provisioning of the self-signed certifcate should be disabled. + description: Disabled indicates that the provisioning of the self-signed certificate should be disabled. type: boolean subjectAltNames: description: SubjectAlternativeNames is a list of SANs to include in the generated HTTP TLS certificate. @@ -4375,7 +4375,7 @@ spec: description: SelfSignedCertificate allows configuring the self-signed certificate generated by the operator. properties: disabled: - description: Disabled indicates that the provisioning of the self-signed certifcate should be disabled. + description: Disabled indicates that the provisioning of the self-signed certificate should be disabled. type: boolean subjectAltNames: description: SubjectAlternativeNames is a list of SANs to include in the generated HTTP TLS certificate. diff --git a/k8s/devinfra/buildbuddy-executor/README.md b/k8s/devinfra/buildbuddy-executor/README.md index 3d8a6ce5dcd..b39ba9b3841 100644 --- a/k8s/devinfra/buildbuddy-executor/README.md +++ b/k8s/devinfra/buildbuddy-executor/README.md @@ -1,10 +1,18 @@ -Install buildbuddy executor to a k8s cluster: -- `helm repo add buildbuddy https://helm.buildbuddy.io` -- (For now not all changes to buildbuddy-executor have landed in the helm repo, so you should use my fork [here](https://github.com/JamesMBartlett/buildbuddy-helm/tree/all_changes_for_pixie) and replace any references to `buildbuddy/buildbuddy-executor` with `/path/to/checkout-of-fork/charts/buildbuddy-executor`) -- From the workspace root run: -``` -BB_EXECUTOR_API_KEY= \ +Bazel RBE with Buildbuddy +========================= + +To install buildbuddy executor to a k8s cluster, run the following from the workspace root. + +```bash +export BB_EXECUTOR_API_KEY="" +export NAMESPACE="" + +helm repo add buildbuddy https://helm.buildbuddy.io + +kubectl create namespace "${NAMESPACE}" || true +kubectl create secret -n "${NAMESPACE}" generic buildbuddy-executor-api-key --from-literal=api-key="${BB_EXECUTOR_API_KEY}" || true + IMAGE_TAG="$(grep DOCKER_IMAGE_TAG "docker.properties" | cut -d= -f2)" \ -envsubst < k8s/devinfra/buildbuddy-executor/values.yaml | \ -helm upgrade --install -f - buildbuddy buildbuddy/buildbuddy-executor --create-namespace -n buildbuddy +envsubst '$IMAGE_TAG' < k8s/devinfra/buildbuddy-executor/values.yaml | \ +helm upgrade --install -f - buildbuddy buildbuddy/buildbuddy-executor -n "${NAMESPACE}" ``` diff --git a/k8s/devinfra/buildbuddy-executor/values.yaml b/k8s/devinfra/buildbuddy-executor/values.yaml index b10c184d49f..380d84dc4ae 100644 --- a/k8s/devinfra/buildbuddy-executor/values.yaml +++ b/k8s/devinfra/buildbuddy-executor/values.yaml @@ -1,18 +1,37 @@ --- -replicas: 48 +replicas: 16 + +autoscaler: + enabled: true + minReplicas: 8 + maxReplicas: 48 + metrics: + - type: ContainerResource + containerResource: + name: cpu + container: buildbuddy-executor + target: + # These executors idle at a very low CPU usage, so any utilization should trigger some scaling. + type: Utilization + averageUtilization: 20 + resources: limits: memory: 8Gi cpu: null requests: - cpu: null + cpu: 4 config: + server_type: buildbuddy-executor executor: app_target: "grpcs://remote.buildbuddy.io:443" - api_key: $BB_EXECUTOR_API_KEY + api_key: "${API_KEY}" + default_isolation_type: none docker_socket: "" + enable_podman: false + enable_oci: false enable_bare_runner: true - local_cache_size_bytes: 375000000000 # 375GB + local_cache_size_bytes: 20000000000 # 20GB millicpu: 4000 extraInitContainers: @@ -21,23 +40,23 @@ extraInitContainers: image: ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd # yamllint disable rule:line-length command: ['sh', '-c', 'set -e; - curl -fsSL https://github.com/buildbuddy-io/buildbuddy/releases/download/v2.12.42/executor-enterprise-linux-amd64 > /bb-executor/executor; - chmod +x /bb-executor/executor'] + curl -fsSL https://github.com/buildbuddy-io/buildbuddy/releases/download/v2.154.0/executor-enterprise-linux-amd64 > /bb-executor/executor; + chmod +x /bb-executor/executor' + ] # yamllint enable rule:line-length volumeMounts: - name: bb-executor mountPath: /bb-executor image: - repository: gcr.io/pixie-oss/pixie-dev-public/dev_image + repository: ghcr.io/pixie-io/dev_image tag: '$IMAGE_TAG' # Some clusters don't have ipv6 enabled, but we need it for some tests. customExecutorCommand: - /bin/sh - -c -- 'sysctl -w net.ipv6.conf.lo.disable_ipv6=0 && - /bb-executor/executor --server_type=buildbuddy-executor' +- 'sysctl -w net.ipv6.conf.lo.disable_ipv6=0 && /bb-executor/executor' poolName: '"$IMAGE_TAG"' @@ -55,6 +74,12 @@ extraVolumes: emptyDir: {} - name: tmp emptyDir: {} +extraEnvVars: +- name: API_KEY + valueFrom: + secretKeyRef: + name: buildbuddy-executor-api-key + key: api-key containerSecurityContext: privileged: true diff --git a/k8s/operator/crd/base/px.dev_viziers.yaml b/k8s/operator/crd/base/px.dev_viziers.yaml index b25d7b59240..3786548e125 100644 --- a/k8s/operator/crd/base/px.dev_viziers.yaml +++ b/k8s/operator/crd/base/px.dev_viziers.yaml @@ -1,11 +1,9 @@ - --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.17.2 name: viziers.px.dev spec: group: px.dev @@ -22,14 +20,19 @@ spec: description: Vizier is the Schema for the viziers API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -51,18 +54,18 @@ spec: Vizier should be pointing to. type: string clusterName: - description: ClusterName is a name for the Vizier instance, usually - specifying which cluster the Vizier is deployed to. If not specified, - a random name will be generated. + description: |- + ClusterName is a name for the Vizier instance, usually specifying which cluster the Vizier is + deployed to. If not specified, a random name will be generated. type: string customDeployKeySecret: description: CustomDeployKeySecret is the name of the secret where the deploy key is stored. type: string dataAccess: - description: DataAccess defines the level of data that may be accesssed - when executing a script on the cluster. If none specified, assumes - full data access. + description: |- + DataAccess defines the level of data that may be accesssed when executing a script on the cluster. If none specified, + assumes full data access. enum: - Full - Restricted @@ -78,9 +81,9 @@ spec: to the PEM via environment variables. type: object datastreamBufferSize: - description: DatastreamBufferSize is the data buffer size per - connection. Default size is 1 Mbyte. For high-throughput applications, - try increasing this number if experiencing data loss. + description: |- + DatastreamBufferSize is the data buffer size per connection. + Default size is 1 Mbyte. For high-throughput applications, try increasing this number if experiencing data loss. format: int32 type: integer datastreamBufferSpikeSize: @@ -90,15 +93,15 @@ spec: type: integer type: object deployKey: - description: DeployKey is the deploy key associated with the Vizier - instance. This is used to link the Vizier to a specific user/org. - This is required unless specifying a CustomDeployKeySecret. + description: |- + DeployKey is the deploy key associated with the Vizier instance. This is used to link the Vizier to a + specific user/org. This is required unless specifying a CustomDeployKeySecret. type: string devCloudNamespace: - description: 'DevCloudNamespace should be specified only for dev versions - of Pixie cloud which have no ingress to help redirect traffic to - the correct service. The DevCloudNamespace is the namespace that - the dev Pixie cloud is running on, for example: "plc-dev".' + description: |- + DevCloudNamespace should be specified only for dev versions of Pixie cloud which have no ingress to help + redirect traffic to the correct service. The DevCloudNamespace is the namespace that the dev Pixie cloud is + running on, for example: "plc-dev". type: string disableAutoUpdate: description: DisableAutoUpdate specifies whether auto update should @@ -109,28 +112,28 @@ spec: for the K8s leaderships elections which Vizier uses manage pod leadership. properties: electionPeriodMs: - description: ElectionPeriodMs defines how frequently Vizier attempts - to run a K8s leader election, in milliseconds. The period also - determines how long Vizier waits for a leader election response - back from the K8s API. If the K8s API is slow to respond, consider - increasing this number. + description: |- + ElectionPeriodMs defines how frequently Vizier attempts to run a K8s leader election, in milliseconds. The period + also determines how long Vizier waits for a leader election response back from the K8s API. If the K8s API is + slow to respond, consider increasing this number. format: int64 type: integer type: object patches: additionalProperties: type: string - description: Patches defines patches that should be applied to Vizier - resources. The key of the patch should be the name of the resource - that is patched. The value of the patch is the patch, encoded as - a string which follow the "strategic merge patch" rules for K8s. + description: |- + Patches defines patches that should be applied to Vizier resources. + The key of the patch should be the name of the resource that is patched. The value of the patch is the patch, + encoded as a string which follow the "strategic merge patch" rules for K8s. type: object pemMemoryLimit: description: PemMemoryLimit is a memory limit applied specifically to PEM pods. type: string pemMemoryRequest: - description: PemMemoryRequest is a memory request applied specifically + description: |- + PemMemoryRequest is a memory request applied specifically to PEM pods. It will automatically use the value of pemMemoryLimit if not specified. type: string @@ -152,29 +155,34 @@ spec: nodeSelector: additionalProperties: type: string - description: 'NodeSelector is a selector which must be true for - the pod to fit on a node. Selector which must match a node''s - labels for the pod to be scheduled on that node. More info: - https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ - This field cannot be updated once the cluster is created.' + description: |- + NodeSelector is a selector which must be true for the pod to fit on a node. + Selector which must match a node's labels for the pod to be scheduled on that node. + More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ + This field cannot be updated once the cluster is created. type: object resources: - description: Resources is the resource requirements for a container. + description: |- + Resources is the resource requirements for a container. This field cannot be updated once the cluster is created. properties: claims: - description: "Claims lists the names of resources, defined - in spec.resourceClaims, that are used by this container. - \n This is an alpha field and requires enabling the DynamicResourceAllocation - feature gate. \n This field is immutable." + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + This is an alpha field and requires enabling the + DynamicResourceAllocation feature gate. + + This field is immutable. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in - pod.spec.resourceClaims of the Pod where this field - is used. It makes that resource available inside a - container. + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. type: string required: - name @@ -190,8 +198,9 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: 'Limits describes the maximum amount of compute - resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object requests: additionalProperties: @@ -200,21 +209,22 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: 'Requests describes the minimum amount of compute - resources required. If Requests is omitted for a container, - it defaults to Limits if that is explicitly specified, otherwise - to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object securityContext: - description: The securityContext which should be set on non-privileged - pods. All pods which require privileged permissions will still - require a privileged securityContext. + description: |- + The securityContext which should be set on non-privileged pods. All pods which require privileged permissions + will still require a privileged securityContext. properties: enabled: - description: Whether a securityContext should be set on the - pod. In cases where no PSPs are applied to the cluster, - this is not necessary. + description: |- + Whether a securityContext should be set on the pod. In cases where no PSPs are applied to the cluster, this is + not necessary. type: boolean fsGroup: description: A special supplemental group that applies to @@ -233,54 +243,53 @@ spec: type: integer type: object tolerations: - description: 'Tolerations allows scheduling pods on nodes with - matching taints. More info: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/: - This field cannot be updated once the cluster is created.' + description: |- + Tolerations allows scheduling pods on nodes with matching taints. + More info: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/: + This field cannot be updated once the cluster is created. items: - description: The pod this Toleration is attached to tolerates - any taint that matches the triple using - the matching operator . + description: |- + The pod this Toleration is attached to tolerates any taint that matches + the triple using the matching operator . properties: effect: - description: Effect indicates the taint effect to match. - Empty means match all taint effects. When specified, allowed - values are NoSchedule, PreferNoSchedule and NoExecute. + description: |- + Effect indicates the taint effect to match. Empty means match all taint effects. + When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute. type: string key: - description: Key is the taint key that the toleration applies - to. Empty means match all taint keys. If the key is empty, - operator must be Exists; this combination means to match - all values and all keys. + description: |- + Key is the taint key that the toleration applies to. Empty means match all taint keys. + If the key is empty, operator must be Exists; this combination means to match all values and all keys. type: string operator: - description: Operator represents a key's relationship to - the value. Valid operators are Exists and Equal. Defaults - to Equal. Exists is equivalent to wildcard for value, - so that a pod can tolerate all taints of a particular - category. + description: |- + Operator represents a key's relationship to the value. + Valid operators are Exists and Equal. Defaults to Equal. + Exists is equivalent to wildcard for value, so that a pod can + tolerate all taints of a particular category. type: string tolerationSeconds: - description: TolerationSeconds represents the period of - time the toleration (which must be of effect NoExecute, - otherwise this field is ignored) tolerates the taint. - By default, it is not set, which means tolerate the taint - forever (do not evict). Zero and negative values will - be treated as 0 (evict immediately) by the system. + description: |- + TolerationSeconds represents the period of time the toleration (which must be + of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, + it is not set, which means tolerate the taint forever (do not evict). Zero and + negative values will be treated as 0 (evict immediately) by the system. format: int64 type: integer value: - description: Value is the taint value the toleration matches - to. If the operator is Exists, the value should be empty, - otherwise just a regular string. + description: |- + Value is the taint value the toleration matches to. + If the operator is Exists, the value should be empty, otherwise just a regular string. type: string type: object type: array type: object registry: - description: 'Registry specifies the image registry to use rather - than Pixie''s default registry (gcr.io). We expect any forward slashes - in Pixie''s image paths are replaced with a "-". For example: "gcr.io/pixie-oss/pixie-dev/vizier/metadata_server_image:latest" - should be pushed to "$registry/gcr.io-pixie-oss-pixie-dev-vizier-metadata_server_image:latest".' + description: |- + Registry specifies the image registry to use rather than Pixie's default registry (gcr.io). We expect any forward slashes in + Pixie's image paths are replaced with a "-". For example: "gcr.io/pixie-oss/pixie-dev/vizier/metadata_server_image:latest" + should be pushed to "$registry/gcr.io-pixie-oss-pixie-dev-vizier-metadata_server_image:latest". type: string useEtcdOperator: description: UseEtcdOperator specifies whether the metadata service @@ -294,9 +303,9 @@ spec: description: VizierStatus defines the observed state of Vizier properties: checksum: - description: A checksum of the last reconciled Vizier spec. If this - checksum does not match the checksum of the current vizier spec, - reconciliation should be performed. + description: |- + A checksum of the last reconciled Vizier spec. If this checksum does not match the checksum + of the current vizier spec, reconciliation should be performed. format: byte type: string lastReconciliationPhaseTime: @@ -313,9 +322,9 @@ spec: instance. type: string reconciliationPhase: - description: ReconciliationPhase describes the state the Reconciler - is in for this Vizier. See the documentation above the ReconciliationPhase - type for more information. + description: |- + ReconciliationPhase describes the state the Reconciler is in for this Vizier. See the + documentation above the ReconciliationPhase type for more information. type: string sentryDSN: description: SentryDSN is key for Viziers that is used to send errors @@ -329,9 +338,9 @@ spec: is in its lifecycle. type: string vizierReason: - description: VizierReason is a short, machine understandable string - that gives the reason for the transition into the Vizier's current - status. + description: |- + VizierReason is a short, machine understandable string that gives the reason + for the transition into the Vizier's current status. type: string type: object type: object @@ -339,9 +348,3 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/scripts/collect_heap_pprofs.sh b/scripts/collect_heap_pprofs.sh new file mode 100755 index 00000000000..a4dd040b772 --- /dev/null +++ b/scripts/collect_heap_pprofs.sh @@ -0,0 +1,61 @@ +#!/bin/bash -e + +# Copyright 2018- The Pixie Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 + +usage() { + echo "This script downloads all of the files listed in the mappings section of a heap profile." + echo "" + echo "Usage: $0 [...]" + echo " : the directory where the heap profile and memory mapped files will be stored. It will be created if it does not exist." + echo " : the ID of the Vizier cluster to connect to." + echo "Common gcloud ssh options include --project." + exit 1 +} + +heap_profile_dir="$1" +cluster_id="$2" +script_dir=$(dirname "$(realpath "$0")") +repo_root=$(git rev-parse --show-toplevel) + +if [ -z "$heap_profile_dir" ] || [ -z "$cluster_id" ]; then + usage +fi + +mkdir -p "$heap_profile_dir" + +pxl_heap_output_file="${heap_profile_dir}/raw_output_from_hot_table_test.json" + +px run -o json -c "$cluster_id" -f "${repo_root}/src/pxl_scripts/px/collect_heap_dumps.pxl" > "$pxl_heap_output_file" + +while IFS= read -r line; do + hostname=$(echo "$line" | jq -r '.hostname') + heap_content=$(echo "$line" | jq -r '.heap') + echo "$heap_content" > "${heap_profile_dir}/${hostname}.txt" + echo "Wrote ${heap_profile_dir}/${hostname}.txt" +done < "$pxl_heap_output_file" + +nodes=() +for file in "${heap_profile_dir}"/*.txt; do + hostname=$(basename "${file%.*}") + nodes+=("$hostname") + hostname_dir="${heap_profile_dir}/${hostname}" + mkdir -p "$hostname_dir" +done + +for node in "${nodes[@]}"; do + "${script_dir}/download_heap_prof_mapped_files.sh" "${heap_profile_dir}/${node}.txt" "$node" "${@:3}" +done diff --git a/scripts/download_heap_prof_mapped_files.sh b/scripts/download_heap_prof_mapped_files.sh index 82986cc64f1..8d86bfd11e0 100755 --- a/scripts/download_heap_prof_mapped_files.sh +++ b/scripts/download_heap_prof_mapped_files.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e # Copyright 2018- The Pixie Authors. # @@ -20,13 +20,13 @@ usage() { echo "This script downloads all of the files listed in the mappings section of a heap profile." echo "" echo "Usage: $0 [...]" + echo "Common gcloud ssh options include --project." exit 1 } -set -e heap_profile="$1" node_name="$2" -output_dir=/tmp/prof_bins +output_dir="${heap_profile%.txt}" if [ -z "$heap_profile" ] || [ -z "$node_name" ]; then usage @@ -44,7 +44,8 @@ mkdir -p "$output_dir" mappings=$(awk 'BEGIN{m=0} /MAPPED_LIBRARIES/{m=1} { if(m) { print $6 }}' "$heap_profile" | grep "^/" | sort | uniq) err_file="$output_dir/gcloud_error.log" -procs=$(gcloud compute ssh --command='ps ax' "$node_name" "${@:3}" 2> "$err_file") || cat "$err_file" && rm "$err_file" +zone=$(gcloud compute instances list "${@:3}" --filter="$node_name" --format="table(name, zone)"| tail -n 1 | awk '{print $2}') +procs=$(gcloud compute ssh --zone "$zone" --command='ps ax' "$node_name" "${@:3}" 2> "$err_file") || cat "$err_file" && rm "$err_file" # Find the mapping that corresponds to a process on the node. # We assume that the process was started by running one of the files in the mappings @@ -79,15 +80,15 @@ output_on_err() { } # Create tar archive on node. -output_on_err gcloud compute ssh --command="$create_tar_cmd" "$node_name" "${@:3}" +output_on_err gcloud compute ssh --zone "$zone" --command="$create_tar_cmd" "$node_name" "${@:3}" # Copy archive to local machine. -output_on_err gcloud compute scp "${@:3}" "$USER@$node_name:~/$tar_file" "/tmp/$tar_file" +output_on_err gcloud compute scp --zone "$zone" "${@:3}" "$USER@$node_name:~/$tar_file" "${output_dir}/$tar_file" # Cleanup tar archive on node. -output_on_err gcloud compute ssh --command="rm ~/$tar_file" "$node_name" "${@:3}" +output_on_err gcloud compute ssh --zone "$zone" --command="rm ~/$tar_file" "$node_name" "${@:3}" -tar --strip-components=1 -C "$output_dir" -xzf "/tmp/$tar_file" +tar --strip-components=1 -C "$output_dir" -xzf "${output_dir}/$tar_file" echo "Dumped mapped binaries to $output_dir" echo "Run 'PPROF_BINARY_PATH=$output_dir pprof -http=localhost:8888 $heap_profile' to visualize the profile." diff --git a/scripts/update_ts_protos.sh b/scripts/update_ts_protos.sh index eeb9decde91..0ed8e4d3815 100755 --- a/scripts/update_ts_protos.sh +++ b/scripts/update_ts_protos.sh @@ -48,7 +48,7 @@ function copy() { # VizierapiServiceClient.ts has a relative import; we're copying elsewhere. We fix this with perl string substitution. regexRelativeImport="s|import \* as ([^ ]+) from '([^ /]+/)+vizierapi_pb'\;|import * as \1 from './vizierapi_pb';|m" # vizierapi_pb.d.ts incorrectly includes an unused (and non-existent) relative import related to Go protos. Remove it. - regexExtraneousImport="s|^import \* as github_com_gogo_protobuf_gogoproto_gogo_pb.*$||m" + regexExtraneousImport="s|^import \* as gogoproto_gogo_pb.*$||m" for abs_path in $abs_paths; do echo "Propagating ${abs_path} ..." diff --git a/skaffold/skaffold_vizier.yaml b/skaffold/skaffold_vizier.yaml index 2b6218a8c7d..14765d6da6f 100644 --- a/skaffold/skaffold_vizier.yaml +++ b/skaffold/skaffold_vizier.yaml @@ -138,9 +138,15 @@ profiles: path: /manifests/kustomize/paths value: - k8s/vizier/persistent_metadata/aarch64 +# Note: You will want to stick with a sysroot based build (-p x86_64_sysroot or -p aarch64_sysroot), +# but you may want to change the --complication_mode setting based on your needs. +# opt builds remove assert/debug checks, while dbg builds work with debuggers (gdb). +# See the bazel docs for more details https://bazel.build/docs/user-manual#compilation-mode - name: x86_64_sysroot patches: - op: add path: /build/artifacts/context=./bazel/args value: - --config=x86_64_sysroot + - --compilation_mode=dbg +# - --compilation_mode=opt diff --git a/src/api/go/pxapi/examples/basic_example/example.go b/src/api/go/pxapi/examples/basic_example/example.go index 16e71f9787f..0ff22b1797f 100644 --- a/src/api/go/pxapi/examples/basic_example/example.go +++ b/src/api/go/pxapi/examples/basic_example/example.go @@ -28,15 +28,13 @@ import ( "px.dev/pixie/src/api/go/pxapi/types" ) -var ( - pxl = ` +var pxl = ` import px df = px.DataFrame('http_events') df = df[['upid', 'req_path', 'remote_addr', 'req_method']] df = df.head(10) px.display(df, 'http') ` -) type tablePrinter struct{} @@ -56,8 +54,7 @@ func (t *tablePrinter) HandleDone(ctx context.Context) error { return nil } -type tableMux struct { -} +type tableMux struct{} func (s *tableMux) AcceptTable(ctx context.Context, metadata types.TableMetadata) (pxapi.TableRecordHandler, error) { return &tablePrinter{}, nil diff --git a/src/api/go/pxapi/examples/encryption_example/example.go b/src/api/go/pxapi/examples/encryption_example/example.go index 61a0629134e..adb04943abb 100644 --- a/src/api/go/pxapi/examples/encryption_example/example.go +++ b/src/api/go/pxapi/examples/encryption_example/example.go @@ -28,15 +28,13 @@ import ( "px.dev/pixie/src/api/go/pxapi/types" ) -var ( - pxl = ` +var pxl = ` import px df = px.DataFrame('http_events') df = df[['upid', 'req_path', 'remote_addr', 'req_method']] df = df.head(10) px.display(df, 'http') ` -) type tablePrinter struct{} @@ -56,8 +54,7 @@ func (t *tablePrinter) HandleDone(ctx context.Context) error { return nil } -type tableMux struct { -} +type tableMux struct{} func (s *tableMux) AcceptTable(ctx context.Context, metadata types.TableMetadata) (pxapi.TableRecordHandler, error) { return &tablePrinter{}, nil diff --git a/src/api/go/pxapi/examples/example_mux/example.go b/src/api/go/pxapi/examples/example_mux/example.go index 463bc9bd05f..04e6e1b74c2 100644 --- a/src/api/go/pxapi/examples/example_mux/example.go +++ b/src/api/go/pxapi/examples/example_mux/example.go @@ -30,8 +30,7 @@ import ( "px.dev/pixie/src/api/go/pxapi/types" ) -var ( - pxl = ` +var pxl = ` import px df = px.DataFrame('http_events') df = df[['upid', 'req_path', 'remote_addr', 'req_method']] @@ -39,7 +38,6 @@ df = df.head(10) px.display(df, 'http_as_json') px.display(df, 'http_as_table') ` -) func main() { apiKey, ok := os.LookupEnv("PX_API_KEY") diff --git a/src/api/go/pxapi/examples/standalone_pem_example/example.go b/src/api/go/pxapi/examples/standalone_pem_example/example.go index 40e363c4d75..64e1e3b10da 100644 --- a/src/api/go/pxapi/examples/standalone_pem_example/example.go +++ b/src/api/go/pxapi/examples/standalone_pem_example/example.go @@ -90,6 +90,7 @@ type tablePrinter struct{} func (t *tablePrinter) HandleInit(ctx context.Context, metadata types.TableMetadata) error { return nil } + func (t *tablePrinter) HandleRecord(ctx context.Context, r *types.Record) error { for _, d := range r.Data { fmt.Printf("%s ", d.String()) @@ -103,8 +104,7 @@ func (t *tablePrinter) HandleDone(ctx context.Context) error { } // Satisfies the TableMuxer interface. -type tableMux struct { -} +type tableMux struct{} func (s *tableMux) AcceptTable(ctx context.Context, metadata types.TableMetadata) (pxapi.TableRecordHandler, error) { return &tablePrinter{}, nil diff --git a/src/api/go/pxapi/examples/streaming_example/example.go b/src/api/go/pxapi/examples/streaming_example/example.go index 0bcc9586e66..6282e030f20 100644 --- a/src/api/go/pxapi/examples/streaming_example/example.go +++ b/src/api/go/pxapi/examples/streaming_example/example.go @@ -28,13 +28,11 @@ import ( "px.dev/pixie/src/api/go/pxapi/types" ) -var ( - pxl = ` +var pxl = ` import px df = px.DataFrame('http_events', start_time='-5m')[['resp_status','req_path']] px.display(df.stream(), 'http_table') ` -) type tablePrinter struct{} @@ -54,8 +52,7 @@ func (t *tablePrinter) HandleDone(ctx context.Context) error { return nil } -type tableMux struct { -} +type tableMux struct{} func (s *tableMux) AcceptTable(ctx context.Context, metadata types.TableMetadata) (pxapi.TableRecordHandler, error) { return &tablePrinter{}, nil diff --git a/src/api/go/pxapi/results.go b/src/api/go/pxapi/results.go index 253219a113d..17a45a9984a 100644 --- a/src/api/go/pxapi/results.go +++ b/src/api/go/pxapi/results.go @@ -181,7 +181,6 @@ func (s *ScriptResults) run() error { ctx := s.c.Context() for { resp, err := s.c.Recv() - if err != nil { if err == io.EOF { // Stream has terminated. diff --git a/src/api/go/pxapi/vizier.go b/src/api/go/pxapi/vizier.go index 59723fa7417..ef5b0bcdfcb 100644 --- a/src/api/go/pxapi/vizier.go +++ b/src/api/go/pxapi/vizier.go @@ -22,7 +22,6 @@ import ( "context" "px.dev/pixie/src/api/go/pxapi/errdefs" - "px.dev/pixie/src/api/proto/vizierpb" ) diff --git a/src/api/proto/cloudpb/BUILD.bazel b/src/api/proto/cloudpb/BUILD.bazel index 8d54dc2d209..ff2cbd1faaa 100644 --- a/src/api/proto/cloudpb/BUILD.bazel +++ b/src/api/proto/cloudpb/BUILD.bazel @@ -26,7 +26,7 @@ pl_proto_library( "//src/api/proto/uuidpb:uuid_pl_proto", "//src/api/proto/vispb:vis_pl_proto", "//src/api/proto/vizierconfigpb:vizier_pl_proto", - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/api/proto/cloudpb/cloudapi.pb.go b/src/api/proto/cloudpb/cloudapi.pb.go index 3c182bf3306..a13bc5313c9 100755 --- a/src/api/proto/cloudpb/cloudapi.pb.go +++ b/src/api/proto/cloudpb/cloudapi.pb.go @@ -6470,7 +6470,7 @@ func init() { } var fileDescriptor_7acc08cd3b92035f = []byte{ - // 5838 bytes of a gzipped FileDescriptorProto + // 5826 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x7c, 0x5d, 0x6c, 0x1b, 0x57, 0x76, 0xb0, 0x87, 0x94, 0x28, 0xf2, 0x50, 0x3f, 0xd4, 0x95, 0x2c, 0xd3, 0xb4, 0x2d, 0x39, 0xe3, 0x38, 0x4e, 0x9c, 0x44, 0x4e, 0xb4, 0x8e, 0xd7, 0x1b, 0x27, 0xfb, 0x85, 0x22, 0x19, 0x99, 0xb1, @@ -6481,361 +6481,361 @@ var fileDescriptor_7acc08cd3b92035f = []byte{ 0xee, 0x1f, 0xe7, 0x9f, 0xa4, 0xec, 0xa0, 0x40, 0xb1, 0x2f, 0x36, 0xe7, 0xdc, 0x73, 0xcf, 0x39, 0xf7, 0x9c, 0x73, 0xcf, 0xfd, 0x39, 0xe7, 0x0a, 0x5e, 0x76, 0x9d, 0xee, 0x2d, 0xcd, 0xd6, 0x6f, 0xd9, 0x8e, 0xe5, 0x59, 0xb7, 0xba, 0x86, 0x35, 0xec, 0xd9, 0x07, 0xec, 0x7f, 0xcd, 0xd6, 0x37, - 0x29, 0x18, 0x15, 0xed, 0xa7, 0x9b, 0x02, 0x54, 0x79, 0xb3, 0xaf, 0x7b, 0x47, 0xc3, 0x83, 0xcd, - 0xae, 0x35, 0xb8, 0xd5, 0xb7, 0xfa, 0x16, 0xeb, 0x7a, 0x30, 0x3c, 0xa4, 0x5f, 0x8c, 0x0e, 0xf9, - 0xc5, 0xfa, 0x56, 0x2e, 0xf5, 0x2d, 0xab, 0x6f, 0x60, 0x1f, 0x0b, 0x0f, 0x6c, 0xef, 0x84, 0x37, - 0x6e, 0x44, 0x1b, 0x3d, 0x7d, 0x80, 0x5d, 0x4f, 0x1b, 0xd8, 0x1c, 0x61, 0x3d, 0x8a, 0xf0, 0x99, - 0xa3, 0xd9, 0x36, 0x76, 0x5c, 0x41, 0x20, 0x2c, 0xff, 0x70, 0xa8, 0x13, 0xf1, 0xc9, 0x7f, 0x1c, - 0xe1, 0x4a, 0x18, 0xe1, 0x58, 0x77, 0xed, 0x03, 0xf2, 0x2f, 0x6f, 0xbe, 0x15, 0x6d, 0xfe, 0x5c, - 0xc7, 0x4e, 0xd7, 0x32, 0x0f, 0xf5, 0x3e, 0xc5, 0x23, 0x9f, 0xaa, 0x77, 0x62, 0x63, 0xde, 0x41, - 0xfe, 0x4b, 0x09, 0x96, 0xf7, 0xed, 0x9e, 0xe6, 0xe1, 0x7d, 0x17, 0x3b, 0x0a, 0xfe, 0x74, 0x88, - 0x5d, 0x0f, 0xdd, 0x80, 0x8c, 0xde, 0x2b, 0x4b, 0x57, 0xa5, 0x57, 0x8b, 0x5b, 0x4b, 0x9b, 0xf6, - 0xd3, 0x4d, 0x26, 0xc8, 0xe6, 0xfe, 0x7e, 0xb3, 0xbe, 0x9d, 0x3b, 0x7d, 0xb6, 0x91, 0x69, 0xd6, - 0x95, 0x8c, 0xde, 0x43, 0x0d, 0x58, 0xea, 0xe9, 0xae, 0x6d, 0x68, 0x27, 0xaa, 0xad, 0x77, 0xbd, - 0xa1, 0x83, 0xcb, 0x19, 0xda, 0xeb, 0xf2, 0x26, 0x1b, 0xe9, 0xa6, 0x18, 0xe9, 0x66, 0xdb, 0x73, - 0x74, 0xb3, 0xff, 0x58, 0x33, 0x86, 0x58, 0x59, 0xe4, 0x9d, 0xf6, 0x58, 0x1f, 0x74, 0x0f, 0x8a, - 0xba, 0xab, 0x6a, 0xb6, 0xed, 0x58, 0xc7, 0xb8, 0x57, 0xce, 0x52, 0x12, 0x95, 0x18, 0x89, 0x6d, - 0xcb, 0x32, 0x18, 0x01, 0xd0, 0xdd, 0x2a, 0xc7, 0x96, 0xdf, 0x83, 0xe5, 0x3a, 0x36, 0xf0, 0xf3, - 0x8d, 0x40, 0x5e, 0x05, 0x14, 0xec, 0xed, 0xda, 0x96, 0xe9, 0x62, 0xf9, 0x87, 0x12, 0x5c, 0xf4, - 0xd5, 0xd2, 0xc6, 0x9e, 0xa7, 0x9b, 0x7d, 0xf7, 0x39, 0xd4, 0x53, 0xd2, 0x4c, 0xcd, 0x38, 0xf1, - 0xf4, 0xae, 0xab, 0x5a, 0xb6, 0x67, 0x0d, 0xbd, 0x29, 0x06, 0xb7, 0x34, 0xea, 0xf3, 0x88, 0x76, - 0xf9, 0x68, 0x26, 0x9f, 0x29, 0x65, 0xe5, 0xcb, 0x50, 0x49, 0x12, 0x89, 0x4b, 0xbc, 0x03, 0x6b, - 0x3b, 0xd8, 0x7b, 0x11, 0x69, 0x39, 0x9b, 0x8f, 0xe0, 0x42, 0x8c, 0x10, 0xe3, 0x81, 0x5e, 0x4b, - 0x18, 0x0e, 0x31, 0x77, 0x3e, 0x49, 0x64, 0xa9, 0x94, 0x91, 0x6b, 0x50, 0xe6, 0xb4, 0xaa, 0x9e, - 0xe7, 0xe8, 0x07, 0x43, 0x0f, 0x9f, 0x59, 0x2c, 0xf9, 0x2e, 0x5c, 0x4c, 0x20, 0xc2, 0x45, 0xba, - 0x04, 0x05, 0xcf, 0x1a, 0x3a, 0xaa, 0x8b, 0xb1, 0x49, 0x89, 0xe5, 0x95, 0x3c, 0x01, 0xb4, 0x31, - 0x36, 0xe5, 0x5f, 0x87, 0x72, 0xfb, 0x45, 0xd9, 0xa3, 0x6f, 0x06, 0x39, 0x64, 0x26, 0x1a, 0xcf, - 0xe7, 0x7e, 0x09, 0x2e, 0xb6, 0xd3, 0xe4, 0x96, 0x31, 0x2c, 0x37, 0xcd, 0x63, 0x3d, 0xec, 0xb4, - 0xab, 0x30, 0x8b, 0x07, 0x9a, 0x6e, 0x50, 0xb1, 0x0a, 0x0a, 0xfb, 0x40, 0x57, 0x00, 0x0e, 0x75, - 0xc7, 0xf5, 0x54, 0x53, 0x1b, 0xb0, 0xe9, 0x55, 0x50, 0x0a, 0x14, 0xd2, 0xd2, 0x06, 0x54, 0x03, - 0x86, 0x26, 0x5a, 0xb3, 0xb4, 0x35, 0x4f, 0x00, 0xa4, 0x51, 0x7e, 0x00, 0x28, 0xc8, 0x86, 0x2b, - 0x2d, 0x99, 0xcf, 0x06, 0x14, 0x75, 0x8a, 0xab, 0x1a, 0xba, 0xf9, 0x84, 0x33, 0x02, 0x06, 0xda, - 0xd5, 0xcd, 0x27, 0xf2, 0xdb, 0x30, 0xbf, 0x6b, 0xf5, 0x75, 0x53, 0x88, 0xfb, 0x12, 0xcc, 0x6b, - 0xdd, 0x2e, 0x76, 0x5d, 0xd5, 0xb3, 0x9e, 0x70, 0xf5, 0x17, 0x94, 0x22, 0x83, 0x75, 0x08, 0x48, - 0xae, 0x02, 0xf0, 0x2e, 0xb6, 0x71, 0x42, 0xf8, 0x06, 0x31, 0xd9, 0x07, 0x19, 0x1f, 0x7e, 0x6a, - 0xeb, 0x0e, 0x76, 0x55, 0x8d, 0xf9, 0x53, 0x56, 0x29, 0x70, 0x48, 0xd5, 0x23, 0x6e, 0xbf, 0x83, - 0xbd, 0xe6, 0x40, 0xeb, 0xe3, 0x9a, 0x83, 0x7b, 0xd8, 0xf4, 0x74, 0xcd, 0x10, 0x66, 0x94, 0xbf, - 0x01, 0x97, 0x12, 0x5b, 0xfd, 0x91, 0x76, 0x1d, 0xdc, 0x73, 0x05, 0x47, 0xfa, 0x21, 0x77, 0xa0, - 0x58, 0x75, 0x3c, 0xfd, 0x50, 0xeb, 0x7a, 0x6d, 0xec, 0x21, 0x04, 0x33, 0x54, 0x79, 0x0c, 0x87, - 0xfe, 0x46, 0x6f, 0x43, 0x5e, 0xe3, 0x28, 0xe5, 0xcc, 0xd5, 0xec, 0xab, 0xc5, 0xad, 0xf3, 0x9b, - 0x81, 0x55, 0x63, 0x53, 0xf4, 0x57, 0x46, 0x68, 0xf2, 0xef, 0x49, 0xb0, 0x24, 0xc0, 0x0f, 0x75, - 0xc7, 0xb1, 0x1c, 0x17, 0x7d, 0x1b, 0x16, 0x44, 0x3b, 0x0d, 0xbb, 0x94, 0xc7, 0xe2, 0xd6, 0xc5, - 0x44, 0x5a, 0x9d, 0x13, 0x1b, 0x2b, 0xf3, 0x5a, 0xe0, 0x0b, 0xc9, 0x90, 0x73, 0x8f, 0xb4, 0xad, - 0x77, 0xee, 0x30, 0x73, 0x6c, 0xc3, 0xe9, 0xb3, 0x8d, 0x5c, 0xfb, 0x7e, 0x75, 0xeb, 0x9d, 0x3b, - 0x0a, 0x6f, 0x41, 0x97, 0x61, 0x66, 0xe8, 0x18, 0x6e, 0x39, 0x7b, 0x35, 0xfb, 0x6a, 0x61, 0x3b, - 0x7f, 0xfa, 0x6c, 0x63, 0x66, 0x5f, 0xd9, 0x75, 0x15, 0x0a, 0x95, 0xbf, 0xc8, 0x40, 0x5e, 0x30, - 0x40, 0x77, 0xa1, 0x30, 0x5a, 0x91, 0xb8, 0xef, 0xc7, 0x7d, 0xb9, 0x23, 0x30, 0x14, 0x1f, 0x99, - 0x38, 0x47, 0xd7, 0x1a, 0x0c, 0x74, 0x4f, 0x3d, 0xd2, 0xdc, 0x23, 0xe1, 0x1c, 0x0c, 0x74, 0x5f, - 0x73, 0x8f, 0x08, 0xc2, 0x31, 0x76, 0x5c, 0xdd, 0x32, 0x55, 0xd7, 0x73, 0xb8, 0x23, 0x02, 0x07, - 0xb5, 0x3d, 0x07, 0xb5, 0x60, 0x45, 0x3b, 0xd6, 0x74, 0x43, 0x3b, 0x30, 0xb0, 0x2a, 0x06, 0xe9, - 0x96, 0x67, 0xae, 0x66, 0xc7, 0x2a, 0x64, 0x3b, 0x53, 0x96, 0x14, 0x34, 0xea, 0x29, 0x9a, 0x5c, - 0x74, 0x19, 0x0a, 0xdd, 0x23, 0xcd, 0xec, 0x63, 0xc3, 0xea, 0x97, 0x67, 0xd9, 0xac, 0x18, 0x01, - 0xd0, 0x77, 0xa0, 0x12, 0xe7, 0xa6, 0x0e, 0x98, 0x59, 0xca, 0x39, 0x6a, 0xd1, 0xcb, 0x89, 0x4c, - 0xb9, 0xe9, 0x94, 0x72, 0x8c, 0x27, 0x6f, 0x21, 0x86, 0x26, 0xb1, 0x56, 0x80, 0x77, 0x75, 0xd7, - 0x13, 0x53, 0xe2, 0x5a, 0xc0, 0xde, 0x01, 0x9f, 0x1a, 0x19, 0x95, 0xce, 0xd8, 0x98, 0x53, 0x64, - 0xce, 0xe6, 0x14, 0xab, 0x30, 0x6b, 0xe8, 0x03, 0x9d, 0x2d, 0x25, 0x59, 0x85, 0x7d, 0xc8, 0x7f, - 0xc4, 0xa4, 0xaa, 0x5b, 0x9f, 0x99, 0x86, 0xa5, 0xf5, 0xc8, 0x8c, 0x3d, 0x93, 0x54, 0x11, 0x03, - 0x66, 0x62, 0x06, 0x8c, 0x89, 0x9d, 0x3d, 0x93, 0xd8, 0xf2, 0xef, 0x4a, 0x74, 0x65, 0x09, 0x0b, - 0xc8, 0xe7, 0x69, 0x09, 0xb2, 0x43, 0x47, 0xc4, 0x23, 0xf2, 0x73, 0x2a, 0xcf, 0xbf, 0x07, 0xc5, - 0x63, 0xcd, 0xd0, 0x7b, 0xea, 0xd0, 0xf4, 0x74, 0x23, 0x75, 0x65, 0xf5, 0x1d, 0x1a, 0x28, 0xfa, - 0x3e, 0xc1, 0x96, 0xd7, 0x60, 0xb5, 0xe6, 0x60, 0xcd, 0xc3, 0x35, 0x63, 0xe8, 0x7a, 0xa3, 0x20, - 0x2c, 0x3f, 0x86, 0xf3, 0x11, 0x38, 0x97, 0xf1, 0x7d, 0x80, 0x2e, 0x03, 0xa9, 0xe9, 0x2b, 0xc7, - 0xc2, 0xe9, 0xb3, 0x8d, 0x02, 0xef, 0xd9, 0xac, 0x2b, 0x05, 0xde, 0xa3, 0xd9, 0x93, 0x7f, 0x2c, - 0xc1, 0x15, 0xb6, 0x7e, 0x3f, 0x72, 0x9a, 0xa6, 0xeb, 0x69, 0x86, 0x11, 0xe6, 0xfc, 0x82, 0x0c, - 0x50, 0x19, 0xe6, 0xb8, 0xb5, 0xb8, 0xf1, 0xc4, 0x27, 0xb1, 0x3f, 0x89, 0x8d, 0xb6, 0x61, 0x9d, - 0xa8, 0xd8, 0xeb, 0xb2, 0x0d, 0x56, 0x5e, 0x99, 0x17, 0xc0, 0x86, 0xd7, 0xed, 0xc9, 0x3b, 0xb0, - 0x9e, 0x26, 0x1e, 0x57, 0xc0, 0x75, 0x58, 0x1c, 0x52, 0x0c, 0xd5, 0xf5, 0x34, 0xc7, 0xc3, 0x3d, - 0xbe, 0xe0, 0x2e, 0x30, 0x68, 0x9b, 0x01, 0xe5, 0x06, 0xcc, 0x3f, 0xa6, 0x1b, 0xcd, 0x1a, 0xdd, - 0x77, 0xa2, 0x5b, 0xb0, 0x62, 0x6b, 0xae, 0xeb, 0x1d, 0x39, 0xd6, 0xb0, 0x7f, 0xa4, 0x62, 0x93, - 0xcc, 0x29, 0xd1, 0x17, 0x05, 0x9a, 0x1a, 0xac, 0x85, 0xef, 0x43, 0xae, 0x02, 0x0a, 0x92, 0x61, - 0xb2, 0xb1, 0x7d, 0x05, 0xc7, 0xf8, 0x00, 0xce, 0xef, 0x60, 0x4f, 0xe8, 0xc2, 0x3c, 0xb4, 0xce, - 0xbc, 0xb5, 0xf8, 0x91, 0x04, 0xf9, 0x07, 0x77, 0xdd, 0xc6, 0x31, 0x36, 0x3d, 0xa2, 0xbf, 0x01, - 0x76, 0x5d, 0xad, 0x2f, 0xe6, 0x87, 0xf8, 0x44, 0xdf, 0x12, 0x2b, 0x30, 0x89, 0x87, 0xa9, 0x7b, - 0x80, 0x40, 0xdc, 0xa4, 0xd8, 0xe4, 0x9b, 0xec, 0x1e, 0xe8, 0xea, 0x4c, 0x7b, 0x4e, 0x76, 0x50, - 0xba, 0x72, 0x93, 0x4f, 0xf9, 0x5f, 0x33, 0x50, 0xd8, 0xb3, 0x7a, 0x6d, 0x4f, 0xf3, 0x86, 0x6e, - 0xe2, 0x12, 0xf5, 0x26, 0xe4, 0x5c, 0xda, 0xca, 0xe3, 0x47, 0x78, 0x81, 0xda, 0xb3, 0x7a, 0x7b, - 0x47, 0x9a, 0x8b, 0x15, 0x8e, 0x44, 0xac, 0xc7, 0x7e, 0xa9, 0x62, 0x94, 0x2c, 0x46, 0x2f, 0x30, - 0xe8, 0x43, 0x3e, 0xd6, 0x35, 0xc8, 0x39, 0x58, 0x73, 0x2d, 0xb3, 0x3c, 0x43, 0x9b, 0xf9, 0x17, - 0x7a, 0x0f, 0xa0, 0x6b, 0x99, 0x9e, 0xa6, 0x9b, 0xd8, 0x71, 0xcb, 0xb3, 0x09, 0x01, 0xb4, 0x26, - 0x9a, 0x99, 0xcc, 0x4a, 0x00, 0x1f, 0xdd, 0x07, 0xe8, 0xd2, 0x49, 0xd5, 0x23, 0x6b, 0x7c, 0x6e, - 0x92, 0x1e, 0xb8, 0x97, 0xb3, 0x1e, 0x55, 0x4f, 0x29, 0x74, 0xc5, 0x4f, 0x32, 0x6a, 0x4c, 0xcc, - 0xe5, 0x96, 0xe7, 0x12, 0x96, 0x65, 0x61, 0x4c, 0x85, 0x23, 0x31, 0xd7, 0xa7, 0xee, 0xaa, 0x76, - 0xad, 0xa1, 0xe9, 0x95, 0xf3, 0x34, 0x66, 0xce, 0x73, 0x60, 0x8d, 0xc0, 0xe4, 0xff, 0x94, 0x60, - 0x29, 0x22, 0x7d, 0xca, 0xa6, 0x60, 0x96, 0x28, 0x4b, 0x04, 0xec, 0x4b, 0xe9, 0xc3, 0xc7, 0x0a, - 0xc3, 0x0c, 0x3a, 0x55, 0x36, 0xec, 0x54, 0x69, 0x8a, 0xfe, 0xfa, 0x54, 0x15, 0x1b, 0xfb, 0x5c, - 0xc2, 0xd8, 0x7f, 0x5c, 0x80, 0x62, 0x60, 0x0a, 0x4d, 0xbf, 0x2f, 0xde, 0x8a, 0xb8, 0x5f, 0x25, - 0xac, 0x0d, 0x46, 0x92, 0xbb, 0x82, 0xf0, 0xc1, 0x57, 0x61, 0x89, 0x38, 0xf8, 0x7d, 0xac, 0x39, - 0xde, 0x01, 0xd6, 0xbc, 0x96, 0xcb, 0xd7, 0xb0, 0x28, 0x18, 0xbd, 0x0d, 0x39, 0x76, 0x6c, 0xa5, - 0xda, 0x29, 0x46, 0x56, 0x99, 0x60, 0x60, 0x50, 0x38, 0x22, 0xba, 0x05, 0x45, 0x11, 0x3e, 0x87, - 0x7a, 0x8f, 0x6d, 0x09, 0xb6, 0x17, 0x4f, 0x9f, 0x6d, 0x00, 0x17, 0x66, 0xbf, 0x59, 0x57, 0x44, - 0x84, 0xdd, 0xd7, 0x7b, 0x64, 0xff, 0x2a, 0x3a, 0x50, 0x53, 0xe7, 0xd8, 0xfe, 0x95, 0xc3, 0xe8, - 0xa2, 0xb8, 0x09, 0x2b, 0xb6, 0x83, 0x3d, 0xef, 0x44, 0x0d, 0x61, 0x16, 0x28, 0xe6, 0x32, 0x6b, - 0xaa, 0x05, 0xf0, 0x6f, 0xc0, 0x92, 0x40, 0x14, 0xb1, 0x78, 0x8e, 0xe2, 0x2e, 0x72, 0xf0, 0x63, - 0x1e, 0x92, 0x5f, 0x83, 0x92, 0x65, 0x63, 0x47, 0xf3, 0x2c, 0x1f, 0x73, 0x99, 0x62, 0x2e, 0x09, - 0xb8, 0x40, 0xbd, 0x0e, 0x8b, 0xfc, 0xe0, 0x2e, 0x10, 0xf3, 0x6c, 0xe2, 0x32, 0xa8, 0x40, 0x73, - 0xa0, 0x42, 0x26, 0x9c, 0x63, 0x19, 0xaa, 0x6d, 0x68, 0x26, 0x56, 0x6d, 0xab, 0xa7, 0x32, 0xbd, - 0x63, 0xb7, 0x0c, 0x74, 0xb2, 0xbc, 0x93, 0x64, 0x23, 0x62, 0x76, 0xea, 0xbd, 0x8e, 0x65, 0xec, - 0x91, 0x9e, 0xa3, 0xb0, 0x83, 0xdd, 0x86, 0xe9, 0x39, 0x27, 0xca, 0x85, 0x6e, 0x72, 0x2b, 0xfa, - 0x4d, 0x09, 0x5e, 0x1a, 0x9a, 0x47, 0x58, 0x33, 0xbc, 0xa3, 0x13, 0xb5, 0xa7, 0x79, 0x5a, 0x12, - 0xef, 0x45, 0xca, 0xfb, 0x5e, 0x2a, 0xef, 0x7d, 0x41, 0xa1, 0xae, 0x79, 0x5a, 0xb2, 0x04, 0x57, - 0x86, 0xe3, 0x70, 0xc8, 0x19, 0xc8, 0x1c, 0x0e, 0x54, 0xd3, 0xea, 0x61, 0xb7, 0x5c, 0xbc, 0x2a, - 0xbd, 0x3a, 0xab, 0xe4, 0xcd, 0xe1, 0xa0, 0x45, 0xbe, 0xd1, 0x6d, 0x58, 0x23, 0x8d, 0xba, 0xe9, - 0x7a, 0xce, 0x70, 0x80, 0x4d, 0x32, 0xb3, 0x18, 0xe6, 0x3c, 0xc5, 0x5c, 0x35, 0x87, 0x83, 0x66, - 0xa0, 0x91, 0xf5, 0x8a, 0x87, 0xcb, 0x85, 0xa4, 0x70, 0x59, 0x83, 0x25, 0xdb, 0xc1, 0xc7, 0xba, - 0x35, 0x74, 0xf9, 0x80, 0xcb, 0x4b, 0x13, 0xa7, 0xc3, 0xa2, 0xe8, 0xc2, 0x63, 0xcd, 0x2e, 0xac, - 0x46, 0x88, 0xb0, 0xf5, 0xa2, 0x34, 0x71, 0xbd, 0x40, 0x61, 0x4a, 0xa4, 0xa1, 0x72, 0x00, 0x97, - 0xc7, 0x59, 0x93, 0xec, 0xb5, 0x9e, 0xe0, 0x13, 0xb1, 0xd7, 0x7a, 0x82, 0x4f, 0xd0, 0x1b, 0x30, - 0x7b, 0x4c, 0x0e, 0xaf, 0x7c, 0x69, 0x5b, 0x8b, 0x2e, 0x24, 0x5c, 0x6c, 0x86, 0xf4, 0x6e, 0xe6, - 0xae, 0x54, 0x39, 0x02, 0x79, 0xb2, 0xd5, 0xbe, 0x0e, 0x4e, 0x72, 0x8b, 0xee, 0x6a, 0x43, 0x8b, - 0x3c, 0xdf, 0x8e, 0xdc, 0x86, 0x3c, 0x9f, 0x54, 0xe4, 0x78, 0x47, 0x5c, 0xac, 0x9c, 0xe6, 0x62, - 0xca, 0x08, 0x53, 0xfe, 0x08, 0x36, 0x7c, 0x7a, 0x35, 0xcb, 0x34, 0x71, 0xd7, 0xd3, 0x2d, 0xf3, - 0xb9, 0xb6, 0x0f, 0xdf, 0x86, 0xab, 0xe9, 0xb4, 0xfc, 0x13, 0x28, 0x3b, 0xf3, 0x66, 0x02, 0x67, - 0x5e, 0x7e, 0x3d, 0xf2, 0x43, 0x09, 0xae, 0xb2, 0x7d, 0x0d, 0xa7, 0x11, 0x8a, 0x6b, 0x67, 0xbd, - 0xa8, 0xa8, 0xc3, 0x02, 0x8b, 0x84, 0x2a, 0xdb, 0x8f, 0x71, 0x1d, 0x6f, 0xa4, 0x46, 0x4e, 0xc6, - 0x5a, 0x99, 0xef, 0x06, 0xbe, 0xe4, 0x6b, 0xf0, 0xd2, 0x18, 0x91, 0xf8, 0xed, 0xc5, 0x7f, 0x4b, - 0x70, 0xbe, 0x4e, 0xb7, 0x8e, 0x64, 0xca, 0x3c, 0xc0, 0x27, 0x0f, 0xb1, 0xa7, 0x91, 0xe9, 0x3f, - 0xbd, 0xb4, 0xdf, 0x0a, 0x2d, 0x73, 0x93, 0x77, 0x46, 0x81, 0x75, 0x0d, 0xc1, 0x4c, 0x0f, 0xbb, - 0x5d, 0xbe, 0x6e, 0xd2, 0xdf, 0x64, 0xbd, 0xb0, 0x9c, 0xbe, 0xca, 0xe3, 0x7e, 0x02, 0xef, 0xc2, - 0xe9, 0xb3, 0x8d, 0xd9, 0x47, 0x4e, 0xbf, 0x59, 0x57, 0x66, 0x2d, 0xa7, 0xdf, 0xec, 0xa1, 0xdb, - 0x30, 0x37, 0x74, 0xd9, 0x5e, 0x3b, 0x97, 0xdc, 0x87, 0x9e, 0x39, 0xf6, 0x5d, 0xba, 0xd1, 0xce, - 0x11, 0xdc, 0xa6, 0xd8, 0x9c, 0x7e, 0x3f, 0x03, 0x0b, 0x21, 0x05, 0x4c, 0x3f, 0x70, 0x3e, 0x29, - 0x32, 0xfe, 0xa4, 0xf8, 0x3f, 0xaa, 0x0a, 0xf9, 0x2d, 0xa8, 0xb0, 0x7d, 0x47, 0x48, 0x13, 0xc2, - 0x6f, 0x85, 0x68, 0x92, 0x2f, 0x9a, 0x5c, 0x81, 0x32, 0x39, 0x2d, 0x27, 0xe1, 0xcb, 0x6d, 0xb8, - 0x98, 0xd0, 0xc6, 0x67, 0xd1, 0x1d, 0x98, 0x79, 0x82, 0x4f, 0xc4, 0x3c, 0x97, 0x43, 0x2e, 0x9d, - 0xe8, 0x88, 0x0a, 0xc5, 0x97, 0xb7, 0xd9, 0x91, 0x33, 0x49, 0xbe, 0xa9, 0x67, 0xf9, 0x7d, 0x7a, - 0x89, 0x99, 0x2c, 0xd7, 0x1b, 0x7e, 0x84, 0x2b, 0x46, 0x42, 0x7e, 0xb8, 0x03, 0x41, 0x93, 0x37, - 0xa1, 0xb2, 0x6b, 0x59, 0x4f, 0x86, 0x76, 0xa2, 0x40, 0xb1, 0x68, 0x29, 0x3f, 0x80, 0x4b, 0x89, - 0xf8, 0xcf, 0xc5, 0xfc, 0xbf, 0x24, 0xc8, 0x55, 0xf7, 0x9a, 0xbf, 0xa4, 0xbe, 0xfa, 0x1f, 0x12, - 0x2c, 0xb2, 0xd1, 0xff, 0xb2, 0x85, 0xaa, 0xd7, 0x60, 0x85, 0xcd, 0x52, 0x36, 0xfc, 0x71, 0xd3, - 0x73, 0x05, 0x96, 0xc9, 0x14, 0x0c, 0x21, 0xca, 0x0d, 0x40, 0x41, 0x20, 0xf7, 0xbd, 0x5b, 0xa1, - 0x09, 0x19, 0x3e, 0x09, 0x85, 0xf5, 0xcc, 0x67, 0xe2, 0x3d, 0x28, 0xed, 0xe0, 0x30, 0xe9, 0xe9, - 0xa7, 0xe0, 0xbb, 0xb0, 0x1c, 0xe8, 0x3c, 0xba, 0x8e, 0x08, 0xb8, 0xff, 0x4a, 0x82, 0x04, 0xcc, - 0xef, 0x6f, 0xc0, 0x0a, 0x9b, 0x44, 0x61, 0xde, 0xf1, 0xd9, 0xf6, 0x3e, 0xac, 0x86, 0x11, 0xcf, - 0xc6, 0x67, 0x19, 0x96, 0x76, 0xb0, 0xb7, 0xab, 0x1f, 0xe3, 0xc7, 0x3a, 0xfe, 0xcc, 0x55, 0xf0, - 0xa7, 0xb2, 0x02, 0x25, 0xf1, 0x3d, 0xf2, 0xba, 0xb5, 0xd1, 0x98, 0x0b, 0x21, 0x27, 0x13, 0xf6, - 0xc8, 0x04, 0x3c, 0x45, 0x9c, 0x41, 0xb3, 0xfe, 0x19, 0x54, 0xde, 0xa3, 0x7a, 0x0c, 0xb0, 0x71, - 0x6d, 0x72, 0x36, 0x37, 0xf4, 0x63, 0xac, 0x1e, 0x13, 0x08, 0x37, 0xc9, 0x95, 0x90, 0xa0, 0x51, - 0x31, 0x94, 0x82, 0x21, 0x28, 0xc8, 0x1f, 0xd1, 0x1d, 0x96, 0xc0, 0x20, 0x5b, 0x47, 0x72, 0x72, - 0x56, 0xf0, 0xa7, 0xe8, 0x2d, 0x98, 0x1f, 0xd1, 0x55, 0x47, 0x52, 0xd3, 0x23, 0x95, 0x40, 0x27, - 0x47, 0x2a, 0x41, 0xaa, 0x49, 0x2f, 0x54, 0x2e, 0x24, 0x12, 0x73, 0x6d, 0xf4, 0x2d, 0xc8, 0x0f, - 0x38, 0x7b, 0xae, 0xcc, 0x09, 0x32, 0x8e, 0xd0, 0xc9, 0x49, 0xcd, 0x7e, 0x6a, 0xa8, 0x5d, 0x4e, - 0x8e, 0x2b, 0xa9, 0x68, 0x3f, 0x35, 0x04, 0x07, 0xb4, 0x01, 0xd9, 0x63, 0xdd, 0xe5, 0xb3, 0x73, - 0x81, 0x10, 0xa6, 0xb9, 0xd1, 0xcd, 0xc7, 0xba, 0xab, 0x90, 0x16, 0x79, 0x09, 0x16, 0x76, 0xb0, - 0xd7, 0xee, 0x3a, 0xba, 0x4d, 0x47, 0x27, 0x7b, 0xb0, 0xc8, 0xbe, 0xbe, 0x2e, 0xdb, 0x20, 0x19, - 0x16, 0x8e, 0x34, 0x57, 0x1d, 0xe9, 0x8c, 0x4e, 0xfb, 0xbc, 0x52, 0x3c, 0xd2, 0x5c, 0x31, 0x38, - 0x79, 0x07, 0x16, 0x83, 0x62, 0xb8, 0x36, 0x7a, 0x07, 0xe6, 0x5c, 0xf6, 0x99, 0x38, 0x9b, 0xc2, - 0x32, 0x2a, 0x02, 0x57, 0xae, 0xc2, 0xea, 0x88, 0x50, 0xd0, 0x68, 0xaf, 0x41, 0x81, 0xa1, 0xf8, - 0x16, 0x9b, 0x3f, 0x7d, 0xb6, 0x91, 0x67, 0x98, 0xcd, 0xba, 0x92, 0x67, 0xcd, 0xcd, 0x9e, 0x6c, - 0xd0, 0x0b, 0xb4, 0x28, 0x09, 0xd7, 0x46, 0xdf, 0x8c, 0x99, 0x6a, 0xac, 0x4c, 0xbe, 0xa1, 0x2a, - 0x90, 0x8f, 0x18, 0x69, 0xf4, 0x2d, 0xff, 0x54, 0x82, 0x95, 0xea, 0xd0, 0xb3, 0xba, 0xd6, 0xc0, - 0x36, 0xb0, 0x87, 0x03, 0x59, 0x2f, 0xdd, 0xb4, 0x87, 0x9e, 0xc8, 0xd1, 0xd0, 0x0f, 0x74, 0x05, - 0xa0, 0x3b, 0x74, 0x5c, 0xcb, 0x51, 0x6d, 0xcb, 0x15, 0x59, 0x21, 0x06, 0xd9, 0xb3, 0x5c, 0x74, - 0x0f, 0x72, 0x1a, 0xdd, 0x6c, 0xf3, 0x5b, 0xe8, 0x6b, 0xe1, 0x79, 0x19, 0x60, 0x53, 0xa5, 0x68, - 0xf4, 0x3e, 0x9a, 0x77, 0x89, 0xde, 0x14, 0xcc, 0x4c, 0xba, 0x29, 0x90, 0xff, 0x4c, 0x82, 0x85, - 0x8e, 0x76, 0xd0, 0x1e, 0xf6, 0xfb, 0xd8, 0xa5, 0x24, 0x2e, 0x41, 0xc1, 0xd3, 0x0e, 0x54, 0xdd, - 0xec, 0xe1, 0xa7, 0x54, 0xf0, 0xac, 0x92, 0xf7, 0xb4, 0x83, 0x26, 0xf9, 0x46, 0x77, 0xe0, 0x02, - 0x7e, 0x8a, 0xbb, 0x43, 0x8f, 0x65, 0x1f, 0x0e, 0x09, 0x23, 0x17, 0x1b, 0xb8, 0x2b, 0xd2, 0xa5, - 0xe7, 0xfd, 0xe6, 0x2a, 0x69, 0x6d, 0xd3, 0x46, 0xd4, 0x80, 0xa2, 0x3b, 0x62, 0xc1, 0x12, 0x3a, - 0xc5, 0x31, 0x23, 0xf3, 0xc5, 0x51, 0x82, 0xfd, 0xe4, 0x7f, 0x93, 0x60, 0x2d, 0x19, 0x0f, 0x7d, - 0x13, 0x66, 0x9e, 0xe8, 0x66, 0x8f, 0xa7, 0xa1, 0xd2, 0x49, 0x37, 0x4c, 0x4f, 0xf7, 0x4e, 0x1e, - 0xe8, 0x66, 0x4f, 0xa1, 0x1d, 0x46, 0xee, 0x9e, 0x09, 0xb8, 0xfb, 0x55, 0x28, 0x92, 0xa9, 0x40, - 0x5c, 0x41, 0x18, 0xa2, 0xa0, 0x04, 0x41, 0xe8, 0x06, 0x2c, 0x0d, 0x34, 0xaf, 0x7b, 0x84, 0x7b, - 0x4c, 0x53, 0x98, 0xe5, 0x7b, 0xb2, 0xca, 0x22, 0x07, 0x37, 0x19, 0x14, 0xbd, 0x2b, 0x6e, 0xd6, - 0x66, 0xa9, 0x60, 0x2f, 0x4f, 0x10, 0x2c, 0x78, 0xc5, 0x26, 0xff, 0x44, 0x82, 0xd5, 0xb0, 0x5f, - 0xf1, 0xc0, 0x7d, 0x03, 0x96, 0x0e, 0x2d, 0x67, 0xa0, 0x79, 0x1e, 0xe5, 0xef, 0xbb, 0xd8, 0xe2, - 0x08, 0xdc, 0xa4, 0xbe, 0x76, 0x0d, 0x16, 0x74, 0x57, 0xf5, 0x6d, 0xc2, 0xad, 0x34, 0xaf, 0xbb, - 0x8d, 0x11, 0x0c, 0x6d, 0xc3, 0xa2, 0x17, 0x74, 0x01, 0x61, 0x9f, 0xf0, 0xc6, 0x2b, 0xe4, 0x25, - 0x4a, 0xa4, 0x87, 0xfc, 0x0b, 0x09, 0xca, 0x41, 0x51, 0x3f, 0xd4, 0xb1, 0xd1, 0x1b, 0x3f, 0x0f, - 0xb6, 0x01, 0x0e, 0x09, 0x56, 0x30, 0x53, 0x34, 0x95, 0xdd, 0x0a, 0xb4, 0x1b, 0x4d, 0x18, 0xfd, - 0x7f, 0x40, 0x0e, 0xfe, 0x74, 0xa8, 0x3b, 0x64, 0x07, 0xe3, 0xf4, 0x59, 0x01, 0x08, 0x15, 0x7f, - 0x4a, 0x5a, 0x25, 0xd1, 0xbd, 0xea, 0xf4, 0x09, 0x45, 0xf7, 0xec, 0x53, 0xe8, 0x47, 0x12, 0x5c, - 0x4c, 0x18, 0x3a, 0x37, 0x55, 0xc4, 0xf3, 0xa5, 0xe7, 0xf3, 0x7c, 0x74, 0x1b, 0xd6, 0x48, 0x00, - 0xd6, 0x7a, 0x3d, 0x9d, 0x00, 0x34, 0x43, 0x65, 0x7e, 0xe6, 0x72, 0x8b, 0xae, 0x1e, 0x69, 0x6e, - 0x75, 0xd4, 0xf8, 0x90, 0xb5, 0xc9, 0xbf, 0x2f, 0xc1, 0x1c, 0xd9, 0x6e, 0x9d, 0xe9, 0xfa, 0xf3, - 0x22, 0xe4, 0xc9, 0x2e, 0x2e, 0x30, 0x29, 0xe6, 0x2c, 0xa7, 0x2f, 0x32, 0x69, 0x3d, 0x6b, 0xa0, - 0xe9, 0x66, 0x30, 0x27, 0x0f, 0x0c, 0x44, 0x11, 0x5e, 0x83, 0x12, 0xcb, 0x82, 0xf0, 0x92, 0x17, - 0xcd, 0x70, 0xf9, 0x52, 0xb1, 0xc4, 0xe0, 0x55, 0x01, 0x96, 0xdf, 0x84, 0x12, 0xdb, 0xbd, 0x3d, - 0x72, 0x46, 0x37, 0x02, 0x41, 0xd6, 0x52, 0x88, 0xb5, 0xfc, 0x7d, 0x09, 0x4a, 0x22, 0x8b, 0xd3, - 0x7f, 0x9e, 0x72, 0x95, 0x98, 0x5c, 0x93, 0x2b, 0x1e, 0x62, 0x32, 0x37, 0xe9, 0xca, 0x44, 0x36, - 0xa3, 0x6e, 0xd3, 0x0c, 0xc8, 0xe1, 0x6f, 0x7c, 0xa5, 0x29, 0x37, 0xbe, 0x72, 0x9d, 0xae, 0x50, - 0x41, 0x52, 0xdc, 0x61, 0x5e, 0x87, 0x59, 0xb2, 0xcb, 0x15, 0xae, 0x12, 0xce, 0x02, 0xd0, 0x7d, - 0xb0, 0x79, 0x68, 0x29, 0x0c, 0x47, 0xde, 0x83, 0xb2, 0x82, 0x07, 0xd6, 0x31, 0xad, 0x82, 0xf8, - 0xd0, 0xb1, 0x06, 0x01, 0xa1, 0x02, 0x5b, 0x6b, 0x69, 0xfa, 0xe3, 0xc4, 0x3b, 0x70, 0x31, 0x81, - 0x22, 0x97, 0xad, 0x0c, 0x73, 0xee, 0x90, 0x16, 0x41, 0xf0, 0x24, 0x97, 0xf8, 0x94, 0x1f, 0x42, - 0x99, 0x59, 0x93, 0x15, 0x65, 0xd0, 0x1a, 0x89, 0x17, 0xd0, 0xce, 0x16, 0x14, 0x03, 0x84, 0x48, - 0x18, 0x73, 0xf5, 0xbe, 0x89, 0x7b, 0x6a, 0xd7, 0xd0, 0xf4, 0x81, 0x28, 0x7a, 0x98, 0x67, 0xc0, - 0x1a, 0x85, 0xc9, 0x6f, 0xc3, 0xc5, 0xc7, 0xd8, 0xd1, 0x0f, 0x4f, 0x42, 0x22, 0xf8, 0x97, 0x55, - 0x34, 0x43, 0xca, 0xe5, 0x66, 0x1f, 0xf2, 0x0e, 0x14, 0x9a, 0xf5, 0x06, 0xcf, 0xe6, 0xbd, 0x02, - 0x79, 0xbd, 0x87, 0x03, 0xce, 0xb7, 0x5d, 0x3c, 0x7d, 0xb6, 0x31, 0xd7, 0xac, 0x37, 0x88, 0x03, - 0x2a, 0x73, 0x7a, 0x0f, 0x53, 0x1f, 0x47, 0x30, 0x63, 0x6b, 0x9e, 0xa8, 0x14, 0xa0, 0xbf, 0xe5, - 0x5f, 0x83, 0xb5, 0x6a, 0xaf, 0x47, 0x87, 0xd0, 0x08, 0x5f, 0x72, 0x9d, 0x7d, 0xf0, 0x68, 0x73, - 0x94, 0x21, 0x48, 0xba, 0x4b, 0xf4, 0x39, 0x70, 0x2c, 0xb9, 0x09, 0x17, 0x62, 0xcc, 0xf9, 0xb0, - 0x7d, 0x52, 0xd2, 0x54, 0xa4, 0x8e, 0xe1, 0x22, 0xab, 0x19, 0xfb, 0x9a, 0x86, 0x12, 0xd4, 0x69, - 0x26, 0x5d, 0xa7, 0xf2, 0x65, 0xa8, 0x24, 0xf1, 0xe5, 0x97, 0x72, 0x1e, 0xdd, 0x7a, 0x07, 0x9b, - 0xdc, 0xff, 0x05, 0x99, 0x76, 0xe9, 0xed, 0x48, 0x84, 0x2b, 0xd7, 0xeb, 0x5b, 0x30, 0xc7, 0x34, - 0x26, 0xa6, 0x69, 0x9a, 0x62, 0x05, 0x9a, 0xfc, 0xdb, 0x19, 0xc8, 0x8b, 0xd9, 0x3b, 0x7d, 0xdc, - 0xf2, 0x87, 0x97, 0x99, 0x76, 0x78, 0xe1, 0xa2, 0xaa, 0x99, 0xb1, 0x45, 0x55, 0xb3, 0xe1, 0xa2, - 0x2a, 0xbf, 0x7c, 0x2a, 0x17, 0x2c, 0x9f, 0xba, 0x01, 0x4b, 0xb6, 0x63, 0x1d, 0xea, 0x06, 0x1e, - 0x95, 0x42, 0xf2, 0xd4, 0x0f, 0x07, 0x8b, 0x62, 0xc7, 0x8d, 0x70, 0xb1, 0x63, 0x9e, 0x4e, 0xb5, - 0x40, 0x41, 0xe3, 0x47, 0x33, 0xf9, 0x6c, 0x69, 0x46, 0xfe, 0x7b, 0x09, 0xd6, 0x98, 0x7a, 0x3e, - 0xb4, 0xf8, 0x2d, 0xac, 0x30, 0xe7, 0x65, 0x28, 0x10, 0xc1, 0x5c, 0x5b, 0xeb, 0x8a, 0x15, 0xc0, - 0x07, 0xa0, 0x3b, 0x30, 0x77, 0xfc, 0xb9, 0xea, 0xda, 0xb8, 0xcb, 0xd5, 0x71, 0x85, 0x9d, 0x86, - 0x82, 0xa5, 0xa0, 0xfc, 0x1e, 0xb8, 0x6d, 0xe3, 0xae, 0x92, 0x3b, 0xfe, 0x9c, 0xfc, 0x4f, 0x96, - 0xf4, 0x27, 0x77, 0xdd, 0x51, 0x92, 0x29, 0xeb, 0x2f, 0xe9, 0x0f, 0xee, 0xba, 0x3c, 0xcb, 0xa4, - 0xc0, 0x93, 0xd1, 0x6f, 0xf4, 0x2e, 0x14, 0x78, 0x62, 0x8a, 0xef, 0x00, 0x12, 0x34, 0x4f, 0x8f, - 0x1e, 0x8c, 0x19, 0x39, 0x7a, 0x30, 0xfc, 0x66, 0x8f, 0xec, 0x84, 0x2e, 0xc4, 0x46, 0xc7, 0xdd, - 0x46, 0x87, 0x65, 0x32, 0x9a, 0x8e, 0xf5, 0x89, 0x36, 0x10, 0x07, 0x3c, 0xee, 0x40, 0xf7, 0xa2, - 0x29, 0xd7, 0x24, 0x02, 0x9b, 0xad, 0x68, 0x6f, 0x96, 0x44, 0x8a, 0x53, 0x45, 0x6f, 0x00, 0xb8, - 0x98, 0x34, 0xaa, 0x3d, 0x97, 0x5f, 0xd1, 0xb3, 0x84, 0x6a, 0x9b, 0x42, 0xeb, 0xed, 0x96, 0x52, - 0x60, 0x08, 0x75, 0xd7, 0xac, 0xd4, 0x61, 0x2d, 0x99, 0x74, 0x42, 0xa6, 0x63, 0x35, 0x98, 0xe9, - 0x28, 0x04, 0x33, 0x1a, 0x15, 0x28, 0x8f, 0x04, 0x7f, 0xc4, 0x73, 0x7d, 0xe2, 0xb2, 0xe5, 0x00, - 0x2e, 0x26, 0xb4, 0x8d, 0x36, 0x49, 0x2b, 0x5c, 0xd8, 0x51, 0xea, 0x90, 0x48, 0xcd, 0xa2, 0xf0, - 0xf9, 0xd3, 0x67, 0x1b, 0xcb, 0x4c, 0x6a, 0xd1, 0x91, 0x48, 0xbf, 0xec, 0x86, 0x41, 0xae, 0x29, - 0x7f, 0x40, 0x2f, 0x53, 0xf6, 0x8c, 0x61, 0x5f, 0x37, 0x47, 0x11, 0xe2, 0xf5, 0xd0, 0xc1, 0xe0, - 0x42, 0x38, 0x2f, 0x43, 0x51, 0xfd, 0xc3, 0x80, 0x5c, 0x03, 0x14, 0xa4, 0xc0, 0xc5, 0x7b, 0x13, - 0xe6, 0x6c, 0x06, 0xe2, 0xc6, 0x5a, 0x49, 0xa0, 0xa2, 0x08, 0x1c, 0xf9, 0x07, 0x19, 0xc8, 0x31, - 0x58, 0x62, 0xae, 0x7d, 0x91, 0x4e, 0x7e, 0xa6, 0x3c, 0x32, 0xc7, 0x27, 0x1f, 0x36, 0x10, 0xcc, - 0x18, 0x56, 0xdf, 0x12, 0x77, 0x6d, 0xe4, 0x37, 0xba, 0x0e, 0x8b, 0x86, 0xe6, 0x61, 0xd7, 0x1b, - 0xb9, 0x35, 0x9b, 0xcc, 0x0b, 0x0c, 0x2a, 0x3c, 0xf9, 0x16, 0xac, 0x38, 0x98, 0x58, 0x93, 0x56, - 0x3f, 0x0d, 0x6d, 0xdb, 0xa2, 0xe5, 0x2d, 0x39, 0x56, 0xa2, 0x32, 0x6a, 0x6a, 0x8b, 0x16, 0xf4, - 0x3a, 0x2c, 0xfb, 0x1d, 0x44, 0x45, 0xcb, 0x1c, 0x45, 0x2f, 0x8d, 0x1a, 0x78, 0x3d, 0x0b, 0x89, - 0x0c, 0x1c, 0x25, 0x92, 0xc1, 0x5d, 0xe4, 0x60, 0x2e, 0x86, 0x5c, 0x05, 0x99, 0xc5, 0x52, 0x45, - 0x90, 0x60, 0x0a, 0x0a, 0x2f, 0x30, 0x97, 0xa0, 0xc0, 0x74, 0x38, 0x3a, 0xe0, 0x2b, 0x79, 0x06, - 0x68, 0xf6, 0xe4, 0x3f, 0xc8, 0xc0, 0xb5, 0xb1, 0x34, 0xb8, 0xb1, 0x3e, 0x8e, 0x86, 0xe6, 0xf7, - 0x43, 0xc6, 0x9a, 0x82, 0x04, 0x9f, 0x7d, 0x3c, 0x41, 0x2b, 0xa8, 0xa1, 0x9b, 0xb0, 0xdc, 0x1d, - 0xba, 0x9e, 0x35, 0x50, 0xf1, 0x53, 0xa2, 0x2c, 0x75, 0xe8, 0x18, 0xdc, 0x8c, 0x4b, 0xac, 0xa1, - 0x41, 0xe1, 0xfb, 0x8e, 0x81, 0xb6, 0x60, 0x5e, 0x37, 0x5d, 0xdc, 0x1d, 0x3a, 0x58, 0xf5, 0x0c, - 0x76, 0x79, 0x93, 0xdf, 0x5e, 0x3a, 0x7d, 0xb6, 0x51, 0x6c, 0x72, 0x78, 0x67, 0xb7, 0xad, 0x14, - 0x05, 0x52, 0xc7, 0x70, 0x2b, 0xef, 0xc2, 0x7c, 0x90, 0xf1, 0x99, 0x66, 0xde, 0x9f, 0xcc, 0x80, - 0xcc, 0x93, 0x5e, 0xcf, 0xab, 0x60, 0xf4, 0xd8, 0x57, 0x1c, 0xab, 0x0b, 0x7d, 0x2f, 0xbc, 0xf5, - 0x9c, 0x48, 0x3e, 0x45, 0x6f, 0xb7, 0x61, 0x4e, 0xf8, 0xd1, 0xe4, 0x0a, 0x71, 0x81, 0x4a, 0x63, - 0x3d, 0x77, 0xa9, 0x99, 0x29, 0xea, 0xee, 0x47, 0x15, 0x61, 0xf7, 0x93, 0xac, 0x34, 0x3b, 0x05, - 0x85, 0x98, 0x0d, 0x5b, 0x11, 0x1b, 0xe6, 0x26, 0x09, 0x3f, 0xde, 0xbe, 0xa8, 0x46, 0x5f, 0x14, - 0xd0, 0x43, 0x88, 0xed, 0x60, 0x17, 0xd3, 0x42, 0x9f, 0x49, 0xfa, 0x58, 0xe4, 0x5d, 0xf6, 0x58, - 0x8f, 0x17, 0x72, 0x92, 0xeb, 0x70, 0x6d, 0xac, 0x11, 0xf9, 0x6e, 0xeb, 0x31, 0x5c, 0xd9, 0xc1, - 0x5e, 0x04, 0x27, 0x98, 0x45, 0x1e, 0xeb, 0x45, 0xa9, 0xb5, 0x7a, 0xf2, 0x5f, 0x67, 0x60, 0x69, - 0x44, 0x95, 0xdd, 0xb3, 0x91, 0x85, 0x36, 0x7c, 0xa5, 0x97, 0xb6, 0xd0, 0xc6, 0xef, 0xf8, 0xc8, - 0x6e, 0x83, 0xf7, 0x0d, 0x1c, 0x55, 0x81, 0x81, 0x5a, 0xd3, 0xdd, 0xe2, 0x6c, 0x40, 0xf1, 0xd0, - 0x21, 0xa3, 0x32, 0xbb, 0x27, 0x2a, 0x3b, 0xa9, 0x66, 0x15, 0x18, 0x81, 0xda, 0xe8, 0x03, 0xff, - 0x32, 0x40, 0xef, 0x89, 0xe2, 0xb0, 0x98, 0x84, 0xc1, 0xdb, 0x81, 0x66, 0xdd, 0x1d, 0xdd, 0x0e, - 0x34, 0x7b, 0x6e, 0x58, 0x59, 0xb9, 0xb8, 0xb2, 0xc2, 0x21, 0x76, 0xe4, 0xfe, 0x97, 0xa0, 0xa0, - 0xbb, 0xdc, 0x4f, 0xf8, 0x46, 0x2a, 0xaf, 0xbb, 0xcc, 0x0b, 0xe4, 0xdf, 0xc9, 0xc2, 0x7a, 0x9a, - 0x89, 0x78, 0x14, 0x54, 0xa2, 0x51, 0xf0, 0x6e, 0x34, 0x0a, 0x8e, 0xe9, 0x9d, 0x32, 0x91, 0x1f, - 0xc1, 0x05, 0xcd, 0x30, 0xac, 0xcf, 0xd4, 0xe4, 0x30, 0x98, 0xdf, 0x2e, 0x9f, 0x3e, 0xdb, 0x58, - 0xad, 0x12, 0x94, 0x5a, 0x70, 0x2e, 0x29, 0xbb, 0xca, 0xaa, 0x16, 0x83, 0x3a, 0x06, 0xda, 0x06, - 0xc4, 0x08, 0x26, 0xc4, 0xca, 0xd5, 0xd3, 0x67, 0x1b, 0x25, 0x4a, 0x2b, 0x38, 0xa1, 0x4a, 0x5a, - 0x08, 0x62, 0xb8, 0x84, 0x46, 0x0f, 0x1f, 0x6a, 0x43, 0xc3, 0x0b, 0xca, 0xc3, 0x6e, 0x6d, 0x28, - 0x8d, 0x3a, 0x6b, 0xf5, 0x65, 0x29, 0xf5, 0x42, 0x10, 0xc7, 0x78, 0xa1, 0x49, 0xc5, 0x8a, 0xf8, - 0x23, 0x7e, 0x3d, 0x2a, 0xe2, 0xdf, 0xa7, 0x45, 0xfc, 0xf1, 0xd6, 0x51, 0xf2, 0x37, 0x72, 0x41, - 0x1e, 0xae, 0x3b, 0x8c, 0xf4, 0xf3, 0x6f, 0xc8, 0xeb, 0xf4, 0xe1, 0x48, 0xb4, 0xf9, 0xac, 0xb9, - 0xa7, 0x3f, 0x94, 0x92, 0x64, 0x0f, 0x54, 0xa1, 0xe4, 0x18, 0x3f, 0x4e, 0x6b, 0xbc, 0x6c, 0x1c, - 0x77, 0xdc, 0x3d, 0x39, 0xd9, 0x93, 0x06, 0x6c, 0x94, 0xf5, 0xf7, 0xa4, 0xbe, 0x71, 0x0a, 0x58, - 0x58, 0x45, 0xfe, 0xf7, 0x2c, 0x5c, 0x8e, 0xc4, 0xab, 0xe7, 0x1b, 0x28, 0x7a, 0x3f, 0x1e, 0x29, - 0x26, 0xad, 0x06, 0xc1, 0x38, 0xf2, 0xed, 0x78, 0x1c, 0x99, 0xd4, 0x3d, 0x14, 0x65, 0x02, 0x0b, - 0xe0, 0xcc, 0xf4, 0x0b, 0xe0, 0x7b, 0xe1, 0xd8, 0x34, 0xcb, 0x93, 0x15, 0xd1, 0x9e, 0x4d, 0xd3, - 0xbb, 0x73, 0x9b, 0xcb, 0x1c, 0x08, 0x5c, 0x77, 0x03, 0x66, 0xc8, 0x4d, 0x21, 0xb0, 0x6f, 0xa4, - 0x7b, 0x21, 0x23, 0xcd, 0x4d, 0xd1, 0xd7, 0xb7, 0x59, 0x34, 0x5e, 0xe6, 0xcf, 0x1c, 0x2f, 0xe5, - 0x0d, 0x51, 0x4b, 0x9e, 0xe2, 0x96, 0xf2, 0x4f, 0x33, 0x70, 0x99, 0x5d, 0x35, 0xa5, 0xb8, 0xc5, - 0xd7, 0xbf, 0x2e, 0xcc, 0xc6, 0xd6, 0x85, 0x4a, 0x44, 0xbd, 0x41, 0x2f, 0xbf, 0x12, 0x53, 0x60, - 0xe1, 0x6b, 0x55, 0x51, 0x78, 0x49, 0x29, 0x44, 0x96, 0x94, 0x0a, 0xe4, 0xf9, 0x96, 0xa1, 0x57, - 0x06, 0xb6, 0x6e, 0x88, 0x6f, 0xf9, 0x3e, 0x5c, 0x49, 0xd1, 0xdc, 0x28, 0xaf, 0x30, 0x65, 0xe8, - 0xd8, 0x81, 0xcb, 0xec, 0xbe, 0xe6, 0x45, 0x63, 0xd0, 0x06, 0x5c, 0x49, 0x21, 0xc4, 0x44, 0xba, - 0xf9, 0xa7, 0x12, 0xcc, 0x07, 0x9f, 0x5e, 0xa0, 0x45, 0x80, 0x6a, 0x47, 0xdd, 0x6f, 0x3d, 0x68, - 0x3d, 0xfa, 0xb8, 0x55, 0x3a, 0x87, 0x10, 0x2c, 0x56, 0x3b, 0xea, 0x6e, 0xb3, 0xb5, 0xff, 0x2b, - 0x6a, 0xf5, 0x61, 0xfd, 0xce, 0xed, 0x92, 0x84, 0x56, 0x60, 0xa9, 0xda, 0x51, 0xeb, 0x55, 0xe5, - 0xe3, 0x66, 0x8b, 0x03, 0x33, 0xa8, 0x02, 0x6b, 0xd5, 0x8e, 0x5a, 0x7b, 0xd4, 0xea, 0x54, 0x9b, - 0xad, 0x86, 0xa2, 0xb6, 0x1b, 0x1d, 0xf5, 0x93, 0xea, 0xc3, 0xdd, 0x76, 0x69, 0x0b, 0x5d, 0x83, - 0x8d, 0x58, 0x5b, 0xa7, 0xf1, 0x70, 0x6f, 0xb7, 0xda, 0x69, 0x70, 0xa4, 0xf7, 0xd0, 0x55, 0xb8, - 0x1c, 0x43, 0x0a, 0xf2, 0xed, 0xdd, 0xfc, 0x63, 0x09, 0x16, 0x42, 0x05, 0x91, 0x44, 0xda, 0x5a, - 0x3b, 0x20, 0x2d, 0xfb, 0xbe, 0xdf, 0xa8, 0xee, 0x76, 0xee, 0x7f, 0x52, 0x92, 0x50, 0x09, 0xe6, - 0x69, 0xbb, 0x80, 0x64, 0x88, 0xec, 0xb5, 0xb6, 0x5a, 0x6f, 0xb6, 0x6b, 0x8f, 0x5a, 0xad, 0x46, - 0xad, 0xd3, 0xa8, 0x97, 0xb2, 0x68, 0x09, 0x8a, 0x04, 0x6d, 0xaf, 0x5e, 0xed, 0x34, 0x5b, 0x3b, - 0xa5, 0x19, 0xde, 0xcf, 0x47, 0x99, 0x45, 0xab, 0x50, 0x12, 0x28, 0x0d, 0xf5, 0xc3, 0x6a, 0x73, - 0xb7, 0x51, 0x2f, 0xe5, 0x78, 0xc7, 0x7a, 0x63, 0x47, 0xa9, 0xd6, 0x1b, 0xf5, 0xd2, 0xdc, 0xcd, - 0x03, 0xc8, 0x8b, 0x02, 0x7a, 0xb4, 0x0c, 0x0b, 0x7b, 0xf7, 0xab, 0xed, 0x46, 0x40, 0xbe, 0x22, - 0xcc, 0xed, 0x35, 0x5a, 0x75, 0xc2, 0x44, 0x22, 0x1f, 0xca, 0x7e, 0xab, 0x45, 0x3e, 0x32, 0x68, - 0x01, 0x0a, 0xed, 0xfd, 0x5a, 0xad, 0xd1, 0xa8, 0x53, 0x89, 0x00, 0x72, 0x9c, 0xc9, 0x0c, 0x19, - 0x54, 0xa7, 0xa1, 0x3c, 0x6c, 0xb6, 0xaa, 0x54, 0x94, 0x9b, 0xbf, 0x25, 0xc1, 0x62, 0xb8, 0x68, - 0x1c, 0x5d, 0x82, 0x0b, 0x01, 0xc5, 0x75, 0x88, 0x8c, 0x3e, 0xd3, 0x84, 0x46, 0xc1, 0x57, 0x42, - 0xeb, 0x50, 0x89, 0x36, 0x06, 0x98, 0x65, 0x92, 0x3a, 0x7f, 0x5c, 0x6d, 0x52, 0x35, 0x65, 0x6f, - 0xee, 0x84, 0xf3, 0x85, 0x7e, 0xc6, 0x94, 0x28, 0xa6, 0x1a, 0xf2, 0xa3, 0x79, 0xc8, 0x13, 0x40, - 0xa3, 0xde, 0xec, 0x94, 0x24, 0xea, 0x65, 0xd5, 0x8e, 0xda, 0x6e, 0xec, 0x36, 0x6a, 0x9d, 0x52, - 0xe6, 0xa6, 0x17, 0x26, 0xe4, 0x67, 0x90, 0x28, 0xa1, 0xc6, 0x83, 0xb0, 0x0a, 0x09, 0x60, 0xef, - 0x51, 0x9d, 0xa9, 0x90, 0x7c, 0xb4, 0x1f, 0xd7, 0x4a, 0x19, 0x4a, 0x94, 0x7c, 0xd4, 0x94, 0xe6, - 0x5e, 0xa7, 0x94, 0x25, 0xfa, 0x27, 0xdf, 0xad, 0xea, 0xc3, 0x46, 0x7b, 0xaf, 0x5a, 0x6b, 0x94, - 0x66, 0xa8, 0x14, 0x04, 0xf4, 0xa8, 0xde, 0x28, 0xcd, 0xde, 0xb4, 0xe1, 0x42, 0x4a, 0x8a, 0x90, - 0xb1, 0x0d, 0x7a, 0x16, 0x07, 0xf8, 0xd6, 0xe3, 0x00, 0xdf, 0x82, 0x94, 0x7d, 0x5b, 0xf8, 0x46, - 0x96, 0xce, 0x9c, 0x46, 0x3b, 0xa8, 0xcd, 0x99, 0x9b, 0x9b, 0x00, 0xfe, 0xa5, 0x08, 0xe9, 0xb1, - 0x17, 0x1c, 0x5a, 0x09, 0xe6, 0xf7, 0x1e, 0xa8, 0x4a, 0xa3, 0xd3, 0x68, 0x75, 0x9a, 0x8f, 0x5a, - 0x25, 0x69, 0xeb, 0xcb, 0x19, 0x28, 0xb2, 0x17, 0xb5, 0xce, 0xb1, 0xde, 0xc5, 0xe8, 0x6d, 0x98, - 0xe3, 0x69, 0x0d, 0x14, 0x9d, 0xf7, 0x95, 0xe4, 0x54, 0x06, 0xfa, 0x2e, 0x2d, 0x2f, 0x09, 0x3e, - 0xcb, 0x45, 0xd7, 0xa2, 0x9b, 0xd5, 0x84, 0xd7, 0xbf, 0x95, 0x97, 0xc7, 0x23, 0xf1, 0x90, 0x86, - 0x01, 0xc5, 0xdf, 0x16, 0xa3, 0x57, 0x12, 0x8e, 0xb6, 0x49, 0x3c, 0x6e, 0x4c, 0xc4, 0xe3, 0x6c, - 0x0e, 0xe8, 0xd5, 0x53, 0xf8, 0x49, 0x2c, 0xba, 0x9e, 0x24, 0x61, 0xec, 0xc1, 0x6e, 0xe5, 0x95, - 0x49, 0x68, 0x3e, 0x8f, 0xf6, 0x04, 0x1e, 0xed, 0xe9, 0x78, 0xa4, 0xbe, 0xde, 0x45, 0x35, 0x00, - 0x7f, 0x94, 0x68, 0x3d, 0x65, 0xf8, 0x82, 0x6a, 0x8a, 0x45, 0x1f, 0x02, 0xf8, 0x2f, 0xcf, 0x23, - 0x44, 0x62, 0x0f, 0xda, 0x2b, 0x1b, 0xa9, 0xed, 0x4c, 0xa6, 0xad, 0x7f, 0x9a, 0x83, 0x95, 0x47, - 0x4e, 0x5f, 0x33, 0xf5, 0xcf, 0x35, 0xba, 0x42, 0x70, 0x5f, 0x7b, 0x08, 0xe0, 0x3f, 0x01, 0x8e, - 0xb0, 0x89, 0x3d, 0x41, 0x8e, 0xb0, 0x49, 0x78, 0x3b, 0x7c, 0x0b, 0x72, 0xec, 0x72, 0x28, 0xee, - 0xb9, 0xab, 0xa1, 0xbe, 0x22, 0xa3, 0x7a, 0x0f, 0x0a, 0xa3, 0x0c, 0x26, 0x0a, 0x57, 0xfc, 0x44, - 0x33, 0x9b, 0x95, 0x28, 0x49, 0xf4, 0x01, 0x14, 0x46, 0xe9, 0xcc, 0x48, 0xe7, 0x68, 0x9a, 0x33, - 0x85, 0xfd, 0x63, 0x5a, 0xf6, 0xe3, 0x67, 0x10, 0xd1, 0x4b, 0x49, 0x7e, 0x14, 0x4a, 0x54, 0x56, - 0xe4, 0x71, 0x28, 0xbe, 0x9b, 0xc5, 0x32, 0x80, 0x11, 0x37, 0x4b, 0xcb, 0x39, 0x46, 0xdc, 0x2c, - 0x3d, 0x91, 0xf8, 0x5d, 0x58, 0x8a, 0xa4, 0xac, 0x22, 0x73, 0x3e, 0x39, 0x9b, 0x16, 0x99, 0xf3, - 0x69, 0x59, 0x2f, 0x2c, 0xfe, 0xf2, 0x41, 0x88, 0xc1, 0x2b, 0x09, 0x7e, 0x96, 0xc4, 0xe3, 0xc6, - 0x44, 0x3c, 0xce, 0x46, 0xa5, 0x05, 0x6b, 0xa1, 0x04, 0x11, 0x7a, 0x39, 0xe1, 0xb2, 0x31, 0x96, - 0xb5, 0xaa, 0x5c, 0x9f, 0x80, 0xc5, 0x19, 0x74, 0x60, 0x39, 0x96, 0x54, 0x8d, 0x58, 0x22, 0x2d, - 0xe9, 0x5a, 0x29, 0x27, 0xb8, 0x3b, 0x23, 0xf0, 0x01, 0x9c, 0x57, 0xf0, 0xb1, 0xf5, 0x04, 0x57, - 0x0d, 0x23, 0x00, 0x77, 0xe3, 0x6e, 0xbf, 0x16, 0xdb, 0xf6, 0x37, 0x06, 0xb6, 0x77, 0x82, 0xf6, - 0x61, 0x39, 0x96, 0x69, 0x45, 0xa9, 0x0c, 0x23, 0x4e, 0x91, 0x9a, 0xa3, 0xdd, 0xfa, 0x08, 0x8a, - 0xd5, 0xa1, 0x77, 0x24, 0xa6, 0xf7, 0x3d, 0x98, 0xa5, 0x2f, 0xec, 0x51, 0xf8, 0x85, 0x54, 0xf0, - 0xa1, 0x7e, 0xe5, 0x42, 0x52, 0x93, 0x6d, 0x9c, 0x6c, 0xfd, 0x86, 0x04, 0x65, 0x9e, 0x9c, 0x19, - 0x68, 0x7d, 0x4c, 0xe8, 0x5a, 0x0e, 0x8f, 0x1f, 0xe8, 0x08, 0x56, 0x12, 0x9e, 0xd6, 0xa3, 0x1b, - 0x51, 0xab, 0xa4, 0x3c, 0xcd, 0xaf, 0xbc, 0x3a, 0x19, 0x91, 0x0f, 0xe9, 0xaf, 0x02, 0x2f, 0xe7, - 0x3b, 0x8e, 0xd6, 0x7d, 0x82, 0x1d, 0xb4, 0x47, 0xd7, 0xbb, 0xe0, 0x1b, 0xeb, 0xf8, 0x7a, 0x97, - 0xf0, 0x02, 0x3b, 0x62, 0xd1, 0xe0, 0x33, 0x7f, 0xb6, 0x82, 0x06, 0x9f, 0x1f, 0xc7, 0x29, 0x26, - 0xbc, 0x9e, 0x8e, 0xaf, 0xa0, 0x49, 0x2f, 0x98, 0xb7, 0xfe, 0x7c, 0x06, 0x96, 0xf9, 0x5b, 0x89, - 0xc0, 0x6b, 0xba, 0xc7, 0xb0, 0x10, 0x7a, 0x4c, 0x1c, 0x89, 0x3e, 0x49, 0x0f, 0x90, 0x23, 0xd1, - 0x27, 0xf9, 0x2d, 0xf2, 0x27, 0xb4, 0x8a, 0x30, 0xc8, 0x29, 0x16, 0xb3, 0xe2, 0xef, 0x62, 0x2b, - 0xd7, 0xc6, 0xe2, 0x70, 0xd2, 0x9f, 0xd1, 0x84, 0x6e, 0xe2, 0xa3, 0x16, 0xf4, 0x46, 0x0a, 0x81, - 0xc4, 0x77, 0x34, 0x95, 0x37, 0xa7, 0xc4, 0xe6, 0x8c, 0x3f, 0x17, 0x7f, 0x72, 0x25, 0xe1, 0xe5, - 0x09, 0x7a, 0x33, 0x21, 0xf6, 0xa7, 0x3f, 0x9a, 0xa9, 0x6c, 0x4e, 0x8b, 0xce, 0x79, 0x7f, 0x0a, - 0x6b, 0xc9, 0x8f, 0x9f, 0xd1, 0xcd, 0xc4, 0x45, 0x27, 0xf1, 0x01, 0x77, 0xe5, 0xf5, 0xa9, 0x70, - 0xb9, 0xc3, 0xfc, 0x45, 0x16, 0x2a, 0x4c, 0x96, 0xf0, 0x03, 0x06, 0xcd, 0xd4, 0xfa, 0xd8, 0x41, - 0x0f, 0x21, 0xc7, 0x4c, 0x1f, 0x99, 0x70, 0xe9, 0x2f, 0x2e, 0x2a, 0x63, 0x9e, 0x00, 0xa0, 0x7d, - 0x98, 0xa1, 0x73, 0xe8, 0x7a, 0xa4, 0xe4, 0x36, 0xf9, 0x31, 0x46, 0x24, 0x18, 0xa5, 0xbf, 0xcb, - 0x50, 0x20, 0xbb, 0x83, 0xbd, 0x78, 0x3c, 0x4f, 0x24, 0x7a, 0x7d, 0x02, 0x16, 0xa7, 0xf9, 0x36, - 0xe4, 0xd8, 0x72, 0x32, 0x7d, 0xa8, 0x3d, 0x12, 0x35, 0xde, 0x91, 0x37, 0x39, 0x91, 0xb8, 0x97, - 0xf6, 0xf4, 0x22, 0x12, 0xaa, 0xc6, 0xbc, 0xb9, 0xd8, 0xfa, 0xe7, 0x0c, 0x2c, 0xf0, 0xfa, 0x76, - 0x6e, 0xa8, 0xff, 0x37, 0x32, 0xd4, 0xd5, 0x04, 0x43, 0x85, 0x8a, 0xce, 0x2b, 0x49, 0xd5, 0xe3, - 0x68, 0x87, 0x9b, 0x66, 0x3d, 0xa6, 0xf3, 0x70, 0xe7, 0x8d, 0xd4, 0x76, 0xae, 0xb8, 0x3a, 0x33, - 0xc6, 0x95, 0x58, 0x98, 0x0c, 0x91, 0x59, 0x4f, 0x6b, 0x7e, 0x7e, 0xf5, 0xb7, 0x61, 0x3e, 0x58, - 0x39, 0x1f, 0x51, 0x44, 0x42, 0xf5, 0x7d, 0xe5, 0xa5, 0x31, 0x18, 0x5c, 0xd3, 0xff, 0x90, 0x81, - 0x02, 0xaf, 0x33, 0xee, 0x3b, 0xe8, 0x01, 0xcc, 0x07, 0xcb, 0xde, 0xd1, 0xe5, 0xe8, 0x28, 0x82, - 0x85, 0xf7, 0x95, 0x2b, 0x63, 0x5a, 0x5d, 0x1b, 0xfd, 0x2a, 0x5d, 0xd9, 0xa2, 0x45, 0xea, 0xf1, - 0xd5, 0x20, 0xa1, 0x26, 0x3e, 0xbe, 0x1a, 0x24, 0xd6, 0xba, 0x37, 0x00, 0xfc, 0x2a, 0x6f, 0x54, - 0x89, 0xf6, 0xf1, 0xef, 0xbf, 0x2b, 0x97, 0x52, 0xdb, 0x5c, 0x1b, 0x7d, 0x87, 0x9e, 0x97, 0xc2, - 0x05, 0xda, 0xf1, 0x0d, 0x6c, 0xac, 0x06, 0x3c, 0xbe, 0x81, 0x8d, 0xd7, 0x78, 0x6f, 0xfd, 0x6d, - 0xa4, 0x1c, 0x5b, 0x6c, 0x28, 0xda, 0x30, 0x1f, 0x04, 0x47, 0x8c, 0x99, 0x50, 0xc0, 0x1d, 0x31, - 0x66, 0x62, 0x29, 0xee, 0x01, 0x2c, 0xc7, 0x8a, 0x3f, 0x23, 0xb1, 0x28, 0xad, 0x2e, 0x36, 0x12, - 0x8b, 0x52, 0x6b, 0x48, 0xb7, 0xfe, 0x4e, 0x82, 0x05, 0x16, 0xd6, 0xc5, 0x50, 0x54, 0x5a, 0xa7, - 0x10, 0xa9, 0x12, 0x89, 0x98, 0x39, 0xb9, 0xc4, 0x26, 0x62, 0xe6, 0xb4, 0x4a, 0x15, 0x4c, 0x2b, - 0x1d, 0x63, 0x15, 0x1b, 0xd1, 0xdd, 0x67, 0x4a, 0xb5, 0x47, 0x64, 0x64, 0xa9, 0x85, 0x1f, 0x5b, - 0xbf, 0x98, 0x83, 0x05, 0x76, 0xdf, 0x10, 0x38, 0xd4, 0xf9, 0x15, 0x18, 0x28, 0x36, 0xa5, 0xc3, - 0xc5, 0x1d, 0x91, 0xc8, 0x91, 0x50, 0xba, 0xf1, 0x29, 0x7d, 0x02, 0x92, 0x90, 0xeb, 0x8a, 0x2c, - 0x7f, 0x63, 0x33, 0x9e, 0x91, 0xe5, 0x6f, 0x42, 0xea, 0xed, 0x7b, 0x12, 0x4d, 0xfa, 0xa4, 0x55, - 0x19, 0xa0, 0x5b, 0xd3, 0xd7, 0x23, 0x30, 0xee, 0x6f, 0x9d, 0xb5, 0x80, 0x81, 0x8a, 0x30, 0x26, - 0xd5, 0x1b, 0x11, 0x61, 0x72, 0x66, 0x3f, 0x22, 0xc2, 0x14, 0x59, 0x64, 0xbe, 0xc7, 0x8e, 0x66, - 0xbe, 0xe2, 0x7b, 0xec, 0x94, 0xcc, 0x59, 0x7c, 0x8f, 0x9d, 0x9a, 0x44, 0xc3, 0x74, 0x2e, 0x44, - 0x33, 0xcb, 0xaf, 0x4c, 0xe8, 0x9f, 0x7c, 0xda, 0x1b, 0x93, 0x0e, 0x33, 0xe1, 0x7c, 0x62, 0x62, - 0x02, 0xbd, 0x36, 0x4e, 0x37, 0x61, 0x66, 0x37, 0xa7, 0x41, 0xf5, 0xf9, 0x25, 0x5e, 0xd6, 0x47, - 0xf8, 0x8d, 0x4b, 0x85, 0x44, 0xf8, 0x8d, 0xbf, 0xfb, 0x37, 0xe1, 0x7c, 0xe2, 0x4d, 0x7c, 0x84, - 0xdf, 0xb8, 0x6b, 0xff, 0x08, 0xbf, 0xb1, 0x17, 0xfb, 0xdb, 0xef, 0x7f, 0xf1, 0xe5, 0xfa, 0xb9, - 0x9f, 0x7d, 0xb9, 0x7e, 0xee, 0xe7, 0x5f, 0xae, 0x4b, 0xdf, 0x3b, 0x5d, 0x97, 0x7e, 0x72, 0xba, - 0x2e, 0xfd, 0xcd, 0xe9, 0xba, 0xf4, 0xc5, 0xe9, 0xba, 0xf4, 0x8f, 0xa7, 0xeb, 0xd2, 0xbf, 0x9c, - 0xae, 0x9f, 0xfb, 0xf9, 0xe9, 0xba, 0xf4, 0x83, 0xaf, 0xd6, 0xcf, 0x7d, 0xf1, 0xd5, 0xfa, 0xb9, - 0x9f, 0x7d, 0xb5, 0x7e, 0xee, 0x3b, 0x73, 0xfc, 0x0f, 0x5f, 0x1e, 0xe4, 0xe8, 0x4a, 0xfd, 0x8d, - 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x7e, 0x36, 0x93, 0xb1, 0x18, 0x53, 0x00, 0x00, + 0x29, 0x18, 0x15, 0xed, 0xa7, 0x9b, 0x02, 0x54, 0x59, 0xed, 0x5b, 0x7d, 0x8b, 0xa1, 0x93, 0x5f, + 0x0c, 0xa5, 0x72, 0xa9, 0x6f, 0x59, 0x7d, 0x03, 0x33, 0x3a, 0x07, 0xc3, 0xc3, 0x5b, 0x78, 0x60, + 0x7b, 0x27, 0xbc, 0x71, 0x23, 0xda, 0xe8, 0xe9, 0x03, 0xec, 0x7a, 0xda, 0xc0, 0xe6, 0x08, 0xeb, + 0x51, 0x84, 0xcf, 0x1c, 0xcd, 0xb6, 0xb1, 0xe3, 0x0a, 0x02, 0x61, 0x31, 0x87, 0x43, 0x9d, 0x48, + 0x49, 0xfe, 0xe3, 0x08, 0x57, 0xc2, 0x08, 0xc7, 0xba, 0x6b, 0x1f, 0x90, 0x7f, 0x79, 0xf3, 0xad, + 0x68, 0xf3, 0xe7, 0x3a, 0x76, 0xba, 0x96, 0x79, 0xa8, 0xf7, 0x29, 0x1e, 0xf9, 0x54, 0xbd, 0x13, + 0x1b, 0xf3, 0x0e, 0xf2, 0x5f, 0x4a, 0xb0, 0xbc, 0x6f, 0xf7, 0x34, 0x0f, 0xef, 0xbb, 0xd8, 0x51, + 0xf0, 0xa7, 0x43, 0xec, 0x7a, 0xe8, 0x06, 0x64, 0xf4, 0x5e, 0x59, 0xba, 0x2a, 0xbd, 0x5a, 0xdc, + 0x5a, 0xda, 0xb4, 0x9f, 0x6e, 0x32, 0x41, 0x36, 0xf7, 0xf7, 0x9b, 0xf5, 0xed, 0xdc, 0xe9, 0xb3, + 0x8d, 0x4c, 0xb3, 0xae, 0x64, 0xf4, 0x1e, 0x6a, 0xc0, 0x52, 0x4f, 0x77, 0x6d, 0x43, 0x3b, 0x51, + 0x6d, 0xbd, 0xeb, 0x0d, 0x1d, 0x5c, 0xce, 0xd0, 0x5e, 0x97, 0x37, 0xd9, 0x48, 0x37, 0xc5, 0x48, + 0x37, 0xdb, 0x9e, 0xa3, 0x9b, 0xfd, 0xc7, 0x9a, 0x31, 0xc4, 0xca, 0x22, 0xef, 0xb4, 0xc7, 0xfa, + 0xa0, 0x7b, 0x50, 0xd4, 0x5d, 0x55, 0xb3, 0x6d, 0xc7, 0x3a, 0xc6, 0xbd, 0x72, 0x96, 0x92, 0xa8, + 0xc4, 0x48, 0x6c, 0x5b, 0x96, 0xc1, 0x08, 0x80, 0xee, 0x56, 0x39, 0xb6, 0xfc, 0x1e, 0x2c, 0xd7, + 0xb1, 0x81, 0x9f, 0x6f, 0x04, 0xf2, 0x2a, 0xa0, 0x60, 0x6f, 0xd7, 0xb6, 0x4c, 0x17, 0xcb, 0x3f, + 0x94, 0xe0, 0xa2, 0xaf, 0x96, 0x36, 0xf6, 0x3c, 0xdd, 0xec, 0xbb, 0xcf, 0xa1, 0x9e, 0x92, 0x66, + 0x6a, 0xc6, 0x89, 0xa7, 0x77, 0x5d, 0xd5, 0xb2, 0x3d, 0x6b, 0xe8, 0x4d, 0x31, 0xb8, 0xa5, 0x51, + 0x9f, 0x47, 0xb4, 0xcb, 0x47, 0x33, 0xf9, 0x4c, 0x29, 0x2b, 0x5f, 0x86, 0x4a, 0x92, 0x48, 0x5c, + 0xe2, 0x1d, 0x58, 0xdb, 0xc1, 0xde, 0x8b, 0x48, 0xcb, 0xd9, 0x7c, 0x04, 0x17, 0x62, 0x84, 0x18, + 0x0f, 0xf4, 0x5a, 0xc2, 0x70, 0x88, 0xb9, 0xf3, 0x49, 0x22, 0x4b, 0xa5, 0x8c, 0x5c, 0x83, 0x32, + 0xa7, 0x55, 0xf5, 0x3c, 0x47, 0x3f, 0x18, 0x7a, 0xf8, 0xcc, 0x62, 0xc9, 0x77, 0xe1, 0x62, 0x02, + 0x11, 0x2e, 0xd2, 0x25, 0x28, 0x78, 0xd6, 0xd0, 0x51, 0x5d, 0x8c, 0x4d, 0x4a, 0x2c, 0xaf, 0xe4, + 0x09, 0xa0, 0x8d, 0xb1, 0x29, 0xff, 0x3a, 0x94, 0xdb, 0x2f, 0xca, 0x1e, 0x7d, 0x33, 0xc8, 0x21, + 0x33, 0xd1, 0x78, 0x3e, 0xf7, 0x4b, 0x70, 0xb1, 0x9d, 0x26, 0xb7, 0x8c, 0x61, 0xb9, 0x69, 0x1e, + 0xeb, 0x61, 0xa7, 0x5d, 0x85, 0x59, 0x3c, 0xd0, 0x74, 0x83, 0x8a, 0x55, 0x50, 0xd8, 0x07, 0xba, + 0x02, 0x70, 0xa8, 0x3b, 0xae, 0xa7, 0x9a, 0xda, 0x80, 0x4d, 0xaf, 0x82, 0x52, 0xa0, 0x90, 0x96, + 0x36, 0xa0, 0x1a, 0x30, 0x34, 0xd1, 0x9a, 0xa5, 0xad, 0x79, 0x02, 0x20, 0x8d, 0xf2, 0x03, 0x40, + 0x41, 0x36, 0x5c, 0x69, 0xc9, 0x7c, 0x36, 0xa0, 0xa8, 0x53, 0x5c, 0xd5, 0xd0, 0xcd, 0x27, 0x9c, + 0x11, 0x30, 0xd0, 0xae, 0x6e, 0x3e, 0x91, 0xdf, 0x86, 0xf9, 0x5d, 0xab, 0xaf, 0x9b, 0x42, 0xdc, + 0x97, 0x60, 0x5e, 0xeb, 0x76, 0xb1, 0xeb, 0xaa, 0x9e, 0xf5, 0x84, 0xab, 0xbf, 0xa0, 0x14, 0x19, + 0xac, 0x43, 0x40, 0x72, 0x15, 0x80, 0x77, 0xb1, 0x8d, 0x13, 0xc2, 0x37, 0x88, 0xc9, 0x3e, 0xc8, + 0xf8, 0xf0, 0x53, 0x5b, 0x77, 0xb0, 0xab, 0x6a, 0xcc, 0x9f, 0xb2, 0x4a, 0x81, 0x43, 0xaa, 0x1e, + 0x71, 0xfb, 0x1d, 0xec, 0x35, 0x07, 0x5a, 0x1f, 0xd7, 0x1c, 0xdc, 0xc3, 0xa6, 0xa7, 0x6b, 0x86, + 0x30, 0xa3, 0xfc, 0x0d, 0xb8, 0x94, 0xd8, 0xea, 0x8f, 0xb4, 0xeb, 0xe0, 0x9e, 0x2b, 0x38, 0xd2, + 0x0f, 0xb9, 0x03, 0xc5, 0xaa, 0xe3, 0xe9, 0x87, 0x5a, 0xd7, 0x6b, 0x63, 0x0f, 0x21, 0x98, 0xa1, + 0xca, 0x63, 0x38, 0xf4, 0x37, 0x7a, 0x1b, 0xf2, 0x1a, 0x47, 0x29, 0x67, 0xae, 0x66, 0x5f, 0x2d, + 0x6e, 0x9d, 0xdf, 0x0c, 0x2c, 0x0e, 0x9b, 0xa2, 0xbf, 0x32, 0x42, 0x93, 0x7f, 0x4f, 0x82, 0x25, + 0x01, 0x7e, 0xa8, 0x3b, 0x8e, 0xe5, 0xb8, 0xe8, 0xdb, 0xb0, 0x20, 0xda, 0x69, 0xd8, 0xa5, 0x3c, + 0x16, 0xb7, 0x2e, 0x26, 0xd2, 0xea, 0x9c, 0xd8, 0x58, 0x99, 0xd7, 0x02, 0x5f, 0x48, 0x86, 0x9c, + 0x7b, 0xa4, 0x6d, 0xbd, 0x73, 0x87, 0x99, 0x63, 0x1b, 0x4e, 0x9f, 0x6d, 0xe4, 0xda, 0xf7, 0xab, + 0x5b, 0xef, 0xdc, 0x51, 0x78, 0x0b, 0xba, 0x0c, 0x33, 0x43, 0xc7, 0x70, 0xcb, 0xd9, 0xab, 0xd9, + 0x57, 0x0b, 0xdb, 0xf9, 0xd3, 0x67, 0x1b, 0x33, 0xfb, 0xca, 0xae, 0xab, 0x50, 0xa8, 0xfc, 0x45, + 0x06, 0xf2, 0x82, 0x01, 0xba, 0x0b, 0x85, 0xd1, 0x8a, 0xc4, 0x7d, 0x3f, 0xee, 0xcb, 0x1d, 0x81, + 0xa1, 0xf8, 0xc8, 0xc4, 0x39, 0xba, 0xd6, 0x60, 0xa0, 0x7b, 0xea, 0x91, 0xe6, 0x1e, 0x09, 0xe7, + 0x60, 0xa0, 0xfb, 0x9a, 0x7b, 0x44, 0x10, 0x8e, 0xb1, 0xe3, 0xea, 0x96, 0xa9, 0xba, 0x9e, 0xc3, + 0x1d, 0x11, 0x38, 0xa8, 0xed, 0x39, 0xa8, 0x05, 0x2b, 0xda, 0xb1, 0xa6, 0x1b, 0xda, 0x81, 0x81, + 0x55, 0x31, 0x48, 0xb7, 0x3c, 0x73, 0x35, 0x3b, 0x56, 0x21, 0xdb, 0x99, 0xb2, 0xa4, 0xa0, 0x51, + 0x4f, 0xd1, 0xe4, 0xa2, 0xcb, 0x50, 0xe8, 0x1e, 0x69, 0x66, 0x1f, 0x1b, 0x56, 0xbf, 0x3c, 0xcb, + 0x66, 0xc5, 0x08, 0x80, 0xbe, 0x03, 0x95, 0x38, 0x37, 0x75, 0xc0, 0xcc, 0x52, 0xce, 0x51, 0x8b, + 0x5e, 0x4e, 0x64, 0xca, 0x4d, 0xa7, 0x94, 0x63, 0x3c, 0x79, 0x0b, 0x31, 0x34, 0x89, 0xb5, 0x02, + 0xbc, 0xab, 0xbb, 0x9e, 0x98, 0x12, 0xd7, 0x02, 0xf6, 0x0e, 0xf8, 0xd4, 0xc8, 0xa8, 0x74, 0xc6, + 0xc6, 0x9c, 0x22, 0x73, 0x36, 0xa7, 0x58, 0x85, 0x59, 0x43, 0x1f, 0xe8, 0x6c, 0x29, 0xc9, 0x2a, + 0xec, 0x43, 0xfe, 0x23, 0x26, 0x55, 0xdd, 0xfa, 0xcc, 0x34, 0x2c, 0xad, 0x47, 0x66, 0xec, 0x99, + 0xa4, 0x8a, 0x18, 0x30, 0x13, 0x33, 0x60, 0x4c, 0xec, 0xec, 0x99, 0xc4, 0x96, 0x7f, 0x57, 0xa2, + 0x2b, 0x4b, 0x58, 0x40, 0x3e, 0x4f, 0x4b, 0x90, 0x1d, 0x3a, 0x22, 0x1e, 0x91, 0x9f, 0x53, 0x79, + 0xfe, 0x3d, 0x28, 0x1e, 0x6b, 0x86, 0xde, 0x53, 0x87, 0xa6, 0xa7, 0x1b, 0xa9, 0x2b, 0xab, 0xef, + 0xd0, 0x40, 0xd1, 0xf7, 0x09, 0xb6, 0xbc, 0x06, 0xab, 0x35, 0x07, 0x6b, 0x1e, 0xae, 0x19, 0x43, + 0xd7, 0x1b, 0x05, 0x61, 0xf9, 0x31, 0x9c, 0x8f, 0xc0, 0xb9, 0x8c, 0xef, 0x03, 0x74, 0x19, 0x48, + 0x4d, 0x5f, 0x39, 0x16, 0x4e, 0x9f, 0x6d, 0x14, 0x78, 0xcf, 0x66, 0x5d, 0x29, 0xf0, 0x1e, 0xcd, + 0x9e, 0xfc, 0x63, 0x09, 0xae, 0xb0, 0xf5, 0xfb, 0x91, 0xd3, 0x34, 0x5d, 0x4f, 0x33, 0x8c, 0x30, + 0xe7, 0x17, 0x64, 0x80, 0xca, 0x30, 0xc7, 0xad, 0xc5, 0x8d, 0x27, 0x3e, 0x89, 0xfd, 0x49, 0x6c, + 0xb4, 0x0d, 0xeb, 0x44, 0xc5, 0x5e, 0x97, 0x6d, 0xb0, 0xf2, 0xca, 0xbc, 0x00, 0x36, 0xbc, 0x6e, + 0x4f, 0xde, 0x81, 0xf5, 0x34, 0xf1, 0xb8, 0x02, 0xae, 0xc3, 0xe2, 0x90, 0x62, 0xa8, 0xae, 0xa7, + 0x39, 0x1e, 0xee, 0xf1, 0x05, 0x77, 0x81, 0x41, 0xdb, 0x0c, 0x28, 0x37, 0x60, 0xfe, 0x31, 0xdd, + 0x68, 0xd6, 0xe8, 0xbe, 0x13, 0xdd, 0x82, 0x15, 0x5b, 0x73, 0x5d, 0xef, 0xc8, 0xb1, 0x86, 0xfd, + 0x23, 0x15, 0x9b, 0x64, 0x4e, 0x89, 0xbe, 0x28, 0xd0, 0xd4, 0x60, 0x2d, 0x7c, 0x1f, 0x72, 0x15, + 0x50, 0x90, 0x0c, 0x93, 0x8d, 0xed, 0x2b, 0x38, 0xc6, 0x07, 0x70, 0x7e, 0x07, 0x7b, 0x42, 0x17, + 0xe6, 0xa1, 0x75, 0xe6, 0xad, 0xc5, 0x8f, 0x24, 0xc8, 0x3f, 0xb8, 0xeb, 0x36, 0x8e, 0xb1, 0xe9, + 0x11, 0xfd, 0x0d, 0xb0, 0xeb, 0x6a, 0x7d, 0x31, 0x3f, 0xc4, 0x27, 0xfa, 0x96, 0x58, 0x81, 0x49, + 0x3c, 0x4c, 0xdd, 0x03, 0x04, 0xe2, 0x26, 0xc5, 0x26, 0xdf, 0x64, 0xf7, 0x40, 0x57, 0x67, 0xda, + 0x73, 0xb2, 0x83, 0xd2, 0x95, 0x9b, 0x7c, 0xca, 0xff, 0x9a, 0x81, 0xc2, 0x9e, 0xd5, 0x6b, 0x7b, + 0x9a, 0x37, 0x74, 0x13, 0x97, 0xa8, 0x37, 0x21, 0xe7, 0xd2, 0x56, 0x1e, 0x3f, 0xc2, 0x0b, 0xd4, + 0x9e, 0xd5, 0xdb, 0x3b, 0xd2, 0x5c, 0xac, 0x70, 0x24, 0x62, 0x3d, 0xf6, 0x4b, 0x15, 0xa3, 0x64, + 0x31, 0x7a, 0x81, 0x41, 0x1f, 0xf2, 0xb1, 0xae, 0x41, 0xce, 0xc1, 0x9a, 0x6b, 0x99, 0xe5, 0x19, + 0xda, 0xcc, 0xbf, 0xd0, 0x7b, 0x00, 0x5d, 0xcb, 0xf4, 0x34, 0xdd, 0xc4, 0x8e, 0x5b, 0x9e, 0x4d, + 0x08, 0xa0, 0x35, 0xd1, 0xcc, 0x64, 0x56, 0x02, 0xf8, 0xe8, 0x3e, 0x40, 0x97, 0x4e, 0xaa, 0x1e, + 0x59, 0xe3, 0x73, 0x93, 0xf4, 0xc0, 0xbd, 0x9c, 0xf5, 0xa8, 0x7a, 0x4a, 0xa1, 0x2b, 0x7e, 0x92, + 0x51, 0x63, 0x62, 0x2e, 0xb7, 0x3c, 0x97, 0xb0, 0x2c, 0x0b, 0x63, 0x2a, 0x1c, 0x89, 0xb9, 0x3e, + 0x75, 0x57, 0xb5, 0x6b, 0x0d, 0x4d, 0xaf, 0x9c, 0xa7, 0x31, 0x73, 0x9e, 0x03, 0x6b, 0x04, 0x26, + 0xff, 0xa7, 0x04, 0x4b, 0x11, 0xe9, 0x53, 0x36, 0x05, 0xb3, 0x44, 0x59, 0x22, 0x60, 0x5f, 0x4a, + 0x1f, 0x3e, 0x56, 0x18, 0x66, 0xd0, 0xa9, 0xb2, 0x61, 0xa7, 0x4a, 0x53, 0xf4, 0xd7, 0xa7, 0xaa, + 0xd8, 0xd8, 0xe7, 0x12, 0xc6, 0xfe, 0xe3, 0x02, 0x14, 0x03, 0x53, 0x68, 0xfa, 0x7d, 0xf1, 0x56, + 0xc4, 0xfd, 0x2a, 0x61, 0x6d, 0x30, 0x92, 0xdc, 0x15, 0x84, 0x0f, 0xbe, 0x0a, 0x4b, 0xc4, 0xc1, + 0xef, 0x63, 0xcd, 0xf1, 0x0e, 0xb0, 0xe6, 0xb5, 0x5c, 0xbe, 0x86, 0x45, 0xc1, 0xe8, 0x6d, 0xc8, + 0xb1, 0x63, 0x2b, 0xd5, 0x4e, 0x31, 0xb2, 0xca, 0x04, 0x03, 0x83, 0xc2, 0x11, 0xd1, 0x2d, 0x28, + 0x8a, 0xf0, 0x39, 0xd4, 0x7b, 0x6c, 0x4b, 0xb0, 0xbd, 0x78, 0xfa, 0x6c, 0x03, 0xb8, 0x30, 0xfb, + 0xcd, 0xba, 0x22, 0x22, 0xec, 0xbe, 0xde, 0x23, 0xfb, 0x57, 0xd1, 0x81, 0x9a, 0x3a, 0xc7, 0xf6, + 0xaf, 0x1c, 0x46, 0x17, 0xc5, 0x4d, 0x58, 0xb1, 0x1d, 0xec, 0x79, 0x27, 0x6a, 0x08, 0xb3, 0x40, + 0x31, 0x97, 0x59, 0x53, 0x2d, 0x80, 0x7f, 0x03, 0x96, 0x04, 0xa2, 0x88, 0xc5, 0x73, 0x14, 0x77, + 0x91, 0x83, 0x1f, 0xf3, 0x90, 0xfc, 0x1a, 0x94, 0x2c, 0x1b, 0x3b, 0x9a, 0x67, 0xf9, 0x98, 0xcb, + 0x14, 0x73, 0x49, 0xc0, 0x05, 0xea, 0x75, 0x58, 0xe4, 0x07, 0x77, 0x81, 0x98, 0x67, 0x13, 0x97, + 0x41, 0x05, 0x9a, 0x03, 0x15, 0x32, 0xe1, 0x1c, 0xcb, 0x50, 0x6d, 0x43, 0x33, 0xb1, 0x6a, 0x5b, + 0x3d, 0x95, 0xe9, 0x1d, 0xbb, 0x65, 0xa0, 0x93, 0xe5, 0x9d, 0x24, 0x1b, 0x11, 0xb3, 0x53, 0xef, + 0x75, 0x2c, 0x63, 0x8f, 0xf4, 0x1c, 0x85, 0x1d, 0xec, 0x36, 0x4c, 0xcf, 0x39, 0x51, 0x2e, 0x74, + 0x93, 0x5b, 0xd1, 0x6f, 0x4a, 0xf0, 0xd2, 0xd0, 0x3c, 0xc2, 0x9a, 0xe1, 0x1d, 0x9d, 0xa8, 0x3d, + 0xcd, 0xd3, 0x92, 0x78, 0x2f, 0x52, 0xde, 0xf7, 0x52, 0x79, 0xef, 0x0b, 0x0a, 0x75, 0xcd, 0xd3, + 0x92, 0x25, 0xb8, 0x32, 0x1c, 0x87, 0x43, 0xce, 0x40, 0xe6, 0x70, 0xa0, 0x9a, 0x56, 0x0f, 0xbb, + 0xe5, 0xe2, 0x55, 0xe9, 0xd5, 0x59, 0x25, 0x6f, 0x0e, 0x07, 0x2d, 0xf2, 0x8d, 0x6e, 0xc3, 0x1a, + 0x69, 0xd4, 0x4d, 0xd7, 0x73, 0x86, 0x03, 0x6c, 0x92, 0x99, 0xc5, 0x30, 0xe7, 0x29, 0xe6, 0xaa, + 0x39, 0x1c, 0x34, 0x03, 0x8d, 0xac, 0x57, 0x3c, 0x5c, 0x2e, 0x24, 0x85, 0xcb, 0x1a, 0x2c, 0xd9, + 0x0e, 0x3e, 0xd6, 0xad, 0xa1, 0xcb, 0x07, 0x5c, 0x5e, 0x9a, 0x38, 0x1d, 0x16, 0x45, 0x17, 0x1e, + 0x6b, 0x76, 0x61, 0x35, 0x42, 0x84, 0xad, 0x17, 0xa5, 0x89, 0xeb, 0x05, 0x0a, 0x53, 0x22, 0x0d, + 0x95, 0x03, 0xb8, 0x3c, 0xce, 0x9a, 0x64, 0xaf, 0xf5, 0x04, 0x9f, 0x88, 0xbd, 0xd6, 0x13, 0x7c, + 0x82, 0xde, 0x80, 0xd9, 0x63, 0x72, 0x78, 0xe5, 0x4b, 0xdb, 0x5a, 0x74, 0x21, 0xe1, 0x62, 0x33, + 0xa4, 0x77, 0x33, 0x77, 0xa5, 0xca, 0x11, 0xc8, 0x93, 0xad, 0xf6, 0x75, 0x70, 0x92, 0x5b, 0x74, + 0x57, 0x1b, 0x5a, 0xe4, 0xf9, 0x76, 0xe4, 0x36, 0xe4, 0xf9, 0xa4, 0x22, 0xc7, 0x3b, 0xe2, 0x62, + 0xe5, 0x34, 0x17, 0x53, 0x46, 0x98, 0xf2, 0x47, 0xb0, 0xe1, 0xd3, 0xab, 0x59, 0xa6, 0x89, 0xbb, + 0x9e, 0x6e, 0x99, 0xcf, 0xb5, 0x7d, 0xf8, 0x36, 0x5c, 0x4d, 0xa7, 0xe5, 0x9f, 0x40, 0xd9, 0x99, + 0x37, 0x13, 0x38, 0xf3, 0xf2, 0xeb, 0x91, 0x1f, 0x4a, 0x70, 0x95, 0xed, 0x6b, 0x38, 0x8d, 0x50, + 0x5c, 0x3b, 0xeb, 0x45, 0x45, 0x1d, 0x16, 0x58, 0x24, 0x54, 0xd9, 0x7e, 0x8c, 0xeb, 0x78, 0x23, + 0x35, 0x72, 0x32, 0xd6, 0xca, 0x7c, 0x37, 0xf0, 0x25, 0x5f, 0x83, 0x97, 0xc6, 0x88, 0xc4, 0x6f, + 0x2f, 0xfe, 0x5b, 0x82, 0xf3, 0x75, 0xba, 0x75, 0x24, 0x53, 0xe6, 0x01, 0x3e, 0x79, 0x88, 0x3d, + 0x8d, 0x4c, 0xff, 0xe9, 0xa5, 0xfd, 0x56, 0x68, 0x99, 0x9b, 0xbc, 0x33, 0x0a, 0xac, 0x6b, 0x08, + 0x66, 0x7a, 0xd8, 0xed, 0xf2, 0x75, 0x93, 0xfe, 0x26, 0xeb, 0x85, 0xe5, 0xf4, 0x55, 0x1e, 0xf7, + 0x13, 0x78, 0x17, 0x4e, 0x9f, 0x6d, 0xcc, 0x3e, 0x72, 0xfa, 0xcd, 0xba, 0x32, 0x6b, 0x39, 0xfd, + 0x66, 0x0f, 0xdd, 0x86, 0xb9, 0xa1, 0xcb, 0xf6, 0xda, 0xb9, 0xe4, 0x3e, 0xf4, 0xcc, 0xb1, 0xef, + 0xd2, 0x8d, 0x76, 0x8e, 0xe0, 0x36, 0xc5, 0xe6, 0xf4, 0xfb, 0x19, 0x58, 0x08, 0x29, 0x60, 0xfa, + 0x81, 0xf3, 0x49, 0x91, 0xf1, 0x27, 0xc5, 0xff, 0x51, 0x55, 0xc8, 0x6f, 0x41, 0x85, 0xed, 0x3b, + 0x42, 0x9a, 0x10, 0x7e, 0x2b, 0x44, 0x93, 0x7c, 0xd1, 0xe4, 0x0a, 0x94, 0xc9, 0x69, 0x39, 0x09, + 0x5f, 0x6e, 0xc3, 0xc5, 0x84, 0x36, 0x3e, 0x8b, 0xee, 0xc0, 0xcc, 0x13, 0x7c, 0x22, 0xe6, 0xb9, + 0x1c, 0x72, 0xe9, 0x44, 0x47, 0x54, 0x28, 0xbe, 0xbc, 0xcd, 0x8e, 0x9c, 0x49, 0xf2, 0x4d, 0x3d, + 0xcb, 0xef, 0xd3, 0x4b, 0xcc, 0x64, 0xb9, 0xde, 0xf0, 0x23, 0x5c, 0x31, 0x12, 0xf2, 0xc3, 0x1d, + 0x08, 0x9a, 0xbc, 0x09, 0x95, 0x5d, 0xcb, 0x7a, 0x32, 0xb4, 0x13, 0x05, 0x8a, 0x45, 0x4b, 0xf9, + 0x01, 0x5c, 0x4a, 0xc4, 0x7f, 0x2e, 0xe6, 0xff, 0x25, 0x41, 0xae, 0xba, 0xd7, 0xfc, 0x25, 0xf5, + 0xd5, 0xff, 0x90, 0x60, 0x91, 0x8d, 0xfe, 0x97, 0x2d, 0x54, 0xbd, 0x06, 0x2b, 0x6c, 0x96, 0xb2, + 0xe1, 0x8f, 0x9b, 0x9e, 0x2b, 0xb0, 0x4c, 0xa6, 0x60, 0x08, 0x51, 0x6e, 0x00, 0x0a, 0x02, 0xb9, + 0xef, 0xdd, 0x0a, 0x4d, 0xc8, 0xf0, 0x49, 0x28, 0xac, 0x67, 0x3e, 0x13, 0xef, 0x41, 0x69, 0x07, + 0x87, 0x49, 0x4f, 0x3f, 0x05, 0xdf, 0x85, 0xe5, 0x40, 0xe7, 0xd1, 0x75, 0x44, 0xc0, 0xfd, 0x57, + 0x12, 0x24, 0x60, 0x7e, 0x7f, 0x03, 0x56, 0xd8, 0x24, 0x0a, 0xf3, 0x8e, 0xcf, 0xb6, 0xf7, 0x61, + 0x35, 0x8c, 0x78, 0x36, 0x3e, 0xcb, 0xb0, 0xb4, 0x83, 0xbd, 0x5d, 0xfd, 0x18, 0x3f, 0xd6, 0xf1, + 0x67, 0xae, 0x82, 0x3f, 0x95, 0x15, 0x28, 0x89, 0xef, 0x91, 0xd7, 0xad, 0x8d, 0xc6, 0x5c, 0x08, + 0x39, 0x99, 0xb0, 0x47, 0x26, 0xe0, 0x29, 0xe2, 0x0c, 0x9a, 0xf5, 0xcf, 0xa0, 0xf2, 0x1e, 0xd5, + 0x63, 0x80, 0x8d, 0x6b, 0x93, 0xb3, 0xb9, 0xa1, 0x1f, 0x63, 0xf5, 0x98, 0x40, 0xb8, 0x49, 0xae, + 0x84, 0x04, 0x8d, 0x8a, 0xa1, 0x14, 0x0c, 0x41, 0x41, 0xfe, 0x88, 0xee, 0xb0, 0x04, 0x06, 0xd9, + 0x3a, 0x92, 0x93, 0xb3, 0x82, 0x3f, 0x45, 0x6f, 0xc1, 0xfc, 0x88, 0xae, 0x3a, 0x92, 0x9a, 0x1e, + 0xa9, 0x04, 0x3a, 0x39, 0x52, 0x09, 0x52, 0x4d, 0x7a, 0xa1, 0x72, 0x21, 0x91, 0x98, 0x6b, 0xa3, + 0x6f, 0x41, 0x7e, 0xc0, 0xd9, 0x73, 0x65, 0x4e, 0x90, 0x71, 0x84, 0x4e, 0x4e, 0x6a, 0xf6, 0x53, + 0x43, 0xed, 0x72, 0x72, 0x5c, 0x49, 0x45, 0xfb, 0xa9, 0x21, 0x38, 0xa0, 0x0d, 0xc8, 0x1e, 0xeb, + 0x2e, 0x9f, 0x9d, 0x0b, 0x84, 0x30, 0xcd, 0x8d, 0x6e, 0x3e, 0xd6, 0x5d, 0x85, 0xb4, 0xc8, 0x4b, + 0xb0, 0xb0, 0x83, 0xbd, 0x76, 0xd7, 0xd1, 0x6d, 0x3a, 0x3a, 0xd9, 0x83, 0x45, 0xf6, 0xf5, 0x75, + 0xd9, 0x06, 0xc9, 0xb0, 0x70, 0xa4, 0xb9, 0xea, 0x48, 0x67, 0x74, 0xda, 0xe7, 0x95, 0xe2, 0x91, + 0xe6, 0x8a, 0xc1, 0xc9, 0x3b, 0xb0, 0x18, 0x14, 0xc3, 0xb5, 0xd1, 0x3b, 0x30, 0xe7, 0xb2, 0xcf, + 0xc4, 0xd9, 0x14, 0x96, 0x51, 0x11, 0xb8, 0x72, 0x15, 0x56, 0x47, 0x84, 0x82, 0x46, 0x7b, 0x0d, + 0x0a, 0x0c, 0xc5, 0xb7, 0xd8, 0xfc, 0xe9, 0xb3, 0x8d, 0x3c, 0xc3, 0x6c, 0xd6, 0x95, 0x3c, 0x6b, + 0x6e, 0xf6, 0x64, 0x83, 0x5e, 0xa0, 0x45, 0x49, 0xb8, 0x36, 0xfa, 0x66, 0xcc, 0x54, 0x63, 0x65, + 0xf2, 0x0d, 0x55, 0x81, 0x7c, 0xc4, 0x48, 0xa3, 0x6f, 0xf9, 0xa7, 0x12, 0xac, 0x54, 0x87, 0x9e, + 0xd5, 0xb5, 0x06, 0xb6, 0x81, 0x3d, 0x1c, 0xc8, 0x7a, 0xe9, 0xa6, 0x3d, 0xf4, 0x44, 0x8e, 0x86, + 0x7e, 0xa0, 0x2b, 0x00, 0xdd, 0xa1, 0xe3, 0x5a, 0x8e, 0x6a, 0x5b, 0xae, 0xc8, 0x0a, 0x31, 0xc8, + 0x9e, 0xe5, 0xa2, 0x7b, 0x90, 0xd3, 0xe8, 0x66, 0x9b, 0xdf, 0x42, 0x5f, 0x0b, 0xcf, 0xcb, 0x00, + 0x9b, 0x2a, 0x45, 0xa3, 0xf7, 0xd1, 0xbc, 0x4b, 0xf4, 0xa6, 0x60, 0x66, 0xd2, 0x4d, 0x81, 0xfc, + 0x67, 0x12, 0x2c, 0x74, 0xb4, 0x83, 0xf6, 0xb0, 0xdf, 0xc7, 0x2e, 0x25, 0x71, 0x09, 0x0a, 0x9e, + 0x76, 0xa0, 0xea, 0x66, 0x0f, 0x3f, 0xa5, 0x82, 0x67, 0x95, 0xbc, 0xa7, 0x1d, 0x34, 0xc9, 0x37, + 0xba, 0x03, 0x17, 0xf0, 0x53, 0xdc, 0x1d, 0x7a, 0x2c, 0xfb, 0x70, 0x48, 0x18, 0xb9, 0xd8, 0xc0, + 0x5d, 0x91, 0x2e, 0x3d, 0xef, 0x37, 0x57, 0x49, 0x6b, 0x9b, 0x36, 0xa2, 0x06, 0x14, 0xdd, 0x11, + 0x0b, 0x96, 0xd0, 0x29, 0x8e, 0x19, 0x99, 0x2f, 0x8e, 0x12, 0xec, 0x27, 0xff, 0x9b, 0x04, 0x6b, + 0xc9, 0x78, 0xe8, 0x9b, 0x30, 0xf3, 0x44, 0x37, 0x7b, 0x3c, 0x0d, 0x95, 0x4e, 0xba, 0x61, 0x7a, + 0xba, 0x77, 0xf2, 0x40, 0x37, 0x7b, 0x0a, 0xed, 0x30, 0x72, 0xf7, 0x4c, 0xc0, 0xdd, 0xaf, 0x42, + 0x91, 0x4c, 0x05, 0xe2, 0x0a, 0xc2, 0x10, 0x05, 0x25, 0x08, 0x42, 0x37, 0x60, 0x69, 0xa0, 0x79, + 0xdd, 0x23, 0xdc, 0x63, 0x9a, 0xc2, 0x2c, 0xdf, 0x93, 0x55, 0x16, 0x39, 0xb8, 0xc9, 0xa0, 0xe8, + 0x5d, 0x71, 0xb3, 0x36, 0x4b, 0x05, 0x7b, 0x79, 0x82, 0x60, 0xc1, 0x2b, 0x36, 0xf9, 0x27, 0x12, + 0xac, 0x86, 0xfd, 0x8a, 0x07, 0xee, 0x1b, 0xb0, 0x74, 0x68, 0x39, 0x03, 0xcd, 0xf3, 0x28, 0x7f, + 0xdf, 0xc5, 0x16, 0x47, 0xe0, 0x26, 0xf5, 0xb5, 0x6b, 0xb0, 0xa0, 0xbb, 0xaa, 0x6f, 0x13, 0x6e, + 0xa5, 0x79, 0xdd, 0x6d, 0x8c, 0x60, 0x68, 0x1b, 0x16, 0xbd, 0xa0, 0x0b, 0x08, 0xfb, 0x84, 0x37, + 0x5e, 0x21, 0x2f, 0x51, 0x22, 0x3d, 0xe4, 0x5f, 0x48, 0x50, 0x0e, 0x8a, 0xfa, 0xa1, 0x8e, 0x8d, + 0xde, 0xf8, 0x79, 0xb0, 0x0d, 0x70, 0x48, 0xb0, 0x82, 0x99, 0xa2, 0xa9, 0xec, 0x56, 0xa0, 0xdd, + 0x68, 0xc2, 0xe8, 0xff, 0x03, 0x72, 0xf0, 0xa7, 0x43, 0xdd, 0x21, 0x3b, 0x18, 0xa7, 0xcf, 0x0a, + 0x40, 0xa8, 0xf8, 0x53, 0xd2, 0x2a, 0x89, 0xee, 0x55, 0xa7, 0x4f, 0x28, 0xba, 0x67, 0x9f, 0x42, + 0x3f, 0x92, 0xe0, 0x62, 0xc2, 0xd0, 0xb9, 0xa9, 0x22, 0x9e, 0x2f, 0x3d, 0x9f, 0xe7, 0xa3, 0xdb, + 0xb0, 0x46, 0x02, 0xb0, 0xd6, 0xeb, 0xe9, 0x04, 0xa0, 0x19, 0x2a, 0xf3, 0x33, 0x97, 0x5b, 0x74, + 0xf5, 0x48, 0x73, 0xab, 0xa3, 0xc6, 0x87, 0xac, 0x4d, 0xfe, 0x7d, 0x09, 0xe6, 0xc8, 0x76, 0xeb, + 0x4c, 0xd7, 0x9f, 0x17, 0x21, 0x4f, 0x76, 0x71, 0x81, 0x49, 0x31, 0x67, 0x39, 0x7d, 0x91, 0x49, + 0xeb, 0x59, 0x03, 0x4d, 0x37, 0x83, 0x39, 0x79, 0x60, 0x20, 0x8a, 0xf0, 0x1a, 0x94, 0x58, 0x16, + 0x84, 0x97, 0xbc, 0x68, 0x86, 0xcb, 0x97, 0x8a, 0x25, 0x06, 0xaf, 0x0a, 0xb0, 0xfc, 0x26, 0x94, + 0xd8, 0xee, 0xed, 0x91, 0x33, 0xba, 0x11, 0x08, 0xb2, 0x96, 0x42, 0xac, 0xe5, 0xef, 0x4b, 0x50, + 0x12, 0x59, 0x9c, 0xfe, 0xf3, 0x94, 0xab, 0xc4, 0xe4, 0x9a, 0x5c, 0xf1, 0x10, 0x93, 0xb9, 0x49, + 0x57, 0x26, 0xb2, 0x19, 0x75, 0x9b, 0x66, 0x40, 0x0e, 0x7f, 0xe3, 0x2b, 0x4d, 0xb9, 0xf1, 0x95, + 0xeb, 0x74, 0x85, 0x0a, 0x92, 0xe2, 0x0e, 0xf3, 0x3a, 0xcc, 0x92, 0x5d, 0xae, 0x70, 0x95, 0x70, + 0x16, 0x80, 0xee, 0x83, 0xcd, 0x43, 0x4b, 0x61, 0x38, 0xf2, 0x1e, 0x94, 0x15, 0x3c, 0xb0, 0x8e, + 0x69, 0x15, 0xc4, 0x87, 0x8e, 0x35, 0x08, 0x08, 0x15, 0xd8, 0x5a, 0x4b, 0xd3, 0x1f, 0x27, 0xde, + 0x81, 0x8b, 0x09, 0x14, 0xb9, 0x6c, 0x65, 0x98, 0x73, 0x87, 0xb4, 0x08, 0x82, 0x27, 0xb9, 0xc4, + 0xa7, 0xfc, 0x10, 0xca, 0xcc, 0x9a, 0xac, 0x28, 0x83, 0xd6, 0x48, 0xbc, 0x80, 0x76, 0xb6, 0xa0, + 0x18, 0x20, 0x44, 0xc2, 0x98, 0xab, 0xf7, 0x4d, 0xdc, 0x53, 0xbb, 0x86, 0xa6, 0x0f, 0x44, 0xd1, + 0xc3, 0x3c, 0x03, 0xd6, 0x28, 0x4c, 0x7e, 0x1b, 0x2e, 0x3e, 0xc6, 0x8e, 0x7e, 0x78, 0x12, 0x12, + 0xc1, 0xbf, 0xac, 0xa2, 0x19, 0x52, 0x2e, 0x37, 0xfb, 0x90, 0x77, 0xa0, 0xd0, 0xac, 0x37, 0x78, + 0x36, 0xef, 0x15, 0xc8, 0xeb, 0x3d, 0x1c, 0x70, 0xbe, 0xed, 0xe2, 0xe9, 0xb3, 0x8d, 0xb9, 0x66, + 0xbd, 0x41, 0x1c, 0x50, 0x99, 0xd3, 0x7b, 0x98, 0xfa, 0x38, 0x82, 0x19, 0x5b, 0xf3, 0x44, 0xa5, + 0x00, 0xfd, 0x2d, 0xff, 0x1a, 0xac, 0x55, 0x7b, 0x3d, 0x3a, 0x84, 0x46, 0xf8, 0x92, 0xeb, 0xec, + 0x83, 0x47, 0x9b, 0xa3, 0x0c, 0x41, 0xd2, 0x5d, 0xa2, 0xcf, 0x81, 0x63, 0xc9, 0x4d, 0xb8, 0x10, + 0x63, 0xce, 0x87, 0xed, 0x93, 0x92, 0xa6, 0x22, 0x75, 0x0c, 0x17, 0x59, 0xcd, 0xd8, 0xd7, 0x34, + 0x94, 0xa0, 0x4e, 0x33, 0xe9, 0x3a, 0x95, 0x2f, 0x43, 0x25, 0x89, 0x2f, 0xbf, 0x94, 0xf3, 0xe8, + 0xd6, 0x3b, 0xd8, 0xe4, 0xfe, 0x2f, 0xc8, 0xb4, 0x4b, 0x6f, 0x47, 0x22, 0x5c, 0xb9, 0x5e, 0xdf, + 0x82, 0x39, 0xa6, 0x31, 0x31, 0x4d, 0xd3, 0x14, 0x2b, 0xd0, 0xe4, 0xdf, 0xce, 0x40, 0x5e, 0xcc, + 0xde, 0xe9, 0xe3, 0x96, 0x3f, 0xbc, 0xcc, 0xb4, 0xc3, 0x0b, 0x17, 0x55, 0xcd, 0x8c, 0x2d, 0xaa, + 0x9a, 0x0d, 0x17, 0x55, 0xf9, 0xe5, 0x53, 0xb9, 0x60, 0xf9, 0xd4, 0x0d, 0x58, 0xb2, 0x1d, 0xeb, + 0x50, 0x37, 0xf0, 0xa8, 0x14, 0x92, 0xa7, 0x7e, 0x38, 0x58, 0x14, 0x3b, 0x6e, 0x84, 0x8b, 0x1d, + 0xf3, 0x74, 0xaa, 0x05, 0x0a, 0x1a, 0x3f, 0x9a, 0xc9, 0x67, 0x4b, 0x33, 0xf2, 0xdf, 0x4b, 0xb0, + 0xc6, 0xd4, 0xf3, 0xa1, 0xc5, 0x6f, 0x61, 0x85, 0x39, 0x2f, 0x43, 0x81, 0x08, 0xe6, 0xda, 0x5a, + 0x57, 0xac, 0x00, 0x3e, 0x00, 0xdd, 0x81, 0xb9, 0xe3, 0xcf, 0x55, 0xd7, 0xc6, 0x5d, 0xae, 0x8e, + 0x2b, 0xec, 0x34, 0x14, 0x2c, 0x05, 0xe5, 0xf7, 0xc0, 0x6d, 0x1b, 0x77, 0x95, 0xdc, 0xf1, 0xe7, + 0xe4, 0x7f, 0xb2, 0xa4, 0x3f, 0xb9, 0xeb, 0x8e, 0x92, 0x4c, 0x59, 0x7f, 0x49, 0x7f, 0x70, 0xd7, + 0xe5, 0x59, 0x26, 0x05, 0x9e, 0x8c, 0x7e, 0xa3, 0x77, 0xa1, 0xc0, 0x13, 0x53, 0x7c, 0x07, 0x90, + 0xa0, 0x79, 0x7a, 0xf4, 0x60, 0xcc, 0xc8, 0xd1, 0x83, 0xe1, 0x37, 0x7b, 0x64, 0x27, 0x74, 0x21, + 0x36, 0x3a, 0xee, 0x36, 0x3a, 0x2c, 0x93, 0xd1, 0x74, 0xac, 0x4f, 0xb4, 0x81, 0x38, 0xe0, 0x71, + 0x07, 0xba, 0x17, 0x4d, 0xb9, 0x26, 0x11, 0xd8, 0x6c, 0x45, 0x7b, 0xb3, 0x24, 0x52, 0x9c, 0x2a, + 0x7a, 0x03, 0xc0, 0xc5, 0xa4, 0x51, 0xed, 0xb9, 0xfc, 0x8a, 0x9e, 0x25, 0x54, 0xdb, 0x14, 0x5a, + 0x6f, 0xb7, 0x94, 0x02, 0x43, 0xa8, 0xbb, 0x66, 0xa5, 0x0e, 0x6b, 0xc9, 0xa4, 0x13, 0x32, 0x1d, + 0xab, 0xc1, 0x4c, 0x47, 0x21, 0x98, 0xd1, 0xa8, 0x40, 0x79, 0x24, 0xf8, 0x23, 0x9e, 0xeb, 0x13, + 0x97, 0x2d, 0x07, 0x70, 0x31, 0xa1, 0x6d, 0xb4, 0x49, 0x5a, 0xe1, 0xc2, 0x8e, 0x52, 0x87, 0x44, + 0x6a, 0x16, 0x85, 0xcf, 0x9f, 0x3e, 0xdb, 0x58, 0x66, 0x52, 0x8b, 0x8e, 0x44, 0xfa, 0x65, 0x37, + 0x0c, 0x72, 0x4d, 0xf9, 0x03, 0x7a, 0x99, 0xb2, 0x67, 0x0c, 0xfb, 0xba, 0x39, 0x8a, 0x10, 0xaf, + 0x87, 0x0e, 0x06, 0x17, 0xc2, 0x79, 0x19, 0x8a, 0xea, 0x1f, 0x06, 0xe4, 0x1a, 0xa0, 0x20, 0x05, + 0x2e, 0xde, 0x9b, 0x30, 0x67, 0x33, 0x10, 0x37, 0xd6, 0x4a, 0x02, 0x15, 0x45, 0xe0, 0xc8, 0x3f, + 0xc8, 0x40, 0x8e, 0xc1, 0x12, 0x73, 0xed, 0x8b, 0x74, 0xf2, 0x33, 0xe5, 0x91, 0x39, 0x3e, 0xf9, + 0xb0, 0x81, 0x60, 0xc6, 0xb0, 0xfa, 0x96, 0xb8, 0x6b, 0x23, 0xbf, 0xd1, 0x75, 0x58, 0x34, 0x34, + 0x0f, 0xbb, 0xde, 0xc8, 0xad, 0xd9, 0x64, 0x5e, 0x60, 0x50, 0xe1, 0xc9, 0xb7, 0x60, 0xc5, 0xc1, + 0xc4, 0x9a, 0xb4, 0xfa, 0x69, 0x68, 0xdb, 0x16, 0x2d, 0x6f, 0xc9, 0xb1, 0x12, 0x95, 0x51, 0x53, + 0x5b, 0xb4, 0xa0, 0xd7, 0x61, 0xd9, 0xef, 0x20, 0x2a, 0x5a, 0xe6, 0x28, 0x7a, 0x69, 0xd4, 0xc0, + 0xeb, 0x59, 0x48, 0x64, 0xe0, 0x28, 0x91, 0x0c, 0xee, 0x22, 0x07, 0x73, 0x31, 0xe4, 0x2a, 0xc8, + 0x2c, 0x96, 0x2a, 0x82, 0x04, 0x53, 0x50, 0x78, 0x81, 0xb9, 0x04, 0x05, 0xa6, 0xc3, 0xd1, 0x01, + 0x5f, 0xc9, 0x33, 0x40, 0xb3, 0x27, 0xff, 0x41, 0x06, 0xae, 0x8d, 0xa5, 0xc1, 0x8d, 0xf5, 0x71, + 0x34, 0x34, 0xbf, 0x1f, 0x32, 0xd6, 0x14, 0x24, 0xf8, 0xec, 0xe3, 0x09, 0x5a, 0x41, 0x0d, 0xdd, + 0x84, 0xe5, 0xee, 0xd0, 0xf5, 0xac, 0x81, 0x8a, 0x9f, 0x12, 0x65, 0xa9, 0x43, 0xc7, 0xe0, 0x66, + 0x5c, 0x62, 0x0d, 0x0d, 0x0a, 0xdf, 0x77, 0x0c, 0xb4, 0x05, 0xf3, 0xba, 0xe9, 0xe2, 0xee, 0xd0, + 0xc1, 0xaa, 0x67, 0xb0, 0xcb, 0x9b, 0xfc, 0xf6, 0xd2, 0xe9, 0xb3, 0x8d, 0x62, 0x93, 0xc3, 0x3b, + 0xbb, 0x6d, 0xa5, 0x28, 0x90, 0x3a, 0x86, 0x5b, 0x79, 0x17, 0xe6, 0x83, 0x8c, 0xcf, 0x34, 0xf3, + 0xfe, 0x64, 0x06, 0x64, 0x9e, 0xf4, 0x7a, 0x5e, 0x05, 0xa3, 0xc7, 0xbe, 0xe2, 0x58, 0x5d, 0xe8, + 0x7b, 0xe1, 0xad, 0xe7, 0x44, 0xf2, 0x29, 0x7a, 0xbb, 0x0d, 0x73, 0xc2, 0x8f, 0x26, 0x57, 0x88, + 0x0b, 0x54, 0x1a, 0xeb, 0xb9, 0x4b, 0xcd, 0x4c, 0x51, 0x77, 0x3f, 0xaa, 0x08, 0xbb, 0x9f, 0x64, + 0xa5, 0xd9, 0x29, 0x28, 0xc4, 0x6c, 0xd8, 0x8a, 0xd8, 0x30, 0x37, 0x49, 0xf8, 0xf1, 0xf6, 0x45, + 0x35, 0xfa, 0xa2, 0x80, 0x1e, 0x42, 0x6c, 0x07, 0xbb, 0x98, 0x16, 0xfa, 0x4c, 0xd2, 0xc7, 0x22, + 0xef, 0xb2, 0xc7, 0x7a, 0xbc, 0x90, 0x93, 0x5c, 0x87, 0x6b, 0x63, 0x8d, 0xc8, 0x77, 0x5b, 0x8f, + 0xe1, 0xca, 0x0e, 0xf6, 0x22, 0x38, 0xc1, 0x2c, 0xf2, 0x58, 0x2f, 0x4a, 0xad, 0xd5, 0x93, 0xff, + 0x3a, 0x03, 0x4b, 0x23, 0xaa, 0xec, 0x9e, 0x8d, 0x2c, 0xb4, 0xe1, 0x2b, 0xbd, 0xb4, 0x85, 0x36, + 0x7e, 0xc7, 0x47, 0x76, 0x1b, 0xbc, 0x6f, 0xe0, 0xa8, 0x0a, 0x0c, 0xd4, 0x9a, 0xee, 0x16, 0x67, + 0x03, 0x8a, 0x87, 0x0e, 0x19, 0x95, 0xd9, 0x3d, 0x51, 0xd9, 0x49, 0x35, 0xab, 0xc0, 0x08, 0xd4, + 0x46, 0x1f, 0xf8, 0x97, 0x01, 0x7a, 0x4f, 0x14, 0x87, 0xc5, 0x24, 0x0c, 0xde, 0x0e, 0x34, 0xeb, + 0xee, 0xe8, 0x76, 0xa0, 0xd9, 0x73, 0xc3, 0xca, 0xca, 0xc5, 0x95, 0x15, 0x0e, 0xb1, 0x23, 0xf7, + 0xbf, 0x04, 0x05, 0xdd, 0xe5, 0x7e, 0xc2, 0x37, 0x52, 0x79, 0xdd, 0x65, 0x5e, 0x20, 0xff, 0x4e, + 0x16, 0xd6, 0xd3, 0x4c, 0xc4, 0xa3, 0xa0, 0x12, 0x8d, 0x82, 0x77, 0xa3, 0x51, 0x70, 0x4c, 0xef, + 0x94, 0x89, 0xfc, 0x08, 0x2e, 0x68, 0x86, 0x61, 0x7d, 0xa6, 0x26, 0x87, 0xc1, 0xfc, 0x76, 0xf9, + 0xf4, 0xd9, 0xc6, 0x6a, 0x95, 0xa0, 0xd4, 0x82, 0x73, 0x49, 0xd9, 0x55, 0x56, 0xb5, 0x18, 0xd4, + 0x31, 0xd0, 0x36, 0x20, 0x46, 0x30, 0x21, 0x56, 0xae, 0x9e, 0x3e, 0xdb, 0x28, 0x51, 0x5a, 0xc1, + 0x09, 0x55, 0xd2, 0x42, 0x10, 0xc3, 0x25, 0x34, 0x7a, 0xf8, 0x50, 0x1b, 0x1a, 0x5e, 0x50, 0x1e, + 0x76, 0x6b, 0x43, 0x69, 0xd4, 0x59, 0xab, 0x2f, 0x4b, 0xa9, 0x17, 0x82, 0x38, 0xc6, 0x0b, 0x4d, + 0x2a, 0x56, 0xc4, 0x1f, 0xf1, 0xeb, 0x51, 0x11, 0xff, 0x3e, 0x2d, 0xe2, 0x8f, 0xb7, 0x8e, 0x92, + 0xbf, 0x91, 0x0b, 0xf2, 0x70, 0xdd, 0x61, 0xa4, 0x9f, 0x7f, 0x43, 0x5e, 0xa7, 0x0f, 0x47, 0xa2, + 0xcd, 0x67, 0xcd, 0x3d, 0xfd, 0xa1, 0x94, 0x24, 0x7b, 0xa0, 0x0a, 0x25, 0xc7, 0xf8, 0x71, 0x5a, + 0xe3, 0x65, 0xe3, 0xb8, 0xe3, 0xee, 0xc9, 0xc9, 0x9e, 0x34, 0x60, 0xa3, 0xac, 0xbf, 0x27, 0xf5, + 0x8d, 0x53, 0xc0, 0xc2, 0x2a, 0xf2, 0xbf, 0x67, 0xe1, 0x72, 0x24, 0x5e, 0x3d, 0xdf, 0x40, 0xd1, + 0xfb, 0xf1, 0x48, 0x31, 0x69, 0x35, 0x08, 0xc6, 0x91, 0x6f, 0xc7, 0xe3, 0xc8, 0xa4, 0xee, 0xa1, + 0x28, 0x13, 0x58, 0x00, 0x67, 0xa6, 0x5f, 0x00, 0xdf, 0x0b, 0xc7, 0xa6, 0x59, 0x9e, 0xac, 0x88, + 0xf6, 0x6c, 0x9a, 0xde, 0x9d, 0xdb, 0x5c, 0xe6, 0x40, 0xe0, 0xba, 0x1b, 0x30, 0x43, 0x6e, 0x0a, + 0x81, 0x7d, 0x23, 0xdd, 0x0b, 0x19, 0x69, 0x6e, 0x8a, 0xbe, 0xbe, 0xcd, 0xa2, 0xf1, 0x32, 0x7f, + 0xe6, 0x78, 0x29, 0x6f, 0x88, 0x5a, 0xf2, 0x14, 0xb7, 0x94, 0x7f, 0x9a, 0x81, 0xcb, 0xec, 0xaa, + 0x29, 0xc5, 0x2d, 0xbe, 0xfe, 0x75, 0x61, 0x36, 0xb6, 0x2e, 0x54, 0x22, 0xea, 0x0d, 0x7a, 0xf9, + 0x95, 0x98, 0x02, 0x0b, 0x5f, 0xab, 0x8a, 0xc2, 0x4b, 0x4a, 0x21, 0xb2, 0xa4, 0x54, 0x20, 0xcf, + 0xb7, 0x0c, 0xbd, 0x32, 0xb0, 0x75, 0x43, 0x7c, 0xcb, 0xf7, 0xe1, 0x4a, 0x8a, 0xe6, 0x46, 0x79, + 0x85, 0x29, 0x43, 0xc7, 0x0e, 0x5c, 0x66, 0xf7, 0x35, 0x2f, 0x1a, 0x83, 0x36, 0xe0, 0x4a, 0x0a, + 0x21, 0x26, 0xd2, 0xcd, 0x3f, 0x95, 0x60, 0x3e, 0xf8, 0xf4, 0x02, 0x2d, 0x02, 0x54, 0x3b, 0xea, + 0x7e, 0xeb, 0x41, 0xeb, 0xd1, 0xc7, 0xad, 0xd2, 0x39, 0x84, 0x60, 0xb1, 0xda, 0x51, 0x77, 0x9b, + 0xad, 0xfd, 0x5f, 0x51, 0xab, 0x0f, 0xeb, 0x77, 0x6e, 0x97, 0x24, 0xb4, 0x02, 0x4b, 0xd5, 0x8e, + 0x5a, 0xaf, 0x2a, 0x1f, 0x37, 0x5b, 0x1c, 0x98, 0x41, 0x15, 0x58, 0xab, 0x76, 0xd4, 0xda, 0xa3, + 0x56, 0xa7, 0xda, 0x6c, 0x35, 0x14, 0xb5, 0xdd, 0xe8, 0xa8, 0x9f, 0x54, 0x1f, 0xee, 0xb6, 0x4b, + 0x5b, 0xe8, 0x1a, 0x6c, 0xc4, 0xda, 0x3a, 0x8d, 0x87, 0x7b, 0xbb, 0xd5, 0x4e, 0x83, 0x23, 0xbd, + 0x87, 0xae, 0xc2, 0xe5, 0x18, 0x52, 0x90, 0x6f, 0xef, 0xe6, 0x1f, 0x4b, 0xb0, 0x10, 0x2a, 0x88, + 0x24, 0xd2, 0xd6, 0xda, 0x01, 0x69, 0xd9, 0xf7, 0xfd, 0x46, 0x75, 0xb7, 0x73, 0xff, 0x93, 0x92, + 0x84, 0x4a, 0x30, 0x4f, 0xdb, 0x05, 0x24, 0x43, 0x64, 0xaf, 0xb5, 0xd5, 0x7a, 0xb3, 0x5d, 0x7b, + 0xd4, 0x6a, 0x35, 0x6a, 0x9d, 0x46, 0xbd, 0x94, 0x45, 0x4b, 0x50, 0x24, 0x68, 0x7b, 0xf5, 0x6a, + 0xa7, 0xd9, 0xda, 0x29, 0xcd, 0xf0, 0x7e, 0x3e, 0xca, 0x2c, 0x5a, 0x85, 0x92, 0x40, 0x69, 0xa8, + 0x1f, 0x56, 0x9b, 0xbb, 0x8d, 0x7a, 0x29, 0xc7, 0x3b, 0xd6, 0x1b, 0x3b, 0x4a, 0xb5, 0xde, 0xa8, + 0x97, 0xe6, 0x6e, 0x1e, 0x40, 0x5e, 0x14, 0xd0, 0xa3, 0x65, 0x58, 0xd8, 0xbb, 0x5f, 0x6d, 0x37, + 0x02, 0xf2, 0x15, 0x61, 0x6e, 0xaf, 0xd1, 0xaa, 0x13, 0x26, 0x12, 0xf9, 0x50, 0xf6, 0x5b, 0x2d, + 0xf2, 0x91, 0x41, 0x0b, 0x50, 0x68, 0xef, 0xd7, 0x6a, 0x8d, 0x46, 0x9d, 0x4a, 0x04, 0x90, 0xe3, + 0x4c, 0x66, 0xc8, 0xa0, 0x3a, 0x0d, 0xe5, 0x61, 0xb3, 0x55, 0xa5, 0xa2, 0xdc, 0xfc, 0x2d, 0x09, + 0x16, 0xc3, 0x45, 0xe3, 0xe8, 0x12, 0x5c, 0x08, 0x28, 0xae, 0x43, 0x64, 0xf4, 0x99, 0x26, 0x34, + 0x0a, 0xbe, 0x12, 0x5a, 0x87, 0x4a, 0xb4, 0x31, 0xc0, 0x2c, 0x93, 0xd4, 0xf9, 0xe3, 0x6a, 0x93, + 0xaa, 0x29, 0x7b, 0x73, 0x27, 0x9c, 0x2f, 0xf4, 0x33, 0xa6, 0x44, 0x31, 0xd5, 0x90, 0x1f, 0xcd, + 0x43, 0x9e, 0x00, 0x1a, 0xf5, 0x66, 0xa7, 0x24, 0x51, 0x2f, 0xab, 0x76, 0xd4, 0x76, 0x63, 0xb7, + 0x51, 0xeb, 0x94, 0x32, 0x37, 0xbd, 0x30, 0x21, 0x3f, 0x83, 0x44, 0x09, 0x35, 0x1e, 0x84, 0x55, + 0x48, 0x00, 0x7b, 0x8f, 0xea, 0x4c, 0x85, 0xe4, 0xa3, 0xfd, 0xb8, 0x56, 0xca, 0x50, 0xa2, 0xe4, + 0xa3, 0xa6, 0x34, 0xf7, 0x3a, 0xa5, 0x2c, 0xd1, 0x3f, 0xf9, 0x6e, 0x55, 0x1f, 0x36, 0xda, 0x7b, + 0xd5, 0x5a, 0xa3, 0x34, 0x43, 0xa5, 0x20, 0xa0, 0x47, 0xf5, 0x46, 0x69, 0xf6, 0xa6, 0x0d, 0x17, + 0x52, 0x52, 0x84, 0x8c, 0x6d, 0xd0, 0xb3, 0x38, 0xc0, 0xb7, 0x1e, 0x07, 0xf8, 0x16, 0xa4, 0xec, + 0xdb, 0xc2, 0x37, 0xb2, 0x74, 0xe6, 0x34, 0xda, 0x41, 0x6d, 0xce, 0xdc, 0xdc, 0x04, 0xf0, 0x2f, + 0x45, 0x48, 0x8f, 0xbd, 0xe0, 0xd0, 0x4a, 0x30, 0xbf, 0xf7, 0x40, 0x55, 0x1a, 0x9d, 0x46, 0xab, + 0xd3, 0x7c, 0xd4, 0x2a, 0x49, 0x5b, 0x5f, 0xce, 0x40, 0x91, 0xbd, 0xa8, 0x75, 0x8e, 0xf5, 0x2e, + 0x46, 0x6f, 0xc3, 0x1c, 0x4f, 0x6b, 0xa0, 0xe8, 0xbc, 0xaf, 0x24, 0xa7, 0x32, 0xd0, 0x77, 0x69, + 0x79, 0x49, 0xf0, 0x59, 0x2e, 0xba, 0x16, 0xdd, 0xac, 0x26, 0xbc, 0xfe, 0xad, 0xbc, 0x3c, 0x1e, + 0x89, 0x87, 0x34, 0x0c, 0x28, 0xfe, 0xb6, 0x18, 0xbd, 0x92, 0x70, 0xb4, 0x4d, 0xe2, 0x71, 0x63, + 0x22, 0x1e, 0x67, 0x73, 0x40, 0xaf, 0x9e, 0xc2, 0x4f, 0x62, 0xd1, 0xf5, 0x24, 0x09, 0x63, 0x0f, + 0x76, 0x2b, 0xaf, 0x4c, 0x42, 0xf3, 0x79, 0xb4, 0x27, 0xf0, 0x68, 0x4f, 0xc7, 0x23, 0xf5, 0xf5, + 0x2e, 0xaa, 0x01, 0xf8, 0xa3, 0x44, 0xeb, 0x29, 0xc3, 0x17, 0x54, 0x53, 0x2c, 0xfa, 0x10, 0xc0, + 0x7f, 0x79, 0x1e, 0x21, 0x12, 0x7b, 0xd0, 0x5e, 0xd9, 0x48, 0x6d, 0x67, 0x32, 0x6d, 0xfd, 0xd3, + 0x1c, 0xac, 0x3c, 0x72, 0xfa, 0x9a, 0xa9, 0x7f, 0xae, 0xd1, 0x15, 0x82, 0xfb, 0xda, 0x43, 0x00, + 0xff, 0x09, 0x70, 0x84, 0x4d, 0xec, 0x09, 0x72, 0x84, 0x4d, 0xc2, 0xdb, 0xe1, 0x5b, 0x90, 0x63, + 0x97, 0x43, 0x71, 0xcf, 0x5d, 0x0d, 0xf5, 0x15, 0x19, 0xd5, 0x7b, 0x50, 0x18, 0x65, 0x30, 0x51, + 0xb8, 0xe2, 0x27, 0x9a, 0xd9, 0xac, 0x44, 0x49, 0xa2, 0x0f, 0xa0, 0x30, 0x4a, 0x67, 0x46, 0x3a, + 0x47, 0xd3, 0x9c, 0x29, 0xec, 0x1f, 0xd3, 0xb2, 0x1f, 0x3f, 0x83, 0x88, 0x5e, 0x4a, 0xf2, 0xa3, + 0x50, 0xa2, 0xb2, 0x22, 0x8f, 0x43, 0xf1, 0xdd, 0x2c, 0x96, 0x01, 0x8c, 0xb8, 0x59, 0x5a, 0xce, + 0x31, 0xe2, 0x66, 0xe9, 0x89, 0xc4, 0xef, 0xc2, 0x52, 0x24, 0x65, 0x15, 0x99, 0xf3, 0xc9, 0xd9, + 0xb4, 0xc8, 0x9c, 0x4f, 0xcb, 0x7a, 0x61, 0xf1, 0x97, 0x0f, 0x42, 0x0c, 0x5e, 0x49, 0xf0, 0xb3, + 0x24, 0x1e, 0x37, 0x26, 0xe2, 0x71, 0x36, 0x2a, 0x2d, 0x58, 0x0b, 0x25, 0x88, 0xd0, 0xcb, 0x09, + 0x97, 0x8d, 0xb1, 0xac, 0x55, 0xe5, 0xfa, 0x04, 0x2c, 0xce, 0xa0, 0x03, 0xcb, 0xb1, 0xa4, 0x6a, + 0xc4, 0x12, 0x69, 0x49, 0xd7, 0x4a, 0x39, 0xc1, 0xdd, 0x19, 0x81, 0x0f, 0xe0, 0xbc, 0x82, 0x8f, + 0xad, 0x27, 0xb8, 0x6a, 0x18, 0x01, 0xb8, 0x1b, 0x77, 0xfb, 0xb5, 0xd8, 0xb6, 0xbf, 0x31, 0xb0, + 0xbd, 0x13, 0xb4, 0x0f, 0xcb, 0xb1, 0x4c, 0x2b, 0x4a, 0x65, 0x18, 0x71, 0x8a, 0xd4, 0x1c, 0xed, + 0xd6, 0x47, 0x50, 0xac, 0x0e, 0xbd, 0x23, 0x31, 0xbd, 0xef, 0xc1, 0x2c, 0x7d, 0x61, 0x8f, 0xc2, + 0x2f, 0xa4, 0x82, 0x0f, 0xf5, 0x2b, 0x17, 0x92, 0x9a, 0x6c, 0xe3, 0x64, 0xeb, 0x37, 0x24, 0x28, + 0xf3, 0xe4, 0xcc, 0x40, 0xeb, 0x63, 0x42, 0xd7, 0x72, 0x78, 0xfc, 0x40, 0x47, 0xb0, 0x92, 0xf0, + 0xb4, 0x1e, 0xdd, 0x88, 0x5a, 0x25, 0xe5, 0x69, 0x7e, 0xe5, 0xd5, 0xc9, 0x88, 0x7c, 0x48, 0x7f, + 0x15, 0x78, 0x39, 0xdf, 0x71, 0xb4, 0xee, 0x13, 0xec, 0xa0, 0x3d, 0xba, 0xde, 0x05, 0xdf, 0x58, + 0xc7, 0xd7, 0xbb, 0x84, 0x17, 0xd8, 0x11, 0x8b, 0x06, 0x9f, 0xf9, 0xb3, 0x15, 0x34, 0xf8, 0xfc, + 0x38, 0x4e, 0x31, 0xe1, 0xf5, 0x74, 0x7c, 0x05, 0x4d, 0x7a, 0xc1, 0xbc, 0xf5, 0xe7, 0x33, 0xb0, + 0xcc, 0xdf, 0x4a, 0x04, 0x5e, 0xd3, 0x3d, 0x86, 0x85, 0xd0, 0x63, 0xe2, 0x48, 0xf4, 0x49, 0x7a, + 0x80, 0x1c, 0x89, 0x3e, 0xc9, 0x6f, 0x91, 0x3f, 0xa1, 0x55, 0x84, 0x41, 0x4e, 0xb1, 0x98, 0x15, + 0x7f, 0x17, 0x5b, 0xb9, 0x36, 0x16, 0x87, 0x93, 0xfe, 0x8c, 0x26, 0x74, 0x13, 0x1f, 0xb5, 0xa0, + 0x37, 0x52, 0x08, 0x24, 0xbe, 0xa3, 0xa9, 0xbc, 0x39, 0x25, 0x36, 0x67, 0xfc, 0xb9, 0xf8, 0x93, + 0x2b, 0x09, 0x2f, 0x4f, 0xd0, 0x9b, 0x09, 0xb1, 0x3f, 0xfd, 0xd1, 0x4c, 0x65, 0x73, 0x5a, 0x74, + 0xce, 0xfb, 0x53, 0x58, 0x4b, 0x7e, 0xfc, 0x8c, 0x6e, 0x26, 0x2e, 0x3a, 0x89, 0x0f, 0xb8, 0x2b, + 0xaf, 0x4f, 0x85, 0xcb, 0x1d, 0xe6, 0x2f, 0xb2, 0x50, 0x61, 0xb2, 0x84, 0x1f, 0x30, 0x68, 0xa6, + 0xd6, 0xc7, 0x0e, 0x7a, 0x08, 0x39, 0x66, 0xfa, 0xc8, 0x84, 0x4b, 0x7f, 0x71, 0x51, 0x19, 0xf3, + 0x04, 0x00, 0xed, 0xc3, 0x0c, 0x9d, 0x43, 0xd7, 0x23, 0x25, 0xb7, 0xc9, 0x8f, 0x31, 0x22, 0xc1, + 0x28, 0xfd, 0x5d, 0x86, 0x02, 0xd9, 0x1d, 0xec, 0xc5, 0xe3, 0x79, 0x22, 0xd1, 0xeb, 0x13, 0xb0, + 0x38, 0xcd, 0xb7, 0x21, 0xc7, 0x96, 0x93, 0xe9, 0x43, 0xed, 0x91, 0xa8, 0xf1, 0x8e, 0xbc, 0xc9, + 0x89, 0xc4, 0xbd, 0xb4, 0xa7, 0x17, 0x91, 0x50, 0x35, 0xe6, 0xcd, 0xc5, 0xd6, 0x3f, 0x67, 0x60, + 0x81, 0xd7, 0xb7, 0x73, 0x43, 0xfd, 0xbf, 0x91, 0xa1, 0xae, 0x26, 0x18, 0x2a, 0x54, 0x74, 0x5e, + 0x49, 0xaa, 0x1e, 0x47, 0x3b, 0xdc, 0x34, 0xeb, 0x31, 0x9d, 0x87, 0x3b, 0x6f, 0xa4, 0xb6, 0x73, + 0xc5, 0xd5, 0x99, 0x31, 0xae, 0xc4, 0xc2, 0x64, 0x88, 0xcc, 0x7a, 0x5a, 0xf3, 0xf3, 0xab, 0xbf, + 0x0d, 0xf3, 0xc1, 0xca, 0xf9, 0x88, 0x22, 0x12, 0xaa, 0xef, 0x2b, 0x2f, 0x8d, 0xc1, 0xe0, 0x9a, + 0xfe, 0x87, 0x0c, 0x14, 0x78, 0x9d, 0x71, 0xdf, 0x41, 0x0f, 0x60, 0x3e, 0x58, 0xf6, 0x8e, 0x2e, + 0x47, 0x47, 0x11, 0x2c, 0xbc, 0xaf, 0x5c, 0x19, 0xd3, 0xea, 0xda, 0xe8, 0x57, 0xe9, 0xca, 0x16, + 0x2d, 0x52, 0x8f, 0xaf, 0x06, 0x09, 0x35, 0xf1, 0xf1, 0xd5, 0x20, 0xb1, 0xd6, 0xbd, 0x01, 0xe0, + 0x57, 0x79, 0xa3, 0x4a, 0xb4, 0x8f, 0x7f, 0xff, 0x5d, 0xb9, 0x94, 0xda, 0xe6, 0xda, 0xe8, 0x3b, + 0xf4, 0xbc, 0x14, 0x2e, 0xd0, 0x8e, 0x6f, 0x60, 0x63, 0x35, 0xe0, 0xf1, 0x0d, 0x6c, 0xbc, 0xc6, + 0x7b, 0xeb, 0x6f, 0x23, 0xe5, 0xd8, 0x62, 0x43, 0xd1, 0x86, 0xf9, 0x20, 0x38, 0x62, 0xcc, 0x84, + 0x02, 0xee, 0x88, 0x31, 0x13, 0x4b, 0x71, 0x0f, 0x60, 0x39, 0x56, 0xfc, 0x19, 0x89, 0x45, 0x69, + 0x75, 0xb1, 0x91, 0x58, 0x94, 0x5a, 0x43, 0xba, 0xf5, 0x77, 0x12, 0x2c, 0xb0, 0xb0, 0x2e, 0x86, + 0xa2, 0xd2, 0x3a, 0x85, 0x48, 0x95, 0x48, 0xc4, 0xcc, 0xc9, 0x25, 0x36, 0x11, 0x33, 0xa7, 0x55, + 0xaa, 0x60, 0x5a, 0xe9, 0x18, 0xab, 0xd8, 0x88, 0xee, 0x3e, 0x53, 0xaa, 0x3d, 0x22, 0x23, 0x4b, + 0x2d, 0xfc, 0xd8, 0xfa, 0xc5, 0x1c, 0x2c, 0xb0, 0xfb, 0x86, 0xc0, 0xa1, 0xce, 0xaf, 0xc0, 0x40, + 0xb1, 0x29, 0x1d, 0x2e, 0xee, 0x88, 0x44, 0x8e, 0x84, 0xd2, 0x8d, 0x4f, 0xe9, 0x13, 0x90, 0x84, + 0x5c, 0x57, 0x64, 0xf9, 0x1b, 0x9b, 0xf1, 0x8c, 0x2c, 0x7f, 0x13, 0x52, 0x6f, 0xdf, 0x93, 0x68, + 0xd2, 0x27, 0xad, 0xca, 0x00, 0xdd, 0x9a, 0xbe, 0x1e, 0x81, 0x71, 0x7f, 0xeb, 0xac, 0x05, 0x0c, + 0x54, 0x84, 0x31, 0xa9, 0xde, 0x88, 0x08, 0x93, 0x33, 0xfb, 0x11, 0x11, 0xa6, 0xc8, 0x22, 0xf3, + 0x3d, 0x76, 0x34, 0xf3, 0x15, 0xdf, 0x63, 0xa7, 0x64, 0xce, 0xe2, 0x7b, 0xec, 0xd4, 0x24, 0x1a, + 0xa6, 0x73, 0x21, 0x9a, 0x59, 0x7e, 0x65, 0x42, 0xff, 0xe4, 0xd3, 0xde, 0x98, 0x74, 0x98, 0x09, + 0xe7, 0x13, 0x13, 0x13, 0xe8, 0xb5, 0x71, 0xba, 0x09, 0x33, 0xbb, 0x39, 0x0d, 0xaa, 0xcf, 0x2f, + 0xf1, 0xb2, 0x3e, 0xc2, 0x6f, 0x5c, 0x2a, 0x24, 0xc2, 0x6f, 0xfc, 0xdd, 0xbf, 0x09, 0xe7, 0x13, + 0x6f, 0xe2, 0x23, 0xfc, 0xc6, 0x5d, 0xfb, 0x47, 0xf8, 0x8d, 0xbd, 0xd8, 0xdf, 0x7e, 0xff, 0x8b, + 0x2f, 0xd7, 0xcf, 0xfd, 0xec, 0xcb, 0xf5, 0x73, 0x3f, 0xff, 0x72, 0x5d, 0xfa, 0xde, 0xe9, 0xba, + 0xf4, 0x93, 0xd3, 0x75, 0xe9, 0x6f, 0x4e, 0xd7, 0xa5, 0x2f, 0x4e, 0xd7, 0xa5, 0x7f, 0x3c, 0x5d, + 0x97, 0xfe, 0xe5, 0x74, 0xfd, 0xdc, 0xcf, 0x4f, 0xd7, 0xa5, 0x1f, 0x7c, 0xb5, 0x7e, 0xee, 0x8b, + 0xaf, 0xd6, 0xcf, 0xfd, 0xec, 0xab, 0xf5, 0x73, 0xdf, 0x99, 0xe3, 0x7f, 0xdf, 0xf2, 0x20, 0x47, + 0x57, 0xea, 0x6f, 0xfc, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2f, 0xa1, 0x2a, 0x22, 0xff, 0x52, + 0x00, 0x00, } func (x ArtifactType) String() string { diff --git a/src/api/proto/cloudpb/cloudapi.proto b/src/api/proto/cloudpb/cloudapi.proto index 2e08ca6dde9..80fad37eaac 100644 --- a/src/api/proto/cloudpb/cloudapi.proto +++ b/src/api/proto/cloudpb/cloudapi.proto @@ -28,7 +28,7 @@ option go_package = "cloudpb"; // * Please do not include dependencies that are outside of src/api // * and only include protobufs that are useful to external-facing users. // -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; diff --git a/src/api/proto/vispb/BUILD.bazel b/src/api/proto/vispb/BUILD.bazel index 12f10a48dbd..c40a3cce933 100644 --- a/src/api/proto/vispb/BUILD.bazel +++ b/src/api/proto/vispb/BUILD.bazel @@ -21,7 +21,7 @@ pl_proto_library( srcs = ["vis.proto"], visibility = ["//src:__subpackages__"], deps = [ - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/api/proto/vispb/vis.pb.go b/src/api/proto/vispb/vis.pb.go index 4a39e0e57a9..e90e2c72a0e 100755 --- a/src/api/proto/vispb/vis.pb.go +++ b/src/api/proto/vispb/vis.pb.go @@ -1947,130 +1947,129 @@ func init() { func init() { proto.RegisterFile("src/api/proto/vispb/vis.proto", fileDescriptor_c1b4dce3e9f2d6af) } var fileDescriptor_c1b4dce3e9f2d6af = []byte{ - // 1963 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4b, 0x8f, 0x1b, 0x59, - 0x15, 0x76, 0xb5, 0xed, 0xb6, 0x7d, 0xfc, 0xaa, 0x5c, 0x42, 0xc6, 0xe3, 0x49, 0x9c, 0x1e, 0x33, - 0x41, 0xdd, 0x49, 0x70, 0x87, 0x66, 0xc2, 0x24, 0x8a, 0x90, 0xb0, 0xbb, 0xdd, 0x0f, 0xd1, 0xb1, - 0xad, 0xb2, 0xe9, 0xb4, 0x10, 0x52, 0xa9, 0x5c, 0x75, 0xbb, 0x5c, 0x60, 0xd7, 0x2d, 0xaa, 0xae, - 0xbb, 0xdb, 0xac, 0x66, 0xc7, 0x96, 0x25, 0x4b, 0xc4, 0x0a, 0x09, 0xf1, 0x3f, 0x10, 0x02, 0x29, - 0xb3, 0x1b, 0x76, 0xa4, 0xb3, 0x19, 0x1e, 0x12, 0x23, 0xf1, 0x07, 0xd0, 0x7d, 0xd4, 0xc3, 0x8e, - 0x35, 0x62, 0x35, 0x9b, 0xee, 0x3a, 0xe7, 0xfb, 0xce, 0xf3, 0x9e, 0x5b, 0x75, 0x0c, 0xf7, 0x02, - 0xdf, 0xdc, 0x35, 0x3c, 0x67, 0xd7, 0xf3, 0x09, 0x25, 0xbb, 0x97, 0x4e, 0xe0, 0x8d, 0xd9, 0xdf, - 0x16, 0x97, 0x51, 0xde, 0xbb, 0x6e, 0x71, 0x5d, 0xfd, 0x7d, 0x9b, 0x10, 0x7b, 0x8a, 0x05, 0x6f, - 0x3c, 0xbf, 0xd8, 0x35, 0xdc, 0x85, 0x20, 0xd5, 0x1b, 0xab, 0xd0, 0x95, 0x6f, 0x78, 0x1e, 0xf6, - 0xa5, 0x93, 0xfa, 0x77, 0x6c, 0x87, 0x4e, 0xe6, 0xe3, 0x96, 0x49, 0x66, 0xbb, 0x36, 0xb1, 0x49, - 0x4c, 0x64, 0x92, 0x08, 0xcc, 0x9e, 0x04, 0xbd, 0xf9, 0xd7, 0x34, 0xa4, 0xcf, 0x9c, 0x00, 0x7d, - 0x0c, 0x85, 0x4b, 0xc3, 0x77, 0x8c, 0xf1, 0x14, 0x07, 0x35, 0x65, 0x2b, 0xbd, 0x5d, 0xdc, 0xbb, - 0xd3, 0x0a, 0xf3, 0x69, 0x9d, 0x39, 0x41, 0xeb, 0x4c, 0xc2, 0x5a, 0x4c, 0x44, 0x0f, 0x21, 0x77, - 0xe5, 0x58, 0x36, 0xa6, 0x41, 0x6d, 0x83, 0xdb, 0xa8, 0xb1, 0xcd, 0x2b, 0x0e, 0x68, 0x21, 0x01, - 0xbd, 0x80, 0x92, 0x3d, 0x25, 0x63, 0x63, 0xaa, 0x5f, 0xcc, 0x5d, 0x33, 0xa8, 0xa5, 0xb9, 0x41, - 0x6d, 0x39, 0xc8, 0x11, 0x67, 0x1c, 0xce, 0x5d, 0x53, 0x2b, 0xda, 0xd1, 0x73, 0x50, 0xff, 0x8b, - 0x02, 0xf9, 0x30, 0x01, 0x84, 0x20, 0xe3, 0x1a, 0x33, 0x5c, 0x53, 0xb6, 0x94, 0xed, 0x82, 0xc6, - 0x9f, 0xd1, 0x47, 0x90, 0xa1, 0x0b, 0x0f, 0xd7, 0x36, 0xb6, 0x94, 0xed, 0x4a, 0x32, 0x8d, 0xc1, - 0xf9, 0x68, 0xe1, 0x61, 0x8d, 0xa3, 0xa8, 0x0d, 0x65, 0x0b, 0x5f, 0x18, 0xf3, 0x29, 0xd5, 0x2f, - 0x8d, 0xe9, 0x1c, 0xd7, 0xd2, 0x5b, 0xca, 0x76, 0x71, 0xef, 0x6e, 0x4b, 0x34, 0xb5, 0x15, 0xf6, - 0xaa, 0x35, 0xa4, 0xbe, 0xe3, 0xda, 0x67, 0x8c, 0xa3, 0x95, 0xa4, 0x09, 0x97, 0xd0, 0x16, 0x14, - 0x2d, 0x1c, 0x98, 0xbe, 0xe3, 0x51, 0x87, 0xb8, 0xb5, 0x0c, 0xcf, 0x21, 0xa9, 0x42, 0x1f, 0x42, - 0xe9, 0xd2, 0x98, 0x3a, 0x96, 0x08, 0x11, 0xd4, 0xb2, 0x5b, 0x69, 0x46, 0xe1, 0x3a, 0xee, 0x23, - 0xa8, 0x9f, 0x03, 0xc4, 0x95, 0xa2, 0xfb, 0x50, 0x24, 0x73, 0xea, 0xcd, 0xa9, 0x9e, 0x28, 0x0b, - 0x84, 0xaa, 0xc7, 0x8a, 0xdb, 0x81, 0x0c, 0xeb, 0x19, 0x2f, 0xae, 0xb8, 0xf7, 0xcd, 0xd5, 0x1e, - 0xb7, 0x78, 0xbf, 0x38, 0xa5, 0xf9, 0xdf, 0x34, 0x6c, 0x0a, 0xed, 0xda, 0x36, 0x3d, 0x85, 0xbc, - 0x47, 0x02, 0x87, 0xa7, 0x2e, 0xbc, 0xbd, 0xff, 0x8e, 0xb7, 0x81, 0x24, 0x68, 0x11, 0x15, 0x3d, - 0x92, 0x09, 0xa4, 0xbf, 0x22, 0x81, 0xe3, 0x94, 0x48, 0x01, 0x7d, 0x02, 0xef, 0x25, 0x0e, 0x5a, - 0x4f, 0x96, 0x96, 0x65, 0xa9, 0x1c, 0xa7, 0xb4, 0xdb, 0xf1, 0xd9, 0xf6, 0xe3, 0x32, 0x3f, 0x81, - 0x92, 0xe5, 0x04, 0xde, 0xd4, 0x58, 0xe8, 0x81, 0x87, 0x4d, 0xde, 0xdb, 0xe2, 0xde, 0xed, 0x77, - 0x0e, 0xa7, 0xed, 0x2e, 0xb4, 0xa2, 0x64, 0x0e, 0x3d, 0x6c, 0xd6, 0x3b, 0x90, 0x0f, 0x93, 0x46, - 0x25, 0x50, 0xae, 0x79, 0xc9, 0x59, 0x4d, 0xb9, 0x66, 0xd2, 0x82, 0x17, 0x9a, 0xd5, 0x94, 0x05, - 0x93, 0xae, 0x78, 0x0d, 0x59, 0x4d, 0xb9, 0x62, 0xd2, 0x84, 0xc7, 0xc8, 0x6a, 0xca, 0xa4, 0xfe, - 0x07, 0x05, 0x32, 0xfc, 0x34, 0xd6, 0xb5, 0xed, 0xbb, 0x90, 0x31, 0x7c, 0x3b, 0x1c, 0xf2, 0x7b, - 0x6b, 0xeb, 0xe7, 0x7f, 0xda, 0xbe, 0xad, 0x71, 0x6a, 0xfd, 0xa7, 0x90, 0x93, 0x8a, 0xb5, 0x1e, - 0xef, 0x40, 0x56, 0x4c, 0xe0, 0x86, 0x6c, 0x89, 0x10, 0xd1, 0x5d, 0xc8, 0x87, 0xd7, 0x8b, 0x67, - 0xca, 0xa0, 0x48, 0xd3, 0xc9, 0x41, 0xd6, 0x71, 0xbd, 0x39, 0xed, 0x94, 0xa1, 0x28, 0x9a, 0xeb, - 0xeb, 0x3e, 0xbe, 0x68, 0xde, 0x85, 0x4c, 0xfb, 0xda, 0x09, 0xd0, 0x6d, 0xc8, 0x4e, 0x8d, 0x31, - 0x9e, 0xca, 0x50, 0x42, 0x68, 0xfe, 0x6e, 0x03, 0xf2, 0x1d, 0xc3, 0xdf, 0x9f, 0x18, 0x3e, 0x45, - 0xdb, 0x90, 0x1e, 0x1b, 0x3e, 0x27, 0x2c, 0x5d, 0xf1, 0x90, 0xc0, 0x1e, 0x34, 0x46, 0x61, 0xce, - 0xa8, 0x43, 0xa7, 0x32, 0x45, 0x4d, 0x08, 0xe8, 0x01, 0x6c, 0x5e, 0xeb, 0xc6, 0xb5, 0x13, 0xc8, - 0x61, 0xa8, 0xc4, 0x2e, 0x58, 0x0a, 0x5a, 0xf6, 0x9a, 0x67, 0xf2, 0x00, 0x36, 0x17, 0x82, 0x96, - 0x59, 0x4f, 0x5b, 0xb0, 0x7f, 0xf5, 0x5f, 0x29, 0x90, 0xee, 0x88, 0x58, 0xa2, 0x1d, 0x32, 0x71, - 0xd1, 0x8c, 0xa8, 0x9c, 0x8d, 0x44, 0x39, 0xe8, 0x7d, 0xc8, 0x07, 0xd4, 0x30, 0x7f, 0xae, 0x8f, - 0x17, 0xa2, 0x45, 0x5a, 0x8e, 0xcb, 0x9d, 0x05, 0x83, 0x6c, 0x9f, 0xcc, 0x3d, 0x06, 0x89, 0x9b, - 0x99, 0xe3, 0x72, 0x67, 0x81, 0x1a, 0x00, 0x13, 0xe2, 0x3b, 0xbf, 0x24, 0x2e, 0x35, 0xa6, 0x7c, - 0x10, 0xf3, 0x5a, 0x42, 0xd3, 0x3c, 0x85, 0xfc, 0xc0, 0xc1, 0xa2, 0x47, 0x6b, 0xdb, 0x18, 0xe7, - 0xb8, 0xb1, 0x92, 0xa3, 0xe8, 0x52, 0x3a, 0xd1, 0xa5, 0xe6, 0x67, 0x1b, 0x50, 0x39, 0x76, 0x02, - 0x4a, 0x6c, 0xdf, 0x98, 0x09, 0xa7, 0x3f, 0x84, 0xc2, 0x24, 0xd4, 0xc8, 0xf6, 0x37, 0xe3, 0xa6, - 0x2c, 0x93, 0x63, 0x51, 0x8b, 0x8d, 0xbe, 0x96, 0x03, 0xf9, 0x8d, 0x02, 0x85, 0xe3, 0x64, 0xc4, - 0x35, 0xc7, 0x52, 0x83, 0xdc, 0xcc, 0xb8, 0x1e, 0x3b, 0x6e, 0xc0, 0x33, 0x49, 0x6b, 0xa1, 0xc8, - 0x11, 0xc7, 0x0d, 0x28, 0xf6, 0x78, 0x32, 0x8a, 0x16, 0x8a, 0x2b, 0xed, 0xcf, 0xac, 0xb6, 0x9f, - 0xbd, 0x34, 0x3d, 0x1f, 0x8f, 0x1d, 0x57, 0x37, 0xc9, 0xdc, 0xa5, 0xe2, 0x4d, 0xa1, 0x15, 0x85, - 0x6e, 0x9f, 0xa9, 0x9a, 0xcf, 0x00, 0x8e, 0x8c, 0xb9, 0x1d, 0x9f, 0xd1, 0xfa, 0x89, 0x79, 0xb7, - 0x45, 0xcd, 0x3f, 0xa6, 0xa1, 0x3a, 0x72, 0x66, 0x38, 0xc0, 0xbe, 0x83, 0x03, 0x61, 0x7f, 0x00, - 0x40, 0x23, 0x95, 0xfc, 0xe2, 0x7d, 0x14, 0xf7, 0x64, 0x85, 0x9e, 0x90, 0xb5, 0x84, 0xdd, 0xd7, - 0x72, 0x24, 0xff, 0x51, 0x00, 0x46, 0x4b, 0x21, 0xd7, 0x14, 0x7e, 0x07, 0x36, 0x65, 0x29, 0x22, - 0x13, 0x29, 0xa1, 0x6f, 0x43, 0x35, 0xbc, 0x2c, 0xba, 0x24, 0xa4, 0x79, 0xf3, 0xcb, 0xf2, 0xce, - 0x0c, 0x05, 0xef, 0x07, 0x90, 0x99, 0x11, 0x0b, 0xf3, 0x4c, 0x2a, 0x7b, 0x3b, 0xff, 0x4f, 0x23, - 0x5a, 0x2f, 0x89, 0x85, 0x35, 0x6e, 0xd6, 0x3c, 0x85, 0x0c, 0x93, 0x90, 0x0a, 0xa5, 0x97, 0xfd, - 0x83, 0xae, 0xfe, 0xe3, 0xde, 0x8f, 0x7a, 0xfd, 0x57, 0x3d, 0x35, 0x85, 0xca, 0x50, 0xe0, 0x9a, - 0xd3, 0x93, 0x5e, 0x57, 0xdd, 0x40, 0x15, 0x00, 0x2e, 0x0e, 0xfa, 0x27, 0xbd, 0x91, 0x9a, 0x8e, - 0xe0, 0xb6, 0xd6, 0x6d, 0xab, 0x99, 0x66, 0x26, 0xaf, 0xa8, 0x4a, 0x73, 0x06, 0x85, 0x21, 0x35, - 0xa8, 0x38, 0xa8, 0xc7, 0x90, 0x09, 0xa8, 0x41, 0xe5, 0x95, 0x49, 0xec, 0x0b, 0x11, 0x85, 0x3f, - 0x69, 0x9c, 0xb5, 0xfe, 0x40, 0xea, 0x77, 0x21, 0x33, 0x94, 0xe8, 0xbb, 0xbd, 0x6b, 0xde, 0x87, - 0xc2, 0x08, 0x5f, 0xcb, 0x70, 0x08, 0x32, 0x63, 0x62, 0x2d, 0xc2, 0x97, 0x35, 0x7b, 0x66, 0x84, - 0x33, 0x6c, 0x1b, 0x11, 0x81, 0x7f, 0x9d, 0x24, 0x81, 0x3d, 0x37, 0x1f, 0x43, 0x76, 0xc4, 0x57, - 0x93, 0x6f, 0x41, 0xd9, 0x9e, 0x53, 0x8a, 0x7d, 0xdd, 0x24, 0xd3, 0xf9, 0xcc, 0x95, 0xac, 0x92, - 0x50, 0xee, 0x73, 0x5d, 0xf3, 0xd3, 0x2c, 0x64, 0x8f, 0x7c, 0xc3, 0x9b, 0xa0, 0xfb, 0x00, 0x16, - 0xa1, 0x4b, 0xdc, 0xe3, 0x94, 0x56, 0xb0, 0x08, 0x15, 0x54, 0x74, 0x08, 0x15, 0xc3, 0xfa, 0x99, - 0x61, 0x62, 0xd7, 0x5c, 0xe8, 0x53, 0x27, 0xa0, 0xf2, 0xab, 0x9d, 0xf8, 0x04, 0x71, 0x4f, 0xad, - 0x76, 0xc8, 0x3a, 0x75, 0x02, 0x7a, 0x9c, 0xd2, 0xca, 0x46, 0x52, 0x81, 0x1e, 0x03, 0xc2, 0x96, - 0x8d, 0xf5, 0x2b, 0xec, 0xd8, 0x93, 0x28, 0xa0, 0x78, 0x65, 0xa9, 0x0c, 0x79, 0xc5, 0x01, 0x19, - 0xf5, 0x31, 0x20, 0x97, 0x58, 0xab, 0x6c, 0xf1, 0x42, 0x55, 0x19, 0xb2, 0xc4, 0x7e, 0x08, 0xb7, - 0xb8, 0x6f, 0x93, 0x4c, 0x49, 0x54, 0xb7, 0xb8, 0xbf, 0x55, 0x06, 0xec, 0x33, 0xbd, 0xe4, 0x1e, - 0x01, 0x57, 0xe9, 0x74, 0xe2, 0xe3, 0x60, 0x42, 0xa6, 0x56, 0x50, 0xdb, 0xe4, 0x05, 0x35, 0x56, - 0x0b, 0xea, 0x5a, 0x36, 0x1e, 0x45, 0x2c, 0xad, 0x82, 0x97, 0x64, 0x36, 0xd7, 0xdc, 0xd1, 0x84, - 0x5c, 0x62, 0x5f, 0x77, 0xdc, 0x0b, 0x52, 0xcb, 0xf1, 0x3d, 0xab, 0xcc, 0xd4, 0xc7, 0x4c, 0x7b, - 0xe2, 0x5e, 0x10, 0xb6, 0x5b, 0x71, 0xde, 0x14, 0xbb, 0x36, 0x9d, 0xd4, 0xf2, 0xfc, 0x7d, 0x05, - 0x4c, 0x75, 0xca, 0x35, 0xe8, 0x19, 0xd4, 0xb0, 0xcb, 0xce, 0x4e, 0x0f, 0x37, 0xc3, 0x89, 0x83, - 0x7d, 0xc3, 0x37, 0x27, 0x8b, 0x5a, 0x81, 0xdf, 0x94, 0x3b, 0x02, 0x3f, 0x10, 0xf0, 0x71, 0x88, - 0xd6, 0x5f, 0x42, 0x79, 0xa9, 0xeb, 0x2c, 0xd6, 0x85, 0x4f, 0x66, 0xcb, 0x47, 0x0f, 0x4c, 0x25, - 0xab, 0xff, 0x00, 0x0a, 0x94, 0x84, 0xb0, 0x18, 0xd0, 0x3c, 0x25, 0x02, 0xac, 0x8f, 0xa1, 0xb2, - 0x5c, 0x33, 0xda, 0x01, 0x75, 0x86, 0x2d, 0x67, 0x3e, 0x8b, 0xdb, 0xc5, 0x9d, 0xa6, 0xb5, 0xaa, - 0xd0, 0x47, 0x5c, 0xf4, 0x00, 0x2a, 0x13, 0xc7, 0x9e, 0x24, 0x88, 0xe2, 0xcd, 0x5c, 0x66, 0xda, - 0x88, 0x16, 0xed, 0x0f, 0xcd, 0xbf, 0x65, 0xa1, 0xa4, 0xe1, 0x5f, 0xcc, 0x71, 0x40, 0xc5, 0x24, - 0x3e, 0x81, 0xdb, 0xbe, 0x90, 0x89, 0xaf, 0x7b, 0xc4, 0x5a, 0x2e, 0x02, 0x45, 0xd8, 0x80, 0x58, - 0xb2, 0x18, 0x6e, 0x11, 0x78, 0xc4, 0xb5, 0xf0, 0x92, 0xc5, 0x46, 0x68, 0x21, 0xb1, 0xd8, 0xe2, - 0x19, 0xd4, 0xe2, 0x18, 0x01, 0xf6, 0x2f, 0x1d, 0x13, 0x2f, 0x8f, 0xe2, 0x9d, 0x08, 0x1f, 0x0a, - 0x38, 0x69, 0x19, 0xc6, 0x5a, 0xb1, 0xcc, 0x84, 0x96, 0x12, 0x5f, 0xb6, 0xdc, 0x4d, 0xd6, 0xe5, - 0xe8, 0x5e, 0x68, 0x55, 0xe6, 0x56, 0xb7, 0x22, 0xec, 0x64, 0x90, 0x34, 0x08, 0x43, 0x25, 0x0c, - 0x2a, 0xa1, 0x81, 0xc4, 0x22, 0x83, 0x7b, 0x00, 0xde, 0xd3, 0x27, 0xcb, 0x73, 0x5f, 0xf0, 0x9e, - 0x3e, 0x49, 0xc0, 0xcf, 0x23, 0x78, 0x53, 0xc2, 0xcf, 0x97, 0xe0, 0xe7, 0x21, 0x9c, 0x0b, 0xe1, - 0xe7, 0x89, 0xbb, 0xe5, 0xfb, 0x6c, 0xcb, 0x33, 0x68, 0x54, 0x71, 0x5e, 0xde, 0x2d, 0x06, 0x68, - 0x06, 0x0d, 0x4b, 0x7d, 0x01, 0x75, 0x59, 0x4e, 0xa0, 0x7b, 0xbc, 0x4f, 0x26, 0x71, 0xa3, 0x63, - 0x29, 0x70, 0xa3, 0xf7, 0x42, 0xc6, 0x80, 0x35, 0x8a, 0xe1, 0xd2, 0xf8, 0x00, 0xee, 0x3b, 0xee, - 0x98, 0xcc, 0x5d, 0x4b, 0x1f, 0x2f, 0x28, 0x5e, 0xe7, 0x01, 0xb8, 0x87, 0x0f, 0x24, 0xad, 0xc3, - 0x58, 0xab, 0x5e, 0x0e, 0x61, 0x8b, 0xcc, 0xe9, 0x57, 0xbb, 0x29, 0x72, 0x37, 0x77, 0x43, 0xde, - 0x5a, 0x3f, 0x2f, 0xa0, 0x4e, 0x09, 0x35, 0xa6, 0xba, 0x4c, 0x57, 0x2c, 0x05, 0xa1, 0x87, 0x92, - 0x28, 0x85, 0x33, 0xe4, 0x10, 0xf3, 0x0d, 0x41, 0xbe, 0x5e, 0x7f, 0x9b, 0x86, 0xdb, 0x43, 0xf6, - 0x71, 0x1b, 0xf9, 0x86, 0x89, 0x0f, 0xa7, 0xc6, 0x0c, 0x8b, 0x19, 0x7f, 0x04, 0xb7, 0xf8, 0x47, - 0x8f, 0x32, 0xfd, 0xf2, 0x80, 0xab, 0x31, 0x20, 0x53, 0xf8, 0x10, 0x4a, 0x4b, 0x41, 0xc5, 0x58, - 0x17, 0xcd, 0x38, 0x10, 0xf3, 0xe7, 0x61, 0xdf, 0xc4, 0x2e, 0x35, 0xec, 0x95, 0x41, 0x56, 0x63, - 0x40, 0x92, 0x77, 0x40, 0x65, 0x8b, 0x7f, 0xe0, 0x19, 0xab, 0xa3, 0x5b, 0x8d, 0xf4, 0x89, 0x99, - 0x88, 0xef, 0x53, 0x38, 0x51, 0xd1, 0x35, 0xda, 0x01, 0xd5, 0x64, 0x4b, 0x93, 0xe3, 0xc6, 0x9f, - 0x19, 0x31, 0x57, 0xd5, 0x48, 0x9f, 0xf0, 0xe4, 0x58, 0xab, 0xd3, 0xe5, 0x84, 0x9e, 0xee, 0x43, - 0x91, 0xbf, 0xe7, 0x97, 0xe6, 0x0a, 0x98, 0x2a, 0x0e, 0x95, 0xa8, 0x50, 0xec, 0xc4, 0x62, 0x90, - 0xaa, 0xb1, 0xfe, 0x94, 0x6f, 0xc7, 0x8f, 0xe0, 0x96, 0xe5, 0x5c, 0x5c, 0x60, 0x1f, 0xbb, 0x71, - 0x81, 0x62, 0x64, 0xd4, 0x18, 0x10, 0x7e, 0x1f, 0xfe, 0x59, 0x81, 0x4d, 0xf1, 0xc3, 0x9c, 0x2d, - 0x04, 0x83, 0xf3, 0xc4, 0xbe, 0x20, 0xe4, 0x4e, 0xbf, 0x7f, 0xda, 0x6d, 0xf7, 0x54, 0x05, 0x95, - 0x20, 0x3f, 0x38, 0xd7, 0x4f, 0x7a, 0xa3, 0xef, 0x7f, 0x2c, 0xd6, 0x87, 0xc1, 0xb9, 0x7e, 0x78, - 0xda, 0x6f, 0x33, 0x99, 0xaf, 0x0f, 0x83, 0x73, 0x7d, 0x38, 0xd2, 0x4e, 0x7a, 0x47, 0x6a, 0x06, - 0x55, 0x39, 0x3c, 0xec, 0x6a, 0x67, 0x27, 0xfb, 0x5d, 0xf5, 0x8b, 0x1c, 0x2a, 0xb2, 0x38, 0xfa, - 0xa0, 0x7f, 0xa0, 0xfe, 0x23, 0x87, 0x6e, 0x41, 0x69, 0x70, 0xae, 0xef, 0xf7, 0x7b, 0xa3, 0xf6, - 0x49, 0xaf, 0xab, 0xa9, 0xff, 0x0c, 0x55, 0xbd, 0xf6, 0xcb, 0xee, 0x70, 0xd0, 0xde, 0xef, 0xaa, - 0xff, 0xca, 0xa1, 0x12, 0xe4, 0x98, 0xaa, 0x7f, 0xd0, 0x55, 0xff, 0x1d, 0x4a, 0xa7, 0x27, 0xc3, - 0x91, 0xfa, 0xba, 0x8a, 0xbe, 0x01, 0x95, 0x28, 0x9c, 0x50, 0x7e, 0x56, 0xed, 0xbc, 0x78, 0xfd, - 0xa6, 0x91, 0xfa, 0xfc, 0x4d, 0x23, 0xf5, 0xe5, 0x9b, 0x86, 0xf2, 0xe9, 0x4d, 0x43, 0xf9, 0xfd, - 0x4d, 0x43, 0xf9, 0xd3, 0x4d, 0x43, 0x79, 0x7d, 0xd3, 0x50, 0xfe, 0x7e, 0xd3, 0x50, 0xbe, 0xb8, - 0x69, 0xa4, 0xbe, 0xbc, 0x69, 0x28, 0xbf, 0x7e, 0xdb, 0x48, 0xbd, 0x7e, 0xdb, 0x48, 0x7d, 0xfe, - 0xb6, 0x91, 0xfa, 0x49, 0x96, 0x7f, 0xec, 0xc6, 0x9b, 0xfc, 0x57, 0xed, 0xf7, 0xfe, 0x17, 0x00, - 0x00, 0xff, 0xff, 0xbc, 0x69, 0x0a, 0x41, 0x1b, 0x12, 0x00, 0x00, + // 1952 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4b, 0x6f, 0x23, 0x59, + 0xf5, 0x77, 0xc5, 0x76, 0x6c, 0x1f, 0xbf, 0xaa, 0xef, 0x3f, 0xff, 0x8c, 0xdb, 0x93, 0x76, 0x32, + 0x66, 0x1a, 0x25, 0xdd, 0x2d, 0xa7, 0x09, 0xd3, 0x4c, 0xb7, 0x5a, 0x48, 0xd8, 0x89, 0xf3, 0x10, + 0x69, 0xdb, 0x2a, 0x9b, 0x74, 0x84, 0x90, 0x4a, 0x65, 0xd7, 0x4d, 0xb9, 0xc0, 0xae, 0x5b, 0x54, + 0x5d, 0x27, 0x31, 0xab, 0xd9, 0xb1, 0x65, 0xc9, 0x12, 0xb1, 0x42, 0x42, 0x7c, 0x0f, 0x84, 0x40, + 0xea, 0xd9, 0x0d, 0x3b, 0x3a, 0xbd, 0x19, 0x1e, 0x12, 0x23, 0xf1, 0x05, 0xd0, 0x7d, 0xd4, 0xc3, + 0x6e, 0x6b, 0xc4, 0x6a, 0x36, 0x49, 0x9d, 0xf3, 0xfb, 0x9d, 0xe7, 0x3d, 0xb7, 0xea, 0x18, 0x1e, + 0xf8, 0xde, 0x68, 0xdf, 0x70, 0xed, 0x7d, 0xd7, 0x23, 0x94, 0xec, 0x5f, 0xdb, 0xbe, 0x3b, 0x64, + 0x7f, 0x1b, 0x5c, 0x46, 0x59, 0xf7, 0xb6, 0xc1, 0x75, 0xd5, 0xfb, 0x16, 0x21, 0xd6, 0x04, 0x0b, + 0xde, 0x70, 0x76, 0xb5, 0x6f, 0x38, 0x73, 0x41, 0xaa, 0xd6, 0x96, 0xa1, 0x1b, 0xcf, 0x70, 0x5d, + 0xec, 0x49, 0x27, 0xd5, 0x0d, 0x8b, 0x58, 0x44, 0xf8, 0x67, 0x4f, 0x42, 0x5b, 0xff, 0x4b, 0x12, + 0x92, 0x17, 0xb6, 0x8f, 0x3e, 0x81, 0xdc, 0xb5, 0xe1, 0xd9, 0xc6, 0x70, 0x82, 0xfd, 0x8a, 0xb2, + 0x93, 0xdc, 0xcd, 0x1f, 0x6c, 0x36, 0x82, 0xb0, 0x8d, 0x0b, 0xdb, 0x6f, 0x5c, 0x48, 0x58, 0x8b, + 0x88, 0xe8, 0x11, 0x64, 0x6e, 0x6c, 0xd3, 0xc2, 0xd4, 0xaf, 0xac, 0x71, 0x1b, 0x35, 0xb2, 0x79, + 0xcd, 0x01, 0x2d, 0x20, 0xa0, 0x97, 0x50, 0xb0, 0x26, 0x64, 0x68, 0x4c, 0xf4, 0xab, 0x99, 0x33, + 0xf2, 0x2b, 0x49, 0x6e, 0x50, 0x59, 0x0c, 0x72, 0xc2, 0x19, 0xc7, 0x33, 0x67, 0xa4, 0xe5, 0xad, + 0xf0, 0xd9, 0xaf, 0xfe, 0x59, 0x81, 0x6c, 0x90, 0x00, 0x42, 0x90, 0x72, 0x8c, 0x29, 0xae, 0x28, + 0x3b, 0xca, 0x6e, 0x4e, 0xe3, 0xcf, 0xe8, 0x63, 0x48, 0xd1, 0xb9, 0x8b, 0x2b, 0x6b, 0x3b, 0xca, + 0x6e, 0x29, 0x9e, 0x46, 0xef, 0x72, 0x30, 0x77, 0xb1, 0xc6, 0x51, 0xd4, 0x84, 0xa2, 0x89, 0xaf, + 0x8c, 0xd9, 0x84, 0xea, 0xd7, 0xc6, 0x64, 0x86, 0x2b, 0xc9, 0x1d, 0x65, 0x37, 0x7f, 0xb0, 0xd5, + 0x10, 0xbd, 0x6b, 0x04, 0xbd, 0x6b, 0xf4, 0xa9, 0x67, 0x3b, 0xd6, 0x05, 0xe3, 0x68, 0x05, 0x69, + 0xc2, 0x25, 0xb4, 0x03, 0x79, 0x13, 0xfb, 0x23, 0xcf, 0x76, 0xa9, 0x4d, 0x9c, 0x4a, 0x8a, 0xe7, + 0x10, 0x57, 0xa1, 0x8f, 0xa0, 0x70, 0x6d, 0x4c, 0x6c, 0x53, 0x84, 0xf0, 0x2b, 0xe9, 0x9d, 0x24, + 0xa3, 0x70, 0x1d, 0xf7, 0xe1, 0x57, 0x2f, 0x01, 0xa2, 0x4a, 0xd1, 0x36, 0xe4, 0xc9, 0x8c, 0xba, + 0x33, 0xaa, 0xc7, 0xca, 0x02, 0xa1, 0xea, 0xb0, 0xe2, 0xf6, 0x20, 0xc5, 0x7a, 0xc6, 0x8b, 0xcb, + 0x1f, 0xfc, 0xff, 0x72, 0x8f, 0x1b, 0xbc, 0x5f, 0x9c, 0x52, 0xff, 0x4f, 0x12, 0xd6, 0x85, 0x76, + 0x65, 0x9b, 0x9e, 0x41, 0xd6, 0x25, 0xbe, 0xcd, 0x53, 0x17, 0xde, 0xee, 0xbf, 0xe7, 0xad, 0x27, + 0x09, 0x5a, 0x48, 0x45, 0x8f, 0x65, 0x02, 0xc9, 0xaf, 0x49, 0xe0, 0x34, 0x21, 0x52, 0x40, 0x9f, + 0xc2, 0x07, 0xb1, 0x83, 0xd6, 0xe3, 0xa5, 0xa5, 0x59, 0x2a, 0xa7, 0x09, 0x6d, 0x23, 0x3a, 0xdb, + 0x6e, 0x54, 0xe6, 0xa7, 0x50, 0x30, 0x6d, 0xdf, 0x9d, 0x18, 0x73, 0xdd, 0x77, 0xf1, 0x88, 0xf7, + 0x36, 0x7f, 0xb0, 0xf1, 0xde, 0xe1, 0x34, 0x9d, 0xb9, 0x96, 0x97, 0xcc, 0xbe, 0x8b, 0x47, 0xd5, + 0x16, 0x64, 0x83, 0xa4, 0x51, 0x01, 0x94, 0x5b, 0x5e, 0x72, 0x5a, 0x53, 0x6e, 0x99, 0x34, 0xe7, + 0x85, 0xa6, 0x35, 0x65, 0xce, 0xa4, 0x1b, 0x5e, 0x43, 0x5a, 0x53, 0x6e, 0x98, 0x34, 0xe6, 0x31, + 0xd2, 0x9a, 0x32, 0xae, 0xfe, 0x5e, 0x81, 0x14, 0x3f, 0x8d, 0x55, 0x6d, 0xfb, 0x0e, 0xa4, 0x0c, + 0xcf, 0x0a, 0x86, 0xfc, 0xc1, 0xca, 0xfa, 0xf9, 0x9f, 0xa6, 0x67, 0x69, 0x9c, 0x5a, 0xfd, 0x09, + 0x64, 0xa4, 0x62, 0xa5, 0xc7, 0x4d, 0x48, 0x8b, 0x09, 0x5c, 0x93, 0x2d, 0x11, 0x22, 0xda, 0x82, + 0x6c, 0x70, 0xbd, 0x78, 0xa6, 0x0c, 0x0a, 0x35, 0xad, 0x0c, 0xa4, 0x6d, 0xc7, 0x9d, 0xd1, 0x56, + 0x11, 0xf2, 0xa2, 0xb9, 0x9e, 0xee, 0xe1, 0xab, 0xfa, 0x16, 0xa4, 0x9a, 0xb7, 0xb6, 0x8f, 0x36, + 0x20, 0x3d, 0x31, 0x86, 0x78, 0x22, 0x43, 0x09, 0xa1, 0xfe, 0xdb, 0x35, 0xc8, 0xb6, 0x0c, 0xef, + 0x70, 0x6c, 0x78, 0x14, 0xed, 0x42, 0x72, 0x68, 0x78, 0x9c, 0xb0, 0x70, 0xc5, 0x03, 0x02, 0x7b, + 0xd0, 0x18, 0x85, 0x39, 0xa3, 0x36, 0x9d, 0xc8, 0x14, 0x35, 0x21, 0xa0, 0x87, 0xb0, 0x7e, 0xab, + 0x1b, 0xb7, 0xb6, 0x2f, 0x87, 0xa1, 0x14, 0xb9, 0x60, 0x29, 0x68, 0xe9, 0x5b, 0x9e, 0xc9, 0x43, + 0x58, 0x9f, 0x0b, 0x5a, 0x6a, 0x35, 0x6d, 0xce, 0xfe, 0x55, 0x7f, 0xa9, 0x40, 0xb2, 0x25, 0x62, + 0x89, 0x76, 0xc8, 0xc4, 0x45, 0x33, 0xc2, 0x72, 0xd6, 0x62, 0xe5, 0xa0, 0xfb, 0x90, 0xf5, 0xa9, + 0x31, 0xfa, 0x99, 0x3e, 0x9c, 0x8b, 0x16, 0x69, 0x19, 0x2e, 0xb7, 0xe6, 0x0c, 0xb2, 0x3c, 0x32, + 0x73, 0x19, 0x24, 0x6e, 0x66, 0x86, 0xcb, 0xad, 0x39, 0xaa, 0x01, 0x8c, 0x89, 0x67, 0xff, 0x82, + 0x38, 0xd4, 0x98, 0xf0, 0x41, 0xcc, 0x6a, 0x31, 0x4d, 0xfd, 0x1c, 0xb2, 0x3d, 0x1b, 0x8b, 0x1e, + 0xad, 0x6c, 0x63, 0x94, 0xe3, 0xda, 0x52, 0x8e, 0xa2, 0x4b, 0xc9, 0x58, 0x97, 0xea, 0x9f, 0xaf, + 0x41, 0xe9, 0xd4, 0xf6, 0x29, 0xb1, 0x3c, 0x63, 0x2a, 0x9c, 0xfe, 0x00, 0x72, 0xe3, 0x40, 0x23, + 0xdb, 0x5f, 0x8f, 0x9a, 0xb2, 0x48, 0x8e, 0x44, 0x2d, 0x32, 0xfa, 0x46, 0x0e, 0xe4, 0xd7, 0x0a, + 0xe4, 0x4e, 0xe3, 0x11, 0x57, 0x1c, 0x4b, 0x05, 0x32, 0x53, 0xe3, 0x76, 0x68, 0x3b, 0x3e, 0xcf, + 0x24, 0xa9, 0x05, 0x22, 0x47, 0x6c, 0xc7, 0xa7, 0xd8, 0xe5, 0xc9, 0x28, 0x5a, 0x20, 0x2e, 0xb5, + 0x3f, 0xb5, 0xdc, 0x7e, 0xf6, 0xd2, 0x74, 0x3d, 0x3c, 0xb4, 0x1d, 0x7d, 0x44, 0x66, 0x0e, 0x15, + 0x6f, 0x0a, 0x2d, 0x2f, 0x74, 0x87, 0x4c, 0x55, 0x7f, 0x0e, 0x70, 0x62, 0xcc, 0xac, 0xe8, 0x8c, + 0x56, 0x4f, 0xcc, 0xfb, 0x2d, 0xaa, 0xff, 0x21, 0x09, 0xe5, 0x81, 0x3d, 0xc5, 0x3e, 0xf6, 0x6c, + 0xec, 0x0b, 0xfb, 0x23, 0x00, 0x1a, 0xaa, 0xe4, 0x17, 0xef, 0xe3, 0xa8, 0x27, 0x4b, 0xf4, 0x98, + 0xac, 0xc5, 0xec, 0xbe, 0x91, 0x23, 0xf9, 0xb7, 0x02, 0x30, 0x58, 0x08, 0xb9, 0xa2, 0xf0, 0x4d, + 0x58, 0x97, 0xa5, 0x88, 0x4c, 0xa4, 0x84, 0xbe, 0x0d, 0xe5, 0xe0, 0xb2, 0xe8, 0x92, 0x90, 0xe4, + 0xcd, 0x2f, 0xca, 0x3b, 0xd3, 0x17, 0xbc, 0xef, 0x43, 0x6a, 0x4a, 0x4c, 0xcc, 0x33, 0x29, 0x1d, + 0xec, 0xfd, 0x2f, 0x8d, 0x68, 0xbc, 0x22, 0x26, 0xd6, 0xb8, 0x59, 0xfd, 0x1c, 0x52, 0x4c, 0x42, + 0x2a, 0x14, 0x5e, 0x75, 0x8f, 0xda, 0xfa, 0x8f, 0x3a, 0x3f, 0xec, 0x74, 0x5f, 0x77, 0xd4, 0x04, + 0x2a, 0x42, 0x8e, 0x6b, 0xce, 0xcf, 0x3a, 0x6d, 0x75, 0x0d, 0x95, 0x00, 0xb8, 0xd8, 0xeb, 0x9e, + 0x75, 0x06, 0x6a, 0x32, 0x84, 0x9b, 0x5a, 0xbb, 0xa9, 0xa6, 0xea, 0xa9, 0xac, 0xa2, 0x2a, 0xf5, + 0x29, 0xe4, 0xfa, 0xd4, 0xa0, 0xe2, 0xa0, 0x9e, 0x40, 0xca, 0xa7, 0x06, 0x95, 0x57, 0x26, 0xb6, + 0x2f, 0x84, 0x14, 0xfe, 0xa4, 0x71, 0xd6, 0xea, 0x03, 0xa9, 0x6e, 0x41, 0xaa, 0x2f, 0xd1, 0xf7, + 0x7b, 0x57, 0xdf, 0x86, 0xdc, 0x00, 0xdf, 0xca, 0x70, 0x08, 0x52, 0x43, 0x62, 0xce, 0x83, 0x97, + 0x35, 0x7b, 0x66, 0x84, 0x0b, 0x6c, 0x19, 0x21, 0x81, 0x7f, 0x9d, 0x24, 0x81, 0x3d, 0xd7, 0x9f, + 0x40, 0x7a, 0xc0, 0x57, 0x93, 0x6f, 0x41, 0xd1, 0x9a, 0x51, 0x8a, 0x3d, 0x7d, 0x44, 0x26, 0xb3, + 0xa9, 0x23, 0x59, 0x05, 0xa1, 0x3c, 0xe4, 0xba, 0xfa, 0x67, 0x69, 0x48, 0x9f, 0x78, 0x86, 0x3b, + 0x46, 0xdb, 0x00, 0x26, 0xa1, 0x0b, 0xdc, 0xd3, 0x84, 0x96, 0x33, 0x09, 0x15, 0x54, 0x74, 0x0c, + 0x25, 0xc3, 0xfc, 0xa9, 0x31, 0xc2, 0xce, 0x68, 0xae, 0x4f, 0x6c, 0x9f, 0xca, 0xaf, 0x76, 0xec, + 0x13, 0xc4, 0x3d, 0x35, 0x9a, 0x01, 0xeb, 0xdc, 0xf6, 0xe9, 0x69, 0x42, 0x2b, 0x1a, 0x71, 0x05, + 0x7a, 0x02, 0x08, 0x9b, 0x16, 0xd6, 0x6f, 0xb0, 0x6d, 0x8d, 0xc3, 0x80, 0xe2, 0x95, 0xa5, 0x32, + 0xe4, 0x35, 0x07, 0x64, 0xd4, 0x27, 0x80, 0x1c, 0x62, 0x2e, 0xb3, 0xc5, 0x0b, 0x55, 0x65, 0xc8, + 0x02, 0xfb, 0x11, 0xdc, 0xe3, 0xbe, 0x47, 0x64, 0x42, 0xc2, 0xba, 0xc5, 0xfd, 0x2d, 0x33, 0xe0, + 0x90, 0xe9, 0x25, 0xf7, 0x04, 0xb8, 0x4a, 0xa7, 0x63, 0x0f, 0xfb, 0x63, 0x32, 0x31, 0xfd, 0xca, + 0x3a, 0x2f, 0xa8, 0xb6, 0x5c, 0x50, 0xdb, 0xb4, 0xf0, 0x20, 0x64, 0x69, 0x25, 0xbc, 0x20, 0xb3, + 0xb9, 0xe6, 0x8e, 0xc6, 0xe4, 0x1a, 0x7b, 0xba, 0xed, 0x5c, 0x91, 0x4a, 0x86, 0xef, 0x59, 0x45, + 0xa6, 0x3e, 0x65, 0xda, 0x33, 0xe7, 0x8a, 0xb0, 0xdd, 0x8a, 0xf3, 0x26, 0xd8, 0xb1, 0xe8, 0xb8, + 0x92, 0xe5, 0xef, 0x2b, 0x60, 0xaa, 0x73, 0xae, 0x41, 0xcf, 0xa1, 0x82, 0x1d, 0x76, 0x76, 0x7a, + 0xb0, 0x19, 0x8e, 0x6d, 0xec, 0x19, 0xde, 0x68, 0x3c, 0xaf, 0xe4, 0xf8, 0x4d, 0xd9, 0x14, 0xf8, + 0x91, 0x80, 0x4f, 0x03, 0xb4, 0xfa, 0x0a, 0x8a, 0x0b, 0x5d, 0x67, 0xb1, 0xae, 0x3c, 0x32, 0x5d, + 0x3c, 0x7a, 0x60, 0x2a, 0x59, 0xfd, 0x87, 0x90, 0xa3, 0x24, 0x80, 0xc5, 0x80, 0x66, 0x29, 0x11, + 0x60, 0x75, 0x08, 0xa5, 0xc5, 0x9a, 0xd1, 0x1e, 0xa8, 0x53, 0x6c, 0xda, 0xb3, 0x69, 0xd4, 0x2e, + 0xee, 0x34, 0xa9, 0x95, 0x85, 0x3e, 0xe4, 0xa2, 0x87, 0x50, 0x1a, 0xdb, 0xd6, 0x38, 0x46, 0x14, + 0x6f, 0xe6, 0x22, 0xd3, 0x86, 0xb4, 0x70, 0x7f, 0xa8, 0xff, 0x35, 0x0d, 0x05, 0x0d, 0xff, 0x7c, + 0x86, 0x7d, 0x2a, 0x26, 0xf1, 0x29, 0x6c, 0x78, 0x42, 0x26, 0x9e, 0xee, 0x12, 0x73, 0xb1, 0x08, + 0x14, 0x62, 0x3d, 0x62, 0xca, 0x62, 0xb8, 0x85, 0xef, 0x12, 0xc7, 0xc4, 0x0b, 0x16, 0x6b, 0x81, + 0x85, 0xc4, 0x22, 0x8b, 0xe7, 0x50, 0x89, 0x62, 0xf8, 0xd8, 0xbb, 0xb6, 0x47, 0x78, 0x71, 0x14, + 0x37, 0x43, 0xbc, 0x2f, 0xe0, 0xb8, 0x65, 0x10, 0x6b, 0xc9, 0x32, 0x15, 0x58, 0x4a, 0x7c, 0xd1, + 0x72, 0x3f, 0x5e, 0x97, 0xad, 0xbb, 0x81, 0x55, 0x91, 0x5b, 0xdd, 0x0b, 0xb1, 0xb3, 0x5e, 0xdc, + 0x20, 0x08, 0x15, 0x33, 0x28, 0x05, 0x06, 0x12, 0x0b, 0x0d, 0x1e, 0x00, 0xb8, 0xcf, 0x9e, 0x2e, + 0xce, 0x7d, 0xce, 0x7d, 0xf6, 0x34, 0x06, 0xbf, 0x08, 0xe1, 0x75, 0x09, 0xbf, 0x58, 0x80, 0x5f, + 0x04, 0x70, 0x26, 0x80, 0x5f, 0xc4, 0xee, 0x96, 0xe7, 0xb1, 0x2d, 0xcf, 0xa0, 0x61, 0xc5, 0x59, + 0x79, 0xb7, 0x18, 0xa0, 0x19, 0x34, 0x28, 0xf5, 0x25, 0x54, 0x65, 0x39, 0xbe, 0xee, 0xf2, 0x3e, + 0x8d, 0x88, 0x13, 0x1e, 0x4b, 0x8e, 0x1b, 0x7d, 0x10, 0x30, 0x7a, 0xac, 0x51, 0x0c, 0x97, 0xc6, + 0x47, 0xb0, 0x6d, 0x3b, 0x43, 0x32, 0x73, 0x4c, 0x7d, 0x38, 0xa7, 0x78, 0x95, 0x07, 0xe0, 0x1e, + 0x3e, 0x94, 0xb4, 0x16, 0x63, 0x2d, 0x7b, 0x39, 0x86, 0x1d, 0x32, 0xa3, 0x5f, 0xef, 0x26, 0xcf, + 0xdd, 0x6c, 0x05, 0xbc, 0x95, 0x7e, 0x5e, 0x42, 0x95, 0x12, 0x6a, 0x4c, 0x74, 0x99, 0xae, 0x58, + 0x0a, 0x02, 0x0f, 0x05, 0x51, 0x0a, 0x67, 0xc8, 0x21, 0xe6, 0x1b, 0x82, 0x7c, 0xbd, 0xfe, 0x26, + 0x09, 0x1b, 0x7d, 0xf6, 0x71, 0x1b, 0x78, 0xc6, 0x08, 0x1f, 0x4f, 0x8c, 0x29, 0x16, 0x33, 0xfe, + 0x18, 0xee, 0xf1, 0x8f, 0x1e, 0x65, 0xfa, 0xc5, 0x01, 0x57, 0x23, 0x40, 0xa6, 0xf0, 0x11, 0x14, + 0x16, 0x82, 0x8a, 0xb1, 0xce, 0x8f, 0xa2, 0x40, 0xcc, 0x9f, 0x8b, 0xbd, 0x11, 0x76, 0xa8, 0x61, + 0x2d, 0x0d, 0xb2, 0x1a, 0x01, 0x92, 0xbc, 0x07, 0x2a, 0x5b, 0xfc, 0x7d, 0xd7, 0x58, 0x1e, 0xdd, + 0x72, 0xa8, 0x8f, 0xcd, 0x44, 0x74, 0x9f, 0x82, 0x89, 0x0a, 0xaf, 0xd1, 0x1e, 0xa8, 0x23, 0xb6, + 0x34, 0xd9, 0x4e, 0xf4, 0x99, 0x11, 0x73, 0x55, 0x0e, 0xf5, 0x31, 0x4f, 0xb6, 0xb9, 0x3c, 0x5d, + 0x76, 0xe0, 0x69, 0x1b, 0xf2, 0xfc, 0x3d, 0xbf, 0x30, 0x57, 0xc0, 0x54, 0x51, 0xa8, 0x58, 0x85, + 0x62, 0x27, 0x16, 0x83, 0x54, 0x8e, 0xf4, 0xe7, 0x7c, 0x3b, 0x7e, 0x0c, 0xf7, 0x4c, 0xfb, 0xea, + 0x0a, 0x7b, 0xd8, 0x89, 0x0a, 0x14, 0x23, 0xa3, 0x46, 0x80, 0xf0, 0xfb, 0xe8, 0x4f, 0x0a, 0xac, + 0x8b, 0x1f, 0xe6, 0x6c, 0x21, 0xe8, 0x5d, 0xc6, 0xf6, 0x05, 0x21, 0xb7, 0xba, 0xdd, 0xf3, 0x76, + 0xb3, 0xa3, 0x2a, 0xa8, 0x00, 0xd9, 0xde, 0xa5, 0x7e, 0xd6, 0x19, 0x7c, 0xef, 0x13, 0xb1, 0x3e, + 0xf4, 0x2e, 0xf5, 0xe3, 0xf3, 0x6e, 0x93, 0xc9, 0x7c, 0x7d, 0xe8, 0x5d, 0xea, 0xfd, 0x81, 0x76, + 0xd6, 0x39, 0x51, 0x53, 0xa8, 0xcc, 0xe1, 0x7e, 0x5b, 0xbb, 0x38, 0x3b, 0x6c, 0xab, 0x5f, 0x66, + 0x50, 0x9e, 0xc5, 0xd1, 0x7b, 0xdd, 0x23, 0xf5, 0xef, 0x19, 0x74, 0x0f, 0x0a, 0xbd, 0x4b, 0xfd, + 0xb0, 0xdb, 0x19, 0x34, 0xcf, 0x3a, 0x6d, 0x4d, 0xfd, 0x47, 0xa0, 0xea, 0x34, 0x5f, 0xb5, 0xfb, + 0xbd, 0xe6, 0x61, 0x5b, 0xfd, 0x67, 0x06, 0x15, 0x20, 0xc3, 0x54, 0xdd, 0xa3, 0xb6, 0xfa, 0xaf, + 0x40, 0x3a, 0x3f, 0xeb, 0x0f, 0xd4, 0x37, 0x65, 0xf4, 0x7f, 0x50, 0x0a, 0xc3, 0x09, 0xe5, 0xe7, + 0xe5, 0xd6, 0xcb, 0x37, 0x6f, 0x6b, 0x89, 0x2f, 0xde, 0xd6, 0x12, 0x5f, 0xbd, 0xad, 0x29, 0x9f, + 0xdd, 0xd5, 0x94, 0xdf, 0xdd, 0xd5, 0x94, 0x3f, 0xde, 0xd5, 0x94, 0x37, 0x77, 0x35, 0xe5, 0x6f, + 0x77, 0x35, 0xe5, 0xcb, 0xbb, 0x5a, 0xe2, 0xab, 0xbb, 0x9a, 0xf2, 0xab, 0x77, 0xb5, 0xc4, 0x9b, + 0x77, 0xb5, 0xc4, 0x17, 0xef, 0x6a, 0x89, 0x1f, 0xa7, 0xf9, 0xc7, 0x6e, 0xb8, 0xce, 0x7f, 0xd5, + 0x7e, 0xf7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc4, 0x40, 0xec, 0xb6, 0x02, 0x12, 0x00, 0x00, } func (x PXType) String() string { diff --git a/src/api/proto/vispb/vis.proto b/src/api/proto/vispb/vis.proto index 62747bb06f3..b5edb2058bd 100644 --- a/src/api/proto/vispb/vis.proto +++ b/src/api/proto/vispb/vis.proto @@ -27,7 +27,7 @@ import "google/protobuf/wrappers.proto"; // Keep this below the google imports. Apparently protobufjs cli doesn't like // it when this is loaded before the google imports. :( -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; // PXType represents the data type of an argument that a pxl script can take. // For example, with a func like def my_func(arg1: px.Service, arg2: int), diff --git a/src/api/proto/vizierconfigpb/BUILD.bazel b/src/api/proto/vizierconfigpb/BUILD.bazel index 28d3a254ca0..ddcbb3c3b3e 100644 --- a/src/api/proto/vizierconfigpb/BUILD.bazel +++ b/src/api/proto/vizierconfigpb/BUILD.bazel @@ -21,7 +21,7 @@ pl_proto_library( srcs = ["vizier_types.proto"], visibility = ["//src:__subpackages__"], deps = [ - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -30,7 +30,7 @@ pl_cc_proto_library( proto = ":vizier_pl_proto", visibility = ["//src:__subpackages__"], deps = [ - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/api/proto/vizierconfigpb/vizier_types.pb.go b/src/api/proto/vizierconfigpb/vizier_types.pb.go index 2f3fea03081..44238d7a73b 100755 --- a/src/api/proto/vizierconfigpb/vizier_types.pb.go +++ b/src/api/proto/vizierconfigpb/vizier_types.pb.go @@ -617,80 +617,80 @@ func init() { } var fileDescriptor_5892195818dca4ca = []byte{ - // 1167 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4f, 0x73, 0xd3, 0x46, - 0x14, 0x8f, 0xe2, 0x90, 0xc4, 0xcf, 0x26, 0xd8, 0x1b, 0x60, 0xb6, 0x2e, 0x88, 0xd4, 0x9d, 0x69, - 0x3d, 0xd0, 0x2a, 0x25, 0x65, 0x4a, 0xa1, 0x53, 0x98, 0x90, 0xa4, 0xd3, 0xd2, 0x40, 0x5d, 0xa5, - 0x70, 0xe0, 0xa2, 0x59, 0x4b, 0xcf, 0x46, 0x83, 0xa4, 0x15, 0xbb, 0x2b, 0x17, 0x73, 0xea, 0xa1, - 0x1f, 0xa0, 0x1f, 0xa3, 0x1f, 0xa0, 0x33, 0x9d, 0xe9, 0x27, 0xe8, 0xa1, 0x33, 0xe5, 0xc8, 0xa9, - 0x53, 0x9c, 0x4b, 0x8f, 0x7c, 0x84, 0x8e, 0x56, 0xb2, 0xa5, 0x10, 0x43, 0xc8, 0x4d, 0xfb, 0xde, - 0xef, 0xf7, 0xde, 0xbe, 0xb7, 0xef, 0x8f, 0x60, 0x5d, 0x0a, 0x77, 0x9d, 0xc5, 0xfe, 0x7a, 0x2c, - 0xb8, 0xe2, 0xeb, 0x43, 0xff, 0xa9, 0x8f, 0xc2, 0xe5, 0x51, 0xdf, 0x1f, 0xc4, 0xbd, 0xfc, 0xe8, - 0xa8, 0x51, 0x8c, 0xd2, 0xd2, 0x08, 0xd2, 0x8c, 0x9f, 0x58, 0x07, 0x51, 0xad, 0x8f, 0x07, 0xbe, - 0x7a, 0x98, 0xf4, 0x2c, 0x97, 0x87, 0xeb, 0x03, 0x3e, 0xe0, 0x99, 0xad, 0x5e, 0xd2, 0xd7, 0xa7, - 0xcc, 0x70, 0xfa, 0x95, 0x59, 0x68, 0x99, 0x03, 0xce, 0x07, 0x01, 0x16, 0xa8, 0x1f, 0x05, 0x8b, - 0x63, 0x14, 0xb9, 0x87, 0xf6, 0xef, 0x4b, 0x00, 0xf7, 0xb5, 0x87, 0xbd, 0x18, 0x5d, 0x42, 0x61, - 0x69, 0x88, 0x42, 0xfa, 0x3c, 0xa2, 0xc6, 0x9a, 0xd1, 0xa9, 0xda, 0x93, 0x23, 0x39, 0x0f, 0xe0, - 0x61, 0x1c, 0xf0, 0x91, 0xf3, 0x08, 0x47, 0x74, 0x5e, 0x2b, 0xab, 0x99, 0xe4, 0x5b, 0x1c, 0x11, - 0x0b, 0x56, 0x3d, 0x5f, 0xb2, 0x5e, 0x80, 0x0e, 0x4b, 0x14, 0x77, 0x92, 0xd8, 0x63, 0x0a, 0x69, - 0x65, 0xcd, 0xe8, 0x2c, 0xdb, 0xcd, 0x5c, 0xb5, 0x99, 0x28, 0x7e, 0x4f, 0x2b, 0xc8, 0x45, 0x68, - 0x26, 0x12, 0x1d, 0x54, 0xae, 0xe7, 0xf0, 0x18, 0x05, 0x53, 0x5c, 0xd0, 0x05, 0x8d, 0x3e, 0x95, - 0x48, 0xdc, 0x51, 0xae, 0xf7, 0x5d, 0x2e, 0x26, 0xef, 0x41, 0xdd, 0x0d, 0x12, 0xa9, 0x50, 0x38, - 0x11, 0x0b, 0x91, 0x9e, 0xd0, 0xce, 0x6b, 0xb9, 0xec, 0x2e, 0x0b, 0x31, 0xbd, 0x9d, 0x1b, 0xf0, - 0xc4, 0x73, 0x98, 0xe7, 0x09, 0xba, 0x98, 0xdd, 0x4e, 0x4b, 0x36, 0x3d, 0x4f, 0xe8, 0xdb, 0xe1, - 0xd0, 0xc9, 0x20, 0xa9, 0x0d, 0x19, 0x33, 0x17, 0xe9, 0x92, 0xc6, 0x35, 0x3d, 0x1c, 0x6e, 0xa5, - 0x9a, 0xbb, 0x13, 0x05, 0xe9, 0x40, 0x23, 0xc6, 0xd0, 0x09, 0x31, 0xe4, 0x62, 0xe4, 0x04, 0x7e, - 0xe8, 0x2b, 0xba, 0xac, 0xc1, 0x2b, 0x31, 0x86, 0x77, 0xb4, 0x78, 0x37, 0x95, 0x92, 0x8f, 0x80, - 0x94, 0x90, 0x02, 0x1f, 0x27, 0x28, 0x15, 0x6d, 0x6a, 0x6c, 0x63, 0x8a, 0xb5, 0x33, 0x39, 0xb9, - 0x01, 0xd0, 0xe5, 0x9e, 0xd3, 0xe5, 0x81, 0xef, 0x8e, 0x68, 0x75, 0xcd, 0xe8, 0xd4, 0x36, 0x2e, - 0x58, 0x87, 0x1e, 0xd9, 0xea, 0x72, 0x2f, 0xc3, 0xd8, 0xf8, 0xd8, 0xae, 0x4e, 0x4f, 0x64, 0x1b, - 0x96, 0x62, 0xa6, 0xdc, 0x87, 0x28, 0x29, 0xac, 0x55, 0x3a, 0xb5, 0x8d, 0x8b, 0x33, 0xc8, 0xc5, - 0x73, 0x5a, 0xdd, 0x0c, 0xbc, 0x13, 0x29, 0x31, 0xb2, 0x27, 0x54, 0xf2, 0x21, 0x9c, 0x72, 0x03, - 0xee, 0x3e, 0x72, 0x5c, 0x1e, 0x0d, 0x51, 0x28, 0x14, 0xb4, 0x9e, 0x05, 0xa7, 0xc5, 0x5b, 0x13, - 0x29, 0xb9, 0x00, 0x35, 0x8f, 0x29, 0xe6, 0x30, 0xd7, 0x45, 0x29, 0xe9, 0x49, 0x0d, 0x82, 0x54, - 0xb4, 0xa9, 0x25, 0xe4, 0x01, 0x9c, 0xd1, 0x00, 0x97, 0x07, 0x01, 0xba, 0x8a, 0x0b, 0x27, 0x66, - 0x82, 0x85, 0x92, 0xae, 0xe8, 0xd0, 0x3e, 0x98, 0x71, 0xbb, 0x6d, 0xa6, 0xd8, 0xd6, 0x04, 0xde, - 0xd5, 0x68, 0x7b, 0xd5, 0x3b, 0x2c, 0x24, 0x3e, 0xb4, 0x02, 0x64, 0x1e, 0x0a, 0xf9, 0xd0, 0x8f, - 0x1d, 0x4c, 0x75, 0x3e, 0x8f, 0x26, 0x0e, 0x4e, 0x69, 0x07, 0x97, 0x66, 0x38, 0xd8, 0x9d, 0x92, - 0x76, 0x72, 0x4e, 0xee, 0x85, 0x06, 0xaf, 0xd1, 0x90, 0xab, 0x40, 0xdd, 0x44, 0x2a, 0x1e, 0x3a, - 0x45, 0x89, 0x3b, 0x12, 0x5d, 0x81, 0x8a, 0x36, 0x74, 0xd0, 0x67, 0x32, 0xfd, 0xf6, 0xa4, 0xde, - 0xf7, 0xb4, 0x92, 0xb4, 0x60, 0x59, 0xe0, 0xc0, 0x97, 0x4a, 0x8c, 0x28, 0xd1, 0xc0, 0xe9, 0x99, - 0x9c, 0x83, 0x6a, 0xda, 0x09, 0xb1, 0x1f, 0x70, 0x45, 0x57, 0x75, 0x65, 0x17, 0x82, 0xd6, 0x75, - 0xa8, 0x97, 0x1f, 0x87, 0x34, 0xa0, 0x92, 0xf6, 0x55, 0xd6, 0x74, 0xe9, 0x27, 0x39, 0x0d, 0x27, - 0x86, 0x2c, 0x48, 0x30, 0xef, 0xb5, 0xec, 0x70, 0x7d, 0xfe, 0x73, 0xe3, 0xf6, 0xc2, 0x72, 0xad, - 0x51, 0x6f, 0xff, 0xb1, 0x00, 0xf5, 0x72, 0x9d, 0x90, 0x2d, 0x58, 0x0c, 0x58, 0x0f, 0x03, 0x49, - 0x0d, 0x5d, 0x1b, 0x97, 0x8e, 0x28, 0x2c, 0x6b, 0x57, 0xa3, 0xb3, 0xe2, 0xc8, 0xa9, 0xc4, 0x86, - 0x1a, 0x8b, 0x22, 0xae, 0x58, 0x9a, 0x1e, 0x49, 0xe7, 0xb5, 0xa5, 0x4f, 0x8e, 0xb2, 0xb4, 0x59, - 0x50, 0x32, 0x73, 0x65, 0x23, 0xe4, 0x4b, 0xa8, 0x0a, 0x94, 0x3c, 0x11, 0x2e, 0x4a, 0x3d, 0x11, - 0x66, 0x17, 0xbd, 0x9d, 0x63, 0x6c, 0x7c, 0x2c, 0xed, 0x82, 0x41, 0xee, 0x41, 0x3d, 0xe2, 0x1e, - 0xee, 0x61, 0x56, 0x1e, 0x74, 0x41, 0xdf, 0xe9, 0xf2, 0x51, 0x77, 0xba, 0x5b, 0xe2, 0x64, 0x97, - 0x3a, 0x60, 0x86, 0xdc, 0x84, 0x9a, 0xe2, 0x41, 0x3a, 0x62, 0x74, 0xa4, 0x27, 0xb4, 0xd5, 0xf3, - 0x33, 0xac, 0xfe, 0x30, 0x45, 0xd9, 0x65, 0x46, 0xeb, 0x1a, 0xd4, 0x4a, 0x19, 0x3c, 0xce, 0x0b, - 0xb6, 0x6e, 0x40, 0xe3, 0xd5, 0x94, 0x1d, 0x8b, 0x7f, 0x13, 0x9a, 0x87, 0xc2, 0x3b, 0x8e, 0x81, - 0xf6, 0xcf, 0x06, 0xd4, 0xcb, 0xf9, 0x26, 0x57, 0x61, 0x51, 0x8f, 0x39, 0xa9, 0xf9, 0x6f, 0x7e, - 0xa0, 0x5d, 0x5f, 0x2a, 0x3b, 0x87, 0x93, 0x2f, 0xd2, 0x16, 0xd0, 0xd3, 0x4d, 0x6a, 0x37, 0x6f, - 0x41, 0x9d, 0x12, 0xda, 0xbf, 0x19, 0x00, 0x45, 0x7a, 0x67, 0x44, 0xd0, 0x82, 0xe5, 0xe9, 0x76, - 0xc8, 0x82, 0x98, 0x9e, 0x8b, 0xe8, 0x2a, 0xa5, 0xe8, 0xc8, 0x59, 0x58, 0xc4, 0x7e, 0x1f, 0x5d, - 0xa5, 0xb7, 0x49, 0xd5, 0xce, 0x4f, 0xe4, 0x36, 0x90, 0xe2, 0xf1, 0xd2, 0xe6, 0xe6, 0x91, 0x27, - 0xf5, 0x2a, 0xa9, 0x6d, 0xbc, 0x6b, 0x65, 0x5b, 0xd2, 0x9a, 0x6c, 0x49, 0xeb, 0x9b, 0x48, 0x7d, - 0x76, 0xe5, 0x7e, 0x6a, 0xd0, 0x6e, 0x16, 0xb4, 0xbd, 0x8c, 0xd5, 0xfe, 0xab, 0x94, 0xbd, 0x34, - 0x22, 0x72, 0x1f, 0x4e, 0x4e, 0xea, 0xd5, 0x09, 0x7c, 0xa9, 0xf2, 0x0e, 0xbc, 0x7c, 0x44, 0x26, - 0x0e, 0x1c, 0xf2, 0x1a, 0x15, 0x25, 0x51, 0xcb, 0x83, 0xe6, 0x21, 0xc8, 0x8c, 0x2c, 0x5d, 0x2b, - 0xbf, 0x73, 0x6d, 0xe3, 0xfd, 0x37, 0xb8, 0xfd, 0x3e, 0x61, 0x91, 0xf2, 0xd5, 0xa8, 0x5c, 0x0c, - 0x1d, 0x68, 0xbc, 0xaa, 0x2e, 0x92, 0x6b, 0x94, 0x92, 0xdb, 0xfe, 0x7b, 0x1e, 0x56, 0x67, 0x0c, - 0x70, 0x72, 0x05, 0xce, 0xa6, 0x23, 0x5c, 0x2a, 0x81, 0x2c, 0x74, 0x7a, 0x49, 0xbf, 0x8f, 0xc2, - 0x91, 0xfe, 0xd3, 0x8c, 0x7e, 0xd2, 0x3e, 0x5d, 0x68, 0x6f, 0x69, 0xe5, 0x9e, 0xff, 0x14, 0xc9, - 0x4d, 0x38, 0x37, 0x83, 0x15, 0xfb, 0x8f, 0x30, 0xe3, 0xce, 0x6b, 0xee, 0x3b, 0x87, 0xb8, 0x29, - 0x42, 0x1b, 0x78, 0x02, 0x8d, 0x7c, 0x6e, 0xa7, 0x3b, 0xb8, 0x1f, 0xb0, 0x81, 0xcc, 0xa7, 0xc3, - 0xf5, 0xb7, 0xdb, 0x3c, 0xd6, 0x96, 0xa6, 0x77, 0x31, 0xfc, 0x2a, 0x25, 0xeb, 0xfc, 0xde, 0x22, - 0xe3, 0x7f, 0x2e, 0xac, 0xe4, 0x8a, 0x9d, 0x3b, 0x5a, 0x61, 0xaf, 0xb8, 0x07, 0x80, 0xad, 0x4d, - 0x58, 0x9d, 0x41, 0x3d, 0xe6, 0x14, 0xaf, 0x34, 0x16, 0xda, 0x5f, 0x03, 0x7d, 0xdd, 0xc2, 0x4a, - 0xff, 0x2d, 0x8a, 0xb5, 0x87, 0xc2, 0xe7, 0x9e, 0x13, 0x66, 0xfd, 0x59, 0xb1, 0x1b, 0x13, 0x4d, - 0x57, 0x2b, 0xee, 0xc8, 0x5b, 0xdb, 0xcf, 0x5e, 0x98, 0x73, 0xcf, 0x5f, 0x98, 0x73, 0x2f, 0x5f, - 0x98, 0xc6, 0x4f, 0x63, 0xd3, 0xf8, 0x75, 0x6c, 0x1a, 0x7f, 0x8e, 0x4d, 0xe3, 0xd9, 0xd8, 0x34, - 0xfe, 0x1d, 0x9b, 0xc6, 0x7f, 0x63, 0x73, 0xee, 0xe5, 0xd8, 0x34, 0x7e, 0xd9, 0x37, 0xe7, 0x9e, - 0xed, 0x9b, 0x73, 0xcf, 0xf7, 0xcd, 0xb9, 0x07, 0x2b, 0x07, 0x93, 0xd4, 0x5b, 0xd4, 0x2d, 0xf0, - 0xe9, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x5b, 0x21, 0x56, 0xab, 0x0a, 0x00, 0x00, + // 1156 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcf, 0x6e, 0xdb, 0x46, + 0x13, 0x17, 0x2d, 0xc7, 0xb6, 0x46, 0x8a, 0x23, 0xad, 0x93, 0x60, 0x3f, 0x7d, 0x09, 0xe3, 0xaa, + 0x40, 0x2b, 0x24, 0x85, 0xdc, 0xb8, 0x41, 0xd3, 0xa4, 0x68, 0x02, 0xc7, 0x76, 0xd1, 0xa6, 0x4e, + 0xaa, 0xd2, 0x4d, 0x0e, 0xb9, 0x10, 0x2b, 0x72, 0xa4, 0x10, 0x21, 0xb9, 0xcc, 0xee, 0x52, 0x8d, + 0x7c, 0xea, 0xa1, 0x0f, 0xd0, 0xc7, 0xe8, 0x03, 0x14, 0x28, 0xd0, 0x27, 0xe8, 0xa1, 0x40, 0x7d, + 0xcc, 0xa9, 0xa8, 0xe5, 0x4b, 0x8f, 0x79, 0x84, 0x82, 0x4b, 0x4a, 0xa4, 0x63, 0x25, 0x8e, 0x6f, + 0x9c, 0x99, 0xdf, 0x6f, 0x76, 0x67, 0x76, 0xfe, 0x10, 0xd6, 0xa4, 0x70, 0xd6, 0x58, 0xe4, 0xad, + 0x45, 0x82, 0x2b, 0xbe, 0x36, 0xf4, 0xf6, 0x3c, 0x14, 0x0e, 0x0f, 0xfb, 0xde, 0x20, 0xea, 0x65, + 0xa2, 0xad, 0x46, 0x11, 0xca, 0x8e, 0x46, 0x90, 0x46, 0xf4, 0xa2, 0x73, 0x14, 0xd5, 0x3c, 0x3f, + 0xe0, 0x03, 0x9e, 0xf2, 0x93, 0xaf, 0x14, 0xd8, 0x34, 0x07, 0x9c, 0x0f, 0x7c, 0x4c, 0x1d, 0xf7, + 0xe2, 0xfe, 0xda, 0x0f, 0x82, 0x45, 0x11, 0x8a, 0xcc, 0x51, 0xeb, 0xb7, 0x45, 0x80, 0xc7, 0xda, + 0xd1, 0x6e, 0x84, 0x0e, 0xa1, 0xb0, 0x38, 0x44, 0x21, 0x3d, 0x1e, 0x52, 0x63, 0xd5, 0x68, 0x57, + 0xac, 0x89, 0x48, 0x2e, 0x03, 0xb8, 0x18, 0xf9, 0x7c, 0x64, 0x3f, 0xc3, 0x11, 0x9d, 0xd3, 0xc6, + 0x4a, 0xaa, 0xf9, 0x06, 0x47, 0xa4, 0x03, 0x2b, 0xae, 0x27, 0x59, 0xcf, 0x47, 0x9b, 0xc5, 0x8a, + 0xdb, 0x71, 0xe4, 0x32, 0x85, 0xb4, 0xbc, 0x6a, 0xb4, 0x97, 0xac, 0x46, 0x66, 0xda, 0x88, 0x15, + 0x7f, 0xa4, 0x0d, 0xe4, 0x2a, 0x34, 0x62, 0x89, 0x36, 0x2a, 0xc7, 0xb5, 0x79, 0x84, 0x82, 0x29, + 0x2e, 0xe8, 0xbc, 0x46, 0x9f, 0x8b, 0x25, 0x6e, 0x2b, 0xc7, 0xfd, 0x36, 0x53, 0x93, 0xf7, 0xa0, + 0xe6, 0xf8, 0xb1, 0x54, 0x28, 0xec, 0x90, 0x05, 0x48, 0xcf, 0xe8, 0xc3, 0xab, 0x99, 0xee, 0x21, + 0x0b, 0x30, 0xb9, 0x9d, 0xe3, 0xf3, 0xd8, 0xb5, 0x99, 0xeb, 0x0a, 0xba, 0x90, 0xde, 0x4e, 0x6b, + 0x36, 0x5c, 0x57, 0xe8, 0xdb, 0xe1, 0xd0, 0x4e, 0x21, 0x89, 0x0f, 0x19, 0x31, 0x07, 0xe9, 0xa2, + 0xc6, 0x35, 0x5c, 0x1c, 0x6e, 0x26, 0x96, 0x87, 0x13, 0x03, 0x69, 0x43, 0x3d, 0xc2, 0xc0, 0x0e, + 0x30, 0xe0, 0x62, 0x64, 0xfb, 0x5e, 0xe0, 0x29, 0xba, 0xa4, 0xc1, 0xcb, 0x11, 0x06, 0x0f, 0xb4, + 0x7a, 0x27, 0xd1, 0x92, 0x8f, 0x80, 0x14, 0x90, 0x02, 0x9f, 0xc7, 0x28, 0x15, 0x6d, 0x68, 0x6c, + 0x7d, 0x8a, 0xb5, 0x52, 0x3d, 0xb9, 0x03, 0xd0, 0xe5, 0xae, 0xdd, 0xe5, 0xbe, 0xe7, 0x8c, 0x68, + 0x65, 0xd5, 0x68, 0x57, 0xd7, 0xaf, 0x74, 0x8e, 0xbd, 0x65, 0xa7, 0xcb, 0xdd, 0x14, 0x63, 0xe1, + 0x73, 0xab, 0x32, 0x95, 0xc8, 0x16, 0x2c, 0x46, 0x4c, 0x39, 0x4f, 0x51, 0x52, 0x58, 0x2d, 0xb7, + 0xab, 0xeb, 0x57, 0x67, 0x90, 0xf3, 0xe7, 0xec, 0x74, 0x53, 0xf0, 0x76, 0xa8, 0xc4, 0xc8, 0x9a, + 0x50, 0xc9, 0x87, 0x70, 0xce, 0xf1, 0xb9, 0xf3, 0xcc, 0x76, 0x78, 0x38, 0x44, 0xa1, 0x50, 0xd0, + 0x5a, 0x1a, 0x9c, 0x56, 0x6f, 0x4e, 0xb4, 0xe4, 0x0a, 0x54, 0x5d, 0xa6, 0x98, 0xcd, 0x1c, 0x07, + 0xa5, 0xa4, 0x67, 0x35, 0x08, 0x12, 0xd5, 0x86, 0xd6, 0x90, 0x27, 0x70, 0x41, 0x03, 0x1c, 0xee, + 0xfb, 0xe8, 0x28, 0x2e, 0xec, 0x88, 0x09, 0x16, 0x48, 0xba, 0xac, 0x43, 0xfb, 0x60, 0xc6, 0xed, + 0xb6, 0x98, 0x62, 0x9b, 0x13, 0x78, 0x57, 0xa3, 0xad, 0x15, 0xf7, 0xb8, 0x92, 0x78, 0xd0, 0xf4, + 0x91, 0xb9, 0x28, 0xe4, 0x53, 0x2f, 0xb2, 0x31, 0xb1, 0x79, 0x3c, 0x9c, 0x1c, 0x70, 0x4e, 0x1f, + 0x70, 0x6d, 0xc6, 0x01, 0x3b, 0x53, 0xd2, 0x76, 0xc6, 0xc9, 0x4e, 0xa1, 0xfe, 0x1b, 0x2c, 0xe4, + 0x26, 0x50, 0x27, 0x96, 0x8a, 0x07, 0x76, 0x5e, 0xe2, 0xb6, 0x44, 0x47, 0xa0, 0xa2, 0x75, 0x1d, + 0xf4, 0x85, 0xd4, 0xbe, 0x35, 0xa9, 0xf7, 0x5d, 0x6d, 0x24, 0x4d, 0x58, 0x12, 0x38, 0xf0, 0xa4, + 0x12, 0x23, 0x4a, 0x34, 0x70, 0x2a, 0x93, 0x4b, 0x50, 0x49, 0x3a, 0x21, 0xf2, 0x7c, 0xae, 0xe8, + 0x8a, 0xae, 0xec, 0x5c, 0xd1, 0xbc, 0x0d, 0xb5, 0xe2, 0xe3, 0x90, 0x3a, 0x94, 0x93, 0xbe, 0x4a, + 0x9b, 0x2e, 0xf9, 0x24, 0xe7, 0xe1, 0xcc, 0x90, 0xf9, 0x31, 0x66, 0xbd, 0x96, 0x0a, 0xb7, 0xe7, + 0x3e, 0x33, 0xee, 0xcf, 0x2f, 0x55, 0xeb, 0xb5, 0xd6, 0xef, 0xf3, 0x50, 0x2b, 0xd6, 0x09, 0xd9, + 0x84, 0x05, 0x9f, 0xf5, 0xd0, 0x97, 0xd4, 0xd0, 0xb5, 0x71, 0xed, 0x84, 0xc2, 0xea, 0xec, 0x68, + 0x74, 0x5a, 0x1c, 0x19, 0x95, 0x58, 0x50, 0x65, 0x61, 0xc8, 0x15, 0x4b, 0xd2, 0x23, 0xe9, 0x9c, + 0xf6, 0xf4, 0xf1, 0x49, 0x9e, 0x36, 0x72, 0x4a, 0xea, 0xae, 0xe8, 0x84, 0x7c, 0x01, 0x15, 0x81, + 0x92, 0xc7, 0xc2, 0x41, 0xa9, 0x27, 0xc2, 0xec, 0xa2, 0xb7, 0x32, 0x8c, 0x85, 0xcf, 0xa5, 0x95, + 0x33, 0xc8, 0x23, 0xa8, 0x85, 0xdc, 0xc5, 0x5d, 0x4c, 0xcb, 0x83, 0xce, 0xeb, 0x3b, 0x5d, 0x3f, + 0xe9, 0x4e, 0x0f, 0x0b, 0x9c, 0xf4, 0x52, 0x47, 0xdc, 0x90, 0xbb, 0x50, 0x55, 0xdc, 0x4f, 0x46, + 0x8c, 0x8e, 0xf4, 0x8c, 0xf6, 0x7a, 0x79, 0x86, 0xd7, 0xef, 0xa7, 0x28, 0xab, 0xc8, 0x68, 0xde, + 0x82, 0x6a, 0x21, 0x83, 0xa7, 0x79, 0xc1, 0xe6, 0x1d, 0xa8, 0xbf, 0x9e, 0xb2, 0x53, 0xf1, 0xef, + 0x42, 0xe3, 0x58, 0x78, 0xa7, 0x71, 0xd0, 0xfa, 0xc9, 0x80, 0x5a, 0x31, 0xdf, 0xe4, 0x26, 0x2c, + 0xe8, 0x31, 0x27, 0x35, 0xff, 0xed, 0x0f, 0xb4, 0xe3, 0x49, 0x65, 0x65, 0x70, 0xf2, 0x79, 0xd2, + 0x02, 0x7a, 0xba, 0x49, 0x7d, 0xcc, 0x3b, 0x50, 0xa7, 0x84, 0xd6, 0xaf, 0x06, 0x40, 0x9e, 0xde, + 0x19, 0x11, 0x34, 0x61, 0x69, 0xba, 0x1d, 0xd2, 0x20, 0xa6, 0x72, 0x1e, 0x5d, 0xb9, 0x10, 0x1d, + 0xb9, 0x08, 0x0b, 0xd8, 0xef, 0xa3, 0xa3, 0xf4, 0x36, 0xa9, 0x58, 0x99, 0x44, 0xee, 0x03, 0xc9, + 0x1f, 0x2f, 0x69, 0x6e, 0x1e, 0xba, 0x52, 0xaf, 0x92, 0xea, 0xfa, 0xff, 0x3b, 0xe9, 0x96, 0xec, + 0x4c, 0xb6, 0x64, 0xe7, 0xeb, 0x50, 0x7d, 0x7a, 0xe3, 0x71, 0xe2, 0xd0, 0x6a, 0xe4, 0xb4, 0xdd, + 0x94, 0xd5, 0xfa, 0xb3, 0x90, 0xbd, 0x24, 0x22, 0xf2, 0x18, 0xce, 0x4e, 0xea, 0xd5, 0xf6, 0x3d, + 0xa9, 0xb2, 0x0e, 0xbc, 0x7e, 0x42, 0x26, 0x8e, 0x08, 0x59, 0x8d, 0x8a, 0x82, 0xaa, 0xe9, 0x42, + 0xe3, 0x18, 0x64, 0x46, 0x96, 0x6e, 0x15, 0xdf, 0xb9, 0xba, 0xfe, 0xfe, 0x5b, 0x8e, 0xfd, 0x2e, + 0x66, 0xa1, 0xf2, 0xd4, 0xa8, 0x58, 0x0c, 0x6d, 0xa8, 0xbf, 0x6e, 0xce, 0x93, 0x6b, 0x14, 0x92, + 0xdb, 0xfa, 0x6b, 0x0e, 0x56, 0x66, 0x0c, 0x70, 0x72, 0x03, 0x2e, 0x26, 0x23, 0x5c, 0x2a, 0x81, + 0x2c, 0xb0, 0x7b, 0x71, 0xbf, 0x8f, 0xc2, 0x96, 0xde, 0x5e, 0x4a, 0x3f, 0x6b, 0x9d, 0xcf, 0xad, + 0xf7, 0xb4, 0x71, 0xd7, 0xdb, 0x43, 0x72, 0x17, 0x2e, 0xcd, 0x60, 0x45, 0xde, 0x33, 0x4c, 0xb9, + 0x73, 0x9a, 0xfb, 0xbf, 0x63, 0xdc, 0x04, 0xa1, 0x1d, 0xbc, 0x80, 0x7a, 0x36, 0xb7, 0x93, 0x1d, + 0xdc, 0xf7, 0xd9, 0x40, 0x66, 0xd3, 0xe1, 0xf6, 0xbb, 0x6d, 0x9e, 0xce, 0xa6, 0xa6, 0x77, 0x31, + 0xf8, 0x32, 0x21, 0xeb, 0xfc, 0xde, 0x23, 0xe3, 0xbf, 0xaf, 0x2c, 0x67, 0x86, 0xed, 0x07, 0xda, + 0x60, 0x2d, 0x3b, 0x47, 0x80, 0xcd, 0x0d, 0x58, 0x99, 0x41, 0x3d, 0xe5, 0x14, 0x2f, 0xd7, 0xe7, + 0x5b, 0x5f, 0x01, 0x7d, 0xd3, 0xc2, 0x4a, 0xfe, 0x2d, 0xf2, 0xb5, 0x87, 0xc2, 0xe3, 0xae, 0x1d, + 0xa4, 0xfd, 0x59, 0xb6, 0xea, 0x13, 0x4b, 0x57, 0x1b, 0x1e, 0xc8, 0x7b, 0x5b, 0xfb, 0x07, 0x66, + 0xe9, 0xe5, 0x81, 0x59, 0x7a, 0x75, 0x60, 0x1a, 0x3f, 0x8e, 0x4d, 0xe3, 0x97, 0xb1, 0x69, 0xfc, + 0x31, 0x36, 0x8d, 0xfd, 0xb1, 0x69, 0xfc, 0x33, 0x36, 0x8d, 0x7f, 0xc7, 0x66, 0xe9, 0xd5, 0xd8, + 0x34, 0x7e, 0x3e, 0x34, 0x4b, 0xfb, 0x87, 0x66, 0xe9, 0xe5, 0xa1, 0x59, 0x7a, 0xb2, 0x7c, 0x34, + 0x49, 0xbd, 0x05, 0xdd, 0x02, 0x9f, 0xfc, 0x17, 0x00, 0x00, 0xff, 0xff, 0xef, 0x8c, 0xa7, 0x35, + 0x92, 0x0a, 0x00, 0x00, } func (this *VizierSpec) Equal(that interface{}) bool { diff --git a/src/api/proto/vizierconfigpb/vizier_types.proto b/src/api/proto/vizierconfigpb/vizier_types.proto index 99054cf221a..d5773e45a03 100644 --- a/src/api/proto/vizierconfigpb/vizier_types.proto +++ b/src/api/proto/vizierconfigpb/vizier_types.proto @@ -22,7 +22,7 @@ package px.vizierconfigpb; option go_package = "vizierconfigpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/wrappers.proto"; // Note: Any changes to this file should be in sync with operatpro/api/v1alpha1/vizier_types.go. diff --git a/src/api/proto/vizierpb/BUILD.bazel b/src/api/proto/vizierpb/BUILD.bazel index 52491b1b7a4..f49b05407a1 100644 --- a/src/api/proto/vizierpb/BUILD.bazel +++ b/src/api/proto/vizierpb/BUILD.bazel @@ -22,7 +22,7 @@ pl_proto_library( srcs = ["vizierapi.proto"], visibility = ["//src:__subpackages__"], deps = [ - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -31,7 +31,7 @@ pl_cc_proto_library( proto = ":vizier_pl_proto", visibility = ["//src:__subpackages__"], deps = [ - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/api/proto/vizierpb/vizierapi.pb.go b/src/api/proto/vizierpb/vizierapi.pb.go index 66d1912cbe6..9f953d98bce 100755 --- a/src/api/proto/vizierpb/vizierapi.pb.go +++ b/src/api/proto/vizierpb/vizierapi.pb.go @@ -2740,192 +2740,191 @@ func init() { } var fileDescriptor_1d71b88d88e6e715 = []byte{ - // 2960 bytes of a gzipped FileDescriptorProto + // 2942 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x59, 0x4d, 0x6c, 0x1b, 0xc7, - 0xf5, 0xe7, 0x92, 0x14, 0x3f, 0x1e, 0x49, 0x69, 0x35, 0x56, 0x6c, 0x99, 0x89, 0xa9, 0x84, 0x76, - 0xfc, 0x37, 0xec, 0xfc, 0xa5, 0x44, 0x71, 0x5c, 0x23, 0x68, 0xd2, 0xf0, 0x63, 0x65, 0x32, 0xb1, - 0x96, 0xf4, 0xec, 0x32, 0x41, 0xd2, 0xc3, 0x66, 0xb5, 0x1c, 0x49, 0x1b, 0x93, 0xbb, 0xcc, 0xee, - 0xd2, 0xb2, 0x7a, 0x28, 0x72, 0x68, 0x1b, 0xa0, 0x97, 0xa6, 0x45, 0x0e, 0xbd, 0x14, 0x28, 0x0a, - 0x14, 0xc8, 0x21, 0x45, 0x7b, 0xcc, 0x21, 0xed, 0x39, 0x05, 0x7a, 0xc8, 0x31, 0xfd, 0x80, 0xd0, - 0x28, 0x97, 0xf4, 0xd4, 0x1c, 0x5a, 0x20, 0xc7, 0x62, 0x3e, 0x96, 0xda, 0x15, 0x29, 0xc5, 0xf1, - 0x49, 0x3b, 0x6f, 0x7e, 0xef, 0xf7, 0xde, 0xbc, 0x37, 0xf3, 0xe6, 0x0d, 0x05, 0x97, 0x7d, 0xcf, - 0x5a, 0x33, 0x47, 0xf6, 0xda, 0xc8, 0x73, 0x03, 0x77, 0xed, 0x9e, 0xfd, 0x03, 0x9b, 0x78, 0xa3, - 0x2d, 0xf1, 0x61, 0x8e, 0xec, 0x55, 0x36, 0x81, 0x16, 0x46, 0xf7, 0x57, 0xe9, 0x28, 0x04, 0x94, - 0xff, 0x7f, 0xc7, 0x0e, 0x76, 0xc7, 0x5b, 0xab, 0x96, 0x3b, 0x5c, 0xdb, 0x71, 0x77, 0x5c, 0x4e, - 0xb0, 0x35, 0xde, 0x66, 0x23, 0xce, 0x46, 0xbf, 0xb8, 0x7e, 0x75, 0x0d, 0xb2, 0xbd, 0xb6, 0x13, - 0x3c, 0xb3, 0x7e, 0x13, 0xc9, 0x90, 0x1a, 0xb8, 0x7b, 0xcb, 0xd2, 0xe3, 0xd2, 0x95, 0x34, 0xa6, - 0x9f, 0x08, 0x41, 0x7a, 0xd7, 0xde, 0xd9, 0x5d, 0x4e, 0x32, 0x11, 0xfb, 0xae, 0x5e, 0x84, 0x52, - 0xdd, 0x75, 0x07, 0xc4, 0x74, 0x1a, 0xee, 0x60, 0x3c, 0x74, 0x28, 0xa8, 0x6f, 0x06, 0xe6, 0xb2, - 0xf4, 0x78, 0xea, 0x4a, 0x0e, 0xb3, 0xef, 0xea, 0x13, 0x50, 0x68, 0x3b, 0xc1, 0x8d, 0xeb, 0x33, - 0x20, 0x29, 0x01, 0x79, 0x01, 0x4a, 0xc2, 0xb0, 0x00, 0x3d, 0x15, 0x01, 0x15, 0xd6, 0x97, 0x57, - 0x8f, 0x2d, 0x6c, 0x55, 0xa0, 0x85, 0xfa, 0x45, 0x28, 0x6d, 0x0c, 0x5c, 0x73, 0xb6, 0x0d, 0x49, - 0x80, 0x2e, 0xc1, 0xbc, 0x6e, 0x0f, 0xc9, 0x8d, 0xeb, 0xaa, 0x76, 0x8a, 0x27, 0x55, 0x28, 0x6a, - 0x81, 0x67, 0x3b, 0x3b, 0x33, 0x30, 0x45, 0x81, 0xf9, 0x30, 0x05, 0x19, 0x31, 0xdd, 0x80, 0xe2, - 0x16, 0x0f, 0x80, 0x21, 0x60, 0xd2, 0x95, 0xc2, 0x7a, 0x65, 0xca, 0xdf, 0x58, 0x94, 0x5a, 0x09, - 0x5c, 0x10, 0x5a, 0x4d, 0x33, 0x30, 0xd1, 0x0b, 0x00, 0x36, 0x0d, 0x10, 0xa7, 0x48, 0x32, 0x8a, - 0xc7, 0xa6, 0x28, 0x22, 0x31, 0x6c, 0x25, 0x70, 0x9e, 0x69, 0x30, 0xf5, 0x06, 0x14, 0xc7, 0x36, - 0x0b, 0x07, 0x27, 0x48, 0x9d, 0xe0, 0x43, 0x2c, 0xc2, 0xd4, 0x07, 0xa1, 0xc5, 0x48, 0x36, 0xa0, - 0x14, 0xb0, 0xe8, 0x38, 0x3e, 0x67, 0x49, 0x33, 0x96, 0x95, 0x29, 0x96, 0x78, 0x0c, 0x5b, 0x09, - 0x5c, 0x0c, 0xf5, 0x42, 0x67, 0xb6, 0x79, 0x2a, 0x38, 0xcd, 0xdc, 0x09, 0xce, 0xc4, 0xf2, 0x45, - 0x9d, 0x11, 0x5a, 0x8c, 0xe4, 0x25, 0x28, 0xf8, 0x2c, 0x09, 0x9c, 0x23, 0xc3, 0x38, 0x2e, 0x4c, - 0x71, 0x44, 0x13, 0xd5, 0x4a, 0x60, 0xe0, 0x3a, 0x94, 0xa1, 0x0e, 0x90, 0xb3, 0xdc, 0x01, 0x53, - 0xaf, 0xfe, 0x46, 0x82, 0x22, 0x76, 0xf7, 0xea, 0x66, 0x60, 0xed, 0x32, 0xfa, 0xcb, 0x90, 0x0b, - 0xcc, 0xad, 0x01, 0x31, 0xec, 0x3e, 0xf3, 0x2f, 0x5f, 0x2f, 0x1c, 0x1e, 0xac, 0x64, 0x75, 0x2a, - 0x6b, 0x37, 0x71, 0x96, 0x4d, 0xb6, 0xfb, 0xe8, 0x1a, 0xa4, 0x2d, 0x77, 0xe0, 0x8b, 0x4d, 0x78, - 0x6e, 0xca, 0x3e, 0xb7, 0x8c, 0x19, 0x08, 0x9d, 0x87, 0x9c, 0x33, 0x1e, 0x1a, 0x9e, 0xbb, 0xe7, - 0xb3, 0x14, 0xa6, 0x70, 0xd6, 0x19, 0x0f, 0xb1, 0xbb, 0xe7, 0xd3, 0xb3, 0x44, 0xdc, 0x3d, 0x96, - 0x97, 0x1c, 0xa6, 0x9f, 0x5c, 0xe2, 0xb3, 0x18, 0x33, 0x89, 0x5f, 0xfd, 0x20, 0x09, 0x39, 0x4c, - 0x06, 0x66, 0x60, 0xbb, 0x0e, 0x7a, 0x11, 0xb2, 0x16, 0xe3, 0x0e, 0x6d, 0x5f, 0x9a, 0xb2, 0x1d, - 0x62, 0x85, 0x13, 0x6d, 0x67, 0xdb, 0xc5, 0xa1, 0x52, 0xf9, 0xef, 0x12, 0xc0, 0x91, 0x1c, 0xad, - 0x40, 0x81, 0xcf, 0x18, 0x8e, 0x39, 0x24, 0x6c, 0x8f, 0xe6, 0x31, 0x70, 0x91, 0x6a, 0x0e, 0x09, - 0x7a, 0x7e, 0x02, 0x08, 0xf6, 0x47, 0x84, 0xb9, 0x3f, 0xbf, 0x7e, 0x7e, 0xca, 0x26, 0x0d, 0x9e, - 0xbe, 0x3f, 0x22, 0xa1, 0x2e, 0xfd, 0x8e, 0x90, 0xf7, 0x89, 0x6f, 0xb1, 0x45, 0x4e, 0xc8, 0x9b, - 0xc4, 0xb7, 0x50, 0x07, 0x96, 0x04, 0xc0, 0x27, 0x43, 0xd3, 0x09, 0x6c, 0x8b, 0x5b, 0x49, 0x33, - 0x2b, 0x33, 0xb2, 0x2a, 0x50, 0xcc, 0x12, 0xe2, 0xaa, 0x51, 0x59, 0xb5, 0x07, 0xa5, 0x86, 0x3b, - 0x1c, 0xd9, 0x03, 0xe2, 0x29, 0x9e, 0xe7, 0x7a, 0xf4, 0x8c, 0x0e, 0x6c, 0x87, 0x88, 0x62, 0xc5, - 0xbe, 0xd1, 0x59, 0xc8, 0x70, 0x55, 0x51, 0xaf, 0xc4, 0x08, 0x2d, 0x43, 0x76, 0x48, 0x7c, 0xdf, - 0xdc, 0x21, 0xc2, 0xd5, 0x70, 0x58, 0x7d, 0x13, 0x8a, 0x8c, 0xae, 0x49, 0x02, 0xd3, 0x1e, 0xf8, - 0xe8, 0x16, 0xcc, 0x5b, 0xc2, 0x8c, 0x41, 0xe8, 0xc4, 0x89, 0x87, 0x3b, 0xe6, 0x4d, 0x2b, 0x81, - 0x4b, 0x56, 0x54, 0x50, 0xcf, 0xc2, 0x1c, 0xd3, 0xaf, 0xbe, 0x23, 0x41, 0x46, 0x0b, 0xcc, 0x60, - 0xec, 0x53, 0x97, 0x2d, 0xb7, 0xcf, 0x5d, 0x9e, 0xc3, 0xec, 0x3b, 0xea, 0x5a, 0x32, 0xe6, 0x1a, - 0xaa, 0x43, 0x89, 0x31, 0x18, 0x7d, 0xee, 0xdb, 0x72, 0x9a, 0xed, 0x8a, 0xe9, 0xd8, 0x45, 0x17, - 0x80, 0x8b, 0x24, 0x32, 0x7a, 0x39, 0x9d, 0x4b, 0xc9, 0xe9, 0xea, 0x9f, 0x93, 0x50, 0xd0, 0x2c, - 0x73, 0x60, 0x7a, 0xaf, 0x9a, 0x83, 0x31, 0x41, 0x37, 0x20, 0x4f, 0xcf, 0x08, 0xcf, 0x88, 0xf4, - 0x4d, 0x79, 0xcf, 0xf5, 0xc5, 0x17, 0x5a, 0x01, 0xa0, 0x15, 0xcc, 0xb8, 0x47, 0x59, 0x98, 0xbb, - 0x39, 0x5a, 0x94, 0xa8, 0x8c, 0x13, 0x3f, 0x01, 0x05, 0x5e, 0xd3, 0x38, 0x82, 0xc6, 0x3a, 0x45, - 0xcf, 0x28, 0x13, 0x72, 0xc8, 0x93, 0x50, 0x0a, 0x4b, 0x05, 0x07, 0xd1, 0x1d, 0x21, 0xd1, 0x8a, - 0x22, 0xc4, 0x1c, 0x76, 0x11, 0x8a, 0xa2, 0x18, 0x70, 0x14, 0x3b, 0xb1, 0xb4, 0x62, 0x70, 0x29, - 0x07, 0x5d, 0x81, 0x05, 0x5e, 0x86, 0x0c, 0xc7, 0x17, 0xb8, 0x8c, 0x30, 0x29, 0xea, 0x9a, 0xea, - 0x73, 0xe4, 0xf7, 0xa0, 0x14, 0x56, 0x4b, 0x8e, 0xcb, 0xb2, 0xac, 0x9e, 0x78, 0xc5, 0x50, 0x7f, - 0x84, 0x02, 0x23, 0xa0, 0xe9, 0x64, 0x8a, 0xd5, 0x3f, 0x65, 0x60, 0x49, 0xb9, 0x4f, 0xac, 0x71, - 0x40, 0x34, 0xcb, 0xb3, 0x47, 0x01, 0x26, 0x6f, 0x8f, 0x89, 0x1f, 0xa0, 0x47, 0x21, 0xff, 0xf6, - 0x98, 0x78, 0xfb, 0x86, 0x1f, 0x78, 0xe2, 0xb4, 0xe5, 0x98, 0x40, 0x0b, 0x3c, 0xf4, 0x14, 0x80, - 0x35, 0x18, 0xfb, 0x01, 0xf1, 0x68, 0xf9, 0x61, 0x7b, 0xb0, 0x5e, 0x3a, 0x3c, 0x58, 0xc9, 0x37, - 0xb8, 0xb4, 0xdd, 0xc4, 0x79, 0x01, 0x68, 0xf7, 0x11, 0x06, 0x20, 0xf7, 0x89, 0x65, 0x6c, 0x8f, - 0x1d, 0x2b, 0x4c, 0xfb, 0xb3, 0xd3, 0x69, 0x9f, 0xe1, 0xc5, 0xea, 0xc6, 0xd8, 0xb1, 0x74, 0x57, - 0x4c, 0xe1, 0x3c, 0xa5, 0xa1, 0x22, 0x1f, 0x95, 0x21, 0x37, 0x1c, 0x07, 0xac, 0x7a, 0xb0, 0x60, - 0xe6, 0xf0, 0x64, 0x8c, 0xb6, 0x01, 0x11, 0xc7, 0xf2, 0xf6, 0x47, 0x74, 0x64, 0xb8, 0xec, 0x8f, - 0x2f, 0x0a, 0xf0, 0x77, 0x1e, 0xcc, 0xae, 0x32, 0xd1, 0xef, 0x70, 0x75, 0xbc, 0x48, 0x8e, 0x8b, - 0x68, 0x09, 0xe6, 0x21, 0xb2, 0xfb, 0x2c, 0x01, 0xa2, 0x04, 0xdf, 0xa1, 0x32, 0x5a, 0x82, 0xd9, - 0x64, 0xbb, 0x8f, 0xd6, 0x69, 0x25, 0x74, 0xb6, 0xed, 0x1d, 0x7f, 0x39, 0x7f, 0x42, 0x9e, 0x1a, - 0x7c, 0x1e, 0x87, 0x40, 0x74, 0x01, 0x80, 0x73, 0xb3, 0x6a, 0x07, 0x2c, 0xfe, 0x3c, 0x21, 0xb4, - 0xd8, 0x95, 0xff, 0x2d, 0x41, 0x29, 0x16, 0x1b, 0x9a, 0x2f, 0x1a, 0xdf, 0x68, 0x75, 0xcc, 0x51, - 0x01, 0xab, 0x8d, 0xdf, 0x07, 0x30, 0x3d, 0xb1, 0xf7, 0x68, 0x65, 0xa7, 0x19, 0xf8, 0xee, 0x43, - 0x64, 0x60, 0xb5, 0xe6, 0xf1, 0xbd, 0x8a, 0xf3, 0xa6, 0xf8, 0xf2, 0xd1, 0x2a, 0x9c, 0x71, 0xc7, - 0xc1, 0x68, 0x1c, 0x18, 0xfc, 0x42, 0x1a, 0x79, 0x64, 0xdb, 0xbe, 0x2f, 0x2a, 0xd3, 0x22, 0x9f, - 0x62, 0xd7, 0x52, 0x97, 0x4d, 0x94, 0xaf, 0x43, 0x2e, 0xa4, 0xa1, 0x25, 0x24, 0xe2, 0x30, 0xfb, - 0x46, 0x4b, 0x62, 0x6f, 0x8a, 0x02, 0xc2, 0x07, 0xe5, 0x9f, 0x49, 0xb0, 0x38, 0x95, 0x15, 0x74, - 0x0e, 0xb2, 0x6f, 0xed, 0xdd, 0x35, 0xee, 0x92, 0x7d, 0x41, 0x91, 0x79, 0x6b, 0xef, 0xee, 0x2b, - 0x64, 0x9f, 0x4e, 0xdc, 0x25, 0xfb, 0x86, 0x39, 0xd8, 0x11, 0x34, 0x99, 0xbb, 0x64, 0xbf, 0x36, - 0xd8, 0xe1, 0xa5, 0xde, 0x09, 0x88, 0x13, 0xb0, 0xc9, 0x49, 0xa9, 0x67, 0x22, 0x0a, 0xf8, 0x3f, - 0x58, 0xa0, 0xa5, 0xcf, 0x23, 0xbe, 0x4f, 0xb7, 0x0f, 0x05, 0xa5, 0x19, 0x68, 0x3e, 0x22, 0xae, - 0x0d, 0x76, 0x5e, 0x4e, 0xe7, 0x92, 0x72, 0xaa, 0xfa, 0xcb, 0x34, 0x64, 0x45, 0xf6, 0xd0, 0x18, - 0x96, 0xdc, 0x80, 0x0c, 0x0c, 0xe2, 0xf4, 0x47, 0xae, 0xed, 0x04, 0x06, 0xcf, 0xa6, 0xa8, 0xb9, - 0xd7, 0x4e, 0xca, 0xfa, 0x6a, 0x47, 0x27, 0x03, 0x45, 0xe8, 0x70, 0x59, 0xfd, 0xec, 0xe1, 0xc1, - 0x0a, 0x9a, 0x96, 0x63, 0x44, 0x0d, 0xc4, 0x65, 0xe8, 0x65, 0x28, 0x8d, 0x06, 0xe3, 0x1d, 0xdb, - 0x09, 0xed, 0xf1, 0xee, 0xeb, 0xc9, 0x13, 0xed, 0x75, 0x19, 0x5a, 0x30, 0x16, 0x47, 0x91, 0x51, - 0xf9, 0xbf, 0x12, 0xcc, 0x30, 0x8b, 0xce, 0x43, 0x6a, 0xec, 0x0d, 0x78, 0x8c, 0xeb, 0xd9, 0xc3, - 0x83, 0x95, 0x54, 0x0f, 0xdf, 0xc6, 0x54, 0x86, 0x30, 0x64, 0x77, 0x89, 0xd9, 0x27, 0x5e, 0xb8, - 0xb1, 0x6e, 0x7e, 0x8b, 0x75, 0xae, 0xb6, 0xb8, 0xaa, 0xe2, 0x04, 0xde, 0x3e, 0x0e, 0x89, 0xe8, - 0xe9, 0xb6, 0x1d, 0x9f, 0x58, 0x63, 0x8f, 0x88, 0x8e, 0x63, 0x32, 0xa6, 0x37, 0x0c, 0x2d, 0x86, + 0x15, 0xe6, 0x92, 0x14, 0x7f, 0x1e, 0x49, 0x69, 0x35, 0x56, 0x6c, 0x99, 0x89, 0xa9, 0x84, 0x76, + 0x5c, 0xc3, 0x0e, 0xe4, 0x44, 0x71, 0x5c, 0x23, 0x68, 0xd2, 0xf0, 0x67, 0x65, 0x6e, 0x62, 0x2d, + 0xe9, 0xd9, 0x65, 0x82, 0xa4, 0x87, 0xcd, 0x9a, 0x1c, 0x49, 0x1b, 0x93, 0xbb, 0xcc, 0xee, 0xd2, + 0xb2, 0x7a, 0x28, 0x72, 0x68, 0x1b, 0xa0, 0x97, 0xa6, 0x45, 0x0e, 0xbd, 0x14, 0x28, 0x0a, 0x14, + 0xc8, 0x21, 0x45, 0x7b, 0xcc, 0x21, 0xed, 0x39, 0x05, 0x7a, 0xc8, 0x31, 0xfd, 0x81, 0xd0, 0x30, + 0x97, 0xf4, 0xd4, 0x1c, 0x5a, 0x20, 0xc7, 0x62, 0x7e, 0x96, 0xda, 0x15, 0x29, 0xc5, 0xf1, 0x49, + 0x3b, 0x6f, 0xbe, 0xf7, 0xbd, 0x37, 0xef, 0xcd, 0xbc, 0x79, 0x43, 0xc1, 0x45, 0xdf, 0xeb, 0x5d, + 0xb5, 0x46, 0xf6, 0xd5, 0x91, 0xe7, 0x06, 0xee, 0xd5, 0x7b, 0xf6, 0x0f, 0x6d, 0xe2, 0x8d, 0xee, + 0x88, 0x0f, 0x6b, 0x64, 0xaf, 0xb3, 0x09, 0xb4, 0x34, 0xba, 0xbf, 0x4e, 0x47, 0x21, 0xa0, 0xbc, + 0xb2, 0xe3, 0xee, 0xb8, 0x5c, 0x89, 0x7e, 0x71, 0x58, 0xf5, 0x2a, 0x64, 0xbb, 0xaa, 0x13, 0x3c, + 0xb3, 0x71, 0x03, 0xc9, 0x90, 0x1a, 0xb8, 0x7b, 0xab, 0xd2, 0xe3, 0xd2, 0xa5, 0x34, 0xa6, 0x9f, + 0x08, 0x41, 0x7a, 0xd7, 0xde, 0xd9, 0x5d, 0x4d, 0x32, 0x11, 0xfb, 0xae, 0x9e, 0x87, 0x52, 0xdd, + 0x75, 0x07, 0xc4, 0x72, 0x1a, 0xee, 0x60, 0x3c, 0x74, 0x28, 0xa8, 0x6f, 0x05, 0xd6, 0xaa, 0xf4, + 0x78, 0xea, 0x52, 0x0e, 0xb3, 0xef, 0xea, 0x13, 0x50, 0x50, 0x9d, 0xe0, 0xfa, 0xb5, 0x39, 0x90, + 0x94, 0x80, 0xbc, 0x00, 0x25, 0x61, 0x58, 0x80, 0x9e, 0x8a, 0x80, 0x0a, 0x1b, 0xab, 0xeb, 0x47, + 0xfc, 0x5f, 0x17, 0x68, 0xa1, 0x7e, 0x1e, 0x4a, 0x9b, 0x03, 0xd7, 0x9a, 0x6f, 0x43, 0x12, 0xa0, + 0x0b, 0xb0, 0x68, 0xd8, 0x43, 0x72, 0xfd, 0x9a, 0xa6, 0x9f, 0xe0, 0x49, 0x15, 0x8a, 0x7a, 0xe0, + 0xd9, 0xce, 0xce, 0x1c, 0x4c, 0x51, 0x60, 0x3e, 0x4c, 0x41, 0x46, 0x4c, 0x37, 0xa0, 0x78, 0x87, + 0x07, 0xc0, 0x14, 0x30, 0xe9, 0x52, 0x61, 0xa3, 0x32, 0xe3, 0x6f, 0x2c, 0x4a, 0xad, 0x04, 0x2e, + 0x08, 0xad, 0xa6, 0x15, 0x58, 0xe8, 0x05, 0x00, 0x9b, 0x06, 0x88, 0x53, 0x24, 0x19, 0xc5, 0x63, + 0x33, 0x14, 0x91, 0x18, 0xb6, 0x12, 0x38, 0xcf, 0x34, 0x98, 0x7a, 0x03, 0x8a, 0x63, 0x9b, 0x85, + 0x83, 0x13, 0xa4, 0x8e, 0xf1, 0x21, 0x16, 0x61, 0xea, 0x83, 0xd0, 0x62, 0x24, 0x9b, 0x50, 0x0a, + 0x58, 0x74, 0x1c, 0x9f, 0xb3, 0xa4, 0x19, 0xcb, 0xda, 0x0c, 0x4b, 0x3c, 0x86, 0xad, 0x04, 0x2e, + 0x86, 0x7a, 0xa1, 0x33, 0xdb, 0x3c, 0x15, 0x9c, 0x66, 0xe1, 0x18, 0x67, 0x62, 0xf9, 0xa2, 0xce, + 0x08, 0x2d, 0x46, 0xf2, 0x12, 0x14, 0x7c, 0x96, 0x04, 0xce, 0x91, 0x61, 0x1c, 0xe7, 0x66, 0x38, + 0xa2, 0x89, 0x6a, 0x25, 0x30, 0x70, 0x1d, 0xca, 0x50, 0x07, 0xc8, 0xf5, 0xdc, 0x01, 0x53, 0xaf, + 0xfe, 0x56, 0x82, 0x22, 0x76, 0xf7, 0xea, 0x56, 0xd0, 0xdb, 0x65, 0xf4, 0x17, 0x21, 0x17, 0x58, + 0x77, 0x06, 0xc4, 0xb4, 0xfb, 0xcc, 0xbf, 0x7c, 0xbd, 0x30, 0x39, 0x58, 0xcb, 0x1a, 0x54, 0xa6, + 0x36, 0x71, 0x96, 0x4d, 0xaa, 0x7d, 0x74, 0x05, 0xd2, 0x3d, 0x77, 0xe0, 0x8b, 0x4d, 0x78, 0x66, + 0xc6, 0x3e, 0xb7, 0x8c, 0x19, 0x08, 0x9d, 0x85, 0x9c, 0x33, 0x1e, 0x9a, 0x9e, 0xbb, 0xe7, 0xb3, + 0x14, 0xa6, 0x70, 0xd6, 0x19, 0x0f, 0xb1, 0xbb, 0xe7, 0xd3, 0xb3, 0x44, 0xdc, 0x3d, 0x96, 0x97, + 0x1c, 0xa6, 0x9f, 0x5c, 0xe2, 0xb3, 0x18, 0x33, 0x89, 0x5f, 0xfd, 0x20, 0x09, 0x39, 0x4c, 0x06, + 0x56, 0x60, 0xbb, 0x0e, 0x7a, 0x11, 0xb2, 0x3d, 0xc6, 0x1d, 0xda, 0xbe, 0x30, 0x63, 0x3b, 0xc4, + 0x0a, 0x27, 0x54, 0x67, 0xdb, 0xc5, 0xa1, 0x52, 0xf9, 0x1f, 0x12, 0xc0, 0xa1, 0x1c, 0xad, 0x41, + 0x81, 0xcf, 0x98, 0x8e, 0x35, 0x24, 0x6c, 0x8f, 0xe6, 0x31, 0x70, 0x91, 0x66, 0x0d, 0x09, 0x7a, + 0x7e, 0x0a, 0x08, 0xf6, 0x47, 0x84, 0xb9, 0xbf, 0xb8, 0x71, 0x76, 0xc6, 0x26, 0x0d, 0x9e, 0xb1, + 0x3f, 0x22, 0xa1, 0x2e, 0xfd, 0x8e, 0x90, 0xf7, 0x89, 0xdf, 0x63, 0x8b, 0x9c, 0x92, 0x37, 0x89, + 0xdf, 0x43, 0x6d, 0x58, 0x11, 0x00, 0x9f, 0x0c, 0x2d, 0x27, 0xb0, 0x7b, 0xdc, 0x4a, 0x9a, 0x59, + 0x99, 0x93, 0x55, 0x81, 0x62, 0x96, 0x10, 0x57, 0x8d, 0xca, 0xaa, 0x5d, 0x28, 0x35, 0xdc, 0xe1, + 0xc8, 0x1e, 0x10, 0x4f, 0xf1, 0x3c, 0xd7, 0xa3, 0x67, 0x74, 0x60, 0x3b, 0x44, 0x14, 0x2b, 0xf6, + 0x8d, 0x4e, 0x43, 0x86, 0xab, 0x8a, 0x7a, 0x25, 0x46, 0x68, 0x15, 0xb2, 0x43, 0xe2, 0xfb, 0xd6, + 0x0e, 0x11, 0xae, 0x86, 0xc3, 0xea, 0x9b, 0x50, 0x64, 0x74, 0x4d, 0x12, 0x58, 0xf6, 0xc0, 0x47, + 0x37, 0x61, 0xb1, 0x27, 0xcc, 0x98, 0x84, 0x4e, 0x1c, 0x7b, 0xb8, 0x63, 0xde, 0xb4, 0x12, 0xb8, + 0xd4, 0x8b, 0x0a, 0xea, 0x59, 0x58, 0x60, 0xfa, 0xd5, 0x77, 0x24, 0xc8, 0xe8, 0x81, 0x15, 0x8c, + 0x7d, 0xea, 0x72, 0xcf, 0xed, 0x73, 0x97, 0x17, 0x30, 0xfb, 0x8e, 0xba, 0x96, 0x8c, 0xb9, 0x86, + 0xea, 0x50, 0x62, 0x0c, 0x66, 0x9f, 0xfb, 0xb6, 0x9a, 0x66, 0xbb, 0x62, 0x36, 0x76, 0xd1, 0x05, + 0xe0, 0x22, 0x89, 0x8c, 0x5e, 0x4e, 0xe7, 0x52, 0x72, 0xba, 0xfa, 0x97, 0x24, 0x14, 0xf4, 0x9e, + 0x35, 0xb0, 0xbc, 0x57, 0xad, 0xc1, 0x98, 0xa0, 0xeb, 0x90, 0xa7, 0x67, 0x84, 0x67, 0x44, 0xfa, + 0xa6, 0xbc, 0xe7, 0xfa, 0xe2, 0x0b, 0xad, 0x01, 0xd0, 0x0a, 0x66, 0xde, 0xa3, 0x2c, 0xcc, 0xdd, + 0x1c, 0x2d, 0x4a, 0x54, 0xc6, 0x89, 0x9f, 0x80, 0x02, 0xaf, 0x69, 0x1c, 0x41, 0x63, 0x9d, 0xa2, + 0x67, 0x94, 0x09, 0x39, 0xe4, 0x49, 0x28, 0x85, 0xa5, 0x82, 0x83, 0xe8, 0x8e, 0x90, 0x68, 0x45, + 0x11, 0x62, 0x0e, 0x3b, 0x0f, 0x45, 0x51, 0x0c, 0x38, 0x8a, 0x9d, 0x58, 0x5a, 0x31, 0xb8, 0x94, + 0x83, 0x2e, 0xc1, 0x12, 0x2f, 0x43, 0xa6, 0xe3, 0x0b, 0x5c, 0x46, 0x98, 0x14, 0x75, 0x4d, 0xf3, + 0x39, 0xf2, 0xfb, 0x50, 0x0a, 0xab, 0x25, 0xc7, 0x65, 0x59, 0x56, 0x8f, 0xbd, 0x62, 0xa8, 0x3f, + 0x42, 0x81, 0x11, 0xd0, 0x74, 0x32, 0xc5, 0xea, 0x9f, 0x33, 0xb0, 0xa2, 0xdc, 0x27, 0xbd, 0x71, + 0x40, 0xf4, 0x9e, 0x67, 0x8f, 0x02, 0x4c, 0xde, 0x1e, 0x13, 0x3f, 0x40, 0x8f, 0x42, 0xfe, 0xed, + 0x31, 0xf1, 0xf6, 0x4d, 0x3f, 0xf0, 0xc4, 0x69, 0xcb, 0x31, 0x81, 0x1e, 0x78, 0xe8, 0x29, 0x80, + 0xde, 0x60, 0xec, 0x07, 0xc4, 0xa3, 0xe5, 0x87, 0xed, 0xc1, 0x7a, 0x69, 0x72, 0xb0, 0x96, 0x6f, + 0x70, 0xa9, 0xda, 0xc4, 0x79, 0x01, 0x50, 0xfb, 0x08, 0x03, 0x90, 0xfb, 0xa4, 0x67, 0x6e, 0x8f, + 0x9d, 0x5e, 0x98, 0xf6, 0x67, 0x67, 0xd3, 0x3e, 0xc7, 0x8b, 0xf5, 0xcd, 0xb1, 0xd3, 0x33, 0x5c, + 0x31, 0x85, 0xf3, 0x94, 0x86, 0x8a, 0x7c, 0x54, 0x86, 0xdc, 0x70, 0x1c, 0xb0, 0xea, 0xc1, 0x82, + 0x99, 0xc3, 0xd3, 0x31, 0xda, 0x06, 0x44, 0x9c, 0x9e, 0xb7, 0x3f, 0xa2, 0x23, 0xd3, 0x65, 0x7f, + 0x7c, 0x51, 0x80, 0xbf, 0xfb, 0x60, 0x76, 0x95, 0xa9, 0x7e, 0x9b, 0xab, 0xe3, 0x65, 0x72, 0x54, + 0x44, 0x4b, 0x30, 0x0f, 0x91, 0xdd, 0x67, 0x09, 0x10, 0x25, 0xf8, 0x36, 0x95, 0xd1, 0x12, 0xcc, + 0x26, 0xd5, 0x3e, 0xda, 0xa0, 0x95, 0xd0, 0xd9, 0xb6, 0x77, 0xfc, 0xd5, 0xfc, 0x31, 0x79, 0x6a, + 0xf0, 0x79, 0x1c, 0x02, 0xd1, 0x39, 0x00, 0xce, 0xcd, 0xaa, 0x1d, 0xb0, 0xf8, 0xf3, 0x84, 0xd0, + 0x62, 0x57, 0xfe, 0x8f, 0x04, 0xa5, 0x58, 0x6c, 0x68, 0xbe, 0x68, 0x7c, 0xa3, 0xd5, 0x31, 0x47, + 0x05, 0xac, 0x36, 0xfe, 0x00, 0xc0, 0xf2, 0xc4, 0xde, 0xa3, 0x95, 0x9d, 0x66, 0xe0, 0x7b, 0x0f, + 0x91, 0x81, 0xf5, 0x9a, 0xc7, 0xf7, 0x2a, 0xce, 0x5b, 0xe2, 0xcb, 0x47, 0xeb, 0x70, 0xca, 0x1d, + 0x07, 0xa3, 0x71, 0x60, 0xf2, 0x0b, 0x69, 0xe4, 0x91, 0x6d, 0xfb, 0xbe, 0xa8, 0x4c, 0xcb, 0x7c, + 0x8a, 0x5d, 0x4b, 0x1d, 0x36, 0x51, 0xbe, 0x06, 0xb9, 0x90, 0x86, 0x96, 0x90, 0x88, 0xc3, 0xec, + 0x1b, 0xad, 0x88, 0xbd, 0x29, 0x0a, 0x08, 0x1f, 0x94, 0x7f, 0x2e, 0xc1, 0xf2, 0x4c, 0x56, 0xd0, + 0x19, 0xc8, 0xbe, 0xb5, 0x77, 0xd7, 0xbc, 0x4b, 0xf6, 0x05, 0x45, 0xe6, 0xad, 0xbd, 0xbb, 0xaf, + 0x90, 0x7d, 0x3a, 0x71, 0x97, 0xec, 0x9b, 0xd6, 0x60, 0x47, 0xd0, 0x64, 0xee, 0x92, 0xfd, 0xda, + 0x60, 0x87, 0x97, 0x7a, 0x27, 0x20, 0x4e, 0xc0, 0x26, 0xa7, 0xa5, 0x9e, 0x89, 0x28, 0xe0, 0x3b, + 0xb0, 0x44, 0x4b, 0x9f, 0x47, 0x7c, 0x9f, 0x6e, 0x1f, 0x0a, 0x4a, 0x33, 0xd0, 0x62, 0x44, 0x5c, + 0x1b, 0xec, 0xbc, 0x9c, 0xce, 0x25, 0xe5, 0x54, 0xf5, 0x57, 0x69, 0xc8, 0x8a, 0xec, 0xa1, 0x31, + 0xac, 0xb8, 0x01, 0x19, 0x98, 0xc4, 0xe9, 0x8f, 0x5c, 0xdb, 0x09, 0x4c, 0x9e, 0x4d, 0x51, 0x73, + 0xaf, 0x1c, 0x97, 0xf5, 0xf5, 0xb6, 0x41, 0x06, 0x8a, 0xd0, 0xe1, 0xb2, 0xfa, 0xe9, 0xc9, 0xc1, + 0x1a, 0x9a, 0x95, 0x63, 0x44, 0x0d, 0xc4, 0x65, 0xe8, 0x65, 0x28, 0x8d, 0x06, 0xe3, 0x1d, 0xdb, + 0x09, 0xed, 0xf1, 0xee, 0xeb, 0xc9, 0x63, 0xed, 0x75, 0x18, 0x5a, 0x30, 0x16, 0x47, 0x91, 0x51, + 0xf9, 0x7f, 0x12, 0xcc, 0x31, 0x8b, 0xce, 0x42, 0x6a, 0xec, 0x0d, 0x78, 0x8c, 0xeb, 0xd9, 0xc9, + 0xc1, 0x5a, 0xaa, 0x8b, 0x6f, 0x61, 0x2a, 0x43, 0x18, 0xb2, 0xbb, 0xc4, 0xea, 0x13, 0x2f, 0xdc, + 0x58, 0x37, 0xbe, 0xc5, 0x3a, 0xd7, 0x5b, 0x5c, 0x55, 0x71, 0x02, 0x6f, 0x1f, 0x87, 0x44, 0xf4, + 0x74, 0xdb, 0x8e, 0x4f, 0x7a, 0x63, 0x8f, 0x88, 0x8e, 0x63, 0x3a, 0xa6, 0x37, 0x0c, 0x2d, 0x86, 0xee, 0x38, 0x60, 0x79, 0x49, 0xe1, 0x70, 0x58, 0x7e, 0x1e, 0x8a, 0x51, 0x3a, 0xda, 0xa0, 0x1c, - 0x6d, 0x0c, 0xfa, 0x39, 0x7b, 0x6b, 0x3d, 0x9f, 0xbc, 0x29, 0x95, 0x31, 0x14, 0xa3, 0x51, 0x41, - 0x55, 0x28, 0xf9, 0x81, 0xe9, 0x05, 0x06, 0x25, 0x37, 0x58, 0x0f, 0x43, 0x6d, 0x15, 0x98, 0x90, - 0xb6, 0x8f, 0xaa, 0x8f, 0x2a, 0x50, 0x20, 0x4e, 0x7f, 0x82, 0xe0, 0x0d, 0x53, 0x9e, 0x38, 0x7d, - 0x3e, 0x5f, 0x1d, 0xc2, 0x02, 0xab, 0x05, 0xba, 0x3d, 0xb4, 0x9d, 0x1d, 0xd6, 0xc5, 0x5c, 0x85, - 0x45, 0xc2, 0x8e, 0x12, 0xdd, 0x5a, 0x71, 0xea, 0x85, 0xc9, 0x84, 0xa0, 0x5f, 0x85, 0x33, 0xfc, - 0x0e, 0x36, 0x63, 0x68, 0x6e, 0x66, 0x31, 0x32, 0x25, 0xcc, 0xfd, 0x56, 0x82, 0x33, 0xcc, 0x9e, - 0x12, 0x12, 0xd1, 0x7b, 0xda, 0x47, 0x37, 0x21, 0x13, 0x30, 0x0f, 0xc4, 0x3e, 0x7c, 0x7c, 0x2a, - 0x3f, 0xc7, 0xbc, 0xc4, 0x02, 0x4f, 0x8f, 0xc2, 0xd6, 0x7e, 0x40, 0x7c, 0x63, 0xe4, 0xb9, 0x16, - 0xf1, 0x7d, 0xd2, 0x17, 0xd6, 0xe7, 0x99, 0xb8, 0x1b, 0x4a, 0xd1, 0x35, 0x58, 0xf4, 0x88, 0xe5, - 0x7a, 0xfd, 0x28, 0x94, 0x5d, 0x97, 0x58, 0x16, 0x13, 0x13, 0x70, 0xd5, 0x83, 0x12, 0x33, 0xb8, - 0x49, 0x02, 0x93, 0xde, 0xc5, 0xe8, 0x39, 0xc8, 0x79, 0xa2, 0x13, 0x14, 0x2e, 0x9e, 0x3f, 0xb1, - 0x55, 0xc4, 0x13, 0xe8, 0xa4, 0x76, 0x24, 0x23, 0xb5, 0xe3, 0x2c, 0x24, 0x27, 0x17, 0x52, 0xe6, - 0xf0, 0x60, 0x25, 0xd9, 0x6e, 0xe2, 0xa4, 0xdd, 0xaf, 0x7e, 0x24, 0x41, 0x9e, 0x19, 0x65, 0xbd, - 0xf3, 0xb3, 0x30, 0xb7, 0x45, 0x1b, 0x69, 0x61, 0x6d, 0xba, 0x05, 0x89, 0x76, 0xda, 0x98, 0x63, - 0x69, 0x30, 0xc4, 0x15, 0x40, 0xfa, 0x06, 0x57, 0xa7, 0x76, 0x8a, 0x78, 0x7e, 0x22, 0x66, 0x3a, - 0x68, 0x13, 0x8e, 0x52, 0x69, 0xf8, 0x34, 0x05, 0xe2, 0x40, 0x5e, 0x9a, 0x1d, 0xf8, 0x78, 0xba, - 0xf0, 0x3c, 0x89, 0x8d, 0xab, 0xbf, 0x4f, 0xc2, 0x23, 0xc7, 0x2a, 0xb3, 0x3f, 0x72, 0x1d, 0x9f, - 0xa0, 0x35, 0xc8, 0xf8, 0xac, 0x13, 0x13, 0xeb, 0x38, 0x37, 0xe3, 0x71, 0x41, 0xa7, 0xb1, 0x80, - 0xc5, 0x2e, 0xac, 0xe4, 0x29, 0x17, 0xd6, 0xd3, 0xe2, 0xbd, 0xc8, 0x1f, 0x61, 0xe5, 0xd9, 0x6e, - 0xd3, 0xd8, 0xb4, 0x12, 0xfc, 0x35, 0x89, 0x5e, 0x80, 0xfc, 0x90, 0x04, 0x66, 0xf4, 0xd5, 0x55, - 0x99, 0xad, 0x16, 0x66, 0xbd, 0x95, 0xc0, 0x39, 0xaa, 0xc2, 0x12, 0x52, 0x87, 0x52, 0x78, 0x7b, - 0x1b, 0xb6, 0xb3, 0xed, 0x8a, 0x17, 0xd7, 0x74, 0x62, 0x36, 0x05, 0x8a, 0x6d, 0xd3, 0xe2, 0x30, - 0x32, 0xaa, 0xe7, 0x20, 0xe3, 0x11, 0x7f, 0x3c, 0x08, 0xaa, 0x5f, 0x4b, 0x50, 0x8c, 0x02, 0xbf, - 0x7d, 0xa0, 0x1a, 0x5c, 0x61, 0x72, 0x57, 0x5e, 0x3b, 0xd5, 0x91, 0xc9, 0x80, 0xb2, 0x10, 0x2c, - 0x54, 0xcb, 0x1e, 0x94, 0x62, 0x13, 0x62, 0x73, 0x4a, 0xc7, 0x37, 0x27, 0x7a, 0x0e, 0xe6, 0x98, - 0x8a, 0x78, 0xb3, 0x4c, 0x3f, 0x57, 0x6f, 0xdb, 0xdb, 0xa4, 0xb1, 0x6f, 0x0d, 0x08, 0x37, 0xc0, - 0xd1, 0x93, 0xfd, 0x9f, 0x3a, 0xda, 0xff, 0xd5, 0x3a, 0xa0, 0x16, 0x31, 0x07, 0xc1, 0x6e, 0x63, - 0x97, 0x58, 0x77, 0xc3, 0x5e, 0x2e, 0xde, 0xae, 0x49, 0xa7, 0xb7, 0x6b, 0xd5, 0x0d, 0x38, 0x13, - 0xe3, 0x78, 0xc8, 0xdd, 0x56, 0xdd, 0x85, 0xf3, 0xb7, 0x88, 0x43, 0x3c, 0x33, 0x20, 0xb4, 0xf0, - 0xc7, 0xdb, 0xcb, 0x6f, 0xe5, 0x12, 0xed, 0x86, 0x46, 0xf7, 0x07, 0x86, 0xcf, 0x28, 0xc4, 0x81, - 0xcf, 0x8f, 0xee, 0x0b, 0xce, 0xea, 0x0f, 0xa1, 0x3c, 0xcb, 0xd2, 0xc3, 0x1e, 0x93, 0x35, 0x28, - 0xb0, 0x6b, 0x3c, 0x6a, 0xae, 0x3e, 0x7f, 0x78, 0xb0, 0x02, 0x11, 0x76, 0xa0, 0x10, 0x61, 0xff, - 0x7d, 0x09, 0x16, 0x9a, 0x64, 0x6b, 0xbc, 0x73, 0xdb, 0xdd, 0x79, 0xb8, 0x05, 0x9e, 0x87, 0xdc, - 0xc8, 0xed, 0x1b, 0x91, 0x7a, 0x96, 0x1d, 0xb9, 0x7d, 0xd6, 0xbb, 0x95, 0x21, 0x37, 0xf2, 0xc8, - 0x3d, 0xdb, 0x1d, 0xfb, 0xe1, 0x5d, 0x18, 0x8e, 0xd1, 0x63, 0x90, 0xa7, 0x9d, 0x8b, 0x69, 0x3b, - 0xc4, 0x13, 0x5d, 0xca, 0x91, 0xa0, 0x7a, 0x19, 0xe4, 0x23, 0xaf, 0x44, 0x30, 0xc2, 0x9f, 0x82, - 0x44, 0xd1, 0x64, 0xbf, 0x2d, 0xfc, 0x34, 0x09, 0x0b, 0x8d, 0x50, 0xeb, 0xe8, 0x6d, 0x37, 0xd5, - 0x98, 0xb5, 0x68, 0x67, 0x24, 0x60, 0xc6, 0xe9, 0x3b, 0x36, 0x46, 0x47, 0x68, 0xeb, 0x14, 0x1d, - 0x9f, 0xfc, 0x80, 0xa5, 0x4f, 0x5e, 0x8f, 0x98, 0xbe, 0xeb, 0x88, 0xe5, 0x88, 0x11, 0xaa, 0x03, - 0x3a, 0xba, 0x8f, 0xfd, 0xc0, 0x1c, 0x8e, 0xe8, 0x5d, 0x48, 0xcb, 0x44, 0xaa, 0xbe, 0x74, 0x78, - 0xb0, 0x22, 0x6b, 0xe1, 0xc5, 0xcc, 0x26, 0x55, 0x0d, 0xcb, 0x7e, 0x5c, 0xe2, 0xa3, 0x8b, 0x50, - 0xf2, 0x08, 0x67, 0xb1, 0xdc, 0xb1, 0x13, 0xf0, 0xd7, 0x15, 0x2e, 0x0a, 0x61, 0x83, 0xca, 0xaa, - 0xbf, 0x4a, 0xc2, 0xc2, 0xab, 0x6c, 0x19, 0x5d, 0xb7, 0x7f, 0x4a, 0x30, 0xd6, 0x60, 0x6e, 0xb4, - 0x6b, 0xfa, 0x27, 0xff, 0xd0, 0xd0, 0x75, 0xfb, 0x5d, 0x0a, 0xc0, 0x1c, 0xf7, 0x10, 0x6b, 0xbe, - 0x00, 0x60, 0x79, 0xc4, 0xa4, 0xf7, 0x8d, 0x19, 0xf0, 0xb5, 0xe2, 0xbc, 0x90, 0xd4, 0x02, 0xd4, - 0x01, 0x14, 0x4f, 0xc7, 0xd8, 0x27, 0xf4, 0x99, 0x93, 0x9a, 0x79, 0xc7, 0x1f, 0x4b, 0x30, 0x6d, - 0x20, 0x62, 0x02, 0x32, 0x23, 0x3e, 0xd9, 0x19, 0xf1, 0x79, 0x49, 0x6c, 0xaa, 0xae, 0xdb, 0xf7, - 0x1f, 0xae, 0xbe, 0xfc, 0x4e, 0x82, 0xc5, 0x08, 0x85, 0xd8, 0x98, 0x2d, 0x58, 0x60, 0x8f, 0xf8, - 0xd1, 0xc0, 0x74, 0x88, 0x31, 0x72, 0xfb, 0xe1, 0xcf, 0x46, 0xd3, 0x4b, 0x39, 0x96, 0x1e, 0x5c, - 0xa2, 0x8a, 0x5d, 0xaa, 0x47, 0x19, 0x91, 0xca, 0xe3, 0xe2, 0xb9, 0x83, 0x28, 0x59, 0xf2, 0x01, - 0xc9, 0x64, 0xa1, 0x3b, 0xe1, 0xbb, 0x3a, 0x84, 0x5c, 0xf8, 0xe3, 0x01, 0x7a, 0x04, 0x16, 0x9b, - 0x35, 0xbd, 0x66, 0xe8, 0xaf, 0x77, 0x15, 0xa3, 0xa7, 0xbe, 0xa2, 0x76, 0x5e, 0x53, 0xe5, 0x04, - 0x2a, 0x40, 0xb6, 0xde, 0xe9, 0xdc, 0x56, 0x6a, 0xaa, 0x2c, 0xa1, 0x3c, 0xcc, 0xb5, 0x55, 0xfd, - 0xc6, 0x75, 0x39, 0x49, 0xe5, 0xbd, 0xb6, 0xaa, 0x3f, 0xb3, 0x7e, 0x53, 0x4e, 0xd1, 0xc1, 0xc6, - 0xed, 0x4e, 0x8d, 0xce, 0xa4, 0x11, 0x40, 0x46, 0xd3, 0x71, 0x5b, 0xbd, 0x25, 0xcf, 0xa1, 0x22, - 0xe4, 0xf4, 0xf6, 0xa6, 0x72, 0xe3, 0xba, 0xaa, 0xc9, 0x99, 0xab, 0x07, 0x69, 0x28, 0x46, 0x7f, - 0x2a, 0x42, 0x08, 0xe6, 0x35, 0xdd, 0xe8, 0xa9, 0x5a, 0x57, 0x69, 0xb4, 0x37, 0xda, 0x4a, 0x93, - 0x1b, 0xd4, 0x74, 0x43, 0xed, 0xa8, 0x8a, 0x2c, 0xa1, 0x79, 0x00, 0x4d, 0x37, 0x28, 0x85, 0xa1, - 0x6a, 0x72, 0x12, 0xc9, 0x50, 0xd4, 0x74, 0xa3, 0x76, 0x4b, 0x51, 0x75, 0xa3, 0xd7, 0x6e, 0xca, - 0x7d, 0x01, 0xaf, 0x69, 0xed, 0xa6, 0x4c, 0x50, 0x91, 0x0d, 0x7a, 0xdd, 0x76, 0x53, 0xfe, 0x44, - 0x42, 0x4b, 0xb0, 0xa0, 0xe9, 0x86, 0xa6, 0xe0, 0x57, 0xdb, 0x0d, 0xc5, 0x50, 0x6b, 0x9b, 0x8a, - 0xfc, 0x21, 0xa5, 0x28, 0x68, 0xba, 0xd1, 0xed, 0x34, 0xb9, 0xe4, 0xbd, 0x14, 0x5a, 0x64, 0xa4, - 0x54, 0xd2, 0x6d, 0xd5, 0x34, 0x45, 0xfe, 0x79, 0x0a, 0x21, 0x28, 0x09, 0x91, 0xa6, 0xd7, 0xf4, - 0x9e, 0x26, 0xff, 0x22, 0x84, 0xa9, 0x9d, 0xa6, 0xe0, 0xfa, 0x4f, 0x0a, 0x9d, 0x85, 0x45, 0x4d, - 0x37, 0x1a, 0x1d, 0x55, 0xaf, 0xb5, 0x55, 0x05, 0x73, 0xf9, 0x67, 0x69, 0x74, 0x0e, 0x50, 0x4c, - 0x4e, 0x49, 0x14, 0xf9, 0xaf, 0x69, 0xb4, 0x0c, 0x67, 0xa6, 0x26, 0x7a, 0x9a, 0xfc, 0xb7, 0xb4, - 0xa0, 0xa2, 0x04, 0x5a, 0xb7, 0x16, 0xba, 0xfb, 0xf1, 0x1c, 0x2a, 0x41, 0x4e, 0xd3, 0x8d, 0xfa, - 0xeb, 0xba, 0xa2, 0xc9, 0xbf, 0xce, 0xa0, 0x05, 0x16, 0x90, 0xae, 0x82, 0x1b, 0x8a, 0xaa, 0xcb, - 0x3f, 0xca, 0xa2, 0x33, 0x2c, 0x84, 0xcd, 0x1e, 0xae, 0xe9, 0xed, 0x8e, 0x4a, 0xa3, 0xf4, 0xe3, - 0x2c, 0x3a, 0x0f, 0x4b, 0x34, 0x6c, 0x2d, 0xdc, 0xe9, 0xdd, 0x6a, 0x75, 0x7b, 0x4c, 0x81, 0x4e, - 0xfd, 0x24, 0x8b, 0x56, 0xa0, 0x1c, 0x9f, 0x62, 0xd4, 0x21, 0xe0, 0xdd, 0xac, 0x58, 0xe6, 0x9d, - 0x5e, 0x4d, 0xd5, 0xdb, 0xb7, 0x15, 0x4d, 0xfe, 0x32, 0x8b, 0x2e, 0xc0, 0x72, 0xdc, 0x46, 0x64, - 0xfa, 0x5f, 0x59, 0x11, 0xac, 0x76, 0xd7, 0xa8, 0x35, 0x9b, 0x58, 0xd1, 0x34, 0xf9, 0x2f, 0x39, - 0x91, 0x89, 0x6e, 0x07, 0xeb, 0xf2, 0x1f, 0xf2, 0x22, 0x1e, 0x2d, 0x5d, 0xef, 0x1a, 0x58, 0xb9, - 0x63, 0x6c, 0x2a, 0x7a, 0xab, 0xd3, 0x94, 0xdf, 0x07, 0x11, 0x0f, 0x31, 0xa1, 0x75, 0xc3, 0x78, - 0x7c, 0x0d, 0x62, 0x09, 0x47, 0x33, 0x9b, 0x8a, 0xa6, 0xd5, 0x6e, 0x29, 0xf2, 0x3f, 0x0a, 0x42, - 0x49, 0x6b, 0xe0, 0x76, 0x57, 0x37, 0xb0, 0xb2, 0xa1, 0x60, 0x45, 0x6d, 0x28, 0xf2, 0x47, 0xe7, - 0xae, 0xbe, 0x0d, 0xf3, 0xf1, 0x86, 0x02, 0x2d, 0x42, 0x49, 0xec, 0x65, 0x91, 0x84, 0x04, 0x15, - 0x75, 0x15, 0xb5, 0xd9, 0x56, 0x6f, 0x09, 0x91, 0x44, 0x45, 0xb8, 0xa7, 0xaa, 0x47, 0x22, 0xb6, - 0xd3, 0x36, 0x6a, 0xed, 0xdb, 0x4a, 0x53, 0x48, 0x52, 0x68, 0x09, 0x64, 0x5d, 0xc1, 0x9b, 0x6d, - 0xb5, 0xa6, 0x4f, 0xa4, 0xe9, 0xab, 0xef, 0x4a, 0x30, 0x1f, 0xbf, 0x12, 0xd0, 0xa3, 0x70, 0xee, - 0x58, 0xea, 0x23, 0xe7, 0x69, 0xc6, 0xa4, 0x30, 0x2d, 0x4b, 0xa8, 0x02, 0xe5, 0xe3, 0x93, 0x47, - 0x26, 0xe5, 0xe4, 0x2c, 0xe5, 0xd7, 0x6a, 0x6d, 0x9d, 0x2a, 0xa7, 0xae, 0x62, 0xc8, 0x85, 0x85, - 0x99, 0xad, 0x91, 0xee, 0xe5, 0xf8, 0x41, 0x16, 0xcb, 0x96, 0x25, 0x3a, 0x08, 0xad, 0x26, 0x51, - 0x09, 0xf2, 0x5a, 0xaf, 0xd1, 0x50, 0x94, 0xa6, 0xd2, 0x94, 0x53, 0xf4, 0xfc, 0xf2, 0x95, 0xcb, - 0xe9, 0xf5, 0x8f, 0x93, 0x50, 0xe2, 0x65, 0x44, 0x23, 0xde, 0x3d, 0xdb, 0x22, 0xe8, 0x4d, 0x28, - 0xc5, 0x5a, 0x76, 0xf4, 0xe4, 0x03, 0xfd, 0xd8, 0x52, 0xbe, 0xfc, 0x4d, 0x30, 0x5e, 0x2c, 0x9f, - 0x96, 0xd0, 0x1b, 0x50, 0x88, 0x34, 0x69, 0xe8, 0xe2, 0x94, 0xe2, 0x74, 0x1b, 0x58, 0xbe, 0x74, - 0x3a, 0x68, 0xc2, 0x3d, 0x04, 0x34, 0xdd, 0x4e, 0xa1, 0xab, 0x53, 0xda, 0x27, 0x76, 0x77, 0xe5, - 0x6b, 0x0f, 0x84, 0xe5, 0x06, 0xd7, 0xff, 0x28, 0x01, 0xe2, 0xe1, 0x63, 0xb7, 0x42, 0x18, 0xc3, - 0x3b, 0x90, 0x0b, 0xbb, 0x17, 0x34, 0x5d, 0xb6, 0x8f, 0xb5, 0x5b, 0xe5, 0x27, 0x4e, 0x41, 0x4c, - 0x16, 0xa6, 0x43, 0x7e, 0x72, 0xf1, 0xa0, 0x13, 0x34, 0x22, 0xf7, 0x5a, 0xb9, 0x7a, 0x1a, 0x24, - 0x64, 0xad, 0xbf, 0xf8, 0xe9, 0xe7, 0x95, 0xc4, 0x67, 0x9f, 0x57, 0x12, 0x5f, 0x7d, 0x5e, 0x91, - 0xde, 0x39, 0xac, 0x48, 0x1f, 0x1c, 0x56, 0xa4, 0x4f, 0x0e, 0x2b, 0xd2, 0xa7, 0x87, 0x15, 0xe9, - 0x9f, 0x87, 0x15, 0xe9, 0xcb, 0xc3, 0x4a, 0xe2, 0xab, 0xc3, 0x8a, 0xf4, 0xde, 0x17, 0x95, 0xc4, - 0xa7, 0x5f, 0x54, 0x12, 0x9f, 0x7d, 0x51, 0x49, 0xbc, 0x91, 0x0b, 0x39, 0xb7, 0x32, 0xec, 0xff, - 0x96, 0xcf, 0xfe, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x34, 0x2a, 0xf0, 0x31, 0x21, 0x1d, 0x00, 0x00, + 0x6e, 0x0c, 0xfa, 0x39, 0x7f, 0x6b, 0x3d, 0x9f, 0xbc, 0x21, 0x95, 0x31, 0x14, 0xa3, 0x51, 0x41, + 0x55, 0x28, 0xf9, 0x81, 0xe5, 0x05, 0x26, 0x25, 0x37, 0x59, 0x0f, 0x43, 0x6d, 0x15, 0x98, 0x90, + 0xb6, 0x8f, 0x9a, 0x8f, 0x2a, 0x50, 0x20, 0x4e, 0x7f, 0x8a, 0xe0, 0x0d, 0x53, 0x9e, 0x38, 0x7d, + 0x3e, 0x5f, 0x1d, 0xc2, 0x12, 0xab, 0x05, 0x86, 0x3d, 0xb4, 0x9d, 0x1d, 0xd6, 0xc5, 0x5c, 0x86, + 0x65, 0xc2, 0x8e, 0x12, 0xdd, 0x5a, 0x71, 0xea, 0xa5, 0xe9, 0x84, 0xa0, 0x5f, 0x87, 0x53, 0xfc, + 0x0e, 0xb6, 0x62, 0x68, 0x6e, 0x66, 0x39, 0x32, 0x25, 0xcc, 0xfd, 0x4e, 0x82, 0x53, 0xcc, 0x9e, + 0x12, 0x12, 0xd1, 0x7b, 0xda, 0x47, 0x37, 0x20, 0x13, 0x30, 0x0f, 0xc4, 0x3e, 0x7c, 0x7c, 0x26, + 0x3f, 0x47, 0xbc, 0xc4, 0x02, 0x4f, 0x8f, 0xc2, 0x9d, 0xfd, 0x80, 0xf8, 0xe6, 0xc8, 0x73, 0x7b, + 0xc4, 0xf7, 0x49, 0x5f, 0x58, 0x5f, 0x64, 0xe2, 0x4e, 0x28, 0x45, 0x57, 0x60, 0xd9, 0x23, 0x3d, + 0xd7, 0xeb, 0x47, 0xa1, 0xec, 0xba, 0xc4, 0xb2, 0x98, 0x98, 0x82, 0xab, 0x1e, 0x94, 0x98, 0xc1, + 0x2d, 0x12, 0x58, 0xf4, 0x2e, 0x46, 0xcf, 0x41, 0xce, 0x13, 0x9d, 0xa0, 0x70, 0xf1, 0xec, 0xb1, + 0xad, 0x22, 0x9e, 0x42, 0xa7, 0xb5, 0x23, 0x19, 0xa9, 0x1d, 0xa7, 0x21, 0x39, 0xbd, 0x90, 0x32, + 0x93, 0x83, 0xb5, 0xa4, 0xda, 0xc4, 0x49, 0xbb, 0x5f, 0xfd, 0x48, 0x82, 0x3c, 0x33, 0xca, 0x7a, + 0xe7, 0x67, 0x61, 0xe1, 0x0e, 0x6d, 0xa4, 0x85, 0xb5, 0xd9, 0x16, 0x24, 0xda, 0x69, 0x63, 0x8e, + 0xa5, 0xc1, 0x10, 0x57, 0x00, 0xe9, 0x9b, 0x5c, 0x9d, 0xda, 0x29, 0xe2, 0xc5, 0xa9, 0x98, 0xe9, + 0xa0, 0x2d, 0x38, 0x4c, 0xa5, 0xe9, 0xd3, 0x14, 0x88, 0x03, 0x79, 0x61, 0x7e, 0xe0, 0xe3, 0xe9, + 0xc2, 0x8b, 0x24, 0x36, 0xae, 0xfe, 0x21, 0x09, 0x8f, 0x1c, 0xa9, 0xcc, 0xfe, 0xc8, 0x75, 0x7c, + 0x82, 0xae, 0x42, 0xc6, 0x67, 0x9d, 0x98, 0x58, 0xc7, 0x99, 0x39, 0x8f, 0x0b, 0x3a, 0x8d, 0x05, + 0x2c, 0x76, 0x61, 0x25, 0x4f, 0xb8, 0xb0, 0x9e, 0x16, 0xef, 0x45, 0xfe, 0x08, 0x2b, 0xcf, 0x77, + 0x9b, 0xc6, 0xa6, 0x95, 0xe0, 0xaf, 0x49, 0xf4, 0x02, 0xe4, 0x87, 0x24, 0xb0, 0xa2, 0xaf, 0xae, + 0xca, 0x7c, 0xb5, 0x30, 0xeb, 0xad, 0x04, 0xce, 0x51, 0x15, 0x96, 0x90, 0x3a, 0x94, 0xc2, 0xdb, + 0xdb, 0xb4, 0x9d, 0x6d, 0x57, 0xbc, 0xb8, 0x66, 0x13, 0xb3, 0x25, 0x50, 0x6c, 0x9b, 0x16, 0x87, + 0x91, 0x51, 0x3d, 0x07, 0x19, 0x8f, 0xf8, 0xe3, 0x41, 0x50, 0xfd, 0x5a, 0x82, 0x62, 0x14, 0xf8, + 0xed, 0x03, 0xd5, 0xe0, 0x0a, 0xd3, 0xbb, 0xf2, 0xca, 0x89, 0x8e, 0x4c, 0x07, 0x94, 0x85, 0x60, + 0xa1, 0x5a, 0xf6, 0xa0, 0x14, 0x9b, 0x10, 0x9b, 0x53, 0x3a, 0xba, 0x39, 0xd1, 0x73, 0xb0, 0xc0, + 0x54, 0xc4, 0x9b, 0x65, 0xf6, 0xb9, 0x7a, 0xcb, 0xde, 0x26, 0x8d, 0xfd, 0xde, 0x80, 0x70, 0x03, + 0x1c, 0x3d, 0xdd, 0xff, 0xa9, 0xc3, 0xfd, 0x5f, 0xad, 0x03, 0x6a, 0x11, 0x6b, 0x10, 0xec, 0x36, + 0x76, 0x49, 0xef, 0x6e, 0xd8, 0xcb, 0xc5, 0xdb, 0x35, 0xe9, 0xe4, 0x76, 0xad, 0xba, 0x09, 0xa7, + 0x62, 0x1c, 0x0f, 0xb9, 0xdb, 0xaa, 0xbb, 0x70, 0xf6, 0x26, 0x71, 0x88, 0x67, 0x05, 0x84, 0x16, + 0xfe, 0x78, 0x7b, 0xf9, 0xad, 0x5c, 0xa2, 0xdd, 0xd0, 0xe8, 0xfe, 0xc0, 0xf4, 0x19, 0x85, 0x38, + 0xf0, 0xf9, 0xd1, 0x7d, 0xc1, 0x59, 0xfd, 0x11, 0x94, 0xe7, 0x59, 0x7a, 0xd8, 0x63, 0x72, 0x15, + 0x0a, 0xec, 0x1a, 0x8f, 0x9a, 0xab, 0x2f, 0x4e, 0x0e, 0xd6, 0x20, 0xc2, 0x0e, 0x14, 0x22, 0xec, + 0xbf, 0x2f, 0xc1, 0x52, 0x93, 0xdc, 0x19, 0xef, 0xdc, 0x72, 0x77, 0x1e, 0x6e, 0x81, 0x67, 0x21, + 0x37, 0x72, 0xfb, 0x66, 0xa4, 0x9e, 0x65, 0x47, 0x6e, 0x9f, 0xf5, 0x6e, 0x65, 0xc8, 0x8d, 0x3c, + 0x72, 0xcf, 0x76, 0xc7, 0x7e, 0x78, 0x17, 0x86, 0x63, 0xf4, 0x18, 0xe4, 0x69, 0xe7, 0x62, 0xd9, + 0x0e, 0xf1, 0x44, 0x97, 0x72, 0x28, 0xa8, 0x5e, 0x04, 0xf9, 0xd0, 0x2b, 0x11, 0x8c, 0xf0, 0xa7, + 0x20, 0x51, 0x34, 0xd9, 0x6f, 0x0b, 0x3f, 0x4b, 0xc2, 0x52, 0x23, 0xd4, 0x3a, 0x7c, 0xdb, 0xcd, + 0x34, 0x66, 0x2d, 0xda, 0x19, 0x09, 0x98, 0x79, 0xf2, 0x8e, 0x8d, 0xd1, 0x11, 0xda, 0x3a, 0x45, + 0xc7, 0xc7, 0x3f, 0x60, 0xe9, 0x93, 0xd7, 0x23, 0x96, 0xef, 0x3a, 0x62, 0x39, 0x62, 0x84, 0xea, + 0x80, 0x0e, 0xef, 0x63, 0x3f, 0xb0, 0x86, 0x23, 0x7a, 0x17, 0xd2, 0x32, 0x91, 0xaa, 0xaf, 0x4c, + 0x0e, 0xd6, 0x64, 0x3d, 0xbc, 0x98, 0xd9, 0xa4, 0xa6, 0x63, 0xd9, 0x8f, 0x4b, 0x7c, 0x74, 0x1e, + 0x4a, 0x1e, 0xe1, 0x2c, 0x3d, 0x77, 0xec, 0x04, 0xfc, 0x75, 0x85, 0x8b, 0x42, 0xd8, 0xa0, 0xb2, + 0xea, 0xaf, 0x93, 0xb0, 0xf4, 0x2a, 0x5b, 0x46, 0xc7, 0xed, 0x9f, 0x10, 0x8c, 0xab, 0xb0, 0x30, + 0xda, 0xb5, 0xfc, 0xe3, 0x7f, 0x68, 0xe8, 0xb8, 0xfd, 0x0e, 0x05, 0x60, 0x8e, 0x7b, 0x88, 0x35, + 0x9f, 0x03, 0xe8, 0x79, 0xc4, 0xa2, 0xf7, 0x8d, 0x15, 0xf0, 0xb5, 0xe2, 0xbc, 0x90, 0xd4, 0x02, + 0xd4, 0x06, 0x14, 0x4f, 0xc7, 0xd8, 0x27, 0xf4, 0x99, 0x93, 0x9a, 0x7b, 0xc7, 0x1f, 0x49, 0x30, + 0x6d, 0x20, 0x62, 0x02, 0x32, 0x27, 0x3e, 0xd9, 0x39, 0xf1, 0x79, 0x49, 0x6c, 0xaa, 0x8e, 0xdb, + 0xf7, 0x1f, 0xae, 0xbe, 0xfc, 0x5e, 0x82, 0xe5, 0x08, 0x85, 0xd8, 0x98, 0x2d, 0x58, 0x62, 0x8f, + 0xf8, 0xd1, 0xc0, 0x72, 0x88, 0x39, 0x72, 0xfb, 0xe1, 0xcf, 0x46, 0xb3, 0x4b, 0x39, 0x92, 0x1e, + 0x5c, 0xa2, 0x8a, 0x1d, 0xaa, 0x47, 0x19, 0x91, 0xc6, 0xe3, 0xe2, 0xb9, 0x83, 0x28, 0x59, 0xf2, + 0x01, 0xc9, 0x64, 0xa1, 0x3b, 0xe5, 0xbb, 0x3c, 0x84, 0x5c, 0xf8, 0xe3, 0x01, 0x7a, 0x04, 0x96, + 0x9b, 0x35, 0xa3, 0x66, 0x1a, 0xaf, 0x77, 0x14, 0xb3, 0xab, 0xbd, 0xa2, 0xb5, 0x5f, 0xd3, 0xe4, + 0x04, 0x2a, 0x40, 0xb6, 0xde, 0x6e, 0xdf, 0x52, 0x6a, 0x9a, 0x2c, 0xa1, 0x3c, 0x2c, 0xa8, 0x9a, + 0x71, 0xfd, 0x9a, 0x9c, 0xa4, 0xf2, 0xae, 0xaa, 0x19, 0xcf, 0x6c, 0xdc, 0x90, 0x53, 0x74, 0xb0, + 0x79, 0xab, 0x5d, 0xa3, 0x33, 0x69, 0x04, 0x90, 0xd1, 0x0d, 0xac, 0x6a, 0x37, 0xe5, 0x05, 0x54, + 0x84, 0x9c, 0xa1, 0x6e, 0x29, 0xd7, 0xaf, 0x69, 0xba, 0x9c, 0xb9, 0x7c, 0x90, 0x86, 0x62, 0xf4, + 0xa7, 0x22, 0x84, 0x60, 0x51, 0x37, 0xcc, 0xae, 0xa6, 0x77, 0x94, 0x86, 0xba, 0xa9, 0x2a, 0x4d, + 0x6e, 0x50, 0x37, 0x4c, 0xad, 0xad, 0x29, 0xb2, 0x84, 0x16, 0x01, 0x74, 0xc3, 0xa4, 0x14, 0xa6, + 0xa6, 0xcb, 0x49, 0x24, 0x43, 0x51, 0x37, 0xcc, 0xda, 0x4d, 0x45, 0x33, 0xcc, 0xae, 0xda, 0x94, + 0xfb, 0x02, 0x5e, 0xd3, 0xd5, 0xa6, 0x4c, 0x50, 0x91, 0x0d, 0xba, 0x1d, 0xb5, 0x29, 0x7f, 0x22, + 0xa1, 0x15, 0x58, 0xd2, 0x0d, 0x53, 0x57, 0xf0, 0xab, 0x6a, 0x43, 0x31, 0xb5, 0xda, 0x96, 0x22, + 0x7f, 0x48, 0x29, 0x0a, 0xba, 0x61, 0x76, 0xda, 0x4d, 0x2e, 0x79, 0x2f, 0x85, 0x96, 0x19, 0x29, + 0x95, 0x74, 0x5a, 0x35, 0x5d, 0x91, 0x7f, 0x91, 0x42, 0x08, 0x4a, 0x42, 0xa4, 0x1b, 0x35, 0xa3, + 0xab, 0xcb, 0xbf, 0x0c, 0x61, 0x5a, 0xbb, 0x29, 0xb8, 0xfe, 0x9b, 0x42, 0xa7, 0x61, 0x59, 0x37, + 0xcc, 0x46, 0x5b, 0x33, 0x6a, 0xaa, 0xa6, 0x60, 0x2e, 0xff, 0x2c, 0x8d, 0xce, 0x00, 0x8a, 0xc9, + 0x29, 0x89, 0x22, 0xff, 0x2d, 0x8d, 0x56, 0xe1, 0xd4, 0xcc, 0x44, 0x57, 0x97, 0xff, 0x9e, 0x16, + 0x54, 0x94, 0x40, 0xef, 0xd4, 0x42, 0x77, 0x3f, 0x5e, 0x40, 0x25, 0xc8, 0xe9, 0x86, 0x59, 0x7f, + 0xdd, 0x50, 0x74, 0xf9, 0x37, 0x19, 0xb4, 0xc4, 0x02, 0xd2, 0x51, 0x70, 0x43, 0xd1, 0x0c, 0xf9, + 0xc7, 0x59, 0x74, 0x8a, 0x85, 0xb0, 0xd9, 0xc5, 0x35, 0x43, 0x6d, 0x6b, 0x34, 0x4a, 0x3f, 0xc9, + 0xa2, 0xb3, 0xb0, 0x42, 0xc3, 0xd6, 0xc2, 0xed, 0xee, 0xcd, 0x56, 0xa7, 0xcb, 0x14, 0xe8, 0xd4, + 0x4f, 0xb3, 0x68, 0x0d, 0xca, 0xf1, 0x29, 0x46, 0x1d, 0x02, 0xde, 0xcd, 0x8a, 0x65, 0xde, 0xee, + 0xd6, 0x34, 0x43, 0xbd, 0xa5, 0xe8, 0xf2, 0x97, 0x59, 0x74, 0x0e, 0x56, 0xe3, 0x36, 0x22, 0xd3, + 0xff, 0xce, 0x8a, 0x60, 0xa9, 0x1d, 0xb3, 0xd6, 0x6c, 0x62, 0x45, 0xd7, 0xe5, 0xbf, 0xe6, 0x44, + 0x26, 0x3a, 0x6d, 0x6c, 0xc8, 0x7f, 0xcc, 0x8b, 0x78, 0xb4, 0x0c, 0xa3, 0x63, 0x62, 0xe5, 0xb6, + 0xb9, 0xa5, 0x18, 0xad, 0x76, 0x53, 0x7e, 0x1f, 0x44, 0x3c, 0xc4, 0x84, 0xde, 0x09, 0xe3, 0xf1, + 0x35, 0x88, 0x25, 0x1c, 0xce, 0x6c, 0x29, 0xba, 0x5e, 0xbb, 0xa9, 0xc8, 0xff, 0x2c, 0x08, 0x25, + 0xbd, 0x81, 0xd5, 0x8e, 0x61, 0x62, 0x65, 0x53, 0xc1, 0x8a, 0xd6, 0x50, 0xe4, 0x8f, 0xce, 0x5c, + 0x7e, 0x1b, 0x16, 0xe3, 0x0d, 0x05, 0x5a, 0x86, 0x92, 0xd8, 0xcb, 0x22, 0x09, 0x09, 0x2a, 0xea, + 0x28, 0x5a, 0x53, 0xd5, 0x6e, 0x0a, 0x91, 0x44, 0x45, 0xb8, 0xab, 0x69, 0x87, 0x22, 0xb6, 0xd3, + 0x36, 0x6b, 0xea, 0x2d, 0xa5, 0x29, 0x24, 0x29, 0xb4, 0x02, 0xb2, 0xa1, 0xe0, 0x2d, 0x55, 0xab, + 0x19, 0x53, 0x69, 0xfa, 0xf2, 0xbb, 0x12, 0x2c, 0xc6, 0xaf, 0x04, 0xf4, 0x28, 0x9c, 0x39, 0x92, + 0xfa, 0xc8, 0x79, 0x9a, 0x33, 0x29, 0x4c, 0xcb, 0x12, 0xaa, 0x40, 0xf9, 0xe8, 0xe4, 0xa1, 0x49, + 0x39, 0x39, 0x4f, 0xf9, 0xb5, 0x9a, 0x6a, 0x50, 0xe5, 0xd4, 0x65, 0x0c, 0xb9, 0xb0, 0x30, 0xb3, + 0x35, 0xd2, 0xbd, 0x1c, 0x3f, 0xc8, 0x62, 0xd9, 0xb2, 0x44, 0x07, 0xa1, 0xd5, 0x24, 0x2a, 0x41, + 0x5e, 0xef, 0x36, 0x1a, 0x8a, 0xd2, 0x54, 0x9a, 0x72, 0x8a, 0x9e, 0x5f, 0xbe, 0x72, 0x39, 0xbd, + 0xf1, 0x71, 0x12, 0x4a, 0xbc, 0x8c, 0xe8, 0xc4, 0xbb, 0x67, 0xf7, 0x08, 0x7a, 0x13, 0x4a, 0xb1, + 0x96, 0x1d, 0x3d, 0xf9, 0x40, 0x3f, 0xb6, 0x94, 0x2f, 0x7e, 0x13, 0x8c, 0x17, 0xcb, 0xa7, 0x25, + 0xf4, 0x06, 0x14, 0x22, 0x4d, 0x1a, 0x3a, 0x3f, 0xa3, 0x38, 0xdb, 0x06, 0x96, 0x2f, 0x9c, 0x0c, + 0x9a, 0x72, 0x0f, 0x01, 0xcd, 0xb6, 0x53, 0xe8, 0xf2, 0x8c, 0xf6, 0xb1, 0xdd, 0x5d, 0xf9, 0xca, + 0x03, 0x61, 0xb9, 0xc1, 0x8d, 0x3f, 0x49, 0x80, 0x78, 0xf8, 0xd8, 0xad, 0x10, 0xc6, 0xf0, 0x36, + 0xe4, 0xc2, 0xee, 0x05, 0xcd, 0x96, 0xed, 0x23, 0xed, 0x56, 0xf9, 0x89, 0x13, 0x10, 0xd3, 0x85, + 0x19, 0x90, 0x9f, 0x5e, 0x3c, 0xe8, 0x18, 0x8d, 0xc8, 0xbd, 0x56, 0xae, 0x9e, 0x04, 0x09, 0x59, + 0xeb, 0x2f, 0x7e, 0xfa, 0x79, 0x25, 0xf1, 0xd9, 0xe7, 0x95, 0xc4, 0x57, 0x9f, 0x57, 0xa4, 0x77, + 0x26, 0x15, 0xe9, 0x83, 0x49, 0x45, 0xfa, 0x64, 0x52, 0x91, 0x3e, 0x9d, 0x54, 0xa4, 0x7f, 0x4d, + 0x2a, 0xd2, 0x97, 0x93, 0x4a, 0xe2, 0xab, 0x49, 0x45, 0x7a, 0xef, 0x8b, 0x4a, 0xe2, 0xd3, 0x2f, + 0x2a, 0x89, 0xcf, 0xbe, 0xa8, 0x24, 0xde, 0xc8, 0x85, 0x9c, 0x77, 0x32, 0xec, 0xff, 0x96, 0xcf, + 0xfe, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x01, 0x0a, 0xf7, 0xfc, 0x08, 0x1d, 0x00, 0x00, } func (x DataType) String() string { diff --git a/src/api/proto/vizierpb/vizierapi.proto b/src/api/proto/vizierpb/vizierapi.proto index d8731a561ac..b7bafd87661 100644 --- a/src/api/proto/vizierpb/vizierapi.proto +++ b/src/api/proto/vizierpb/vizierapi.proto @@ -22,7 +22,7 @@ package px.api.vizierpb; option go_package = "vizierpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; // The list of data types supported by our execution engine. // Each type corresponds to a Column type below. diff --git a/src/api/python/BUILD.bazel b/src/api/python/BUILD.bazel index 7471c32ae56..32d2ae302e9 100644 --- a/src/api/python/BUILD.bazel +++ b/src/api/python/BUILD.bazel @@ -20,12 +20,14 @@ load("@rules_python//python:packaging.bzl", "py_wheel") py_wheel( name = "pxapi", author = "The Pixie Maintainers", - author_email = "help@pixielabs.ai", + author_email = "maintainers@px.dev", classifiers = [ "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Operating System :: OS Independent", "License :: OSI Approved :: Apache Software License", "Typing :: Typed", @@ -34,20 +36,20 @@ py_wheel( distribution = "pxapi", license = "Apache-2.0", platform = "any", - python_requires = ">=3.8, < 3.11", + python_requires = ">=3.9, < 3.14", python_tag = "py3", requires = [ - "Authlib==1.0.1", - "gogo-python==0.0.1", - "grpcio==1.53.0", - "grpcio-tools==1.47.0", - "protobuf==3.20.1", + "Authlib==1.5.1", + "grpcio==1.70.0", + "grpcio-tools==1.70.0", + "protobuf==5.29.3", ], strip_path_prefixes = ["src/api/python/"], - version = "0.8.1", + version = "0.9.0", deps = [ "//src/api/python/pxapi:pxapi_library", "//src/api/python/pxapi/proto:pxapi_py_proto_library", + "@gogo_grpc_proto//gogoproto:gogo_pl_py_proto", ], ) diff --git a/src/api/python/pxapi/BUILD.bazel b/src/api/python/pxapi/BUILD.bazel index 40eb88221c3..dcead0d49f4 100644 --- a/src/api/python/pxapi/BUILD.bazel +++ b/src/api/python/pxapi/BUILD.bazel @@ -30,7 +30,7 @@ py_library( visibility = ["//src/api/python:__subpackages__"], deps = [ "//src/api/python/pxapi/proto:pxapi_py_proto_library", - requirement("gogo-python"), + "@gogo_grpc_proto//gogoproto:gogo_pl_py_proto", requirement("grpcio"), requirement("grpcio-tools"), requirement("protobuf"), diff --git a/src/api/python/pxapi/proto/BUILD.bazel b/src/api/python/pxapi/proto/BUILD.bazel index 6d64409944c..32d4e9cf9e6 100644 --- a/src/api/python/pxapi/proto/BUILD.bazel +++ b/src/api/python/pxapi/proto/BUILD.bazel @@ -22,6 +22,7 @@ colocate_python_files( srcs = [ "//src/api/proto/cloudpb:cloudapi_pl_py_grpc", "//src/api/proto/vizierpb:vizier_pl_py_grpc", + "@gogo_grpc_proto//gogoproto:gogo_pl_py_proto", ], protos_include_dir = "src/api/proto/", visibility = ["//src/api/python/pxapi:__subpackages__"], diff --git a/src/api/python/requirements.bazel.txt b/src/api/python/requirements.bazel.txt index 634d7acdbff..58cab4f864a 100644 --- a/src/api/python/requirements.bazel.txt +++ b/src/api/python/requirements.bazel.txt @@ -1,13 +1,13 @@ # -# This file is autogenerated by pip-compile with python 3.9 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: # -# pip-compile --allow-unsafe --generate-hashes requirements.bazel.txt +# pip-compile --allow-unsafe --generate-hashes --output-file=requirements.bazel.txt requirements.txt # -authlib==1.1.0 \ - --hash=sha256:0a270c91409fc2b7b0fbee6996e09f2ee3187358762111a9a4225c874b94e891 \ - --hash=sha256:be4b6a1dea51122336c210a6945b27a105b9ac572baffd15b07bcff4376c1523 - # via -r requirements.bazel.txt +authlib==1.5.1 \ + --hash=sha256:5cbc85ecb0667312c1cdc2f9095680bb735883b123fb509fde1e65b1c5df972e \ + --hash=sha256:8408861cbd9b4ea2ff759b00b6f02fd7d81ac5a56d0b2b22c08606c6049aae11 + # via -r requirements.txt cffi==1.15.1 \ --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \ @@ -108,141 +108,141 @@ cryptography==42.0.4 \ --hash=sha256:fb0cef872d8193e487fc6bdb08559c3aa41b659a7d9be48b2e10747f47863925 \ --hash=sha256:ffc73996c4fca3d2b6c1c8c12bfd3ad00def8621da24f547626bf06441400449 # via authlib -gogo-python==0.0.1 \ - --hash=sha256:55300f8c7f3645a267a391cb439f89f15d21aa58e3a07653353923f9f6a3627b \ - --hash=sha256:6f68d3aa598ee2ca4d3bb44b8afa2d4ef4a3198d6f5ae3824f38fbca2c6653ed - # via -r requirements.bazel.txt -grpcio==1.53.2 \ - --hash=sha256:07b83c06e7d113044cf3da15ca52f578c5f3dca299af711e9a589c1b71eb8be5 \ - --hash=sha256:0c9e42f2499c8603af1d88771dc97e2c6b0310c278337058fd7fd1ddb35ab853 \ - --hash=sha256:0e92dc6a85cd1de42527812ef1276095e62169d002d86c888b6e889fcda1dd29 \ - --hash=sha256:0f76287d98ec79a38cba8292d0bdcd6ab9b9daf568dce1d53b9eb0135fc14d26 \ - --hash=sha256:18afdda2bbe0c615da4daff754cab0df9bbd859c415d85e7e741a2975b3208b4 \ - --hash=sha256:1af074f28a56425e4f4d99761708981543a27ae963f5b4b0a36ff71f3483479d \ - --hash=sha256:1d1a320230e0d020880178b8eb453300bd57700b44c3744268370502e7376a9b \ - --hash=sha256:1deeb84bb344351434f999cea4704ac6f1e07b3d861e34c44b50d8afa06caaa1 \ - --hash=sha256:1df931fbb4c36363d2cb985c2c26fda8f060b541a89c6c1191fdb59151a8c934 \ - --hash=sha256:1fcced1abb13cdb6a5d8b105765d30212a6cb29ab0dfb01eedecf2ff6c84371b \ - --hash=sha256:24c63592103fded38b258f1e520ba8b0a7a0bbc397cddd6520a1f74dc4b5dec0 \ - --hash=sha256:2b4f5671f9e88b7f51f54adda37a23277b7fdebd1557c47543b3e8a8044dd510 \ - --hash=sha256:33f7678287ac330c94e25f96cdb951e0861e206115ba4d8ea66cf6546b1a09d0 \ - --hash=sha256:3b789472e9ef75d179295d0c6a1f7f0aefd08189cd1c822b068b0523365a1dbe \ - --hash=sha256:431f864f2642a97d0aa8c6b606c307f03d22f919b1a226af90488426aed35809 \ - --hash=sha256:504af9e86ab01c9c33d8a452fe846aa931d024945f2e897537ccb8f7d76778ee \ - --hash=sha256:53d34cbf212f03634d74ba366d595b4a06a3b60fcc731eddbd6fd7ebe4acf981 \ - --hash=sha256:590c7206f764cfe37a65003a75977358e20919ed488f970935f54efa2741b497 \ - --hash=sha256:5b403c4ad22f3ba37c7720547d8888a1e4b74ad980a94332bbbc50330b623abc \ - --hash=sha256:5b49f372df33f5f84865aef5d46cacd23180b586c80e8cbe0ce149b96dfa8c4c \ - --hash=sha256:6275a54b41d6b1ec539b019bc3affaf6d05b0a0ba36af1a65b8a2810ef69e07d \ - --hash=sha256:69e99fe6bdc2cdacd04cef6b6585b00630d958c98e36d825de3eea406e15fb31 \ - --hash=sha256:6be86e8d5cf47415968588e5dfbfb92ee8757fb41139584192b67050d1a72c58 \ - --hash=sha256:712113946b303db9ae4245a13de213710367850a6c3c53530b70e87989feb8e0 \ - --hash=sha256:7734d1b91f1f3b1f186debf8ec4d168ee088a54e8186c14d89a95f7e51d3198d \ - --hash=sha256:7b44ed75b9d67d17e5a098a0f99a8fd3e5861fd3c4eb54212277a0acdf298434 \ - --hash=sha256:7cbf1e3aaec3edf734ef90182363a395d234cd4790544be914cedbe1b9fec99a \ - --hash=sha256:7e6885a8431939f1ee547e965fa3cb801a518b83d3d3509e90dbef78f0b5fd29 \ - --hash=sha256:7ea235cecb9df14b49a75cbd27a634683a96bb76576363407ec820ae454ce2b2 \ - --hash=sha256:80a8867746cff41c2db436dd9eea18ebbfcd0449d65b64b3ed3c995207898971 \ - --hash=sha256:8166ac6671472d172cc0db50323b7a7504bd534de54aa31354465a00ca44409d \ - --hash=sha256:8fc7667564c8c15748354dea1bb4035c5118df4e9dc5154ccdb6e62a3e5a2bac \ - --hash=sha256:9efbedc737ba342d8a2459afc9bd5c5df31adcdf774b772a4e663739f2cf0d06 \ - --hash=sha256:a3bee217bda6b2c81d9e2866f523217135a03a007a89043eee074e93d76706b0 \ - --hash=sha256:b16258a31269b97e26a08d71b5deb56499e86077d26e453fad8f6ec4c06fe666 \ - --hash=sha256:b676c4365a5753bc8c49f922a5f88bdb5df6746c670a9d859d2ba2f5f97d9269 \ - --hash=sha256:bea6a20c5a732a27b64623d43614b3022e6fcfc081a75236b7f9aa069d2eaa4d \ - --hash=sha256:d406cf2f6ccf39883a24b048c448a37bac16939408c1b6fbb4d021f3cd961448 \ - --hash=sha256:d9c51ca201326b49cfee38336c6e7dd1cb8a6b6d0dcf84aeaecbae310a736dbc \ - --hash=sha256:df07843c8c0dc71a56d3af3dfe19165fb0d3af7d3354a72185f6fa1b4ac05cab \ - --hash=sha256:ea84becb5cbd6a94a810c5214eb263ae57e915a9ed1bdcd5b4a6baf13d8c5177 \ - --hash=sha256:f14a82d12d53eb93298c35edf88d8c3ef37243b95f94dd3c75fddcba575d34ab \ - --hash=sha256:f3761f9a6817e32898eaa5aecd0b0ad69d0c68ab45ea7bf206e8dc4548f025f0 \ - --hash=sha256:f7e66d8b31ef2bada7029275debbe12c97397ec7ac70a659837a7b8a6a9dc916 \ - --hash=sha256:f9f7c0dd17f24e1774cc3a8df738246772994e853c28b28ed6ba7711ccf0abb4 +grpcio==1.70.0 \ + --hash=sha256:0495c86a55a04a874c7627fd33e5beaee771917d92c0e6d9d797628ac40e7655 \ + --hash=sha256:07269ff4940f6fb6710951116a04cd70284da86d0a4368fd5a3b552744511f5a \ + --hash=sha256:0a5c78d5198a1f0aa60006cd6eb1c912b4a1520b6a3968e677dbcba215fabb40 \ + --hash=sha256:0ba0a173f4feacf90ee618fbc1a27956bfd21260cd31ced9bc707ef551ff7dc7 \ + --hash=sha256:0cd430b9215a15c10b0e7d78f51e8a39d6cf2ea819fd635a7214fae600b1da27 \ + --hash=sha256:0de706c0a5bb9d841e353f6343a9defc9fc35ec61d6eb6111802f3aa9fef29e1 \ + --hash=sha256:17325b0be0c068f35770f944124e8839ea3185d6d54862800fc28cc2ffad205a \ + --hash=sha256:2394e3381071045a706ee2eeb6e08962dd87e8999b90ac15c55f56fa5a8c9597 \ + --hash=sha256:27cc75e22c5dba1fbaf5a66c778e36ca9b8ce850bf58a9db887754593080d839 \ + --hash=sha256:2b0d02e4b25a5c1f9b6c7745d4fa06efc9fd6a611af0fb38d3ba956786b95199 \ + --hash=sha256:374d014f29f9dfdb40510b041792e0e2828a1389281eb590df066e1cc2b404e5 \ + --hash=sha256:3b0f01f6ed9994d7a0b27eeddea43ceac1b7e6f3f9d86aeec0f0064b8cf50fdb \ + --hash=sha256:4119fed8abb7ff6c32e3d2255301e59c316c22d31ab812b3fbcbaf3d0d87cc68 \ + --hash=sha256:412faabcc787bbc826f51be261ae5fa996b21263de5368a55dc2cf824dc5090e \ + --hash=sha256:4f1937f47c77392ccd555728f564a49128b6a197a05a5cd527b796d36f3387d0 \ + --hash=sha256:5413549fdf0b14046c545e19cfc4eb1e37e9e1ebba0ca390a8d4e9963cab44d2 \ + --hash=sha256:558c386ecb0148f4f99b1a65160f9d4b790ed3163e8610d11db47838d452512d \ + --hash=sha256:58ad9ba575b39edef71f4798fdb5c7b6d02ad36d47949cd381d4392a5c9cbcd3 \ + --hash=sha256:5ea67c72101d687d44d9c56068328da39c9ccba634cabb336075fae2eab0d04b \ + --hash=sha256:7385b1cb064734005204bc8994eed7dcb801ed6c2eda283f613ad8c6c75cf873 \ + --hash=sha256:7c73c42102e4a5ec76608d9b60227d917cea46dff4d11d372f64cbeb56d259d0 \ + --hash=sha256:8058667a755f97407fca257c844018b80004ae8035565ebc2812cc550110718d \ + --hash=sha256:879a61bf52ff8ccacbedf534665bb5478ec8e86ad483e76fe4f729aaef867cab \ + --hash=sha256:880bfb43b1bb8905701b926274eafce5c70a105bc6b99e25f62e98ad59cb278e \ + --hash=sha256:8d1584a68d5922330025881e63a6c1b54cc8117291d382e4fa69339b6d914c56 \ + --hash=sha256:95469d1977429f45fe7df441f586521361e235982a0b39e33841549143ae2851 \ + --hash=sha256:9e654c4b17d07eab259d392e12b149c3a134ec52b11ecdc6a515b39aceeec898 \ + --hash=sha256:a31d7e3b529c94e930a117b2175b2efd179d96eb3c7a21ccb0289a8ab05b645c \ + --hash=sha256:aa47688a65643afd8b166928a1da6247d3f46a2784d301e48ca1cc394d2ffb40 \ + --hash=sha256:aa573896aeb7d7ce10b1fa425ba263e8dddd83d71530d1322fd3a16f31257b4a \ + --hash=sha256:aba19419aef9b254e15011b230a180e26e0f6864c90406fdbc255f01d83bc83c \ + --hash=sha256:ac073fe1c4cd856ebcf49e9ed6240f4f84d7a4e6ee95baa5d66ea05d3dd0df7f \ + --hash=sha256:b3c76701428d2df01964bc6479422f20e62fcbc0a37d82ebd58050b86926ef8c \ + --hash=sha256:b745d2c41b27650095e81dea7091668c040457483c9bdb5d0d9de8f8eb25e59f \ + --hash=sha256:bb491125103c800ec209d84c9b51f1c60ea456038e4734688004f377cfacc113 \ + --hash=sha256:c1af8e15b0f0fe0eac75195992a63df17579553b0c4af9f8362cc7cc99ccddf4 \ + --hash=sha256:c78b339869f4dbf89881e0b6fbf376313e4f845a42840a7bdf42ee6caed4b11f \ + --hash=sha256:cb5277db254ab7586769e490b7b22f4ddab3876c490da0a1a9d7c695ccf0bf77 \ + --hash=sha256:cbce24409beaee911c574a3d75d12ffb8c3e3dd1b813321b1d7a96bbcac46bf4 \ + --hash=sha256:cd24d2d9d380fbbee7a5ac86afe9787813f285e684b0271599f95a51bce33528 \ + --hash=sha256:ce7df14b2dcd1102a2ec32f621cc9fab6695effef516efbc6b063ad749867295 \ + --hash=sha256:d24035d49e026353eb042bf7b058fb831db3e06d52bee75c5f2f3ab453e71aca \ + --hash=sha256:d405b005018fd516c9ac529f4b4122342f60ec1cee181788249372524e6db429 \ + --hash=sha256:d63764963412e22f0491d0d32833d71087288f4e24cbcddbae82476bfa1d81fd \ + --hash=sha256:dbe41ad140df911e796d4463168e33ef80a24f5d21ef4d1e310553fcd2c4a386 \ + --hash=sha256:dfa089a734f24ee5f6880c83d043e4f46bf812fcea5181dcb3a572db1e79e01c \ + --hash=sha256:e27585831aa6b57b9250abaf147003e126cd3a6c6ca0c531a01996f31709bed1 \ + --hash=sha256:e7831a0fc1beeeb7759f737f5acd9fdcda520e955049512d68fda03d91186eea \ + --hash=sha256:ed9718f17fbdb472e33b869c77a16d0b55e166b100ec57b016dc7de9c8d236bf \ + --hash=sha256:ef4c14508299b1406c32bdbb9fb7b47612ab979b04cf2b27686ea31882387cff \ + --hash=sha256:f19375f0300b96c0117aca118d400e76fede6db6e91f3c34b7b035822e06c35f \ + --hash=sha256:f2af68a6f5c8f78d56c145161544ad0febbd7479524a59c16b3e25053f39c87f \ + --hash=sha256:f32090238b720eb585248654db8e3afc87b48d26ac423c8dde8334a232ff53c9 \ + --hash=sha256:fe9dbd916df3b60e865258a8c72ac98f3ac9e2a9542dcb72b7a34d236242a5ce \ + --hash=sha256:ff4a8112a79464919bb21c18e956c54add43ec9a4850e3949da54f61c241a4a6 # via - # -r requirements.bazel.txt + # -r requirements.txt # grpcio-tools -grpcio-tools==1.47.0 \ - --hash=sha256:058060fbc5a60a1c6cc2cbb3d99f730825ba249917978d48b7d0fd8f2caf01da \ - --hash=sha256:05b495ed997a9afc9016c696ed7fcd35678a7276fe0bd8b95743a382363ad2b4 \ - --hash=sha256:0b32002ff4ae860c85feb2aca1b752eb4518e7781c5770b869e7b2dfa9d92cbe \ - --hash=sha256:0eced69e159b3fdd7597d85950f56990e0aa81c11a20a7785fb66f0e47c46b57 \ - --hash=sha256:156b5f6654fea51983fd9257d47f1ad7bfb2a1d09ed471e610a7b34b97d40802 \ - --hash=sha256:18548f35b0657422d5d40e6fa89994469f4bb77df09f8133ecdccec0e31fc72c \ - --hash=sha256:1a0a91941f6f2a4d97e843a5d9ad7ccccf702af2d9455932f18cf922e65af95e \ - --hash=sha256:2364ac3bd7266752c9971dbef3f79d21cd958777823512faa93473cbd973b8f1 \ - --hash=sha256:2a6a6e5e08866d643b84c89140bbe504f864f11b87bfff7a5f2af94c5a2be18d \ - --hash=sha256:2c5c50886e6e79af5387c6514eb19f1f6b1a0b4eb787f1b7a8f21a74e2444102 \ - --hash=sha256:3edb04d102e0d6f0149d93fe8cf69a38c20a2259a913701a4c35c119049c8404 \ - --hash=sha256:3fccc282ee97211a33652419dcdfd24a9a60bbd2d56f5c5dd50c7186a0f4d978 \ - --hash=sha256:441a0a378117447c089b944f325f11039329d8aa961ecdb8226c5dd84af6f003 \ - --hash=sha256:45ceb73a97e2d7ff719fc12c02f1ef13014c47bad60a864313da88ccd90cdf36 \ - --hash=sha256:498c0bae4975683a5a33b72cf1bd64703b34c826871fd3ee8d295407cd5211ec \ - --hash=sha256:4eced9e0674bfb5c528a3bf2ea2b8596da133148b3e0718915792074204ea226 \ - --hash=sha256:51352070f13ea3346b5f5ca825f2203528b8218fffc6ac6d951216f812272d8b \ - --hash=sha256:53c47b08ee2f59a89e8df5f3c09850d7fac264754cbaeabae65f6fbf78d80536 \ - --hash=sha256:5c8ab9b541a869d3b4ef34c291fbfb6ec78ad728e04737fddd91eac3c2193459 \ - --hash=sha256:6804cbd92b9069ae9189d65300e456bcc3945f6ae196d2af254e9635b9c3ef0d \ - --hash=sha256:6c66094fd79ee98bcb504e9f1a3fa6e7ebfd246b4e3d8132227e5020b5633988 \ - --hash=sha256:6d41ec06f2ccc8adcd400a63508ea8e008fb03f270e0031ff2de047def2ada9d \ - --hash=sha256:74f607b9084b5325a997d9ae57c0814955e19311111568d029b2a6a66f4869ec \ - --hash=sha256:7589d6f56e633378047274223f0a75534b2cd7c598f9f2894cb4854378b8b00b \ - --hash=sha256:759064fc8439bbfe5402b2fd3b0685f4ffe07d7cc6a64908c2f88a7c80449ce4 \ - --hash=sha256:7be45d69f0eed912df2e92d94958d1a3e72617469ec58ffcac3e2eb153a7057e \ - --hash=sha256:7fd10683f4f03400536e7a026de9929430ee198c2cbdf2c584edfa909ccc8993 \ - --hash=sha256:818fca1c7dd4ad1c9c01f91ba37006964f4c57c93856fa4ebd7d5589132844d6 \ - --hash=sha256:84e38f46af513a6f62a3d482160fcb94063dbc9fdd1452d09f8010422f144de1 \ - --hash=sha256:93d08c02bd82e423353399582f22493a191db459c3f34031b583f13bcf42b95e \ - --hash=sha256:94114e01c4508d904825bd984e3d2752c0b0e6eb714ac08b99f73421691cf931 \ - --hash=sha256:9ab78cd16b4ac7c6b79c8be194c67e03238f6378694133ce3ce9b123caf24ed5 \ - --hash=sha256:9dd6e26e3e0555deadcb52b087c6064e4fd02c09180b42e96c66260137d26b50 \ - --hash=sha256:a93263955da8d6e449d7ceb84af4e84b82fa760fd661b4ef4549929d9670ab8e \ - --hash=sha256:ac5c6aef72618ebc5ee9ad725dd53e1c145ef420b79d21a7c43ca80658d3d8d4 \ - --hash=sha256:ae53ae35a9761ceea50a502addb7186c5188969d63ad21cf12e00d939db5b967 \ - --hash=sha256:b2fa3c545c8aa1e8c33ca04b1424be3ff77da631faf37db3350d7459c3bdedde \ - --hash=sha256:c2c280197d68d5a28f5b90adf755bd9e28c99f3e47ad4edcfe20497cf3456e1d \ - --hash=sha256:ca548afcfa0ffc47c3cf9eeede81adde15c321bfe897085e90ce8913615584ae \ - --hash=sha256:ccc8ce33bd31bf12649541b5857fabfee7dd84b04138336a27bf46a28d150c11 \ - --hash=sha256:dc6567d652c6b70d8c03f4e450a694e62b4d69a400752f8b9c3c8b659dd6b06a \ - --hash=sha256:dd5d330230038374e64fc652fc4c1b25d457a8b67b9069bfce83a17ab675650b \ - --hash=sha256:e1de1f139f05ab6bbdabc58b06f6ebb5940a92214bbc7246270299387d0af2ae \ - --hash=sha256:f19191460435f8bc72450cf26ac0559726f98c49ad9b0969db3db8ba51be98c8 \ - --hash=sha256:f64b5378484be1d6ce59311f86174be29c8ff98d8d90f589e1c56d5acae67d3c \ - --hash=sha256:fb44ae747fd299b6513420cb6ead50491dc3691d17da48f28fcc5ebf07f47741 - # via -r requirements.bazel.txt -protobuf==3.20.3 \ - --hash=sha256:03038ac1cfbc41aa21f6afcbcd357281d7521b4157926f30ebecc8d4ea59dcb7 \ - --hash=sha256:28545383d61f55b57cf4df63eebd9827754fd2dc25f80c5253f9184235db242c \ - --hash=sha256:2e3427429c9cffebf259491be0af70189607f365c2f41c7c3764af6f337105f2 \ - --hash=sha256:398a9e0c3eaceb34ec1aee71894ca3299605fa8e761544934378bbc6c97de23b \ - --hash=sha256:44246bab5dd4b7fbd3c0c80b6f16686808fab0e4aca819ade6e8d294a29c7050 \ - --hash=sha256:447d43819997825d4e71bf5769d869b968ce96848b6479397e29fc24c4a5dfe9 \ - --hash=sha256:67a3598f0a2dcbc58d02dd1928544e7d88f764b47d4a286202913f0b2801c2e7 \ - --hash=sha256:74480f79a023f90dc6e18febbf7b8bac7508420f2006fabd512013c0c238f454 \ - --hash=sha256:819559cafa1a373b7096a482b504ae8a857c89593cf3a25af743ac9ecbd23480 \ - --hash=sha256:899dc660cd599d7352d6f10d83c95df430a38b410c1b66b407a6b29265d66469 \ - --hash=sha256:8c0c984a1b8fef4086329ff8dd19ac77576b384079247c770f29cc8ce3afa06c \ - --hash=sha256:9aae4406ea63d825636cc11ffb34ad3379335803216ee3a856787bcf5ccc751e \ - --hash=sha256:a7ca6d488aa8ff7f329d4c545b2dbad8ac31464f1d8b1c87ad1346717731e4db \ - --hash=sha256:b6cc7ba72a8850621bfec987cb72623e703b7fe2b9127a161ce61e61558ad905 \ - --hash=sha256:bf01b5720be110540be4286e791db73f84a2b721072a3711efff6c324cdf074b \ - --hash=sha256:c02ce36ec760252242a33967d51c289fd0e1c0e6e5cc9397e2279177716add86 \ - --hash=sha256:d9e4432ff660d67d775c66ac42a67cf2453c27cb4d738fc22cb53b5d84c135d4 \ - --hash=sha256:daa564862dd0d39c00f8086f88700fdbe8bc717e993a21e90711acfed02f2402 \ - --hash=sha256:de78575669dddf6099a8a0f46a27e82a1783c557ccc38ee620ed8cc96d3be7d7 \ - --hash=sha256:e64857f395505ebf3d2569935506ae0dfc4a15cb80dc25261176c784662cdcc4 \ - --hash=sha256:f4bd856d702e5b0d96a00ec6b307b0f51c1982c2bf9c0052cf9019e9a544ba99 \ - --hash=sha256:f4c42102bc82a51108e449cbb32b19b180022941c727bac0cfd50170341f16ee +grpcio-tools==1.70.0 \ + --hash=sha256:02e3bf55fb569fe21b54a32925979156e320f9249bb247094c4cbaa60c23a80d \ + --hash=sha256:04bf30c0eb2741defe3ab6e0a6102b022d69cfd39d68fab9b954993ceca8d346 \ + --hash=sha256:076f71c6d5adcf237ebca63f1ed51098293261dab9f301e3dfd180e896e5fa89 \ + --hash=sha256:0f7ed0372afd9f5eb938334e84681396257015ab92e03de009aa3170e64b24d0 \ + --hash=sha256:114a42e566e5b16a47e98f7910a6c0074b37e2d1faacaae13222e463d0d0d43c \ + --hash=sha256:1ab788afced2d2c59bef86479967ce0b28485789a9f2cc43793bb7aa67f9528b \ + --hash=sha256:1c0917dce12af04529606d437def83962d51c59dcde905746134222e94a2ab1b \ + --hash=sha256:1de6c71833d36fb8cc8ac10539681756dc2c5c67e5d4aa4d05adb91ecbdd8474 \ + --hash=sha256:1fa9a81621d7178498dedcf94eb8f276a7594327faf3dd5fd1935ce2819a2bdb \ + --hash=sha256:22024caee36ab65c2489594d718921dcbb5bd18d61c5417a9ede94fd8dc8a589 \ + --hash=sha256:24a5b0328ffcfe0c4a9024f302545abdb8d6f24921409a5839f2879555b96fea \ + --hash=sha256:3020c97f03b30eee3c26aa2a55fbe003f1729c6f879a378507c2c78524db7c12 \ + --hash=sha256:3875543d74ce1a698a11f498f83795216ce929cb29afa5fac15672c7ba1d6dd2 \ + --hash=sha256:4545264e06e1cd7fb21b9447bb5126330bececb4bc626c98f793fda2fd910bf8 \ + --hash=sha256:4cae365d7e3ba297256216a9a256458b286f75c64603f017972b3ad1ee374437 \ + --hash=sha256:4d456521290e25b1091975af71604facc5c7db162abdca67e12a0207b8bbacbe \ + --hash=sha256:4ebf09733545a69c166b02caa14c34451e38855544820dab7fdde5c28e2dbffe \ + --hash=sha256:52d7e7ef11867fe7de577076b1f2ac6bf106b2325130e3de66f8c364c96ff332 \ + --hash=sha256:54ceffef59a059d2c7304554a8bbb20eedb05a3f937159ab1c332c1b28e12c9f \ + --hash=sha256:5cb0baa52d4d44690fac6b1040197c694776a291a90e2d3c369064b4d5bc6642 \ + --hash=sha256:5f5aba12d98d25c7ab2dd983939e2c21556a7d15f903b286f24d88d2c6e30c0a \ + --hash=sha256:6034a0579fab2aed8685fa1a558de084668b1e9b01a82a4ca7458b9bedf4654c \ + --hash=sha256:63f367363a4a1489a0046b19f9d561216ea0d206c40a6f1bf07a58ccfb7be480 \ + --hash=sha256:6eeb86864e1432fc1ab61e03395a2a4c04e9dd9c89db07e6fe68c7c2ac8ec24f \ + --hash=sha256:701bbb1ff406a21a771f5b1df6be516c0a59236774b6836eaad7696b1d128ea8 \ + --hash=sha256:70234b592af17050ec30cf35894790cef52aeae87639efe6db854a7fa783cc8c \ + --hash=sha256:740b3741d124c5f390dd50ad1c42c11788882baf3c202cd3e69adee0e3dde559 \ + --hash=sha256:79b723ce30416e8e1d7ff271f97ade79aaf30309a595d80c377105c07f5b20fd \ + --hash=sha256:7a90a66a46821140a2a2b0be787dfabe42e22e9a5ba9cc70726b3e5c71a3b785 \ + --hash=sha256:7d45067e6efd20881e98a0e1d7edd7f207b1625ad7113321becbfe0a6ebee46c \ + --hash=sha256:836293dcbb1e59fa52aa8aa890bd7a32a8eea7651cd614e96d86de4f3032fe73 \ + --hash=sha256:840ec536ab933db2ef8d5acaa6b712d0e9e8f397f62907c852ec50a3f69cdb78 \ + --hash=sha256:88a3ec6fa2381f616d567f996503e12ca353777941b61030fd9733fd5772860e \ + --hash=sha256:8eae17c920d14e2e451dbb18f5d8148f884e10228061941b33faa8fceee86e73 \ + --hash=sha256:904f13d2d04f88178b09d8ef89549b90cbf8792b684a7c72540fc1a9887697e2 \ + --hash=sha256:9387b30f3b2f46942fb5718624d7421875a6ce458620d6e15817172d78db1e1a \ + --hash=sha256:99caa530242a0a832d8b6a6ab94b190c9b449d3e237f953911b4d56207569436 \ + --hash=sha256:9c021b040d0a9f5bb96a725c4d2b95008aad127d6bed124a7bbe854973014f5b \ + --hash=sha256:a130c24d617a3a57369da784080dfa8848444d41b7ae1250abc06e72e706a8d9 \ + --hash=sha256:ae139a8d3ddd8353f62af3af018e99ebcd2f4a237bd319cb4b6f58dd608aaa54 \ + --hash=sha256:b5a9beadd1e24772ffa2c70f07d72f73330d356b78b246e424f4f2ed6c6713f3 \ + --hash=sha256:b9e4a12b862ba5e42d8028da311e8d4a2c307362659b2f4141d0f940f8c12b49 \ + --hash=sha256:bb8135eef160a62505f074bf7a3d62f3b13911c3c14037c5392bf877114213b5 \ + --hash=sha256:c6da2585c0950cdb650df1ff6d85b3fe31e22f8370b9ee11f8fe641d5b4bf096 \ + --hash=sha256:d1fc2112e9c40167086e2e6a929b253e5281bffd070fab7cd1ae019317ffc11d \ + --hash=sha256:d47a6c6cfc526b290b7b53a37dd7e6932983f7a168b56aab760b4b597c47f30f \ + --hash=sha256:d50080bca84f53f3a05452e06e6251cbb4887f5a1d1321d1989e26d6e0dc398d \ + --hash=sha256:d53c8c45e843b5836781ad6b82a607c72c2f9a3f556e23d703a0e099222421fa \ + --hash=sha256:d7fd472fce3b33bdf7fbc24d40da7ab10d7a088bcaf59c37433c2c57330fbcb6 \ + --hash=sha256:e578fee7c1c213c8e471750d92631d00f178a15479fb2cb3b939a07fc125ccd3 \ + --hash=sha256:ec5d6932c3173d7618267b3b3fd77b9243949c5ec04302b7338386d4f8544e0b \ + --hash=sha256:f024688d04e7a9429489ed695b85628075c3c6d655198ba3c6ccbd1d8b7c333b \ + --hash=sha256:f22852da12f53b02a3bdb29d0c32fcabab9c7c8f901389acffec8461083f110d \ + --hash=sha256:f7ac9b3e13ace8467a586c53580ee22f9732c355583f3c344ef8c6c0666219cc \ + --hash=sha256:fd04c93af460b1456cd12f8f85502503e1db6c4adc1b7d4bd775b12c1fd94fee + # via -r requirements.txt +protobuf==5.29.3 \ + --hash=sha256:0a18ed4a24198528f2333802eb075e59dea9d679ab7a6c5efb017a59004d849f \ + --hash=sha256:0eb32bfa5219fc8d4111803e9a690658aa2e6366384fd0851064b963b6d1f2a7 \ + --hash=sha256:3ea51771449e1035f26069c4c7fd51fba990d07bc55ba80701c78f886bf9c888 \ + --hash=sha256:5da0f41edaf117bde316404bad1a486cb4ededf8e4a54891296f648e8e076620 \ + --hash=sha256:6ce8cc3389a20693bfde6c6562e03474c40851b44975c9b2bf6df7d8c4f864da \ + --hash=sha256:84a57163a0ccef3f96e4b6a20516cedcf5bb3a95a657131c5c3ac62200d23252 \ + --hash=sha256:a4fa6f80816a9a0678429e84973f2f98cbc218cca434abe8db2ad0bffc98503a \ + --hash=sha256:a8434404bbf139aa9e1300dbf989667a83d42ddda9153d8ab76e0d5dcaca484e \ + --hash=sha256:b89c115d877892a512f79a8114564fb435943b59067615894c3b13cd3e1fa107 \ + --hash=sha256:c027e08a08be10b67c06bf2370b99c811c466398c357e615ca88c91c07f0910f \ + --hash=sha256:daaf63f70f25e8689c072cfad4334ca0ac1d1e05a92fc15c54eb9cf23c3efd84 # via - # -r requirements.bazel.txt + # -r requirements.txt # grpcio-tools pycparser==2.21 \ --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 # via cffi -six==1.16.0 \ - --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ - --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 - # via grpcio # The following packages are considered to be unsafe in a requirements file: setuptools==65.6.3 \ diff --git a/src/api/python/requirements.txt b/src/api/python/requirements.txt index 09018faf67f..8bb46b49186 100644 --- a/src/api/python/requirements.txt +++ b/src/api/python/requirements.txt @@ -1,5 +1,4 @@ -Authlib==1.1.0 -gogo-python==0.0.1 -grpcio==1.53.2 -grpcio-tools==1.47.0 -protobuf==3.20.3 +Authlib==1.5.1 +grpcio==1.70.0 +grpcio-tools==1.70.0 +protobuf==5.29.3 diff --git a/src/api/python/wheel_upload.bzl b/src/api/python/wheel_upload.bzl index 766745dac31..62d06c90206 100644 --- a/src/api/python/wheel_upload.bzl +++ b/src/api/python/wheel_upload.bzl @@ -23,7 +23,7 @@ def _impl(ctx): "#!/bin/bash -e", "python3 -m venv venv", "source venv/bin/activate", - "pip install -q twine==3.4.1", + "pip install -q twine==6.1.0", ] upload_cmd = [ diff --git a/src/carnot/carnotpb/BUILD.bazel b/src/carnot/carnotpb/BUILD.bazel index 8c1af8cf2e5..ce7a99abda6 100644 --- a/src/carnot/carnotpb/BUILD.bazel +++ b/src/carnot/carnotpb/BUILD.bazel @@ -31,7 +31,7 @@ pl_proto_library( "//src/carnot/queryresultspb:query_results_pl_proto", "//src/common/base/statuspb:status_pl_proto", "//src/table_store/schemapb:schema_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -43,7 +43,7 @@ pl_cc_proto_library( "//src/carnot/queryresultspb:query_results_pl_cc_proto", "//src/common/base/statuspb:status_pl_cc_proto", "//src/table_store/schemapb:schema_pl_cc_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/carnot/carnotpb/carnot.pb.go b/src/carnot/carnotpb/carnot.pb.go index 8264713b758..c8874258073 100755 --- a/src/carnot/carnotpb/carnot.pb.go +++ b/src/carnot/carnotpb/carnot.pb.go @@ -427,55 +427,54 @@ func init() { func init() { proto.RegisterFile("src/carnot/carnotpb/carnot.proto", fileDescriptor_4ae58e1781b105be) } var fileDescriptor_4ae58e1781b105be = []byte{ - // 753 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x41, 0x4f, 0xc3, 0x36, - 0x14, 0x8e, 0x69, 0xa1, 0xa9, 0x5b, 0xa0, 0x84, 0x6d, 0xca, 0x8a, 0x94, 0x56, 0x48, 0x68, 0xbd, - 0x90, 0x4a, 0xdd, 0x61, 0xd3, 0x0e, 0x48, 0xb4, 0x45, 0x6b, 0x39, 0x4c, 0x23, 0x85, 0x4d, 0xda, - 0x25, 0x72, 0x12, 0xb7, 0xcd, 0x46, 0xec, 0x60, 0x3b, 0x83, 0x9d, 0xc6, 0x4f, 0xd8, 0xcf, 0xd8, - 0x4f, 0xd9, 0x11, 0x69, 0x9a, 0xc4, 0x09, 0x8d, 0x70, 0xd9, 0x91, 0x9f, 0x30, 0xd9, 0x49, 0x46, - 0x06, 0x8c, 0x71, 0xca, 0xfb, 0xec, 0xcf, 0xdf, 0x7b, 0x7e, 0xef, 0x73, 0x60, 0x97, 0x33, 0xbf, - 0xef, 0x23, 0x46, 0xa8, 0xc8, 0x3f, 0xb1, 0x97, 0x07, 0x76, 0xcc, 0xa8, 0xa0, 0x46, 0x23, 0xbe, - 0xb2, 0x8b, 0x9d, 0xf6, 0xfe, 0x22, 0x14, 0xcb, 0xc4, 0xb3, 0x7d, 0x1a, 0xf5, 0x17, 0x74, 0x41, - 0xfb, 0x8a, 0xe3, 0x25, 0x73, 0x85, 0x14, 0x50, 0x51, 0x76, 0xb6, 0xdd, 0x91, 0xea, 0x28, 0x0e, - 0x33, 0x5a, 0x3f, 0x49, 0xc2, 0x20, 0xf6, 0xd4, 0x27, 0x27, 0xec, 0x97, 0xd2, 0x5f, 0x24, 0x98, - 0xfd, 0xc4, 0x30, 0x4f, 0xce, 0x05, 0x8f, 0xbd, 0x0c, 0xba, 0x39, 0xce, 0xe9, 0x7b, 0x92, 0x2e, - 0x90, 0x77, 0x8e, 0x5d, 0x2e, 0x28, 0xc3, 0x7d, 0xee, 0x2f, 0x71, 0x84, 0x62, 0x2f, 0x0f, 0xca, - 0x34, 0x9f, 0x46, 0x11, 0x25, 0x7d, 0x0f, 0x71, 0xdc, 0xe7, 0x02, 0x89, 0x44, 0x8a, 0x66, 0x41, - 0x46, 0xdb, 0xfd, 0xbd, 0x06, 0xdb, 0xa7, 0x0c, 0x11, 0x3e, 0xc7, 0xcc, 0x51, 0x79, 0x46, 0xcb, - 0x84, 0xfc, 0xe0, 0xe0, 0x8b, 0x04, 0x73, 0x61, 0x98, 0xb0, 0x86, 0x82, 0x80, 0x61, 0xce, 0x4d, - 0xd0, 0x05, 0xbd, 0xba, 0x53, 0x40, 0xe3, 0x33, 0xa8, 0x67, 0xd5, 0x85, 0x81, 0xb9, 0xd2, 0x05, - 0xbd, 0xc6, 0x60, 0xd3, 0x8e, 0xaf, 0xec, 0xec, 0x7a, 0xf6, 0xd9, 0xd9, 0x74, 0x3c, 0x6c, 0xa4, - 0x77, 0x9d, 0xda, 0x89, 0x24, 0x4d, 0xc7, 0x4e, 0x4d, 0xb1, 0xa7, 0x81, 0xf1, 0x2d, 0x6c, 0x96, - 0xaf, 0x65, 0xae, 0xaa, 0xc3, 0x03, 0xbb, 0xd4, 0x62, 0xfb, 0xbf, 0x2b, 0xb2, 0x67, 0xa1, 0x8c, - 0xe5, 0xf2, 0x44, 0x73, 0x1a, 0x4a, 0x29, 0x83, 0xc6, 0x35, 0x80, 0x1f, 0xe3, 0x2b, 0xec, 0x27, - 0x22, 0xa4, 0xc4, 0x45, 0x24, 0x70, 0x45, 0x18, 0x85, 0x64, 0xe1, 0x86, 0x64, 0x4e, 0xcd, 0x35, - 0x95, 0x66, 0xf4, 0xde, 0x34, 0xaa, 0xec, 0xa3, 0x42, 0xed, 0x90, 0x04, 0xa7, 0x4a, 0x6b, 0x4a, - 0xe6, 0x74, 0xa2, 0x39, 0x1f, 0xe1, 0x57, 0x77, 0x8c, 0x03, 0xb8, 0xf9, 0x54, 0x01, 0x66, 0x8c, - 0x32, 0xb3, 0xa6, 0xf2, 0x6e, 0xcb, 0xbc, 0xc5, 0x04, 0xec, 0x99, 0x0a, 0x26, 0x9a, 0xb3, 0xf1, - 0x0f, 0xfb, 0x48, 0x92, 0x0d, 0x04, 0xd7, 0x43, 0x12, 0x8a, 0x10, 0x09, 0xec, 0xfa, 0x94, 0x10, - 0x53, 0x57, 0xa7, 0xbf, 0x78, 0x6f, 0xd5, 0xd3, 0xfc, 0xf0, 0x88, 0x12, 0x82, 0x7d, 0xa9, 0x3b, - 0xd1, 0x9c, 0x66, 0x58, 0x5a, 0x6d, 0xff, 0x01, 0x20, 0x7c, 0xea, 0xa1, 0x31, 0x86, 0x75, 0x46, - 0x2f, 0x5d, 0x0f, 0x09, 0x7f, 0xa9, 0x46, 0xdc, 0x18, 0xec, 0xc9, 0x6c, 0x25, 0x83, 0xd9, 0x85, - 0xc1, 0x6c, 0x87, 0x5e, 0x0e, 0x25, 0x71, 0x8c, 0x04, 0x9a, 0x68, 0x8e, 0xce, 0x72, 0x6c, 0x7c, - 0x0e, 0x37, 0x16, 0x2c, 0xf6, 0x5d, 0x4e, 0x13, 0xe6, 0xe3, 0xc2, 0x12, 0xd5, 0x61, 0x2b, 0xbd, - 0xeb, 0x34, 0xbf, 0x74, 0xbe, 0x1e, 0xcd, 0xd4, 0xc6, 0x74, 0x3c, 0x01, 0x4e, 0x53, 0x32, 0x73, - 0x1c, 0x18, 0x1d, 0x08, 0xb3, 0x54, 0x04, 0x45, 0xd8, 0xac, 0x48, 0x8f, 0x4d, 0x80, 0x53, 0x57, - 0x6b, 0x5f, 0xa1, 0x08, 0x0f, 0xb7, 0xe0, 0x66, 0x66, 0x14, 0xd9, 0x10, 0x81, 0x89, 0xe0, 0xc3, - 0x75, 0xd8, 0x08, 0x30, 0x17, 0x21, 0x41, 0xf2, 0x86, 0xc7, 0x55, 0xbd, 0xda, 0x5a, 0x6d, 0xdf, - 0x01, 0xb8, 0xf3, 0xc6, 0xd0, 0x8c, 0x6f, 0xca, 0xa3, 0x91, 0x93, 0xe0, 0xb9, 0x6d, 0xf7, 0x9f, - 0x9a, 0x6b, 0xff, 0xfb, 0xf9, 0x3d, 0x33, 0x81, 0x9c, 0x1a, 0x2f, 0x8d, 0x4c, 0x61, 0x03, 0xc1, - 0x0f, 0xd1, 0x02, 0x13, 0xe1, 0x3e, 0x57, 0xaf, 0x74, 0x2b, 0x6f, 0xab, 0x1f, 0xca, 0x63, 0xcf, - 0xd4, 0xb7, 0xd1, 0xcb, 0xc5, 0xe3, 0xaa, 0x0e, 0x5a, 0x2b, 0xed, 0x0f, 0xa0, 0xf1, 0x72, 0xbc, - 0x43, 0x1d, 0xae, 0x65, 0x8a, 0xc7, 0x55, 0xbd, 0xd2, 0xaa, 0x66, 0xcd, 0xd8, 0x3d, 0x81, 0x3b, - 0xaf, 0xba, 0x84, 0xc7, 0x94, 0x70, 0x2c, 0x5f, 0x35, 0x4f, 0x7c, 0xbf, 0x78, 0xd5, 0xba, 0x53, - 0x40, 0xb9, 0x13, 0x61, 0xce, 0xd1, 0x02, 0xab, 0xee, 0xd4, 0x9d, 0x02, 0x0e, 0x7e, 0x86, 0x5b, - 0x99, 0x94, 0x34, 0xcf, 0x0c, 0xb3, 0x1f, 0x43, 0x1f, 0x1b, 0xdf, 0xc3, 0xed, 0x57, 0xf2, 0x18, - 0x9f, 0xbc, 0xd3, 0xaf, 0xed, 0xde, 0xff, 0x13, 0xb3, 0x92, 0x7b, 0x60, 0x78, 0x70, 0x73, 0x6f, - 0x69, 0xb7, 0xf7, 0x96, 0xf6, 0x78, 0x6f, 0x81, 0xeb, 0xd4, 0x02, 0xbf, 0xa6, 0x16, 0xf8, 0x2d, - 0xb5, 0xc0, 0x4d, 0x6a, 0x81, 0x3f, 0x53, 0x0b, 0xfc, 0x95, 0x5a, 0xda, 0x63, 0x6a, 0x81, 0x5f, - 0x1e, 0x2c, 0xed, 0xe6, 0xc1, 0xd2, 0x6e, 0x1f, 0x2c, 0xed, 0x3b, 0xbd, 0x50, 0xf7, 0xd6, 0xd4, - 0x0f, 0xef, 0xd3, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xc4, 0xd7, 0x69, 0xd1, 0xee, 0x05, 0x00, - 0x00, + // 742 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x4f, 0x4f, 0xe3, 0x46, + 0x14, 0xf7, 0x90, 0x40, 0x9c, 0x49, 0x80, 0x60, 0x68, 0xe5, 0x06, 0xc9, 0x89, 0x90, 0x50, 0x73, + 0xc1, 0x91, 0xd2, 0x43, 0xab, 0x1e, 0x90, 0x48, 0x82, 0x9a, 0x70, 0xa8, 0x8a, 0x03, 0xad, 0xd4, + 0x8b, 0x35, 0xb6, 0x87, 0xe0, 0x96, 0xcc, 0x98, 0x99, 0x71, 0xa1, 0xa7, 0xe5, 0x23, 0xec, 0xc7, + 0xd8, 0x8f, 0xb2, 0x47, 0xa4, 0xd5, 0x4a, 0x9c, 0xd0, 0x62, 0x2e, 0x7b, 0xe4, 0x23, 0xac, 0x66, + 0x6c, 0x2f, 0x5e, 0x60, 0x59, 0x4e, 0x7e, 0x7f, 0x7e, 0xf3, 0x7b, 0x6f, 0xde, 0xfb, 0x8d, 0x61, + 0x9b, 0x33, 0xbf, 0xeb, 0x23, 0x46, 0xa8, 0xc8, 0x3e, 0x91, 0x97, 0x19, 0x76, 0xc4, 0xa8, 0xa0, + 0x46, 0x2d, 0x3a, 0xb7, 0xf3, 0x4c, 0x73, 0x6d, 0x4a, 0xa7, 0x54, 0xc5, 0xbb, 0xd2, 0x4a, 0x21, + 0xcd, 0x96, 0x24, 0x41, 0x51, 0xd8, 0x4d, 0x33, 0x71, 0x1c, 0x06, 0x91, 0xa7, 0x3e, 0x19, 0x60, + 0xab, 0x50, 0xe5, 0x34, 0xc6, 0xec, 0x7f, 0x86, 0x79, 0x7c, 0x22, 0x78, 0xe4, 0xa5, 0xae, 0x9b, + 0xf9, 0x19, 0x7c, 0x53, 0xc2, 0x05, 0xf2, 0x4e, 0xb0, 0xcb, 0x05, 0x65, 0xb8, 0xcb, 0xfd, 0x63, + 0x3c, 0x43, 0x91, 0x97, 0x19, 0x45, 0x98, 0x4f, 0x67, 0x33, 0x4a, 0xba, 0x1e, 0xe2, 0xb8, 0xcb, + 0x05, 0x12, 0xb1, 0x24, 0x4d, 0x8d, 0x14, 0xb6, 0xf1, 0xae, 0x02, 0x9b, 0x07, 0x0c, 0x11, 0x7e, + 0x84, 0x99, 0xa3, 0xea, 0x0c, 0x8e, 0x63, 0xf2, 0xaf, 0x83, 0x4f, 0x63, 0xcc, 0x85, 0x61, 0xc2, + 0x0a, 0x0a, 0x02, 0x86, 0x39, 0x37, 0x41, 0x1b, 0x74, 0xaa, 0x4e, 0xee, 0x1a, 0x3f, 0x43, 0x3d, + 0xed, 0x2e, 0x0c, 0xcc, 0xb9, 0x36, 0xe8, 0xd4, 0x7a, 0xcb, 0x76, 0x74, 0x6e, 0xa7, 0xd7, 0xb3, + 0x0f, 0x0f, 0xc7, 0xc3, 0x7e, 0x2d, 0xb9, 0x6e, 0x55, 0xf6, 0x25, 0x68, 0x3c, 0x74, 0x2a, 0x0a, + 0x3d, 0x0e, 0x8c, 0xbf, 0x60, 0xbd, 0x78, 0x2d, 0x73, 0x5e, 0x1d, 0xee, 0xd9, 0x85, 0x49, 0xda, + 0x5f, 0xef, 0xc8, 0x9e, 0x84, 0xd2, 0x96, 0xe1, 0x91, 0xe6, 0xd4, 0x14, 0x53, 0xea, 0x1a, 0x17, + 0x00, 0xfe, 0x80, 0xcf, 0xb1, 0x1f, 0x8b, 0x90, 0x12, 0x17, 0x91, 0xc0, 0x15, 0xe1, 0x2c, 0x24, + 0x53, 0x37, 0x24, 0x47, 0xd4, 0x5c, 0x50, 0x65, 0x06, 0x2f, 0x2d, 0xa3, 0xda, 0xde, 0xcd, 0xd9, + 0x76, 0x48, 0x70, 0xa0, 0xb8, 0xc6, 0xe4, 0x88, 0x8e, 0x34, 0xe7, 0x7b, 0xfc, 0x64, 0xc6, 0xd8, + 0x86, 0xcb, 0xf7, 0x1d, 0x60, 0xc6, 0x28, 0x33, 0x2b, 0xaa, 0xee, 0xaa, 0xac, 0x9b, 0x6f, 0xc0, + 0x9e, 0x28, 0x63, 0xa4, 0x39, 0x4b, 0x9f, 0xd1, 0xbb, 0x12, 0x6c, 0x20, 0xb8, 0x18, 0x92, 0x50, + 0x84, 0x48, 0x60, 0xd7, 0xa7, 0x84, 0x98, 0xba, 0x3a, 0xfd, 0xeb, 0x4b, 0xbb, 0x1e, 0x67, 0x87, + 0x07, 0x94, 0x10, 0xec, 0x4b, 0xde, 0x91, 0xe6, 0xd4, 0xc3, 0x42, 0xb4, 0xf9, 0x1e, 0x40, 0x78, + 0x3f, 0x43, 0x63, 0x08, 0xab, 0x8c, 0x9e, 0xb9, 0x1e, 0x12, 0xfe, 0xb1, 0x5a, 0x71, 0xad, 0xb7, + 0x29, 0xab, 0x15, 0x04, 0x66, 0xe7, 0x02, 0xb3, 0x1d, 0x7a, 0xd6, 0x97, 0xc0, 0x21, 0x12, 0x68, + 0xa4, 0x39, 0x3a, 0xcb, 0x7c, 0xe3, 0x17, 0xb8, 0x34, 0x65, 0x91, 0xef, 0x72, 0x1a, 0x33, 0x1f, + 0xe7, 0x92, 0x28, 0xf7, 0x1b, 0xc9, 0x75, 0xab, 0xfe, 0x9b, 0xf3, 0xc7, 0x60, 0xa2, 0x12, 0xe3, + 0xe1, 0x08, 0x38, 0x75, 0x89, 0xcc, 0xfc, 0xc0, 0x68, 0x41, 0x98, 0x96, 0x22, 0x68, 0x86, 0xcd, + 0x92, 0xd4, 0xd8, 0x08, 0x38, 0x55, 0x15, 0xfb, 0x1d, 0xcd, 0x70, 0x7f, 0x05, 0x2e, 0xa7, 0x42, + 0x91, 0x03, 0x11, 0x98, 0x08, 0xde, 0x5f, 0x84, 0xb5, 0x00, 0x73, 0x11, 0x12, 0x24, 0x6f, 0xb8, + 0x57, 0xd6, 0xcb, 0x8d, 0xf9, 0xe6, 0x35, 0x80, 0xeb, 0xcf, 0x2c, 0xcd, 0xf8, 0xb3, 0xb8, 0x1a, + 0xb9, 0x09, 0x9e, 0xc9, 0x76, 0xeb, 0x7e, 0xb8, 0xf6, 0x97, 0xcf, 0xef, 0x81, 0x08, 0xe4, 0xd6, + 0x78, 0x61, 0x65, 0xca, 0x37, 0x10, 0xfc, 0x0e, 0x4d, 0x31, 0x11, 0xee, 0x43, 0xf6, 0x52, 0xbb, + 0xf4, 0x3c, 0xfb, 0x8e, 0x3c, 0xf6, 0x80, 0x7d, 0x15, 0x3d, 0x0e, 0xee, 0x95, 0x75, 0xd0, 0x98, + 0x6b, 0xae, 0x41, 0xe3, 0xf1, 0x7a, 0xfb, 0x3a, 0x5c, 0x48, 0x19, 0xf7, 0xca, 0x7a, 0xa9, 0x51, + 0x4e, 0x87, 0xb1, 0xb1, 0x0f, 0xd7, 0x9f, 0x54, 0x09, 0x8f, 0x28, 0xe1, 0x58, 0xbe, 0x6a, 0x1e, + 0xfb, 0x7e, 0xfe, 0xaa, 0x75, 0x27, 0x77, 0x65, 0x66, 0x86, 0x39, 0x47, 0x53, 0xac, 0xa6, 0x53, + 0x75, 0x72, 0xb7, 0xf7, 0x0a, 0xae, 0xa4, 0x54, 0x52, 0x3c, 0x13, 0xcc, 0xfe, 0x0b, 0x7d, 0x6c, + 0xfc, 0x03, 0x57, 0x9f, 0xa8, 0x63, 0xfc, 0xf8, 0x42, 0xbd, 0x36, 0x3b, 0xdf, 0x06, 0xa6, 0x2d, + 0x77, 0x40, 0x7f, 0xfb, 0xf2, 0xc6, 0xd2, 0xae, 0x6e, 0x2c, 0xed, 0xee, 0xc6, 0x02, 0x17, 0x89, + 0x05, 0xde, 0x24, 0x16, 0x78, 0x9b, 0x58, 0xe0, 0x32, 0xb1, 0xc0, 0x87, 0xc4, 0x02, 0x1f, 0x13, + 0x4b, 0xbb, 0x4b, 0x2c, 0xf0, 0xfa, 0xd6, 0xd2, 0x2e, 0x6f, 0x2d, 0xed, 0xea, 0xd6, 0xd2, 0xfe, + 0xd6, 0x73, 0x76, 0x6f, 0x41, 0xfd, 0xf0, 0x7e, 0xfa, 0x14, 0x00, 0x00, 0xff, 0xff, 0x69, 0x72, + 0x90, 0x2e, 0xd5, 0x05, 0x00, 0x00, } func (this *TransferResultChunkRequest) Equal(that interface{}) bool { diff --git a/src/carnot/carnotpb/carnot.proto b/src/carnot/carnotpb/carnot.proto index 2202fd967b5..cb8b4192ea5 100644 --- a/src/carnot/carnotpb/carnot.proto +++ b/src/carnot/carnotpb/carnot.proto @@ -22,7 +22,7 @@ package px.carnotpb; option go_package = "carnotpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "src/api/proto/uuidpb/uuid.proto"; import "src/carnot/queryresultspb/query_results.proto"; import "src/table_store/schemapb/schema.proto"; diff --git a/src/carnot/docspb/BUILD.bazel b/src/carnot/docspb/BUILD.bazel index c7ff25f16b4..301b78eebe2 100644 --- a/src/carnot/docspb/BUILD.bazel +++ b/src/carnot/docspb/BUILD.bazel @@ -23,7 +23,7 @@ pl_proto_library( srcs = ["docs.proto"], deps = [ "//src/carnot/udfspb:udfs_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -32,7 +32,7 @@ pl_cc_proto_library( proto = ":docs_pl_proto", deps = [ "//src/carnot/udfspb:udfs_pl_cc_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/carnot/docspb/docs.pb.go b/src/carnot/docspb/docs.pb.go index ef2255599fb..45eb9b9cc5d 100755 --- a/src/carnot/docspb/docs.pb.go +++ b/src/carnot/docspb/docs.pb.go @@ -796,58 +796,57 @@ func init() { func init() { proto.RegisterFile("src/carnot/docspb/docs.proto", fileDescriptor_af0569155e5909a2) } var fileDescriptor_af0569155e5909a2 = []byte{ - // 803 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xc1, 0x6e, 0xeb, 0x44, - 0x14, 0x8d, 0x49, 0x9a, 0xa4, 0x37, 0x49, 0x03, 0xc3, 0xe3, 0x91, 0x57, 0x15, 0x37, 0xb2, 0x58, - 0x74, 0xd3, 0x44, 0x04, 0x16, 0x48, 0x45, 0x42, 0x84, 0x10, 0x51, 0xa9, 0x50, 0x64, 0xba, 0xa8, - 0xd8, 0x44, 0x93, 0x99, 0x71, 0x6a, 0xe1, 0x78, 0xac, 0xf1, 0x18, 0x9a, 0x05, 0x08, 0x7e, 0x00, - 0xf1, 0x0f, 0x6c, 0xf8, 0x14, 0x96, 0x5d, 0x76, 0x85, 0xa8, 0xbb, 0x41, 0x62, 0xd3, 0x4f, 0x40, - 0x33, 0x63, 0x27, 0x2e, 0x89, 0x5a, 0x56, 0x59, 0xe5, 0x9e, 0xf1, 0xbd, 0xe7, 0xdc, 0xb9, 0x73, - 0x66, 0x14, 0x38, 0x88, 0x05, 0xe9, 0x13, 0x2c, 0x42, 0x2e, 0xfb, 0x94, 0x93, 0x38, 0x9a, 0xea, - 0x9f, 0x5e, 0x24, 0xb8, 0xe4, 0xe8, 0xf5, 0xe8, 0xba, 0x67, 0x3e, 0xf6, 0xcc, 0xc7, 0xfd, 0xe3, - 0x99, 0x2f, 0xaf, 0x92, 0x69, 0x8f, 0xf0, 0x79, 0x7f, 0xc6, 0x67, 0xbc, 0xaf, 0x13, 0xa7, 0x89, - 0xa7, 0x91, 0x06, 0x3a, 0x32, 0x04, 0xfb, 0x45, 0xfa, 0x84, 0x7a, 0x8a, 0x5e, 0xfd, 0x98, 0xaf, - 0x0e, 0x85, 0xfa, 0x29, 0x65, 0xa1, 0x1c, 0x71, 0x82, 0x5e, 0xc0, 0x8e, 0xaf, 0xe2, 0x8e, 0xd5, - 0xb5, 0x8e, 0x76, 0x5d, 0x03, 0x10, 0x82, 0x0a, 0x65, 0x31, 0xe9, 0xbc, 0xa6, 0x17, 0x75, 0xac, - 0x32, 0xe5, 0x22, 0x62, 0x71, 0xa7, 0xdc, 0x2d, 0xab, 0x4c, 0x0d, 0x50, 0x07, 0x6a, 0x94, 0x79, - 0x38, 0x09, 0x64, 0xa7, 0xa2, 0x93, 0x73, 0xe8, 0xfc, 0x63, 0x41, 0x6d, 0x9c, 0x84, 0x44, 0xa9, - 0xf4, 0xa0, 0x82, 0xc5, 0x2c, 0xee, 0x58, 0xdd, 0xf2, 0x51, 0x63, 0xb0, 0xdf, 0xfb, 0xef, 0xfe, - 0x7a, 0x79, 0x3f, 0xae, 0xce, 0x43, 0x1f, 0x43, 0x4b, 0xb0, 0x88, 0x61, 0xc9, 0xe8, 0x44, 0x17, - 0xaa, 0x46, 0x9e, 0x2e, 0x6c, 0xe6, 0x05, 0x9f, 0x28, 0x82, 0x01, 0x54, 0xbf, 0xfd, 0x5e, 0x57, - 0x96, 0x9f, 0xad, 0xcc, 0x32, 0xd1, 0x09, 0x34, 0x04, 0x93, 0x89, 0x08, 0x27, 0x6a, 0x6b, 0x7a, - 0x3b, 0x4f, 0x17, 0x82, 0x49, 0xbf, 0x58, 0x44, 0xcc, 0xf9, 0x11, 0x5a, 0x23, 0x4e, 0x62, 0x29, - 0xfc, 0x70, 0xf6, 0x25, 0xa7, 0x4c, 0x8d, 0x30, 0xc4, 0x73, 0x96, 0xcd, 0x55, 0xc7, 0xe8, 0x00, - 0x76, 0x69, 0x9e, 0x94, 0xcd, 0x76, 0xb5, 0x80, 0x4e, 0xa0, 0x4e, 0xae, 0xfc, 0x80, 0x0a, 0x16, - 0xea, 0x19, 0x37, 0x06, 0x87, 0xeb, 0xe2, 0x8f, 0x44, 0xdc, 0x65, 0x81, 0xf3, 0x8b, 0x05, 0xed, - 0xd3, 0x50, 0x32, 0x11, 0xe2, 0xe0, 0xab, 0xcb, 0x33, 0x95, 0x86, 0x3e, 0x87, 0xf6, 0x92, 0x7d, - 0x12, 0x72, 0xca, 0xf2, 0x03, 0x78, 0x96, 0x77, 0x8f, 0x16, 0x61, 0x8c, 0xde, 0x83, 0x7a, 0x42, - 0xbd, 0x89, 0x5a, 0xcd, 0x8e, 0xe2, 0x65, 0x81, 0xc2, 0x38, 0x4c, 0x53, 0xb8, 0xb5, 0x84, 0x7a, - 0x2a, 0x70, 0x1c, 0x80, 0xcf, 0xae, 0xf1, 0x3c, 0x0a, 0x58, 0x66, 0xb3, 0xef, 0x70, 0x90, 0xe4, - 0xe3, 0x30, 0xc0, 0xf9, 0xd9, 0x82, 0xda, 0x88, 0x93, 0x21, 0xa7, 0x8b, 0x8d, 0xf3, 0x7a, 0x01, - 0x3b, 0x53, 0xe1, 0x33, 0x2f, 0x9b, 0x95, 0x01, 0x4b, 0x73, 0x96, 0x0b, 0xe6, 0xfc, 0x10, 0xea, - 0xcc, 0xa8, 0xc5, 0x9d, 0x8a, 0xde, 0xe3, 0xc1, 0xfa, 0x1e, 0x57, 0xfd, 0xb8, 0xcb, 0x6c, 0x47, - 0x40, 0xe3, 0x8b, 0x44, 0x62, 0xe9, 0xf3, 0x50, 0x35, 0x7a, 0x0c, 0x95, 0x29, 0xa7, 0x0b, 0xdd, - 0x46, 0x63, 0xf0, 0x6a, 0xe3, 0xa0, 0x54, 0xbf, 0xae, 0x4e, 0x43, 0x1f, 0x40, 0xdd, 0x4b, 0x42, - 0xa2, 0x26, 0x93, 0x0d, 0x66, 0x43, 0x49, 0x76, 0x0b, 0xdc, 0x9a, 0x67, 0x02, 0xe7, 0x07, 0x78, - 0x79, 0x21, 0x30, 0x61, 0x11, 0xf7, 0x43, 0x39, 0x62, 0x84, 0x0b, 0x2c, 0xb9, 0xd8, 0x9a, 0xfc, - 0x02, 0xd0, 0x4a, 0x7e, 0xec, 0xb3, 0x80, 0x6e, 0x4d, 0x3a, 0x81, 0xbd, 0x11, 0x96, 0x78, 0x2c, - 0xf0, 0x9c, 0x9d, 0x47, 0x5b, 0x93, 0x8d, 0xa1, 0xf9, 0x29, 0x9f, 0x47, 0x7e, 0xc0, 0xc6, 0xdb, - 0x3b, 0xe5, 0x10, 0x6a, 0xe7, 0x17, 0x2c, 0xd8, 0x9a, 0xde, 0x6f, 0x15, 0xd8, 0xfb, 0x5a, 0x8a, - 0x84, 0xc8, 0x44, 0x30, 0xaa, 0x5f, 0x80, 0x21, 0xb4, 0xe6, 0x99, 0xb9, 0xcd, 0xe5, 0x35, 0xf7, - 0xff, 0x9d, 0x75, 0xb6, 0xc2, 0x1d, 0x70, 0x9b, 0xf3, 0x15, 0x88, 0x11, 0x85, 0x57, 0x72, 0xe9, - 0x96, 0x09, 0xcd, 0xdd, 0x9a, 0x3f, 0x06, 0x8a, 0xef, 0x68, 0x9d, 0x6f, 0xb3, 0xbf, 0xdd, 0xb7, - 0xe5, 0xc6, 0xf5, 0x18, 0x5d, 0xc2, 0x5b, 0x05, 0x15, 0x4f, 0x99, 0xd2, 0x28, 0x98, 0x97, 0xf0, - 0xdd, 0xa7, 0x14, 0x72, 0x0b, 0xbb, 0x6f, 0xca, 0xb5, 0xb5, 0x18, 0x9d, 0xc1, 0x1b, 0x14, 0x4b, - 0xec, 0x29, 0xcb, 0x4d, 0x78, 0x64, 0x58, 0x77, 0x34, 0x6b, 0x77, 0xc3, 0x41, 0x3c, 0x72, 0xa7, - 0xdb, 0x5e, 0x96, 0x6a, 0x1c, 0xa3, 0x31, 0xb4, 0x89, 0x71, 0xd2, 0xc4, 0xcb, 0x66, 0x5a, 0xd5, - 0x5c, 0xf6, 0x3a, 0x57, 0xd1, 0x72, 0x6e, 0x8b, 0x14, 0xd0, 0xe3, 0x17, 0xb5, 0xf2, 0xbf, 0x5e, - 0x54, 0x34, 0x82, 0x5d, 0x2e, 0x59, 0x60, 0x6a, 0x6a, 0x5a, 0x74, 0x83, 0x2d, 0x32, 0xcb, 0x0d, - 0x9b, 0xe9, 0x9f, 0x87, 0xf5, 0x0c, 0xc4, 0x6e, 0x5d, 0x55, 0xaa, 0x68, 0xf8, 0xd1, 0xcd, 0x9d, - 0x5d, 0xba, 0xbd, 0xb3, 0x4b, 0x0f, 0x77, 0xb6, 0xf5, 0x53, 0x6a, 0x5b, 0xbf, 0xa7, 0xb6, 0xf5, - 0x47, 0x6a, 0x5b, 0x37, 0xa9, 0x6d, 0xfd, 0x95, 0xda, 0xd6, 0xdf, 0xa9, 0x5d, 0x7a, 0x48, 0x6d, - 0xeb, 0xd7, 0x7b, 0xbb, 0x74, 0x73, 0x6f, 0x97, 0x6e, 0xef, 0xed, 0xd2, 0x37, 0x55, 0xc3, 0x3e, - 0xad, 0xea, 0x7f, 0x10, 0xef, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x82, 0x99, 0x88, 0x26, 0xc0, - 0x08, 0x00, 0x00, + // 792 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x41, 0x6f, 0xdb, 0x36, + 0x14, 0xb6, 0x66, 0xc7, 0x76, 0x9e, 0xed, 0x78, 0xe3, 0xb2, 0xcc, 0x09, 0x32, 0xc5, 0x10, 0x76, + 0xc8, 0x65, 0x0e, 0xe6, 0xed, 0x30, 0x20, 0x03, 0x86, 0x79, 0x9e, 0xb1, 0x00, 0xd9, 0x32, 0x68, + 0x39, 0x04, 0xbb, 0x18, 0xb4, 0x48, 0xb9, 0x42, 0x65, 0x51, 0xa0, 0xa8, 0x36, 0x3e, 0xb4, 0x68, + 0xff, 0x40, 0xd1, 0xff, 0xd0, 0x4b, 0x7f, 0x4a, 0x8f, 0x39, 0xe6, 0x54, 0x34, 0xca, 0xa5, 0x40, + 0x2f, 0xf9, 0x09, 0x05, 0x49, 0xc9, 0x56, 0x6a, 0x23, 0xe9, 0xc9, 0x27, 0xbd, 0x47, 0xbe, 0xf7, + 0x7d, 0xe4, 0xc7, 0x8f, 0x84, 0x60, 0x37, 0xe2, 0xce, 0x81, 0x83, 0x79, 0xc0, 0xc4, 0x01, 0x61, + 0x4e, 0x14, 0x8e, 0xd4, 0xa7, 0x13, 0x72, 0x26, 0x18, 0xfa, 0x32, 0x3c, 0xef, 0xe8, 0xc9, 0x8e, + 0x9e, 0xdc, 0xd9, 0x1c, 0xb3, 0x31, 0x53, 0x93, 0x07, 0x32, 0xd2, 0x75, 0x3b, 0x79, 0x94, 0x98, + 0xb8, 0x12, 0x45, 0x7e, 0xf4, 0xac, 0x45, 0xa0, 0x7a, 0x44, 0x68, 0x20, 0xfa, 0xcc, 0x41, 0x9b, + 0xb0, 0xe6, 0xc9, 0xb8, 0x65, 0xb4, 0x8d, 0xfd, 0x75, 0x5b, 0x27, 0x08, 0x41, 0x89, 0xd0, 0xc8, + 0x69, 0x7d, 0xa1, 0x06, 0x55, 0x2c, 0x2b, 0xc5, 0x34, 0xa4, 0x51, 0xab, 0xd8, 0x2e, 0xca, 0x4a, + 0x95, 0xa0, 0x16, 0x54, 0x08, 0x75, 0x71, 0xec, 0x8b, 0x56, 0x49, 0x15, 0x67, 0xa9, 0xf5, 0xc1, + 0x80, 0xca, 0x20, 0x0e, 0x1c, 0xc9, 0xd2, 0x81, 0x12, 0xe6, 0xe3, 0xa8, 0x65, 0xb4, 0x8b, 0xfb, + 0xb5, 0xee, 0x4e, 0xe7, 0xd3, 0x6d, 0x74, 0xb2, 0xf5, 0xd8, 0xaa, 0x0e, 0xfd, 0x06, 0x0d, 0x4e, + 0x43, 0x8a, 0x05, 0x25, 0x43, 0xd5, 0x28, 0x17, 0x72, 0x77, 0x63, 0x3d, 0x6b, 0xf8, 0x5d, 0x02, + 0x74, 0xa1, 0xfc, 0xf0, 0xb1, 0xea, 0x2c, 0xde, 0xdb, 0x99, 0x56, 0xa2, 0x43, 0xa8, 0x71, 0x2a, + 0x62, 0x1e, 0x0c, 0xe5, 0xd6, 0xd4, 0x76, 0xee, 0x6e, 0x04, 0x5d, 0x7e, 0x3a, 0x0d, 0xa9, 0xf5, + 0x14, 0x1a, 0x7d, 0xe6, 0x44, 0x82, 0x7b, 0xc1, 0xf8, 0x1f, 0x46, 0xa8, 0x94, 0x30, 0xc0, 0x13, + 0x9a, 0xea, 0xaa, 0x62, 0xb4, 0x0b, 0xeb, 0x24, 0x2b, 0x4a, 0xb5, 0x9d, 0x0f, 0xa0, 0x43, 0xa8, + 0x3a, 0x0f, 0x3c, 0x9f, 0x70, 0x1a, 0x28, 0x8d, 0x6b, 0xdd, 0xbd, 0x45, 0xf2, 0x5b, 0x24, 0xf6, + 0xac, 0xc1, 0x7a, 0x61, 0x40, 0xf3, 0x28, 0x10, 0x94, 0x07, 0xd8, 0xff, 0xf7, 0xec, 0x58, 0x96, + 0xa1, 0xbf, 0xa0, 0x39, 0x43, 0x1f, 0x06, 0x8c, 0xd0, 0xec, 0x00, 0xee, 0xc5, 0xdd, 0x20, 0xf9, + 0x34, 0x42, 0x3f, 0x42, 0x35, 0x26, 0xee, 0x50, 0x8e, 0xa6, 0x47, 0xb1, 0x95, 0x83, 0xd0, 0x0e, + 0x53, 0x10, 0x76, 0x25, 0x26, 0xae, 0x0c, 0x2c, 0x0b, 0xe0, 0xcf, 0x73, 0x3c, 0x09, 0x7d, 0x9a, + 0xda, 0xec, 0x11, 0xf6, 0xe3, 0x4c, 0x0e, 0x9d, 0x58, 0xcf, 0x0d, 0xa8, 0xf4, 0x99, 0xd3, 0x63, + 0x64, 0xba, 0x54, 0xaf, 0x4d, 0x58, 0x1b, 0x71, 0x8f, 0xba, 0xa9, 0x56, 0x3a, 0x99, 0x99, 0xb3, + 0x98, 0x33, 0xe7, 0x2f, 0x50, 0xa5, 0x9a, 0x2d, 0x6a, 0x95, 0xd4, 0x1e, 0x77, 0x17, 0xf7, 0x38, + 0x5f, 0x8f, 0x3d, 0xab, 0xb6, 0x38, 0xd4, 0xfe, 0x8e, 0x05, 0x16, 0x1e, 0x0b, 0xe4, 0x42, 0x7f, + 0x80, 0xd2, 0x88, 0x91, 0xa9, 0x5a, 0x46, 0xad, 0xbb, 0xbd, 0x54, 0x28, 0xb9, 0x5e, 0x5b, 0x95, + 0xa1, 0x9f, 0xa1, 0xea, 0xc6, 0x81, 0x23, 0x95, 0x49, 0x85, 0x59, 0xd2, 0x92, 0xde, 0x02, 0xbb, + 0xe2, 0xea, 0xc0, 0x7a, 0x02, 0x5b, 0xa7, 0x1c, 0x3b, 0x34, 0x64, 0x5e, 0x20, 0xfa, 0xd4, 0x61, + 0x1c, 0x0b, 0xc6, 0x57, 0x46, 0x3f, 0x05, 0x34, 0xa7, 0x1f, 0x78, 0xd4, 0x27, 0x2b, 0xa3, 0x8e, + 0x61, 0xa3, 0x8f, 0x05, 0x1e, 0x70, 0x3c, 0xa1, 0x27, 0xe1, 0xca, 0x68, 0x23, 0xa8, 0xff, 0xc1, + 0x26, 0xa1, 0xe7, 0xd3, 0xc1, 0xea, 0x4e, 0x39, 0x80, 0xca, 0xc9, 0x29, 0xf5, 0x57, 0xc6, 0xf7, + 0xaa, 0x04, 0x1b, 0xff, 0x09, 0x1e, 0x3b, 0x22, 0xe6, 0x94, 0xa8, 0x17, 0xa0, 0x07, 0x8d, 0x49, + 0x6a, 0x6e, 0x7d, 0x79, 0xf5, 0xfd, 0xff, 0x6e, 0x11, 0x2d, 0x77, 0x07, 0xec, 0xfa, 0x64, 0x9e, + 0x44, 0x88, 0xc0, 0xb6, 0x98, 0xb9, 0x65, 0x48, 0x32, 0xb7, 0x66, 0x8f, 0x81, 0xc4, 0xdb, 0x5f, + 0xc4, 0x5b, 0xee, 0x6f, 0xfb, 0x5b, 0xb1, 0x74, 0x3c, 0x42, 0x67, 0xf0, 0x4d, 0x8e, 0xc5, 0x95, + 0xa6, 0xd4, 0x0c, 0xfa, 0x25, 0xfc, 0xfe, 0x2e, 0x86, 0xcc, 0xc2, 0xf6, 0xd7, 0x62, 0x61, 0x2c, + 0x42, 0xc7, 0xf0, 0x15, 0xc1, 0x02, 0xbb, 0xd2, 0x72, 0x43, 0x16, 0x6a, 0xd4, 0x35, 0x85, 0xda, + 0x5e, 0x72, 0x10, 0xb7, 0xdc, 0x69, 0x37, 0x67, 0xad, 0x2a, 0x8f, 0xd0, 0x00, 0x9a, 0x8e, 0x76, + 0xd2, 0xd0, 0x4d, 0x35, 0x2d, 0x2b, 0x2c, 0x73, 0x11, 0x2b, 0x6f, 0x39, 0xbb, 0xe1, 0xe4, 0xb2, + 0xdb, 0x2f, 0x6a, 0xe9, 0xb3, 0x5e, 0x54, 0xd4, 0x87, 0x75, 0x26, 0xa8, 0xaf, 0x7b, 0x2a, 0x8a, + 0x74, 0x89, 0x2d, 0x52, 0xcb, 0xf5, 0xea, 0xc9, 0xdb, 0xbd, 0x6a, 0x9a, 0x44, 0x76, 0x55, 0x76, + 0xca, 0xa8, 0xf7, 0xeb, 0xc5, 0x95, 0x59, 0xb8, 0xbc, 0x32, 0x0b, 0x37, 0x57, 0xa6, 0xf1, 0x2c, + 0x31, 0x8d, 0xd7, 0x89, 0x69, 0xbc, 0x49, 0x4c, 0xe3, 0x22, 0x31, 0x8d, 0x77, 0x89, 0x69, 0xbc, + 0x4f, 0xcc, 0xc2, 0x4d, 0x62, 0x1a, 0x2f, 0xaf, 0xcd, 0xc2, 0xc5, 0xb5, 0x59, 0xb8, 0xbc, 0x36, + 0x0b, 0xff, 0x97, 0x35, 0xfa, 0xa8, 0xac, 0xfe, 0x20, 0x7e, 0xfa, 0x18, 0x00, 0x00, 0xff, 0xff, + 0x12, 0x82, 0x7e, 0xb5, 0xa7, 0x08, 0x00, 0x00, } func (this *IdentDoc) Equal(that interface{}) bool { diff --git a/src/carnot/docspb/docs.proto b/src/carnot/docspb/docs.proto index c81b75d7ad0..61e25748069 100644 --- a/src/carnot/docspb/docs.proto +++ b/src/carnot/docspb/docs.proto @@ -22,7 +22,7 @@ package px.carnot.docspb; option go_package = "docspb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "src/carnot/udfspb/udfs.proto"; message IdentDoc { @@ -40,7 +40,7 @@ message FuncDoc { // The arguments of the function. repeated IdentDoc args = 1; // The variable args field (*args) if the function supports it. - // *args will catch all unnamed aruments that aren't explicitly state. Ie + // *args will catch all unnamed arguments that aren't explicitly state. Ie // `def func(*args)` can be called as `func(val1, val2)` IdentDoc repeated_args = 2; // The variable keyword args field (**kwargs) if the function supports it. diff --git a/src/carnot/docstring/pkg/docstring.go b/src/carnot/docstring/pkg/docstring.go index d0a818ea72e..77e7d24e891 100644 --- a/src/carnot/docstring/pkg/docstring.go +++ b/src/carnot/docstring/pkg/docstring.go @@ -80,6 +80,7 @@ func (w *parser) ArgMatch(s string) bool { return allRe.MatchString(s) && w.isTabbedLine(s) } + func (w *parser) ReturnMatch(s string) bool { allRe := re.MustCompile(w.ReturnReStr()) @@ -373,8 +374,10 @@ func parseDocstring(docString string) (*FunctionDocstring, error) { return p.parsedDoc, nil } -const topicRegex = `:topic: (?P[^\s]*)\n` -const opnameRegex = `:opname: (?P.*)\n` +const ( + topicRegex = `:topic: (?P[^\s]*)\n` + opnameRegex = `:opname: (?P.*)\n` +) // getTag finds the tag in the docstring if it exists. func getTag(docstring, tagRegex string) string { diff --git a/src/carnot/docstring/tables/datatables.go b/src/carnot/docstring/tables/datatables.go index 6f92cc7959f..a7966a21c84 100644 --- a/src/carnot/docstring/tables/datatables.go +++ b/src/carnot/docstring/tables/datatables.go @@ -36,13 +36,11 @@ import ( "px.dev/pixie/src/shared/services" ) -var ( - pxl = ` +var pxl = ` import px px.display(px.GetTables(), 'table_desc') px.display(px.GetSchemas(), 'table_schemas') ` -) func init() { pflag.String("cluster_id", "", "The cluster_id of the cluster to query") diff --git a/src/carnot/engine_state.h b/src/carnot/engine_state.h index 097c33835fd..afe13eb875b 100644 --- a/src/carnot/engine_state.h +++ b/src/carnot/engine_state.h @@ -87,6 +87,9 @@ class EngineState : public NotCopyable { [this](const std::string& remote_addr, bool insecure) { return TraceStubGenerator(remote_addr, insecure); }, + [this](const std::string& remote_addr, bool insecure) { + return LogsStubGenerator(remote_addr, insecure); + }, query_id, model_pool_.get(), grpc_router_, add_auth_to_grpc_context_func_, metrics_.get()); } std::shared_ptr CreateChannel(const std::string& remote_addr, bool insecure) { @@ -115,6 +118,12 @@ class EngineState : public NotCopyable { CreateChannel(remote_addr, insecure)); } + std::unique_ptr + LogsStubGenerator(const std::string& remote_addr, bool insecure) { + return opentelemetry::proto::collector::logs::v1::LogsService::NewStub( + CreateChannel(remote_addr, insecure)); + } + std::unique_ptr CreatePlanState() { return std::make_unique(func_registry_.get()); } diff --git a/src/carnot/exec/BUILD.bazel b/src/carnot/exec/BUILD.bazel index e0ec604f9f7..228b352501c 100644 --- a/src/carnot/exec/BUILD.bazel +++ b/src/carnot/exec/BUILD.bazel @@ -47,6 +47,7 @@ pl_cc_library( "//src/table_store/table:cc_library", "@com_github_apache_arrow//:arrow", "@com_github_grpc_grpc//:grpc++", + "@com_github_opentelemetry_proto//:logs_service_grpc_cc", "@com_github_opentelemetry_proto//:metrics_service_grpc_cc", "@com_github_opentelemetry_proto//:trace_service_grpc_cc", "@com_github_rlyeh_sole//:sole", diff --git a/src/carnot/exec/agg_node_test.cc b/src/carnot/exec/agg_node_test.cc index 9a6c5f815d2..02b68fba8df 100644 --- a/src/carnot/exec/agg_node_test.cc +++ b/src/carnot/exec/agg_node_test.cc @@ -476,7 +476,7 @@ std::unique_ptr MakeTestExecState(udf::Registry* registry) { auto table_store = std::make_shared(); return std::make_unique(registry, table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, MockTraceStubGenerator, - sole::uuid4(), nullptr); + MockLogStubGenerator, sole::uuid4(), nullptr); } std::unique_ptr PlanNodeFromPbtxt(const std::string& pbtxt) { diff --git a/src/carnot/exec/empty_source_node_test.cc b/src/carnot/exec/empty_source_node_test.cc index e2acf6a48b8..6f7954d9388 100644 --- a/src/carnot/exec/empty_source_node_test.cc +++ b/src/carnot/exec/empty_source_node_test.cc @@ -48,9 +48,9 @@ class EmptySourceNodeTest : public ::testing::Test { void SetUp() override { func_registry_ = std::make_unique("test_registry"); auto table_store = std::make_shared(); - exec_state_ = std::make_unique(func_registry_.get(), table_store, - MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + exec_state_ = std::make_unique( + func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); } std::unique_ptr exec_state_; diff --git a/src/carnot/exec/equijoin_node_test.cc b/src/carnot/exec/equijoin_node_test.cc index 56cb7503ec9..6d5e8b186b0 100644 --- a/src/carnot/exec/equijoin_node_test.cc +++ b/src/carnot/exec/equijoin_node_test.cc @@ -52,9 +52,9 @@ class JoinNodeTest : public ::testing::Test { JoinNodeTest() { func_registry_ = std::make_unique("test_registry"); auto table_store = std::make_shared(); - exec_state_ = std::make_unique(func_registry_.get(), table_store, - MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + exec_state_ = std::make_unique( + func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); } protected: diff --git a/src/carnot/exec/exec_graph_test.cc b/src/carnot/exec/exec_graph_test.cc index a341a033d4a..d5c7abb8d89 100644 --- a/src/carnot/exec/exec_graph_test.cc +++ b/src/carnot/exec/exec_graph_test.cc @@ -74,9 +74,9 @@ class BaseExecGraphTest : public ::testing::Test { func_registry_->RegisterOrDie("multiply"); auto table_store = std::make_shared(); - exec_state_ = std::make_unique(func_registry_.get(), table_store, - MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + exec_state_ = std::make_unique( + func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); } std::unique_ptr func_registry_; @@ -174,7 +174,7 @@ TEST_P(ExecGraphExecuteTest, execute) { table_store->AddTable("numbers", table); auto exec_state_ = std::make_unique( func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); EXPECT_OK(exec_state_->AddScalarUDF( 0, "add", std::vector({types::DataType::INT64, types::DataType::FLOAT64}))); @@ -255,7 +255,7 @@ TEST_F(ExecGraphTest, execute_time) { auto exec_state_ = std::make_unique( func_registry.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); EXPECT_OK(exec_state_->AddScalarUDF( 0, "add", std::vector({types::DataType::INT64, types::DataType::FLOAT64}))); @@ -322,7 +322,7 @@ TEST_F(ExecGraphTest, two_limits_dont_interfere) { table_store->AddTable("numbers", table); auto exec_state_ = std::make_unique( func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); ExecutionGraph e; auto s = e.Init(schema.get(), plan_state.get(), exec_state_.get(), plan_fragment_.get(), @@ -390,7 +390,7 @@ TEST_F(ExecGraphTest, limit_w_multiple_srcs) { table_store->AddTable("numbers", table); auto exec_state_ = std::make_unique( func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); ExecutionGraph e; auto s = e.Init(schema.get(), plan_state.get(), exec_state_.get(), plan_fragment_.get(), @@ -452,7 +452,7 @@ TEST_F(ExecGraphTest, two_sequential_limits) { table_store->AddTable("numbers", table); auto exec_state_ = std::make_unique( func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); ExecutionGraph e; auto s = e.Init(schema.get(), plan_state.get(), exec_state_.get(), plan_fragment_.get(), @@ -515,7 +515,7 @@ TEST_F(ExecGraphTest, execute_with_two_limits) { table_store->AddTable("numbers", table); auto exec_state_ = std::make_unique( func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); ExecutionGraph e; auto s = e.Init(schema.get(), plan_state.get(), exec_state_.get(), plan_fragment_.get(), @@ -702,7 +702,7 @@ class GRPCExecGraphTest : public ::testing::Test { auto table_store = std::make_shared(); exec_state_ = std::make_unique( func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr, grpc_router_.get()); + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr, grpc_router_.get()); } void SetUpPlanFragment() { diff --git a/src/carnot/exec/exec_state.h b/src/carnot/exec/exec_state.h index fd8101cffb0..444d9298d06 100644 --- a/src/carnot/exec/exec_state.h +++ b/src/carnot/exec/exec_state.h @@ -37,6 +37,7 @@ #include "src/shared/metadata/metadata_state.h" #include "src/table_store/table/table_store.h" +#include "opentelemetry/proto/collector/logs/v1/logs_service.grpc.pb.h" #include "opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.h" #include "opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.h" #include "src/carnot/carnotpb/carnot.grpc.pb.h" @@ -54,6 +55,9 @@ using MetricsStubGenerator = std::function< using TraceStubGenerator = std::function< std::unique_ptr( const std::string& address, bool insecure)>; +using LogsStubGenerator = std::function< + std::unique_ptr( + const std::string& address, bool insecure)>; /** * ExecState manages the execution state for a single query. A new one will @@ -69,8 +73,8 @@ class ExecState { udf::Registry* func_registry, std::shared_ptr table_store, const ResultSinkStubGenerator& stub_generator, const MetricsStubGenerator& metrics_stub_generator, - const TraceStubGenerator& trace_stub_generator, const sole::uuid& query_id, - udf::ModelPool* model_pool, GRPCRouter* grpc_router = nullptr, + const TraceStubGenerator& trace_stub_generator, const LogsStubGenerator& logs_stub_generator, + const sole::uuid& query_id, udf::ModelPool* model_pool, GRPCRouter* grpc_router = nullptr, std::function add_auth_func = [](grpc::ClientContext*) {}, ExecMetrics* exec_metrics = nullptr) : func_registry_(func_registry), @@ -78,6 +82,7 @@ class ExecState { stub_generator_(stub_generator), metrics_stub_generator_(metrics_stub_generator), trace_stub_generator_(trace_stub_generator), + logs_stub_generator_(logs_stub_generator), query_id_(query_id), model_pool_(model_pool), grpc_router_(grpc_router), @@ -157,6 +162,19 @@ class ExecState { trace_service_stubs_pool_.push_back(std::move(stub_)); return raw; } + opentelemetry::proto::collector::logs::v1::LogsService::StubInterface* LogsServiceStub( + const std::string& remote_address, bool insecure) { + if (logs_service_stub_map_.contains(remote_address)) { + return logs_service_stub_map_[remote_address]; + } + std::unique_ptr stub_ = + logs_stub_generator_(remote_address, insecure); + opentelemetry::proto::collector::logs::v1::LogsService::StubInterface* raw = stub_.get(); + logs_service_stub_map_[remote_address] = raw; + // Push to the pool. + logs_service_stubs_pool_.push_back(std::move(stub_)); + return raw; + } udf::ScalarUDFDefinition* GetScalarUDFDefinition(int64_t id) { return id_to_scalar_udf_map_[id]; } @@ -209,6 +227,7 @@ class ExecState { const ResultSinkStubGenerator stub_generator_; const MetricsStubGenerator metrics_stub_generator_; const TraceStubGenerator trace_stub_generator_; + const LogsStubGenerator logs_stub_generator_; std::map id_to_scalar_udf_map_; std::map id_to_uda_map_; const sole::uuid query_id_; @@ -239,6 +258,15 @@ class ExecState { absl::flat_hash_map trace_service_stub_map_; + + std::vector< + std::unique_ptr> + logs_service_stubs_pool_; + absl::flat_hash_map + logs_service_stub_map_; + + types::Time64NSValue time_now_; }; } // namespace exec diff --git a/src/carnot/exec/expression_evaluator_benchmark.cc b/src/carnot/exec/expression_evaluator_benchmark.cc index a742975af66..c2732c39d4d 100644 --- a/src/carnot/exec/expression_evaluator_benchmark.cc +++ b/src/carnot/exec/expression_evaluator_benchmark.cc @@ -46,6 +46,7 @@ using ScalarExpression = px::carnot::plan::ScalarExpression; using ScalarExpressionVector = std::vector>; using px::carnot::exec::ExecState; +using px::carnot::exec::MockLogStubGenerator; using px::carnot::exec::MockMetricsStubGenerator; using px::carnot::exec::MockResultSinkStubGenerator; using px::carnot::exec::MockTraceStubGenerator; @@ -85,7 +86,7 @@ void BM_ScalarExpressionTwoCols(benchmark::State& state, PX_CHECK_OK(func_registry->Register("add")); auto exec_state = std::make_unique( func_registry.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); EXPECT_OK(exec_state->AddScalarUDF( 0, "add", std::vector({px::types::DataType::INT64, px::types::DataType::INT64}))); diff --git a/src/carnot/exec/expression_evaluator_test.cc b/src/carnot/exec/expression_evaluator_test.cc index 736f232e6eb..cadd861537b 100644 --- a/src/carnot/exec/expression_evaluator_test.cc +++ b/src/carnot/exec/expression_evaluator_test.cc @@ -116,9 +116,9 @@ class ScalarExpressionTest : public ::testing::TestWithParamRegister("add").ok()); EXPECT_TRUE(func_registry_->Register("init_arg").ok()); - exec_state_ = std::make_unique(func_registry_.get(), table_store, - MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + exec_state_ = std::make_unique( + func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); EXPECT_OK(exec_state_->AddScalarUDF( 0, "add", std::vector({types::DataType::INT64, types::DataType::INT64}))); EXPECT_OK( diff --git a/src/carnot/exec/filter_node_test.cc b/src/carnot/exec/filter_node_test.cc index 27efe1a57a2..4562d829515 100644 --- a/src/carnot/exec/filter_node_test.cc +++ b/src/carnot/exec/filter_node_test.cc @@ -60,9 +60,9 @@ class FilterNodeTest : public ::testing::Test { EXPECT_OK(func_registry_->Register("eq")); auto table_store = std::make_shared(); - exec_state_ = std::make_unique(func_registry_.get(), table_store, - MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + exec_state_ = std::make_unique( + func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); EXPECT_OK(exec_state_->AddScalarUDF( 0, "eq", std::vector({types::DataType::INT64, types::DataType::INT64}))); EXPECT_OK(exec_state_->AddScalarUDF( diff --git a/src/carnot/exec/grpc_router_test.cc b/src/carnot/exec/grpc_router_test.cc index 914f97d6408..6818a66cf91 100644 --- a/src/carnot/exec/grpc_router_test.cc +++ b/src/carnot/exec/grpc_router_test.cc @@ -352,7 +352,7 @@ TEST_F(GRPCRouterTest, threaded_router_test) { auto table_store = std::make_shared(); auto exec_state = std::make_unique( func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); MockExecNode mock_child; @@ -520,7 +520,7 @@ TEST_F(GRPCRouterTest, threaded_router_test_multi_writer) { auto table_store = std::make_shared(); auto exec_state = std::make_unique( func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); MockExecNode mock_child0; MockExecNode mock_child1; diff --git a/src/carnot/exec/grpc_sink_node_benchmark.cc b/src/carnot/exec/grpc_sink_node_benchmark.cc index dd5b1f508c2..96707f0d896 100644 --- a/src/carnot/exec/grpc_sink_node_benchmark.cc +++ b/src/carnot/exec/grpc_sink_node_benchmark.cc @@ -36,6 +36,7 @@ #include "src/shared/types/types.h" #include "src/shared/types/typespb/types.pb.h" +using px::carnot::exec::MockLogStubGenerator; using px::carnot::exec::MockMetricsStubGenerator; using px::carnot::exec::MockTraceStubGenerator; using px::carnotpb::MockResultSinkServiceStub; @@ -61,8 +62,8 @@ void BM_GRPCSinkNodeSplitting(benchmark::State& state) { func_registry.get(), table_store, [&](const std::string&, const std::string&) -> std::unique_ptr { return std::move(mock_unique); }, - MockMetricsStubGenerator, MockTraceStubGenerator, sole::uuid4(), nullptr, nullptr, - [&](grpc::ClientContext*) {}); + MockMetricsStubGenerator, MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), + nullptr, nullptr, [&](grpc::ClientContext*) {}); TransferResultChunkResponse resp; resp.set_success(true); auto writer = diff --git a/src/carnot/exec/grpc_sink_node_test.cc b/src/carnot/exec/grpc_sink_node_test.cc index 340863c0bc3..62d6a2e2c12 100644 --- a/src/carnot/exec/grpc_sink_node_test.cc +++ b/src/carnot/exec/grpc_sink_node_test.cc @@ -68,8 +68,8 @@ class GRPCSinkNodeTest : public ::testing::Test { const std::string&) -> std::unique_ptr { return std::move(mock_unique_); }, - MockMetricsStubGenerator, MockTraceStubGenerator, sole::uuid4(), nullptr, nullptr, - [this](grpc::ClientContext*) { add_metadata_called_ = true; }); + MockMetricsStubGenerator, MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), + nullptr, nullptr, [this](grpc::ClientContext*) { add_metadata_called_ = true; }); table_store::schema::Relation rel({types::DataType::BOOLEAN, types::DataType::TIME64NS}, {"col1", "time_"}); diff --git a/src/carnot/exec/grpc_source_node_test.cc b/src/carnot/exec/grpc_source_node_test.cc index bf63aa6572e..b129e10440d 100644 --- a/src/carnot/exec/grpc_source_node_test.cc +++ b/src/carnot/exec/grpc_source_node_test.cc @@ -45,9 +45,9 @@ class GRPCSourceNodeTest : public ::testing::Test { func_registry_ = std::make_unique("test_registry"); auto table_store = std::make_shared(); - exec_state_ = std::make_unique(func_registry_.get(), table_store, - MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + exec_state_ = std::make_unique( + func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); table_store::schema::Relation rel({types::DataType::BOOLEAN, types::DataType::TIME64NS}, {"col1", "time_"}); diff --git a/src/carnot/exec/limit_node_test.cc b/src/carnot/exec/limit_node_test.cc index 8b95f9b6608..c787545d547 100644 --- a/src/carnot/exec/limit_node_test.cc +++ b/src/carnot/exec/limit_node_test.cc @@ -52,9 +52,9 @@ class LimitNodeTest : public ::testing::Test { auto table_store = std::make_shared(); - exec_state_ = std::make_unique(func_registry_.get(), table_store, - MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + exec_state_ = std::make_unique( + func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); } protected: diff --git a/src/carnot/exec/map_node_test.cc b/src/carnot/exec/map_node_test.cc index 8a7333f4606..d2753d0941a 100644 --- a/src/carnot/exec/map_node_test.cc +++ b/src/carnot/exec/map_node_test.cc @@ -61,9 +61,9 @@ class MapNodeTest : public ::testing::Test { EXPECT_OK(func_registry_->Register("add")); auto table_store = std::make_shared(); - exec_state_ = std::make_unique(func_registry_.get(), table_store, - MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + exec_state_ = std::make_unique( + func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); EXPECT_OK(exec_state_->AddScalarUDF( 0, "add", std::vector({types::DataType::INT64, types::DataType::INT64}))); } diff --git a/src/carnot/exec/memory_sink_node_test.cc b/src/carnot/exec/memory_sink_node_test.cc index d0a50b4ac85..e2587dbf132 100644 --- a/src/carnot/exec/memory_sink_node_test.cc +++ b/src/carnot/exec/memory_sink_node_test.cc @@ -50,9 +50,9 @@ class MemorySinkNodeTest : public ::testing::Test { func_registry_ = std::make_unique("test_registry"); auto table_store = std::make_shared(); - exec_state_ = std::make_unique(func_registry_.get(), table_store, - MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + exec_state_ = std::make_unique( + func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); } protected: diff --git a/src/carnot/exec/memory_source_node_test.cc b/src/carnot/exec/memory_source_node_test.cc index 1246478db1c..df86c58c23c 100644 --- a/src/carnot/exec/memory_source_node_test.cc +++ b/src/carnot/exec/memory_source_node_test.cc @@ -51,9 +51,9 @@ class MemorySourceNodeTest : public ::testing::Test { void SetUp() override { func_registry_ = std::make_unique("test_registry"); auto table_store = std::make_shared(); - exec_state_ = std::make_unique(func_registry_.get(), table_store, - MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + exec_state_ = std::make_unique( + func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); table_store::schema::Relation rel({types::DataType::BOOLEAN, types::DataType::TIME64NS}, {"col1", "time_"}); @@ -230,9 +230,9 @@ class MemorySourceNodeTabletTest : public ::testing::Test { void SetUp() override { func_registry_ = std::make_unique("test_registry"); auto table_store = std::make_shared(); - exec_state_ = std::make_unique(func_registry_.get(), table_store, - MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + exec_state_ = std::make_unique( + func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); rel = table_store::schema::Relation({types::DataType::BOOLEAN, types::DataType::TIME64NS}, {"col1", "time_"}); @@ -450,9 +450,9 @@ class ParamMemorySourceNodeTest : public ::testing::Test, test_case_ = GetParam(); func_registry_ = std::make_unique("test_registry"); auto table_store = std::make_shared(); - exec_state_ = std::make_unique(func_registry_.get(), table_store, - MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + exec_state_ = std::make_unique( + func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); rel_ = std::make_unique( std::vector{types::DataType::TIME64NS}, std::vector{"time_"}); diff --git a/src/carnot/exec/otel_export_sink_node.cc b/src/carnot/exec/otel_export_sink_node.cc index 7ceb5b4d16b..77da9f12d0b 100644 --- a/src/carnot/exec/otel_export_sink_node.cc +++ b/src/carnot/exec/otel_export_sink_node.cc @@ -77,6 +77,9 @@ Status OTelExportSinkNode::OpenImpl(ExecState* exec_state) { if (plan_node_->spans().size()) { trace_service_stub_ = exec_state->TraceServiceStub(plan_node_->url(), plan_node_->insecure()); } + if (plan_node_->logs().size()) { + logs_service_stub_ = exec_state->LogsServiceStub(plan_node_->url(), plan_node_->insecure()); + } return Status::OK(); } @@ -438,6 +441,69 @@ Status OTelExportSinkNode::ConsumeSpans(ExecState* exec_state, const RowBatch& r return Status::OK(); } +using ::opentelemetry::proto::logs::v1::ResourceLogs; +Status OTelExportSinkNode::ConsumeLogs(ExecState* exec_state, const RowBatch& rb) { + grpc::ClientContext context; + for (const auto& header : plan_node_->endpoint_headers()) { + context.AddMetadata(header.first, header.second); + } + context.set_compression_algorithm(GRPC_COMPRESS_GZIP); + + logs_response_.Clear(); + opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest request; + + for (int64_t row_idx = 0; row_idx < rb.ColumnAt(0)->length(); ++row_idx) { + // TODO(ddelnano) aggregate spans by resource. + ::opentelemetry::proto::logs::v1::ResourceLogs resource_logs; + auto resource = resource_logs.mutable_resource(); + AddAttributes(resource->mutable_attributes(), plan_node_->resource_attributes_normal_encoding(), + rb, row_idx); + auto scope_logs = resource_logs.add_scope_logs(); + for (const auto& log_pb : plan_node_->logs()) { + auto log = scope_logs->add_log_records(); + + AddAttributes(log->mutable_attributes(), log_pb.attributes(), rb, row_idx); + + auto time_col = rb.ColumnAt(log_pb.time_column_index()).get(); + log->set_time_unix_nano(types::GetValueFromArrowArray(time_col, row_idx)); + if (log_pb.observed_time_column_index() >= 0) { + auto observed_time_col = rb.ColumnAt(log_pb.observed_time_column_index()).get(); + log->set_observed_time_unix_nano( + types::GetValueFromArrowArray(observed_time_col, row_idx)); + } else { + log->set_observed_time_unix_nano( + types::GetValueFromArrowArray(time_col, row_idx)); + } + log->set_severity_number( + static_cast<::opentelemetry::proto::logs::v1::SeverityNumber>(log_pb.severity_number())); + log->set_severity_text(log_pb.severity_text()); + log->mutable_body()->set_string_value(types::GetValueFromArrowArray( + rb.ColumnAt(log_pb.body_column_index()).get(), row_idx)); + } + + ReplicateData( + plan_node_->resource_attributes_optional_json_encoded(), + [&request](ResourceLogs log) { *request.add_resource_logs() = std::move(log); }, + std::move(resource_logs), rb, row_idx); + } + // Set timeout, to avoid blocking on query. + if (plan_node_->timeout() > 0) { + std::chrono::system_clock::time_point deadline = + std::chrono::system_clock::now() + std::chrono::seconds{plan_node_->timeout()}; + context.set_deadline(deadline); + } + + grpc::Status status = logs_service_stub_->Export(&context, request, &logs_response_); + if (!status.ok()) { + if (status.error_code() == grpc::StatusCode::DEADLINE_EXCEEDED) { + exec_state->exec_metrics()->otlp_spans_timeout_counter.Increment(); + } + + return FormatOTelStatus(plan_node_->id(), status); + } + return Status::OK(); +} + Status OTelExportSinkNode::ConsumeNextImpl(ExecState* exec_state, const RowBatch& rb, size_t) { if (plan_node_->metrics().size()) { PX_RETURN_IF_ERROR(ConsumeMetrics(exec_state, rb)); @@ -445,6 +511,9 @@ Status OTelExportSinkNode::ConsumeNextImpl(ExecState* exec_state, const RowBatch if (plan_node_->spans().size()) { PX_RETURN_IF_ERROR(ConsumeSpans(exec_state, rb)); } + if (plan_node_->logs().size()) { + PX_RETURN_IF_ERROR(ConsumeLogs(exec_state, rb)); + } if (rb.eos()) { sent_eos_ = true; } diff --git a/src/carnot/exec/otel_export_sink_node.h b/src/carnot/exec/otel_export_sink_node.h index b07b188cf74..22bddf84b7a 100644 --- a/src/carnot/exec/otel_export_sink_node.h +++ b/src/carnot/exec/otel_export_sink_node.h @@ -21,9 +21,6 @@ #include #include -#include "opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.h" -#include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h" - #include "src/carnot/exec/exec_node.h" #include "src/carnot/planpb/plan.pb.h" #include "src/common/base/base.h" @@ -51,6 +48,7 @@ class OTelExportSinkNode : public SinkNode { size_t parent_index) override; private: + Status ConsumeLogs(ExecState* exec_state, const table_store::schema::RowBatch& rb); Status ConsumeMetrics(ExecState* exec_state, const table_store::schema::RowBatch& rb); Status ConsumeSpans(ExecState* exec_state, const table_store::schema::RowBatch& rb); @@ -60,6 +58,8 @@ class OTelExportSinkNode : public SinkNode { metrics_service_stub_; opentelemetry::proto::collector::trace::v1::ExportTraceServiceResponse trace_response_; opentelemetry::proto::collector::trace::v1::TraceService::StubInterface* trace_service_stub_; + opentelemetry::proto::collector::logs::v1::ExportLogsServiceResponse logs_response_; + opentelemetry::proto::collector::logs::v1::LogsService::StubInterface* logs_service_stub_; std::unique_ptr plan_node_; std::unique_ptr span_config_; diff --git a/src/carnot/exec/otel_export_sink_node_test.cc b/src/carnot/exec/otel_export_sink_node_test.cc index 285f9aa2217..9aeee55103e 100644 --- a/src/carnot/exec/otel_export_sink_node_test.cc +++ b/src/carnot/exec/otel_export_sink_node_test.cc @@ -18,6 +18,7 @@ #include "src/carnot/exec/otel_export_sink_node.h" +#include #include #include @@ -25,6 +26,9 @@ #include #include +#include "opentelemetry/proto/collector/logs/v1/logs_service.grpc.pb.h" +#include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h" +#include "opentelemetry/proto/collector/logs/v1/logs_service_mock.grpc.pb.h" #include "opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.h" #include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h" #include "opentelemetry/proto/collector/metrics/v1/metrics_service_mock.grpc.pb.h" @@ -62,6 +66,7 @@ using ::testing::SetArgPointee; using testing::proto::EqualsProto; namespace otelmetricscollector = opentelemetry::proto::collector::metrics::v1; namespace oteltracecollector = opentelemetry::proto::collector::trace::v1; +namespace otellogscollector = opentelemetry::proto::collector::logs::v1; class OTelExportSinkNodeTest : public ::testing::Test { public: @@ -75,6 +80,9 @@ class OTelExportSinkNodeTest : public ::testing::Test { trace_mock_unique_ = std::make_unique(); trace_mock_ = trace_mock_unique_.get(); + logs_mock_unique_ = std::make_unique(); + logs_mock_ = logs_mock_unique_.get(); + exec_state_ = std::make_unique( func_registry_.get(), table_store, MockResultSinkStubGenerator, [this](const std::string& url, @@ -87,6 +95,11 @@ class OTelExportSinkNodeTest : public ::testing::Test { url_ = url; return std::move(trace_mock_unique_); }, + [this](const std::string& url, + bool) -> std::unique_ptr { + url_ = url; + return std::move(logs_mock_unique_); + }, sole::uuid4(), nullptr, nullptr, [](grpc::ClientContext*) {}); } @@ -94,12 +107,14 @@ class OTelExportSinkNodeTest : public ::testing::Test { std::string url_; std::unique_ptr exec_state_; std::unique_ptr func_registry_; + otellogscollector::MockLogsServiceStub* logs_mock_; otelmetricscollector::MockMetricsServiceStub* metrics_mock_; oteltracecollector::MockTraceServiceStub* trace_mock_; private: // Ownership will be transferred to the GRPC node, so access this ptr via `metrics_mock_` in the // tests. + std::unique_ptr logs_mock_unique_; std::unique_ptr metrics_mock_unique_; std::unique_ptr trace_mock_unique_; }; @@ -1837,6 +1852,176 @@ eos: true)pb"; EXPECT_OK(retval); } +class OTelLogTest : public OTelExportSinkNodeTest, + public ::testing::WithParamInterface {}; + +TEST_P(OTelLogTest, process_data) { + auto tc = GetParam(); + std::vector actual_protos( + tc.expected_otel_protos.size()); + size_t i = 0; + EXPECT_CALL(*logs_mock_, Export(_, _, _)) + .Times(tc.expected_otel_protos.size()) + .WillRepeatedly(Invoke([&i, &actual_protos](const auto&, const auto& proto, const auto&) { + actual_protos[i] = proto; + ++i; + return grpc::Status::OK; + })); + + planpb::OTelExportSinkOperator otel_sink_op; + + EXPECT_TRUE(google::protobuf::TextFormat::ParseFromString(tc.operator_proto, &otel_sink_op)); + auto plan_node = std::make_unique(1); + auto s = plan_node->Init(otel_sink_op); + + // Load a RowBatch to get the Input RowDescriptor. + table_store::schemapb::RowBatchData row_batch_proto; + EXPECT_TRUE( + google::protobuf::TextFormat::ParseFromString(tc.incoming_rowbatches[0], &row_batch_proto)); + RowDescriptor input_rd = RowBatch::FromProto(row_batch_proto).ConsumeValueOrDie()->desc(); + RowDescriptor output_rd({}); + + auto tester = exec::ExecNodeTester( + *plan_node, output_rd, {input_rd}, exec_state_.get()); + for (const auto& rb_pb_txt : tc.incoming_rowbatches) { + table_store::schemapb::RowBatchData row_batch_proto; + EXPECT_TRUE(google::protobuf::TextFormat::ParseFromString(rb_pb_txt, &row_batch_proto)); + auto rb = RowBatch::FromProto(row_batch_proto).ConsumeValueOrDie(); + tester.ConsumeNext(*rb.get(), 1, 0); + } + + for (size_t i = 0; i < tc.expected_otel_protos.size(); ++i) { + EXPECT_THAT(actual_protos[i], EqualsProto(tc.expected_otel_protos[i])); + } +} + +INSTANTIATE_TEST_SUITE_P(OTelLog, OTelLogTest, + ::testing::ValuesIn(std::vector{ + {"basic_test", + R"pb( +resource { + attributes { + name: "service.name" + column { + column_type: STRING + column_index: 1 + can_be_json_encoded_array: true + } + } +} +logs { + time_column_index: 0 + attributes { + column { + column_type: STRING + column_index: 1 + } + } + body_column_index: 2 + severity_text: "info" + severity_number: 9 +})pb", + + {R"pb( +cols { time64ns_data { data: 10 } } +cols { string_data { data: "aaaa" } } +cols { string_data { data: "2025-03-05T22:30:24.313268+00:00 dev-vm kernel: ll header: 00000000: ff ff ff ff ff ff 42 01 0a 81 00 01 08 06" } } +num_rows: 1 +eow: true +eos: true)pb"}, + {R"pb( +resource_logs { + resource { + attributes { + key: "service.name" + value { + string_value: "aaaa" + } + } + } + scope_logs { + log_records { + time_unix_nano: 10 + observed_time_unix_nano: 10 + severity_text: "info" + severity_number: 9 + body: { + string_value: "2025-03-05T22:30:24.313268+00:00 dev-vm kernel: ll header: 00000000: ff ff ff ff ff ff 42 01 0a 81 00 01 08 06" + } + attributes { + value { + string_value: "aaaa" + } + } + } + } +})pb"}}, + {"with_observed_time", + R"pb( +resource { + attributes { + name: "service.name" + column { + column_type: STRING + column_index: 2 + can_be_json_encoded_array: true + } + } +} +logs { + time_column_index: 0 + observed_time_column_index: 1 + attributes { + column { + column_type: STRING + column_index: 2 + } + } + body_column_index: 3 + severity_text: "info" + severity_number: 9 +})pb", + + {R"pb( +cols { time64ns_data { data: 10 } } +cols { time64ns_data { data: 12 } } +cols { string_data { data: "aaaa" } } +cols { string_data { data: "2025-03-05T22:30:24.313268+00:00 dev-vm kernel: ll header: 00000000: ff ff ff ff ff ff 42 01 0a 81 00 01 08 06" } } +num_rows: 1 +eow: true +eos: true)pb"}, + {R"pb( +resource_logs { + resource { + attributes { + key: "service.name" + value { + string_value: "aaaa" + } + } + } + scope_logs { + log_records { + time_unix_nano: 10 + observed_time_unix_nano: 12 + severity_text: "info" + severity_number: 9 + body: { + string_value: "2025-03-05T22:30:24.313268+00:00 dev-vm kernel: ll header: 00000000: ff ff ff ff ff ff 42 01 0a 81 00 01 08 06" + } + attributes { + value { + string_value: "aaaa" + } + } + } + } +})pb"}}, + }), + [](const ::testing::TestParamInfo& info) { + return info.param.name; + }); + } // namespace exec } // namespace carnot } // namespace px diff --git a/src/carnot/exec/test_utils.h b/src/carnot/exec/test_utils.h index f5accb6f932..e2f6fae1289 100644 --- a/src/carnot/exec/test_utils.h +++ b/src/carnot/exec/test_utils.h @@ -25,6 +25,7 @@ #include #include +#include "opentelemetry/proto/collector/logs/v1/logs_service_mock.grpc.pb.h" #include "opentelemetry/proto/collector/metrics/v1/metrics_service_mock.grpc.pb.h" #include "opentelemetry/proto/collector/trace/v1/trace_service_mock.grpc.pb.h" #include "src/carnot/carnotpb/carnot.grpc.pb.h" @@ -65,6 +66,11 @@ const TraceStubGenerator MockTraceStubGenerator = [](const std::string&, bool) return std::make_unique(); }; +const LogsStubGenerator MockLogStubGenerator = [](const std::string&, bool) + -> std::unique_ptr { + return std::make_unique(); +}; + table_store::schema::RowBatch ConcatRowBatches( const std::vector& batches) { CHECK(batches.size()); diff --git a/src/carnot/exec/udtf_source_node_test.cc b/src/carnot/exec/udtf_source_node_test.cc index d765722172f..46b82557fc7 100644 --- a/src/carnot/exec/udtf_source_node_test.cc +++ b/src/carnot/exec/udtf_source_node_test.cc @@ -113,9 +113,9 @@ class UDTFSourceNodeTest : public ::testing::Test { EXPECT_OK(func_registry_->Register("test_udtf")); auto table_store = std::make_shared(); - exec_state_ = std::make_unique(func_registry_.get(), table_store, - MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + exec_state_ = std::make_unique( + func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); } protected: diff --git a/src/carnot/exec/union_node_test.cc b/src/carnot/exec/union_node_test.cc index 3400dd45998..f5bec6e5cfd 100644 --- a/src/carnot/exec/union_node_test.cc +++ b/src/carnot/exec/union_node_test.cc @@ -48,9 +48,9 @@ class UnionNodeTest : public ::testing::Test { UnionNodeTest() { func_registry_ = std::make_unique("test_registry"); auto table_store = std::make_shared(); - exec_state_ = std::make_unique(func_registry_.get(), table_store, - MockResultSinkStubGenerator, MockMetricsStubGenerator, - MockTraceStubGenerator, sole::uuid4(), nullptr); + exec_state_ = std::make_unique( + func_registry_.get(), table_store, MockResultSinkStubGenerator, MockMetricsStubGenerator, + MockTraceStubGenerator, MockLogStubGenerator, sole::uuid4(), nullptr); } protected: diff --git a/src/carnot/funcs/builtins/json_ops.h b/src/carnot/funcs/builtins/json_ops.h index c04fc2ad75a..9e54040c092 100644 --- a/src/carnot/funcs/builtins/json_ops.h +++ b/src/carnot/funcs/builtins/json_ops.h @@ -255,8 +255,8 @@ class SplitUDF : public udf::ScalarUDF { | # Returns By=http://frontend.px.dev;URI=http://testclient.px.dev | df.xfcc_hdr = px.pluck(df.req_headers, 'X-Forwarded-Client-Cert') | df.xfcc_parts = px.split(df.xfcc_hdr, ';') - | df.by = px.pluck_array(df.xfcc_hdr, 0) # Returns "By=http://frontend.px.dev" - | df.uri = px.pluck_array(df.xfcc_hdr, 1) # Returns "URI=http://testclient.px.dev" + | df.by = px.pluck_array(df.xfcc_parts, 0) # Returns "By=http://frontend.px.dev" + | df.uri = px.pluck_array(df.xfcc_parts, 1) # Returns "URI=http://testclient.px.dev" )doc") .Arg("input_str", "The string to split.") .Arg("delimiter", "The string value to split the input string.") diff --git a/src/carnot/goplanner/logical_planner.go b/src/carnot/goplanner/logical_planner.go index 826cc0ebcdc..5001b2894db 100644 --- a/src/carnot/goplanner/logical_planner.go +++ b/src/carnot/goplanner/logical_planner.go @@ -25,6 +25,7 @@ package goplanner // #include // #include "src/carnot/planner/cgo_export.h" import "C" + import ( "errors" "fmt" @@ -32,7 +33,6 @@ import ( "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/types" - // Blank Import required by package. _ "github.com/ianlancetaylor/cgosymbolizer" diff --git a/src/carnot/goplanner/logical_planner_benchmark_test.go b/src/carnot/goplanner/logical_planner_benchmark_test.go index 37322813eb4..34677f3ff3b 100644 --- a/src/carnot/goplanner/logical_planner_benchmark_test.go +++ b/src/carnot/goplanner/logical_planner_benchmark_test.go @@ -491,6 +491,7 @@ const pxClusterJSON = ` ] } ` + const pxPodPxl = ` '''Pod Overview @@ -1290,7 +1291,6 @@ func setupPlanner() (*goplanner.GoPlanner, error) { func benchmarkPlannerInnerLoop(c *goplanner.GoPlanner, queryRequestPB *plannerpb.QueryRequest) { plannerResultPB, err := c.Plan(queryRequestPB) - if err != nil { log.Fatalln("Failed to plan:", err) os.Exit(1) @@ -1302,6 +1302,7 @@ func benchmarkPlannerInnerLoop(c *goplanner.GoPlanner, queryRequestPB *plannerpb os.Exit(1) } } + func benchmarkPlanner(b *testing.B, queryRequestPB *plannerpb.QueryRequest, numAgents int) { // Create the compiler. c, err := setupPlanner() diff --git a/src/carnot/goplanner/logical_planner_stub.go b/src/carnot/goplanner/logical_planner_stub.go index b48cd709c11..673eb0f6397 100644 --- a/src/carnot/goplanner/logical_planner_stub.go +++ b/src/carnot/goplanner/logical_planner_stub.go @@ -33,8 +33,7 @@ import ( var errorUnimplemented = errors.New(" ¡UNIMPLEMENTED STUB FOR STATIC ANALYSIS. goplanner ONLY RUNS WITH __CGO__ ENABLED! ") // GoPlanner wraps the C Planner. -type GoPlanner struct { -} +type GoPlanner struct{} // New creates a new GoPlanner object. func New(udfInfo *udfspb.UDFInfo) (GoPlanner, error) { diff --git a/src/carnot/goplanner/logical_planner_test.go b/src/carnot/goplanner/logical_planner_test.go index 9d85d10a4a2..d890b3a6131 100644 --- a/src/carnot/goplanner/logical_planner_test.go +++ b/src/carnot/goplanner/logical_planner_test.go @@ -142,7 +142,6 @@ func TestPlanner_Simple(t *testing.T) { LogicalPlannerState: plannerStatePB, } plannerResultPB, err := c.Plan(queryRequestPB) - if err != nil { log.Fatalln("Failed to plan:", err) os.Exit(1) @@ -197,7 +196,6 @@ func TestPlanner_MissingTable(t *testing.T) { LogicalPlannerState: plannerStatePB, } plannerResultPB, err := c.Plan(queryRequestPB) - if err != nil { log.Fatalln("Failed to plan:", err) os.Exit(1) @@ -234,7 +232,6 @@ func TestPlanner_EmptyString(t *testing.T) { LogicalPlannerState: plannerStatePB, } plannerResultPB, err := c.Plan(queryRequestPB) - if err != nil { t.Fatal("Failed to plan:", err) } diff --git a/src/carnot/plan/operators.h b/src/carnot/plan/operators.h index 82ea71902f1..8586f6eb976 100644 --- a/src/carnot/plan/operators.h +++ b/src/carnot/plan/operators.h @@ -375,6 +375,7 @@ class OTelExportSinkOperator : public Operator { // TODO(philkuz) temporary measure. const planpb::OTelExportSinkOperator& pb() const { return pb_; } + const ::google::protobuf::RepeatedPtrField& logs() const { return pb_.logs(); } const ::google::protobuf::RepeatedPtrField& metrics() const { return pb_.metrics(); } diff --git a/src/carnot/plandebugger/main.go b/src/carnot/plandebugger/main.go index 8fb4e16a7af..b2d4e1eae70 100644 --- a/src/carnot/plandebugger/main.go +++ b/src/carnot/plandebugger/main.go @@ -760,8 +760,8 @@ func convertExecFuncs(inputFuncs []*vizierpb.ExecuteScriptRequest_FuncToExecute) } func main() { - var readScriptFromDir = true - var scriptDir = "/home/philkuz/library/pixie/pxl_scripts/px/cluster/" + readScriptFromDir := true + scriptDir := "/home/philkuz/library/pixie/pxl_scripts/px/cluster/" // Create the compiler. var udfInfoPb udfspb.UDFInfo b, err := funcs.Asset("src/vizier/funcs/data/udf.pb") @@ -830,7 +830,6 @@ func main() { agent.QueryBrokerAddress = id.String() } plannerResultPB, err := c.Plan(queryRequestPB) - if err != nil { log.Fatalf("Failed to plan: %v", err) } @@ -873,7 +872,7 @@ func main() { defer f.Close() } - f, err := os.OpenFile(path, os.O_RDWR, 0644) + f, err := os.OpenFile(path, os.O_RDWR, 0o644) if err != nil { log.WithError(err).Fatalf("failed to open") } diff --git a/src/carnot/planner/compilerpb/BUILD.bazel b/src/carnot/planner/compilerpb/BUILD.bazel index 44009cb4614..c1ad3ce7e6a 100644 --- a/src/carnot/planner/compilerpb/BUILD.bazel +++ b/src/carnot/planner/compilerpb/BUILD.bazel @@ -28,7 +28,7 @@ pl_proto_library( deps = [ "//src/carnot/planpb:plan_pl_proto", "//src/common/base/statuspb:status_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -38,7 +38,7 @@ pl_cc_proto_library( deps = [ "//src/carnot/planpb:plan_pl_cc_proto", "//src/common/base/statuspb:status_pl_cc_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/carnot/planner/distributedpb/BUILD.bazel b/src/carnot/planner/distributedpb/BUILD.bazel index a6f75ad25e4..e93db22c448 100644 --- a/src/carnot/planner/distributedpb/BUILD.bazel +++ b/src/carnot/planner/distributedpb/BUILD.bazel @@ -33,7 +33,7 @@ pl_proto_library( "//src/shared/bloomfilterpb:bloomfilter_pl_proto", "//src/shared/metadatapb:metadata_pl_proto", "//src/table_store/schemapb:schema_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -47,7 +47,7 @@ pl_cc_proto_library( "//src/shared/bloomfilterpb:bloomfilter_pl_cc_proto", "//src/shared/metadatapb:metadata_pl_cc_proto", "//src/table_store/schemapb:schema_pl_cc_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/carnot/planner/distributedpb/distributed_plan.pb.go b/src/carnot/planner/distributedpb/distributed_plan.pb.go index f1b0460f2cb..64787d1782a 100755 --- a/src/carnot/planner/distributedpb/distributed_plan.pb.go +++ b/src/carnot/planner/distributedpb/distributed_plan.pb.go @@ -900,105 +900,104 @@ func init() { } var fileDescriptor_30dce4250507a2af = []byte{ - // 1564 bytes of a gzipped FileDescriptorProto + // 1549 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x4f, 0x6f, 0x1b, 0xc7, 0x15, 0xd7, 0x8a, 0x94, 0x48, 0x3e, 0x92, 0x12, 0x3d, 0xa2, 0x5c, 0x96, 0x48, 0x48, 0x97, 0x48, - 0x50, 0xc1, 0x76, 0x96, 0xa9, 0x12, 0x34, 0x69, 0x80, 0xb4, 0x11, 0x45, 0xff, 0x61, 0xac, 0x26, - 0xea, 0x50, 0x06, 0x02, 0x1f, 0xba, 0x98, 0xe5, 0x0e, 0xc9, 0x45, 0x96, 0xbb, 0xab, 0x9d, 0x59, - 0x43, 0x6a, 0x51, 0xa0, 0x3d, 0xf6, 0xd4, 0x7e, 0x8c, 0x9e, 0x7a, 0xeb, 0xb5, 0xd7, 0xf6, 0xe8, - 0x63, 0x4e, 0x42, 0x4c, 0x5f, 0x7a, 0xcc, 0x17, 0x28, 0x50, 0xcc, 0x9b, 0x5d, 0x6a, 0x49, 0x13, - 0x90, 0xd3, 0x5c, 0xc8, 0x99, 0xf7, 0x7e, 0xef, 0xcf, 0xcc, 0x7b, 0xbf, 0x99, 0x59, 0xf8, 0x48, - 0x44, 0xa3, 0xee, 0x88, 0x45, 0x7e, 0x20, 0xbb, 0xa1, 0xc7, 0x7c, 0x9f, 0x47, 0x5d, 0xc7, 0x15, - 0x32, 0x72, 0xed, 0x58, 0x72, 0x27, 0xb4, 0xb3, 0x33, 0x4b, 0x21, 0xcc, 0x30, 0x0a, 0x64, 0x40, - 0xda, 0xe1, 0x85, 0xa9, 0xed, 0xcc, 0xc4, 0xce, 0x5c, 0xb2, 0x6b, 0xbe, 0x37, 0x71, 0xe5, 0x34, - 0xb6, 0xcd, 0x51, 0x30, 0xeb, 0x4e, 0x82, 0x49, 0xd0, 0x45, 0x3b, 0x3b, 0x1e, 0xe3, 0x0c, 0x27, - 0x38, 0xd2, 0xfe, 0x9a, 0x6d, 0x95, 0x08, 0x0b, 0x5d, 0x0d, 0xeb, 0xc6, 0xb1, 0xab, 0x82, 0xab, - 0xbf, 0x04, 0xf0, 0xd6, 0x4a, 0xa6, 0xa1, 0xdd, 0xbd, 0x4e, 0xa7, 0xf9, 0x2e, 0x6a, 0x83, 0xd9, - 0x2c, 0xf0, 0xbb, 0x36, 0x13, 0xbc, 0x2b, 0x24, 0x93, 0xb1, 0x08, 0xed, 0x64, 0x90, 0xc0, 0xee, - 0x2a, 0x98, 0x98, 0xb2, 0x88, 0x3b, 0x5d, 0xdb, 0x0b, 0x82, 0xd9, 0xd8, 0xf5, 0x24, 0x8f, 0x42, - 0x3b, 0x3b, 0x4b, 0xb0, 0xef, 0x64, 0xb0, 0x33, 0x2e, 0x99, 0xc3, 0x24, 0x0b, 0xed, 0xc5, 0x30, - 0x1b, 0x58, 0x32, 0xdb, 0xe3, 0x96, 0x90, 0x41, 0xc4, 0xbb, 0x62, 0x34, 0xe5, 0x33, 0x05, 0xd4, - 0x03, 0x0d, 0xeb, 0xcc, 0x0d, 0xa8, 0xfc, 0x3a, 0xb1, 0x1c, 0xf8, 0xe3, 0x80, 0x3c, 0x81, 0xdd, - 0xd4, 0x93, 0x35, 0x76, 0xb9, 0xe7, 0x88, 0x86, 0x71, 0x27, 0x77, 0xb0, 0x73, 0xd8, 0x31, 0xc3, - 0x0b, 0x53, 0x87, 0x35, 0xaf, 0xc3, 0x9a, 0xa9, 0xf1, 0xd9, 0x65, 0xc8, 0xe9, 0x4e, 0xaa, 0x78, - 0x88, 0x96, 0xe4, 0xf7, 0xb0, 0x7f, 0x71, 0x31, 0x65, 0x62, 0xfa, 0xf3, 0x0f, 0x2d, 0x5c, 0x88, - 0xa5, 0x57, 0xd2, 0xd8, 0xbc, 0x63, 0x1c, 0x94, 0x0f, 0xef, 0x67, 0x5c, 0x2e, 0xad, 0xda, 0xfc, - 0xea, 0xab, 0xc7, 0x68, 0xd5, 0x53, 0xd2, 0x87, 0x28, 0xed, 0xfd, 0x68, 0x7e, 0xd5, 0xde, 0x5b, - 0xa3, 0x78, 0xbc, 0x41, 0xf7, 0xd2, 0x28, 0x59, 0x7c, 0x11, 0xb6, 0xb5, 0xbf, 0xce, 0xb7, 0x79, - 0x80, 0x63, 0xac, 0x10, 0x2e, 0xf1, 0x7d, 0xa8, 0x9f, 0xc7, 0x3c, 0xba, 0xb4, 0xec, 0x28, 0xf8, - 0x9a, 0x47, 0x16, 0x73, 0x9c, 0x88, 0x0b, 0xb5, 0x4e, 0xe3, 0xa0, 0x44, 0x09, 0xea, 0x7a, 0xa8, - 0x3a, 0xd2, 0x1a, 0xf2, 0x11, 0x14, 0xd9, 0x84, 0xfb, 0xd2, 0x72, 0x9d, 0x06, 0x60, 0xea, 0xbb, - 0x2a, 0x75, 0xdd, 0x0c, 0xe6, 0xd3, 0xa7, 0x83, 0x7e, 0xaf, 0x3c, 0xbf, 0x6a, 0x17, 0x8e, 0x14, - 0x68, 0xd0, 0xa7, 0x05, 0x44, 0x0f, 0x1c, 0xf2, 0x0b, 0xd8, 0x9d, 0x32, 0x61, 0x4d, 0xa2, 0x70, - 0x64, 0x09, 0x1e, 0x3d, 0x4f, 0x96, 0x5e, 0xec, 0xdd, 0x9a, 0x5f, 0xb5, 0xab, 0x8f, 0x99, 0x78, - 0x44, 0x4f, 0x8f, 0x87, 0xa8, 0xa0, 0xd5, 0x29, 0x13, 0x8f, 0xa2, 0x70, 0xa4, 0xa7, 0xe4, 0x10, - 0x2a, 0x68, 0x96, 0x66, 0x97, 0x53, 0xd9, 0xf5, 0x76, 0xe7, 0x57, 0xed, 0xb2, 0x32, 0x4a, 0x52, - 0xa3, 0x65, 0x05, 0x4a, 0xf3, 0x7c, 0x07, 0x76, 0x54, 0x38, 0x2c, 0x1e, 0x56, 0xbd, 0x91, 0x57, - 0xd1, 0x68, 0x65, 0xca, 0x44, 0x9f, 0x49, 0x36, 0x54, 0x32, 0xf2, 0x2e, 0xec, 0x84, 0x51, 0x30, - 0xe2, 0x42, 0x70, 0x8d, 0x6d, 0x6c, 0x21, 0xaa, 0xba, 0x90, 0x2a, 0x2c, 0xf9, 0x10, 0x6e, 0xb3, - 0xd1, 0x88, 0x87, 0x52, 0x58, 0x11, 0x9f, 0x05, 0x92, 0x5b, 0x22, 0x88, 0xa3, 0x11, 0x17, 0x8d, - 0x6d, 0x84, 0xd7, 0x13, 0x2d, 0x45, 0xe5, 0x50, 0xeb, 0xc8, 0x00, 0x40, 0x77, 0x9d, 0xeb, 0x8f, - 0x83, 0x46, 0xe1, 0x4e, 0xee, 0xa0, 0x7c, 0x78, 0xd7, 0xbc, 0x81, 0x94, 0xe6, 0x99, 0x32, 0x51, - 0xc5, 0xa1, 0x25, 0x99, 0x0e, 0xc9, 0x5b, 0x90, 0x67, 0xc2, 0x75, 0x1a, 0xc5, 0x3b, 0xc6, 0x41, - 0xb5, 0x57, 0x9c, 0x5f, 0xb5, 0xf3, 0x47, 0xc3, 0x41, 0x9f, 0xa2, 0x94, 0x50, 0xa8, 0x2e, 0x1a, - 0x15, 0x63, 0x95, 0xb0, 0x30, 0xef, 0xdd, 0x18, 0x2b, 0xdb, 0xee, 0xb4, 0x32, 0xcb, 0x36, 0xff, - 0xc7, 0xb0, 0x23, 0x84, 0x67, 0x49, 0x16, 0x4d, 0xb8, 0xf4, 0xd9, 0x8c, 0x37, 0xca, 0xb8, 0xeb, - 0x58, 0xad, 0xe1, 0xf0, 0xe4, 0x0c, 0x15, 0x5f, 0xb0, 0x19, 0xa7, 0x55, 0x21, 0xbc, 0xb3, 0x05, - 0xae, 0x33, 0x85, 0xd2, 0x62, 0x0d, 0xa4, 0x0e, 0x5b, 0xb8, 0x8a, 0xa4, 0xa3, 0xf4, 0x84, 0xdc, - 0x83, 0x5b, 0x38, 0x90, 0xee, 0xef, 0x98, 0x74, 0x03, 0xdf, 0xfa, 0x9a, 0x5f, 0x62, 0x37, 0x94, - 0x68, 0x6d, 0x49, 0xf1, 0x84, 0x5f, 0x92, 0x06, 0x14, 0xb4, 0x4c, 0x15, 0x3e, 0x77, 0x50, 0xa2, - 0xe9, 0xb4, 0xf3, 0x17, 0x03, 0x60, 0x88, 0x14, 0xc6, 0x58, 0x04, 0xf2, 0x98, 0xa8, 0x0e, 0x85, - 0x63, 0xf2, 0x29, 0x14, 0x23, 0xee, 0xa1, 0xaf, 0x84, 0x69, 0x3f, 0x51, 0xbb, 0x92, 0x39, 0x0d, - 0xcc, 0xf4, 0x34, 0x30, 0x69, 0x02, 0xa4, 0x0b, 0x13, 0x62, 0x02, 0xe8, 0x6e, 0xf7, 0x5c, 0x21, - 0x31, 0xfc, 0xeb, 0xfd, 0x4e, 0x4b, 0x08, 0x39, 0x71, 0x85, 0xec, 0xfc, 0xdd, 0x80, 0x5a, 0xff, - 0x7a, 0x8b, 0x87, 0x92, 0x49, 0x4e, 0x4e, 0xa0, 0xac, 0xab, 0xa0, 0x8b, 0x63, 0xa0, 0x97, 0x7b, - 0x37, 0x16, 0xe7, 0x9a, 0xa6, 0x14, 0x46, 0xd7, 0x94, 0x3d, 0x81, 0xb2, 0xce, 0x58, 0x7b, 0xdb, - 0x7c, 0x43, 0x6f, 0xd7, 0xfb, 0x44, 0x41, 0x2c, 0xc6, 0x9d, 0x7f, 0xe5, 0x60, 0x37, 0x93, 0xf0, - 0xa9, 0xc7, 0x7c, 0x12, 0x01, 0x39, 0xb7, 0x53, 0xb2, 0x59, 0x32, 0xc0, 0x3b, 0x25, 0x49, 0xfb, - 0xc1, 0x8d, 0x81, 0x56, 0xbc, 0x99, 0xbf, 0xb1, 0x13, 0x4a, 0x9e, 0x05, 0x6a, 0xfe, 0xc0, 0x97, - 0xd1, 0x25, 0xdd, 0x3d, 0x5f, 0x96, 0x92, 0xe7, 0x50, 0x5f, 0x8e, 0xe9, 0xb0, 0x89, 0x3a, 0x62, - 0xf4, 0xf2, 0x1e, 0xfe, 0x90, 0xa8, 0x7d, 0x36, 0x19, 0x38, 0x3a, 0x6c, 0xed, 0x7c, 0x45, 0x4c, - 0x7e, 0x0a, 0x39, 0x87, 0x4d, 0xf0, 0x44, 0x29, 0x1f, 0xee, 0xaf, 0x84, 0x51, 0x7e, 0x8f, 0x1e, - 0x51, 0x85, 0x68, 0x3e, 0x83, 0xfa, 0xba, 0x95, 0x90, 0x1a, 0xe4, 0x54, 0xf3, 0xea, 0x9e, 0x53, - 0x43, 0x72, 0x1f, 0xb6, 0x9e, 0x33, 0x2f, 0xe6, 0x49, 0xbf, 0xdd, 0x7e, 0xdd, 0xa9, 0xb2, 0xa6, - 0x1a, 0xf4, 0xc9, 0xe6, 0xc7, 0x46, 0xf3, 0x18, 0xf6, 0xd7, 0xe6, 0xbb, 0xc6, 0x79, 0x3d, 0xeb, - 0x3c, 0x9f, 0x71, 0xd2, 0xf9, 0x93, 0x01, 0x35, 0xca, 0x1d, 0x36, 0x52, 0x8d, 0xfb, 0x65, 0xa8, - 0x7e, 0x05, 0xb9, 0x0f, 0x24, 0x16, 0xdc, 0x1a, 0xc7, 0x9e, 0x67, 0x45, 0xa9, 0x12, 0xfd, 0x15, - 0x69, 0x2d, 0x16, 0xfc, 0x61, 0xec, 0x79, 0x0b, 0x23, 0xf2, 0x2b, 0x78, 0x5b, 0xa1, 0xc3, 0x8b, - 0x04, 0x6b, 0x85, 0xae, 0x6b, 0xd9, 0x5c, 0x48, 0x8b, 0x8f, 0xc7, 0x41, 0x24, 0xf5, 0x81, 0x4d, - 0x1b, 0xb1, 0xe0, 0xa7, 0x17, 0xda, 0xec, 0xd4, 0x75, 0x7b, 0x5c, 0xc8, 0x07, 0xa8, 0xef, 0xfc, - 0xd7, 0x00, 0xf2, 0xe5, 0x19, 0xf7, 0x1e, 0xf8, 0x4e, 0x18, 0xb8, 0xbe, 0x3c, 0x0e, 0xfc, 0xb1, - 0x3b, 0x21, 0x3f, 0x86, 0x5c, 0x1c, 0x79, 0x7a, 0x19, 0xbd, 0xc2, 0xfc, 0xaa, 0x9d, 0x7b, 0x4a, - 0x4f, 0xa8, 0x92, 0x91, 0x67, 0x50, 0x98, 0x72, 0xe6, 0xf0, 0x48, 0x24, 0xa5, 0xfe, 0xec, 0xc6, - 0x52, 0xbf, 0x1e, 0xc0, 0x7c, 0xac, 0x5d, 0xe8, 0x22, 0xa7, 0x0e, 0x49, 0x13, 0x8a, 0xae, 0x2f, - 0xf8, 0x28, 0x8e, 0x38, 0x16, 0xb8, 0x48, 0x17, 0x73, 0x3c, 0x54, 0xdc, 0x19, 0x0f, 0x62, 0x89, - 0xf7, 0x42, 0x8e, 0xa6, 0xd3, 0xe6, 0x27, 0x50, 0xc9, 0xba, 0xbb, 0xa9, 0x06, 0xa5, 0x6c, 0x0d, - 0x28, 0x54, 0x4e, 0xbd, 0x78, 0xe2, 0xfa, 0xc9, 0xc2, 0x3b, 0x50, 0x15, 0x92, 0x45, 0xd2, 0x52, - 0xce, 0x2d, 0x5f, 0xdf, 0xab, 0x39, 0x5a, 0x46, 0xe1, 0x99, 0x3b, 0xe3, 0x5f, 0x08, 0xd2, 0x82, - 0x32, 0xf7, 0x9d, 0x05, 0x62, 0x13, 0x11, 0x25, 0xee, 0x3b, 0x5a, 0xdf, 0xf9, 0xa7, 0x01, 0xa5, - 0x3e, 0xb7, 0xe3, 0x09, 0xb2, 0xff, 0x1c, 0xf6, 0x03, 0xc9, 0x3d, 0xcb, 0x51, 0x12, 0x8b, 0xc9, - 0x64, 0x5f, 0x44, 0x42, 0xcf, 0x4f, 0x6f, 0x26, 0x4a, 0xea, 0x0a, 0xf7, 0x11, 0x67, 0x47, 0xa9, - 0x17, 0xba, 0xa7, 0x7c, 0x2f, 0xcb, 0x44, 0xf3, 0x97, 0xba, 0xa6, 0xcb, 0xe2, 0xb5, 0x87, 0xed, - 0xda, 0x8d, 0xe9, 0xfc, 0x63, 0x0b, 0xf6, 0x4e, 0x82, 0x89, 0x3b, 0x62, 0xde, 0xa9, 0x4e, 0x49, - 0x1f, 0x8b, 0xbf, 0x85, 0x5b, 0xd9, 0x87, 0xab, 0x7a, 0x04, 0xa6, 0x9c, 0xf9, 0xd9, 0xf7, 0xe1, - 0x3b, 0x7a, 0xa3, 0x35, 0x67, 0xf5, 0xd8, 0xfd, 0x0c, 0x2a, 0xca, 0xd6, 0x0a, 0x34, 0x17, 0x12, - 0x8e, 0xbf, 0xbd, 0x9e, 0x8e, 0x09, 0x61, 0x68, 0x39, 0xbc, 0x9e, 0xa8, 0xd7, 0x41, 0xc4, 0x45, - 0xec, 0xc9, 0xc5, 0xcb, 0x23, 0x8f, 0x0b, 0xab, 0x6a, 0x69, 0xfa, 0xd4, 0x78, 0x02, 0xfb, 0x09, - 0x6c, 0xe5, 0xc6, 0xdc, 0xc2, 0x86, 0xc7, 0xc7, 0x1a, 0x45, 0xc0, 0xf2, 0xbd, 0xb9, 0xa7, 0xad, - 0x86, 0xd9, 0xdb, 0x53, 0xed, 0xca, 0x82, 0xa8, 0x8b, 0xd4, 0x0b, 0x6f, 0xb8, 0x2b, 0xab, 0xfc, - 0xa7, 0xb5, 0x68, 0xf5, 0x44, 0xf8, 0x03, 0xd4, 0xb1, 0x81, 0x78, 0xc2, 0x20, 0x6b, 0x84, 0xad, - 0x8a, 0x2f, 0x8b, 0xf2, 0xe1, 0x07, 0xff, 0x07, 0xfb, 0x7a, 0xb7, 0xe7, 0x57, 0xed, 0x35, 0xb4, - 0xa7, 0x44, 0x05, 0x5a, 0x39, 0x0a, 0x28, 0x54, 0x43, 0x64, 0x48, 0x1a, 0xf7, 0x4d, 0x9f, 0x2a, - 0x59, 0x5e, 0xd1, 0x4a, 0x98, 0x65, 0xd9, 0x00, 0x40, 0xd3, 0x01, 0x2f, 0x44, 0xfd, 0x28, 0xbd, - 0xfb, 0xe6, 0x44, 0xa0, 0x25, 0x27, 0x1d, 0x7e, 0x9e, 0x2f, 0x1a, 0xb5, 0xcd, 0xcf, 0xf3, 0xc5, - 0xed, 0x5a, 0xa1, 0xf3, 0x67, 0x03, 0xea, 0xcb, 0x7d, 0xab, 0x8b, 0x48, 0xee, 0xc1, 0xb6, 0xfe, - 0x62, 0xc1, 0xe6, 0x2f, 0x1f, 0xee, 0xe1, 0xdb, 0x3d, 0xf9, 0x98, 0x31, 0x87, 0x38, 0xa0, 0x09, - 0x84, 0xf4, 0x21, 0x8f, 0xd7, 0xa7, 0x6e, 0xec, 0xf7, 0xbf, 0xef, 0x45, 0x46, 0xd1, 0xba, 0x77, - 0xfc, 0xe2, 0x65, 0x6b, 0xe3, 0x9b, 0x97, 0xad, 0x8d, 0xef, 0x5e, 0xb6, 0x8c, 0x3f, 0xce, 0x5b, - 0xc6, 0xdf, 0xe6, 0x2d, 0xe3, 0xdf, 0xf3, 0x96, 0xf1, 0x62, 0xde, 0x32, 0xbe, 0x9d, 0xb7, 0x8c, - 0xff, 0xcc, 0x5b, 0x1b, 0xdf, 0xcd, 0x5b, 0xc6, 0x5f, 0x5f, 0xb5, 0x36, 0x5e, 0xbc, 0x6a, 0x6d, - 0x7c, 0xf3, 0xaa, 0xb5, 0xf1, 0xac, 0xba, 0xe4, 0xda, 0xde, 0xc6, 0xef, 0x9c, 0x0f, 0xfe, 0x17, - 0x00, 0x00, 0xff, 0xff, 0xb9, 0x38, 0x96, 0xde, 0x51, 0x0e, 0x00, 0x00, + 0x50, 0xc1, 0x76, 0x97, 0xa9, 0x12, 0x34, 0x69, 0x80, 0xb4, 0x11, 0x45, 0xc9, 0x62, 0xac, 0x26, + 0xea, 0x50, 0x06, 0x02, 0x1f, 0xba, 0x18, 0x72, 0x87, 0xe4, 0x22, 0xcb, 0xdd, 0xd5, 0xce, 0xac, + 0x21, 0xb5, 0x28, 0xd0, 0x1e, 0x7b, 0x6a, 0x3f, 0x46, 0x4f, 0xbd, 0xf5, 0xda, 0x6b, 0x7b, 0xf4, + 0x31, 0x27, 0x21, 0xa6, 0x2f, 0x3d, 0xe6, 0x0b, 0x14, 0x28, 0xe6, 0xcd, 0x2e, 0xb5, 0xa4, 0x09, + 0x48, 0x6e, 0x2f, 0xe4, 0xcc, 0x7b, 0xbf, 0xf7, 0x67, 0xe6, 0xbd, 0xdf, 0xcc, 0x2c, 0x7c, 0x2c, + 0xc2, 0x61, 0x7b, 0xc8, 0x42, 0xcf, 0x97, 0xed, 0xc0, 0x65, 0x9e, 0xc7, 0xc3, 0xb6, 0xed, 0x08, + 0x19, 0x3a, 0x83, 0x48, 0x72, 0x3b, 0x18, 0xa4, 0x67, 0x96, 0x42, 0x98, 0x41, 0xe8, 0x4b, 0x9f, + 0x34, 0x83, 0x4b, 0x53, 0xdb, 0x99, 0xb1, 0x9d, 0xb9, 0x60, 0x57, 0xaf, 0x8e, 0xfd, 0xb1, 0x8f, + 0xd8, 0xb6, 0x1a, 0x69, 0xb3, 0x7a, 0x53, 0xc5, 0x63, 0x81, 0xd3, 0xd6, 0x9a, 0x28, 0x72, 0x54, + 0x0c, 0xf5, 0x17, 0x03, 0xde, 0x59, 0x4a, 0x28, 0x18, 0xb4, 0x6f, 0xa2, 0xd6, 0xdf, 0x47, 0xad, + 0x3f, 0x9d, 0xfa, 0x5e, 0x7b, 0xc0, 0x04, 0x6f, 0x0b, 0xc9, 0x64, 0x24, 0x82, 0x41, 0x3c, 0x88, + 0x61, 0x0f, 0x15, 0x4c, 0x4c, 0x58, 0xc8, 0xed, 0xf6, 0xc0, 0xf5, 0xfd, 0xe9, 0xc8, 0x71, 0x25, + 0x0f, 0x83, 0x41, 0x7a, 0x16, 0x63, 0xdf, 0x4b, 0x61, 0xa7, 0x5c, 0x32, 0x9b, 0x49, 0x16, 0x0c, + 0xe6, 0xc3, 0x74, 0x60, 0xc9, 0x06, 0x2e, 0xb7, 0x84, 0xf4, 0x43, 0xde, 0x16, 0xc3, 0x09, 0x9f, + 0x2a, 0xa0, 0x1e, 0x68, 0x58, 0x6b, 0x66, 0x40, 0xe9, 0x57, 0xb1, 0x65, 0xcf, 0x1b, 0xf9, 0xe4, + 0x29, 0x6c, 0x27, 0x9e, 0xac, 0x91, 0xc3, 0x5d, 0x5b, 0xd4, 0x8c, 0x07, 0x99, 0xbd, 0xad, 0xfd, + 0x96, 0x19, 0x5c, 0x9a, 0x3a, 0xac, 0x79, 0x13, 0xd6, 0x4c, 0x8c, 0xcf, 0xaf, 0x02, 0x4e, 0xb7, + 0x12, 0xc5, 0x31, 0x5a, 0x92, 0xdf, 0xc1, 0xee, 0xe5, 0xe5, 0x84, 0x89, 0xc9, 0xcf, 0x3e, 0xb2, + 0x70, 0x21, 0x96, 0x5e, 0x49, 0x6d, 0xfd, 0x81, 0xb1, 0x57, 0xdc, 0x7f, 0x9c, 0x72, 0xb9, 0xb0, + 0x6a, 0xf3, 0xeb, 0xaf, 0x4f, 0xd0, 0xaa, 0xa3, 0xa4, 0xc7, 0x28, 0xed, 0xfc, 0x60, 0x76, 0xdd, + 0xdc, 0x59, 0xa1, 0x38, 0x59, 0xa3, 0x3b, 0x49, 0x94, 0x34, 0x3e, 0x0f, 0x9b, 0xda, 0x5f, 0xeb, + 0xbb, 0x2c, 0xc0, 0x21, 0x56, 0x08, 0x97, 0xf8, 0x01, 0x54, 0x2f, 0x22, 0x1e, 0x5e, 0x59, 0x83, + 0xd0, 0xff, 0x86, 0x87, 0x16, 0xb3, 0xed, 0x90, 0x0b, 0xb5, 0x4e, 0x63, 0xaf, 0x40, 0x09, 0xea, + 0x3a, 0xa8, 0x3a, 0xd0, 0x1a, 0xf2, 0x31, 0xe4, 0xd9, 0x98, 0x7b, 0xd2, 0x72, 0xec, 0x1a, 0x60, + 0xea, 0xdb, 0x2a, 0x75, 0xdd, 0x0c, 0xe6, 0xb3, 0x67, 0xbd, 0x6e, 0xa7, 0x38, 0xbb, 0x6e, 0xe6, + 0x0e, 0x14, 0xa8, 0xd7, 0xa5, 0x39, 0x44, 0xf7, 0x6c, 0xf2, 0x73, 0xd8, 0x9e, 0x30, 0x61, 0x8d, + 0xc3, 0x60, 0x68, 0x09, 0x1e, 0xbe, 0x88, 0x97, 0x9e, 0xef, 0xdc, 0x9b, 0x5d, 0x37, 0xcb, 0x27, + 0x4c, 0x3c, 0xa1, 0x67, 0x87, 0x7d, 0x54, 0xd0, 0xf2, 0x84, 0x89, 0x27, 0x61, 0x30, 0xd4, 0x53, + 0xb2, 0x0f, 0x25, 0x34, 0x4b, 0xb2, 0xcb, 0xa8, 0xec, 0x3a, 0xdb, 0xb3, 0xeb, 0x66, 0x51, 0x19, + 0xc5, 0xa9, 0xd1, 0xa2, 0x02, 0x25, 0x79, 0xbe, 0x07, 0x5b, 0x2a, 0x1c, 0x16, 0x0f, 0xab, 0x5e, + 0xcb, 0xaa, 0x68, 0xb4, 0x34, 0x61, 0xa2, 0xcb, 0x24, 0xeb, 0x2b, 0x19, 0x79, 0x1f, 0xb6, 0x82, + 0xd0, 0x1f, 0x72, 0x21, 0xb8, 0xc6, 0xd6, 0x36, 0x10, 0x55, 0x9e, 0x4b, 0x15, 0x96, 0x7c, 0x04, + 0xf7, 0xd9, 0x70, 0xc8, 0x03, 0x29, 0xac, 0x90, 0x4f, 0x7d, 0xc9, 0x2d, 0xe1, 0x47, 0xe1, 0x90, + 0x8b, 0xda, 0x26, 0xc2, 0xab, 0xb1, 0x96, 0xa2, 0xb2, 0xaf, 0x75, 0xa4, 0x07, 0xa0, 0xbb, 0xce, + 0xf1, 0x46, 0x7e, 0x2d, 0xf7, 0x20, 0xb3, 0x57, 0xdc, 0x7f, 0x68, 0xde, 0xc2, 0x3d, 0xf3, 0x5c, + 0x99, 0xa8, 0xe2, 0xd0, 0x82, 0x4c, 0x86, 0xe4, 0x1d, 0xc8, 0x32, 0xe1, 0xd8, 0xb5, 0xfc, 0x03, + 0x63, 0xaf, 0xdc, 0xc9, 0xcf, 0xae, 0x9b, 0xd9, 0x83, 0x7e, 0xaf, 0x4b, 0x51, 0x4a, 0x28, 0x94, + 0xe7, 0x8d, 0x8a, 0xb1, 0x0a, 0x58, 0x98, 0x9f, 0xdc, 0x1a, 0x2b, 0xdd, 0xee, 0xb4, 0x34, 0x4d, + 0x37, 0xff, 0x27, 0xb0, 0x25, 0x84, 0x6b, 0x49, 0x16, 0x8e, 0xb9, 0xf4, 0xd8, 0x94, 0xd7, 0x8a, + 0xb8, 0xeb, 0x58, 0xad, 0x7e, 0xff, 0xf4, 0x1c, 0x15, 0x5f, 0xb2, 0x29, 0xa7, 0x65, 0x21, 0xdc, + 0xf3, 0x39, 0xae, 0x35, 0x81, 0xc2, 0x7c, 0x0d, 0xa4, 0x0a, 0x1b, 0xb8, 0x8a, 0xb8, 0xa3, 0xf4, + 0x84, 0x3c, 0x82, 0x7b, 0x38, 0x90, 0xce, 0x6f, 0x99, 0x74, 0x7c, 0xcf, 0xfa, 0x86, 0x5f, 0x61, + 0x37, 0x14, 0x68, 0x65, 0x41, 0xf1, 0x94, 0x5f, 0x91, 0x1a, 0xe4, 0xb4, 0x4c, 0x15, 0x3e, 0xb3, + 0x57, 0xa0, 0xc9, 0xb4, 0xf5, 0x67, 0x03, 0xa0, 0x8f, 0x14, 0xc6, 0x58, 0x04, 0xb2, 0x98, 0xa8, + 0x0e, 0x85, 0x63, 0xf2, 0x19, 0xe4, 0x43, 0xee, 0xa2, 0xaf, 0x98, 0x69, 0x3f, 0x52, 0xbb, 0x92, + 0x3a, 0x0d, 0xcc, 0xe4, 0x34, 0x30, 0x69, 0x0c, 0xa4, 0x73, 0x13, 0x62, 0x02, 0xe8, 0x6e, 0x77, + 0x1d, 0x21, 0x31, 0xfc, 0x9b, 0xfd, 0x4e, 0x0b, 0x08, 0x39, 0x75, 0x84, 0x6c, 0xfd, 0xcd, 0x80, + 0x4a, 0xf7, 0x66, 0x8b, 0xfb, 0x92, 0x49, 0x4e, 0x4e, 0xa1, 0xa8, 0xab, 0xa0, 0x8b, 0x63, 0xa0, + 0x97, 0x47, 0xb7, 0x16, 0xe7, 0x86, 0xa6, 0x14, 0x86, 0x37, 0x94, 0x3d, 0x85, 0xa2, 0xce, 0x58, + 0x7b, 0x5b, 0xbf, 0xa3, 0xb7, 0x9b, 0x7d, 0xa2, 0x20, 0xe6, 0xe3, 0xd6, 0x3f, 0x33, 0xb0, 0x9d, + 0x4a, 0xf8, 0xcc, 0x65, 0x1e, 0x09, 0x81, 0x5c, 0x0c, 0x12, 0xb2, 0x59, 0xd2, 0xc7, 0xab, 0x23, + 0x4e, 0xfb, 0xe8, 0xd6, 0x40, 0x4b, 0xde, 0xcc, 0x5f, 0x0f, 0x62, 0x4a, 0x9e, 0xfb, 0x6a, 0x7e, + 0xe4, 0xc9, 0xf0, 0x8a, 0x6e, 0x5f, 0x2c, 0x4a, 0xc9, 0x0b, 0xa8, 0x2e, 0xc6, 0xb4, 0xd9, 0x58, + 0x1d, 0x31, 0x7a, 0x79, 0xc7, 0xff, 0x4f, 0xd4, 0x2e, 0x1b, 0xf7, 0x6c, 0x1d, 0xb6, 0x72, 0xb1, + 0x24, 0x26, 0x3f, 0x86, 0x8c, 0xcd, 0xc6, 0x78, 0xa2, 0x14, 0xf7, 0x77, 0x97, 0xc2, 0x28, 0xbf, + 0x07, 0x4f, 0xa8, 0x42, 0xd4, 0x9f, 0x43, 0x75, 0xd5, 0x4a, 0x48, 0x05, 0x32, 0xaa, 0x79, 0x75, + 0xcf, 0xa9, 0x21, 0x79, 0x0c, 0x1b, 0x2f, 0x98, 0x1b, 0xf1, 0xb8, 0xdf, 0xee, 0xbf, 0xe9, 0x54, + 0x59, 0x53, 0x0d, 0xfa, 0x74, 0xfd, 0x13, 0xa3, 0x7e, 0x08, 0xbb, 0x2b, 0xf3, 0x5d, 0xe1, 0xbc, + 0x9a, 0x76, 0x9e, 0x4d, 0x39, 0x69, 0xfd, 0xd1, 0x80, 0x0a, 0xe5, 0x36, 0x1b, 0xaa, 0xc6, 0xfd, + 0x2a, 0x50, 0xbf, 0x82, 0x3c, 0x06, 0x12, 0x09, 0x6e, 0x8d, 0x22, 0xd7, 0xb5, 0xc2, 0x44, 0x89, + 0xfe, 0xf2, 0xb4, 0x12, 0x09, 0x7e, 0x1c, 0xb9, 0xee, 0xdc, 0x88, 0xfc, 0x12, 0xde, 0x55, 0xe8, + 0xe0, 0x32, 0xc6, 0x5a, 0x81, 0xe3, 0x58, 0x03, 0x2e, 0xa4, 0xc5, 0x47, 0x23, 0x3f, 0x94, 0xfa, + 0xc0, 0xa6, 0xb5, 0x48, 0xf0, 0xb3, 0x4b, 0x6d, 0x76, 0xe6, 0x38, 0x1d, 0x2e, 0xe4, 0x11, 0xea, + 0x5b, 0xff, 0x31, 0x80, 0x7c, 0x75, 0xce, 0xdd, 0x23, 0xcf, 0x0e, 0x7c, 0xc7, 0x93, 0x87, 0xbe, + 0x37, 0x72, 0xc6, 0xe4, 0x87, 0x90, 0x89, 0x42, 0x57, 0x2f, 0xa3, 0x93, 0x9b, 0x5d, 0x37, 0x33, + 0xcf, 0xe8, 0x29, 0x55, 0x32, 0xf2, 0x1c, 0x72, 0x13, 0xce, 0x6c, 0x1e, 0x8a, 0xb8, 0xd4, 0x9f, + 0xdf, 0x5a, 0xea, 0x37, 0x03, 0x98, 0x27, 0xda, 0x85, 0x2e, 0x72, 0xe2, 0x90, 0xd4, 0x21, 0xef, + 0x78, 0x82, 0x0f, 0xa3, 0x90, 0x63, 0x81, 0xf3, 0x74, 0x3e, 0xc7, 0x43, 0xc5, 0x99, 0x72, 0x3f, + 0x92, 0x78, 0x2f, 0x64, 0x68, 0x32, 0xad, 0x7f, 0x0a, 0xa5, 0xb4, 0xbb, 0xdb, 0x6a, 0x50, 0x48, + 0xd7, 0x80, 0x42, 0xe9, 0xcc, 0x8d, 0xc6, 0x8e, 0x17, 0x2f, 0xbc, 0x05, 0x65, 0x21, 0x59, 0x28, + 0x2d, 0xe5, 0xdc, 0xf2, 0xf4, 0xbd, 0x9a, 0xa1, 0x45, 0x14, 0x9e, 0x3b, 0x53, 0xfe, 0xa5, 0x20, + 0x0d, 0x28, 0x72, 0xcf, 0x9e, 0x23, 0xd6, 0x11, 0x51, 0xe0, 0x9e, 0xad, 0xf5, 0xad, 0x7f, 0x18, + 0x50, 0xe8, 0xf2, 0x41, 0x34, 0x46, 0xf6, 0x5f, 0xc0, 0xae, 0x2f, 0xb9, 0x6b, 0xd9, 0x4a, 0x62, + 0x31, 0x19, 0xef, 0x8b, 0x88, 0xe9, 0xf9, 0xd9, 0xed, 0x44, 0x49, 0x5c, 0xe1, 0x3e, 0xe2, 0xec, + 0x20, 0xf1, 0x42, 0x77, 0x94, 0xef, 0x45, 0x99, 0xa8, 0xff, 0x42, 0xd7, 0x74, 0x51, 0xbc, 0xf2, + 0xb0, 0x5d, 0xb9, 0x31, 0xad, 0xbf, 0x6f, 0xc0, 0xce, 0xa9, 0x3f, 0x76, 0x86, 0xcc, 0x3d, 0xd3, + 0x29, 0xe9, 0x63, 0xf1, 0x37, 0x70, 0x2f, 0xfd, 0x3e, 0x55, 0x8f, 0xc0, 0x84, 0x33, 0x3f, 0x7d, + 0x1b, 0xbe, 0xa3, 0x37, 0x5a, 0xb1, 0x97, 0x8f, 0xdd, 0xcf, 0xa1, 0xa4, 0x6c, 0x2d, 0x5f, 0x73, + 0x21, 0xe6, 0xf8, 0xbb, 0xab, 0xe9, 0x18, 0x13, 0x86, 0x16, 0x83, 0x9b, 0x89, 0x7a, 0x1d, 0x84, + 0x5c, 0x44, 0xae, 0x9c, 0xbf, 0x3c, 0xb2, 0xb8, 0xb0, 0xb2, 0x96, 0x26, 0x4f, 0x8d, 0xa7, 0xb0, + 0x1b, 0xc3, 0x96, 0x6e, 0xcc, 0x0d, 0x6c, 0x78, 0x7c, 0xac, 0x51, 0x04, 0x2c, 0xde, 0x9b, 0x3b, + 0xda, 0xaa, 0x9f, 0xbe, 0x3d, 0xd5, 0xae, 0xcc, 0x89, 0x3a, 0x4f, 0x3d, 0x77, 0xc7, 0x5d, 0x59, + 0xe6, 0x3f, 0xad, 0x84, 0xcb, 0x27, 0xc2, 0xef, 0xa1, 0x8a, 0x0d, 0xc4, 0x63, 0x06, 0x59, 0x43, + 0x6c, 0x55, 0x7c, 0x59, 0x14, 0xf7, 0x3f, 0xfc, 0x1f, 0xd8, 0xd7, 0xb9, 0x3f, 0xbb, 0x6e, 0xae, + 0xa0, 0x3d, 0x25, 0x2a, 0xd0, 0xd2, 0x51, 0x40, 0xa1, 0x1c, 0x20, 0x43, 0x92, 0xb8, 0x77, 0x7d, + 0xaa, 0xa4, 0x79, 0x45, 0x4b, 0x41, 0x9a, 0x65, 0x3d, 0x00, 0x4d, 0x07, 0xbc, 0x10, 0xf5, 0xa3, + 0xf4, 0xe1, 0xdd, 0x89, 0x40, 0x0b, 0x76, 0x32, 0xfc, 0x22, 0x9b, 0x37, 0x2a, 0xeb, 0x5f, 0x64, + 0xf3, 0x9b, 0x95, 0x5c, 0xeb, 0x4f, 0x06, 0x54, 0x17, 0xfb, 0x56, 0x17, 0x91, 0x3c, 0x82, 0x4d, + 0xfd, 0xc5, 0x82, 0xcd, 0x5f, 0xdc, 0xdf, 0xc1, 0xb7, 0x7b, 0xfc, 0x31, 0x63, 0xf6, 0x71, 0x40, + 0x63, 0x08, 0xe9, 0x42, 0x16, 0xaf, 0x4f, 0xdd, 0xd8, 0x1f, 0xbc, 0xed, 0x45, 0x46, 0xd1, 0xba, + 0x73, 0xf8, 0xf2, 0x55, 0x63, 0xed, 0xdb, 0x57, 0x8d, 0xb5, 0xef, 0x5f, 0x35, 0x8c, 0x3f, 0xcc, + 0x1a, 0xc6, 0x5f, 0x67, 0x0d, 0xe3, 0x5f, 0xb3, 0x86, 0xf1, 0x72, 0xd6, 0x30, 0xbe, 0x9b, 0x35, + 0x8c, 0x7f, 0xcf, 0x1a, 0x6b, 0xdf, 0xcf, 0x1a, 0xc6, 0x5f, 0x5e, 0x37, 0xd6, 0x5e, 0xbe, 0x6e, + 0xac, 0x7d, 0xfb, 0xba, 0xb1, 0xf6, 0xbc, 0xbc, 0xe0, 0x7a, 0xb0, 0x89, 0xdf, 0x39, 0x1f, 0xfe, + 0x37, 0x00, 0x00, 0xff, 0xff, 0x01, 0xc0, 0xd4, 0xed, 0x38, 0x0e, 0x00, 0x00, } func (this *MetadataInfo) Equal(that interface{}) bool { diff --git a/src/carnot/planner/distributedpb/distributed_plan.proto b/src/carnot/planner/distributedpb/distributed_plan.proto index f9abf56c62b..b5a4e8d08a1 100644 --- a/src/carnot/planner/distributedpb/distributed_plan.proto +++ b/src/carnot/planner/distributedpb/distributed_plan.proto @@ -22,7 +22,7 @@ package px.carnot.planner.distributedpb; option go_package = "distributedpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "src/api/proto/uuidpb/uuid.proto"; import "src/carnot/planpb/plan.proto"; import "src/common/base/statuspb/status.proto"; diff --git a/src/carnot/planner/dynamic_tracing/ir/logicalpb/BUILD.bazel b/src/carnot/planner/dynamic_tracing/ir/logicalpb/BUILD.bazel index c3a717480f4..64b32834040 100644 --- a/src/carnot/planner/dynamic_tracing/ir/logicalpb/BUILD.bazel +++ b/src/carnot/planner/dynamic_tracing/ir/logicalpb/BUILD.bazel @@ -23,7 +23,7 @@ pl_proto_library( srcs = ["logical.proto"], deps = [ "//src/shared/k8s/metadatapb:metadata_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -32,7 +32,7 @@ pl_cc_proto_library( proto = ":logical_pl_proto", deps = [ "//src/shared/k8s/metadatapb:metadata_pl_cc_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/carnot/planner/dynamic_tracing/ir/logicalpb/logical.pb.go b/src/carnot/planner/dynamic_tracing/ir/logicalpb/logical.pb.go index 1486e3c5712..8d8dc6b9817 100755 --- a/src/carnot/planner/dynamic_tracing/ir/logicalpb/logical.pb.go +++ b/src/carnot/planner/dynamic_tracing/ir/logicalpb/logical.pb.go @@ -1114,80 +1114,79 @@ func init() { } var fileDescriptor_8cf202d4a324913e = []byte{ - // 1153 bytes of a gzipped FileDescriptorProto + // 1142 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4d, 0x8f, 0xdb, 0xc4, - 0x1b, 0xb7, 0x93, 0xec, 0x4b, 0x9e, 0xbc, 0x74, 0xff, 0xf3, 0xaf, 0xaa, 0x10, 0x81, 0x5b, 0xa2, - 0x22, 0xad, 0x10, 0x38, 0x62, 0x5b, 0xa1, 0xb6, 0xa2, 0x82, 0x0d, 0xbb, 0x25, 0x29, 0xdb, 0x24, - 0x9a, 0x0d, 0xab, 0x8a, 0x03, 0x66, 0x62, 0x4f, 0x52, 0x2f, 0x8e, 0x67, 0x34, 0x9e, 0x54, 0xcd, + 0x1b, 0xb7, 0x93, 0xec, 0x4b, 0x9e, 0xbc, 0x34, 0xff, 0xf9, 0x57, 0x55, 0x88, 0xc0, 0x2d, 0x51, + 0x91, 0x56, 0x08, 0x39, 0x62, 0x5b, 0xa1, 0xb6, 0xa2, 0x82, 0x0d, 0xbb, 0x25, 0x29, 0xdb, 0x24, + 0x9a, 0x0d, 0xab, 0x8a, 0x03, 0x66, 0x62, 0x4f, 0x82, 0x17, 0xaf, 0x67, 0x34, 0x9e, 0x54, 0xcd, 0xad, 0xe2, 0xca, 0xa5, 0x27, 0x3e, 0x03, 0x12, 0xdf, 0x03, 0x71, 0xec, 0xb1, 0xa7, 0x8a, 0xa6, - 0x17, 0x8e, 0xfd, 0x08, 0xc8, 0xe3, 0x71, 0xe2, 0x2c, 0x2b, 0x44, 0xb6, 0xdc, 0xe6, 0xf7, 0x78, - 0xe6, 0xf7, 0xbc, 0xfd, 0xe6, 0xc5, 0x70, 0x37, 0x12, 0x6e, 0xd3, 0x25, 0x22, 0x64, 0xb2, 0xc9, - 0x03, 0x12, 0x86, 0x54, 0x34, 0xbd, 0x59, 0x48, 0x26, 0xbe, 0xeb, 0x48, 0x41, 0x5c, 0x3f, 0x1c, - 0x37, 0x7d, 0xd1, 0x0c, 0xd8, 0xd8, 0x77, 0x49, 0xc0, 0x87, 0xe9, 0xc8, 0xe6, 0x82, 0x49, 0x86, - 0x3e, 0xe2, 0x4f, 0xec, 0x64, 0xb5, 0xad, 0x57, 0xdb, 0x67, 0x56, 0xdb, 0xbe, 0xb0, 0xf5, 0x9a, - 0xfa, 0xc7, 0x63, 0x5f, 0x3e, 0x9a, 0x0e, 0x6d, 0x97, 0x4d, 0x9a, 0x63, 0x36, 0x66, 0x4d, 0x45, - 0x32, 0x9c, 0x8e, 0x14, 0x52, 0x40, 0x8d, 0x12, 0xf2, 0xba, 0x35, 0x66, 0x6c, 0x1c, 0xd0, 0xe5, - 0x2c, 0x6f, 0x2a, 0x88, 0xf4, 0x59, 0x98, 0x7c, 0x6f, 0xd8, 0xb0, 0xbd, 0x2f, 0xc6, 0xd3, 0x09, - 0x0d, 0x25, 0xaa, 0x42, 0xce, 0xf7, 0x6a, 0xe6, 0x35, 0x73, 0xb7, 0x88, 0x73, 0xbe, 0x87, 0x10, - 0x14, 0xe8, 0x13, 0x2e, 0x6a, 0x39, 0x65, 0x51, 0xe3, 0xc6, 0x27, 0x50, 0xc2, 0x54, 0x4e, 0x45, - 0x78, 0x42, 0x82, 0x29, 0xfd, 0x57, 0x4b, 0x6e, 0xc2, 0x66, 0x6f, 0x2a, 0xf9, 0x54, 0xc6, 0x5f, - 0x43, 0x32, 0xa1, 0x7a, 0xbe, 0x1a, 0xa3, 0x2b, 0xb0, 0x39, 0xf2, 0x69, 0xe0, 0x45, 0xb5, 0xdc, - 0xb5, 0xfc, 0x6e, 0x11, 0x6b, 0xd4, 0x38, 0x81, 0x72, 0xb2, 0x6a, 0xdf, 0x8d, 0xc3, 0x45, 0x57, - 0xa1, 0xc4, 0x14, 0x76, 0x32, 0x14, 0x90, 0x98, 0xba, 0x31, 0xd1, 0x07, 0x50, 0x7d, 0x4c, 0x84, - 0x4f, 0x86, 0x01, 0x55, 0x53, 0x52, 0xc2, 0x4a, 0x6a, 0x8d, 0x67, 0x45, 0x8d, 0xeb, 0x00, 0x03, - 0x41, 0x5c, 0xca, 0x99, 0x1f, 0xca, 0xd8, 0x7b, 0x34, 0x9b, 0x0c, 0x59, 0xa0, 0x09, 0x35, 0x6a, - 0xbc, 0x0f, 0x97, 0xee, 0x4d, 0x43, 0xe5, 0xf9, 0x88, 0x48, 0x1a, 0xba, 0xb3, 0xb3, 0xa9, 0x36, - 0x9e, 0x16, 0x60, 0xa3, 0x2f, 0xd8, 0x90, 0x9e, 0x9b, 0xd6, 0x43, 0x00, 0xb9, 0x70, 0xa3, 0xca, - 0x51, 0xda, 0xbb, 0x65, 0xaf, 0xd3, 0x69, 0x7b, 0x19, 0x26, 0xce, 0x70, 0xa1, 0xfb, 0x50, 0x20, - 0x62, 0x1c, 0xd5, 0xf2, 0xd7, 0xf2, 0xbb, 0xa5, 0xbd, 0x4f, 0xd7, 0xe3, 0x4c, 0x7b, 0x8d, 0x15, - 0x07, 0x1a, 0xc0, 0xb6, 0xa0, 0xd2, 0x79, 0x4c, 0x82, 0xa8, 0x56, 0x50, 0x7c, 0xb7, 0xd7, 0xe3, - 0xcb, 0x68, 0x01, 0x6f, 0x09, 0x2a, 0x4f, 0x48, 0x10, 0xa1, 0x53, 0xd8, 0x19, 0xe9, 0xe2, 0x39, - 0x41, 0x52, 0xbd, 0xda, 0x86, 0xaa, 0xc0, 0xdd, 0xf5, 0xd8, 0xcf, 0xb4, 0xa0, 0x6d, 0xe0, 0x4b, - 0xa3, 0x33, 0x5d, 0x21, 0x50, 0xd5, 0xb2, 0x20, 0xca, 0x1e, 0xd5, 0x36, 0x55, 0x1e, 0x77, 0xd6, - 0xf3, 0x94, 0x95, 0x1a, 0xae, 0xb0, 0x0c, 0x8a, 0x5a, 0x35, 0xb8, 0x72, 0x36, 0x1d, 0x87, 0x85, - 0x94, 0x8d, 0x1a, 0xbf, 0x9a, 0x50, 0x5d, 0x76, 0xe9, 0x98, 0x53, 0x17, 0x75, 0x61, 0x2b, 0x59, - 0x1d, 0xd5, 0x4c, 0x15, 0xc8, 0xcd, 0x8b, 0x04, 0x82, 0x53, 0x12, 0xd4, 0x81, 0x0d, 0x1e, 0x8b, - 0x4c, 0x4b, 0xe8, 0xc6, 0x7a, 0x6c, 0x4a, 0x9f, 0x38, 0x61, 0x68, 0x5c, 0x87, 0xed, 0x56, 0xff, - 0x9e, 0x8a, 0x17, 0xd5, 0x60, 0x8b, 0x0b, 0x36, 0x16, 0x64, 0xa2, 0x55, 0x9b, 0xc2, 0xc6, 0x3e, - 0x14, 0xbe, 0xe9, 0x77, 0x0e, 0x62, 0x51, 0x93, 0x48, 0x0b, 0xbe, 0x82, 0xd5, 0x18, 0xed, 0x40, - 0x9e, 0xfb, 0x9e, 0x0a, 0xa5, 0x82, 0xe3, 0x21, 0xfa, 0x3f, 0x6c, 0xc8, 0xc8, 0x09, 0x63, 0x35, - 0x9a, 0xbb, 0x05, 0x5c, 0x90, 0x51, 0x37, 0x6a, 0xfc, 0xbc, 0x05, 0xd5, 0x03, 0xca, 0x03, 0x36, - 0x8b, 0xa5, 0xa6, 0xca, 0xd2, 0x86, 0xc2, 0x94, 0x6b, 0xb6, 0xd2, 0xde, 0xde, 0x7a, 0x59, 0xc4, - 0xf1, 0xb4, 0x0d, 0xac, 0x18, 0x10, 0x87, 0x4a, 0xf4, 0x88, 0x08, 0xea, 0x39, 0x6c, 0x78, 0x4a, - 0xdd, 0x74, 0x6f, 0x75, 0xd6, 0xa3, 0x5c, 0x0d, 0xcf, 0x3e, 0x56, 0x8c, 0x3d, 0x45, 0xd8, 0x36, - 0x70, 0x39, 0xca, 0x60, 0x74, 0x0a, 0x25, 0xce, 0x3c, 0x87, 0x0b, 0xe6, 0xd2, 0x28, 0xc9, 0xb4, - 0xb4, 0xf7, 0xd5, 0x5b, 0xf9, 0xeb, 0x33, 0xaf, 0x9f, 0xd0, 0xb5, 0x0d, 0x0c, 0x7c, 0x81, 0x50, - 0x04, 0xd5, 0x80, 0x0c, 0x69, 0xe0, 0x44, 0x34, 0xa0, 0xae, 0x64, 0xa2, 0x56, 0x50, 0xee, 0xee, - 0xbf, 0x95, 0xbb, 0xa3, 0x98, 0xf2, 0x58, 0x33, 0xb6, 0x0d, 0x5c, 0x09, 0xb2, 0x86, 0xfa, 0x29, - 0x94, 0xb3, 0x05, 0x38, 0xf7, 0x3c, 0xbb, 0xa7, 0x1b, 0x98, 0xbb, 0x68, 0x03, 0x93, 0xf6, 0xd5, - 0x1f, 0x02, 0x2c, 0x93, 0x8f, 0x3d, 0x71, 0xe6, 0x25, 0x5b, 0xa5, 0x88, 0xd5, 0x18, 0xbd, 0x0b, - 0x45, 0x97, 0x85, 0x92, 0xf8, 0x21, 0x4d, 0xef, 0x91, 0xa5, 0x41, 0x0b, 0x77, 0xd1, 0x88, 0x44, - 0xb8, 0x31, 0xac, 0x3f, 0xcb, 0x41, 0x65, 0x25, 0x51, 0x14, 0xc2, 0xa6, 0x4a, 0x34, 0xdd, 0x8a, - 0x27, 0xff, 0x5d, 0x11, 0x13, 0x14, 0x1d, 0x86, 0x52, 0xcc, 0xb0, 0xf6, 0x12, 0x47, 0xae, 0x2e, - 0x1e, 0x4e, 0x5c, 0x9a, 0x46, 0xbe, 0x30, 0xac, 0xe6, 0x95, 0xff, 0x87, 0xbc, 0x0a, 0xab, 0x79, - 0xdd, 0x86, 0x52, 0xc6, 0x59, 0xbc, 0x07, 0x7f, 0xa0, 0x33, 0xdd, 0x9b, 0x78, 0x88, 0x2e, 0xc3, - 0xc6, 0xe3, 0xf8, 0x00, 0xd6, 0x2e, 0x13, 0x70, 0x27, 0x77, 0xcb, 0x6c, 0x55, 0xa1, 0x2c, 0x89, - 0x18, 0x53, 0xa9, 0xcf, 0xab, 0x9f, 0x4c, 0x40, 0x99, 0xf3, 0x2a, 0xad, 0x93, 0x03, 0x95, 0x54, - 0x6e, 0x8e, 0x9c, 0xf1, 0xa4, 0xf1, 0xd5, 0x75, 0x8f, 0xd0, 0x94, 0x6e, 0x30, 0xe3, 0x14, 0x97, - 0xa3, 0x0c, 0x3a, 0x3f, 0xc2, 0xc6, 0x8f, 0x1b, 0x70, 0x79, 0x19, 0xcd, 0xb2, 0xda, 0xe7, 0xea, - 0xef, 0x26, 0xe4, 0xa5, 0x0c, 0xb4, 0xfc, 0xde, 0xb1, 0x93, 0x57, 0x8d, 0x9d, 0xbe, 0x6a, 0xec, - 0x03, 0xfd, 0xaa, 0x69, 0x6d, 0xcd, 0x5f, 0x5e, 0xcd, 0x0f, 0x06, 0x47, 0x38, 0x9e, 0x8e, 0x28, - 0x5c, 0xf2, 0x16, 0xbc, 0x4e, 0xc4, 0xa9, 0xab, 0xb7, 0xef, 0x67, 0x6f, 0x23, 0x05, 0x5c, 0xf5, - 0x56, 0x4f, 0x37, 0x0e, 0xdb, 0xfa, 0xf8, 0x4c, 0xaf, 0xd1, 0xc1, 0x45, 0xaf, 0xfa, 0xa5, 0xa7, - 0x8c, 0xb1, 0x9f, 0x90, 0xe3, 0x85, 0x97, 0xfa, 0x6f, 0x39, 0xf8, 0xdf, 0xdf, 0xbe, 0xa3, 0xf7, - 0x00, 0xe4, 0xe2, 0xfd, 0xa3, 0xcb, 0x57, 0x94, 0xe9, 0xdb, 0x07, 0xf5, 0xa1, 0xa0, 0x4a, 0x90, - 0xbb, 0x48, 0x09, 0x56, 0xef, 0x39, 0xac, 0x98, 0xd0, 0xf7, 0xb0, 0x3d, 0xe4, 0x23, 0xf5, 0x38, - 0xd1, 0x85, 0x5d, 0xf3, 0x3d, 0x92, 0x5e, 0x48, 0xad, 0xf2, 0xfc, 0xe5, 0xd5, 0xc5, 0xf5, 0x84, - 0x17, 0xac, 0xe8, 0x3b, 0x28, 0xa6, 0x52, 0x4a, 0x6b, 0xfb, 0xc5, 0x85, 0x03, 0xd7, 0x44, 0x78, - 0x49, 0xf9, 0x61, 0x0f, 0xca, 0x59, 0xe1, 0xa2, 0x1d, 0x28, 0x77, 0x7b, 0xce, 0x97, 0xbd, 0xee, - 0x41, 0x67, 0xd0, 0xe9, 0x75, 0x77, 0x0c, 0x54, 0x05, 0x78, 0xb0, 0xff, 0xd0, 0xf9, 0xfa, 0x10, - 0x77, 0x0f, 0x8f, 0x76, 0x4c, 0x85, 0x3b, 0xdd, 0x14, 0xe7, 0x50, 0x05, 0x8a, 0xed, 0xde, 0xf1, - 0xc0, 0xe9, 0xee, 0x3f, 0x38, 0xdc, 0xc9, 0xb7, 0x3e, 0x7f, 0xfe, 0xca, 0x32, 0x5e, 0xbc, 0xb2, - 0x8c, 0x37, 0xaf, 0x2c, 0xf3, 0xe9, 0xdc, 0x32, 0x7f, 0x99, 0x5b, 0xe6, 0xef, 0x73, 0xcb, 0x7c, - 0x3e, 0xb7, 0xcc, 0x3f, 0xe6, 0x96, 0xf9, 0xe7, 0xdc, 0x32, 0xde, 0xcc, 0x2d, 0xf3, 0xd9, 0x6b, - 0xcb, 0x78, 0xfe, 0xda, 0x32, 0x5e, 0xbc, 0xb6, 0x8c, 0x6f, 0x8b, 0x8b, 0x9f, 0x83, 0xe1, 0xa6, - 0x12, 0xf5, 0x8d, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x57, 0x7f, 0xe3, 0x0f, 0x56, 0x0c, 0x00, - 0x00, + 0x17, 0x8e, 0xfd, 0x08, 0xc8, 0xe3, 0x71, 0xe2, 0x2c, 0x2b, 0x44, 0x76, 0xb9, 0x3d, 0xcf, 0xe3, + 0x79, 0x7e, 0xcf, 0xdb, 0x6f, 0x5e, 0x0c, 0xf7, 0x23, 0xe1, 0xb6, 0x5c, 0x22, 0x42, 0x26, 0x5b, + 0x3c, 0x20, 0x61, 0x48, 0x45, 0xcb, 0x9b, 0x85, 0xe4, 0xd4, 0x77, 0x1d, 0x29, 0x88, 0xeb, 0x87, + 0x93, 0x96, 0x2f, 0x5a, 0x01, 0x9b, 0xf8, 0x2e, 0x09, 0xf8, 0x28, 0x95, 0x6c, 0x2e, 0x98, 0x64, + 0xe8, 0x23, 0xfe, 0xd4, 0x4e, 0xbc, 0x6d, 0xed, 0x6d, 0x9f, 0xf1, 0xb6, 0x7d, 0x61, 0x6b, 0x9f, + 0xc6, 0xd5, 0x09, 0x9b, 0x30, 0xe5, 0xd8, 0x8a, 0xa5, 0x04, 0xa3, 0x61, 0x4d, 0x18, 0x9b, 0x04, + 0xb4, 0xa5, 0xb4, 0xd1, 0x74, 0xdc, 0xf2, 0xa6, 0x82, 0x48, 0x9f, 0x85, 0xc9, 0xf7, 0xa6, 0x0d, + 0xdb, 0x7b, 0x62, 0x32, 0x3d, 0xa5, 0xa1, 0x44, 0x55, 0xc8, 0xf9, 0x5e, 0xdd, 0xbc, 0x61, 0xee, + 0x14, 0x71, 0xce, 0xf7, 0x10, 0x82, 0x02, 0x7d, 0xca, 0x45, 0x3d, 0xa7, 0x2c, 0x4a, 0x6e, 0x7e, + 0x0c, 0x25, 0x4c, 0xe5, 0x54, 0x84, 0xc7, 0x24, 0x98, 0xd2, 0x7f, 0xe5, 0x72, 0x1b, 0x36, 0xfb, + 0x53, 0xc9, 0xa7, 0x32, 0xfe, 0x1a, 0x92, 0x53, 0xaa, 0xd7, 0x2b, 0x19, 0x5d, 0x83, 0xcd, 0xb1, + 0x4f, 0x03, 0x2f, 0xaa, 0xe7, 0x6e, 0xe4, 0x77, 0x8a, 0x58, 0x6b, 0xcd, 0x63, 0x28, 0x27, 0x5e, + 0x7b, 0x6e, 0x9c, 0x2e, 0xba, 0x0e, 0x25, 0xa6, 0x74, 0x27, 0x03, 0x01, 0x89, 0xa9, 0x17, 0x03, + 0x7d, 0x00, 0xd5, 0x27, 0x44, 0xf8, 0x64, 0x14, 0x50, 0xb5, 0x24, 0x05, 0xac, 0xa4, 0xd6, 0x78, + 0x55, 0xd4, 0xbc, 0x09, 0x30, 0x14, 0xc4, 0xa5, 0x9c, 0xf9, 0xa1, 0x8c, 0xa3, 0x47, 0xb3, 0xd3, + 0x11, 0x0b, 0x34, 0xa0, 0xd6, 0x9a, 0xef, 0xc3, 0x95, 0x07, 0xd3, 0x50, 0x45, 0x3e, 0x24, 0x92, + 0x86, 0xee, 0xec, 0x6c, 0xa9, 0xcd, 0x67, 0x05, 0xd8, 0x18, 0x08, 0x36, 0xa2, 0xe7, 0x96, 0xf5, + 0x18, 0x40, 0x2e, 0xc2, 0xa8, 0x76, 0x94, 0x76, 0xef, 0xd8, 0xeb, 0x0c, 0xd4, 0x5e, 0xa6, 0x89, + 0x33, 0x58, 0xe8, 0x21, 0x14, 0x88, 0x98, 0x44, 0xf5, 0xfc, 0x8d, 0xfc, 0x4e, 0x69, 0xf7, 0x93, + 0xf5, 0x30, 0xd3, 0x59, 0x63, 0x85, 0x81, 0x86, 0xb0, 0x2d, 0xa8, 0x74, 0x9e, 0x90, 0x20, 0xaa, + 0x17, 0x14, 0xde, 0xdd, 0xf5, 0xf0, 0x32, 0x5c, 0xc0, 0x5b, 0x82, 0xca, 0x63, 0x12, 0x44, 0xe8, + 0x04, 0x6a, 0x63, 0xdd, 0x3c, 0x27, 0x48, 0xba, 0x57, 0xdf, 0x50, 0x1d, 0xb8, 0xbf, 0x1e, 0xfa, + 0x99, 0x11, 0x74, 0x0c, 0x7c, 0x65, 0x7c, 0x66, 0x2a, 0x04, 0xaa, 0x9a, 0x16, 0x44, 0xd9, 0xa3, + 0xfa, 0xa6, 0xaa, 0xe3, 0xde, 0x7a, 0x91, 0xb2, 0x54, 0xc3, 0x15, 0x96, 0xd1, 0xa2, 0x76, 0x1d, + 0xae, 0x9d, 0x2d, 0xc7, 0x61, 0x21, 0x65, 0xe3, 0xe6, 0xaf, 0x26, 0x54, 0x97, 0x53, 0x3a, 0xe2, + 0xd4, 0x45, 0x3d, 0xd8, 0x4a, 0xbc, 0xa3, 0xba, 0xa9, 0x12, 0xb9, 0x7d, 0x91, 0x44, 0x70, 0x0a, + 0x82, 0xba, 0xb0, 0xc1, 0x63, 0x92, 0x69, 0x0a, 0xdd, 0x5a, 0x0f, 0x4d, 0xf1, 0x13, 0x27, 0x08, + 0xcd, 0x9b, 0xb0, 0xdd, 0x1e, 0x3c, 0x50, 0xf9, 0xa2, 0x3a, 0x6c, 0x71, 0xc1, 0x26, 0x82, 0x9c, + 0x6a, 0xd6, 0xa6, 0x6a, 0x73, 0x0f, 0x0a, 0x5f, 0x0f, 0xba, 0xfb, 0x31, 0xa9, 0x49, 0xa4, 0x09, + 0x5f, 0xc1, 0x4a, 0x46, 0x35, 0xc8, 0x73, 0xdf, 0x53, 0xa9, 0x54, 0x70, 0x2c, 0xa2, 0xff, 0xc3, + 0x86, 0x8c, 0x9c, 0x30, 0x66, 0xa3, 0xb9, 0x53, 0xc0, 0x05, 0x19, 0xf5, 0xa2, 0xe6, 0xcf, 0x5b, + 0x50, 0xdd, 0xa7, 0x3c, 0x60, 0xb3, 0x98, 0x6a, 0xaa, 0x2d, 0x1d, 0x28, 0x4c, 0xb9, 0x46, 0x2b, + 0xed, 0xee, 0xae, 0x57, 0x45, 0x9c, 0x4f, 0xc7, 0xc0, 0x0a, 0x01, 0x71, 0xa8, 0x44, 0xdf, 0x13, + 0x41, 0x3d, 0x87, 0x8d, 0x4e, 0xa8, 0x9b, 0xee, 0xad, 0xee, 0x7a, 0x90, 0xab, 0xe9, 0xd9, 0x47, + 0x0a, 0xb1, 0xaf, 0x00, 0x3b, 0x06, 0x2e, 0x47, 0x19, 0x1d, 0x9d, 0x40, 0x89, 0x33, 0xcf, 0xe1, + 0x82, 0xb9, 0x34, 0x4a, 0x2a, 0x2d, 0xed, 0x7e, 0x79, 0xa9, 0x78, 0x03, 0xe6, 0x0d, 0x12, 0xb8, + 0x8e, 0x81, 0x81, 0x2f, 0x34, 0x14, 0x41, 0x35, 0x20, 0x23, 0x1a, 0x38, 0x11, 0x0d, 0xa8, 0x2b, + 0x99, 0xa8, 0x17, 0x54, 0xb8, 0x87, 0x97, 0x0a, 0x77, 0x18, 0x43, 0x1e, 0x69, 0xc4, 0x8e, 0x81, + 0x2b, 0x41, 0xd6, 0xd0, 0x38, 0x81, 0x72, 0xb6, 0x01, 0xe7, 0x9e, 0x67, 0x0f, 0xf4, 0x00, 0x73, + 0x17, 0x1d, 0x60, 0x32, 0xbe, 0xc6, 0x63, 0x80, 0x65, 0xf1, 0x71, 0x24, 0xce, 0xbc, 0x64, 0xab, + 0x14, 0xb1, 0x92, 0xd1, 0xbb, 0x50, 0x74, 0x59, 0x28, 0x89, 0x1f, 0xd2, 0xf4, 0x1e, 0x59, 0x1a, + 0x34, 0x71, 0x17, 0x83, 0x48, 0x88, 0x1b, 0xab, 0x8d, 0xe7, 0x39, 0xa8, 0xac, 0x14, 0x8a, 0x42, + 0xd8, 0x54, 0x85, 0xa6, 0x5b, 0xf1, 0xf8, 0xbf, 0x6b, 0x62, 0xa2, 0x45, 0x07, 0xa1, 0x14, 0x33, + 0xac, 0xa3, 0xc4, 0x99, 0xab, 0x8b, 0x87, 0x13, 0x97, 0xa6, 0x99, 0x2f, 0x0c, 0xab, 0x75, 0xe5, + 0xff, 0xa1, 0xae, 0xc2, 0x6a, 0x5d, 0x77, 0xa1, 0x94, 0x09, 0x16, 0xef, 0xc1, 0x1f, 0xe8, 0x4c, + 0xcf, 0x26, 0x16, 0xd1, 0x55, 0xd8, 0x78, 0x12, 0x1f, 0xc0, 0x3a, 0x64, 0xa2, 0xdc, 0xcb, 0xdd, + 0x31, 0xdb, 0x55, 0x28, 0x4b, 0x22, 0x26, 0x54, 0xea, 0xf3, 0xea, 0x27, 0x13, 0x50, 0xe6, 0xbc, + 0x4a, 0xfb, 0xe4, 0x40, 0x25, 0xa5, 0x9b, 0x23, 0x67, 0x3c, 0x19, 0x7c, 0x75, 0xdd, 0x23, 0x34, + 0x85, 0x1b, 0xce, 0x38, 0xc5, 0xe5, 0x28, 0xa3, 0x9d, 0x9f, 0x61, 0xf3, 0xc7, 0x0d, 0xb8, 0xba, + 0xcc, 0x66, 0xd9, 0xed, 0x73, 0xf9, 0x77, 0x1b, 0xf2, 0x52, 0x06, 0x9a, 0x7e, 0xef, 0xd8, 0xc9, + 0xab, 0xc6, 0x4e, 0x5f, 0x35, 0xf6, 0xbe, 0x7e, 0xd5, 0xb4, 0xb7, 0xe6, 0xaf, 0xae, 0xe7, 0x87, + 0xc3, 0x43, 0x1c, 0x2f, 0x47, 0x14, 0xae, 0x78, 0x0b, 0x5c, 0x27, 0xe2, 0xd4, 0xd5, 0xdb, 0xf7, + 0xd3, 0xcb, 0x50, 0x01, 0x57, 0xbd, 0xd5, 0xd3, 0x8d, 0xc3, 0xb6, 0x3e, 0x3e, 0xd3, 0x6b, 0x74, + 0x78, 0xd1, 0xab, 0x7e, 0x19, 0x29, 0x63, 0x1c, 0x24, 0xe0, 0x78, 0x11, 0xa5, 0xf1, 0x5b, 0x0e, + 0xfe, 0xf7, 0xb7, 0xef, 0xe8, 0x3d, 0x00, 0xb9, 0x78, 0xff, 0xe8, 0xf6, 0x15, 0x65, 0xfa, 0xf6, + 0x41, 0x03, 0x28, 0xa8, 0x16, 0xe4, 0x2e, 0xd2, 0x82, 0xd5, 0x7b, 0x0e, 0x2b, 0x24, 0xf4, 0x1d, + 0x6c, 0x8f, 0xf8, 0x58, 0x3d, 0x4e, 0x74, 0x63, 0xd7, 0x7c, 0x8f, 0xa4, 0x17, 0x52, 0xbb, 0x3c, + 0x7f, 0x75, 0x7d, 0x71, 0x3d, 0xe1, 0x05, 0x2a, 0xfa, 0x16, 0x8a, 0x29, 0x95, 0xd2, 0xde, 0x7e, + 0x7e, 0xe1, 0xc4, 0x35, 0x10, 0x5e, 0x42, 0x7e, 0xd8, 0x87, 0x72, 0x96, 0xb8, 0xa8, 0x06, 0xe5, + 0x5e, 0xdf, 0xf9, 0xa2, 0xdf, 0xdb, 0xef, 0x0e, 0xbb, 0xfd, 0x5e, 0xcd, 0x40, 0x55, 0x80, 0x47, + 0x7b, 0x8f, 0x9d, 0xaf, 0x0e, 0x70, 0xef, 0xe0, 0xb0, 0x66, 0x2a, 0xbd, 0xdb, 0x4b, 0xf5, 0x1c, + 0xaa, 0x40, 0xb1, 0xd3, 0x3f, 0x1a, 0x3a, 0xbd, 0xbd, 0x47, 0x07, 0xb5, 0x7c, 0xfb, 0xb3, 0x17, + 0xaf, 0x2d, 0xe3, 0xe5, 0x6b, 0xcb, 0x78, 0xfb, 0xda, 0x32, 0x9f, 0xcd, 0x2d, 0xf3, 0x97, 0xb9, + 0x65, 0xfe, 0x3e, 0xb7, 0xcc, 0x17, 0x73, 0xcb, 0xfc, 0x63, 0x6e, 0x99, 0x7f, 0xce, 0x2d, 0xe3, + 0xed, 0xdc, 0x32, 0x9f, 0xbf, 0xb1, 0x8c, 0x17, 0x6f, 0x2c, 0xe3, 0xe5, 0x1b, 0xcb, 0xf8, 0xa6, + 0xb8, 0xf8, 0x07, 0x18, 0x6d, 0x2a, 0x52, 0xdf, 0xfa, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x90, 0x3c, + 0x57, 0x7a, 0x3d, 0x0c, 0x00, 0x00, } func (x SelectorType) String() string { diff --git a/src/carnot/planner/dynamic_tracing/ir/logicalpb/logical.proto b/src/carnot/planner/dynamic_tracing/ir/logicalpb/logical.proto index d3def335d09..e59e03b8dab 100644 --- a/src/carnot/planner/dynamic_tracing/ir/logicalpb/logical.proto +++ b/src/carnot/planner/dynamic_tracing/ir/logicalpb/logical.proto @@ -22,7 +22,7 @@ package px.carnot.planner.dynamic_tracing.ir.logical; option go_package = "logicalpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; message Argument { diff --git a/src/carnot/planner/plannerpb/BUILD.bazel b/src/carnot/planner/plannerpb/BUILD.bazel index e2893a0bd23..4b73065c498 100644 --- a/src/carnot/planner/plannerpb/BUILD.bazel +++ b/src/carnot/planner/plannerpb/BUILD.bazel @@ -32,7 +32,7 @@ pl_proto_library( "//src/common/base/statuspb:status_pl_proto", "//src/shared/types/typespb:types_pl_proto", "//src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/logicalpb:logical_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -45,7 +45,7 @@ pl_cc_proto_library( "//src/carnot/planpb:plan_pl_cc_proto", "//src/common/base/statuspb:status_pl_cc_proto", "//src/shared/types/typespb/wrapper:cc_library", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/carnot/planner/plannerpb/service.pb.go b/src/carnot/planner/plannerpb/service.pb.go index 6366da83569..172eeb1cd81 100755 --- a/src/carnot/planner/plannerpb/service.pb.go +++ b/src/carnot/planner/plannerpb/service.pb.go @@ -873,78 +873,77 @@ func init() { } var fileDescriptor_710b3465b5cdfdeb = []byte{ - // 1122 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0x51, 0x6f, 0x1b, 0x45, - 0x10, 0xf6, 0xd9, 0x69, 0x63, 0x8f, 0x9d, 0x92, 0x6e, 0x0b, 0xb8, 0xae, 0xb8, 0x44, 0xa7, 0x82, - 0x42, 0xa0, 0x67, 0x48, 0x03, 0x41, 0x95, 0x00, 0xe1, 0x26, 0x10, 0xaa, 0x52, 0xc2, 0x25, 0xed, - 0x43, 0x55, 0x71, 0x3a, 0x9f, 0x27, 0xce, 0x89, 0xbb, 0xbd, 0xeb, 0xee, 0x5e, 0xe5, 0xf0, 0x42, - 0x8b, 0xc4, 0x3b, 0x12, 0x7f, 0x01, 0x21, 0x10, 0xbf, 0x81, 0x77, 0x1e, 0xf3, 0xd8, 0xa7, 0x88, - 0x38, 0x12, 0xe2, 0xb1, 0x3f, 0x01, 0xed, 0xee, 0x5d, 0xe2, 0x24, 0x6e, 0xe2, 0x44, 0x3c, 0xf2, - 0x74, 0x3b, 0xb3, 0x33, 0xdf, 0xcc, 0x7e, 0x33, 0xb3, 0x7b, 0x30, 0xcb, 0x99, 0xdf, 0xf4, 0x3d, - 0x46, 0x63, 0xd1, 0x4c, 0x42, 0x8f, 0x52, 0x64, 0xf9, 0x37, 0x69, 0x37, 0x39, 0xb2, 0xc7, 0x81, - 0x8f, 0x76, 0xc2, 0x62, 0x11, 0x93, 0xab, 0x49, 0xcf, 0xd6, 0xa6, 0x76, 0x66, 0x62, 0xef, 0x99, - 0x36, 0x3e, 0x1c, 0x02, 0xd4, 0xd9, 0xa4, 0x5e, 0x14, 0xf8, 0xae, 0x60, 0x9e, 0x1f, 0xd0, 0x6e, - 0x33, 0x60, 0xcd, 0x30, 0xee, 0x06, 0xbe, 0x17, 0x26, 0xed, 0x7c, 0xa5, 0xb1, 0x1b, 0xaf, 0x2b, - 0xf7, 0x38, 0x8a, 0x62, 0xda, 0x6c, 0x7b, 0x1c, 0x9b, 0x5c, 0x78, 0x22, 0xe5, 0x32, 0x07, 0xb5, - 0xc8, 0xcc, 0xae, 0x77, 0x03, 0xb1, 0x91, 0xb6, 0x6d, 0x3f, 0x8e, 0x9a, 0xdd, 0xb8, 0x1b, 0x37, - 0x95, 0xba, 0x9d, 0xae, 0x2b, 0x49, 0x09, 0x6a, 0x95, 0x99, 0x2f, 0x0c, 0x4b, 0x2a, 0xe0, 0x82, - 0x05, 0xed, 0x54, 0x60, 0x27, 0x69, 0x0f, 0x4a, 0xae, 0xb4, 0xd0, 0x8e, 0xd6, 0xdf, 0x06, 0x4c, - 0x7c, 0x9a, 0x52, 0x7f, 0x2d, 0x5e, 0xea, 0xa1, 0x9f, 0x0a, 0x24, 0x57, 0xa1, 0xb2, 0x9e, 0x52, - 0xdf, 0xa5, 0x5e, 0x84, 0x75, 0x63, 0xda, 0x98, 0xa9, 0x38, 0x65, 0xa9, 0xb8, 0xeb, 0x45, 0x48, - 0x1c, 0x00, 0x8f, 0x75, 0xdd, 0xc7, 0x5e, 0x98, 0x22, 0xaf, 0x17, 0xa7, 0x4b, 0x33, 0xd5, 0xb9, - 0x1b, 0xf6, 0x31, 0x74, 0xd9, 0x07, 0xc0, 0xed, 0x4f, 0x58, 0xf7, 0xbe, 0xf4, 0x75, 0x2a, 0x5e, - 0xb6, 0xe2, 0xc4, 0x86, 0x4b, 0x71, 0x2a, 0x92, 0x54, 0xb8, 0xc2, 0x6b, 0x87, 0xe8, 0x26, 0x0c, - 0xd7, 0x83, 0x5e, 0xbd, 0xa4, 0x42, 0x5f, 0xd4, 0x5b, 0x6b, 0x72, 0x67, 0x45, 0x6d, 0x34, 0xe6, - 0xa1, 0x9c, 0xc3, 0x10, 0x02, 0x63, 0x03, 0x79, 0xaa, 0x35, 0xb9, 0x0c, 0xe7, 0x54, 0x7e, 0xf5, - 0xa2, 0x52, 0x6a, 0xc1, 0xfa, 0x63, 0x0c, 0xc6, 0x6f, 0xc5, 0x74, 0x3d, 0xe8, 0x72, 0xf2, 0xd4, - 0x80, 0xcb, 0xb1, 0xc0, 0xd0, 0x45, 0xda, 0x49, 0xe2, 0x80, 0x0a, 0xd7, 0x57, 0x3b, 0x0a, 0xa6, - 0x3a, 0xb7, 0x70, 0xec, 0x81, 0x32, 0x10, 0xfb, 0xcb, 0x35, 0x0c, 0x97, 0x32, 0x7f, 0xad, 0x6b, - 0xbd, 0xd2, 0xdf, 0x9e, 0x22, 0x47, 0xf5, 0x0e, 0x91, 0xc1, 0x0e, 0xea, 0xc8, 0x7d, 0x98, 0x48, - 0xc2, 0xb4, 0x1b, 0xd0, 0x3c, 0x76, 0x51, 0xc5, 0x7e, 0x77, 0xa4, 0xd8, 0x2b, 0xca, 0x33, 0x43, - 0xaf, 0x25, 0x03, 0x52, 0xe3, 0x69, 0x11, 0x86, 0xa4, 0x40, 0xae, 0x40, 0x29, 0x65, 0xa1, 0xe6, - 0xa9, 0x35, 0xde, 0xdf, 0x9e, 0x2a, 0xdd, 0x73, 0xee, 0x38, 0x52, 0x47, 0xbe, 0x86, 0xf1, 0x0d, - 0xf4, 0x3a, 0xc8, 0xf2, 0x82, 0x2e, 0x9e, 0xf1, 0xfc, 0xf6, 0xb2, 0x86, 0x59, 0xa2, 0x82, 0x6d, - 0x3a, 0x39, 0x28, 0x69, 0x40, 0x39, 0xa0, 0x1c, 0xfd, 0x94, 0xa1, 0x2a, 0x6a, 0xd9, 0xd9, 0x93, - 0x49, 0x1d, 0xc6, 0x45, 0x10, 0x61, 0x9c, 0x8a, 0xfa, 0xd8, 0xb4, 0x31, 0x53, 0x72, 0x72, 0xb1, - 0x71, 0x13, 0x6a, 0x83, 0x70, 0x64, 0x12, 0x4a, 0xdf, 0xe0, 0x66, 0x56, 0x68, 0xb9, 0x1c, 0x5e, - 0xe7, 0x9b, 0xc5, 0x0f, 0x8c, 0x86, 0x03, 0xb5, 0x41, 0x86, 0x88, 0x05, 0x13, 0x5c, 0x78, 0x4c, - 0xb8, 0x12, 0xdc, 0xa5, 0x5c, 0xa1, 0x94, 0x9c, 0xaa, 0x52, 0xae, 0x05, 0x11, 0xde, 0xe5, 0xc4, - 0x84, 0x2a, 0xd2, 0xce, 0x9e, 0x45, 0x51, 0x59, 0x54, 0x90, 0x76, 0xf4, 0xbe, 0xf5, 0x4b, 0x11, - 0x6a, 0x5f, 0xa5, 0xc8, 0x36, 0x1d, 0x7c, 0x94, 0x22, 0x17, 0x64, 0x03, 0x5e, 0xce, 0x26, 0xdb, - 0xcd, 0xc8, 0x71, 0xe5, 0x04, 0x63, 0xfd, 0x9c, 0x2a, 0xe4, 0xfc, 0x10, 0x12, 0x0f, 0x4c, 0xa4, - 0x7d, 0x47, 0x7b, 0xaf, 0xe8, 0xcd, 0x55, 0xe9, 0xeb, 0x5c, 0x0a, 0x8f, 0x2a, 0xe5, 0x44, 0x3e, - 0x92, 0x91, 0x5d, 0x2e, 0x58, 0x3e, 0x91, 0x4a, 0xb1, 0x2a, 0x18, 0xf9, 0x1c, 0x00, 0x7b, 0xe8, - 0xbb, 0x72, 0x44, 0x79, 0xbd, 0xa4, 0x0a, 0x38, 0x3b, 0xfa, 0x44, 0x3a, 0x15, 0xe9, 0x2d, 0x55, - 0x9c, 0x7c, 0x04, 0xe3, 0xba, 0x17, 0xb9, 0x2a, 0x46, 0x75, 0xee, 0xda, 0x28, 0x8d, 0xe0, 0xe4, - 0x4e, 0xb7, 0xc7, 0xca, 0xc5, 0xc9, 0x92, 0xf5, 0xbd, 0x01, 0x13, 0x19, 0x51, 0x3c, 0x89, 0x29, - 0x47, 0xf2, 0x16, 0x9c, 0xd7, 0x77, 0x5b, 0x36, 0x5f, 0x97, 0x24, 0x6c, 0x7e, 0xed, 0xd9, 0xab, - 0x6a, 0xe1, 0x64, 0x26, 0x64, 0x11, 0xc6, 0x64, 0x88, 0x6c, 0x1c, 0xde, 0x39, 0x91, 0xc5, 0xc5, - 0x7d, 0x49, 0x92, 0xe6, 0x28, 0x6f, 0xeb, 0xf7, 0x22, 0xbc, 0x7a, 0x2b, 0x8e, 0x92, 0x20, 0xc4, - 0x2f, 0x52, 0xe1, 0x89, 0x20, 0xa6, 0xfc, 0xff, 0xc2, 0xbd, 0xa0, 0x70, 0xd6, 0x1b, 0x30, 0xb9, - 0x88, 0x21, 0x0a, 0x5c, 0x63, 0x9e, 0x8f, 0x6a, 0xa2, 0x87, 0xdd, 0xac, 0xd6, 0x43, 0xa8, 0x69, - 0xdf, 0x7b, 0x49, 0x47, 0x9e, 0x6f, 0xc4, 0x99, 0x24, 0xd7, 0xe0, 0x82, 0xd7, 0x45, 0x2a, 0xdc, - 0x24, 0xee, 0xe8, 0x77, 0x45, 0x5f, 0xee, 0x35, 0xa5, 0x5d, 0x89, 0x3b, 0xf2, 0x6d, 0xb1, 0x7e, - 0x2b, 0xc2, 0x4b, 0x87, 0x6a, 0x46, 0x1e, 0xc0, 0x39, 0xf9, 0xa6, 0x62, 0xd6, 0x0e, 0xad, 0x61, - 0xb5, 0x39, 0xf8, 0xf6, 0xda, 0x01, 0xb3, 0xf3, 0x17, 0x77, 0xff, 0x38, 0x8b, 0x98, 0x84, 0xf1, - 0x66, 0x84, 0x54, 0x2c, 0x17, 0x1c, 0x0d, 0x49, 0x1e, 0xc2, 0xc5, 0x8e, 0x3a, 0xb5, 0x72, 0xd5, - 0x76, 0x2a, 0xb1, 0xea, 0xdc, 0xf5, 0x63, 0xf9, 0x3b, 0xcc, 0xd5, 0x72, 0xc1, 0x99, 0xec, 0x1c, - 0xe6, 0x6f, 0x05, 0x26, 0x34, 0xbd, 0x6e, 0xaa, 0xc8, 0xca, 0x2a, 0xf3, 0xe6, 0x08, 0x95, 0xd1, - 0xec, 0x2e, 0x17, 0x9c, 0x9a, 0x3f, 0x20, 0xb7, 0x00, 0xca, 0x51, 0xc6, 0x8b, 0xf5, 0x93, 0x01, - 0xf5, 0xa3, 0xfd, 0x7d, 0x96, 0x79, 0xbb, 0x0d, 0x95, 0x1c, 0x35, 0xbf, 0xff, 0xdf, 0x3e, 0x21, - 0xc7, 0x03, 0x61, 0x9d, 0x7d, 0x77, 0xeb, 0x67, 0x03, 0xae, 0x7c, 0x86, 0x14, 0x99, 0x27, 0x50, - 0x3e, 0x0f, 0xab, 0x3e, 0x0b, 0x12, 0x71, 0xe2, 0xdc, 0x19, 0xff, 0xf5, 0xdc, 0xbd, 0x06, 0x90, - 0xf4, 0x42, 0x97, 0xab, 0xf0, 0x59, 0x2b, 0x56, 0x92, 0x5e, 0x96, 0x8f, 0xf5, 0x2d, 0x34, 0x86, - 0x65, 0x79, 0x16, 0xf6, 0x9a, 0x50, 0x55, 0x3f, 0x12, 0x83, 0xa1, 0x5a, 0x17, 0xfa, 0xdb, 0x53, - 0x30, 0x80, 0x0c, 0xd2, 0x44, 0xaf, 0xe7, 0x9e, 0x94, 0xe0, 0x42, 0x9e, 0xab, 0xfe, 0xe7, 0x24, - 0x28, 0xa7, 0x4a, 0x71, 0xaa, 0xae, 0x4d, 0x72, 0x7c, 0x8b, 0x0c, 0xbe, 0x41, 0x8d, 0xd9, 0x51, - 0x4c, 0xb3, 0x73, 0x7d, 0x07, 0x93, 0x87, 0x3b, 0x86, 0xcc, 0x9f, 0xa6, 0xd2, 0xf9, 0x05, 0xda, - 0x78, 0xef, 0x94, 0x5e, 0x59, 0x02, 0x3f, 0x18, 0x40, 0x8e, 0xf2, 0x4e, 0xde, 0x3f, 0x16, 0xed, - 0x85, 0xed, 0xd4, 0x58, 0x38, 0xb5, 0x9f, 0xce, 0xa3, 0xf5, 0xf1, 0xd6, 0x8e, 0x59, 0x78, 0xb6, - 0x63, 0x16, 0x9e, 0xef, 0x98, 0xc6, 0x93, 0xbe, 0x69, 0xfc, 0xda, 0x37, 0x8d, 0x3f, 0xfb, 0xa6, - 0xb1, 0xd5, 0x37, 0x8d, 0xbf, 0xfa, 0xa6, 0xf1, 0x4f, 0xdf, 0x2c, 0x3c, 0xef, 0x9b, 0xc6, 0x8f, - 0xbb, 0x66, 0x61, 0x6b, 0xd7, 0x2c, 0x3c, 0xdb, 0x35, 0x0b, 0x0f, 0x2a, 0x7b, 0xd8, 0xed, 0xf3, - 0xea, 0xd7, 0xf9, 0xc6, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x92, 0xad, 0xa9, 0x05, 0x53, 0x0c, - 0x00, 0x00, + // 1108 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0x51, 0x6f, 0x1b, 0xc5, + 0x13, 0xf7, 0xd9, 0x69, 0x63, 0x8f, 0x9d, 0xfe, 0xd3, 0x4d, 0xfe, 0xe0, 0xba, 0xe2, 0x12, 0x9d, + 0x0a, 0x0a, 0x01, 0xce, 0x90, 0x06, 0x82, 0x2a, 0x01, 0xc2, 0x4d, 0x20, 0x54, 0xa5, 0x84, 0x4b, + 0xda, 0x87, 0xaa, 0xe2, 0x74, 0xbe, 0x9b, 0xb8, 0x27, 0xce, 0x7b, 0xd7, 0xdd, 0xbd, 0xca, 0xe1, + 0x85, 0x16, 0x89, 0x77, 0x24, 0xbe, 0x02, 0x42, 0x20, 0x3e, 0x03, 0xef, 0x3c, 0xe6, 0xb1, 0x4f, + 0x11, 0x71, 0x24, 0xc4, 0x63, 0x3f, 0x02, 0xda, 0xdd, 0xbb, 0xc4, 0x49, 0xdc, 0xc4, 0x89, 0x78, + 0xe4, 0xe9, 0x66, 0x67, 0x67, 0x7e, 0x33, 0xfb, 0x9b, 0x99, 0xdd, 0x83, 0x79, 0xce, 0xfc, 0xa6, + 0xef, 0x31, 0x1a, 0x8b, 0x66, 0x12, 0x79, 0x94, 0x22, 0xcb, 0xbf, 0x49, 0xbb, 0xc9, 0x91, 0x3d, + 0x0e, 0x7d, 0xb4, 0x13, 0x16, 0x8b, 0x98, 0x5c, 0x4d, 0x7a, 0xb6, 0x36, 0xb5, 0x33, 0x13, 0x7b, + 0xdf, 0xb4, 0xf1, 0xc1, 0x10, 0xa0, 0x60, 0x8b, 0x7a, 0xdd, 0xd0, 0x77, 0x05, 0xf3, 0xfc, 0x90, + 0x76, 0x9a, 0x21, 0x6b, 0x46, 0x71, 0x27, 0xf4, 0xbd, 0x28, 0x69, 0xe7, 0x92, 0xc6, 0x6e, 0xbc, + 0xaa, 0xdc, 0xe3, 0x6e, 0x37, 0xa6, 0xcd, 0xb6, 0xc7, 0xb1, 0xc9, 0x85, 0x27, 0x52, 0x2e, 0x73, + 0x50, 0x42, 0x66, 0x36, 0xdd, 0x89, 0x3b, 0xb1, 0x12, 0x9b, 0x52, 0xca, 0xb4, 0x4b, 0xc3, 0x62, + 0x87, 0x5c, 0xb0, 0xb0, 0x9d, 0x0a, 0x0c, 0x92, 0xf6, 0xe0, 0xca, 0x95, 0x16, 0xda, 0xd1, 0xfa, + 0xcb, 0x80, 0x89, 0x4f, 0x52, 0xea, 0x6f, 0xc4, 0x2b, 0x3d, 0xf4, 0x53, 0x81, 0xe4, 0x2a, 0x54, + 0x36, 0x53, 0xea, 0xbb, 0xd4, 0xeb, 0x62, 0xdd, 0x98, 0x35, 0xe6, 0x2a, 0x4e, 0x59, 0x2a, 0xee, + 0x78, 0x5d, 0x24, 0x0e, 0x80, 0xc7, 0x3a, 0xee, 0x63, 0x2f, 0x4a, 0x91, 0xd7, 0x8b, 0xb3, 0xa5, + 0xb9, 0xea, 0xc2, 0x75, 0xfb, 0x04, 0x56, 0xec, 0x43, 0xe0, 0xf6, 0xc7, 0xac, 0x73, 0x4f, 0xfa, + 0x3a, 0x15, 0x2f, 0x93, 0x38, 0xb1, 0x61, 0x2a, 0x4e, 0x45, 0x92, 0x0a, 0x57, 0x78, 0xed, 0x08, + 0xdd, 0x84, 0xe1, 0x66, 0xd8, 0xab, 0x97, 0x54, 0xe8, 0xcb, 0x7a, 0x6b, 0x43, 0xee, 0xac, 0xa9, + 0x8d, 0xc6, 0x22, 0x94, 0x73, 0x18, 0x42, 0x60, 0x6c, 0x20, 0x4f, 0x25, 0x93, 0x69, 0xb8, 0xa0, + 0xf2, 0xab, 0x17, 0x95, 0x52, 0x2f, 0xac, 0xdf, 0xc7, 0x60, 0xfc, 0x66, 0x4c, 0x37, 0xc3, 0x0e, + 0x27, 0x4f, 0x0d, 0x98, 0x8e, 0x05, 0x46, 0x2e, 0xd2, 0x20, 0x89, 0x43, 0x2a, 0x5c, 0x5f, 0xed, + 0x28, 0x98, 0xea, 0xc2, 0xd2, 0x89, 0x07, 0xca, 0x40, 0xec, 0x2f, 0x36, 0x30, 0x5a, 0xc9, 0xfc, + 0xb5, 0xae, 0xf5, 0x52, 0x7f, 0x67, 0x86, 0x1c, 0xd7, 0x3b, 0x44, 0x06, 0x3b, 0xac, 0x23, 0xf7, + 0x60, 0x22, 0x89, 0xd2, 0x4e, 0x48, 0xf3, 0xd8, 0x45, 0x15, 0xfb, 0x9d, 0x91, 0x62, 0xaf, 0x29, + 0xcf, 0x0c, 0xbd, 0x96, 0x0c, 0xac, 0x1a, 0x4f, 0x8b, 0x30, 0x24, 0x05, 0x72, 0x05, 0x4a, 0x29, + 0x8b, 0x34, 0x4f, 0xad, 0xf1, 0xfe, 0xce, 0x4c, 0xe9, 0xae, 0x73, 0xdb, 0x91, 0x3a, 0xf2, 0x15, + 0x8c, 0x3f, 0x44, 0x2f, 0x40, 0x96, 0x17, 0x74, 0xf9, 0x9c, 0xe7, 0xb7, 0x57, 0x35, 0xcc, 0x0a, + 0x15, 0x6c, 0xcb, 0xc9, 0x41, 0x49, 0x03, 0xca, 0x21, 0xe5, 0xe8, 0xa7, 0x0c, 0x55, 0x51, 0xcb, + 0xce, 0xfe, 0x9a, 0xd4, 0x61, 0x5c, 0x84, 0x5d, 0x8c, 0x53, 0x51, 0x1f, 0x9b, 0x35, 0xe6, 0x4a, + 0x4e, 0xbe, 0x6c, 0xdc, 0x80, 0xda, 0x20, 0x1c, 0x99, 0x84, 0xd2, 0xd7, 0xb8, 0x95, 0x15, 0x5a, + 0x8a, 0xc3, 0xeb, 0x7c, 0xa3, 0xf8, 0xbe, 0xd1, 0x70, 0xa0, 0x36, 0xc8, 0x10, 0xb1, 0x60, 0x82, + 0x0b, 0x8f, 0x09, 0x57, 0x82, 0xbb, 0x94, 0x2b, 0x94, 0x92, 0x53, 0x55, 0xca, 0x8d, 0xb0, 0x8b, + 0x77, 0x38, 0x31, 0xa1, 0x8a, 0x34, 0xd8, 0xb7, 0x28, 0x2a, 0x8b, 0x0a, 0xd2, 0x40, 0xef, 0x5b, + 0x3f, 0x17, 0xa1, 0xf6, 0x65, 0x8a, 0x6c, 0xcb, 0xc1, 0x47, 0x29, 0x72, 0x41, 0x1e, 0xc2, 0xff, + 0xb3, 0x01, 0x76, 0x33, 0x72, 0x5c, 0x39, 0xa8, 0x58, 0xbf, 0xa0, 0x0a, 0xb9, 0x38, 0x84, 0xc4, + 0x43, 0x13, 0x69, 0xdf, 0xd6, 0xde, 0x6b, 0x7a, 0x73, 0x5d, 0xfa, 0x3a, 0x53, 0xd1, 0x71, 0xa5, + 0x9c, 0xc8, 0x47, 0x32, 0xb2, 0xcb, 0x05, 0xcb, 0x27, 0x52, 0x29, 0xd6, 0x05, 0x23, 0x9f, 0x01, + 0x60, 0x0f, 0x7d, 0x57, 0x8e, 0x28, 0xaf, 0x97, 0x54, 0x01, 0xe7, 0x47, 0x9f, 0x48, 0xa7, 0x22, + 0xbd, 0xa5, 0x8a, 0x93, 0x0f, 0x61, 0x5c, 0xf7, 0x22, 0x57, 0xc5, 0xa8, 0x2e, 0x5c, 0x1b, 0xa5, + 0x11, 0x9c, 0xdc, 0xe9, 0xd6, 0x58, 0xb9, 0x38, 0x59, 0xb2, 0xbe, 0x33, 0x60, 0x22, 0x23, 0x8a, + 0x27, 0x31, 0xe5, 0x48, 0xde, 0x80, 0x8b, 0xfa, 0x0a, 0xcb, 0xe6, 0x6b, 0x4a, 0xc2, 0xe6, 0xb7, + 0x9b, 0xbd, 0xae, 0x04, 0x27, 0x33, 0x21, 0xcb, 0x30, 0x26, 0x43, 0x64, 0xe3, 0xf0, 0xf6, 0xa9, + 0x2c, 0x2e, 0x1f, 0xac, 0x24, 0x69, 0x8e, 0xf2, 0xb6, 0x7e, 0x2b, 0xc2, 0xcb, 0x37, 0xe3, 0x6e, + 0x12, 0x46, 0xf8, 0x79, 0x2a, 0x3c, 0x11, 0xc6, 0x94, 0xff, 0x57, 0xb8, 0x17, 0x14, 0xce, 0x7a, + 0x0d, 0x26, 0x97, 0x31, 0x42, 0x81, 0x1b, 0xcc, 0xf3, 0x51, 0x4d, 0xf4, 0xb0, 0x9b, 0xd5, 0x7a, + 0x00, 0x35, 0xed, 0x7b, 0x37, 0x09, 0xe4, 0xf9, 0x46, 0x9c, 0x49, 0x72, 0x0d, 0x2e, 0x79, 0x1d, + 0xa4, 0xc2, 0x4d, 0xe2, 0x40, 0xbf, 0x2b, 0xfa, 0x72, 0xaf, 0x29, 0xed, 0x5a, 0x1c, 0xc8, 0xb7, + 0xc5, 0xfa, 0xb5, 0x08, 0xff, 0x3b, 0x52, 0x33, 0x72, 0x1f, 0x2e, 0xc8, 0xa7, 0x13, 0xb3, 0x76, + 0x68, 0x0d, 0xab, 0xcd, 0xe1, 0x27, 0xd6, 0x0e, 0x99, 0x9d, 0x3f, 0xac, 0x07, 0xc7, 0x59, 0xc6, + 0x24, 0x8a, 0xb7, 0xba, 0x48, 0xc5, 0x6a, 0xc1, 0xd1, 0x90, 0xe4, 0x01, 0x5c, 0x0e, 0xd4, 0xa9, + 0x95, 0xab, 0xb6, 0x53, 0x89, 0x55, 0x17, 0xde, 0x3a, 0x91, 0xbf, 0xa3, 0x5c, 0xad, 0x16, 0x9c, + 0xc9, 0xe0, 0x28, 0x7f, 0x6b, 0x30, 0xa1, 0xe9, 0x75, 0x53, 0x45, 0x56, 0x56, 0x99, 0xd7, 0x47, + 0xa8, 0x8c, 0x66, 0x77, 0xb5, 0xe0, 0xd4, 0xfc, 0x81, 0x75, 0x0b, 0xa0, 0xdc, 0xcd, 0x78, 0xb1, + 0x7e, 0x34, 0xa0, 0x7e, 0xbc, 0xbf, 0xcf, 0x33, 0x6f, 0xb7, 0xa0, 0x92, 0xa3, 0xe6, 0xf7, 0xff, + 0x9b, 0xa7, 0xe4, 0x78, 0x28, 0xac, 0x73, 0xe0, 0x6e, 0xfd, 0x64, 0xc0, 0x95, 0x4f, 0x91, 0x22, + 0xf3, 0x04, 0xca, 0xe7, 0x61, 0xdd, 0x67, 0x61, 0x22, 0x4e, 0x9d, 0x3b, 0xe3, 0xdf, 0x9e, 0xbb, + 0x57, 0x00, 0x92, 0x5e, 0xe4, 0x72, 0x15, 0x3e, 0x6b, 0xc5, 0x4a, 0xd2, 0xcb, 0xf2, 0xb1, 0xbe, + 0x81, 0xc6, 0xb0, 0x2c, 0xcf, 0xc3, 0x5e, 0x13, 0xaa, 0xea, 0x47, 0x62, 0x30, 0x54, 0xeb, 0x52, + 0x7f, 0x67, 0x06, 0x06, 0x90, 0x41, 0x9a, 0x68, 0x79, 0xe1, 0x49, 0x09, 0x2e, 0xe5, 0xb9, 0xea, + 0x5f, 0x4b, 0x82, 0x72, 0xaa, 0x14, 0xa7, 0xea, 0xda, 0x24, 0x27, 0xb7, 0xc8, 0xe0, 0x1b, 0xd4, + 0x98, 0x1f, 0xc5, 0x34, 0x3b, 0xd7, 0xb7, 0x30, 0x79, 0xb4, 0x63, 0xc8, 0xe2, 0x59, 0x2a, 0x9d, + 0x5f, 0xa0, 0x8d, 0x77, 0xcf, 0xe8, 0x95, 0x25, 0xf0, 0xbd, 0x01, 0xe4, 0x38, 0xef, 0xe4, 0xbd, + 0x13, 0xd1, 0x5e, 0xd8, 0x4e, 0x8d, 0xa5, 0x33, 0xfb, 0xe9, 0x3c, 0x5a, 0x1f, 0x6d, 0xef, 0x9a, + 0x85, 0x67, 0xbb, 0x66, 0xe1, 0xf9, 0xae, 0x69, 0x3c, 0xe9, 0x9b, 0xc6, 0x2f, 0x7d, 0xd3, 0xf8, + 0xa3, 0x6f, 0x1a, 0xdb, 0x7d, 0xd3, 0xf8, 0xb3, 0x6f, 0x1a, 0x7f, 0xf7, 0xcd, 0xc2, 0xf3, 0xbe, + 0x69, 0xfc, 0xb0, 0x67, 0x16, 0xb6, 0xf7, 0xcc, 0xc2, 0xb3, 0x3d, 0xb3, 0x70, 0xbf, 0xb2, 0x8f, + 0xdd, 0xbe, 0xa8, 0x7e, 0x9d, 0xaf, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x05, 0x48, 0x4a, + 0x3a, 0x0c, 0x00, 0x00, } func (this *FuncToExecute) Equal(that interface{}) bool { diff --git a/src/carnot/planner/plannerpb/service.proto b/src/carnot/planner/plannerpb/service.proto index 125158535b2..a9b33d825f8 100644 --- a/src/carnot/planner/plannerpb/service.proto +++ b/src/carnot/planner/plannerpb/service.proto @@ -24,7 +24,7 @@ option go_package = "plannerpb"; import "src/carnot/planner/dynamic_tracing/ir/logicalpb/logical.proto"; import "src/common/base/statuspb/status.proto"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "src/carnot/planner/distributedpb/distributed_plan.proto"; // FuncToExecute specifies the name and arguments of a function to execute. diff --git a/src/carnot/planpb/BUILD.bazel b/src/carnot/planpb/BUILD.bazel index e624d7035a0..09f7c418048 100644 --- a/src/carnot/planpb/BUILD.bazel +++ b/src/carnot/planpb/BUILD.bazel @@ -28,7 +28,7 @@ pl_proto_library( deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", "//src/shared/types/typespb:types_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -38,7 +38,7 @@ pl_cc_proto_library( deps = [ "//src/api/proto/uuidpb:uuid_pl_cc_proto", "//src/shared/types/typespb/wrapper:cc_library", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/carnot/planpb/plan.pb.go b/src/carnot/planpb/plan.pb.go index c4bf7a6e402..ce6671091c1 100755 --- a/src/carnot/planpb/plan.pb.go +++ b/src/carnot/planpb/plan.pb.go @@ -1810,6 +1810,89 @@ func (m *EmptySourceOperator) GetColumnTypes() []typespb.DataType { return nil } +type OTelLog struct { + Attributes []*OTelAttribute `protobuf:"bytes,1,rep,name=attributes,proto3" json:"attributes,omitempty"` + TimeColumnIndex int64 `protobuf:"varint,2,opt,name=time_column_index,json=timeColumnIndex,proto3" json:"time_column_index,omitempty"` + ObservedTimeColumnIndex int64 `protobuf:"varint,3,opt,name=observed_time_column_index,json=observedTimeColumnIndex,proto3" json:"observed_time_column_index,omitempty"` + SeverityNumber int64 `protobuf:"varint,4,opt,name=severity_number,json=severityNumber,proto3" json:"severity_number,omitempty"` + SeverityText string `protobuf:"bytes,5,opt,name=severity_text,json=severityText,proto3" json:"severity_text,omitempty"` + BodyColumnIndex int64 `protobuf:"varint,6,opt,name=body_column_index,json=bodyColumnIndex,proto3" json:"body_column_index,omitempty"` +} + +func (m *OTelLog) Reset() { *m = OTelLog{} } +func (*OTelLog) ProtoMessage() {} +func (*OTelLog) Descriptor() ([]byte, []int) { + return fileDescriptor_e5dcfc8666ec3f33, []int{18} +} +func (m *OTelLog) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *OTelLog) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_OTelLog.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *OTelLog) XXX_Merge(src proto.Message) { + xxx_messageInfo_OTelLog.Merge(m, src) +} +func (m *OTelLog) XXX_Size() int { + return m.Size() +} +func (m *OTelLog) XXX_DiscardUnknown() { + xxx_messageInfo_OTelLog.DiscardUnknown(m) +} + +var xxx_messageInfo_OTelLog proto.InternalMessageInfo + +func (m *OTelLog) GetAttributes() []*OTelAttribute { + if m != nil { + return m.Attributes + } + return nil +} + +func (m *OTelLog) GetTimeColumnIndex() int64 { + if m != nil { + return m.TimeColumnIndex + } + return 0 +} + +func (m *OTelLog) GetObservedTimeColumnIndex() int64 { + if m != nil { + return m.ObservedTimeColumnIndex + } + return 0 +} + +func (m *OTelLog) GetSeverityNumber() int64 { + if m != nil { + return m.SeverityNumber + } + return 0 +} + +func (m *OTelLog) GetSeverityText() string { + if m != nil { + return m.SeverityText + } + return "" +} + +func (m *OTelLog) GetBodyColumnIndex() int64 { + if m != nil { + return m.BodyColumnIndex + } + return 0 +} + type OTelSpan struct { // Types that are valid to be assigned to Name: // @@ -1828,7 +1911,7 @@ type OTelSpan struct { func (m *OTelSpan) Reset() { *m = OTelSpan{} } func (*OTelSpan) ProtoMessage() {} func (*OTelSpan) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{18} + return fileDescriptor_e5dcfc8666ec3f33, []int{19} } func (m *OTelSpan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1963,7 +2046,7 @@ type OTelMetricGauge struct { func (m *OTelMetricGauge) Reset() { *m = OTelMetricGauge{} } func (*OTelMetricGauge) ProtoMessage() {} func (*OTelMetricGauge) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{19} + return fileDescriptor_e5dcfc8666ec3f33, []int{20} } func (m *OTelMetricGauge) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2047,7 +2130,7 @@ type OTelMetricSummary struct { func (m *OTelMetricSummary) Reset() { *m = OTelMetricSummary{} } func (*OTelMetricSummary) ProtoMessage() {} func (*OTelMetricSummary) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{20} + return fileDescriptor_e5dcfc8666ec3f33, []int{21} } func (m *OTelMetricSummary) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2105,7 +2188,7 @@ type OTelMetricSummary_ValueAtQuantile struct { func (m *OTelMetricSummary_ValueAtQuantile) Reset() { *m = OTelMetricSummary_ValueAtQuantile{} } func (*OTelMetricSummary_ValueAtQuantile) ProtoMessage() {} func (*OTelMetricSummary_ValueAtQuantile) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{20, 0} + return fileDescriptor_e5dcfc8666ec3f33, []int{21, 0} } func (m *OTelMetricSummary_ValueAtQuantile) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2160,7 +2243,7 @@ type OTelAttribute struct { func (m *OTelAttribute) Reset() { *m = OTelAttribute{} } func (*OTelAttribute) ProtoMessage() {} func (*OTelAttribute) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{21} + return fileDescriptor_e5dcfc8666ec3f33, []int{22} } func (m *OTelAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2251,7 +2334,7 @@ type OTelAttribute_Column struct { func (m *OTelAttribute_Column) Reset() { *m = OTelAttribute_Column{} } func (*OTelAttribute_Column) ProtoMessage() {} func (*OTelAttribute_Column) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{21, 0} + return fileDescriptor_e5dcfc8666ec3f33, []int{22, 0} } func (m *OTelAttribute_Column) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2317,7 +2400,7 @@ type OTelMetric struct { func (m *OTelMetric) Reset() { *m = OTelMetric{} } func (*OTelMetric) ProtoMessage() {} func (*OTelMetric) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{22} + return fileDescriptor_e5dcfc8666ec3f33, []int{23} } func (m *OTelMetric) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2437,7 +2520,7 @@ type OTelEndpointConfig struct { func (m *OTelEndpointConfig) Reset() { *m = OTelEndpointConfig{} } func (*OTelEndpointConfig) ProtoMessage() {} func (*OTelEndpointConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{23} + return fileDescriptor_e5dcfc8666ec3f33, []int{24} } func (m *OTelEndpointConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2501,7 +2584,7 @@ type OTelResource struct { func (m *OTelResource) Reset() { *m = OTelResource{} } func (*OTelResource) ProtoMessage() {} func (*OTelResource) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{24} + return fileDescriptor_e5dcfc8666ec3f33, []int{25} } func (m *OTelResource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2542,12 +2625,13 @@ type OTelExportSinkOperator struct { Resource *OTelResource `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"` Metrics []*OTelMetric `protobuf:"bytes,3,rep,name=metrics,proto3" json:"metrics,omitempty"` Spans []*OTelSpan `protobuf:"bytes,4,rep,name=spans,proto3" json:"spans,omitempty"` + Logs []*OTelLog `protobuf:"bytes,5,rep,name=logs,proto3" json:"logs,omitempty"` } func (m *OTelExportSinkOperator) Reset() { *m = OTelExportSinkOperator{} } func (*OTelExportSinkOperator) ProtoMessage() {} func (*OTelExportSinkOperator) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{25} + return fileDescriptor_e5dcfc8666ec3f33, []int{26} } func (m *OTelExportSinkOperator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2604,6 +2688,13 @@ func (m *OTelExportSinkOperator) GetSpans() []*OTelSpan { return nil } +func (m *OTelExportSinkOperator) GetLogs() []*OTelLog { + if m != nil { + return m.Logs + } + return nil +} + type ScalarExpression struct { // Types that are valid to be assigned to Value: // @@ -2616,7 +2707,7 @@ type ScalarExpression struct { func (m *ScalarExpression) Reset() { *m = ScalarExpression{} } func (*ScalarExpression) ProtoMessage() {} func (*ScalarExpression) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{26} + return fileDescriptor_e5dcfc8666ec3f33, []int{27} } func (m *ScalarExpression) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2719,7 +2810,7 @@ type ScalarValue struct { func (m *ScalarValue) Reset() { *m = ScalarValue{} } func (*ScalarValue) ProtoMessage() {} func (*ScalarValue) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{27} + return fileDescriptor_e5dcfc8666ec3f33, []int{28} } func (m *ScalarValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2860,7 +2951,7 @@ type ScalarFunc struct { func (m *ScalarFunc) Reset() { *m = ScalarFunc{} } func (*ScalarFunc) ProtoMessage() {} func (*ScalarFunc) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{28} + return fileDescriptor_e5dcfc8666ec3f33, []int{29} } func (m *ScalarFunc) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2935,7 +3026,7 @@ type AggregateExpression struct { func (m *AggregateExpression) Reset() { *m = AggregateExpression{} } func (*AggregateExpression) ProtoMessage() {} func (*AggregateExpression) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{29} + return fileDescriptor_e5dcfc8666ec3f33, []int{30} } func (m *AggregateExpression) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3010,7 +3101,7 @@ type AggregateExpression_Arg struct { func (m *AggregateExpression_Arg) Reset() { *m = AggregateExpression_Arg{} } func (*AggregateExpression_Arg) ProtoMessage() {} func (*AggregateExpression_Arg) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{29, 0} + return fileDescriptor_e5dcfc8666ec3f33, []int{30, 0} } func (m *AggregateExpression_Arg) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3093,7 +3184,7 @@ type Column struct { func (m *Column) Reset() { *m = Column{} } func (*Column) ProtoMessage() {} func (*Column) Descriptor() ([]byte, []int) { - return fileDescriptor_e5dcfc8666ec3f33, []int{30} + return fileDescriptor_e5dcfc8666ec3f33, []int{31} } func (m *Column) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3164,6 +3255,7 @@ func init() { proto.RegisterType((*JoinOperator_ParentColumn)(nil), "px.carnot.planpb.JoinOperator.ParentColumn") proto.RegisterType((*UDTFSourceOperator)(nil), "px.carnot.planpb.UDTFSourceOperator") proto.RegisterType((*EmptySourceOperator)(nil), "px.carnot.planpb.EmptySourceOperator") + proto.RegisterType((*OTelLog)(nil), "px.carnot.planpb.OTelLog") proto.RegisterType((*OTelSpan)(nil), "px.carnot.planpb.OTelSpan") proto.RegisterType((*OTelMetricGauge)(nil), "px.carnot.planpb.OTelMetricGauge") proto.RegisterType((*OTelMetricSummary)(nil), "px.carnot.planpb.OTelMetricSummary") @@ -3186,208 +3278,213 @@ func init() { func init() { proto.RegisterFile("src/carnot/planpb/plan.proto", fileDescriptor_e5dcfc8666ec3f33) } var fileDescriptor_e5dcfc8666ec3f33 = []byte{ - // 3202 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcf, 0x6f, 0x1b, 0xc7, - 0xf5, 0xe7, 0x92, 0x14, 0x45, 0x3e, 0xfe, 0x10, 0x35, 0xb6, 0x1c, 0x99, 0xb6, 0x29, 0x87, 0xb1, - 0xbf, 0x51, 0xfc, 0x4d, 0x68, 0x5b, 0x76, 0x5c, 0xc7, 0x71, 0x9a, 0x50, 0x12, 0x25, 0x51, 0x91, - 0x44, 0x75, 0x44, 0x25, 0x4d, 0x1b, 0x74, 0x31, 0xe2, 0x8e, 0xd6, 0x1b, 0x93, 0xbb, 0x9b, 0xfd, - 0x11, 0x4b, 0x01, 0x8a, 0xa6, 0xe8, 0xa5, 0x87, 0x14, 0xe8, 0xa1, 0x87, 0xa2, 0xf7, 0x16, 0x39, - 0x15, 0x39, 0xf4, 0x0f, 0x68, 0x81, 0x02, 0xe9, 0xa1, 0x08, 0xdc, 0x9e, 0x72, 0x32, 0x62, 0xe5, - 0xe2, 0x43, 0x51, 0xa4, 0xf7, 0x1e, 0x8a, 0xf9, 0xb1, 0xe4, 0x92, 0x5c, 0x5a, 0x4a, 0x0e, 0x05, - 0x7a, 0xb0, 0xc5, 0x79, 0xf3, 0x79, 0x6f, 0xde, 0xaf, 0x79, 0xf3, 0x66, 0x16, 0xce, 0xbb, 0x4e, - 0xfb, 0x6a, 0x9b, 0x38, 0xa6, 0xe5, 0x5d, 0xb5, 0x3b, 0xc4, 0xb4, 0xf7, 0xf8, 0x9f, 0xaa, 0xed, - 0x58, 0x9e, 0x85, 0x8a, 0xf6, 0x41, 0x55, 0x4c, 0x56, 0xc5, 0x64, 0xe9, 0x25, 0xdd, 0xf0, 0xee, - 0xf9, 0x7b, 0xd5, 0xb6, 0xd5, 0xbd, 0xaa, 0x5b, 0xba, 0x75, 0x95, 0x03, 0xf7, 0xfc, 0x7d, 0x3e, - 0xe2, 0x03, 0xfe, 0x4b, 0x08, 0x28, 0x95, 0x75, 0xcb, 0xd2, 0x3b, 0xb4, 0x8f, 0x7a, 0xe0, 0x10, - 0xdb, 0xa6, 0x8e, 0x2b, 0xe7, 0xe7, 0xd8, 0xf2, 0xc4, 0x36, 0x04, 0xe0, 0xaa, 0xef, 0x1b, 0x9a, - 0xbd, 0xc7, 0xff, 0x48, 0xc0, 0x25, 0x06, 0x70, 0xef, 0x11, 0x87, 0x6a, 0x57, 0xbd, 0x43, 0x9b, - 0xba, 0xe2, 0x7f, 0x7b, 0x4f, 0xfc, 0x15, 0xa8, 0xca, 0x4f, 0x15, 0xc8, 0x6e, 0x77, 0x88, 0xd9, - 0xb4, 0x3d, 0xc3, 0x32, 0x5d, 0x34, 0x0b, 0x93, 0xf4, 0xc0, 0xee, 0x10, 0xc3, 0x9c, 0x8d, 0x5f, - 0x54, 0xe6, 0xd3, 0x38, 0x18, 0xb2, 0x19, 0x62, 0x92, 0xce, 0xe1, 0x87, 0x74, 0x36, 0x21, 0x66, - 0xe4, 0x10, 0xdd, 0x86, 0xb3, 0x5d, 0x72, 0xa0, 0x5a, 0xbe, 0x67, 0xfb, 0x9e, 0xea, 0x58, 0x0f, - 0x5c, 0xd5, 0xa6, 0x8e, 0xea, 0x91, 0xbd, 0x0e, 0x9d, 0x4d, 0x5e, 0x54, 0xe6, 0x13, 0x78, 0xa6, - 0x4b, 0x0e, 0x9a, 0x7c, 0x1e, 0x5b, 0x0f, 0xdc, 0x6d, 0xea, 0xb4, 0xd8, 0xe4, 0x7a, 0x32, 0xad, - 0x14, 0xe3, 0x95, 0xc7, 0x09, 0x48, 0x32, 0x1d, 0xd0, 0xf3, 0x90, 0xd0, 0x88, 0x3e, 0xab, 0x5c, - 0x54, 0xe6, 0xb3, 0x0b, 0x33, 0xd5, 0x61, 0x17, 0x56, 0x97, 0x6b, 0xab, 0x98, 0x21, 0xd0, 0x4d, - 0x98, 0x30, 0x2d, 0x8d, 0xba, 0xb3, 0xf1, 0x8b, 0x89, 0xf9, 0xec, 0x42, 0x79, 0x14, 0xca, 0xe4, - 0xad, 0x38, 0x44, 0xef, 0x52, 0xd3, 0xc3, 0x02, 0x8c, 0xde, 0x80, 0x1c, 0x9b, 0x55, 0x2d, 0x61, - 0x2b, 0x57, 0x2d, 0xbb, 0x70, 0x21, 0x9a, 0x59, 0x3a, 0x04, 0x67, 0xed, 0x90, 0x77, 0x76, 0x00, - 0x19, 0x66, 0xdb, 0xea, 0x1a, 0xa6, 0xae, 0x12, 0x9d, 0x9a, 0x9e, 0x6a, 0x68, 0xee, 0xec, 0x04, - 0x57, 0x62, 0x8a, 0xc9, 0x11, 0x61, 0xa8, 0xee, 0xee, 0x36, 0x96, 0x17, 0x4f, 0x1f, 0x3d, 0x9a, - 0x2b, 0x36, 0x24, 0xbc, 0xc6, 0xd0, 0x8d, 0x65, 0x17, 0x17, 0x8d, 0x01, 0x8a, 0xe6, 0x22, 0x1f, - 0x2e, 0xd0, 0x03, 0xda, 0xf6, 0xd9, 0x12, 0xaa, 0xeb, 0x11, 0xcf, 0x77, 0x55, 0x8d, 0xba, 0x9e, - 0x61, 0x12, 0xa1, 0x67, 0x8a, 0xcb, 0xbf, 0x1e, 0xad, 0x67, 0xb5, 0x1e, 0xf0, 0xee, 0x70, 0xd6, - 0xe5, 0x3e, 0x27, 0x3e, 0x47, 0xc7, 0xce, 0xb9, 0xa5, 0x7d, 0x28, 0x8d, 0x67, 0x45, 0xcf, 0x42, - 0x4e, 0x77, 0xec, 0xb6, 0x4a, 0x34, 0xcd, 0xa1, 0xae, 0xcb, 0x63, 0x92, 0xc1, 0x59, 0x46, 0xab, - 0x09, 0x12, 0xba, 0x0c, 0x05, 0xd7, 0xed, 0xa8, 0x1e, 0x71, 0x74, 0xea, 0x99, 0xa4, 0x4b, 0x79, - 0xc6, 0x64, 0x70, 0xde, 0x75, 0x3b, 0xad, 0x1e, 0x71, 0x3d, 0x99, 0x4e, 0x14, 0x93, 0x95, 0x43, - 0xc8, 0x85, 0x43, 0x82, 0x0a, 0x10, 0x37, 0x34, 0x2e, 0x35, 0x89, 0xe3, 0x86, 0x16, 0x84, 0x3e, - 0x7e, 0x6c, 0xe8, 0xaf, 0x05, 0xa1, 0x4f, 0x70, 0xaf, 0x94, 0xa2, 0xbd, 0xb2, 0x65, 0x69, 0x54, - 0x86, 0xbd, 0xf2, 0x5b, 0x05, 0x12, 0xcb, 0xb5, 0x55, 0x74, 0x23, 0xe0, 0x54, 0x38, 0xe7, 0x85, - 0xc8, 0x45, 0xd8, 0xbf, 0x10, 0x73, 0xc9, 0x80, 0x49, 0x49, 0x19, 0x51, 0x99, 0xd9, 0x6f, 0x39, - 0x1e, 0xd5, 0x54, 0x9b, 0x38, 0xd4, 0xf4, 0x58, 0x42, 0x25, 0xe6, 0x93, 0x38, 0x2f, 0xa8, 0xdb, - 0x82, 0x88, 0x9e, 0x87, 0x29, 0x09, 0x6b, 0xdf, 0x33, 0x3a, 0x9a, 0x43, 0x4d, 0xae, 0x7a, 0x12, - 0x4b, 0xee, 0x25, 0x49, 0xad, 0xac, 0x40, 0x3a, 0x50, 0x7d, 0x64, 0xad, 0x2b, 0x10, 0xb7, 0x6c, - 0xe9, 0x9d, 0x08, 0x93, 0x9b, 0x36, 0x75, 0x88, 0x67, 0x39, 0x38, 0x6e, 0xd9, 0x95, 0x9f, 0xa5, - 0x21, 0x1d, 0x10, 0xd0, 0x77, 0x60, 0xd2, 0xb2, 0x55, 0xb6, 0xe3, 0xb9, 0xb4, 0x42, 0xd4, 0x5e, - 0x09, 0xc0, 0xad, 0x43, 0x9b, 0xe2, 0x94, 0x65, 0xb3, 0xbf, 0x68, 0x03, 0xf2, 0x5d, 0xda, 0x55, - 0x5d, 0xcb, 0x77, 0xda, 0x54, 0xed, 0x2d, 0xfe, 0x7f, 0xa3, 0xec, 0x9b, 0xb4, 0x6b, 0x39, 0x87, - 0x3b, 0x1c, 0x18, 0x88, 0x5a, 0x8b, 0xe1, 0x6c, 0x97, 0x76, 0x03, 0x22, 0xba, 0x05, 0xa9, 0x2e, - 0xb1, 0x99, 0x98, 0xc4, 0xb8, 0x4d, 0xb7, 0x49, 0xec, 0x10, 0xf7, 0x44, 0x97, 0x0d, 0xd1, 0x5d, - 0x48, 0x11, 0x5d, 0x67, 0x7c, 0x62, 0xb3, 0x3e, 0x37, 0xca, 0x57, 0xd3, 0x75, 0x87, 0xea, 0xc4, - 0x0b, 0xaf, 0x3d, 0x41, 0x74, 0xbd, 0x69, 0xa3, 0x15, 0xc8, 0x72, 0x1b, 0x0c, 0xf3, 0x3e, 0x13, - 0x31, 0xc1, 0x45, 0x5c, 0x1a, 0x6b, 0x81, 0x61, 0xde, 0x0f, 0xc9, 0xc8, 0x30, 0xfd, 0x39, 0x09, - 0xbd, 0x0e, 0x99, 0x7d, 0xa3, 0xe3, 0x51, 0x87, 0x49, 0x49, 0x71, 0x29, 0x17, 0x47, 0xa5, 0xac, - 0x70, 0x48, 0x48, 0x42, 0x7a, 0x5f, 0x52, 0xd0, 0x5d, 0x48, 0x77, 0x8c, 0xae, 0xe1, 0x31, 0xfe, - 0x49, 0xce, 0x3f, 0x37, 0xca, 0xbf, 0xc1, 0x10, 0x21, 0xf6, 0xc9, 0x8e, 0x20, 0x30, 0x6e, 0xdf, - 0x64, 0xc5, 0xc1, 0xb2, 0x67, 0xd3, 0xe3, 0xb8, 0x77, 0x19, 0x22, 0xcc, 0xed, 0x0b, 0x02, 0xfa, - 0x11, 0x14, 0xf8, 0x4e, 0xee, 0x47, 0x32, 0x33, 0xce, 0x0f, 0xab, 0x78, 0x7b, 0x69, 0x30, 0x8e, - 0x8b, 0xc5, 0xa3, 0x47, 0x73, 0xb9, 0x30, 0x7d, 0x2d, 0x86, 0x79, 0x65, 0xe8, 0x85, 0xf6, 0x6d, - 0x59, 0x29, 0x02, 0x2f, 0x3f, 0x11, 0x06, 0x56, 0xc6, 0x88, 0x0f, 0x39, 0x79, 0xb1, 0x70, 0xf4, - 0x68, 0x0e, 0xfa, 0xd4, 0xb5, 0x18, 0x06, 0x2e, 0x5a, 0x78, 0xfd, 0x15, 0x98, 0x7c, 0xcf, 0x32, - 0xb8, 0xd5, 0x59, 0x2e, 0x32, 0x22, 0x75, 0xd7, 0x2d, 0x23, 0x6c, 0x74, 0xea, 0x3d, 0x3e, 0x46, - 0x1b, 0x50, 0xf0, 0x35, 0x6f, 0x3f, 0x64, 0x73, 0x6e, 0x9c, 0xcd, 0xbb, 0xcb, 0xad, 0x95, 0x91, - 0xdc, 0xcd, 0x31, 0xee, 0x9e, 0x85, 0x4d, 0x98, 0xa2, 0x5d, 0xdb, 0x3b, 0x0c, 0x89, 0xcb, 0x73, - 0x71, 0x97, 0x47, 0xc5, 0xd5, 0x19, 0x70, 0x44, 0x5e, 0x9e, 0x86, 0xc9, 0xe8, 0x5d, 0xc8, 0x59, - 0x1e, 0xed, 0xf4, 0x5c, 0x56, 0xe0, 0xd2, 0xe6, 0x23, 0x76, 0x66, 0x8b, 0x76, 0xea, 0x07, 0xb6, - 0xe5, 0x78, 0xa3, 0x7e, 0x63, 0x73, 0x7d, 0xbf, 0x31, 0x79, 0x62, 0xb4, 0x98, 0x64, 0xb5, 0xa2, - 0xf2, 0xb7, 0x38, 0x9c, 0x8e, 0xda, 0x99, 0x08, 0x41, 0x92, 0x17, 0x6b, 0x51, 0xd1, 0xf9, 0x6f, - 0x34, 0x07, 0xd9, 0xb6, 0xd5, 0xf1, 0xbb, 0xa6, 0x6a, 0x68, 0x07, 0xe2, 0x54, 0x4d, 0x60, 0x10, - 0xa4, 0x86, 0x76, 0xe0, 0xb2, 0xe3, 0x40, 0x02, 0x18, 0x5e, 0x14, 0xdf, 0x0c, 0x96, 0x4c, 0x5b, - 0x8c, 0x84, 0x5e, 0xee, 0x41, 0x78, 0x7f, 0xc1, 0x8b, 0x61, 0x61, 0x01, 0x31, 0xa3, 0x44, 0xc3, - 0xb1, 0x4c, 0x3c, 0xc2, 0x4b, 0x8c, 0x64, 0x63, 0xbf, 0x5d, 0x74, 0x07, 0xc0, 0xf5, 0x88, 0xe3, - 0xa9, 0x9e, 0xd1, 0xa5, 0x72, 0x8b, 0x9e, 0xab, 0x8a, 0xe6, 0xa7, 0x1a, 0x34, 0x3f, 0xd5, 0x86, - 0xe9, 0xdd, 0xba, 0xf9, 0x16, 0xe9, 0xf8, 0x14, 0x67, 0x38, 0xbc, 0x65, 0x74, 0x59, 0xe3, 0x91, - 0x71, 0x3d, 0x56, 0xde, 0x18, 0x6b, 0xea, 0x78, 0xd6, 0x34, 0x43, 0x73, 0xce, 0x33, 0x90, 0xe2, - 0xed, 0x89, 0xc7, 0xb7, 0x63, 0x06, 0xcb, 0x11, 0x3a, 0xcf, 0x24, 0x3a, 0x94, 0xb0, 0x03, 0x9a, - 0xef, 0xb5, 0x34, 0xee, 0x13, 0x2a, 0x9f, 0x2b, 0x80, 0x46, 0x6b, 0x45, 0xa4, 0x47, 0x87, 0xbd, - 0x11, 0x3f, 0x99, 0x37, 0x4e, 0xe0, 0xe7, 0x75, 0x98, 0x91, 0x10, 0x97, 0x76, 0x89, 0xe9, 0x19, - 0xed, 0x01, 0x87, 0x9f, 0xe9, 0x2f, 0xb1, 0x23, 0xe7, 0xf9, 0x32, 0xa7, 0x04, 0x53, 0x98, 0xe6, - 0x56, 0x4c, 0x40, 0xa3, 0x7b, 0x7e, 0x44, 0x77, 0xe5, 0xdb, 0xe9, 0x1e, 0x1f, 0xd1, 0xbd, 0xf2, - 0x79, 0x12, 0x8a, 0xc3, 0x55, 0x80, 0x37, 0x96, 0x03, 0x5d, 0x46, 0x30, 0x44, 0xb7, 0x07, 0x4b, - 0x97, 0xa1, 0xf1, 0xd3, 0x23, 0x39, 0x5c, 0x94, 0x1a, 0xcb, 0x83, 0x45, 0xa9, 0xa1, 0xa1, 0x1d, - 0xc8, 0xc9, 0x76, 0xb4, 0xdf, 0x85, 0x66, 0x17, 0xaa, 0xc7, 0xd7, 0xa4, 0x2a, 0xa6, 0xae, 0xdf, - 0xf1, 0x78, 0x7b, 0xca, 0x0e, 0x31, 0x21, 0x85, 0x0f, 0x91, 0x0e, 0xa8, 0x6d, 0x99, 0x26, 0x6d, - 0x7b, 0xa2, 0x18, 0x8b, 0xee, 0x4c, 0xa4, 0xec, 0xed, 0x13, 0x88, 0x66, 0x84, 0xa5, 0x9e, 0x80, - 0xa0, 0xc1, 0x9c, 0x6e, 0x0f, 0x93, 0x4a, 0x7f, 0x57, 0x20, 0x1b, 0xd2, 0x03, 0x5d, 0x00, 0xe0, - 0x66, 0xa8, 0xa1, 0x34, 0xcb, 0x70, 0xca, 0xd6, 0xff, 0x4c, 0xae, 0x95, 0xbe, 0x0b, 0x33, 0x91, - 0x0e, 0x88, 0xe8, 0x23, 0x95, 0x88, 0x3e, 0x72, 0x31, 0x0f, 0xd9, 0x50, 0x57, 0xbc, 0x9e, 0x4c, - 0xc7, 0x8b, 0x89, 0xca, 0x07, 0x90, 0x0d, 0xf5, 0x0d, 0x68, 0x19, 0xb2, 0xf4, 0xc0, 0x66, 0xb9, - 0xc3, 0x43, 0x23, 0x1a, 0xbd, 0x88, 0x93, 0x68, 0xa7, 0x4d, 0x3a, 0xc4, 0xa9, 0xf7, 0xa0, 0x38, - 0xcc, 0x76, 0x92, 0x44, 0xfe, 0x7d, 0x1c, 0xa6, 0x47, 0x1a, 0x0f, 0xf4, 0x1a, 0xa4, 0x3e, 0x60, - 0x85, 0x26, 0x58, 0xf9, 0xf2, 0x53, 0xba, 0x95, 0xd0, 0xe2, 0x92, 0x09, 0x5d, 0x83, 0x94, 0xee, - 0x58, 0xbe, 0x1d, 0x5c, 0x6b, 0x66, 0x47, 0xd9, 0x97, 0xb8, 0x0e, 0x58, 0xe2, 0x58, 0xdd, 0xe6, - 0xbf, 0x06, 0x22, 0x08, 0x9c, 0x24, 0x02, 0x38, 0x07, 0x59, 0x2e, 0x5c, 0x02, 0x92, 0x02, 0xc0, - 0x49, 0x02, 0x50, 0x82, 0xf4, 0x03, 0xc3, 0xd4, 0xac, 0x07, 0x54, 0xe3, 0x99, 0x9c, 0xc6, 0xbd, - 0x31, 0x63, 0xb6, 0x89, 0xe3, 0x19, 0xa4, 0xa3, 0x12, 0x5d, 0xe7, 0x05, 0x36, 0x8d, 0x41, 0x92, - 0x6a, 0xba, 0x8e, 0x5e, 0x80, 0xe2, 0xbe, 0x61, 0x92, 0x8e, 0xf1, 0x21, 0x55, 0x1d, 0x9e, 0xaf, - 0x2e, 0xaf, 0xa7, 0x69, 0x3c, 0x15, 0xd0, 0x45, 0x1a, 0xbb, 0x95, 0x9f, 0x2b, 0x50, 0x18, 0x6c, - 0x90, 0xd0, 0x22, 0x40, 0xdf, 0xeb, 0xf2, 0xd2, 0x77, 0x92, 0x58, 0x85, 0xb8, 0xd0, 0x02, 0x4c, - 0x8a, 0xb0, 0x1c, 0xef, 0xb3, 0x00, 0x58, 0xf9, 0x48, 0x81, 0xfc, 0x40, 0xaf, 0x85, 0x4e, 0xc3, - 0x04, 0xef, 0xb5, 0xb8, 0x12, 0x09, 0x2c, 0x06, 0xdf, 0x46, 0x36, 0xcb, 0x65, 0xb2, 0x67, 0x39, - 0x62, 0xb7, 0xba, 0x4e, 0xdb, 0x95, 0xbd, 0x7e, 0xbe, 0x47, 0xdd, 0x71, 0xda, 0x6e, 0xe5, 0x89, - 0x02, 0xf9, 0x81, 0x86, 0x6d, 0x24, 0xe7, 0x94, 0xd1, 0xcd, 0xf8, 0x16, 0x4c, 0x49, 0x48, 0x97, - 0xd8, 0xb6, 0x61, 0xea, 0x81, 0x5e, 0x2f, 0x1d, 0xd3, 0x0d, 0x4a, 0x2d, 0x37, 0x05, 0x17, 0x2e, - 0xb4, 0xc3, 0x43, 0x17, 0x5d, 0x82, 0x42, 0xef, 0xce, 0xbe, 0x47, 0xbc, 0xf6, 0x3d, 0x51, 0x65, - 0x71, 0xce, 0x11, 0x57, 0xf5, 0x45, 0x46, 0x2b, 0xdd, 0x82, 0xfc, 0x80, 0x18, 0x66, 0x6a, 0xd0, - 0x33, 0x98, 0x1a, 0x3d, 0x90, 0x3a, 0x27, 0x70, 0x5e, 0xb6, 0x0d, 0x82, 0x58, 0xf9, 0x2c, 0x09, - 0xb9, 0x70, 0x97, 0x86, 0x5e, 0x85, 0x64, 0xe8, 0x3a, 0xf2, 0xfc, 0xd3, 0x7b, 0x3a, 0x3e, 0xe0, - 0x35, 0x85, 0x33, 0x21, 0x02, 0xa7, 0xe8, 0xfb, 0x3e, 0xe9, 0x18, 0xde, 0xa1, 0xda, 0xb6, 0x4c, - 0xcd, 0x10, 0x35, 0x58, 0xf8, 0xe1, 0xda, 0x31, 0xb2, 0xea, 0x92, 0x73, 0x29, 0x60, 0xc4, 0x88, - 0x0e, 0x93, 0x5c, 0x84, 0xa1, 0x20, 0x8f, 0x8e, 0x20, 0xfa, 0xe2, 0xa6, 0xf9, 0xff, 0xc7, 0x48, - 0x17, 0xf7, 0x3d, 0x99, 0x10, 0x79, 0x21, 0x62, 0x49, 0xa6, 0xc5, 0x70, 0x74, 0x93, 0xa3, 0xd1, - 0x1d, 0x8d, 0xc2, 0x44, 0x44, 0x14, 0xba, 0x30, 0x3d, 0x62, 0x05, 0xba, 0x02, 0xd3, 0x1d, 0xba, - 0x1f, 0xe8, 0x2b, 0xc2, 0x21, 0xef, 0x8e, 0x53, 0x6c, 0x62, 0xa9, 0x1f, 0x10, 0xf4, 0x22, 0x20, - 0xc7, 0xd0, 0xef, 0x0d, 0x81, 0xe3, 0x1c, 0x5c, 0xe4, 0x33, 0x21, 0x74, 0xa9, 0x05, 0xb9, 0xb0, - 0x59, 0xcc, 0x0e, 0x71, 0xd7, 0x1d, 0x58, 0x24, 0x2b, 0x68, 0x62, 0x81, 0xbe, 0xa9, 0x61, 0xd1, - 0xd9, 0x50, 0x52, 0x54, 0x5e, 0x86, 0x74, 0x10, 0x56, 0x94, 0x81, 0x89, 0xc6, 0xd6, 0x56, 0x1d, - 0x17, 0x63, 0xa8, 0x00, 0xb0, 0x51, 0x5f, 0x69, 0xa9, 0xcd, 0xdd, 0x56, 0x1d, 0x17, 0x15, 0x36, - 0x5e, 0xd9, 0xdd, 0xd8, 0x90, 0xe3, 0x44, 0x65, 0x1f, 0xd0, 0x68, 0xb3, 0x1e, 0xd9, 0x7c, 0xdd, - 0x05, 0x20, 0x8e, 0xae, 0xca, 0x5a, 0x1c, 0x1f, 0x77, 0xdd, 0x17, 0x95, 0x45, 0x76, 0x95, 0xc4, - 0xd1, 0xf9, 0x2f, 0xb7, 0x62, 0xc1, 0xa9, 0x88, 0x2e, 0xfe, 0x24, 0x3b, 0xf4, 0xdb, 0x1d, 0xc4, - 0x95, 0x8f, 0x93, 0x90, 0xe6, 0xdd, 0xbc, 0x4d, 0x98, 0x8b, 0xb3, 0x4c, 0xbe, 0xea, 0x7a, 0x0e, - 0xeb, 0x41, 0xb9, 0x59, 0xac, 0xc1, 0x67, 0xc4, 0x1d, 0x4e, 0x43, 0x2f, 0xc2, 0x34, 0x87, 0x8c, - 0xf8, 0x39, 0xb1, 0x16, 0xc3, 0x53, 0x6c, 0x2a, 0x1c, 0xf1, 0xd7, 0x01, 0x88, 0xe7, 0x39, 0xc6, - 0x9e, 0xef, 0xf5, 0x5e, 0x4d, 0xe6, 0xa2, 0xaf, 0x1a, 0xb5, 0x00, 0x87, 0x43, 0x2c, 0x68, 0x19, - 0x66, 0x3c, 0x87, 0xf0, 0xfe, 0x6b, 0x70, 0x49, 0xfe, 0xb4, 0xb7, 0x38, 0x7d, 0xf4, 0x68, 0x2e, - 0xdf, 0x62, 0x80, 0xc6, 0xb2, 0xcc, 0x7e, 0xc4, 0xf1, 0x0d, 0x2d, 0xac, 0x46, 0x0d, 0x4e, 0xbb, - 0x36, 0x31, 0x47, 0x84, 0x4c, 0x70, 0x21, 0xbc, 0xa3, 0x63, 0xf6, 0xf7, 0x64, 0x4c, 0x33, 0xf4, - 0xa0, 0x88, 0x16, 0x9c, 0x93, 0xd9, 0x17, 0x29, 0x29, 0xc5, 0x25, 0x9d, 0x39, 0x7a, 0x34, 0x87, - 0x44, 0xd2, 0x0e, 0xc8, 0x7b, 0xc6, 0xee, 0xd3, 0x06, 0xa4, 0xbe, 0x0c, 0xcf, 0xf4, 0x2f, 0x20, - 0x83, 0x12, 0x27, 0xf9, 0x71, 0x70, 0xba, 0x77, 0xe1, 0x08, 0xb3, 0x5d, 0x87, 0x19, 0x6a, 0x6a, - 0x11, 0x4c, 0x69, 0xce, 0x84, 0xa8, 0xa9, 0x0d, 0xb3, 0x5c, 0x00, 0xb8, 0x6f, 0x98, 0x9a, 0xc8, - 0x4b, 0x7e, 0x0b, 0x4f, 0xe0, 0x0c, 0xa3, 0xf0, 0xc4, 0x5b, 0x4c, 0x89, 0x4c, 0xae, 0xfc, 0x18, - 0xa6, 0x58, 0x30, 0x36, 0xa9, 0xe7, 0x18, 0xed, 0x55, 0xe2, 0xeb, 0x14, 0x55, 0x01, 0xed, 0x77, - 0x2c, 0x12, 0xb1, 0xc5, 0x59, 0xc8, 0x8b, 0x7c, 0x2e, 0xbc, 0xd2, 0x15, 0x28, 0x1a, 0xa6, 0x17, - 0x9d, 0x20, 0x05, 0xc3, 0x0c, 0x63, 0x17, 0x0b, 0x90, 0x13, 0x2d, 0x82, 0x40, 0x57, 0x7e, 0x17, - 0x87, 0xe9, 0xfe, 0xfa, 0x3b, 0x7e, 0xb7, 0x4b, 0x9c, 0x43, 0x56, 0x37, 0xda, 0x96, 0x6f, 0x46, - 0x69, 0x80, 0x8b, 0x7c, 0x26, 0xbc, 0xfe, 0x3c, 0x14, 0x5d, 0xbf, 0x1b, 0xb1, 0x3e, 0x2e, 0xb8, - 0x7e, 0x37, 0x8c, 0x7c, 0x17, 0xa6, 0xde, 0xf7, 0x59, 0x97, 0xd8, 0xa1, 0xc1, 0x7e, 0x15, 0x29, - 0x7a, 0x23, 0x3a, 0x45, 0x07, 0xb4, 0xaa, 0x72, 0xc7, 0xd5, 0xbc, 0xef, 0x49, 0x09, 0xb8, 0x10, - 0xc8, 0x12, 0x5b, 0xb9, 0xf4, 0x43, 0x98, 0x1a, 0x82, 0xb0, 0x86, 0x27, 0x00, 0x71, 0xf5, 0x15, - 0xdc, 0x1b, 0x33, 0x23, 0xc3, 0xae, 0x18, 0x50, 0xbc, 0xc8, 0x67, 0x42, 0xaa, 0x57, 0x3e, 0x8d, - 0x43, 0x7e, 0x60, 0xd7, 0x44, 0xd6, 0xa2, 0x37, 0x20, 0x25, 0xa4, 0x8d, 0x7f, 0x40, 0x1b, 0x10, - 0x22, 0x0f, 0xeb, 0xb5, 0x18, 0x96, 0x7c, 0xe8, 0x39, 0xc8, 0x89, 0x62, 0x20, 0x13, 0x27, 0x21, - 0x4b, 0x42, 0x56, 0x50, 0xb9, 0x81, 0xa5, 0xdf, 0x28, 0x90, 0x92, 0x45, 0xfa, 0x46, 0xef, 0x32, - 0x1f, 0x3a, 0x67, 0xa3, 0x8a, 0x10, 0xf4, 0x8b, 0x50, 0x64, 0xd9, 0x4e, 0x0c, 0x94, 0x6d, 0x74, - 0x1b, 0xce, 0xb6, 0x89, 0xa9, 0xee, 0x51, 0xf5, 0x3d, 0xd7, 0x32, 0x55, 0x6a, 0xb6, 0x2d, 0x8d, - 0x6a, 0x2a, 0x71, 0x1c, 0x72, 0x28, 0x3f, 0x09, 0xcc, 0xb4, 0x89, 0xb9, 0x48, 0xd7, 0x5d, 0xcb, - 0xac, 0x8b, 0xd9, 0x1a, 0x9b, 0x5c, 0x9c, 0x84, 0x09, 0xae, 0x7a, 0xe5, 0xb3, 0x38, 0x40, 0x3f, - 0x8a, 0x91, 0xfe, 0xba, 0xc8, 0xdb, 0xfc, 0xb6, 0x63, 0xf0, 0xdb, 0x81, 0x7c, 0x52, 0x0e, 0x93, - 0x18, 0x97, 0x6f, 0x1a, 0x9e, 0xf0, 0x03, 0xe6, 0xbf, 0x87, 0x8a, 0x5c, 0xf2, 0x9b, 0x17, 0xb9, - 0x2b, 0x30, 0x3d, 0xba, 0x95, 0x79, 0x6d, 0xc2, 0x53, 0xde, 0xd0, 0x3e, 0x7e, 0x05, 0x26, 0x74, - 0xb6, 0x2d, 0x67, 0x29, 0x8f, 0xe8, 0xb3, 0x4f, 0xcb, 0x54, 0xbe, 0x7f, 0xd7, 0x62, 0x58, 0x70, - 0xa0, 0xd7, 0x61, 0xd2, 0x15, 0xb9, 0x3b, 0xbb, 0x3f, 0xee, 0x41, 0x73, 0x24, 0xcd, 0xd7, 0x62, - 0x38, 0xe0, 0x62, 0x45, 0x42, 0x23, 0x1e, 0xa9, 0xfc, 0x53, 0x01, 0xc4, 0x5f, 0x87, 0x4c, 0xcd, - 0xb6, 0xf8, 0x8e, 0x36, 0xf7, 0x0d, 0x1d, 0x9d, 0x85, 0x84, 0xef, 0x74, 0x84, 0x43, 0x17, 0x27, - 0x8f, 0x1e, 0xcd, 0x25, 0x76, 0xf1, 0x06, 0x66, 0x34, 0xf4, 0x26, 0x4c, 0xde, 0xa3, 0x44, 0xa3, - 0x4e, 0x70, 0x22, 0x5e, 0x1f, 0xf3, 0xde, 0x34, 0x20, 0xb1, 0xba, 0x26, 0x78, 0xea, 0xa6, 0xe7, - 0x1c, 0xe2, 0x40, 0x02, 0xdb, 0x45, 0x86, 0xe9, 0xd2, 0xb6, 0xef, 0x04, 0x5f, 0x83, 0x7a, 0x63, - 0x76, 0x9f, 0x67, 0x1e, 0xb3, 0x7c, 0x4f, 0x7e, 0xfc, 0x09, 0x86, 0xa5, 0x3b, 0x90, 0x0b, 0x8b, - 0x43, 0x45, 0x48, 0xdc, 0xa7, 0x87, 0x32, 0xfc, 0xec, 0x27, 0xeb, 0xc4, 0x45, 0x92, 0x8b, 0xb8, - 0x8b, 0xc1, 0x9d, 0xf8, 0x6d, 0xa5, 0xd2, 0x84, 0x1c, 0xd3, 0x0e, 0x53, 0xf1, 0x18, 0x30, 0x14, - 0x71, 0xe5, 0x1b, 0x47, 0xbc, 0xf2, 0x8b, 0x38, 0x9c, 0x89, 0x7e, 0x5f, 0x43, 0x9b, 0x30, 0x45, - 0xa5, 0x17, 0x58, 0x97, 0xb9, 0x6f, 0x04, 0xdf, 0xa4, 0x2e, 0x9d, 0xc4, 0x65, 0xb8, 0x40, 0x07, - 0x83, 0x72, 0x07, 0xd2, 0x8e, 0x54, 0x5b, 0x16, 0x81, 0x72, 0xb4, 0x9c, 0xc0, 0x38, 0xdc, 0xc3, - 0xa3, 0x5b, 0x30, 0xd9, 0xe5, 0xb9, 0x10, 0xd4, 0xc5, 0xf3, 0x4f, 0x4b, 0x18, 0x1c, 0x80, 0xd1, - 0x35, 0x98, 0x60, 0x87, 0x64, 0xb0, 0x17, 0x4a, 0xd1, 0x5c, 0xec, 0x34, 0xc4, 0x02, 0x58, 0xf9, - 0xa3, 0x02, 0xc5, 0xe1, 0xbb, 0x16, 0x7a, 0x15, 0xd2, 0x6d, 0xcb, 0x74, 0x3d, 0x62, 0x7a, 0xd2, - 0x05, 0x4f, 0xef, 0xa3, 0xd6, 0x62, 0xb8, 0xc7, 0x80, 0x16, 0x86, 0x4a, 0xdf, 0xd8, 0xfb, 0x53, - 0xa8, 0xd8, 0x2d, 0x40, 0x72, 0xdf, 0x37, 0xdb, 0xf2, 0x33, 0xc1, 0xf9, 0x71, 0x8b, 0xad, 0xf8, - 0x66, 0x7b, 0x2d, 0x86, 0x39, 0xb6, 0x5f, 0x5e, 0xfe, 0x14, 0x87, 0x6c, 0x48, 0x19, 0x74, 0x15, - 0x32, 0x6c, 0xb3, 0x1c, 0x57, 0x07, 0xd3, 0x9a, 0xfc, 0x85, 0xe6, 0x00, 0xf6, 0x2c, 0xab, 0xa3, - 0xf6, 0x73, 0x30, 0xbd, 0x16, 0xc3, 0x19, 0x46, 0x13, 0x12, 0x9f, 0x85, 0xac, 0x61, 0x7a, 0xb7, - 0x6e, 0x86, 0x4a, 0x31, 0x3b, 0x53, 0xc1, 0xe8, 0x3d, 0x32, 0xa2, 0xcb, 0x90, 0xe7, 0xe7, 0x71, - 0x0f, 0xc4, 0x36, 0x81, 0xb2, 0x16, 0xc3, 0x39, 0x49, 0x16, 0xb0, 0xe1, 0xaa, 0x3e, 0x11, 0x51, - 0xd5, 0xd1, 0x3c, 0xf0, 0xe2, 0x73, 0xeb, 0xa6, 0x6a, 0xba, 0x12, 0x97, 0x92, 0x4b, 0xe6, 0xc5, - 0xc4, 0x96, 0x2b, 0x90, 0xb7, 0x21, 0xef, 0x1b, 0xa6, 0x77, 0x7d, 0xe1, 0xb6, 0xc4, 0x89, 0x57, - 0xf8, 0xe9, 0xbe, 0xb9, 0xbb, 0x0d, 0x3e, 0xcd, 0x5f, 0xb7, 0x05, 0x52, 0xb4, 0x1d, 0x81, 0xf7, - 0xd6, 0x93, 0xe9, 0x74, 0x31, 0x53, 0xf9, 0x52, 0x01, 0xe8, 0xfb, 0x38, 0xb2, 0x44, 0xdf, 0x81, - 0x8c, 0x61, 0x1a, 0x9e, 0x4a, 0x1c, 0xfd, 0x84, 0xdd, 0x75, 0x9a, 0xe1, 0x6b, 0x8e, 0xee, 0xa2, - 0x5b, 0x90, 0xe4, 0x6c, 0x89, 0x13, 0x3f, 0xcd, 0x70, 0xbc, 0xfc, 0x20, 0x26, 0xea, 0x49, 0xdc, - 0xd0, 0xd0, 0x1d, 0x98, 0x62, 0x74, 0xb5, 0x17, 0x5f, 0xf1, 0x19, 0x36, 0x3a, 0xc0, 0x79, 0x06, - 0x0d, 0x46, 0x6e, 0xe5, 0x5f, 0x71, 0x38, 0x15, 0xf1, 0x0e, 0xd3, 0xb3, 0x35, 0x31, 0xce, 0xd6, - 0xe4, 0x37, 0xb3, 0xf5, 0x35, 0x69, 0xab, 0xf8, 0x3e, 0xfc, 0xc2, 0x89, 0x1e, 0x83, 0xaa, 0x35, - 0x47, 0x1f, 0x30, 0x39, 0xf5, 0x34, 0x93, 0x27, 0x4f, 0x68, 0x72, 0xe9, 0x27, 0x90, 0xa8, 0x39, - 0xfa, 0x7f, 0x7d, 0x3b, 0xf7, 0xb7, 0xe6, 0x42, 0xaf, 0x3d, 0x61, 0x5e, 0xb6, 0x34, 0x2a, 0xef, - 0x8e, 0xfc, 0x37, 0x2b, 0xfb, 0xe1, 0xdb, 0xa2, 0x18, 0x5c, 0xf9, 0x47, 0x1c, 0x72, 0xe1, 0x6f, - 0x93, 0xe8, 0x2c, 0xcc, 0x34, 0xb7, 0xeb, 0xb8, 0xd6, 0x6a, 0x62, 0xb5, 0xf5, 0xce, 0x76, 0x5d, - 0xdd, 0xdd, 0x7a, 0x73, 0xab, 0xf9, 0xf6, 0x56, 0x31, 0x86, 0xce, 0xc1, 0x99, 0xcd, 0xfa, 0x66, - 0x13, 0xbf, 0xa3, 0xee, 0x34, 0x77, 0xf1, 0x52, 0x5d, 0x0d, 0x80, 0xc5, 0x27, 0x93, 0xe8, 0x2c, - 0x9c, 0x5e, 0xc5, 0xdb, 0x4b, 0x23, 0x53, 0x7f, 0x4d, 0xb3, 0x29, 0x76, 0xa9, 0x1c, 0x99, 0xfa, - 0x34, 0x83, 0x4a, 0x30, 0x53, 0xdf, 0xdc, 0x6e, 0x8d, 0x4a, 0xfc, 0x15, 0xa0, 0x69, 0xc8, 0x6d, - 0xd6, 0xb6, 0xfb, 0xa4, 0x87, 0x53, 0xe8, 0x19, 0x40, 0xb5, 0xd5, 0x55, 0x5c, 0x5f, 0xad, 0xb5, - 0x42, 0xd8, 0x3f, 0x14, 0xd1, 0x69, 0x98, 0x5a, 0x69, 0x6c, 0xb4, 0xea, 0xb8, 0x4f, 0xfd, 0xf5, - 0x34, 0x3a, 0x05, 0x85, 0x8d, 0xc6, 0x66, 0xa3, 0xd5, 0x27, 0xfe, 0x9b, 0x13, 0x77, 0xb7, 0x1a, - 0xcd, 0xad, 0x3e, 0xf1, 0x4b, 0x84, 0x10, 0xe4, 0xd7, 0x9b, 0x8d, 0x10, 0xed, 0xcf, 0xa7, 0x98, - 0xda, 0x81, 0xb9, 0x8d, 0xad, 0x37, 0xfb, 0x53, 0x9f, 0xac, 0x30, 0x3d, 0x84, 0xb1, 0x03, 0x13, - 0x1f, 0xaf, 0xa2, 0x32, 0x9c, 0x6d, 0xb6, 0xea, 0x1b, 0x6a, 0xfd, 0xfb, 0xdb, 0x4d, 0xdc, 0x1a, - 0x9a, 0xff, 0x7a, 0x75, 0xf1, 0xee, 0xc3, 0xc7, 0xe5, 0xd8, 0x17, 0x8f, 0xcb, 0xb1, 0xaf, 0x1f, - 0x97, 0x95, 0x8f, 0x8e, 0xca, 0xca, 0x27, 0x47, 0x65, 0xe5, 0x2f, 0x47, 0x65, 0xe5, 0xe1, 0x51, - 0x59, 0xf9, 0xf2, 0xa8, 0xac, 0x3c, 0x39, 0x2a, 0xc7, 0xbe, 0x3e, 0x2a, 0x2b, 0xbf, 0xfc, 0xaa, - 0x1c, 0x7b, 0xf8, 0x55, 0x39, 0xf6, 0xc5, 0x57, 0xe5, 0xd8, 0x0f, 0x52, 0x22, 0xf4, 0x7b, 0x29, - 0xfe, 0xc1, 0xe5, 0xc6, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x49, 0xc5, 0x4d, 0x17, 0x23, - 0x00, 0x00, + // 3294 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x39, 0x4b, 0x6c, 0x1b, 0xc7, + 0xd9, 0x5c, 0x92, 0xe2, 0xe3, 0xe3, 0x53, 0x63, 0xc9, 0x96, 0x69, 0x9b, 0x72, 0x18, 0xfb, 0xb7, + 0xe2, 0x3f, 0xa1, 0x6c, 0xd9, 0xf1, 0xef, 0x38, 0xce, 0x9f, 0x50, 0x12, 0x25, 0x51, 0x91, 0x44, + 0x75, 0x44, 0x25, 0x4d, 0x1b, 0x74, 0xb1, 0xe2, 0x8e, 0xd6, 0x1b, 0x93, 0xbb, 0x9b, 0x7d, 0xd8, + 0x52, 0x80, 0xa2, 0x29, 0x7a, 0xe9, 0x21, 0x87, 0x1e, 0x7a, 0x28, 0x7a, 0x6f, 0x91, 0x4b, 0x8b, + 0x1c, 0x7a, 0xec, 0xa1, 0x05, 0x0a, 0xa4, 0x87, 0x22, 0x70, 0x7b, 0xca, 0xc9, 0x88, 0x95, 0x8b, + 0x0f, 0x45, 0x91, 0xde, 0x7b, 0x28, 0xe6, 0xb1, 0xe4, 0x52, 0xbb, 0xb2, 0x94, 0xb4, 0x28, 0xd0, + 0x83, 0xc4, 0x9d, 0xef, 0x35, 0xdf, 0x7b, 0xbe, 0xd9, 0x85, 0xf3, 0x8e, 0xdd, 0x9d, 0xed, 0x2a, + 0xb6, 0x61, 0xba, 0xb3, 0x56, 0x4f, 0x31, 0xac, 0x1d, 0xf6, 0x53, 0xb7, 0x6c, 0xd3, 0x35, 0x51, + 0xd9, 0xda, 0xab, 0x73, 0x64, 0x9d, 0x23, 0x2b, 0x13, 0x9a, 0xa9, 0x99, 0x0c, 0x39, 0x4b, 0x9f, + 0x38, 0x5d, 0xa5, 0xaa, 0x99, 0xa6, 0xd6, 0x23, 0xb3, 0x6c, 0xb5, 0xe3, 0xed, 0xce, 0x3e, 0xb4, + 0x15, 0xcb, 0x22, 0xb6, 0x23, 0xf0, 0xd3, 0x74, 0x17, 0xc5, 0xd2, 0x39, 0xc1, 0xac, 0xe7, 0xe9, + 0xaa, 0xb5, 0xc3, 0x7e, 0x04, 0xc1, 0x25, 0x4a, 0xe0, 0xdc, 0x53, 0x6c, 0xa2, 0xce, 0xba, 0xfb, + 0x16, 0x71, 0xf8, 0x7f, 0x6b, 0x87, 0xff, 0x72, 0xaa, 0xda, 0x0f, 0x25, 0xc8, 0x6d, 0xf6, 0x14, + 0xa3, 0x6d, 0xb9, 0xba, 0x69, 0x38, 0x68, 0x0a, 0xd2, 0x64, 0xcf, 0xea, 0x29, 0xba, 0x31, 0x15, + 0xbf, 0x28, 0xcd, 0x64, 0xb0, 0xbf, 0xa4, 0x18, 0xc5, 0x50, 0x7a, 0xfb, 0x1f, 0x90, 0xa9, 0x04, + 0xc7, 0x88, 0x25, 0xba, 0x0d, 0x67, 0xfb, 0xca, 0x9e, 0x6c, 0x7a, 0xae, 0xe5, 0xb9, 0xb2, 0x6d, + 0x3e, 0x74, 0x64, 0x8b, 0xd8, 0xb2, 0xab, 0xec, 0xf4, 0xc8, 0x54, 0xf2, 0xa2, 0x34, 0x93, 0xc0, + 0x93, 0x7d, 0x65, 0xaf, 0xcd, 0xf0, 0xd8, 0x7c, 0xe8, 0x6c, 0x12, 0xbb, 0x43, 0x91, 0xab, 0xc9, + 0x8c, 0x54, 0x8e, 0xd7, 0x9e, 0x24, 0x20, 0x49, 0x75, 0x40, 0x57, 0x20, 0xa1, 0x2a, 0xda, 0x94, + 0x74, 0x51, 0x9a, 0xc9, 0xcd, 0x4d, 0xd6, 0x0f, 0x7b, 0xaa, 0xbe, 0xd8, 0x58, 0xc6, 0x94, 0x02, + 0xdd, 0x84, 0x31, 0xc3, 0x54, 0x89, 0x33, 0x15, 0xbf, 0x98, 0x98, 0xc9, 0xcd, 0x55, 0xc3, 0xa4, + 0x54, 0xde, 0x92, 0xad, 0x68, 0x7d, 0x62, 0xb8, 0x98, 0x13, 0xa3, 0x37, 0x20, 0x4f, 0xb1, 0xb2, + 0xc9, 0x6d, 0x65, 0xaa, 0xe5, 0xe6, 0x2e, 0x44, 0x33, 0x0b, 0x87, 0xe0, 0x9c, 0x15, 0xf0, 0xce, + 0x16, 0x20, 0xdd, 0xe8, 0x9a, 0x7d, 0xdd, 0xd0, 0x64, 0x45, 0x23, 0x86, 0x2b, 0xeb, 0xaa, 0x33, + 0x35, 0xc6, 0x94, 0x28, 0x51, 0x39, 0x3c, 0x0c, 0xf5, 0xed, 0xed, 0xd6, 0xe2, 0xfc, 0xc4, 0xc1, + 0xe3, 0xe9, 0x72, 0x4b, 0x90, 0x37, 0x28, 0x75, 0x6b, 0xd1, 0xc1, 0x65, 0x7d, 0x04, 0xa2, 0x3a, + 0xc8, 0x83, 0x0b, 0x64, 0x8f, 0x74, 0x3d, 0xba, 0x85, 0xec, 0xb8, 0x8a, 0xeb, 0x39, 0xb2, 0x4a, + 0x1c, 0x57, 0x37, 0x14, 0xae, 0x67, 0x8a, 0xc9, 0xbf, 0x1e, 0xad, 0x67, 0xbd, 0xe9, 0xf3, 0x6e, + 0x31, 0xd6, 0xc5, 0x21, 0x27, 0x3e, 0x47, 0x8e, 0xc4, 0x39, 0x95, 0x5d, 0xa8, 0x1c, 0xcd, 0x8a, + 0x9e, 0x83, 0xbc, 0x66, 0x5b, 0x5d, 0x59, 0x51, 0x55, 0x9b, 0x38, 0x0e, 0x8b, 0x49, 0x16, 0xe7, + 0x28, 0xac, 0xc1, 0x41, 0xe8, 0x32, 0x14, 0x1d, 0xa7, 0x27, 0xbb, 0x8a, 0xad, 0x11, 0xd7, 0x50, + 0xfa, 0x84, 0x65, 0x4c, 0x16, 0x17, 0x1c, 0xa7, 0xd7, 0x19, 0x00, 0x57, 0x93, 0x99, 0x44, 0x39, + 0x59, 0xdb, 0x87, 0x7c, 0x30, 0x24, 0xa8, 0x08, 0x71, 0x5d, 0x65, 0x52, 0x93, 0x38, 0xae, 0xab, + 0x7e, 0xe8, 0xe3, 0xc7, 0x86, 0xfe, 0x9a, 0x1f, 0xfa, 0x04, 0xf3, 0x4a, 0x25, 0xda, 0x2b, 0x1b, + 0xa6, 0x4a, 0x44, 0xd8, 0x6b, 0xbf, 0x90, 0x20, 0xb1, 0xd8, 0x58, 0x46, 0x37, 0x7c, 0x4e, 0x89, + 0x71, 0x5e, 0x88, 0xdc, 0x84, 0xfe, 0x05, 0x98, 0x2b, 0x3a, 0xa4, 0x05, 0x24, 0xa4, 0x32, 0xb5, + 0xdf, 0xb4, 0x5d, 0xa2, 0xca, 0x96, 0x62, 0x13, 0xc3, 0xa5, 0x09, 0x95, 0x98, 0x49, 0xe2, 0x02, + 0x87, 0x6e, 0x72, 0x20, 0xba, 0x02, 0x25, 0x41, 0xd6, 0xbd, 0xa7, 0xf7, 0x54, 0x9b, 0x18, 0x4c, + 0xf5, 0x24, 0x16, 0xdc, 0x0b, 0x02, 0x5a, 0x5b, 0x82, 0x8c, 0xaf, 0x7a, 0x68, 0xaf, 0xab, 0x10, + 0x37, 0x2d, 0xe1, 0x9d, 0x08, 0x93, 0xdb, 0x16, 0xb1, 0x15, 0xd7, 0xb4, 0x71, 0xdc, 0xb4, 0x6a, + 0x3f, 0xca, 0x40, 0xc6, 0x07, 0xa0, 0xff, 0x83, 0xb4, 0x69, 0xc9, 0xb4, 0xe2, 0x99, 0xb4, 0x62, + 0x54, 0xad, 0xf8, 0xc4, 0x9d, 0x7d, 0x8b, 0xe0, 0x94, 0x69, 0xd1, 0x5f, 0xb4, 0x06, 0x85, 0x3e, + 0xe9, 0xcb, 0x8e, 0xe9, 0xd9, 0x5d, 0x22, 0x0f, 0x36, 0xff, 0x9f, 0x30, 0xfb, 0x3a, 0xe9, 0x9b, + 0xf6, 0xfe, 0x16, 0x23, 0xf4, 0x45, 0xad, 0xc4, 0x70, 0xae, 0x4f, 0xfa, 0x3e, 0x10, 0xdd, 0x82, + 0x54, 0x5f, 0xb1, 0xa8, 0x98, 0xc4, 0x51, 0x45, 0xb7, 0xae, 0x58, 0x01, 0xee, 0xb1, 0x3e, 0x5d, + 0xa2, 0xbb, 0x90, 0x52, 0x34, 0x8d, 0xf2, 0xf1, 0x62, 0x7d, 0x3e, 0xcc, 0xd7, 0xd0, 0x34, 0x9b, + 0x68, 0x8a, 0x1b, 0xdc, 0x7b, 0x4c, 0xd1, 0xb4, 0xb6, 0x85, 0x96, 0x20, 0xc7, 0x6c, 0xd0, 0x8d, + 0xfb, 0x54, 0xc4, 0x18, 0x13, 0x71, 0xe9, 0x48, 0x0b, 0x74, 0xe3, 0x7e, 0x40, 0x46, 0x96, 0xea, + 0xcf, 0x40, 0xe8, 0x75, 0xc8, 0xee, 0xea, 0x3d, 0x97, 0xd8, 0x54, 0x4a, 0x8a, 0x49, 0xb9, 0x18, + 0x96, 0xb2, 0xc4, 0x48, 0x02, 0x12, 0x32, 0xbb, 0x02, 0x82, 0xee, 0x42, 0xa6, 0xa7, 0xf7, 0x75, + 0x97, 0xf2, 0xa7, 0x19, 0xff, 0x74, 0x98, 0x7f, 0x8d, 0x52, 0x04, 0xd8, 0xd3, 0x3d, 0x0e, 0xa0, + 0xdc, 0x9e, 0x41, 0x9b, 0x83, 0x69, 0x4d, 0x65, 0x8e, 0xe2, 0xde, 0xa6, 0x14, 0x41, 0x6e, 0x8f, + 0x03, 0xd0, 0xf7, 0xa0, 0xc8, 0x2a, 0x79, 0x18, 0xc9, 0xec, 0x51, 0x7e, 0x58, 0xc6, 0x9b, 0x0b, + 0xa3, 0x71, 0x9c, 0x2f, 0x1f, 0x3c, 0x9e, 0xce, 0x07, 0xe1, 0x2b, 0x31, 0xcc, 0x3a, 0xc3, 0x20, + 0xb4, 0x6f, 0x8b, 0x4e, 0xe1, 0x7b, 0xf9, 0x29, 0x37, 0xb0, 0x76, 0x84, 0xf8, 0x80, 0x93, 0xe7, + 0x8b, 0x07, 0x8f, 0xa7, 0x61, 0x08, 0x5d, 0x89, 0x61, 0x60, 0xa2, 0xb9, 0xd7, 0x5f, 0x81, 0xf4, + 0x7b, 0xa6, 0xce, 0xac, 0xce, 0x31, 0x91, 0x11, 0xa9, 0xbb, 0x6a, 0xea, 0x41, 0xa3, 0x53, 0xef, + 0xb1, 0x35, 0x5a, 0x83, 0xa2, 0xa7, 0xba, 0xbb, 0x01, 0x9b, 0xf3, 0x47, 0xd9, 0xbc, 0xbd, 0xd8, + 0x59, 0x0a, 0xe5, 0x6e, 0x9e, 0x72, 0x0f, 0x2c, 0x6c, 0x43, 0x89, 0xf4, 0x2d, 0x77, 0x3f, 0x20, + 0xae, 0xc0, 0xc4, 0x5d, 0x0e, 0x8b, 0x6b, 0x52, 0xc2, 0x90, 0xbc, 0x02, 0x09, 0x82, 0xd1, 0xbb, + 0x90, 0x37, 0x5d, 0xd2, 0x1b, 0xb8, 0xac, 0xc8, 0xa4, 0xcd, 0x44, 0x54, 0x66, 0x87, 0xf4, 0x9a, + 0x7b, 0x96, 0x69, 0xbb, 0x61, 0xbf, 0x51, 0xdc, 0xd0, 0x6f, 0x54, 0x1e, 0x5f, 0xcd, 0x27, 0x69, + 0xaf, 0xa8, 0xfd, 0x39, 0x0e, 0x13, 0x51, 0x95, 0x89, 0x10, 0x24, 0x59, 0xb3, 0xe6, 0x1d, 0x9d, + 0x3d, 0xa3, 0x69, 0xc8, 0x75, 0xcd, 0x9e, 0xd7, 0x37, 0x64, 0x5d, 0xdd, 0xe3, 0xa7, 0x6a, 0x02, + 0x03, 0x07, 0xb5, 0xd4, 0x3d, 0x87, 0x1e, 0x07, 0x82, 0x80, 0xd2, 0xf3, 0xe6, 0x9b, 0xc5, 0x82, + 0x69, 0x83, 0x82, 0xd0, 0xcb, 0x03, 0x12, 0x36, 0x5f, 0xb0, 0x66, 0x58, 0x9c, 0x43, 0xd4, 0x28, + 0x3e, 0x70, 0x2c, 0x2a, 0xae, 0xc2, 0x5a, 0x8c, 0x60, 0xa3, 0xcf, 0x0e, 0xba, 0x03, 0xe0, 0xb8, + 0x8a, 0xed, 0xca, 0xae, 0xde, 0x27, 0xa2, 0x44, 0xcf, 0xd5, 0xf9, 0xf0, 0x53, 0xf7, 0x87, 0x9f, + 0x7a, 0xcb, 0x70, 0x6f, 0xdd, 0x7c, 0x4b, 0xe9, 0x79, 0x04, 0x67, 0x19, 0x79, 0x47, 0xef, 0xd3, + 0xc1, 0x23, 0xeb, 0xb8, 0xb4, 0xbd, 0x51, 0xd6, 0xd4, 0xf1, 0xac, 0x19, 0x4a, 0xcd, 0x38, 0x4f, + 0x43, 0x8a, 0x8d, 0x27, 0x2e, 0x2b, 0xc7, 0x2c, 0x16, 0x2b, 0x74, 0x9e, 0x4a, 0xb4, 0x89, 0x42, + 0x0f, 0x68, 0x56, 0x6b, 0x19, 0x3c, 0x04, 0xd4, 0x3e, 0x93, 0x00, 0x85, 0x7b, 0x45, 0xa4, 0x47, + 0x0f, 0x7b, 0x23, 0x7e, 0x32, 0x6f, 0x9c, 0xc0, 0xcf, 0xab, 0x30, 0x29, 0x48, 0x1c, 0xd2, 0x57, + 0x0c, 0x57, 0xef, 0x8e, 0x38, 0xfc, 0xf4, 0x70, 0x8b, 0x2d, 0x81, 0x67, 0xdb, 0x9c, 0xe2, 0x4c, + 0x41, 0x98, 0x53, 0x33, 0x00, 0x85, 0x6b, 0x3e, 0xa4, 0xbb, 0xf4, 0xcd, 0x74, 0x8f, 0x87, 0x74, + 0xaf, 0x7d, 0x96, 0x84, 0xf2, 0xe1, 0x2e, 0xc0, 0x06, 0xcb, 0x91, 0x29, 0xc3, 0x5f, 0xa2, 0xdb, + 0xa3, 0xad, 0x4b, 0x57, 0xd9, 0xe9, 0x91, 0x3c, 0xdc, 0x94, 0x5a, 0x8b, 0xa3, 0x4d, 0xa9, 0xa5, + 0xa2, 0x2d, 0xc8, 0x8b, 0x71, 0x74, 0x38, 0x85, 0xe6, 0xe6, 0xea, 0xc7, 0xf7, 0xa4, 0x3a, 0x26, + 0x8e, 0xd7, 0x73, 0xd9, 0x78, 0x4a, 0x0f, 0x31, 0x2e, 0x85, 0x2d, 0x91, 0x06, 0xa8, 0x6b, 0x1a, + 0x06, 0xe9, 0xba, 0xbc, 0x19, 0xf3, 0xe9, 0x8c, 0xa7, 0xec, 0xed, 0x13, 0x88, 0xa6, 0x80, 0x85, + 0x81, 0x00, 0x7f, 0xc0, 0x1c, 0xef, 0x1e, 0x06, 0x55, 0xfe, 0x22, 0x41, 0x2e, 0xa0, 0x07, 0xba, + 0x00, 0xc0, 0xcc, 0x90, 0x03, 0x69, 0x96, 0x65, 0x90, 0x8d, 0xff, 0x9a, 0x5c, 0xab, 0xfc, 0x3f, + 0x4c, 0x46, 0x3a, 0x20, 0x62, 0x8e, 0x94, 0x22, 0xe6, 0xc8, 0xf9, 0x02, 0xe4, 0x02, 0x53, 0xf1, + 0x6a, 0x32, 0x13, 0x2f, 0x27, 0x6a, 0x0f, 0x20, 0x17, 0x98, 0x1b, 0xd0, 0x22, 0xe4, 0xc8, 0x9e, + 0x45, 0x73, 0x87, 0x85, 0x86, 0x0f, 0x7a, 0x11, 0x27, 0xd1, 0x56, 0x57, 0xe9, 0x29, 0x76, 0x73, + 0x40, 0x8a, 0x83, 0x6c, 0x27, 0x49, 0xe4, 0x5f, 0xc7, 0x61, 0x3c, 0x34, 0x78, 0xa0, 0xd7, 0x20, + 0xf5, 0x80, 0x36, 0x1a, 0x7f, 0xe7, 0xcb, 0xcf, 0x98, 0x56, 0x02, 0x9b, 0x0b, 0x26, 0x74, 0x0d, + 0x52, 0x9a, 0x6d, 0x7a, 0x96, 0x7f, 0xad, 0x99, 0x0a, 0xb3, 0x2f, 0x30, 0x1d, 0xb0, 0xa0, 0xa3, + 0x7d, 0x9b, 0x3d, 0x8d, 0x44, 0x10, 0x18, 0x88, 0x07, 0x70, 0x1a, 0x72, 0x4c, 0xb8, 0x20, 0x48, + 0x72, 0x02, 0x06, 0xe2, 0x04, 0x15, 0xc8, 0x3c, 0xd4, 0x0d, 0xd5, 0x7c, 0x48, 0x54, 0x96, 0xc9, + 0x19, 0x3c, 0x58, 0x53, 0x66, 0x4b, 0xb1, 0x5d, 0x5d, 0xe9, 0xc9, 0x8a, 0xa6, 0xb1, 0x06, 0x9b, + 0xc1, 0x20, 0x40, 0x0d, 0x4d, 0x43, 0x2f, 0x40, 0x79, 0x57, 0x37, 0x94, 0x9e, 0xfe, 0x01, 0x91, + 0x6d, 0x96, 0xaf, 0x0e, 0xeb, 0xa7, 0x19, 0x5c, 0xf2, 0xe1, 0x3c, 0x8d, 0x9d, 0xda, 0x8f, 0x25, + 0x28, 0x8e, 0x0e, 0x48, 0x68, 0x1e, 0x60, 0xe8, 0x75, 0x71, 0xe9, 0x3b, 0x49, 0xac, 0x02, 0x5c, + 0x68, 0x0e, 0xd2, 0x3c, 0x2c, 0xc7, 0xfb, 0xcc, 0x27, 0xac, 0x7d, 0x28, 0x41, 0x61, 0x64, 0xd6, + 0x42, 0x13, 0x30, 0xc6, 0x66, 0x2d, 0xa6, 0x44, 0x02, 0xf3, 0xc5, 0x37, 0x91, 0x4d, 0x73, 0x59, + 0xd9, 0x31, 0x6d, 0x5e, 0xad, 0x8e, 0xdd, 0x75, 0xc4, 0xac, 0x5f, 0x18, 0x40, 0xb7, 0xec, 0xae, + 0x53, 0x7b, 0x2a, 0x41, 0x61, 0x64, 0x60, 0x0b, 0xe5, 0x9c, 0x14, 0x2e, 0xc6, 0xb7, 0xa0, 0x24, + 0x48, 0xfa, 0x8a, 0x65, 0xe9, 0x86, 0xe6, 0xeb, 0xf5, 0xd2, 0x31, 0xd3, 0xa0, 0xd0, 0x72, 0x9d, + 0x73, 0xe1, 0x62, 0x37, 0xb8, 0x74, 0xd0, 0x25, 0x28, 0x0e, 0xee, 0xec, 0x3b, 0x8a, 0xdb, 0xbd, + 0xc7, 0xbb, 0x2c, 0xce, 0xdb, 0xfc, 0xaa, 0x3e, 0x4f, 0x61, 0x95, 0x5b, 0x50, 0x18, 0x11, 0x43, + 0x4d, 0xf5, 0x67, 0x06, 0x43, 0x25, 0x7b, 0x42, 0xe7, 0x04, 0x2e, 0x88, 0xb1, 0x81, 0x03, 0x6b, + 0x9f, 0x26, 0x21, 0x1f, 0x9c, 0xd2, 0xd0, 0xab, 0x90, 0x0c, 0x5c, 0x47, 0xae, 0x3c, 0x7b, 0xa6, + 0x63, 0x0b, 0xd6, 0x53, 0x18, 0x13, 0x52, 0xe0, 0x14, 0x79, 0xdf, 0x53, 0x7a, 0xba, 0xbb, 0x2f, + 0x77, 0x4d, 0x43, 0xd5, 0x79, 0x0f, 0xe6, 0x7e, 0xb8, 0x76, 0x8c, 0xac, 0xa6, 0xe0, 0x5c, 0xf0, + 0x19, 0x31, 0x22, 0x87, 0x41, 0x0e, 0xc2, 0x50, 0x14, 0x47, 0x87, 0x1f, 0x7d, 0x7e, 0xd3, 0xfc, + 0xdf, 0x63, 0xa4, 0xf3, 0xfb, 0x9e, 0x48, 0x88, 0x02, 0x17, 0xb1, 0x20, 0xd2, 0xe2, 0x70, 0x74, + 0x93, 0xe1, 0xe8, 0x86, 0xa3, 0x30, 0x16, 0x11, 0x85, 0x3e, 0x8c, 0x87, 0xac, 0x40, 0x57, 0x61, + 0xbc, 0x47, 0x76, 0x7d, 0x7d, 0x79, 0x38, 0xc4, 0xdd, 0xb1, 0x44, 0x11, 0x0b, 0xc3, 0x80, 0xa0, + 0x17, 0x01, 0xd9, 0xba, 0x76, 0xef, 0x10, 0x71, 0x9c, 0x11, 0x97, 0x19, 0x26, 0x40, 0x5d, 0xe9, + 0x40, 0x3e, 0x68, 0x16, 0xb5, 0x83, 0xdf, 0x75, 0x47, 0x36, 0xc9, 0x71, 0x18, 0xdf, 0x60, 0x68, + 0x6a, 0x50, 0x74, 0x2e, 0x90, 0x14, 0xb5, 0x97, 0x21, 0xe3, 0x87, 0x15, 0x65, 0x61, 0xac, 0xb5, + 0xb1, 0xd1, 0xc4, 0xe5, 0x18, 0x2a, 0x02, 0xac, 0x35, 0x97, 0x3a, 0x72, 0x7b, 0xbb, 0xd3, 0xc4, + 0x65, 0x89, 0xae, 0x97, 0xb6, 0xd7, 0xd6, 0xc4, 0x3a, 0x51, 0xdb, 0x05, 0x14, 0x1e, 0xd6, 0x23, + 0x87, 0xaf, 0xbb, 0x00, 0x8a, 0xad, 0xc9, 0xa2, 0x17, 0xc7, 0x8f, 0xba, 0xee, 0xf3, 0xce, 0x22, + 0xa6, 0x4a, 0xc5, 0xd6, 0xd8, 0x93, 0x53, 0x33, 0xe1, 0x54, 0xc4, 0x14, 0x7f, 0x92, 0x0a, 0xfd, + 0x66, 0x07, 0x71, 0xed, 0x57, 0x71, 0x48, 0xd3, 0x69, 0x7e, 0xcd, 0xd4, 0xd0, 0xeb, 0x00, 0x8a, + 0xeb, 0xda, 0xfa, 0x8e, 0xe7, 0x0e, 0x8e, 0x91, 0xe9, 0xe8, 0x8b, 0x41, 0xc3, 0xa7, 0xc3, 0x01, + 0x16, 0x9a, 0x0c, 0x74, 0x1c, 0x0e, 0xc7, 0x37, 0x81, 0x4b, 0x14, 0x11, 0x4c, 0x86, 0x57, 0xa1, + 0x62, 0xee, 0x38, 0xc4, 0x7e, 0x40, 0x54, 0x39, 0xcc, 0x94, 0x60, 0x4c, 0x67, 0x7c, 0x8a, 0xce, + 0x21, 0xe6, 0x2b, 0x50, 0x72, 0xc8, 0x03, 0x62, 0xd3, 0x52, 0x34, 0xbc, 0xfe, 0x0e, 0xb1, 0xc5, + 0xbb, 0xbe, 0xa2, 0x0f, 0xde, 0x60, 0x50, 0xf4, 0x3c, 0x14, 0x06, 0x84, 0x2e, 0xd9, 0x73, 0x59, + 0x62, 0x67, 0x71, 0xde, 0x07, 0x76, 0xc8, 0x9e, 0x4b, 0xd5, 0xde, 0x31, 0xd5, 0xfd, 0x51, 0x0d, + 0x52, 0x5c, 0x6d, 0x8a, 0x08, 0xec, 0x5c, 0xfb, 0x28, 0x09, 0x19, 0x76, 0xfb, 0xb1, 0x14, 0x9a, + 0x92, 0x39, 0x1a, 0x0f, 0xd9, 0x71, 0x6d, 0x3a, 0xb3, 0xb3, 0x34, 0xa0, 0x17, 0x22, 0x0a, 0xdc, + 0x62, 0x30, 0xf4, 0x22, 0x8c, 0x33, 0x92, 0xb0, 0x4b, 0x56, 0x62, 0xb8, 0x44, 0x51, 0x41, 0xbb, + 0x46, 0x23, 0x90, 0xf8, 0xfa, 0x11, 0x58, 0x84, 0x49, 0xd7, 0x56, 0xd8, 0xbc, 0x3a, 0xba, 0x25, + 0x73, 0xcf, 0xfc, 0xf8, 0xc1, 0xe3, 0xe9, 0x42, 0x87, 0x12, 0xb4, 0x16, 0x45, 0xb7, 0x40, 0x8c, + 0xbe, 0xa5, 0x06, 0xd5, 0x68, 0xc0, 0x84, 0x63, 0x29, 0x46, 0x48, 0xc8, 0x18, 0x13, 0xc2, 0x26, + 0x60, 0x6a, 0xff, 0x40, 0xc6, 0x38, 0xa5, 0x1e, 0x15, 0xd1, 0x81, 0x73, 0xa2, 0x5a, 0x23, 0x25, + 0x31, 0xef, 0xce, 0x9f, 0x3e, 0x78, 0x3c, 0x8d, 0x78, 0x91, 0x8f, 0xc8, 0x3b, 0x63, 0x0d, 0x61, + 0x23, 0x52, 0x5f, 0x86, 0x33, 0xc3, 0x0b, 0xdb, 0xa8, 0xc4, 0x34, 0x8b, 0xd7, 0xc4, 0xe0, 0x82, + 0x16, 0x64, 0xbb, 0x0e, 0x93, 0xc4, 0x88, 0x4a, 0xb3, 0x0c, 0x63, 0x42, 0xc4, 0x08, 0x65, 0xd8, + 0x05, 0x80, 0xfb, 0xba, 0xa1, 0xf2, 0x3a, 0x66, 0x6f, 0x2d, 0x12, 0x38, 0x4b, 0x21, 0xac, 0x50, + 0xe7, 0x53, 0xbc, 0xf2, 0x6b, 0xdf, 0x87, 0x12, 0x0d, 0xc6, 0x3a, 0x71, 0x6d, 0xbd, 0xbb, 0xac, + 0x78, 0x1a, 0x41, 0x75, 0x40, 0xbb, 0x3d, 0x53, 0x89, 0x68, 0x89, 0x34, 0xe4, 0x65, 0x86, 0x0b, + 0xee, 0x74, 0x15, 0xca, 0xba, 0xe1, 0x46, 0x27, 0x48, 0x51, 0x37, 0x82, 0xb4, 0xf3, 0x45, 0xc8, + 0xf3, 0x91, 0x8a, 0x53, 0xd7, 0x7e, 0x19, 0x87, 0xf1, 0xe1, 0xfe, 0x5b, 0x5e, 0xbf, 0xaf, 0xd8, + 0xfb, 0xb4, 0xcf, 0x76, 0x4d, 0xcf, 0x88, 0xd2, 0x00, 0x97, 0x19, 0x26, 0xb8, 0xff, 0x0c, 0x94, + 0x1d, 0xaf, 0x1f, 0x55, 0xb3, 0x45, 0xc7, 0xeb, 0x07, 0x29, 0xdf, 0x85, 0xd2, 0xfb, 0x1e, 0x9d, + 0xaa, 0x7b, 0xc4, 0xef, 0x6f, 0x3c, 0x45, 0x6f, 0x44, 0xa7, 0xe8, 0x88, 0x56, 0x75, 0xe6, 0xb8, + 0x86, 0xfb, 0x2d, 0x21, 0x01, 0x17, 0x7d, 0x59, 0xbc, 0xf5, 0x55, 0xbe, 0x0b, 0xa5, 0x43, 0x24, + 0x74, 0x40, 0xf4, 0x89, 0x98, 0xfa, 0x12, 0x1e, 0xac, 0xa9, 0x91, 0x41, 0x57, 0x8c, 0x28, 0x5e, + 0x66, 0x98, 0x60, 0xd9, 0x7e, 0x12, 0x87, 0xc2, 0x48, 0xd5, 0x44, 0xf6, 0xee, 0x37, 0x20, 0xc5, + 0xa5, 0x1d, 0xfd, 0xc2, 0x71, 0x44, 0x88, 0x18, 0x6e, 0x56, 0x62, 0x58, 0xf0, 0xa1, 0xe7, 0x21, + 0xcf, 0x9b, 0x81, 0x48, 0x9c, 0x84, 0x68, 0x09, 0x39, 0x0e, 0x65, 0x06, 0x56, 0x7e, 0x2e, 0x41, + 0x4a, 0x1c, 0x6a, 0x37, 0x06, 0x2f, 0x3f, 0x02, 0x73, 0x49, 0x54, 0xd3, 0x86, 0x61, 0xd3, 0x8e, + 0x3c, 0xe6, 0x12, 0x23, 0xc7, 0x1c, 0xba, 0x0d, 0x67, 0xbb, 0x8a, 0x21, 0xef, 0x10, 0xf9, 0x3d, + 0xc7, 0x34, 0x64, 0x62, 0x74, 0x4d, 0x95, 0xa8, 0xb2, 0x62, 0xdb, 0xca, 0xbe, 0xf8, 0x84, 0x32, + 0xd9, 0x55, 0x8c, 0x79, 0xb2, 0xea, 0x98, 0x46, 0x93, 0x63, 0x1b, 0x14, 0x39, 0x9f, 0x86, 0x31, + 0xa6, 0x7a, 0xed, 0xd3, 0x38, 0xc0, 0x30, 0x8a, 0x91, 0xfe, 0xba, 0xc8, 0xae, 0x45, 0x5d, 0x5b, + 0x67, 0xb7, 0x29, 0xf1, 0x0a, 0x3e, 0x08, 0xa2, 0x5c, 0x9e, 0xa1, 0xbb, 0xdc, 0x0f, 0x98, 0x3d, + 0x1f, 0x6a, 0x72, 0xc9, 0x7f, 0xd3, 0x31, 0x33, 0x16, 0x7d, 0xcc, 0xbc, 0x02, 0x63, 0x1a, 0x2d, + 0xcb, 0x29, 0xc2, 0x22, 0xfa, 0xdc, 0xb3, 0x32, 0x95, 0xd5, 0xef, 0x4a, 0x0c, 0x73, 0x0e, 0xf4, + 0x3a, 0xa4, 0x1d, 0x9e, 0xbb, 0x53, 0xbb, 0x47, 0xbd, 0x00, 0x0e, 0xa5, 0xf9, 0x4a, 0x0c, 0xfb, + 0x5c, 0xb4, 0x49, 0xa8, 0x8a, 0xab, 0xd4, 0xfe, 0x26, 0x01, 0x62, 0x6f, 0xd3, 0x0c, 0xd5, 0x32, + 0x59, 0x45, 0x1b, 0xbb, 0xba, 0x86, 0xce, 0x42, 0xc2, 0xb3, 0x7b, 0xdc, 0xa1, 0xf3, 0xe9, 0x83, + 0xc7, 0xd3, 0x89, 0x6d, 0xbc, 0x86, 0x29, 0x0c, 0xbd, 0x09, 0xe9, 0x7b, 0x44, 0x51, 0x89, 0xed, + 0x4f, 0x10, 0xd7, 0x8f, 0x78, 0x3f, 0x37, 0x22, 0xb1, 0xbe, 0xc2, 0x79, 0x9a, 0x86, 0x6b, 0xef, + 0x63, 0x5f, 0x02, 0xad, 0x22, 0xdd, 0x70, 0x48, 0xd7, 0xb3, 0xfd, 0xaf, 0x67, 0x83, 0x35, 0x9a, + 0x82, 0x34, 0xf5, 0x98, 0xe9, 0xb9, 0xe2, 0x00, 0xf5, 0x97, 0x95, 0x3b, 0x90, 0x0f, 0x8a, 0x43, + 0x65, 0x48, 0xdc, 0x27, 0xfb, 0x22, 0xfc, 0xf4, 0x91, 0xde, 0x5c, 0x78, 0x92, 0xf3, 0xb8, 0xf3, + 0xc5, 0x9d, 0xf8, 0x6d, 0xa9, 0xd6, 0x86, 0x3c, 0xd5, 0x0e, 0x13, 0xfe, 0xf2, 0xe4, 0x5f, 0x1e, + 0x2c, 0x6a, 0xbf, 0x8d, 0xc3, 0xe9, 0xe8, 0xf7, 0x91, 0x68, 0x1d, 0x4a, 0x44, 0x78, 0x81, 0x4e, + 0xe5, 0xbb, 0xba, 0xff, 0x0d, 0xef, 0xd2, 0x49, 0x5c, 0x86, 0x8b, 0x64, 0x34, 0x28, 0x77, 0x20, + 0x63, 0x0b, 0xb5, 0x45, 0x13, 0xa8, 0x46, 0xcb, 0xf1, 0x8d, 0xc3, 0x03, 0x7a, 0x74, 0x0b, 0xd2, + 0x7d, 0x96, 0x0b, 0x7e, 0x5f, 0x3c, 0xff, 0xac, 0x84, 0xc1, 0x3e, 0x31, 0xba, 0x06, 0x63, 0xf4, + 0x90, 0xf4, 0x6b, 0xa1, 0x12, 0xcd, 0x45, 0x4f, 0x43, 0xcc, 0x09, 0xd1, 0x4b, 0x90, 0xec, 0x99, + 0x9a, 0xff, 0xf5, 0xef, 0x6c, 0x34, 0xc3, 0x9a, 0xa9, 0x61, 0x46, 0x56, 0xfb, 0x9d, 0x04, 0xe5, + 0xc3, 0x57, 0x59, 0xf4, 0x2a, 0x64, 0xba, 0xa6, 0xe1, 0xb8, 0x8a, 0xe1, 0x0a, 0x8f, 0x3d, 0x7b, + 0x4c, 0x5d, 0x89, 0xe1, 0x01, 0x03, 0x9a, 0x3b, 0xd4, 0x29, 0x8f, 0xbc, 0x9e, 0x06, 0x7a, 0xe3, + 0x1c, 0x24, 0x77, 0x3d, 0xa3, 0x2b, 0xbe, 0xc2, 0x9c, 0x3f, 0x6a, 0xb3, 0x25, 0xcf, 0xe8, 0xae, + 0xc4, 0x30, 0xa3, 0x1d, 0x76, 0xa3, 0xdf, 0xc7, 0x21, 0x17, 0x50, 0x06, 0xcd, 0x42, 0x96, 0xd6, + 0xd6, 0x71, 0x6d, 0x33, 0xa3, 0x8a, 0x27, 0x34, 0x0d, 0xb0, 0x63, 0x9a, 0x3d, 0x79, 0x98, 0xb2, + 0x99, 0x95, 0x18, 0xce, 0x52, 0x18, 0x97, 0xf8, 0x1c, 0xe4, 0x74, 0xc3, 0xbd, 0x75, 0x33, 0xd0, + 0xb9, 0xe9, 0x11, 0x0c, 0xfa, 0xe0, 0x1d, 0x2e, 0xba, 0x0c, 0x05, 0x76, 0x7c, 0x0f, 0x88, 0x68, + 0xcd, 0x48, 0x2b, 0x31, 0x9c, 0x17, 0x60, 0x4e, 0x76, 0xf8, 0x10, 0x18, 0x8b, 0x38, 0x04, 0xd0, + 0x0c, 0xb0, 0x5e, 0x75, 0xeb, 0xa6, 0x6c, 0x38, 0x82, 0x2e, 0x25, 0xb6, 0x2c, 0x70, 0xc4, 0x86, + 0xc3, 0x29, 0x6f, 0x43, 0xc1, 0xd3, 0x0d, 0xf7, 0xfa, 0xdc, 0x6d, 0x41, 0xc7, 0x3f, 0x72, 0x8c, + 0x0f, 0xcd, 0xdd, 0x6e, 0x31, 0x34, 0xfb, 0x78, 0xc0, 0x29, 0xf9, 0x94, 0xe2, 0x7b, 0x6f, 0x35, + 0x99, 0xc9, 0x94, 0xb3, 0xb5, 0x2f, 0x24, 0x80, 0xa1, 0x8f, 0x23, 0x3b, 0xfa, 0x1d, 0xc8, 0xea, + 0x86, 0xee, 0xca, 0x8a, 0xad, 0x9d, 0xf0, 0xf2, 0x92, 0xa1, 0xf4, 0x0d, 0x5b, 0x73, 0xd0, 0x2d, + 0x48, 0x32, 0xb6, 0xc4, 0x89, 0xdf, 0x7c, 0x31, 0x7a, 0xf1, 0xbd, 0x91, 0xb7, 0x9f, 0xb8, 0xae, + 0xa2, 0x3b, 0x50, 0xa2, 0x70, 0x79, 0x10, 0x5f, 0x9e, 0xe7, 0xd1, 0x01, 0x2e, 0x50, 0x52, 0x7f, + 0xe5, 0xd4, 0xfe, 0x1e, 0x87, 0x53, 0x11, 0xaf, 0xb9, 0x06, 0xb6, 0x26, 0x8e, 0xb2, 0x35, 0xf9, + 0xf5, 0x6c, 0x7d, 0x4d, 0xd8, 0xca, 0x0b, 0xf0, 0x85, 0x13, 0xbd, 0x6b, 0xab, 0x37, 0x6c, 0x6d, + 0xc4, 0xe4, 0xd4, 0xb3, 0x4c, 0x4e, 0x9f, 0xd0, 0xe4, 0xca, 0x0f, 0x20, 0xd1, 0xb0, 0xb5, 0xff, + 0x78, 0x39, 0x0f, 0x4b, 0x73, 0x6e, 0x30, 0xcd, 0x50, 0x2f, 0x9b, 0x2a, 0x11, 0x57, 0x73, 0xf6, + 0x4c, 0x4f, 0x89, 0xe0, 0x65, 0x9c, 0x2f, 0xae, 0xfe, 0x35, 0x0e, 0xf9, 0xe0, 0xa7, 0x5f, 0x74, + 0x16, 0x26, 0xdb, 0x9b, 0x4d, 0xdc, 0xe8, 0xb4, 0xb1, 0xdc, 0x79, 0x67, 0xb3, 0x29, 0x6f, 0x6f, + 0xbc, 0xb9, 0xd1, 0x7e, 0x7b, 0xa3, 0x1c, 0x43, 0xe7, 0xe0, 0xf4, 0x7a, 0x73, 0xbd, 0x8d, 0xdf, + 0x91, 0xb7, 0xda, 0xdb, 0x78, 0xa1, 0x29, 0xfb, 0x84, 0xe5, 0xa7, 0x69, 0x74, 0x16, 0x26, 0x96, + 0xf1, 0xe6, 0x42, 0x08, 0xf5, 0xa7, 0x0c, 0x45, 0xd1, 0x3b, 0x7b, 0x08, 0xf5, 0x49, 0x16, 0x55, + 0x60, 0xb2, 0xb9, 0xbe, 0xd9, 0x09, 0x4b, 0xfc, 0x29, 0xa0, 0x71, 0xc8, 0xaf, 0x37, 0x36, 0x87, + 0xa0, 0x47, 0x25, 0x74, 0x06, 0x50, 0x63, 0x79, 0x19, 0x37, 0x97, 0x1b, 0x9d, 0x00, 0xed, 0x6f, + 0xca, 0x68, 0x02, 0x4a, 0x4b, 0xad, 0xb5, 0x4e, 0x13, 0x0f, 0xa1, 0x3f, 0x1b, 0x47, 0xa7, 0xa0, + 0xb8, 0xd6, 0x5a, 0x6f, 0x75, 0x86, 0xc0, 0x7f, 0x30, 0xe0, 0xf6, 0x46, 0xab, 0xbd, 0x31, 0x04, + 0x7e, 0x81, 0x10, 0x82, 0xc2, 0x6a, 0xbb, 0x15, 0x80, 0xfd, 0xe1, 0x14, 0x55, 0xdb, 0x37, 0xb7, + 0xb5, 0xf1, 0xe6, 0x10, 0xf5, 0xf1, 0x12, 0xd5, 0x83, 0x1b, 0x3b, 0x82, 0xf8, 0x68, 0x19, 0x55, + 0xe1, 0x6c, 0xbb, 0xd3, 0x5c, 0x93, 0x9b, 0xdf, 0xde, 0x6c, 0xe3, 0xce, 0x21, 0xfc, 0x57, 0xcb, + 0xf3, 0x77, 0x1f, 0x3d, 0xa9, 0xc6, 0x3e, 0x7f, 0x52, 0x8d, 0x7d, 0xf5, 0xa4, 0x2a, 0x7d, 0x78, + 0x50, 0x95, 0x3e, 0x3e, 0xa8, 0x4a, 0x7f, 0x3c, 0xa8, 0x4a, 0x8f, 0x0e, 0xaa, 0xd2, 0x17, 0x07, + 0x55, 0xe9, 0xe9, 0x41, 0x35, 0xf6, 0xd5, 0x41, 0x55, 0xfa, 0xc9, 0x97, 0xd5, 0xd8, 0xa3, 0x2f, + 0xab, 0xb1, 0xcf, 0xbf, 0xac, 0xc6, 0xbe, 0x93, 0xe2, 0xa1, 0xdf, 0x49, 0xb1, 0xef, 0x59, 0x37, + 0xfe, 0x19, 0x00, 0x00, 0xff, 0xff, 0xd2, 0xa5, 0x24, 0xbc, 0x5d, 0x24, 0x00, 0x00, } func (x OperatorType) String() string { @@ -4703,6 +4800,50 @@ func (this *EmptySourceOperator) Equal(that interface{}) bool { } return true } +func (this *OTelLog) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*OTelLog) + if !ok { + that2, ok := that.(OTelLog) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if len(this.Attributes) != len(that1.Attributes) { + return false + } + for i := range this.Attributes { + if !this.Attributes[i].Equal(that1.Attributes[i]) { + return false + } + } + if this.TimeColumnIndex != that1.TimeColumnIndex { + return false + } + if this.ObservedTimeColumnIndex != that1.ObservedTimeColumnIndex { + return false + } + if this.SeverityNumber != that1.SeverityNumber { + return false + } + if this.SeverityText != that1.SeverityText { + return false + } + if this.BodyColumnIndex != that1.BodyColumnIndex { + return false + } + return true +} func (this *OTelSpan) Equal(that interface{}) bool { if that == nil { return this == nil @@ -5264,6 +5405,14 @@ func (this *OTelExportSinkOperator) Equal(that interface{}) bool { return false } } + if len(this.Logs) != len(that1.Logs) { + return false + } + for i := range this.Logs { + if !this.Logs[i].Equal(that1.Logs[i]) { + return false + } + } return true } func (this *ScalarExpression) Equal(that interface{}) bool { @@ -6219,6 +6368,23 @@ func (this *EmptySourceOperator) GoString() string { s = append(s, "}") return strings.Join(s, "") } +func (this *OTelLog) GoString() string { + if this == nil { + return "nil" + } + s := make([]string, 0, 10) + s = append(s, "&planpb.OTelLog{") + if this.Attributes != nil { + s = append(s, "Attributes: "+fmt.Sprintf("%#v", this.Attributes)+",\n") + } + s = append(s, "TimeColumnIndex: "+fmt.Sprintf("%#v", this.TimeColumnIndex)+",\n") + s = append(s, "ObservedTimeColumnIndex: "+fmt.Sprintf("%#v", this.ObservedTimeColumnIndex)+",\n") + s = append(s, "SeverityNumber: "+fmt.Sprintf("%#v", this.SeverityNumber)+",\n") + s = append(s, "SeverityText: "+fmt.Sprintf("%#v", this.SeverityText)+",\n") + s = append(s, "BodyColumnIndex: "+fmt.Sprintf("%#v", this.BodyColumnIndex)+",\n") + s = append(s, "}") + return strings.Join(s, "") +} func (this *OTelSpan) GoString() string { if this == nil { return "nil" @@ -6426,7 +6592,7 @@ func (this *OTelExportSinkOperator) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 8) + s := make([]string, 0, 9) s = append(s, "&planpb.OTelExportSinkOperator{") if this.EndpointConfig != nil { s = append(s, "EndpointConfig: "+fmt.Sprintf("%#v", this.EndpointConfig)+",\n") @@ -6440,6 +6606,9 @@ func (this *OTelExportSinkOperator) GoString() string { if this.Spans != nil { s = append(s, "Spans: "+fmt.Sprintf("%#v", this.Spans)+",\n") } + if this.Logs != nil { + s = append(s, "Logs: "+fmt.Sprintf("%#v", this.Logs)+",\n") + } s = append(s, "}") return strings.Join(s, "") } @@ -8312,6 +8481,70 @@ func (m *EmptySourceOperator) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *OTelLog) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *OTelLog) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OTelLog) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.BodyColumnIndex != 0 { + i = encodeVarintPlan(dAtA, i, uint64(m.BodyColumnIndex)) + i-- + dAtA[i] = 0x30 + } + if len(m.SeverityText) > 0 { + i -= len(m.SeverityText) + copy(dAtA[i:], m.SeverityText) + i = encodeVarintPlan(dAtA, i, uint64(len(m.SeverityText))) + i-- + dAtA[i] = 0x2a + } + if m.SeverityNumber != 0 { + i = encodeVarintPlan(dAtA, i, uint64(m.SeverityNumber)) + i-- + dAtA[i] = 0x20 + } + if m.ObservedTimeColumnIndex != 0 { + i = encodeVarintPlan(dAtA, i, uint64(m.ObservedTimeColumnIndex)) + i-- + dAtA[i] = 0x18 + } + if m.TimeColumnIndex != 0 { + i = encodeVarintPlan(dAtA, i, uint64(m.TimeColumnIndex)) + i-- + dAtA[i] = 0x10 + } + if len(m.Attributes) > 0 { + for iNdEx := len(m.Attributes) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Attributes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintPlan(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func (m *OTelSpan) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -8907,6 +9140,20 @@ func (m *OTelExportSinkOperator) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if len(m.Logs) > 0 { + for iNdEx := len(m.Logs) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Logs[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintPlan(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } + } if len(m.Spans) > 0 { for iNdEx := len(m.Spans) - 1; iNdEx >= 0; iNdEx-- { { @@ -10224,6 +10471,37 @@ func (m *EmptySourceOperator) Size() (n int) { return n } +func (m *OTelLog) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Attributes) > 0 { + for _, e := range m.Attributes { + l = e.Size() + n += 1 + l + sovPlan(uint64(l)) + } + } + if m.TimeColumnIndex != 0 { + n += 1 + sovPlan(uint64(m.TimeColumnIndex)) + } + if m.ObservedTimeColumnIndex != 0 { + n += 1 + sovPlan(uint64(m.ObservedTimeColumnIndex)) + } + if m.SeverityNumber != 0 { + n += 1 + sovPlan(uint64(m.SeverityNumber)) + } + l = len(m.SeverityText) + if l > 0 { + n += 1 + l + sovPlan(uint64(l)) + } + if m.BodyColumnIndex != 0 { + n += 1 + sovPlan(uint64(m.BodyColumnIndex)) + } + return n +} + func (m *OTelSpan) Size() (n int) { if m == nil { return 0 @@ -10526,6 +10804,12 @@ func (m *OTelExportSinkOperator) Size() (n int) { n += 1 + l + sovPlan(uint64(l)) } } + if len(m.Logs) > 0 { + for _, e := range m.Logs { + l = e.Size() + n += 1 + l + sovPlan(uint64(l)) + } + } return n } @@ -11296,6 +11580,26 @@ func (this *EmptySourceOperator) String() string { }, "") return s } +func (this *OTelLog) String() string { + if this == nil { + return "nil" + } + repeatedStringForAttributes := "[]*OTelAttribute{" + for _, f := range this.Attributes { + repeatedStringForAttributes += strings.Replace(f.String(), "OTelAttribute", "OTelAttribute", 1) + "," + } + repeatedStringForAttributes += "}" + s := strings.Join([]string{`&OTelLog{`, + `Attributes:` + repeatedStringForAttributes + `,`, + `TimeColumnIndex:` + fmt.Sprintf("%v", this.TimeColumnIndex) + `,`, + `ObservedTimeColumnIndex:` + fmt.Sprintf("%v", this.ObservedTimeColumnIndex) + `,`, + `SeverityNumber:` + fmt.Sprintf("%v", this.SeverityNumber) + `,`, + `SeverityText:` + fmt.Sprintf("%v", this.SeverityText) + `,`, + `BodyColumnIndex:` + fmt.Sprintf("%v", this.BodyColumnIndex) + `,`, + `}`, + }, "") + return s +} func (this *OTelSpan) String() string { if this == nil { return "nil" @@ -11531,11 +11835,17 @@ func (this *OTelExportSinkOperator) String() string { repeatedStringForSpans += strings.Replace(f.String(), "OTelSpan", "OTelSpan", 1) + "," } repeatedStringForSpans += "}" + repeatedStringForLogs := "[]*OTelLog{" + for _, f := range this.Logs { + repeatedStringForLogs += strings.Replace(f.String(), "OTelLog", "OTelLog", 1) + "," + } + repeatedStringForLogs += "}" s := strings.Join([]string{`&OTelExportSinkOperator{`, `EndpointConfig:` + strings.Replace(this.EndpointConfig.String(), "OTelEndpointConfig", "OTelEndpointConfig", 1) + `,`, `Resource:` + strings.Replace(this.Resource.String(), "OTelResource", "OTelResource", 1) + `,`, `Metrics:` + repeatedStringForMetrics + `,`, `Spans:` + repeatedStringForSpans + `,`, + `Logs:` + repeatedStringForLogs + `,`, `}`, }, "") return s @@ -16110,6 +16420,198 @@ func (m *EmptySourceOperator) Unmarshal(dAtA []byte) error { } return nil } +func (m *OTelLog) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPlan + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: OTelLog: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: OTelLog: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Attributes", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPlan + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPlan + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPlan + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Attributes = append(m.Attributes, &OTelAttribute{}) + if err := m.Attributes[len(m.Attributes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field TimeColumnIndex", wireType) + } + m.TimeColumnIndex = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPlan + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.TimeColumnIndex |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ObservedTimeColumnIndex", wireType) + } + m.ObservedTimeColumnIndex = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPlan + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ObservedTimeColumnIndex |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SeverityNumber", wireType) + } + m.SeverityNumber = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPlan + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SeverityNumber |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SeverityText", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPlan + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthPlan + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthPlan + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SeverityText = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field BodyColumnIndex", wireType) + } + m.BodyColumnIndex = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPlan + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.BodyColumnIndex |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipPlan(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthPlan + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *OTelSpan) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -17679,6 +18181,40 @@ func (m *OTelExportSinkOperator) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Logs", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPlan + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthPlan + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthPlan + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Logs = append(m.Logs, &OTelLog{}) + if err := m.Logs[len(m.Logs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipPlan(dAtA[iNdEx:]) diff --git a/src/carnot/planpb/plan.proto b/src/carnot/planpb/plan.proto index e92498ca4b4..c7bcb552dda 100644 --- a/src/carnot/planpb/plan.proto +++ b/src/carnot/planpb/plan.proto @@ -22,7 +22,7 @@ package px.carnot.planpb; option go_package = "planpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/wrappers.proto"; import "src/api/proto/uuidpb/uuid.proto"; import "src/shared/types/typespb/types.proto"; @@ -358,6 +358,34 @@ message EmptySourceOperator { repeated px.types.DataType column_types = 2; } +// OTelLog maps operator columns to each field in the OpenTelemetry Log configuration. +// The mapping ensures that each row of the table will be a separate log. +// Maps to the config described here: +// https://github.com/open-telemetry/opentelemetry-proto/blob/d7770822d70c7bd47a6891fc9faacc66fc4af3d3/opentelemetry/proto/logs/v1/logs.proto#L136 +message OTelLog { + // A mapping of the OpenTelemetry attribute name to the data that populates that attribute. + repeated OTelAttribute attributes = 1; + + // start_time_column points to the column that contains the start + // time of the aggregation. Column must be of type TIME64NS. + int64 time_column_index = 2; + + // (Optional) The column that contains the observed time. Defaults + // to time_column_index (time_unix_nano) if not set (index < 0). + int64 observed_time_column_index = 3; + + // The severity number to use for the log. This corresponds to the OTel's + // opentelemetry.proto.logs.v1.SeverityNumber enum. + // https://github.com/open-telemetry/opentelemetry-proto/blob/9d7c091a619d8f53c31cd54c0b604eec3f7611c1/opentelemetry/proto/logs/v1/logs.proto#L86 + int64 severity_number = 4; + + // The severity text string to use for the log (e.g. "INFO", "ERROR"). + string severity_text = 5; + + // Column corresponding to the body of the log. + int64 body_column_index = 6; +} + // OTelSpan maps operator columns to each field in the OpenTelemetry Span configuration. // The mapping ensures that each row of the table will be a separate span. // Maps to the config described here: @@ -511,10 +539,12 @@ message OTelExportSinkOperator { OTelEndpointConfig endpoint_config = 1; // Resource describes where the telemetry data comes from. OTelResource resource = 2; - // Metrics describest the exported metrics for this resource. + // Metrics describes the exported metrics for this resource. repeated OTelMetric metrics = 3; - // Metrics describes the exported spans for this resource. + // Spans describes the exported spans for this resource. repeated OTelSpan spans = 4; + // Logs describes the exported logs for this resource. + repeated OTelLog logs = 5; } // Scalar expression is any single valued expression. diff --git a/src/carnot/queryresultspb/BUILD.bazel b/src/carnot/queryresultspb/BUILD.bazel index 11d62d480e7..23c54c28bc9 100644 --- a/src/carnot/queryresultspb/BUILD.bazel +++ b/src/carnot/queryresultspb/BUILD.bazel @@ -27,7 +27,7 @@ pl_proto_library( deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", "//src/shared/types/typespb:types_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -37,7 +37,7 @@ pl_cc_proto_library( deps = [ "//src/api/proto/uuidpb:uuid_pl_cc_proto", "//src/shared/types/typespb/wrapper:cc_library", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/carnot/queryresultspb/query_results.pb.go b/src/carnot/queryresultspb/query_results.pb.go index 33bc842aaa9..8570b3abbfe 100755 --- a/src/carnot/queryresultspb/query_results.pb.go +++ b/src/carnot/queryresultspb/query_results.pb.go @@ -335,51 +335,51 @@ func init() { } var fileDescriptor_9ab3e12aa52e3568 = []byte{ - // 702 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0x8e, 0x93, 0x26, 0x69, 0x26, 0x6d, 0xd2, 0x38, 0x55, 0x1b, 0x72, 0xd8, 0x96, 0x48, 0x88, - 0x02, 0xaa, 0x83, 0x5a, 0x21, 0x10, 0x20, 0x55, 0xad, 0x1a, 0xa4, 0x1c, 0xa0, 0x60, 0xda, 0x0b, - 0x07, 0x2c, 0xc7, 0xde, 0x18, 0x43, 0xbc, 0x6b, 0xd6, 0x6b, 0xd4, 0xdc, 0x78, 0x04, 0x4e, 0x3c, - 0x03, 0x27, 0x9e, 0x80, 0x07, 0xe0, 0xd8, 0x63, 0x4f, 0x88, 0xba, 0x17, 0x8e, 0x7d, 0x04, 0xe4, - 0x5d, 0xa7, 0x4d, 0x52, 0x57, 0xfc, 0x9c, 0xec, 0x99, 0xf9, 0x66, 0xe6, 0xf3, 0xcc, 0x37, 0x86, - 0xf5, 0x80, 0x59, 0x6d, 0xcb, 0x64, 0x84, 0xf2, 0xf6, 0xfb, 0x10, 0xb3, 0x21, 0xc3, 0x41, 0x38, - 0xe0, 0x81, 0xdf, 0x93, 0xa6, 0x91, 0xd8, 0x9a, 0xcf, 0x28, 0xa7, 0x6a, 0xc3, 0x3f, 0xd4, 0x24, - 0x5a, 0x9b, 0x44, 0x37, 0xd7, 0x1d, 0x97, 0xbf, 0x09, 0x7b, 0x9a, 0x45, 0xbd, 0xb6, 0x43, 0x1d, - 0xda, 0x16, 0x09, 0xbd, 0xb0, 0x2f, 0x2c, 0x61, 0x88, 0x37, 0x59, 0xa8, 0x79, 0xcd, 0xa1, 0xd4, - 0x19, 0xe0, 0x0b, 0x94, 0x49, 0x86, 0x49, 0x68, 0x25, 0xa6, 0x64, 0xfa, 0xae, 0x8c, 0xb5, 0xc3, - 0xd0, 0xb5, 0xfd, 0x9e, 0x78, 0x48, 0x40, 0xcb, 0x83, 0xea, 0x8b, 0xb8, 0xf9, 0xbe, 0xeb, 0xb9, - 0xc4, 0xe9, 0x92, 0x3e, 0x55, 0x6f, 0x43, 0x0d, 0x1f, 0x62, 0x2b, 0xe4, 0x2e, 0x25, 0x06, 0x77, - 0x3d, 0x6c, 0x90, 0xa0, 0xa1, 0xac, 0x2a, 0x6b, 0x39, 0xbd, 0x7a, 0x1e, 0xd8, 0x77, 0x3d, 0xfc, - 0x2c, 0x50, 0x35, 0xa8, 0x5b, 0xd4, 0xf3, 0xdd, 0x81, 0x39, 0x81, 0xce, 0x0a, 0x74, 0x6d, 0x2c, - 0x24, 0xf1, 0xad, 0xaf, 0x0a, 0xd4, 0x45, 0xbf, 0xce, 0xa8, 0xd0, 0x4b, 0x6e, 0xf2, 0x40, 0xdd, - 0x86, 0x02, 0x17, 0x0c, 0x44, 0xa3, 0xf2, 0xc6, 0x2d, 0xed, 0xaa, 0xe1, 0x68, 0x53, 0x74, 0xf5, - 0x24, 0x51, 0xbd, 0x09, 0xd5, 0xde, 0x90, 0xe3, 0xc0, 0xf0, 0x19, 0xb5, 0x70, 0x10, 0x60, 0x3b, - 0xa1, 0x51, 0x11, 0xee, 0xe7, 0x23, 0xaf, 0x7a, 0x07, 0x6a, 0x0c, 0x5b, 0x94, 0xd9, 0xe3, 0xd0, - 0x9c, 0x80, 0x2e, 0x24, 0x81, 0x73, 0x70, 0xeb, 0x73, 0x1e, 0x96, 0xf6, 0x7c, 0xcc, 0x4c, 0x4e, - 0xd9, 0x14, 0xe7, 0x35, 0x58, 0xf0, 0x07, 0x26, 0x31, 0xfa, 0xcc, 0x74, 0x3c, 0x4c, 0xb8, 0xe1, - 0xda, 0xc9, 0x98, 0x2a, 0xb1, 0xff, 0x49, 0xe2, 0xee, 0xda, 0xea, 0x32, 0x14, 0x09, 0xb5, 0x71, - 0x0c, 0x90, 0x94, 0x0a, 0xb1, 0xd9, 0xb5, 0xd5, 0xeb, 0x30, 0x27, 0x39, 0xd3, 0x90, 0xfb, 0x21, - 0x4f, 0x58, 0x94, 0x85, 0x6f, 0x4f, 0xb8, 0xd4, 0x1b, 0x50, 0x19, 0xb1, 0x4d, 0x40, 0x33, 0x02, - 0x34, 0x9f, 0x78, 0x13, 0xd8, 0x3d, 0x58, 0xe6, 0x94, 0x9b, 0x03, 0xe3, 0xf2, 0xea, 0xf2, 0x02, - 0xbf, 0x28, 0xc2, 0x9d, 0xa9, 0xfd, 0x6d, 0xc2, 0x52, 0x80, 0x07, 0xfd, 0x94, 0xac, 0x82, 0xc8, - 0xaa, 0xc7, 0xd1, 0xe9, 0xa4, 0x47, 0x50, 0xa1, 0xc9, 0x48, 0x8c, 0x20, 0x1e, 0x45, 0xa3, 0x28, - 0x96, 0xb6, 0xa8, 0x49, 0x21, 0x6a, 0x23, 0x21, 0x6a, 0xdb, 0x64, 0xa8, 0xcf, 0x8f, 0xb0, 0x72, - 0x6a, 0x0e, 0xcc, 0xe3, 0x43, 0xce, 0x4c, 0xc3, 0xc3, 0x9c, 0xb9, 0x56, 0xd0, 0x98, 0x5d, 0xcd, - 0xad, 0x95, 0x37, 0x76, 0xae, 0x5e, 0x78, 0xfa, 0xf8, 0xb5, 0x4e, 0x5c, 0xe5, 0xa9, 0x2c, 0xd2, - 0x21, 0x9c, 0x0d, 0xf5, 0x39, 0x3c, 0xe6, 0x52, 0x5f, 0x03, 0xc8, 0x46, 0x2e, 0xe9, 0xd3, 0x46, - 0x49, 0x74, 0xd9, 0xfa, 0xbf, 0x2e, 0xb1, 0xce, 0x64, 0x8b, 0x12, 0x1e, 0xd9, 0xcd, 0x2d, 0xa8, - 0x5d, 0xa2, 0xa0, 0x2e, 0x40, 0xee, 0x1d, 0x1e, 0x0a, 0x19, 0x94, 0xf4, 0xf8, 0x55, 0x5d, 0x84, - 0xfc, 0x07, 0x73, 0x10, 0x62, 0xb1, 0x79, 0x45, 0x97, 0xc6, 0xc3, 0xec, 0x03, 0xa5, 0xf9, 0x18, - 0x2a, 0x93, 0xd5, 0xff, 0x94, 0x5d, 0x1a, 0xcb, 0x6e, 0x7d, 0xcb, 0x42, 0x7d, 0xdb, 0xc1, 0x84, - 0x4f, 0xa9, 0xf2, 0x3e, 0xcc, 0x9a, 0xce, 0x98, 0x1a, 0xcb, 0x1b, 0xd5, 0xf8, 0xa3, 0xe5, 0xe5, - 0x6b, 0x07, 0x07, 0xdd, 0xdd, 0x9d, 0x72, 0xf4, 0x63, 0xa5, 0x28, 0x72, 0xbb, 0xbb, 0x7a, 0x51, - 0xa0, 0xbb, 0xb6, 0xfa, 0x16, 0x1a, 0xe7, 0x5b, 0xbd, 0x90, 0x83, 0xdc, 0x6f, 0x56, 0x4c, 0xef, - 0xee, 0xbf, 0x4e, 0x4f, 0x5f, 0xa2, 0xe9, 0xa7, 0x93, 0xfa, 0x8b, 0xc9, 0xa5, 0xff, 0x62, 0x52, - 0xee, 0x7a, 0xe6, 0xef, 0xef, 0x3a, 0x9f, 0x7e, 0xd7, 0x3b, 0xbb, 0x47, 0x27, 0x28, 0x73, 0x7c, - 0x82, 0x32, 0x67, 0x27, 0x48, 0xf9, 0x18, 0x21, 0xe5, 0x4b, 0x84, 0x94, 0xef, 0x11, 0x52, 0x8e, - 0x22, 0xa4, 0xfc, 0x8c, 0x90, 0xf2, 0x2b, 0x42, 0x99, 0xb3, 0x08, 0x29, 0x9f, 0x4e, 0x51, 0xe6, - 0xe8, 0x14, 0x65, 0x8e, 0x4f, 0x51, 0xe6, 0x55, 0x65, 0xf2, 0xb3, 0x7b, 0x05, 0xa1, 0xf4, 0xcd, - 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xcd, 0x34, 0xc0, 0x80, 0xfa, 0x05, 0x00, 0x00, + // 695 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xcd, 0x6e, 0xd3, 0x4a, + 0x14, 0xc7, 0xe3, 0xa4, 0x49, 0x9a, 0x93, 0x36, 0x69, 0x9c, 0xa8, 0xcd, 0xcd, 0x62, 0xda, 0x1b, + 0xe9, 0xea, 0xf6, 0x5e, 0x84, 0x83, 0x5a, 0x21, 0x10, 0x20, 0x55, 0xad, 0x1a, 0xa4, 0x2c, 0xa0, + 0x60, 0xda, 0x0d, 0x0b, 0x2c, 0xc7, 0x9e, 0x58, 0x06, 0x7b, 0xc6, 0x8c, 0xc7, 0xa8, 0xd9, 0xf1, + 0x08, 0xac, 0x78, 0x06, 0x56, 0x3c, 0x01, 0x0f, 0xc0, 0xb2, 0xcb, 0xae, 0x10, 0x75, 0x37, 0x2c, + 0xfb, 0x08, 0xc8, 0x33, 0x4e, 0x49, 0x52, 0x57, 0x7c, 0xac, 0xec, 0x73, 0xce, 0xef, 0xcc, 0xf9, + 0xfb, 0x9c, 0x33, 0x86, 0x9b, 0x21, 0xb3, 0x7a, 0x96, 0xc9, 0x08, 0xe5, 0xbd, 0xd7, 0x11, 0x66, + 0x63, 0x86, 0xc3, 0xc8, 0xe3, 0x61, 0x30, 0x94, 0xa6, 0x91, 0xda, 0x5a, 0xc0, 0x28, 0xa7, 0x6a, + 0x3b, 0x38, 0xd6, 0x24, 0xad, 0xcd, 0xd2, 0x9d, 0x96, 0x43, 0x1d, 0x2a, 0xa0, 0x5e, 0xf2, 0x26, + 0xf9, 0xce, 0x5f, 0x0e, 0xa5, 0x8e, 0x87, 0x7b, 0xc2, 0x1a, 0x46, 0xa3, 0x9e, 0x49, 0xc6, 0x69, + 0x68, 0x3d, 0xa9, 0x6c, 0x06, 0xae, 0x8c, 0xf5, 0xa2, 0xc8, 0xb5, 0x83, 0xa1, 0x78, 0x48, 0xa0, + 0xeb, 0x43, 0xfd, 0x69, 0x52, 0xe3, 0xd0, 0xf5, 0x5d, 0xe2, 0x0c, 0xc8, 0x88, 0xaa, 0xff, 0x43, + 0x03, 0x1f, 0x63, 0x2b, 0xe2, 0x2e, 0x25, 0x06, 0x77, 0x7d, 0x6c, 0x90, 0xb0, 0xad, 0x6c, 0x28, + 0x9b, 0x05, 0xbd, 0x7e, 0x19, 0x38, 0x74, 0x7d, 0xfc, 0x38, 0x54, 0x35, 0x68, 0x5a, 0xd4, 0x0f, + 0x5c, 0xcf, 0x9c, 0xa1, 0xf3, 0x82, 0x6e, 0x4c, 0x85, 0x24, 0xdf, 0xfd, 0xa8, 0x40, 0x53, 0xd4, + 0xeb, 0x4f, 0x0e, 0x7a, 0xc6, 0x4d, 0x1e, 0xaa, 0xbb, 0x50, 0xe2, 0x42, 0x81, 0x28, 0x54, 0xdd, + 0xfa, 0x4f, 0xbb, 0xae, 0x07, 0xda, 0x9c, 0x5c, 0x3d, 0x4d, 0x54, 0xff, 0x85, 0xfa, 0x70, 0xcc, + 0x71, 0x68, 0x04, 0x8c, 0x5a, 0x38, 0x0c, 0xb1, 0x9d, 0xca, 0xa8, 0x09, 0xf7, 0x93, 0x89, 0x57, + 0xbd, 0x01, 0x0d, 0x86, 0x2d, 0xca, 0xec, 0x69, 0xb4, 0x20, 0xd0, 0x95, 0x34, 0x70, 0x09, 0x77, + 0xdf, 0x17, 0x61, 0xf5, 0x20, 0xc0, 0xcc, 0xe4, 0x94, 0xcd, 0x69, 0xde, 0x84, 0x95, 0xc0, 0x33, + 0x89, 0x31, 0x62, 0xa6, 0xe3, 0x63, 0xc2, 0x0d, 0xd7, 0x4e, 0xdb, 0x54, 0x4b, 0xfc, 0x0f, 0x53, + 0xf7, 0xc0, 0x56, 0xd7, 0xa0, 0x4c, 0xa8, 0x8d, 0x13, 0x40, 0x4a, 0x2a, 0x25, 0xe6, 0xc0, 0x56, + 0xff, 0x86, 0x25, 0xa9, 0x99, 0x46, 0x3c, 0x88, 0x78, 0xaa, 0xa2, 0x2a, 0x7c, 0x07, 0xc2, 0xa5, + 0xfe, 0x03, 0xb5, 0x89, 0xda, 0x14, 0x5a, 0x10, 0xd0, 0x72, 0xea, 0x4d, 0xb1, 0xdb, 0xb0, 0xc6, + 0x29, 0x37, 0x3d, 0xe3, 0xea, 0xe8, 0x8a, 0x82, 0x6f, 0x89, 0x70, 0x7f, 0x6e, 0x7e, 0xdb, 0xb0, + 0x1a, 0x62, 0x6f, 0x94, 0x91, 0x55, 0x12, 0x59, 0xcd, 0x24, 0x3a, 0x9f, 0x74, 0x1f, 0x6a, 0x34, + 0x6d, 0x89, 0x11, 0x26, 0xad, 0x68, 0x97, 0xc5, 0xd0, 0x5a, 0x9a, 0x5c, 0x44, 0x6d, 0xb2, 0x88, + 0xda, 0x2e, 0x19, 0xeb, 0xcb, 0x13, 0x56, 0x76, 0xcd, 0x81, 0x65, 0x7c, 0xcc, 0x99, 0x69, 0xf8, + 0x98, 0x33, 0xd7, 0x0a, 0xdb, 0x8b, 0x1b, 0x85, 0xcd, 0xea, 0xd6, 0xde, 0xf5, 0x03, 0xcf, 0x6e, + 0xbf, 0xd6, 0x4f, 0x4e, 0x79, 0x24, 0x0f, 0xe9, 0x13, 0xce, 0xc6, 0xfa, 0x12, 0x9e, 0x72, 0xa9, + 0x2f, 0x00, 0x64, 0x21, 0x97, 0x8c, 0x68, 0xbb, 0x22, 0xaa, 0xec, 0xfc, 0x59, 0x95, 0x64, 0xcf, + 0x64, 0x89, 0x0a, 0x9e, 0xd8, 0x9d, 0x1d, 0x68, 0x5c, 0x91, 0xa0, 0xae, 0x40, 0xe1, 0x15, 0x1e, + 0x8b, 0x35, 0xa8, 0xe8, 0xc9, 0xab, 0xda, 0x82, 0xe2, 0x1b, 0xd3, 0x8b, 0xb0, 0x98, 0xbc, 0xa2, + 0x4b, 0xe3, 0x5e, 0xfe, 0xae, 0xd2, 0x79, 0x00, 0xb5, 0xd9, 0xd3, 0x7f, 0x96, 0x5d, 0x99, 0xca, + 0xee, 0x7e, 0xca, 0x43, 0x73, 0xd7, 0xc1, 0x84, 0xcf, 0x6d, 0xe5, 0x1d, 0x58, 0x34, 0x9d, 0xa9, + 0x6d, 0xac, 0x6e, 0xd5, 0x93, 0x8f, 0x96, 0x37, 0x5f, 0x3b, 0x3a, 0x1a, 0xec, 0xef, 0x55, 0xe3, + 0x2f, 0xeb, 0x65, 0x91, 0x3b, 0xd8, 0xd7, 0xcb, 0x82, 0x1e, 0xd8, 0xea, 0x4b, 0x68, 0x5f, 0x4e, + 0xf5, 0xc7, 0x3a, 0xc8, 0xf9, 0xe6, 0x45, 0xf7, 0x6e, 0xfd, 0x6e, 0xf7, 0xf4, 0x55, 0x9a, 0x7d, + 0x75, 0x32, 0x7f, 0x31, 0x85, 0xec, 0x5f, 0x4c, 0xc6, 0xbd, 0x5e, 0xf8, 0xf5, 0x7b, 0x5d, 0xcc, + 0xbe, 0xd7, 0x7b, 0xfb, 0x27, 0x67, 0x28, 0x77, 0x7a, 0x86, 0x72, 0x17, 0x67, 0x48, 0x79, 0x1b, + 0x23, 0xe5, 0x43, 0x8c, 0x94, 0xcf, 0x31, 0x52, 0x4e, 0x62, 0xa4, 0x7c, 0x8d, 0x91, 0xf2, 0x2d, + 0x46, 0xb9, 0x8b, 0x18, 0x29, 0xef, 0xce, 0x51, 0xee, 0xe4, 0x1c, 0xe5, 0x4e, 0xcf, 0x51, 0xee, + 0x79, 0x6d, 0xf6, 0xb3, 0x87, 0x25, 0xb1, 0xe9, 0xdb, 0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x99, + 0x72, 0x0a, 0x50, 0xe1, 0x05, 0x00, 0x00, } func (this *QueryTimingInfo) Equal(that interface{}) bool { diff --git a/src/carnot/queryresultspb/query_results.proto b/src/carnot/queryresultspb/query_results.proto index fd7a8e8b055..b34a799a3c9 100644 --- a/src/carnot/queryresultspb/query_results.proto +++ b/src/carnot/queryresultspb/query_results.proto @@ -22,7 +22,7 @@ package px.carnot.queryresultspb; option go_package = "queryresultspb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "src/api/proto/uuidpb/uuid.proto"; diff --git a/src/carnot/udfspb/BUILD.bazel b/src/carnot/udfspb/BUILD.bazel index dd092b8e3bd..c4f4f736707 100644 --- a/src/carnot/udfspb/BUILD.bazel +++ b/src/carnot/udfspb/BUILD.bazel @@ -29,7 +29,7 @@ pl_proto_library( "//src/carnot/planpb:plan_pl_proto", "//src/shared/types/typespb:types_pl_proto", "//src/table_store/schemapb:schema_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -40,7 +40,7 @@ pl_cc_proto_library( "//src/carnot/planpb:plan_pl_cc_proto", "//src/shared/types/typespb/wrapper:cc_library", "//src/table_store/schemapb:schema_pl_cc_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/cloud/api/api_server.go b/src/cloud/api/api_server.go index 0951fa38c62..87f68ec76c2 100644 --- a/src/cloud/api/api_server.go +++ b/src/cloud/api/api_server.go @@ -50,8 +50,10 @@ import ( "px.dev/pixie/src/utils/script" ) -const defaultBundleFile = "https://storage.googleapis.com/pixie-prod-artifacts/script-bundles/bundle-core.json" -const ossBundleFile = "https://artifacts.px.dev/pxl_scripts/bundle.json" +const ( + defaultBundleFile = "https://storage.googleapis.com/pixie-prod-artifacts/script-bundles/bundle-core.json" + ossBundleFile = "https://artifacts.px.dev/pxl_scripts/bundle.json" +) func init() { pflag.String("domain_name", "dev.withpixie.dev", "The domain name of Pixie Cloud") diff --git a/src/cloud/api/apienv/env.go b/src/cloud/api/apienv/env.go index 4a2c0dbc5dd..f6889d76666 100644 --- a/src/cloud/api/apienv/env.go +++ b/src/cloud/api/apienv/env.go @@ -84,7 +84,8 @@ type Impl struct { func New(ac authpb.AuthServiceClient, pc profilepb.ProfileServiceClient, oc profilepb.OrgServiceClient, vk vzmgrpb.VZDeploymentKeyServiceClient, ak authpb.APIKeyServiceClient, vc vzmgrpb.VZMgrServiceClient, at artifacttrackerpb.ArtifactTrackerClient, oa IdentityProviderClient, - cm configmanagerpb.ConfigManagerServiceClient, pm pluginpb.PluginServiceClient, rm pluginpb.DataRetentionPluginServiceClient) (APIEnv, error) { + cm configmanagerpb.ConfigManagerServiceClient, pm pluginpb.PluginServiceClient, rm pluginpb.DataRetentionPluginServiceClient, +) (APIEnv, error) { sessionKey := viper.GetString("session_key") if len(sessionKey) == 0 { return nil, errors.New("session_key is required for cookie store") diff --git a/src/cloud/api/controllers/api_key_resolver_test.go b/src/cloud/api/controllers/api_key_resolver_test.go index 729b221f737..2e8021299a8 100644 --- a/src/cloud/api/controllers/api_key_resolver_test.go +++ b/src/cloud/api/controllers/api_key_resolver_test.go @@ -55,7 +55,7 @@ func TestAPIKey(t *testing.T) { defer cleanup() ctx := test.ctx - createTime := time.Date(2020, 03, 9, 17, 46, 100, 1232409, time.UTC) + createTime := time.Date(2020, 0o3, 9, 17, 46, 100, 1232409, time.UTC) createTimePb, err := types.TimestampProto(createTime) if err != nil { t.Fatalf("could not write time %+v as protobuf", createTime) @@ -130,7 +130,7 @@ func TestAPIKeys(t *testing.T) { defer cleanup() ctx := test.ctx - createTime1 := time.Date(2020, 03, 9, 17, 46, 100, 1232409, time.UTC) + createTime1 := time.Date(2020, 0o3, 9, 17, 46, 100, 1232409, time.UTC) createTime1Pb, err := types.TimestampProto(createTime1) if err != nil { t.Fatalf("could not write time %+v as protobuf", createTime1) @@ -231,7 +231,7 @@ func TestCreateAPIKey(t *testing.T) { defer cleanup() ctx := test.ctx - createTime := time.Date(2020, 03, 9, 17, 46, 100, 1232409, time.UTC) + createTime := time.Date(2020, 0o3, 9, 17, 46, 100, 1232409, time.UTC) createTimePb, err := types.TimestampProto(createTime) if err != nil { t.Fatalf("could not write time %+v as protobuf", createTime) diff --git a/src/cloud/api/controllers/config_grpc.go b/src/cloud/api/controllers/config_grpc.go index ef00f0886e5..e1b3cc66901 100644 --- a/src/cloud/api/controllers/config_grpc.go +++ b/src/cloud/api/controllers/config_grpc.go @@ -34,7 +34,8 @@ type ConfigServiceServer struct { // GetConfigForVizier fetches vizier templates and sets up yaml maps by calling // Config Manager service. func (c *ConfigServiceServer) GetConfigForVizier(ctx context.Context, - req *cloudpb.ConfigForVizierRequest) (*cloudpb.ConfigForVizierResponse, error) { + req *cloudpb.ConfigForVizierRequest, +) (*cloudpb.ConfigForVizierResponse, error) { ctx, err := contextWithAuthToken(ctx) if err != nil { return nil, err @@ -76,7 +77,8 @@ func (c *ConfigServiceServer) GetConfigForVizier(ctx context.Context, // GetConfigForOperator provides the key for the operator that is used to send errors and stacktraces to Sentry func (c *ConfigServiceServer) GetConfigForOperator(ctx context.Context, - req *cloudpb.ConfigForOperatorRequest) (*cloudpb.ConfigForOperatorResponse, error) { + req *cloudpb.ConfigForOperatorRequest, +) (*cloudpb.ConfigForOperatorResponse, error) { ctx, err := contextWithAuthToken(ctx) if err != nil { return nil, err diff --git a/src/cloud/api/controllers/deployment_key_resolver_test.go b/src/cloud/api/controllers/deployment_key_resolver_test.go index 3d38afe3ed5..b1e631d2a97 100644 --- a/src/cloud/api/controllers/deployment_key_resolver_test.go +++ b/src/cloud/api/controllers/deployment_key_resolver_test.go @@ -55,7 +55,7 @@ func TestDeploymentKey(t *testing.T) { defer cleanup() ctx := test.ctx - createTime := time.Date(2020, 03, 9, 17, 46, 100, 1232409, time.UTC) + createTime := time.Date(2020, 0o3, 9, 17, 46, 100, 1232409, time.UTC) createTimePb, err := types.TimestampProto(createTime) if err != nil { t.Fatalf("could not write time %+v as protobuf", createTime) @@ -130,7 +130,7 @@ func TestDeploymentKeys(t *testing.T) { defer cleanup() ctx := test.ctx - createTime1 := time.Date(2020, 03, 9, 17, 46, 100, 1232409, time.UTC) + createTime1 := time.Date(2020, 0o3, 9, 17, 46, 100, 1232409, time.UTC) createTime1Pb, err := types.TimestampProto(createTime1) if err != nil { t.Fatalf("could not write time %+v as protobuf", createTime1) @@ -231,7 +231,7 @@ func TestCreateDeploymentKey(t *testing.T) { defer cleanup() ctx := test.ctx - createTime := time.Date(2020, 03, 9, 17, 46, 100, 1232409, time.UTC) + createTime := time.Date(2020, 0o3, 9, 17, 46, 100, 1232409, time.UTC) createTimePb, err := types.TimestampProto(createTime) if err != nil { t.Fatalf("could not write time %+v as protobuf", createTime) diff --git a/src/cloud/api/controllers/org_grpc.go b/src/cloud/api/controllers/org_grpc.go index fb98814516e..90b38793638 100644 --- a/src/cloud/api/controllers/org_grpc.go +++ b/src/cloud/api/controllers/org_grpc.go @@ -185,7 +185,8 @@ func (o *OrganizationServiceServer) UpdateOrg(ctx context.Context, req *cloudpb. // GetUsersInOrg will get users given an org id. func (o *OrganizationServiceServer) GetUsersInOrg(ctx context.Context, req *cloudpb.GetUsersInOrgRequest) (*cloudpb.GetUsersInOrgResponse, - error) { + error, +) { ctx, err := contextWithAuthToken(ctx) if err != nil { return nil, err diff --git a/src/cloud/api/controllers/org_resolver.go b/src/cloud/api/controllers/org_resolver.go index b73ada8b845..a300c08cea4 100644 --- a/src/cloud/api/controllers/org_resolver.go +++ b/src/cloud/api/controllers/org_resolver.go @@ -52,7 +52,6 @@ func (q *QueryResolver) InviteUser(ctx context.Context, args *inviteUserArgs) (* FirstName: args.FirstName, LastName: args.LastName, }) - if err != nil { return nil, rpcErrorHelper(err) } @@ -237,7 +236,6 @@ func (q *QueryResolver) CreateInviteToken(ctx context.Context, args *createInvit resp, err := grpcAPI.CreateInviteToken(ctx, &cloudpb.CreateInviteTokenRequest{ OrgID: utils.ProtoFromUUIDStrOrNil(string(args.OrgID)), }) - if err != nil { return "", rpcErrorHelper(err) } @@ -254,7 +252,6 @@ func (q *QueryResolver) RevokeAllInviteTokens(ctx context.Context, args *revokeA grpcAPI := q.Env.OrgServer _, err := grpcAPI.RevokeAllInviteTokens(ctx, utils.ProtoFromUUIDStrOrNil(string(args.OrgID))) - if err != nil { return false, rpcErrorHelper(err) } @@ -272,7 +269,6 @@ func (q *QueryResolver) VerifyInviteToken(ctx context.Context, args *verifyInvit grpcAPI := q.Env.OrgServer resp, err := grpcAPI.VerifyInviteToken(ctx, &cloudpb.InviteToken{SignedClaims: args.InviteToken}) - if err != nil { return false, rpcErrorHelper(err) } @@ -289,7 +285,6 @@ func (q *QueryResolver) RemoveUserFromOrg(ctx context.Context, args *removeUserF grpcAPI := q.Env.OrgServer resp, err := grpcAPI.RemoveUserFromOrg(ctx, &cloudpb.RemoveUserFromOrgRequest{UserID: utils.ProtoFromUUIDStrOrNil(string(args.UserID))}) - if err != nil { return false, rpcErrorHelper(err) } diff --git a/src/cloud/api/controllers/org_resolver_test.go b/src/cloud/api/controllers/org_resolver_test.go index a2c0221541a..b8cc854bb1c 100644 --- a/src/cloud/api/controllers/org_resolver_test.go +++ b/src/cloud/api/controllers/org_resolver_test.go @@ -217,7 +217,7 @@ func TestOrgSettingsResolver_OrgUsers(t *testing.T) { defer cleanup() ctx := test.ctx - //mockProfile := mock_profile.NewMockProfileServiceClient(ctrl) + // mockProfile := mock_profile.NewMockProfileServiceClient(ctrl) mockClients.MockOrg.EXPECT(). GetUsersInOrg(gomock.Any(), &cloudpb.GetUsersInOrgRequest{ OrgID: utils.ProtoFromUUIDStrOrNil(testingutils.TestOrgID), diff --git a/src/cloud/api/controllers/plugin_resolver.go b/src/cloud/api/controllers/plugin_resolver.go index c3b2bb1ac9f..8430ac5f42b 100644 --- a/src/cloud/api/controllers/plugin_resolver.go +++ b/src/cloud/api/controllers/plugin_resolver.go @@ -131,7 +131,6 @@ func (q *QueryResolver) RetentionPluginInfo(ctx context.Context, args retentionP PluginId: args.ID, Version: args.PluginVersion, }) - if err != nil { return nil, err } @@ -159,7 +158,6 @@ func (q *QueryResolver) OrgRetentionPluginConfig(ctx context.Context, args reten resp, err := q.Env.PluginServer.GetOrgRetentionPluginConfig(ctx, &cloudpb.GetOrgRetentionPluginConfigRequest{ PluginId: args.ID, }) - if err != nil { return configs, err } @@ -180,7 +178,6 @@ func (q *QueryResolver) RetentionPluginConfig(ctx context.Context, args retentio resp, err := q.Env.PluginServer.GetOrgRetentionPluginConfig(ctx, &cloudpb.GetOrgRetentionPluginConfigRequest{ PluginId: args.ID, }) - if err != nil { return nil, err } @@ -259,7 +256,6 @@ func (q *QueryResolver) UpdateRetentionPluginConfig(ctx context.Context, args up } _, err := q.Env.PluginServer.UpdateRetentionPluginConfig(ctx, req) - if err != nil { return false, err } diff --git a/src/cloud/api/controllers/script_test.go b/src/cloud/api/controllers/script_test.go index fd3301d7518..3e8ef9bc6b3 100644 --- a/src/cloud/api/controllers/script_test.go +++ b/src/cloud/api/controllers/script_test.go @@ -45,7 +45,7 @@ func toAny(t *testing.T, msg proto.Message) *types.Any { } func TestScriptMgr(t *testing.T) { - var testVis = &vispb.Vis{ + testVis := &vispb.Vis{ Widgets: []*vispb.Widget{ { FuncOrRef: &vispb.Widget_Func_{ diff --git a/src/cloud/api/controllers/session_middleware.go b/src/cloud/api/controllers/session_middleware.go index cd98cbfcacf..a80d778e7e9 100644 --- a/src/cloud/api/controllers/session_middleware.go +++ b/src/cloud/api/controllers/session_middleware.go @@ -170,7 +170,7 @@ func getAugmentedToken(env apienv.APIEnv, r *http.Request) (string, error) { // If the header "X-Use-Bearer is true we force the use of Bearer auth and ignore sessions. // This is needed to prevent logged in pixie sessions to show up in embedded versions. - forceBearer := false + forceBearer := false //nolint:staticcheck if strings.ToLower(r.Header.Get("X-Use-Bearer")) == "true" { forceBearer = true } diff --git a/src/cloud/api/controllers/user_grpc.go b/src/cloud/api/controllers/user_grpc.go index 9346e13f688..6ea63c44d44 100644 --- a/src/cloud/api/controllers/user_grpc.go +++ b/src/cloud/api/controllers/user_grpc.go @@ -62,7 +62,8 @@ func (u *UserServiceServer) GetUser(ctx context.Context, req *uuidpb.UUID) (*clo // GetUserSettings will retrieve settings given the user ID. func (u *UserServiceServer) GetUserSettings(ctx context.Context, req *cloudpb.GetUserSettingsRequest) (*cloudpb.GetUserSettingsResponse, - error) { + error, +) { ctx, err := contextWithAuthToken(ctx) if err != nil { return nil, err @@ -84,7 +85,8 @@ func (u *UserServiceServer) GetUserSettings(ctx context.Context, req *cloudpb.Ge // UpdateUserSettings will update the settings for the given user. func (u *UserServiceServer) UpdateUserSettings(ctx context.Context, req *cloudpb.UpdateUserSettingsRequest) (*cloudpb.UpdateUserSettingsResponse, - error) { + error, +) { ctx, err := contextWithAuthToken(ctx) if err != nil { return nil, err @@ -105,7 +107,8 @@ func (u *UserServiceServer) UpdateUserSettings(ctx context.Context, req *cloudpb // UpdateUser will update user information. func (u *UserServiceServer) UpdateUser(ctx context.Context, req *cloudpb.UpdateUserRequest) (*cloudpb.UserInfo, - error) { + error, +) { sCtx, err := authcontext.FromContext(ctx) if err != nil { return nil, err @@ -162,7 +165,8 @@ func (u *UserServiceServer) UpdateUser(ctx context.Context, req *cloudpb.UpdateU // GetUserAttributes will retrieve attributes given the user ID. func (u *UserServiceServer) GetUserAttributes(ctx context.Context, req *cloudpb.GetUserAttributesRequest) (*cloudpb.GetUserAttributesResponse, - error) { + error, +) { ctx, err := contextWithAuthToken(ctx) if err != nil { return nil, err @@ -184,7 +188,8 @@ func (u *UserServiceServer) GetUserAttributes(ctx context.Context, req *cloudpb. // SetUserAttributes will update the attributes for the given user. func (u *UserServiceServer) SetUserAttributes(ctx context.Context, req *cloudpb.SetUserAttributesRequest) (*cloudpb.SetUserAttributesResponse, - error) { + error, +) { ctx, err := contextWithAuthToken(ctx) if err != nil { return nil, err diff --git a/src/cloud/api/controllers/vizier_cluster_grpc.go b/src/cloud/api/controllers/vizier_cluster_grpc.go index efa53a3060a..3f3838f903e 100644 --- a/src/cloud/api/controllers/vizier_cluster_grpc.go +++ b/src/cloud/api/controllers/vizier_cluster_grpc.go @@ -169,7 +169,6 @@ func (v *VizierClusterInfo) getClusterInfoForViziers(ctx context.Context, ids [] vzInfoResp, err := v.VzMgr.GetVizierInfos(ctx, &vzmgrpb.GetVizierInfosRequest{ VizierIDs: ids, }) - if err != nil { return nil, err } diff --git a/src/cloud/api/controllers/vizier_cluster_test.go b/src/cloud/api/controllers/vizier_cluster_test.go index 9c0564dd8c7..55608c6e1a0 100644 --- a/src/cloud/api/controllers/vizier_cluster_test.go +++ b/src/cloud/api/controllers/vizier_cluster_test.go @@ -253,18 +253,19 @@ func TestVizierClusterInfo_GetClusterInfoDuplicates(t *testing.T) { mockClients.MockVzMgr.EXPECT().GetVizierInfos(gomock.Any(), &vzmgrpb.GetVizierInfosRequest{ VizierIDs: []*uuidpb.UUID{clusterID, clusterID2}, }).Return(&vzmgrpb.GetVizierInfosResponse{ - VizierInfos: []*cvmsgspb.VizierInfo{{ - VizierID: clusterID, - Status: cvmsgspb.VZ_ST_HEALTHY, - LastHeartbeatNs: int64(1305646598000000000), - Config: &cvmsgspb.VizierConfig{}, - VizierVersion: "1.2.3", - ClusterUID: "a UID", - ClusterName: "gke_pl-dev-infra_us-west1-a_dev-cluster-zasgar", - ClusterVersion: "5.6.7", - NumNodes: 5, - NumInstrumentedNodes: 3, - }, + VizierInfos: []*cvmsgspb.VizierInfo{ + { + VizierID: clusterID, + Status: cvmsgspb.VZ_ST_HEALTHY, + LastHeartbeatNs: int64(1305646598000000000), + Config: &cvmsgspb.VizierConfig{}, + VizierVersion: "1.2.3", + ClusterUID: "a UID", + ClusterName: "gke_pl-dev-infra_us-west1-a_dev-cluster-zasgar", + ClusterVersion: "5.6.7", + NumNodes: 5, + NumInstrumentedNodes: 3, + }, { VizierID: clusterID, Status: cvmsgspb.VZ_ST_HEALTHY, @@ -330,18 +331,19 @@ func TestVizierClusterInfo_GetClusterInfo_Homoglyphs(t *testing.T) { mockClients.MockVzMgr.EXPECT().GetVizierInfos(gomock.Any(), &vzmgrpb.GetVizierInfosRequest{ VizierIDs: []*uuidpb.UUID{clusterID, clusterID2}, }).Return(&vzmgrpb.GetVizierInfosResponse{ - VizierInfos: []*cvmsgspb.VizierInfo{{ - VizierID: clusterID, - Status: cvmsgspb.VZ_ST_HEALTHY, - LastHeartbeatNs: int64(1305646598000000000), - Config: &cvmsgspb.VizierConfig{}, - VizierVersion: "1.2.3", - ClusterUID: "a UID", - ClusterName: "gke_pl-dev-infra_us-west1-a_dev-cluster-zasgar", - ClusterVersion: "5.6.7", - NumNodes: 5, - NumInstrumentedNodes: 3, - }, + VizierInfos: []*cvmsgspb.VizierInfo{ + { + VizierID: clusterID, + Status: cvmsgspb.VZ_ST_HEALTHY, + LastHeartbeatNs: int64(1305646598000000000), + Config: &cvmsgspb.VizierConfig{}, + VizierVersion: "1.2.3", + ClusterUID: "a UID", + ClusterName: "gke_pl-dev-infra_us-west1-a_dev-cluster-zasgar", + ClusterVersion: "5.6.7", + NumNodes: 5, + NumInstrumentedNodes: 3, + }, { VizierID: clusterID, Status: cvmsgspb.VZ_ST_HEALTHY, @@ -401,16 +403,17 @@ func TestVizierClusterInfo_GetClusterInfoWithID(t *testing.T) { mockClients.MockVzMgr.EXPECT().GetVizierInfos(gomock.Any(), &vzmgrpb.GetVizierInfosRequest{ VizierIDs: []*uuidpb.UUID{clusterID}, }).Return(&vzmgrpb.GetVizierInfosResponse{ - VizierInfos: []*cvmsgspb.VizierInfo{{ - VizierID: clusterID, - Status: cvmsgspb.VZ_ST_HEALTHY, - LastHeartbeatNs: int64(1305646598000000000), - Config: &cvmsgspb.VizierConfig{}, - VizierVersion: "1.2.3", - ClusterUID: "a UID", - ClusterName: "some cluster", - ClusterVersion: "5.6.7", - }, + VizierInfos: []*cvmsgspb.VizierInfo{ + { + VizierID: clusterID, + Status: cvmsgspb.VZ_ST_HEALTHY, + LastHeartbeatNs: int64(1305646598000000000), + Config: &cvmsgspb.VizierConfig{}, + VizierVersion: "1.2.3", + ClusterUID: "a UID", + ClusterName: "some cluster", + ClusterVersion: "5.6.7", + }, }, }, nil) diff --git a/src/cloud/api/ptproxy/vizier_pt_proxy.go b/src/cloud/api/ptproxy/vizier_pt_proxy.go index e55e3d747d2..02bf938943b 100644 --- a/src/cloud/api/ptproxy/vizier_pt_proxy.go +++ b/src/cloud/api/ptproxy/vizier_pt_proxy.go @@ -84,7 +84,6 @@ func (v *VizierPassThroughProxy) isScriptModified(ctx context.Context, script st } resp, err := v.sm.CheckScriptExists(ctx, req) - if err != nil { return false, err } diff --git a/src/cloud/artifact_tracker/artifact_tracker_server.go b/src/cloud/artifact_tracker/artifact_tracker_server.go index 81d061d099d..e54aa4929a3 100644 --- a/src/cloud/artifact_tracker/artifact_tracker_server.go +++ b/src/cloud/artifact_tracker/artifact_tracker_server.go @@ -58,7 +58,6 @@ func init() { func loadServiceAccountConfig() *jwt.Config { saKeyFile := viper.GetString("sa_key_path") saKey, err := os.ReadFile(saKeyFile) - if err != nil { return nil } diff --git a/src/cloud/artifact_tracker/artifacttrackerpb/BUILD.bazel b/src/cloud/artifact_tracker/artifacttrackerpb/BUILD.bazel index 10e15f26b69..060a9c155c7 100644 --- a/src/cloud/artifact_tracker/artifacttrackerpb/BUILD.bazel +++ b/src/cloud/artifact_tracker/artifacttrackerpb/BUILD.bazel @@ -23,7 +23,7 @@ pl_proto_library( deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", "//src/shared/artifacts/versionspb:versions_pl_proto", - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/cloud/artifact_tracker/artifacttrackerpb/artifact_tracker.pb.go b/src/cloud/artifact_tracker/artifacttrackerpb/artifact_tracker.pb.go index d894c570e95..7d2006d1655 100755 --- a/src/cloud/artifact_tracker/artifacttrackerpb/artifact_tracker.pb.go +++ b/src/cloud/artifact_tracker/artifacttrackerpb/artifact_tracker.pb.go @@ -219,38 +219,37 @@ func init() { } var fileDescriptor_6fba5f49ea413862 = []byte{ - // 489 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x31, 0x8f, 0xd3, 0x30, - 0x18, 0x86, 0x63, 0x2a, 0x2a, 0x9d, 0x0b, 0x1c, 0x58, 0x08, 0x4a, 0x06, 0xb7, 0xea, 0x31, 0x74, - 0xc1, 0x91, 0x82, 0xee, 0x16, 0x24, 0xa4, 0x3b, 0x90, 0x8e, 0xe1, 0x84, 0x50, 0x7a, 0x2c, 0x08, - 0xa9, 0x72, 0x52, 0x5f, 0x6a, 0x5d, 0x12, 0x07, 0xdb, 0x29, 0x77, 0x1b, 0x3f, 0x80, 0x01, 0x89, - 0x9d, 0x99, 0xbf, 0xc1, 0xc6, 0xd8, 0xf1, 0x26, 0x44, 0xd3, 0x85, 0xf1, 0x7e, 0x02, 0xaa, 0x93, - 0xa6, 0x15, 0xa9, 0x90, 0xba, 0xf9, 0xfd, 0xf2, 0xfa, 0xf3, 0xe3, 0xef, 0x75, 0xe0, 0x0b, 0x25, - 0x03, 0x27, 0x88, 0x44, 0x36, 0x72, 0xa8, 0xd4, 0xfc, 0x8c, 0x06, 0x7a, 0xa8, 0x25, 0x0d, 0xce, - 0x99, 0xac, 0x0a, 0xa5, 0x4e, 0xfd, 0x9a, 0x85, 0xa4, 0x52, 0x68, 0x81, 0x5a, 0xe9, 0x05, 0x51, - 0x4c, 0x4e, 0x78, 0xc0, 0x94, 0xfd, 0x24, 0xe4, 0x7a, 0x9c, 0xf9, 0x24, 0x10, 0xb1, 0x13, 0x8a, - 0x50, 0x38, 0xc6, 0xe3, 0x67, 0x67, 0x46, 0x19, 0x61, 0x56, 0xc5, 0x5e, 0xbb, 0x13, 0x0a, 0x11, - 0x46, 0x6c, 0xe5, 0xd2, 0x3c, 0x66, 0x4a, 0xd3, 0x38, 0x2d, 0x0d, 0x64, 0x41, 0xa8, 0xc6, 0x54, - 0xb2, 0x15, 0xa2, 0x72, 0x26, 0x4c, 0x2a, 0x2e, 0x12, 0x95, 0xfa, 0xd5, 0xb2, 0xf0, 0xf7, 0xbe, - 0x02, 0xf8, 0xe0, 0x98, 0xe9, 0xc3, 0xd2, 0x7a, 0xc2, 0x95, 0xf6, 0xd8, 0x87, 0x8c, 0x29, 0x8d, - 0xf6, 0xe0, 0xed, 0xea, 0x06, 0x09, 0x8d, 0x59, 0x1b, 0x74, 0x41, 0x7f, 0xc7, 0xbb, 0xb5, 0x2c, - 0xbe, 0xa6, 0x31, 0x43, 0xcf, 0xd7, 0x4c, 0xfa, 0x32, 0x65, 0xed, 0x1b, 0x5d, 0xd0, 0xbf, 0xe3, - 0x3e, 0x22, 0xe9, 0x05, 0xa9, 0x8e, 0x5a, 0x76, 0x3f, 0xbd, 0x4c, 0xd9, 0x6a, 0xff, 0x42, 0xa1, - 0xfb, 0xf0, 0x66, 0xc4, 0x63, 0xae, 0xdb, 0x8d, 0x2e, 0xe8, 0x37, 0xbc, 0x42, 0xf4, 0xbe, 0x15, - 0x54, 0x2f, 0xc5, 0xc7, 0x24, 0x12, 0x74, 0x74, 0xc2, 0x93, 0xf3, 0xad, 0xa8, 0x3a, 0xb0, 0x55, - 0x1e, 0x3e, 0x54, 0x5a, 0x1a, 0xa6, 0x1d, 0x0f, 0x96, 0xa5, 0x81, 0x96, 0x75, 0xec, 0xc6, 0x56, - 0xd8, 0xbd, 0xcf, 0x00, 0x3e, 0xac, 0x01, 0xaa, 0x54, 0x24, 0x8a, 0xa1, 0xbb, 0xb0, 0x91, 0xc9, - 0xa8, 0xe4, 0x5a, 0x2c, 0x51, 0x0f, 0x36, 0xd5, 0x98, 0xba, 0xfb, 0x07, 0x05, 0xc9, 0x11, 0xcc, - 0x7f, 0x75, 0x9a, 0x83, 0x57, 0x87, 0xee, 0xfe, 0x81, 0x57, 0x7e, 0x41, 0xcf, 0x60, 0x6b, 0x42, - 0x23, 0x3e, 0x1a, 0x66, 0x89, 0xe6, 0x91, 0xe1, 0x69, 0xb9, 0x36, 0x29, 0xf2, 0x26, 0xcb, 0xbc, - 0xc9, 0xe9, 0x32, 0x6f, 0x0f, 0x1a, 0xfb, 0xdb, 0x85, 0xdb, 0xfd, 0x01, 0xe0, 0x6e, 0x45, 0x5b, - 0x3c, 0x36, 0xf4, 0x06, 0xee, 0xfe, 0x13, 0x2c, 0xda, 0x23, 0x6b, 0x4f, 0x8f, 0x6c, 0x8e, 0xdd, - 0x6e, 0x6f, 0x9c, 0xc1, 0x80, 0x69, 0xf4, 0xde, 0x74, 0x5c, 0xbf, 0x73, 0xbd, 0xe3, 0x86, 0xc8, - 0xec, 0xc7, 0xff, 0x37, 0x15, 0x63, 0x3b, 0x3a, 0x9e, 0xce, 0xb0, 0x75, 0x35, 0xc3, 0xd6, 0xf5, - 0x0c, 0x83, 0x4f, 0x39, 0x06, 0xdf, 0x73, 0x0c, 0x7e, 0xe6, 0x18, 0x4c, 0x73, 0x0c, 0x7e, 0xe7, - 0x18, 0xfc, 0xc9, 0xb1, 0x75, 0x9d, 0x63, 0xf0, 0x65, 0x8e, 0xad, 0xe9, 0x1c, 0x5b, 0x57, 0x73, - 0x6c, 0xbd, 0xbb, 0x57, 0xfb, 0xed, 0xfc, 0xa6, 0x19, 0xd6, 0xd3, 0xbf, 0x01, 0x00, 0x00, 0xff, - 0xff, 0x59, 0x14, 0xf6, 0xcc, 0xad, 0x03, 0x00, 0x00, + // 479 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x31, 0x6f, 0xd3, 0x40, + 0x14, 0xc7, 0x7d, 0x44, 0x44, 0xea, 0x05, 0x28, 0x9c, 0x2a, 0x08, 0x1e, 0x2e, 0x51, 0xca, 0x90, + 0xe9, 0x2c, 0x19, 0xb5, 0x0b, 0x12, 0x52, 0x0b, 0x52, 0x19, 0x2a, 0x84, 0x9c, 0xb2, 0x20, 0xa4, + 0xe8, 0xe2, 0x5c, 0xd3, 0x53, 0x6d, 0xdf, 0x71, 0x77, 0x0e, 0xed, 0xc6, 0x07, 0x60, 0x40, 0x62, + 0x67, 0xe6, 0x6b, 0xb0, 0x31, 0x66, 0xec, 0x84, 0x88, 0xb3, 0x30, 0xf6, 0x23, 0x20, 0xfb, 0x1c, + 0x37, 0xc2, 0x11, 0x52, 0xb6, 0xf7, 0xfe, 0xfe, 0xfb, 0xdd, 0xcf, 0xef, 0x7f, 0x86, 0x2f, 0xb4, + 0x0a, 0xbd, 0x30, 0x12, 0xe9, 0xd8, 0xa3, 0xca, 0xf0, 0x53, 0x1a, 0x9a, 0xa1, 0x51, 0x34, 0x3c, + 0x67, 0xaa, 0x12, 0xca, 0x5e, 0x8e, 0x6a, 0x16, 0x22, 0x95, 0x30, 0x02, 0xb5, 0xe4, 0x05, 0xd1, + 0x4c, 0x4d, 0x79, 0xc8, 0xb4, 0xbb, 0x33, 0x11, 0x13, 0x51, 0xe8, 0x5e, 0x5e, 0x59, 0x8b, 0xdb, + 0x99, 0x08, 0x31, 0x89, 0x98, 0x57, 0x74, 0xa3, 0xf4, 0xd4, 0x33, 0x3c, 0x66, 0xda, 0xd0, 0x58, + 0x96, 0x06, 0x92, 0x83, 0xe8, 0x33, 0xaa, 0xd8, 0x0d, 0x89, 0xf6, 0xa6, 0x4c, 0x69, 0x2e, 0x12, + 0x2d, 0x47, 0x55, 0x69, 0xfd, 0xbd, 0xaf, 0x00, 0x3e, 0x3c, 0x62, 0xe6, 0xa0, 0xb4, 0x1e, 0x73, + 0x6d, 0x02, 0xf6, 0x21, 0x65, 0xda, 0xa0, 0x5d, 0x78, 0xb7, 0x02, 0x4d, 0x68, 0xcc, 0xda, 0xa0, + 0x0b, 0xfa, 0x5b, 0xc1, 0x9d, 0xa5, 0xf8, 0x9a, 0xc6, 0x0c, 0x3d, 0x5f, 0x31, 0x99, 0x4b, 0xc9, + 0xda, 0xb7, 0xba, 0xa0, 0x7f, 0xcf, 0x7f, 0x4c, 0xe4, 0x05, 0xa9, 0x8e, 0x5a, 0x4e, 0x3f, 0xb9, + 0x94, 0xec, 0xe6, 0xfd, 0xbc, 0x43, 0x3b, 0xf0, 0x76, 0xc4, 0x63, 0x6e, 0xda, 0x8d, 0x2e, 0xe8, + 0x37, 0x02, 0xdb, 0xf4, 0xbe, 0x59, 0xaa, 0x97, 0xe2, 0x63, 0x12, 0x09, 0x3a, 0x3e, 0xe6, 0xc9, + 0xf9, 0x46, 0x54, 0x1d, 0xd8, 0x2a, 0x0f, 0x1f, 0x6a, 0xa3, 0x0a, 0xa6, 0xad, 0x00, 0x96, 0xd2, + 0xc0, 0xa8, 0x3a, 0x76, 0x63, 0x23, 0xec, 0xde, 0x67, 0x00, 0x1f, 0xd5, 0x00, 0xb5, 0x14, 0x89, + 0x66, 0xe8, 0x3e, 0x6c, 0xa4, 0x2a, 0x2a, 0xb9, 0xf2, 0x12, 0xf5, 0x60, 0x53, 0x9f, 0x51, 0x7f, + 0x6f, 0xdf, 0x92, 0x1c, 0xc2, 0xec, 0x57, 0xa7, 0x39, 0x78, 0x75, 0xe0, 0xef, 0xed, 0x07, 0xe5, + 0x13, 0xf4, 0x0c, 0xb6, 0xa6, 0x34, 0xe2, 0xe3, 0x61, 0x9a, 0x18, 0x1e, 0x15, 0x3c, 0x2d, 0xdf, + 0x25, 0x36, 0x6f, 0xb2, 0xcc, 0x9b, 0x9c, 0x2c, 0xf3, 0x0e, 0x60, 0x61, 0x7f, 0x9b, 0xbb, 0xfd, + 0x1f, 0x00, 0x6e, 0x57, 0xb4, 0xf6, 0x4e, 0xa1, 0x37, 0x70, 0xfb, 0x9f, 0x60, 0xd1, 0x2e, 0x59, + 0xb9, 0x61, 0x64, 0x7d, 0xec, 0x6e, 0x7b, 0xed, 0x0e, 0x06, 0xcc, 0xa0, 0xf7, 0xc5, 0xc4, 0xd5, + 0x6f, 0xae, 0x4f, 0x5c, 0x13, 0x99, 0xfb, 0xe4, 0xff, 0x26, 0xbb, 0xb6, 0xc3, 0xa3, 0xd9, 0x1c, + 0x3b, 0x57, 0x73, 0xec, 0x5c, 0xcf, 0x31, 0xf8, 0x94, 0x61, 0xf0, 0x3d, 0xc3, 0xe0, 0x67, 0x86, + 0xc1, 0x2c, 0xc3, 0xe0, 0x77, 0x86, 0xc1, 0x9f, 0x0c, 0x3b, 0xd7, 0x19, 0x06, 0x5f, 0x16, 0xd8, + 0x99, 0x2d, 0xb0, 0x73, 0xb5, 0xc0, 0xce, 0xbb, 0x07, 0xb5, 0xbf, 0x6b, 0xd4, 0x2c, 0x96, 0xf5, + 0xf4, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x44, 0x6c, 0xdd, 0x55, 0x94, 0x03, 0x00, 0x00, } func (this *GetArtifactListRequest) Equal(that interface{}) bool { diff --git a/src/cloud/artifact_tracker/artifacttrackerpb/artifact_tracker.proto b/src/cloud/artifact_tracker/artifacttrackerpb/artifact_tracker.proto index 5417565904d..a7dc2f62a59 100644 --- a/src/cloud/artifact_tracker/artifacttrackerpb/artifact_tracker.proto +++ b/src/cloud/artifact_tracker/artifacttrackerpb/artifact_tracker.proto @@ -22,7 +22,7 @@ package px.services; option go_package = "artifacttrackerpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "src/shared/artifacts/versionspb/versions.proto"; diff --git a/src/cloud/artifact_tracker/controllers/server.go b/src/cloud/artifact_tracker/controllers/server.go index 579effd3cc4..9570efd5bc7 100644 --- a/src/cloud/artifact_tracker/controllers/server.go +++ b/src/cloud/artifact_tracker/controllers/server.go @@ -173,7 +173,7 @@ func (s *Server) GetDownloadLink(ctx context.Context, in *apb.GetDownloadLinkReq return nil, status.Error(codes.InvalidArgument, "artifact type cannot be unknown") } - if !(at == vpb.AT_DARWIN_AMD64 || at == vpb.AT_LINUX_AMD64 || at == vpb.AT_CONTAINER_SET_YAMLS || at == vpb.AT_CONTAINER_SET_TEMPLATE_YAMLS) { + if at != vpb.AT_DARWIN_AMD64 && at != vpb.AT_LINUX_AMD64 && at != vpb.AT_CONTAINER_SET_YAMLS && at != vpb.AT_CONTAINER_SET_TEMPLATE_YAMLS { return nil, status.Error(codes.InvalidArgument, "artifact type cannot be downloaded") } @@ -233,7 +233,6 @@ func (s *Server) GetDownloadLink(ctx context.Context, in *apb.GetDownloadLinkReq sha256ObjectPath := objectPath + ".sha256" r, err := s.sc.Bucket(bucket).Object(sha256ObjectPath).NewReader(ctx) - if err != nil { return nil, status.Error(codes.Internal, "failed to fetch sha256 file") } diff --git a/src/cloud/auth/apikey/api_key.go b/src/cloud/auth/apikey/api_key.go index 5aa25b88433..0974f27461e 100644 --- a/src/cloud/auth/apikey/api_key.go +++ b/src/cloud/auth/apikey/api_key.go @@ -39,10 +39,8 @@ import ( "px.dev/pixie/src/utils" ) -var ( - // ErrAPIKeyNotFound is used when the specified API key cannot be located. - ErrAPIKeyNotFound = errors.New("invalid API key") -) +// ErrAPIKeyNotFound is used when the specified API key cannot be located. +var ErrAPIKeyNotFound = errors.New("invalid API key") const ( // apiKeyPrefix is applied to all api keys to make them easier to identify. diff --git a/src/cloud/auth/authpb/BUILD.bazel b/src/cloud/auth/authpb/BUILD.bazel index 1bcfff10f39..ee3e0a1aeaa 100644 --- a/src/cloud/auth/authpb/BUILD.bazel +++ b/src/cloud/auth/authpb/BUILD.bazel @@ -23,7 +23,7 @@ pl_proto_library( deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", "//src/shared/services/jwtpb:jwt_pl_proto", - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/cloud/auth/authpb/auth.pb.go b/src/cloud/auth/authpb/auth.pb.go index 6d01f5aaff7..9401680a495 100755 --- a/src/cloud/auth/authpb/auth.pb.go +++ b/src/cloud/auth/authpb/auth.pb.go @@ -1609,94 +1609,93 @@ func init() { func init() { proto.RegisterFile("src/cloud/auth/authpb/auth.proto", fileDescriptor_78f37304415417b9) } var fileDescriptor_78f37304415417b9 = []byte{ - // 1385 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4b, 0x73, 0xdb, 0xd4, - 0x17, 0x8f, 0x6c, 0x59, 0xb1, 0x8f, 0xd3, 0xff, 0xdf, 0xb9, 0x69, 0x8b, 0xab, 0x12, 0x39, 0x11, - 0xc3, 0xf4, 0x35, 0xc8, 0xd3, 0x50, 0x66, 0xa0, 0x05, 0x8a, 0xdb, 0xb4, 0x25, 0x69, 0xfa, 0x18, - 0xb5, 0x5d, 0xc0, 0x02, 0x8f, 0x62, 0x5d, 0x2b, 0x22, 0xb6, 0xae, 0x2a, 0x5d, 0x75, 0xe2, 0x05, - 0x33, 0x7c, 0x04, 0x96, 0x0c, 0x1b, 0x56, 0xcc, 0xf0, 0x51, 0x60, 0xd7, 0x65, 0x17, 0x4c, 0x87, - 0xba, 0x0b, 0x58, 0x76, 0xc7, 0x02, 0x16, 0xcc, 0x7d, 0xb8, 0x91, 0x6c, 0x39, 0xe3, 0x36, 0xdd, - 0xb0, 0x89, 0xaf, 0xce, 0xeb, 0xfe, 0xce, 0xf3, 0x9e, 0x09, 0xac, 0xc4, 0x51, 0xa7, 0xd9, 0xe9, - 0x91, 0xc4, 0x6d, 0x3a, 0x09, 0xdd, 0xe1, 0x7f, 0xc2, 0x6d, 0xfe, 0x63, 0x85, 0x11, 0xa1, 0x04, - 0x55, 0xc3, 0x3d, 0x2b, 0xc6, 0xd1, 0x23, 0xbf, 0x83, 0x63, 0xfd, 0x3d, 0xcf, 0xa7, 0x3b, 0xc9, - 0xb6, 0xd5, 0x21, 0xfd, 0xa6, 0x47, 0x3c, 0xd2, 0xe4, 0x32, 0xdb, 0x49, 0x97, 0x7f, 0xf1, 0x0f, - 0x7e, 0x12, 0xba, 0xfa, 0x49, 0x8f, 0x10, 0xaf, 0x87, 0xf7, 0xa5, 0x70, 0x3f, 0xa4, 0x03, 0xc9, - 0x6c, 0x8c, 0x33, 0xa9, 0xdf, 0xc7, 0x31, 0x75, 0xfa, 0xe1, 0x48, 0x80, 0x61, 0x73, 0x42, 0x5f, - 0x48, 0x34, 0x93, 0xc4, 0x77, 0xc3, 0x6d, 0xfe, 0x23, 0x04, 0xcc, 0x1f, 0x15, 0x38, 0xd6, 0x4a, - 0xe8, 0x0e, 0x0e, 0xa8, 0xdf, 0x71, 0x28, 0x76, 0x1f, 0xc4, 0x38, 0xda, 0x08, 0xba, 0x04, 0x5d, - 0x80, 0xf9, 0x24, 0xc6, 0x51, 0xdb, 0x77, 0xeb, 0xca, 0x8a, 0x72, 0xba, 0xba, 0xf6, 0x7f, 0x2b, - 0xdc, 0xb3, 0x84, 0x05, 0xeb, 0xc1, 0x83, 0x8d, 0xf5, 0x2b, 0x30, 0x7c, 0xda, 0xd0, 0xb8, 0xfc, - 0xba, 0xad, 0x31, 0xd9, 0x0d, 0x17, 0x2d, 0x03, 0x74, 0xfd, 0x28, 0xa6, 0xed, 0xc0, 0xe9, 0xe3, - 0x7a, 0x61, 0x45, 0x39, 0x5d, 0xb1, 0x2b, 0x9c, 0x72, 0xdb, 0xe9, 0x63, 0x74, 0x12, 0x2a, 0x3d, - 0x67, 0xc4, 0x2d, 0x72, 0x6e, 0x99, 0x11, 0x38, 0xf3, 0x28, 0x94, 0x70, 0xdf, 0xf1, 0x7b, 0x75, - 0x95, 0x33, 0xc4, 0x87, 0xf9, 0x83, 0x02, 0x0b, 0x5b, 0xc4, 0xf3, 0x03, 0x1b, 0x3f, 0x4c, 0x70, - 0x4c, 0xd1, 0x2a, 0x2c, 0x38, 0x9d, 0x0e, 0x8e, 0xe3, 0x36, 0x25, 0xbb, 0x38, 0xe0, 0xe8, 0x2a, - 0x76, 0x55, 0xd0, 0xee, 0x33, 0x12, 0xfa, 0x10, 0x4e, 0x74, 0x22, 0xec, 0x50, 0xdc, 0x16, 0x2e, - 0x74, 0xdb, 0x01, 0xa1, 0x6d, 0xbc, 0xe7, 0xc7, 0x34, 0xe6, 0xd7, 0x96, 0xed, 0x63, 0x42, 0x80, - 0xc3, 0xef, 0xde, 0x26, 0xf4, 0x1a, 0x67, 0x32, 0xe3, 0x7e, 0xf0, 0xc8, 0xa7, 0x58, 0x1a, 0xd7, - 0x84, 0x71, 0x41, 0xe3, 0xc6, 0x37, 0xd5, 0xb2, 0x5a, 0x2b, 0x6d, 0xaa, 0xe5, 0x52, 0x4d, 0x33, - 0x7f, 0x2b, 0x00, 0x48, 0x70, 0x61, 0x6f, 0xc0, 0x3c, 0x48, 0x63, 0x12, 0x1f, 0x2c, 0x26, 0x78, - 0x2f, 0xf4, 0x23, 0x1c, 0xb7, 0x1d, 0xca, 0x63, 0x52, 0xb4, 0x2b, 0x92, 0xd2, 0xe2, 0xfe, 0x70, - 0x94, 0x02, 0x90, 0x2b, 0xf1, 0x55, 0x19, 0xed, 0xaa, 0x20, 0xa1, 0xcb, 0x50, 0x11, 0x8e, 0x04, - 0x5d, 0x52, 0x2f, 0xf1, 0x6c, 0x98, 0x56, 0xaa, 0xa8, 0xac, 0xdc, 0x14, 0xda, 0xe5, 0x64, 0x94, - 0xcc, 0x8b, 0x50, 0x26, 0x91, 0x27, 0xf4, 0x35, 0xae, 0xdf, 0xc8, 0xe8, 0xef, 0xfb, 0x60, 0xdd, - 0x89, 0x3c, 0xae, 0x3c, 0x4f, 0xc4, 0x01, 0x9d, 0x83, 0x45, 0xdf, 0x65, 0xc6, 0xe9, 0xa0, 0x1d, - 0x46, 0xe4, 0x91, 0xef, 0xe2, 0xa8, 0x3e, 0xcf, 0x1d, 0xac, 0x8d, 0x18, 0x77, 0x25, 0x5d, 0xbf, - 0x0e, 0xf3, 0xd2, 0x00, 0x5a, 0x01, 0x8d, 0xdf, 0x29, 0xea, 0xa7, 0x72, 0xa5, 0x32, 0x7c, 0xda, - 0x28, 0x31, 0xe6, 0xba, 0x5d, 0x62, 0xb6, 0x5d, 0x74, 0x42, 0xa0, 0x4a, 0x95, 0x0a, 0xbb, 0x94, - 0xd5, 0x82, 0x08, 0xb2, 0xe9, 0xc0, 0x91, 0x7b, 0xbe, 0x17, 0x24, 0xe1, 0x2b, 0xe4, 0x7e, 0x3c, - 0x83, 0x6a, 0x5e, 0x06, 0x0b, 0xb5, 0xe2, 0xa6, 0x5a, 0x2e, 0xd6, 0x54, 0xf3, 0xa7, 0x02, 0x54, - 0x47, 0x77, 0xbc, 0x76, 0x0a, 0x1b, 0x50, 0x65, 0x8e, 0x64, 0x33, 0x08, 0x24, 0xf2, 0xde, 0x58, - 0x02, 0xcf, 0xbf, 0x0c, 0xa6, 0x96, 0xdf, 0x8c, 0x07, 0x47, 0x77, 0x3e, 0x13, 0xdd, 0xfc, 0x94, - 0x96, 0xf3, 0x53, 0x2a, 0x53, 0x71, 0x01, 0xde, 0xbe, 0x81, 0x69, 0x2b, 0xf1, 0xfa, 0x38, 0xa0, - 0xd8, 0x65, 0x78, 0x79, 0x30, 0x47, 0x99, 0xc9, 0x8d, 0x9b, 0x79, 0x1f, 0x96, 0xa7, 0x68, 0xc5, - 0x21, 0x09, 0x62, 0xfc, 0x5a, 0xe1, 0x36, 0xcf, 0xc1, 0x92, 0x8d, 0xbb, 0x98, 0x76, 0x66, 0x81, - 0x70, 0x13, 0x8e, 0x66, 0x85, 0x0f, 0x73, 0xf3, 0xe7, 0xb0, 0x9a, 0xf6, 0x87, 0x5b, 0xbc, 0x4e, - 0xa2, 0xd6, 0xdd, 0x8d, 0x9b, 0x78, 0x30, 0xc2, 0xf1, 0x0e, 0xcc, 0x3b, 0xa1, 0xdf, 0xde, 0xc5, - 0x03, 0x59, 0xf9, 0x7c, 0x50, 0x4a, 0x19, 0xcd, 0x09, 0xfd, 0x9b, 0x78, 0x60, 0x7e, 0x01, 0xe6, - 0x41, 0x96, 0x0e, 0x03, 0xf2, 0x7b, 0x05, 0x16, 0x37, 0x78, 0xb9, 0xb3, 0x42, 0x4a, 0x45, 0x47, - 0x4c, 0x57, 0x25, 0x35, 0x5d, 0x0f, 0x35, 0xaf, 0xf7, 0x6b, 0x52, 0x9d, 0xb1, 0x26, 0xcd, 0x0f, - 0x00, 0xa5, 0x91, 0x49, 0x2f, 0x1b, 0x20, 0xdb, 0xb3, 0xdd, 0xf3, 0x83, 0x5d, 0x09, 0x10, 0x04, - 0x69, 0xcb, 0x0f, 0x76, 0xcd, 0x5f, 0x0b, 0xb0, 0x2c, 0x5a, 0xe9, 0x4e, 0xe4, 0xb5, 0x02, 0x77, - 0xd2, 0xbb, 0xcf, 0xa0, 0x48, 0x22, 0x4f, 0xbe, 0x54, 0x56, 0xa6, 0xb5, 0x0e, 0x54, 0x64, 0xe3, - 0xce, 0x66, 0xaa, 0xe8, 0x2a, 0xa8, 0xac, 0xdb, 0x78, 0x0c, 0xaa, 0x6b, 0xcd, 0x57, 0x30, 0xc1, - 0xcf, 0x5c, 0x59, 0x6f, 0x41, 0xf1, 0x4e, 0xe4, 0x65, 0x5a, 0x4f, 0xc9, 0xb6, 0x5e, 0x03, 0xaa, - 0x2e, 0xe9, 0x3b, 0x7e, 0x90, 0x8e, 0x38, 0x08, 0x12, 0x13, 0xd0, 0xbf, 0x02, 0x95, 0x19, 0x7c, - 0xf3, 0x2f, 0xe9, 0xa6, 0x5a, 0x56, 0x6a, 0x05, 0xb3, 0x05, 0xc6, 0x34, 0x77, 0x66, 0x4d, 0x47, - 0x4b, 0xce, 0x02, 0xba, 0x73, 0x95, 0x04, 0x01, 0xee, 0x50, 0x12, 0x65, 0x1a, 0x71, 0x15, 0x16, - 0x3a, 0xbd, 0x24, 0xa6, 0x38, 0x4a, 0x87, 0xa0, 0x2a, 0x69, 0x0c, 0xe1, 0xcb, 0xc1, 0x30, 0x69, - 0xe2, 0x30, 0x95, 0xff, 0xb7, 0x02, 0xb2, 0xcf, 0xd0, 0x29, 0x28, 0x4c, 0xdf, 0x5c, 0xb4, 0xe1, - 0xd3, 0x46, 0x61, 0x63, 0xdd, 0x2e, 0xf8, 0x2e, 0xaa, 0x41, 0x91, 0x75, 0xaa, 0x08, 0x30, 0x3b, - 0xa2, 0x8f, 0x00, 0xe4, 0x24, 0x67, 0x97, 0x14, 0xb9, 0x09, 0xdd, 0x12, 0xab, 0x96, 0x35, 0x5a, - 0xb5, 0xac, 0xfb, 0xa3, 0x55, 0xcb, 0xae, 0x48, 0xe9, 0x16, 0x45, 0x08, 0x54, 0x17, 0xc7, 0x1d, - 0x19, 0x77, 0x7e, 0x4e, 0xb5, 0x49, 0x69, 0xd6, 0xd1, 0x9d, 0xda, 0xbd, 0xb4, 0x99, 0x77, 0x2f, - 0xf3, 0x2f, 0x05, 0xfe, 0x27, 0xbc, 0xbf, 0x85, 0xa9, 0xe3, 0x3a, 0xd4, 0x99, 0x3d, 0x0a, 0xff, - 0x51, 0x9f, 0xc5, 0x53, 0x6e, 0x9e, 0x81, 0x25, 0x51, 0xd3, 0xd9, 0x41, 0x3c, 0x42, 0xa6, 0xec, - 0x23, 0x33, 0x97, 0x60, 0x71, 0xcb, 0x8f, 0x69, 0x46, 0xd0, 0xbc, 0x06, 0x28, 0x4d, 0x94, 0x25, - 0xd8, 0x04, 0x75, 0x17, 0x0f, 0xe2, 0xba, 0xb2, 0x52, 0x3c, 0x5d, 0x5d, 0x3b, 0x99, 0x7d, 0xaf, - 0x33, 0x71, 0xb6, 0xb9, 0xa0, 0x79, 0x09, 0x6a, 0xac, 0xa8, 0x33, 0x18, 0x66, 0xcd, 0x80, 0x79, - 0x11, 0x16, 0x53, 0xca, 0x12, 0xc2, 0xbb, 0xa2, 0x38, 0x85, 0xfa, 0x52, 0x0e, 0x02, 0x5e, 0xb1, - 0xe6, 0x29, 0x58, 0xda, 0x22, 0x64, 0x37, 0x09, 0xb3, 0x77, 0xd7, 0xf6, 0xb5, 0x45, 0x69, 0x9b, - 0x9f, 0xc0, 0xd1, 0xac, 0xe0, 0x2b, 0xdd, 0xb3, 0xf6, 0x4f, 0x09, 0xaa, 0xac, 0x67, 0xef, 0x09, - 0x26, 0xba, 0x04, 0x25, 0xbe, 0x39, 0xa2, 0x13, 0x79, 0xdb, 0x24, 0x07, 0xa1, 0xbf, 0x35, 0x65, - 0xd1, 0x44, 0x9f, 0x82, 0x26, 0x16, 0x2f, 0xa4, 0x67, 0x44, 0x32, 0x1b, 0x9f, 0x5e, 0xcf, 0xe5, - 0x31, 0xfd, 0xaf, 0x45, 0xc0, 0x32, 0x2f, 0x28, 0x3a, 0x93, 0x11, 0x3f, 0x68, 0x63, 0xd1, 0xcf, - 0xce, 0x22, 0x2a, 0xe3, 0x73, 0x0f, 0x16, 0xd2, 0x4b, 0x04, 0x5a, 0xc9, 0xe8, 0xe6, 0x2c, 0x23, - 0xfa, 0xea, 0x01, 0x12, 0xd2, 0xe8, 0x37, 0xa0, 0x4f, 0x5f, 0x01, 0x90, 0x35, 0x15, 0x5e, 0xee, - 0xd6, 0xa1, 0x37, 0x67, 0x96, 0x97, 0xd7, 0xdf, 0x02, 0xd8, 0x1f, 0xfe, 0xc8, 0xc8, 0xa8, 0x4f, - 0x3c, 0x72, 0x7a, 0x63, 0x2a, 0x5f, 0x9a, 0x7b, 0x08, 0xc7, 0xf3, 0xdf, 0x15, 0x74, 0x76, 0xf6, - 0xb7, 0x54, 0x3f, 0x37, 0x93, 0xac, 0xbc, 0x32, 0x80, 0x63, 0xb9, 0x8f, 0x48, 0x5e, 0x15, 0x4c, - 0x79, 0xab, 0xf2, 0xaa, 0x60, 0xda, 0x9b, 0xb4, 0xf6, 0x47, 0x01, 0x8e, 0x88, 0x20, 0x8e, 0x1a, - 0xe0, 0x32, 0x68, 0x02, 0xe3, 0x58, 0x45, 0xe4, 0x4c, 0x23, 0x3d, 0xaf, 0xad, 0xd0, 0x0d, 0x50, - 0xd9, 0xe4, 0x19, 0x0b, 0xff, 0xc4, 0x84, 0x1a, 0x0b, 0x7f, 0xce, 0xb0, 0x5a, 0x87, 0xe2, 0x0d, - 0x4c, 0xd1, 0xf2, 0x84, 0x3b, 0x19, 0x33, 0xc6, 0x34, 0xb6, 0xb4, 0x72, 0x1e, 0xb4, 0x75, 0xdc, - 0xc3, 0x14, 0xa3, 0xf1, 0x59, 0xa5, 0x1f, 0x9f, 0x78, 0x0d, 0xae, 0xf5, 0x43, 0x3a, 0x60, 0xad, - 0x91, 0x1e, 0x29, 0x63, 0x81, 0xc8, 0x19, 0x4b, 0x63, 0xad, 0x91, 0x37, 0x8f, 0xae, 0x7c, 0xfc, - 0xf8, 0x99, 0x31, 0xf7, 0xe4, 0x99, 0x31, 0xf7, 0xe2, 0x99, 0xa1, 0x7c, 0x3b, 0x34, 0x94, 0x9f, - 0x87, 0x86, 0xf2, 0xcb, 0xd0, 0x50, 0x1e, 0x0f, 0x0d, 0xe5, 0xf7, 0xa1, 0xa1, 0xfc, 0x39, 0x34, - 0xe6, 0x5e, 0x0c, 0x0d, 0xe5, 0xbb, 0xe7, 0xc6, 0xdc, 0xe3, 0xe7, 0xc6, 0xdc, 0x93, 0xe7, 0xc6, - 0xdc, 0x97, 0x9a, 0xf8, 0xd7, 0xcb, 0xb6, 0xc6, 0x21, 0xbe, 0xff, 0x6f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xc3, 0xe7, 0x73, 0xf6, 0x9a, 0x11, 0x00, 0x00, + // 1371 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcd, 0x6f, 0xdb, 0x64, + 0x18, 0xaf, 0x13, 0xc7, 0x4d, 0x9e, 0x74, 0x90, 0xbe, 0xed, 0x46, 0xe6, 0x51, 0xa7, 0x35, 0x42, + 0xfb, 0x92, 0x1c, 0xad, 0x0c, 0x09, 0x36, 0x60, 0x64, 0xeb, 0x36, 0xda, 0x75, 0x1f, 0xf2, 0xb6, + 0x03, 0x1c, 0x88, 0xdc, 0xf8, 0x8d, 0x67, 0x9a, 0xf8, 0xf5, 0xec, 0xd7, 0x53, 0x73, 0x40, 0xe2, + 0x4f, 0xe0, 0x88, 0xb8, 0x70, 0x42, 0xe2, 0x4f, 0x81, 0xdb, 0x8e, 0x3b, 0xa0, 0x89, 0x65, 0x07, + 0x38, 0xee, 0xc6, 0x01, 0x0e, 0xe8, 0xfd, 0xc8, 0x6a, 0x27, 0x4e, 0x95, 0xad, 0xbb, 0x70, 0x59, + 0x9d, 0xe7, 0xeb, 0xfd, 0x3d, 0xdf, 0x8f, 0x06, 0xab, 0x71, 0xd4, 0x69, 0x76, 0x7a, 0x24, 0x71, + 0x9b, 0x4e, 0x42, 0x1f, 0xf0, 0x7f, 0xc2, 0x1d, 0xfe, 0xc7, 0x0a, 0x23, 0x42, 0x09, 0xaa, 0x86, + 0x7b, 0x56, 0x8c, 0xa3, 0x47, 0x7e, 0x07, 0xc7, 0xfa, 0xb2, 0x47, 0x3c, 0xc2, 0xe9, 0x4d, 0xf6, + 0x25, 0x44, 0xf4, 0x13, 0x1e, 0x21, 0x5e, 0x0f, 0x37, 0xf9, 0xaf, 0x9d, 0xa4, 0xdb, 0xc4, 0xfd, + 0x90, 0x0e, 0x24, 0xb3, 0x31, 0xce, 0xa4, 0x7e, 0x1f, 0xc7, 0xd4, 0xe9, 0x87, 0x23, 0x01, 0x06, + 0xc1, 0x09, 0x7d, 0x21, 0xd1, 0x4c, 0x12, 0xdf, 0x0d, 0x77, 0xf8, 0x1f, 0x21, 0x60, 0xfe, 0xa4, + 0xc0, 0xd1, 0x56, 0x42, 0x1f, 0xe0, 0x80, 0xfa, 0x1d, 0x87, 0x62, 0xf7, 0x7e, 0x8c, 0xa3, 0xcd, + 0xa0, 0x4b, 0xd0, 0x79, 0x98, 0x4f, 0x62, 0x1c, 0xb5, 0x7d, 0xb7, 0xae, 0xac, 0x2a, 0xa7, 0xaa, + 0xeb, 0x6f, 0x5b, 0xe1, 0x9e, 0x25, 0x2c, 0x58, 0xf7, 0xef, 0x6f, 0x6e, 0x5c, 0x86, 0xe1, 0xd3, + 0x86, 0xc6, 0xe5, 0x37, 0x6c, 0x8d, 0xc9, 0x6e, 0xba, 0x68, 0x05, 0xa0, 0xeb, 0x47, 0x31, 0x6d, + 0x07, 0x4e, 0x1f, 0xd7, 0x0b, 0xab, 0xca, 0xa9, 0x8a, 0x5d, 0xe1, 0x94, 0x5b, 0x4e, 0x1f, 0xa3, + 0x13, 0x50, 0xe9, 0x39, 0x23, 0x6e, 0x91, 0x73, 0xcb, 0x8c, 0xc0, 0x99, 0xcb, 0x50, 0xc2, 0x7d, + 0xc7, 0xef, 0xd5, 0x55, 0xce, 0x10, 0x3f, 0xcc, 0x1f, 0x15, 0x58, 0xd8, 0x26, 0x9e, 0x1f, 0xd8, + 0xf8, 0x61, 0x82, 0x63, 0x8a, 0xd6, 0x60, 0xc1, 0xe9, 0x74, 0x70, 0x1c, 0xb7, 0x29, 0xd9, 0xc5, + 0x01, 0x47, 0x57, 0xb1, 0xab, 0x82, 0x76, 0x8f, 0x91, 0xd0, 0x47, 0x70, 0xbc, 0x13, 0x61, 0x87, + 0xe2, 0xb6, 0x70, 0xa1, 0xdb, 0x0e, 0x08, 0x6d, 0xe3, 0x3d, 0x3f, 0xa6, 0x31, 0x7f, 0xb6, 0x6c, + 0x1f, 0x15, 0x02, 0x1c, 0x7e, 0xf7, 0x16, 0xa1, 0x57, 0x39, 0x93, 0x19, 0xf7, 0x83, 0x47, 0x3e, + 0xc5, 0xd2, 0xb8, 0x26, 0x8c, 0x0b, 0x1a, 0x37, 0xbe, 0xa5, 0x96, 0xd5, 0x5a, 0x69, 0x4b, 0x2d, + 0x97, 0x6a, 0x9a, 0xf9, 0x7b, 0x01, 0x40, 0x82, 0x0b, 0x7b, 0x03, 0xe6, 0x41, 0x1a, 0x93, 0xf8, + 0xc1, 0x62, 0x82, 0xf7, 0x42, 0x3f, 0xc2, 0x71, 0xdb, 0xa1, 0x3c, 0x26, 0x45, 0xbb, 0x22, 0x29, + 0x2d, 0xee, 0x0f, 0x47, 0x29, 0x00, 0xb9, 0x12, 0x5f, 0x95, 0xd1, 0xae, 0x08, 0x12, 0xba, 0x04, + 0x15, 0xe1, 0x48, 0xd0, 0x25, 0xf5, 0x12, 0xcf, 0x86, 0x69, 0xa5, 0x6a, 0xc7, 0xca, 0x4d, 0xa1, + 0x5d, 0x4e, 0x46, 0xc9, 0xbc, 0x00, 0x65, 0x12, 0x79, 0x42, 0x5f, 0xe3, 0xfa, 0x8d, 0x8c, 0xfe, + 0xbe, 0x0f, 0xd6, 0xed, 0xc8, 0xe3, 0xca, 0xf3, 0x44, 0x7c, 0xa0, 0xb3, 0xb0, 0xe8, 0xbb, 0xcc, + 0x38, 0x1d, 0xb4, 0xc3, 0x88, 0x3c, 0xf2, 0x5d, 0x1c, 0xd5, 0xe7, 0xb9, 0x83, 0xb5, 0x11, 0xe3, + 0x8e, 0xa4, 0xeb, 0xd7, 0x60, 0x5e, 0x1a, 0x40, 0xab, 0xa0, 0xf1, 0x37, 0x45, 0xfd, 0x54, 0x2e, + 0x57, 0x86, 0x4f, 0x1b, 0x25, 0xc6, 0xdc, 0xb0, 0x4b, 0xcc, 0xb6, 0x8b, 0x8e, 0x0b, 0x54, 0xa9, + 0x52, 0x61, 0x8f, 0xb2, 0x5a, 0x10, 0x41, 0x36, 0x1d, 0x38, 0x72, 0xd7, 0xf7, 0x82, 0x24, 0x7c, + 0x85, 0xdc, 0x8f, 0x67, 0x50, 0xcd, 0xcb, 0x60, 0xa1, 0x56, 0xdc, 0x52, 0xcb, 0xc5, 0x9a, 0x6a, + 0xfe, 0x5c, 0x80, 0xea, 0xe8, 0x8d, 0xd7, 0x4e, 0x61, 0x03, 0xaa, 0xcc, 0x91, 0x6c, 0x06, 0x81, + 0x44, 0xde, 0x1b, 0x4b, 0xe0, 0xb9, 0x97, 0xc1, 0xd4, 0xf2, 0x9b, 0xf1, 0xe0, 0xe8, 0xce, 0x67, + 0xa2, 0x9b, 0x9f, 0xd2, 0x72, 0x7e, 0x4a, 0x65, 0x2a, 0xce, 0xc3, 0xbb, 0xd7, 0x31, 0x6d, 0x25, + 0x5e, 0x1f, 0x07, 0x14, 0xbb, 0x0c, 0x2f, 0x0f, 0xe6, 0x28, 0x33, 0xb9, 0x71, 0x33, 0xef, 0xc1, + 0xca, 0x14, 0xad, 0x38, 0x24, 0x41, 0x8c, 0x5f, 0x2b, 0xdc, 0xe6, 0x59, 0x58, 0xb2, 0x71, 0x17, + 0xd3, 0xce, 0x2c, 0x10, 0x6e, 0xc0, 0x72, 0x56, 0xf8, 0x30, 0x2f, 0x7f, 0x01, 0x6b, 0x69, 0x7f, + 0xb8, 0xc5, 0x6b, 0x24, 0x6a, 0xdd, 0xd9, 0xbc, 0x81, 0x07, 0x23, 0x1c, 0xef, 0xc1, 0xbc, 0x13, + 0xfa, 0xed, 0x5d, 0x3c, 0x90, 0x95, 0xcf, 0x07, 0xa5, 0x94, 0xd1, 0x9c, 0xd0, 0xbf, 0x81, 0x07, + 0xe6, 0x97, 0x60, 0x1e, 0x64, 0xe9, 0x30, 0x20, 0x7f, 0x50, 0x60, 0x71, 0x93, 0x97, 0x3b, 0x2b, + 0xa4, 0x54, 0x74, 0xc4, 0x74, 0x55, 0x52, 0xd3, 0xf5, 0x50, 0xf3, 0x7a, 0xbf, 0x26, 0xd5, 0x19, + 0x6b, 0xd2, 0xfc, 0x10, 0x50, 0x1a, 0x99, 0xf4, 0xb2, 0x01, 0xb2, 0x3d, 0xdb, 0x3d, 0x3f, 0xd8, + 0x95, 0x00, 0x41, 0x90, 0xb6, 0xfd, 0x60, 0xd7, 0xfc, 0xad, 0x00, 0x2b, 0xa2, 0x95, 0x6e, 0x47, + 0x5e, 0x2b, 0x70, 0x27, 0xbd, 0xfb, 0x1c, 0x8a, 0x24, 0xf2, 0xe4, 0xa6, 0xb2, 0x32, 0xad, 0x75, + 0xa0, 0x22, 0x1b, 0x77, 0x36, 0x53, 0x45, 0x57, 0x40, 0x65, 0xdd, 0xc6, 0x63, 0x50, 0x5d, 0x6f, + 0xbe, 0x82, 0x09, 0xfe, 0xcd, 0x95, 0xf5, 0x16, 0x14, 0x6f, 0x47, 0x5e, 0xa6, 0xf5, 0x94, 0x6c, + 0xeb, 0x35, 0xa0, 0xea, 0x92, 0xbe, 0xe3, 0x07, 0xe9, 0x88, 0x83, 0x20, 0x31, 0x01, 0xfd, 0x6b, + 0x50, 0x99, 0xc1, 0x37, 0xbf, 0x49, 0xb7, 0xd4, 0xb2, 0x52, 0x2b, 0x98, 0x2d, 0x30, 0xa6, 0xb9, + 0x33, 0x6b, 0x3a, 0x5a, 0x72, 0x16, 0xd0, 0x07, 0x57, 0x48, 0x10, 0xe0, 0x0e, 0x25, 0x51, 0xa6, + 0x11, 0xd7, 0x60, 0xa1, 0xd3, 0x4b, 0x62, 0x8a, 0xa3, 0x74, 0x08, 0xaa, 0x92, 0xc6, 0x10, 0xbe, + 0x1c, 0x0c, 0x93, 0x26, 0x0e, 0x53, 0xf9, 0xff, 0x28, 0x20, 0xfb, 0x0c, 0x9d, 0x84, 0xc2, 0xf4, + 0xcb, 0x45, 0x1b, 0x3e, 0x6d, 0x14, 0x36, 0x37, 0xec, 0x82, 0xef, 0xa2, 0x1a, 0x14, 0x59, 0xa7, + 0x8a, 0x00, 0xb3, 0x4f, 0xf4, 0x31, 0x80, 0x9c, 0xe4, 0xec, 0x91, 0x22, 0x37, 0xa1, 0x5b, 0xe2, + 0xd4, 0xb2, 0x46, 0xa7, 0x96, 0x75, 0x6f, 0x74, 0x6a, 0xd9, 0x15, 0x29, 0xdd, 0xa2, 0x08, 0x81, + 0xea, 0xe2, 0xb8, 0x23, 0xe3, 0xce, 0xbf, 0x53, 0x6d, 0x52, 0x9a, 0x75, 0x74, 0xa7, 0x6e, 0x2f, + 0x6d, 0xe6, 0xdb, 0xcb, 0xfc, 0x5b, 0x81, 0xb7, 0x84, 0xf7, 0x37, 0x31, 0x75, 0x5c, 0x87, 0x3a, + 0xb3, 0x47, 0xe1, 0x7f, 0xea, 0xb3, 0x58, 0xe5, 0xe6, 0x69, 0x58, 0x12, 0x35, 0x9d, 0x1d, 0xc4, + 0x23, 0x64, 0xca, 0x3e, 0x32, 0x73, 0x09, 0x16, 0xb7, 0xfd, 0x98, 0x66, 0x04, 0xcd, 0xab, 0x80, + 0xd2, 0x44, 0x59, 0x82, 0x4d, 0x50, 0x77, 0xf1, 0x20, 0xae, 0x2b, 0xab, 0xc5, 0x53, 0xd5, 0xf5, + 0x13, 0xd9, 0x7d, 0x9d, 0x89, 0xb3, 0xcd, 0x05, 0xcd, 0x8b, 0x50, 0x63, 0x45, 0x9d, 0xc1, 0x30, + 0x6b, 0x06, 0xcc, 0x0b, 0xb0, 0x98, 0x52, 0x96, 0x10, 0xde, 0x17, 0xc5, 0x29, 0xd4, 0x97, 0x72, + 0x10, 0xf0, 0x8a, 0x35, 0x4f, 0xc2, 0xd2, 0x36, 0x21, 0xbb, 0x49, 0x98, 0x7d, 0xbb, 0xb6, 0xaf, + 0x2d, 0x4a, 0xdb, 0xfc, 0x14, 0x96, 0xb3, 0x82, 0xaf, 0xf4, 0xce, 0xfa, 0xbf, 0x25, 0xa8, 0xb2, + 0x9e, 0xbd, 0x2b, 0x98, 0xe8, 0x22, 0x94, 0xf8, 0xe5, 0x88, 0x8e, 0xe7, 0x5d, 0x93, 0x1c, 0x84, + 0xfe, 0xce, 0x94, 0x43, 0x13, 0x7d, 0x06, 0x9a, 0x38, 0xbc, 0x90, 0x9e, 0x11, 0xc9, 0x5c, 0x7c, + 0x7a, 0x3d, 0x97, 0xc7, 0xf4, 0xbf, 0x11, 0x01, 0xcb, 0x6c, 0x50, 0x74, 0x3a, 0x23, 0x7e, 0xd0, + 0xc5, 0xa2, 0x9f, 0x99, 0x45, 0x54, 0xc6, 0xe7, 0x2e, 0x2c, 0xa4, 0x8f, 0x08, 0xb4, 0x9a, 0xd1, + 0xcd, 0x39, 0x46, 0xf4, 0xb5, 0x03, 0x24, 0xa4, 0xd1, 0x6f, 0x41, 0x9f, 0x7e, 0x02, 0x20, 0x6b, + 0x2a, 0xbc, 0xdc, 0xab, 0x43, 0x6f, 0xce, 0x2c, 0x2f, 0x9f, 0xbf, 0x09, 0xb0, 0x3f, 0xfc, 0x91, + 0x91, 0x51, 0x9f, 0x58, 0x72, 0x7a, 0x63, 0x2a, 0x5f, 0x9a, 0x7b, 0x08, 0xc7, 0xf2, 0xf7, 0x0a, + 0x3a, 0x33, 0xfb, 0x2e, 0xd5, 0xcf, 0xce, 0x24, 0x2b, 0x9f, 0x0c, 0xe0, 0x68, 0xee, 0x12, 0xc9, + 0xab, 0x82, 0x29, 0xbb, 0x2a, 0xaf, 0x0a, 0xa6, 0xed, 0xa4, 0xf5, 0x3f, 0x0b, 0x70, 0x44, 0x04, + 0x71, 0xd4, 0x00, 0x97, 0x40, 0x13, 0x18, 0xc7, 0x2a, 0x22, 0x67, 0x1a, 0xe9, 0x79, 0x6d, 0x85, + 0xae, 0x83, 0xca, 0x26, 0xcf, 0x58, 0xf8, 0x27, 0x26, 0xd4, 0x58, 0xf8, 0x73, 0x86, 0xd5, 0x06, + 0x14, 0xaf, 0x63, 0x8a, 0x56, 0x26, 0xdc, 0xc9, 0x98, 0x31, 0xa6, 0xb1, 0xa5, 0x95, 0x73, 0xa0, + 0x6d, 0xe0, 0x1e, 0xa6, 0x18, 0x8d, 0xcf, 0x2a, 0xfd, 0xd8, 0xc4, 0x36, 0xb8, 0xda, 0x0f, 0xe9, + 0x80, 0xb5, 0x46, 0x7a, 0xa4, 0x8c, 0x05, 0x22, 0x67, 0x2c, 0x8d, 0xb5, 0x46, 0xde, 0x3c, 0xba, + 0xfc, 0xc9, 0xe3, 0x67, 0xc6, 0xdc, 0x93, 0x67, 0xc6, 0xdc, 0x8b, 0x67, 0x86, 0xf2, 0xdd, 0xd0, + 0x50, 0x7e, 0x19, 0x1a, 0xca, 0xaf, 0x43, 0x43, 0x79, 0x3c, 0x34, 0x94, 0x3f, 0x86, 0x86, 0xf2, + 0xd7, 0xd0, 0x98, 0x7b, 0x31, 0x34, 0x94, 0xef, 0x9f, 0x1b, 0x73, 0x8f, 0x9f, 0x1b, 0x73, 0x4f, + 0x9e, 0x1b, 0x73, 0x5f, 0x69, 0xe2, 0x7f, 0x58, 0x76, 0x34, 0x0e, 0xf1, 0x83, 0xff, 0x02, 0x00, + 0x00, 0xff, 0xff, 0xa7, 0xff, 0xeb, 0xfc, 0x81, 0x11, 0x00, 0x00, } func (this *AuthenticatedUserInfo) Equal(that interface{}) bool { diff --git a/src/cloud/auth/authpb/auth.proto b/src/cloud/auth/authpb/auth.proto index 8050694f227..11b1a1d3d45 100644 --- a/src/cloud/auth/authpb/auth.proto +++ b/src/cloud/auth/authpb/auth.proto @@ -22,7 +22,7 @@ package px.services; option go_package = "authpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; import "src/api/proto/uuidpb/uuid.proto"; diff --git a/src/cloud/auth/controllers/auth0.go b/src/cloud/auth/controllers/auth0.go index 6b09bc290cf..9bbfd16119e 100644 --- a/src/cloud/auth/controllers/auth0.go +++ b/src/cloud/auth/controllers/auth0.go @@ -218,7 +218,6 @@ func (a *Auth0Connector) GetUserInfo(userID string) (*UserInfo, error) { req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", managementToken)) req.Header.Set("Content-Type", "application/json") resp, err := client.Do(req) - if err != nil { return nil, err } diff --git a/src/cloud/auth/controllers/login.go b/src/cloud/auth/controllers/login.go index 9217200091f..894ebc806d4 100644 --- a/src/cloud/auth/controllers/login.go +++ b/src/cloud/auth/controllers/login.go @@ -385,7 +385,7 @@ func (s *Server) Signup(ctx context.Context, in *authpb.SignupRequest) (*authpb. if !utils.IsNilUUIDProto(inviteOrgID) { orgInfoPb, err := s.env.OrgClient().GetOrg(ctx, inviteOrgID) if err != nil { - return nil, status.Errorf(codes.Internal, err.Error()) + return nil, status.Error(codes.Internal, err.Error()) } if orgInfoPb == nil { return nil, status.Errorf(codes.InvalidArgument, "misformatted invite link") @@ -524,7 +524,8 @@ func (s *Server) GetAugmentedTokenForAPIKey(ctx context.Context, in *authpb.GetA // GetAugmentedToken produces augmented tokens for the user based on passed in credentials. func (s *Server) GetAugmentedToken( ctx context.Context, in *authpb.GetAugmentedAuthTokenRequest) ( - *authpb.GetAugmentedAuthTokenResponse, error) { + *authpb.GetAugmentedAuthTokenResponse, error, +) { // Check the incoming token and make sure it's valid. aCtx := authcontext.New() @@ -600,7 +601,6 @@ func (s *Server) createInvitedUser(ctx context.Context, req *authpb.InviteUserRe IdentityProvider: ident.IdentityProvider, AuthProviderID: ident.AuthProviderID, }, req.OrgID) - if err != nil { return nil, err } @@ -673,7 +673,6 @@ func (s *Server) CreateOrgAndInviteUser(ctx context.Context, req *authpb.CreateO IdentityProvider: ident.IdentityProvider, AuthProviderID: ident.AuthProviderID, }) - if err != nil { return nil, fmt.Errorf("unable to create org and user: %v", err) } diff --git a/src/cloud/autocomplete/autocomplete.go b/src/cloud/autocomplete/autocomplete.go index 02422cd4b5b..efdf448b968 100644 --- a/src/cloud/autocomplete/autocomplete.go +++ b/src/cloud/autocomplete/autocomplete.go @@ -436,9 +436,11 @@ func (cmd *Command) ToFormatString(action cloudpb.AutocompleteActionType, s Sugg for k := range knownTypes { scriptTypes = append(scriptTypes, k) } - res, err := s.GetSuggestions([]*SuggestionRequest{{orgID, clusterUID, "", + res, err := s.GetSuggestions([]*SuggestionRequest{{ + orgID, clusterUID, "", []cloudpb.AutocompleteEntityKind{cloudpb.AEK_POD, cloudpb.AEK_SVC, cloudpb.AEK_NAMESPACE, cloudpb.AEK_SCRIPT}, - scriptTypes}}) + scriptTypes, + }}) if err == nil { cmd.TabStops[curTabStop].Suggestions = res[0].Suggestions } diff --git a/src/cloud/autocomplete/suggester.go b/src/cloud/autocomplete/suggester.go index 6e9387c020d..2cf1b665a64 100644 --- a/src/cloud/autocomplete/suggester.go +++ b/src/cloud/autocomplete/suggester.go @@ -158,7 +158,6 @@ func (e *ElasticSuggester) GetSuggestions(reqs []*SuggestionRequest) ([]*Suggest } resp, err := ms.Do(context.Background()) - if err != nil { return nil, err } @@ -173,9 +172,10 @@ func (e *ElasticSuggester) GetSuggestions(reqs []*SuggestionRequest) ([]*Suggest scriptArgMap[s.ScriptName] = make([]cloudpb.AutocompleteEntityKind, 0) for _, a := range s.Vis.Variables { aKind := cloudpb.AEK_UNKNOWN - if a.Type == vispb.PX_POD { + switch a.Type { + case vispb.PX_POD: aKind = cloudpb.AEK_POD - } else if a.Type == vispb.PX_SERVICE { + case vispb.PX_SERVICE: aKind = cloudpb.AEK_SVC } @@ -273,7 +273,7 @@ func (e *ElasticSuggester) GetSuggestions(reqs []*SuggestionRequest) ([]*Suggest // TODO(michellenguyen): Remove namespace handling when we create a new index and ensure there are no more // documents with namespace. resName := res.Name - if res.NS != "" && !(md.EsMDType(res.Kind) == md.EsMDTypeNamespace || md.EsMDType(res.Kind) == md.EsMDTypeNode) { + if res.NS != "" && !(md.EsMDType(res.Kind) == md.EsMDTypeNamespace || md.EsMDType(res.Kind) == md.EsMDTypeNode) { //nolint:staticcheck resName = fmt.Sprintf("%s/%s", res.NS, res.Name) } diff --git a/src/cloud/config_manager/configmanagerpb/BUILD.bazel b/src/cloud/config_manager/configmanagerpb/BUILD.bazel index b9198371a15..81b62fdcaf9 100644 --- a/src/cloud/config_manager/configmanagerpb/BUILD.bazel +++ b/src/cloud/config_manager/configmanagerpb/BUILD.bazel @@ -23,7 +23,7 @@ pl_proto_library( deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", "//src/api/proto/vizierconfigpb:vizier_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/cloud/config_manager/configmanagerpb/service.pb.go b/src/cloud/config_manager/configmanagerpb/service.pb.go index f57a325585e..76d91fa6ab9 100755 --- a/src/cloud/config_manager/configmanagerpb/service.pb.go +++ b/src/cloud/config_manager/configmanagerpb/service.pb.go @@ -241,44 +241,43 @@ func init() { } var fileDescriptor_11c1886abb7750df = []byte{ - // 587 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0xf5, 0xb4, 0xdf, 0x57, 0xea, 0x09, 0x50, 0x3a, 0x94, 0x62, 0x2c, 0x98, 0x54, 0xe1, 0x47, - 0x59, 0x80, 0x2d, 0x05, 0xa9, 0x8a, 0xca, 0x2e, 0x4d, 0x40, 0x11, 0xa2, 0x48, 0x0e, 0xad, 0x04, - 0x1b, 0xcb, 0x76, 0xa6, 0xc1, 0x4a, 0xe2, 0x19, 0x3c, 0xb6, 0xd5, 0x64, 0xc5, 0x23, 0xf0, 0x18, - 0x3c, 0x0a, 0xcb, 0x2c, 0x2b, 0x21, 0x45, 0xc4, 0xd9, 0xb0, 0xec, 0x92, 0x25, 0xf2, 0x8c, 0x53, - 0x9a, 0x34, 0xfc, 0xac, 0x3c, 0xf7, 0xde, 0x73, 0xef, 0x39, 0x73, 0xae, 0xc6, 0x70, 0x97, 0x87, - 0x9e, 0xe9, 0xf5, 0x68, 0xdc, 0x36, 0x3d, 0x1a, 0x1c, 0xfb, 0x1d, 0xbb, 0xef, 0x04, 0x4e, 0x87, - 0x84, 0x79, 0x98, 0x47, 0xcc, 0x35, 0x39, 0x09, 0x13, 0xdf, 0x23, 0x06, 0x0b, 0x69, 0x44, 0x51, - 0x81, 0x9d, 0x18, 0x79, 0x86, 0xeb, 0x4f, 0x3a, 0x7e, 0xf4, 0x3e, 0x76, 0x0d, 0x8f, 0xf6, 0xcd, - 0x0e, 0xed, 0x50, 0x53, 0x60, 0xdc, 0xf8, 0x58, 0x44, 0x22, 0x10, 0x27, 0xd9, 0xab, 0x17, 0x33, - 0x4e, 0x87, 0xf9, 0x12, 0x66, 0xc6, 0xb1, 0xdf, 0x66, 0xae, 0xf8, 0xe4, 0x00, 0x73, 0x1e, 0x90, - 0xf8, 0x43, 0x9f, 0x84, 0x52, 0x0f, 0x73, 0xf3, 0xd0, 0x8e, 0x06, 0x8c, 0x70, 0xd9, 0x50, 0xfa, - 0x0a, 0xe0, 0xf6, 0xbe, 0xa8, 0x3f, 0xa7, 0xe1, 0x91, 0xa8, 0x5b, 0xe4, 0x43, 0x4c, 0x78, 0x84, - 0xee, 0x42, 0x35, 0x70, 0xfa, 0x84, 0x33, 0xc7, 0x23, 0x1a, 0xd8, 0x01, 0x65, 0xd5, 0xfa, 0x95, - 0x40, 0xbb, 0xf0, 0x4a, 0x32, 0xb4, 0x39, 0x23, 0x9e, 0xb6, 0xb2, 0x03, 0xca, 0x85, 0xca, 0x3d, - 0x83, 0x9d, 0x18, 0xf3, 0x84, 0x86, 0x1c, 0xd8, 0x62, 0xc4, 0xb3, 0xd6, 0x92, 0x61, 0xf6, 0x45, - 0x26, 0x2c, 0x74, 0xab, 0xdc, 0x4e, 0x48, 0xc8, 0x7d, 0x1a, 0x68, 0xab, 0xd9, 0xdc, 0xda, 0xf5, - 0x74, 0x5c, 0x84, 0x2f, 0xab, 0xfc, 0x48, 0x66, 0x2d, 0xd8, 0x3d, 0x3f, 0xa3, 0x3d, 0xa8, 0xe6, - 0xba, 0xfd, 0xb6, 0xf6, 0x9f, 0xa0, 0xda, 0xc8, 0xa8, 0xe4, 0xe5, 0x8d, 0xc3, 0xc3, 0x66, 0xbd, - 0x76, 0x35, 0x1d, 0x17, 0xd7, 0x25, 0x59, 0xb3, 0x6e, 0xad, 0x4b, 0x7c, 0xb3, 0x5d, 0xfa, 0x01, - 0xe0, 0xed, 0x4b, 0xb7, 0xe3, 0x8c, 0x06, 0x9c, 0x20, 0x1f, 0x6e, 0x66, 0xb7, 0x79, 0x43, 0xdf, - 0x3a, 0xfd, 0xde, 0x3e, 0x0d, 0x22, 0x12, 0x44, 0x1a, 0xd8, 0x59, 0x2d, 0x17, 0x2a, 0xcf, 0x8c, - 0x0b, 0x3b, 0x32, 0x7e, 0x33, 0xc0, 0x38, 0x58, 0xec, 0x6e, 0x04, 0x51, 0x38, 0xb0, 0x2e, 0x4f, - 0x45, 0x8f, 0x21, 0xe4, 0x24, 0x2b, 0xda, 0x6d, 0x1e, 0x08, 0xbb, 0xd4, 0xda, 0xb5, 0x74, 0x5c, - 0x54, 0x5b, 0x22, 0x5b, 0x6f, 0x1d, 0x58, 0xaa, 0x04, 0xd4, 0x79, 0xa0, 0xd7, 0xe1, 0xf6, 0xf2, - 0xd1, 0xe8, 0x06, 0x5c, 0xed, 0x92, 0x41, 0xbe, 0x8b, 0xec, 0x88, 0xb6, 0xe0, 0xff, 0x89, 0xd3, - 0x8b, 0x89, 0x1c, 0x6a, 0xc9, 0x60, 0x6f, 0xa5, 0x0a, 0x4a, 0x3a, 0xd4, 0xce, 0x85, 0xbf, 0x66, - 0x24, 0x74, 0x22, 0x3a, 0xdb, 0x6c, 0xc9, 0x85, 0x77, 0x96, 0xd4, 0x72, 0x5f, 0x1a, 0xf0, 0x66, - 0x2e, 0x96, 0xe6, 0x25, 0xa1, 0x5a, 0x90, 0xd6, 0x6e, 0xa5, 0xe3, 0xe2, 0xa6, 0x54, 0x3d, 0x6b, - 0xcc, 0xd4, 0x6f, 0xf2, 0xf9, 0x14, 0x0f, 0x2a, 0x63, 0x00, 0xb7, 0x24, 0xc9, 0x2b, 0xf9, 0x10, - 0x5a, 0xd2, 0x4f, 0x64, 0x43, 0xf4, 0x82, 0x44, 0x0b, 0xa6, 0xa2, 0xfb, 0x7f, 0xb6, 0x5c, 0xe8, - 0xd6, 0x1f, 0xfc, 0xcb, 0x5e, 0x10, 0x81, 0x5b, 0x17, 0x09, 0x66, 0xa2, 0xd0, 0xc3, 0xe5, 0xdd, - 0x0b, 0xe6, 0xe8, 0x8f, 0xfe, 0x06, 0x93, 0x34, 0xb5, 0xc6, 0x68, 0x82, 0x95, 0xd3, 0x09, 0x56, - 0xce, 0x26, 0x18, 0x7c, 0x4c, 0x31, 0xf8, 0x9c, 0x62, 0xf0, 0x25, 0xc5, 0x60, 0x94, 0x62, 0xf0, - 0x2d, 0xc5, 0xe0, 0x7b, 0x8a, 0x95, 0xb3, 0x14, 0x83, 0x4f, 0x53, 0xac, 0x8c, 0xa6, 0x58, 0x39, - 0x9d, 0x62, 0xe5, 0xdd, 0xc6, 0xc2, 0xcf, 0xc1, 0x5d, 0x13, 0xef, 0xf0, 0xe9, 0xcf, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x91, 0x82, 0xd2, 0x9f, 0x4f, 0x04, 0x00, 0x00, + // 569 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x4d, 0x6f, 0xd3, 0x30, + 0x18, 0x8e, 0x37, 0x18, 0x8b, 0x0b, 0x8c, 0x99, 0x32, 0x42, 0x04, 0xee, 0x54, 0x3e, 0xd4, 0x03, + 0x4a, 0xa4, 0x22, 0x4d, 0xd5, 0xb8, 0x75, 0x2d, 0xa8, 0x42, 0x0c, 0x29, 0x65, 0x93, 0xe0, 0x12, + 0xa5, 0xa9, 0xa9, 0xa2, 0xb6, 0xb1, 0x89, 0xd3, 0x68, 0xed, 0x89, 0x9f, 0xc0, 0xcf, 0xe0, 0xa7, + 0x70, 0xec, 0x71, 0x12, 0x52, 0x45, 0xdd, 0x0b, 0xc7, 0x1d, 0x39, 0xa2, 0xd8, 0xe9, 0x58, 0xbb, + 0xf2, 0x71, 0xb2, 0xdf, 0xaf, 0xe7, 0x79, 0xfc, 0xbc, 0x6d, 0xe0, 0x1e, 0x8f, 0x7c, 0xdb, 0xef, + 0xd1, 0x41, 0xdb, 0xf6, 0x69, 0xf8, 0x21, 0xe8, 0xb8, 0x7d, 0x2f, 0xf4, 0x3a, 0x24, 0xca, 0xc2, + 0x2c, 0x62, 0x2d, 0x9b, 0x93, 0x28, 0x09, 0x7c, 0x62, 0xb1, 0x88, 0xc6, 0x14, 0xe5, 0xd8, 0x89, + 0x95, 0x65, 0xb8, 0x99, 0xef, 0xd0, 0x0e, 0x95, 0x79, 0x3b, 0xbd, 0xa9, 0x16, 0xb3, 0x90, 0x42, + 0x7b, 0x2c, 0xb0, 0x55, 0x65, 0x30, 0x08, 0xda, 0xac, 0x25, 0x8f, 0xac, 0xc1, 0x5e, 0x6c, 0x48, + 0x82, 0x51, 0x40, 0x22, 0x45, 0xcb, 0x5a, 0x59, 0xe8, 0xc6, 0x43, 0x46, 0xb8, 0x1a, 0x28, 0x7e, + 0x03, 0x70, 0xe7, 0x40, 0xd6, 0x5f, 0xd0, 0xe8, 0x58, 0xd6, 0x1d, 0xf2, 0x71, 0x40, 0x78, 0x8c, + 0xee, 0x43, 0x3d, 0xf4, 0xfa, 0x84, 0x33, 0xcf, 0x27, 0x06, 0xd8, 0x05, 0x25, 0xdd, 0xf9, 0x9d, + 0x40, 0x7b, 0xf0, 0x5a, 0x32, 0x72, 0x39, 0x23, 0xbe, 0xb1, 0xb6, 0x0b, 0x4a, 0xb9, 0xf2, 0x03, + 0x8b, 0x9d, 0x58, 0x8b, 0x84, 0x96, 0x02, 0x6c, 0x32, 0xe2, 0x3b, 0x1b, 0xc9, 0x28, 0x3d, 0x91, + 0x0d, 0x73, 0xdd, 0x0a, 0x77, 0x13, 0x12, 0xf1, 0x80, 0x86, 0xc6, 0x7a, 0x8a, 0x5b, 0xbd, 0x29, + 0x26, 0x05, 0xf8, 0xaa, 0xc2, 0x8f, 0x55, 0xd6, 0x81, 0xdd, 0xf3, 0x3b, 0xda, 0x87, 0x7a, 0xa6, + 0x3b, 0x68, 0x1b, 0x57, 0x24, 0xd5, 0x56, 0x4a, 0xa5, 0x1e, 0x6f, 0x1d, 0x1d, 0x35, 0x6a, 0xd5, + 0xeb, 0x62, 0x52, 0xd8, 0x54, 0x64, 0x8d, 0x9a, 0xb3, 0xa9, 0xfa, 0x1b, 0xed, 0xe2, 0x4f, 0x00, + 0xef, 0x5e, 0x7a, 0x1d, 0x67, 0x34, 0xe4, 0x04, 0x05, 0x70, 0x3b, 0x7d, 0xcd, 0x5b, 0xfa, 0xce, + 0xeb, 0xf7, 0x0e, 0x68, 0x18, 0x93, 0x30, 0x36, 0xc0, 0xee, 0x7a, 0x29, 0x57, 0x7e, 0x6e, 0x5d, + 0x58, 0x85, 0xf5, 0x07, 0x00, 0xeb, 0x70, 0x79, 0xba, 0x1e, 0xc6, 0xd1, 0xd0, 0xb9, 0x8c, 0x8a, + 0x9e, 0x42, 0xc8, 0x49, 0x5a, 0x74, 0xdb, 0x3c, 0x94, 0x76, 0xe9, 0xd5, 0x1b, 0x62, 0x52, 0xd0, + 0x9b, 0x32, 0x5b, 0x6b, 0x1e, 0x3a, 0xba, 0x6a, 0xa8, 0xf1, 0xd0, 0xac, 0xc1, 0x9d, 0xd5, 0xd0, + 0xe8, 0x16, 0x5c, 0xef, 0x92, 0x61, 0xb6, 0x8b, 0xf4, 0x8a, 0xf2, 0xf0, 0x6a, 0xe2, 0xf5, 0x06, + 0x44, 0x81, 0x3a, 0x2a, 0xd8, 0x5f, 0xab, 0x80, 0xa2, 0x09, 0x8d, 0x73, 0xe1, 0x6f, 0x18, 0x89, + 0xbc, 0x98, 0xce, 0x37, 0x5b, 0x6c, 0xc1, 0x7b, 0x2b, 0x6a, 0x99, 0x2f, 0x75, 0x78, 0x3b, 0x13, + 0x4b, 0xb3, 0x92, 0x54, 0x2d, 0x49, 0xab, 0x77, 0xc4, 0xa4, 0xb0, 0xad, 0x54, 0xcf, 0x07, 0x53, + 0xf5, 0xdb, 0x7c, 0x31, 0xc5, 0xc3, 0xf2, 0x04, 0xc0, 0xbc, 0x22, 0x79, 0xad, 0x7e, 0xef, 0x4d, + 0xe5, 0x27, 0x72, 0x21, 0x7a, 0x49, 0xe2, 0x25, 0x53, 0xd1, 0xc3, 0xbf, 0x5b, 0x2e, 0x75, 0x9b, + 0x8f, 0xfe, 0x67, 0x2f, 0x88, 0xc0, 0xfc, 0x45, 0x82, 0xb9, 0x28, 0xf4, 0x78, 0xf5, 0xf4, 0x92, + 0x39, 0xe6, 0x93, 0x7f, 0xb5, 0x29, 0x9a, 0x6a, 0x7d, 0x3c, 0xc5, 0xda, 0xe9, 0x14, 0x6b, 0x67, + 0x53, 0x0c, 0x3e, 0x09, 0x0c, 0xbe, 0x08, 0x0c, 0xbe, 0x0a, 0x0c, 0xc6, 0x02, 0x83, 0xef, 0x02, + 0x83, 0x1f, 0x02, 0x6b, 0x67, 0x02, 0x83, 0xcf, 0x33, 0xac, 0x8d, 0x67, 0x58, 0x3b, 0x9d, 0x61, + 0xed, 0xfd, 0xd6, 0xd2, 0x37, 0xa0, 0xb5, 0x21, 0xff, 0x87, 0xcf, 0x7e, 0x05, 0x00, 0x00, 0xff, + 0xff, 0x9c, 0x29, 0x06, 0x9c, 0x36, 0x04, 0x00, 0x00, } func (this *ConfigForVizierRequest) Equal(that interface{}) bool { diff --git a/src/cloud/config_manager/configmanagerpb/service.proto b/src/cloud/config_manager/configmanagerpb/service.proto index 1c77e44109e..94487a6e69e 100644 --- a/src/cloud/config_manager/configmanagerpb/service.proto +++ b/src/cloud/config_manager/configmanagerpb/service.proto @@ -22,7 +22,7 @@ package px.services; option go_package = "configmanagerpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "src/api/proto/uuidpb/uuid.proto"; import "src/api/proto/vizierconfigpb/vizier_types.proto"; diff --git a/src/cloud/config_manager/controllers/server.go b/src/cloud/config_manager/controllers/server.go index c9c3d5dd81c..b10c221eca9 100644 --- a/src/cloud/config_manager/controllers/server.go +++ b/src/cloud/config_manager/controllers/server.go @@ -157,7 +157,8 @@ func AddDefaultTableStoreSize(pemMemoryRequest string, customPEMFlags map[string // GetConfigForVizier provides yaml names and content that can be used to deploy Vizier func (s *Server) GetConfigForVizier(ctx context.Context, - in *cpb.ConfigForVizierRequest) (*cpb.ConfigForVizierResponse, error) { + in *cpb.ConfigForVizierRequest, +) (*cpb.ConfigForVizierResponse, error) { log.Info("Fetching config for Vizier") templatedYAMLs, err := fetchVizierTemplates(ctx, "", in.VzSpec.Version, s.atClient) @@ -301,7 +302,8 @@ func getSentryDSN(vizierVersion string) string { // fetchVizierTemplates gets a download link, untars file, and // converts to yaml maps. func fetchVizierTemplates(ctx context.Context, authToken, - versionStr string, atClient atpb.ArtifactTrackerClient) ([]*yamls.YAMLFile, error) { + versionStr string, atClient atpb.ArtifactTrackerClient, +) ([]*yamls.YAMLFile, error) { req := &atpb.GetDownloadLinkRequest{ ArtifactName: "vizier", VersionStr: versionStr, diff --git a/src/cloud/config_manager/controllers/vizier_feature_flags.go b/src/cloud/config_manager/controllers/vizier_feature_flags.go index 99c78b4bda2..280b59edf72 100644 --- a/src/cloud/config_manager/controllers/vizier_feature_flags.go +++ b/src/cloud/config_manager/controllers/vizier_feature_flags.go @@ -124,7 +124,8 @@ func AddFeatureFlagsToTemplate(client VizierFeatureFlagClient, orgID uuid.UUID, // AddFeatureFlagToTemplate adds an individual feature flag to the Vizier template. func AddFeatureFlagToTemplate(client VizierFeatureFlagClient, orgID uuid.UUID, featureFlag string, pemFlag string, defaultVal interface{}, - tmplValues *vizieryamls.VizierTmplValues) { + tmplValues *vizieryamls.VizierTmplValues, +) { if _, hasValue := tmplValues.CustomPEMFlags[pemFlag]; !hasValue { switch dv := defaultVal.(type) { case bool: diff --git a/src/cloud/cron_script/controllers/server.go b/src/cloud/cron_script/controllers/server.go index bc8062b9905..c4d3eafd15f 100644 --- a/src/cloud/cron_script/controllers/server.go +++ b/src/cloud/cron_script/controllers/server.go @@ -350,7 +350,6 @@ func (s *Server) GetScripts(ctx context.Context, req *cronscriptpb.GetScriptsReq cronErr := status.Error(codes.Internal, "Failed to get cron scripts") query, args, err := sqlx.In(strQuery, s.dbKey, orgID, ids) - if err != nil { log.WithError(err).Error("Failed to bind parameters for cron scripts query") return nil, cronErr @@ -358,7 +357,6 @@ func (s *Server) GetScripts(ctx context.Context, req *cronscriptpb.GetScriptsReq query = s.db.Rebind(query) rows, err := s.db.Queryx(query, args...) - if err != nil { log.WithError(err).Error(fmt.Sprintf("Failed to run cron scripts query: %s", query)) return nil, cronErr diff --git a/src/cloud/cron_script/controllers/server_test.go b/src/cloud/cron_script/controllers/server_test.go index 18513ed4025..2f4bfb25223 100644 --- a/src/cloud/cron_script/controllers/server_test.go +++ b/src/cloud/cron_script/controllers/server_test.go @@ -574,7 +574,8 @@ func TestServer_HandleChecksumRequest(t *testing.T) { orgID := "223e4567-e89b-12d3-a456-426655440001" mockVZMgr.EXPECT().GetOrgFromVizier(gomock.Any(), utils.ProtoFromUUIDStrOrNil(vzID)).Return(&vzmgrpb.GetOrgFromVizierResponse{ - OrgID: utils.ProtoFromUUIDStrOrNil(orgID)}, nil) + OrgID: utils.ProtoFromUUIDStrOrNil(orgID), + }, nil) nc, natsCleanup := testingutils.MustStartTestNATS(t) defer natsCleanup() @@ -633,7 +634,8 @@ func TestServer_HandleGetScriptsRequest(t *testing.T) { orgID := "223e4567-e89b-12d3-a456-426655440001" mockVZMgr.EXPECT().GetOrgFromVizier(gomock.Any(), utils.ProtoFromUUIDStrOrNil(vzID)).Return(&vzmgrpb.GetOrgFromVizierResponse{ - OrgID: utils.ProtoFromUUIDStrOrNil(orgID)}, nil) + OrgID: utils.ProtoFromUUIDStrOrNil(orgID), + }, nil) nc, natsCleanup := testingutils.MustStartTestNATS(t) defer natsCleanup() diff --git a/src/cloud/cron_script/cronscriptpb/BUILD.bazel b/src/cloud/cron_script/cronscriptpb/BUILD.bazel index 861b9c6ca69..12e4717116e 100644 --- a/src/cloud/cron_script/cronscriptpb/BUILD.bazel +++ b/src/cloud/cron_script/cronscriptpb/BUILD.bazel @@ -23,7 +23,7 @@ pl_proto_library( deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", "//src/shared/cvmsgspb:cvmsgs_pl_proto", - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/cloud/cron_script/cronscriptpb/service.pb.go b/src/cloud/cron_script/cronscriptpb/service.pb.go index aa569b30d2e..90c92ce123b 100755 --- a/src/cloud/cron_script/cronscriptpb/service.pb.go +++ b/src/cloud/cron_script/cronscriptpb/service.pb.go @@ -751,60 +751,59 @@ func init() { } var fileDescriptor_9421d06c83b7b792 = []byte{ - // 844 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4d, 0x6f, 0xe3, 0x54, - 0x14, 0x8d, 0x93, 0xe6, 0xeb, 0x66, 0x34, 0xc3, 0xbc, 0x46, 0x91, 0x95, 0x41, 0x4e, 0x64, 0x09, - 0x26, 0x8c, 0xc0, 0x81, 0x4e, 0x35, 0x42, 0x08, 0x09, 0x94, 0x66, 0x84, 0xbc, 0x40, 0x80, 0xa3, - 0xb2, 0x40, 0x48, 0x51, 0x62, 0xbf, 0x1a, 0x0b, 0xe3, 0xe7, 0xbe, 0x67, 0x97, 0xb0, 0x63, 0xc7, - 0x96, 0x9f, 0xc1, 0x82, 0x1f, 0x82, 0x58, 0x75, 0xd9, 0x55, 0x44, 0xdd, 0x0d, 0xcb, 0x8a, 0x5f, - 0x80, 0xec, 0x67, 0x3b, 0x4e, 0x62, 0x27, 0x55, 0x47, 0x5d, 0xc5, 0xf7, 0xf9, 0x5e, 0x9f, 0xeb, - 0x73, 0x8e, 0x8f, 0x02, 0x1f, 0x32, 0xaa, 0x0f, 0x75, 0x9b, 0xf8, 0xc6, 0x50, 0xa7, 0xc4, 0x99, - 0x32, 0x9d, 0x5a, 0xae, 0x17, 0x5d, 0xf3, 0x4b, 0x77, 0x3e, 0x64, 0x98, 0x5e, 0x58, 0x3a, 0x56, - 0x5c, 0x4a, 0x3c, 0x82, 0xda, 0xee, 0x42, 0x89, 0x4f, 0x98, 0x62, 0x39, 0x1e, 0xa6, 0xce, 0xcc, - 0xee, 0x7e, 0x60, 0x5a, 0xde, 0x0f, 0xfe, 0x5c, 0xd1, 0xc9, 0x4f, 0x43, 0x93, 0x98, 0x64, 0x18, - 0x35, 0xcf, 0xfd, 0xb3, 0xa8, 0x8a, 0x8a, 0xe8, 0x8a, 0x3f, 0xa4, 0x2b, 0x99, 0x84, 0x98, 0x36, - 0x5e, 0x75, 0xfd, 0x4c, 0x67, 0xae, 0x8b, 0x29, 0x8b, 0xef, 0xf7, 0xc2, 0xb5, 0x66, 0xae, 0xc5, - 0x1b, 0x86, 0xbe, 0x6f, 0x19, 0xee, 0x3c, 0xfa, 0xe1, 0x0d, 0xf2, 0xdf, 0x65, 0x80, 0x13, 0x4a, - 0x9c, 0x49, 0xb4, 0x24, 0x7a, 0x0e, 0x65, 0xcb, 0x10, 0x85, 0xbe, 0x30, 0x68, 0x1d, 0x3d, 0x51, - 0xdc, 0x85, 0xc2, 0x27, 0x94, 0xd3, 0x53, 0x75, 0x3c, 0xaa, 0x05, 0xcb, 0x5e, 0x59, 0x1d, 0x6b, - 0x65, 0xcb, 0x40, 0x1f, 0x41, 0x8d, 0x50, 0x73, 0x6a, 0x19, 0x62, 0x39, 0xbf, 0xb9, 0x19, 0x2c, - 0x7b, 0xd5, 0xaf, 0xa8, 0xa9, 0x8e, 0xb5, 0x2a, 0xa1, 0xa6, 0x6a, 0xa0, 0x0e, 0xd4, 0x38, 0x15, - 0x62, 0xa5, 0x2f, 0x0c, 0x9a, 0x5a, 0x5c, 0xa1, 0x67, 0xd0, 0x8c, 0x28, 0xc3, 0x0b, 0x97, 0x8a, - 0x07, 0xd1, 0xad, 0x46, 0x78, 0xf0, 0x7a, 0xe1, 0x52, 0xf4, 0x39, 0xb4, 0x74, 0xdb, 0x67, 0x1e, - 0xa6, 0x53, 0xcb, 0x60, 0x62, 0xb5, 0x5f, 0xc9, 0x03, 0x7b, 0x1c, 0x2c, 0x7b, 0x70, 0xc2, 0xfb, - 0xd4, 0x31, 0xd3, 0x20, 0x9e, 0x51, 0x0d, 0x86, 0x44, 0xa8, 0xeb, 0xc4, 0x39, 0xb3, 0x4c, 0x26, - 0xd6, 0xa2, 0x87, 0x27, 0x25, 0x6a, 0x43, 0xd5, 0x23, 0x3f, 0x62, 0x47, 0xac, 0x47, 0xe7, 0xbc, - 0x08, 0xfb, 0xb1, 0x33, 0x9b, 0xdb, 0xd8, 0x10, 0x1b, 0x7d, 0x61, 0xd0, 0xd0, 0x92, 0x12, 0xf5, - 0xa0, 0x75, 0x46, 0xf1, 0xb9, 0x8f, 0x1d, 0xfd, 0x97, 0x29, 0x13, 0x9b, 0x7d, 0x61, 0x50, 0xd1, - 0x20, 0x3d, 0x9a, 0xc8, 0x0e, 0xbc, 0xf5, 0x05, 0xf6, 0x38, 0x95, 0x5a, 0x78, 0xca, 0x1e, 0x94, - 0x51, 0xf9, 0x4b, 0x78, 0x9a, 0xc1, 0x63, 0x2e, 0x71, 0x18, 0x46, 0x1f, 0xa7, 0x34, 0x73, 0xd0, - 0xbe, 0x92, 0x67, 0x34, 0x65, 0x25, 0x7a, 0x22, 0x84, 0x4c, 0x33, 0x8f, 0x63, 0xc9, 0xfe, 0x2f, - 0xa0, 0x12, 0x12, 0x2f, 0xe4, 0x13, 0x5f, 0x0f, 0x96, 0xbd, 0x4a, 0xc8, 0x78, 0xd8, 0x74, 0x9f, - 0x57, 0xf8, 0x1a, 0x50, 0x16, 0x33, 0x7e, 0x87, 0x4f, 0xa0, 0xce, 0x77, 0x4a, 0x80, 0xf7, 0xbf, - 0x44, 0x32, 0x20, 0xff, 0x59, 0x86, 0xc3, 0x13, 0x8a, 0x67, 0x1e, 0x5e, 0x17, 0xa2, 0xb3, 0xc6, - 0x4b, 0x81, 0xfd, 0xca, 0xbb, 0xed, 0x57, 0x79, 0x23, 0xfb, 0x1d, 0x14, 0xd8, 0xaf, 0x9a, 0xb5, - 0xdf, 0x86, 0xc9, 0x6a, 0x9b, 0x26, 0x43, 0x5d, 0x68, 0x18, 0x16, 0xe3, 0x06, 0xad, 0x47, 0x06, - 0x4d, 0xeb, 0x8c, 0x00, 0x8d, 0xbb, 0x0a, 0xf0, 0x19, 0xb4, 0xd7, 0xd9, 0x8a, 0x25, 0xb8, 0xab, - 0x6f, 0xe5, 0xff, 0x2a, 0x70, 0x78, 0xea, 0x1a, 0x5b, 0x7c, 0x1f, 0x6f, 0xf8, 0xf0, 0x6d, 0x85, - 0x67, 0x95, 0x92, 0x64, 0x95, 0x32, 0xf1, 0xa8, 0xe5, 0x98, 0xdf, 0xce, 0x6c, 0x1f, 0xa7, 0x6a, - 0xbc, 0x86, 0x27, 0xa9, 0x1a, 0x98, 0x31, 0x8b, 0x38, 0xb1, 0x97, 0x76, 0x8f, 0x3f, 0x4e, 0x14, - 0xe3, 0x33, 0xe8, 0x9b, 0x4d, 0xdd, 0x76, 0x7d, 0x09, 0xa9, 0x70, 0x3b, 0x85, 0x7c, 0xb5, 0x2e, - 0xe4, 0xbe, 0x8d, 0x52, 0x99, 0x8f, 0x57, 0x79, 0x52, 0x8d, 0xe6, 0xba, 0x5b, 0x73, 0x23, 0x42, - 0xec, 0x78, 0x2a, 0xc9, 0x9a, 0x4f, 0xb7, 0x6d, 0xd0, 0x3a, 0x7a, 0xb6, 0x35, 0xa9, 0x3a, 0xde, - 0xab, 0x63, 0x3e, 0x9a, 0xf5, 0xc8, 0xfb, 0xd0, 0xe4, 0x7c, 0x86, 0x56, 0xa8, 0xe7, 0x6a, 0xa8, - 0x35, 0x78, 0x87, 0x7a, 0x2f, 0xd7, 0xbc, 0x84, 0x0c, 0x4d, 0xe8, 0x1d, 0xa8, 0x5e, 0x84, 0x3b, - 0x14, 0xa4, 0x84, 0xc6, 0xef, 0xca, 0x1d, 0x68, 0xaf, 0x1b, 0x85, 0x5b, 0x4d, 0x3e, 0x87, 0xc3, - 0x31, 0xb6, 0xf1, 0xa6, 0x81, 0x1e, 0x32, 0x39, 0x3b, 0xd0, 0x5e, 0x87, 0xe4, 0xab, 0x1c, 0xfd, - 0x76, 0x00, 0x4f, 0x57, 0xa1, 0x32, 0xe1, 0x5e, 0x41, 0xdf, 0x43, 0x33, 0x0d, 0x29, 0xf4, 0x6e, - 0xbe, 0x8b, 0x36, 0x83, 0xbf, 0xfb, 0x7c, 0x6f, 0x5f, 0xfc, 0xa5, 0x4d, 0x01, 0x56, 0x11, 0x88, - 0xf6, 0x8d, 0x25, 0xc1, 0xdc, 0x1d, 0xec, 0x6f, 0x8c, 0x01, 0x30, 0x3c, 0xca, 0x7e, 0xe2, 0xe8, - 0xbd, 0xa2, 0x30, 0xdd, 0x0a, 0xcd, 0xee, 0x8b, 0xbb, 0xb4, 0xae, 0x60, 0xb2, 0xf2, 0x16, 0xc1, - 0xe4, 0x64, 0x45, 0x11, 0x4c, 0x9e, 0x5b, 0x42, 0x98, 0xac, 0x74, 0x45, 0x30, 0x39, 0x8e, 0x2a, - 0x82, 0xc9, 0x73, 0xc2, 0x68, 0x74, 0x79, 0x2d, 0x95, 0xae, 0xae, 0xa5, 0xd2, 0xed, 0xb5, 0x24, - 0xfc, 0x1a, 0x48, 0xc2, 0x1f, 0x81, 0x24, 0xfc, 0x15, 0x48, 0xc2, 0x65, 0x20, 0x09, 0xff, 0x04, - 0x92, 0xf0, 0x6f, 0x20, 0x95, 0x6e, 0x03, 0x49, 0xf8, 0xfd, 0x46, 0x2a, 0x5d, 0xde, 0x48, 0xa5, - 0xab, 0x1b, 0xa9, 0xf4, 0xdd, 0xa3, 0xec, 0x1f, 0xbe, 0x79, 0x2d, 0xfa, 0x4e, 0x5f, 0xfe, 0x1f, - 0x00, 0x00, 0xff, 0xff, 0xd5, 0x1a, 0x10, 0xf8, 0x1d, 0x0a, 0x00, 0x00, + // 831 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4d, 0x6f, 0xeb, 0x44, + 0x14, 0x8d, 0x93, 0xe6, 0xeb, 0xe6, 0xe9, 0x3d, 0xde, 0x34, 0x8a, 0xac, 0x14, 0x39, 0x91, 0x25, + 0x68, 0xa8, 0x90, 0x03, 0x6d, 0x55, 0x21, 0x84, 0x04, 0x4a, 0x53, 0x21, 0x2f, 0x10, 0xe0, 0xa8, + 0x2c, 0x10, 0x52, 0x94, 0xd8, 0x53, 0xcb, 0xc2, 0xf2, 0xb8, 0x33, 0x4e, 0x09, 0x3b, 0x76, 0x6c, + 0xf9, 0x19, 0x2c, 0xf8, 0x21, 0x88, 0x55, 0x97, 0x5d, 0x45, 0xd4, 0xdd, 0xb0, 0xac, 0xf8, 0x05, + 0xc8, 0x1e, 0xdb, 0x71, 0x12, 0x3b, 0xa9, 0x8a, 0xba, 0x8a, 0x67, 0x7c, 0xaf, 0xcf, 0x9d, 0x73, + 0xce, 0x1c, 0x05, 0x3e, 0x62, 0x54, 0xef, 0xeb, 0x36, 0x99, 0x19, 0x7d, 0x9d, 0x12, 0x67, 0xcc, + 0x74, 0x6a, 0xb9, 0x5e, 0xf8, 0xcc, 0x1f, 0xdd, 0x69, 0x9f, 0x61, 0x7a, 0x63, 0xe9, 0x58, 0x71, + 0x29, 0xf1, 0x08, 0x6a, 0xba, 0x73, 0x25, 0xda, 0x61, 0x8a, 0xe5, 0x78, 0x98, 0x3a, 0x13, 0xbb, + 0xdd, 0x34, 0x89, 0x49, 0xc2, 0x82, 0x7e, 0xf0, 0xc4, 0x6b, 0xdb, 0x92, 0x49, 0x88, 0x69, 0xe3, + 0x7e, 0xb8, 0x9a, 0xce, 0xae, 0xfa, 0x3f, 0xd1, 0x89, 0xeb, 0x62, 0xca, 0xa2, 0xf7, 0x9d, 0x00, + 0x7d, 0xe2, 0x5a, 0xbc, 0xa0, 0x3f, 0x9b, 0x59, 0x86, 0x3b, 0x0d, 0x7f, 0x78, 0x81, 0xfc, 0x57, + 0x11, 0xe0, 0x9c, 0x12, 0x67, 0x14, 0xce, 0x82, 0x0e, 0xa1, 0x68, 0x19, 0xa2, 0xd0, 0x15, 0x7a, + 0x8d, 0xe3, 0x37, 0x8a, 0x3b, 0x57, 0x78, 0x87, 0x72, 0x79, 0xa9, 0x0e, 0x07, 0x15, 0x7f, 0xd1, + 0x29, 0xaa, 0x43, 0xad, 0x68, 0x19, 0xe8, 0x63, 0xa8, 0x10, 0x6a, 0x8e, 0x2d, 0x43, 0x2c, 0x66, + 0x17, 0xd7, 0xfd, 0x45, 0xa7, 0xfc, 0x35, 0x35, 0xd5, 0xa1, 0x56, 0x26, 0xd4, 0x54, 0x0d, 0xd4, + 0x82, 0x0a, 0x3f, 0xb1, 0x58, 0xea, 0x0a, 0xbd, 0xba, 0x16, 0xad, 0xd0, 0x01, 0xd4, 0x43, 0x66, + 0xf0, 0xdc, 0xa5, 0xe2, 0x5e, 0xf8, 0xaa, 0x16, 0x6c, 0x5c, 0xcc, 0x5d, 0x8a, 0xbe, 0x80, 0x86, + 0x6e, 0xcf, 0x98, 0x87, 0xe9, 0xd8, 0x32, 0x98, 0x58, 0xee, 0x96, 0xb2, 0xc0, 0x5e, 0xfb, 0x8b, + 0x0e, 0x9c, 0xf3, 0x3a, 0x75, 0xc8, 0x34, 0x88, 0x7a, 0x54, 0x83, 0x21, 0x11, 0xaa, 0x3a, 0x71, + 0xae, 0x2c, 0x93, 0x89, 0x95, 0xf0, 0xe3, 0xf1, 0x12, 0x35, 0xa1, 0xec, 0x91, 0x1f, 0xb1, 0x23, + 0x56, 0xc3, 0x7d, 0xbe, 0x08, 0xea, 0xb1, 0x33, 0x99, 0xda, 0xd8, 0x10, 0x6b, 0x5d, 0xa1, 0x57, + 0xd3, 0xe2, 0x25, 0xea, 0x40, 0xe3, 0x8a, 0xe2, 0xeb, 0x19, 0x76, 0xf4, 0x9f, 0xc7, 0x4c, 0xac, + 0x77, 0x85, 0x5e, 0x49, 0x83, 0x64, 0x6b, 0x24, 0x3b, 0xf0, 0xce, 0x97, 0xd8, 0xe3, 0x54, 0x6a, + 0xc1, 0x2e, 0x7b, 0x51, 0x46, 0xe5, 0xaf, 0xe0, 0x6d, 0x0a, 0x8f, 0xb9, 0xc4, 0x61, 0x18, 0x7d, + 0x92, 0xd0, 0xcc, 0x41, 0xbb, 0x4a, 0x96, 0x9f, 0x94, 0xa5, 0xe8, 0xb1, 0x10, 0x32, 0x4d, 0x7d, + 0x8e, 0xc5, 0xf3, 0x1f, 0x41, 0x29, 0x20, 0x5e, 0xc8, 0x26, 0xbe, 0xea, 0x2f, 0x3a, 0xa5, 0x80, + 0xf1, 0xa0, 0xe8, 0x39, 0x47, 0xf8, 0x06, 0x50, 0x1a, 0x33, 0x3a, 0xc3, 0xa7, 0x50, 0xe5, 0x33, + 0xc5, 0xc0, 0xbb, 0x0f, 0x11, 0x37, 0xc8, 0x7f, 0x14, 0x61, 0xff, 0x9c, 0xe2, 0x89, 0x87, 0x57, + 0x85, 0x68, 0xad, 0xf0, 0x92, 0x63, 0xbf, 0xe2, 0x76, 0xfb, 0x95, 0xfe, 0x97, 0xfd, 0xf6, 0x72, + 0xec, 0x57, 0x4e, 0xdb, 0x6f, 0xcd, 0x64, 0x95, 0x75, 0x93, 0xa1, 0x36, 0xd4, 0x0c, 0x8b, 0x71, + 0x83, 0x56, 0x43, 0x83, 0x26, 0xeb, 0x94, 0x00, 0xb5, 0xa7, 0x0a, 0xf0, 0x39, 0x34, 0x57, 0xd9, + 0x8a, 0x24, 0x78, 0xaa, 0x6f, 0xe5, 0x7f, 0x4b, 0xb0, 0x7f, 0xe9, 0x1a, 0x1b, 0x7c, 0x9f, 0xae, + 0xf9, 0xf0, 0x5d, 0x85, 0x67, 0x95, 0x12, 0x67, 0x95, 0x32, 0xf2, 0xa8, 0xe5, 0x98, 0xdf, 0x4d, + 0xec, 0x19, 0x4e, 0xd4, 0xb8, 0x80, 0x37, 0x89, 0x1a, 0x98, 0x31, 0x8b, 0x38, 0x91, 0x97, 0xb6, + 0xb7, 0xbf, 0x8e, 0x15, 0xe3, 0x3d, 0xe8, 0xdb, 0x75, 0xdd, 0xb6, 0xdd, 0x84, 0x44, 0xb8, 0xad, + 0x42, 0x9e, 0xad, 0x0a, 0xb9, 0x6b, 0xa2, 0x44, 0xe6, 0xd3, 0x65, 0x9e, 0x94, 0xc3, 0xbe, 0xf6, + 0x46, 0xdf, 0x80, 0x10, 0x3b, 0xea, 0x8a, 0xb3, 0xe6, 0xb3, 0x4d, 0x1b, 0x34, 0x8e, 0x0f, 0x36, + 0x3a, 0x55, 0xc7, 0x3b, 0x3b, 0xe5, 0xad, 0x69, 0x8f, 0x7c, 0x08, 0x75, 0xce, 0x67, 0x60, 0x85, + 0x6a, 0xa6, 0x86, 0x5a, 0x8d, 0x57, 0xa8, 0xcf, 0x72, 0xcd, 0x09, 0xa4, 0x68, 0x42, 0xef, 0x41, + 0xf9, 0x26, 0x98, 0x21, 0x27, 0x25, 0x34, 0xfe, 0x56, 0x6e, 0x41, 0x73, 0xd5, 0x28, 0xdc, 0x6a, + 0xf2, 0x35, 0xec, 0x0f, 0xb1, 0x8d, 0xd7, 0x0d, 0xf4, 0x92, 0xc9, 0xd9, 0x82, 0xe6, 0x2a, 0x24, + 0x1f, 0xe5, 0xf8, 0xd7, 0x3d, 0x78, 0xbb, 0x0c, 0x95, 0x11, 0xf7, 0x0a, 0xfa, 0x01, 0xea, 0x49, + 0x48, 0xa1, 0xf7, 0xb3, 0x5d, 0xb4, 0x1e, 0xfc, 0xed, 0xc3, 0x9d, 0x75, 0xd1, 0x4d, 0x1b, 0x03, + 0x2c, 0x23, 0x10, 0xed, 0x6a, 0x8b, 0x83, 0xb9, 0xdd, 0xdb, 0x5d, 0x18, 0x01, 0x60, 0x78, 0x95, + 0xbe, 0xe2, 0xe8, 0x83, 0xbc, 0x30, 0xdd, 0x08, 0xcd, 0xf6, 0xd1, 0x53, 0x4a, 0x97, 0x30, 0x69, + 0x79, 0xf3, 0x60, 0x32, 0xb2, 0x22, 0x0f, 0x26, 0xcb, 0x2d, 0x01, 0x4c, 0x5a, 0xba, 0x3c, 0x98, + 0x0c, 0x47, 0xe5, 0xc1, 0x64, 0x39, 0x61, 0x30, 0xb8, 0xbd, 0x97, 0x0a, 0x77, 0xf7, 0x52, 0xe1, + 0xf1, 0x5e, 0x12, 0x7e, 0xf1, 0x25, 0xe1, 0x77, 0x5f, 0x12, 0xfe, 0xf4, 0x25, 0xe1, 0xd6, 0x97, + 0x84, 0xbf, 0x7d, 0x49, 0xf8, 0xc7, 0x97, 0x0a, 0x8f, 0xbe, 0x24, 0xfc, 0xf6, 0x20, 0x15, 0x6e, + 0x1f, 0xa4, 0xc2, 0xdd, 0x83, 0x54, 0xf8, 0xfe, 0x55, 0xfa, 0x7f, 0xdd, 0xb4, 0x12, 0xde, 0xd3, + 0x93, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xea, 0x8c, 0xb7, 0x16, 0x04, 0x0a, 0x00, 0x00, } func (this *CronScript) Equal(that interface{}) bool { diff --git a/src/cloud/cron_script/cronscriptpb/service.proto b/src/cloud/cron_script/cronscriptpb/service.proto index c4ca7e01dfd..ea4abd578c4 100644 --- a/src/cloud/cron_script/cronscriptpb/service.proto +++ b/src/cloud/cron_script/cronscriptpb/service.proto @@ -22,7 +22,7 @@ package px.services.internal; option go_package = "cronscriptpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/wrappers.proto"; import "src/api/proto/uuidpb/uuid.proto"; diff --git a/src/cloud/indexer/indexer_server.go b/src/cloud/indexer/indexer_server.go index 95b49fe2ac5..e743eab5922 100644 --- a/src/cloud/indexer/indexer_server.go +++ b/src/cloud/indexer/indexer_server.go @@ -79,7 +79,6 @@ func mustConnectElastic() *elastic.Client { Passwd: viper.GetString("es_passwd"), CaCertFile: viper.GetString("es_ca_cert"), }) - if err != nil { log.WithError(err).Fatalf("Failed to connect to elastic at url: %s", esURL) } diff --git a/src/cloud/indexer/md/md.go b/src/cloud/indexer/md/md.go index b2950ff79b1..add3e520799 100644 --- a/src/cloud/indexer/md/md.go +++ b/src/cloud/indexer/md/md.go @@ -39,12 +39,10 @@ const ( defaultFlushInterval = time.Second * 10 ) -var ( - elasticFailuresCollector = prometheus.NewCounterVec(prometheus.CounterOpts{ - Name: "elastic_index_failures", - Help: "The number of failures for the vizier_id index", - }, []string{"vizier_id"}) -) +var elasticFailuresCollector = prometheus.NewCounterVec(prometheus.CounterOpts{ + Name: "elastic_index_failures", + Help: "The number of failures for the vizier_id index", +}, []string{"vizier_id"}) func init() { prometheus.MustRegister(elasticFailuresCollector) @@ -70,7 +68,8 @@ type VizierIndexer struct { // NewVizierIndexerWithBulkSettings creates a new Vizier indexer with bulk settings. func NewVizierIndexerWithBulkSettings(vizierID uuid.UUID, orgID uuid.UUID, k8sUID, indexName string, st msgbus.Streamer, - es *elastic.Client, batchFlushInterval time.Duration) *VizierIndexer { + es *elastic.Client, batchFlushInterval time.Duration, +) *VizierIndexer { return &VizierIndexer{ st: st, es: es, diff --git a/src/cloud/indexer/md/md_test.go b/src/cloud/indexer/md/md_test.go index b78e5b6f49d..0c8fe9768e0 100644 --- a/src/cloud/indexer/md/md_test.go +++ b/src/cloud/indexer/md/md_test.go @@ -38,9 +38,11 @@ import ( const indexName = "test_md_index" -var elasticClient *elastic.Client -var vzID uuid.UUID -var orgID uuid.UUID +var ( + elasticClient *elastic.Client + vzID uuid.UUID + orgID uuid.UUID +) func TestMain(m *testing.M) { es, cleanup, err := docker.SetupElastic() diff --git a/src/cloud/metrics/controllers/server.go b/src/cloud/metrics/controllers/server.go index e628be48088..8681584dee4 100644 --- a/src/cloud/metrics/controllers/server.go +++ b/src/cloud/metrics/controllers/server.go @@ -26,8 +26,6 @@ import ( "sync" "time" - "px.dev/pixie/src/shared/bq" - "cloud.google.com/go/bigquery" "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/types" @@ -38,6 +36,7 @@ import ( log "github.com/sirupsen/logrus" "px.dev/pixie/src/cloud/shared/vzshard" + "px.dev/pixie/src/shared/bq" "px.dev/pixie/src/shared/cvmsgs" "px.dev/pixie/src/shared/cvmsgspb" ) diff --git a/src/cloud/plugin/controllers/server.go b/src/cloud/plugin/controllers/server.go index e2e2097f5e0..55254742954 100644 --- a/src/cloud/plugin/controllers/server.go +++ b/src/cloud/plugin/controllers/server.go @@ -560,7 +560,7 @@ func (s *Server) UpdateOrgRetentionPluginConfig(ctx context.Context, req *plugin if req.Version != nil { version = req.Version.Value } - if req.Configurations != nil && len(req.Configurations) > 0 { + if len(req.Configurations) > 0 { configurations, _ = json.Marshal(req.Configurations) } @@ -1024,7 +1024,6 @@ func (s *Server) UpdateRetentionScript(ctx context.Context, req *pluginpb.Update // Update retention scripts with new info. query = `UPDATE plugin_retention_scripts SET script_name = $1, export_url = PGP_SYM_ENCRYPT($2, $3), description = $4 WHERE script_id = $5` _, err = txn.Exec(query, scriptName, exportURL, s.dbKey, description, scriptID) - if err != nil { return nil, status.Errorf(codes.Internal, "Failed to update retention script") } diff --git a/src/cloud/plugin/pluginpb/BUILD.bazel b/src/cloud/plugin/pluginpb/BUILD.bazel index 13d51ce6da1..215a5cb20da 100644 --- a/src/cloud/plugin/pluginpb/BUILD.bazel +++ b/src/cloud/plugin/pluginpb/BUILD.bazel @@ -23,7 +23,7 @@ pl_proto_library( deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", "//src/shared/cvmsgspb:cvmsgs_pl_proto", - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/cloud/plugin/pluginpb/service.pb.go b/src/cloud/plugin/pluginpb/service.pb.go index f50e98d2f3a..1e356998fa9 100755 --- a/src/cloud/plugin/pluginpb/service.pb.go +++ b/src/cloud/plugin/pluginpb/service.pb.go @@ -1500,113 +1500,112 @@ func init() { } var fileDescriptor_0b1ae703d1aa3a9a = []byte{ - // 1692 bytes of a gzipped FileDescriptorProto + // 1680 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0x4b, 0x6f, 0xdb, 0xc6, 0x16, 0x36, 0x65, 0x5b, 0x96, 0x8e, 0xe2, 0xd7, 0xd8, 0x49, 0x14, 0xd9, 0x91, 0x7c, 0x79, 0x91, - 0x6b, 0xdf, 0xdc, 0x1b, 0x39, 0x71, 0x5c, 0x37, 0xcd, 0xab, 0x89, 0x2d, 0xc7, 0x51, 0xe3, 0xca, - 0x01, 0x1d, 0xa5, 0x40, 0x81, 0x56, 0xa0, 0xc5, 0xb1, 0xca, 0x86, 0x26, 0x55, 0x3e, 0xe2, 0x24, + 0x6b, 0xdf, 0xdc, 0x5b, 0x29, 0x71, 0x5c, 0x37, 0xcd, 0xab, 0x89, 0x2d, 0xc7, 0x51, 0xe3, 0xca, + 0x01, 0x1d, 0xa5, 0x40, 0x81, 0x56, 0xa0, 0xc5, 0xb1, 0xc0, 0x86, 0x21, 0x55, 0x3e, 0xe2, 0x24, 0xab, 0xa0, 0x8b, 0x02, 0x2d, 0x82, 0xa2, 0xe8, 0xaa, 0x40, 0x77, 0x5d, 0xf5, 0x57, 0xb4, 0xcb, 0x76, 0x99, 0x65, 0x16, 0x85, 0xd0, 0x30, 0x9b, 0x2e, 0xfd, 0x03, 0xba, 0x28, 0x38, 0x33, 0x94, - 0x48, 0x8a, 0xd4, 0xcb, 0x59, 0x59, 0x9c, 0x39, 0xe7, 0xcc, 0x37, 0xe7, 0x7c, 0xe7, 0x41, 0x1a, - 0x16, 0x0d, 0xbd, 0xba, 0x5c, 0x55, 0x34, 0x4b, 0x5a, 0xae, 0x2b, 0x56, 0x4d, 0x56, 0xd9, 0x9f, - 0xfa, 0xde, 0xb2, 0x81, 0xf5, 0xc7, 0x72, 0x15, 0xe7, 0xeb, 0xba, 0x66, 0x6a, 0x68, 0xb6, 0xfe, - 0x24, 0xcf, 0x56, 0x8c, 0xbc, 0xac, 0x9a, 0x58, 0x57, 0x45, 0x25, 0x73, 0xa1, 0x26, 0x9b, 0x9f, - 0x59, 0x7b, 0xf9, 0xaa, 0x76, 0xb0, 0x5c, 0xd3, 0x6a, 0xda, 0x32, 0x11, 0xde, 0xb3, 0xf6, 0xc9, - 0x13, 0x79, 0x20, 0xbf, 0xa8, 0x91, 0x4c, 0xb6, 0xa6, 0x69, 0x35, 0x05, 0xb7, 0xa4, 0x0e, 0x75, - 0xb1, 0x5e, 0xc7, 0xba, 0xc1, 0xf6, 0x73, 0x0e, 0x1a, 0xb1, 0x2e, 0x53, 0x81, 0x65, 0xcb, 0x92, - 0xa5, 0xfa, 0x1e, 0xf9, 0x43, 0x05, 0xf8, 0x22, 0x4c, 0x6f, 0x61, 0xf3, 0x3e, 0x81, 0x68, 0x08, - 0xf8, 0x0b, 0x0b, 0x1b, 0x26, 0x5a, 0x85, 0x91, 0x47, 0xb2, 0x2a, 0xa5, 0xb9, 0x05, 0x6e, 0x69, - 0x62, 0x65, 0x21, 0x1f, 0x86, 0x34, 0x4f, 0x75, 0xee, 0xc9, 0xaa, 0x24, 0x10, 0x69, 0x7e, 0x1b, - 0x90, 0xd7, 0x94, 0x51, 0xd7, 0x54, 0x03, 0xa3, 0x35, 0x18, 0xa3, 0x0e, 0x30, 0xd2, 0xdc, 0xc2, - 0xf0, 0x52, 0x6a, 0x65, 0xbe, 0x93, 0x39, 0xc1, 0x15, 0xe6, 0xcb, 0xb0, 0xb0, 0x85, 0x4d, 0x01, - 0x9b, 0x58, 0x35, 0x65, 0x4d, 0x65, 0x66, 0xef, 0x68, 0xfa, 0x8e, 0x5e, 0x73, 0x71, 0x5e, 0x82, - 0xb8, 0xa6, 0xd7, 0x2a, 0x32, 0x45, 0x9a, 0x5a, 0x99, 0x74, 0x4c, 0xd3, 0x3b, 0xe6, 0xcb, 0xe5, - 0x62, 0x61, 0x3d, 0x69, 0x37, 0x72, 0xa3, 0x3b, 0x7a, 0xad, 0x58, 0x10, 0x46, 0x35, 0xbd, 0x56, - 0x94, 0xf8, 0x23, 0x0e, 0xfe, 0xd5, 0xc1, 0x2e, 0x03, 0xfd, 0x49, 0x10, 0xf4, 0x46, 0x38, 0xe8, - 0xae, 0x96, 0xd8, 0xb5, 0x76, 0x4d, 0xd1, 0xc4, 0xcd, 0xbb, 0x65, 0x14, 0x48, 0x79, 0xd6, 0xd1, - 0x2a, 0xc4, 0xe9, 0x0e, 0xbb, 0x46, 0x67, 0x0f, 0x31, 0x59, 0xb4, 0x08, 0x93, 0x58, 0x15, 0xf7, - 0x14, 0x2c, 0x55, 0x1e, 0x63, 0xdd, 0x90, 0x35, 0x35, 0x1d, 0x5b, 0xe0, 0x96, 0x92, 0xc2, 0x04, - 0x5b, 0x7e, 0x48, 0x57, 0xf9, 0x5f, 0x38, 0x88, 0x53, 0x5d, 0x84, 0x60, 0x44, 0x15, 0x0f, 0x30, - 0x39, 0x27, 0x29, 0x90, 0xdf, 0xe8, 0x14, 0xc4, 0x64, 0x89, 0xaa, 0xae, 0xc7, 0xed, 0x46, 0x2e, - 0x56, 0x2c, 0x08, 0x31, 0x59, 0x42, 0x0b, 0x90, 0x92, 0xb0, 0x51, 0xd5, 0xe5, 0xba, 0x73, 0xbb, - 0xf4, 0x30, 0x51, 0xf1, 0x2e, 0x39, 0xd6, 0x14, 0xad, 0xa6, 0xa5, 0x47, 0xa8, 0x35, 0xe7, 0x37, - 0x3a, 0x07, 0x13, 0x8a, 0x68, 0x62, 0xc3, 0x6c, 0x82, 0x1a, 0x25, 0xbb, 0xe3, 0x74, 0x95, 0x61, - 0x42, 0xff, 0x83, 0x69, 0xdd, 0x75, 0x5c, 0x85, 0xe1, 0x4d, 0xc7, 0x17, 0xb8, 0xa5, 0x84, 0x30, - 0xd5, 0xdc, 0xd8, 0xa4, 0xeb, 0xfc, 0x2e, 0xe4, 0xda, 0x1d, 0xbd, 0xa1, 0xa9, 0xfb, 0x72, 0x93, - 0x09, 0xf4, 0x12, 0x5c, 0xdb, 0x25, 0xd2, 0x30, 0xe6, 0x77, 0x8e, 0xfb, 0xc8, 0x1f, 0x8d, 0x86, - 0x11, 0xcc, 0xb5, 0xca, 0x78, 0xa0, 0xc3, 0x44, 0x95, 0xac, 0x58, 0xba, 0xe8, 0x08, 0xb9, 0x74, - 0xf8, 0xa0, 0x57, 0x3a, 0xf8, 0xed, 0xe5, 0x37, 0x7c, 0xc6, 0x36, 0x55, 0x53, 0x7f, 0x2a, 0x04, - 0x4e, 0x40, 0x9f, 0xc3, 0x44, 0x5d, 0xc7, 0x06, 0x36, 0x2b, 0xd4, 0xd3, 0x46, 0x3a, 0xd6, 0x1f, - 0x05, 0x03, 0x67, 0xde, 0x27, 0xc6, 0x76, 0x89, 0x2d, 0x61, 0xbc, 0xee, 0x79, 0x32, 0xd0, 0x6d, - 0x98, 0x96, 0xb4, 0xaa, 0x75, 0x80, 0x55, 0x93, 0x9c, 0x5e, 0xb1, 0x74, 0x85, 0x46, 0x7a, 0x7d, - 0xd6, 0x6e, 0xe4, 0xa6, 0x0a, 0xde, 0xcd, 0xb2, 0xb0, 0x2d, 0x4c, 0xf9, 0xc4, 0xcb, 0xba, 0x82, - 0xd6, 0x01, 0x49, 0x78, 0x5f, 0xb4, 0x14, 0xb3, 0x82, 0x9f, 0xd4, 0x35, 0xdd, 0x24, 0x36, 0x46, - 0x3c, 0x36, 0xe8, 0xee, 0x26, 0xd9, 0xa4, 0x36, 0x7c, 0x2b, 0xba, 0x82, 0x76, 0xe0, 0xb4, 0xa8, - 0x28, 0xda, 0x61, 0xa5, 0x6a, 0x19, 0xa6, 0x76, 0xe0, 0x35, 0xe4, 0xb0, 0x27, 0xb1, 0x9e, 0xb6, - 0x1b, 0xb9, 0xd9, 0xdb, 0x8e, 0xc8, 0x06, 0x91, 0x68, 0x19, 0x9b, 0x15, 0xdb, 0x56, 0x29, 0x28, - 0x6a, 0x50, 0x56, 0x0d, 0x5c, 0xb5, 0x74, 0x5c, 0x31, 0x15, 0x83, 0xf2, 0x8b, 0x82, 0x22, 0xb6, - 0x8a, 0x6c, 0xf3, 0xc1, 0xf6, 0xae, 0x30, 0x25, 0xfa, 0x56, 0x14, 0x23, 0x73, 0x1b, 0x66, 0x42, - 0xc2, 0x85, 0xa6, 0x60, 0xf8, 0x11, 0x7e, 0xca, 0x32, 0xc8, 0xf9, 0x89, 0x66, 0x61, 0xf4, 0xb1, - 0xa8, 0x58, 0x98, 0x31, 0x8c, 0x3e, 0x5c, 0x8d, 0x5d, 0xe1, 0x32, 0x2f, 0x38, 0x38, 0xe1, 0x75, - 0x7f, 0x68, 0xfe, 0x05, 0xf2, 0x2c, 0xd6, 0x9e, 0x67, 0x79, 0x98, 0x71, 0x5d, 0xbc, 0xaf, 0x3b, - 0x84, 0x57, 0xab, 0x4f, 0x2b, 0x06, 0x89, 0xd3, 0xb0, 0x30, 0xcd, 0xb6, 0xee, 0xb8, 0x3b, 0xbb, - 0xe8, 0x14, 0xc4, 0xa9, 0x32, 0xcb, 0x4c, 0xf6, 0xc4, 0x7f, 0xc9, 0x01, 0xbf, 0x85, 0x4d, 0x52, - 0x9e, 0x3a, 0xe4, 0xd2, 0x7f, 0x21, 0x49, 0x4b, 0x4c, 0xa5, 0x99, 0x52, 0x27, 0xec, 0x46, 0x2e, - 0x41, 0x65, 0x8b, 0x05, 0x21, 0x41, 0xb7, 0x8b, 0x92, 0xa7, 0x00, 0xc7, 0x7a, 0x2d, 0xc0, 0xbf, - 0xc6, 0xe0, 0xdf, 0x1d, 0x41, 0xb0, 0xd4, 0xb3, 0x22, 0x52, 0xef, 0xc3, 0xc8, 0x34, 0xe8, 0x66, - 0xb2, 0xa7, 0xec, 0x3b, 0x0f, 0xd3, 0xed, 0x24, 0xa4, 0x31, 0x99, 0xac, 0x06, 0x58, 0xb6, 0x02, - 0x27, 0x7c, 0xfc, 0x1a, 0x26, 0xfc, 0x9a, 0xb4, 0x1b, 0xb9, 0x94, 0x97, 0x5a, 0x29, 0xf9, 0xad, - 0xb2, 0x8a, 0xff, 0x76, 0x14, 0xce, 0x95, 0xeb, 0x92, 0x68, 0xe2, 0x6e, 0x91, 0xec, 0xbf, 0x3f, - 0xfa, 0x83, 0x1f, 0xeb, 0x18, 0xfc, 0xc3, 0xb6, 0x08, 0x0d, 0x93, 0x08, 0xed, 0x84, 0x47, 0xa8, - 0x27, 0xc8, 0x3d, 0xc5, 0x68, 0x15, 0xc6, 0xdc, 0x96, 0x31, 0x42, 0xee, 0x95, 0xc9, 0xd3, 0x31, - 0x28, 0xef, 0x8e, 0x41, 0xf9, 0x75, 0x4d, 0x53, 0x1e, 0x3a, 0x1e, 0x13, 0x5c, 0x51, 0x67, 0x10, - 0xf1, 0xb6, 0x24, 0xa7, 0xcd, 0x06, 0xb5, 0x76, 0x4d, 0x5d, 0x56, 0x6b, 0x4c, 0x8f, 0x09, 0xa3, - 0xbb, 0x61, 0x8c, 0x88, 0xf7, 0x60, 0xa1, 0x8d, 0x2f, 0xa5, 0x00, 0x5f, 0xc6, 0xba, 0x81, 0xef, - 0xcc, 0x25, 0xb4, 0x01, 0x93, 0x92, 0x6c, 0x38, 0xb7, 0xab, 0xd0, 0xb2, 0x6e, 0xa4, 0x13, 0x5d, - 0xfd, 0x31, 0xc1, 0x54, 0x68, 0x5d, 0x7a, 0x2b, 0x84, 0x5c, 0x82, 0xff, 0x74, 0x0b, 0x2e, 0xcd, - 0x40, 0x7e, 0x07, 0x32, 0xde, 0x7e, 0xc5, 0xda, 0xd0, 0x31, 0xc6, 0xb9, 0xdf, 0x62, 0x30, 0x19, - 0x30, 0x87, 0xae, 0x42, 0x92, 0x16, 0xbc, 0x0e, 0x96, 0x08, 0xa7, 0xa9, 0xbc, 0xc3, 0x69, 0x2a, - 0x5f, 0x94, 0x50, 0x0e, 0x52, 0x4c, 0x97, 0xd4, 0x69, 0x7a, 0x55, 0xa0, 0x4b, 0xa5, 0x90, 0x6a, - 0x1d, 0x32, 0x15, 0xe5, 0x20, 0xe5, 0xad, 0xd2, 0x23, 0xa4, 0x4a, 0xc3, 0x7e, 0xab, 0x3c, 0xdf, - 0x82, 0x54, 0x55, 0xb1, 0x0c, 0x13, 0xeb, 0x15, 0x59, 0x32, 0xd2, 0xa3, 0x24, 0x69, 0xda, 0x10, - 0x4e, 0xd8, 0x8d, 0x1c, 0x6c, 0x50, 0xb9, 0x62, 0xc1, 0x10, 0x80, 0xe9, 0x14, 0x25, 0x03, 0xcd, - 0x79, 0x93, 0x34, 0x4e, 0x20, 0xb4, 0xd2, 0x32, 0xdd, 0xca, 0x8e, 0x31, 0x32, 0x50, 0x35, 0x33, - 0x60, 0x0e, 0x92, 0xb2, 0xc1, 0xa8, 0x42, 0x98, 0x92, 0x10, 0x12, 0xb2, 0x41, 0x89, 0xc0, 0xff, - 0xc4, 0xc1, 0xe9, 0x02, 0x36, 0x45, 0x59, 0xc1, 0x52, 0xd0, 0xa3, 0x37, 0x9a, 0x0d, 0x85, 0xba, - 0xf3, 0x5c, 0x78, 0x86, 0x07, 0xd4, 0xdc, 0xbe, 0x83, 0x32, 0x90, 0xa8, 0x6a, 0xaa, 0xb3, 0x67, - 0x30, 0x8f, 0x36, 0x9f, 0xd1, 0xff, 0x01, 0x3c, 0x69, 0x45, 0x47, 0x8f, 0x71, 0xbb, 0x91, 0x4b, - 0xb6, 0x5a, 0x7c, 0x12, 0xbb, 0x19, 0xc4, 0x7f, 0x0a, 0x73, 0xa1, 0xfc, 0x61, 0x3d, 0xe3, 0x7d, - 0x18, 0x73, 0x67, 0x26, 0xda, 0x2c, 0x7a, 0x04, 0xea, 0x6a, 0xf1, 0xdf, 0x70, 0x70, 0xa6, 0xfd, - 0x80, 0x63, 0x94, 0x53, 0x1f, 0x17, 0x63, 0x7d, 0x71, 0x91, 0xaf, 0x86, 0x25, 0x4b, 0xf3, 0xae, - 0x9b, 0x81, 0x98, 0x5c, 0x08, 0xbf, 0x6a, 0x44, 0x48, 0x9b, 0x33, 0xc1, 0x0f, 0x1c, 0xcc, 0x6f, - 0xe8, 0xd8, 0x79, 0x3d, 0x09, 0xbf, 0xf4, 0xdb, 0x39, 0x67, 0x90, 0x49, 0xe1, 0x2e, 0x9c, 0x8d, - 0x40, 0xc6, 0x5c, 0xb0, 0xd8, 0x1c, 0xfa, 0x43, 0xec, 0x79, 0xde, 0x02, 0xf8, 0xaf, 0x46, 0x60, - 0x9e, 0x56, 0xa8, 0x88, 0x4b, 0x1e, 0xa7, 0x64, 0xdc, 0x68, 0x2f, 0x19, 0xdd, 0x3a, 0x83, 0xb7, - 0xa0, 0xdc, 0x6c, 0x2f, 0x28, 0xdd, 0xd4, 0x7d, 0xe5, 0x66, 0xb0, 0x66, 0x78, 0xdd, 0x5f, 0xa4, - 0x68, 0x43, 0x9c, 0x6b, 0xd3, 0x2c, 0xaa, 0xe6, 0xda, 0x2a, 0xc3, 0xec, 0xa9, 0x60, 0x57, 0x3c, - 0x09, 0xdd, 0x4b, 0x27, 0x6c, 0xa5, 0xfb, 0x35, 0x5f, 0xba, 0x8f, 0xf5, 0xa0, 0xdb, 0xca, 0xfe, - 0x60, 0xe1, 0x4c, 0xf4, 0x5d, 0x38, 0xf9, 0x1c, 0x9c, 0x8d, 0xe0, 0x01, 0x6b, 0x50, 0xcf, 0x60, - 0xbe, 0x80, 0x15, 0x1c, 0x49, 0x94, 0x5e, 0x29, 0x37, 0x08, 0xdf, 0x73, 0x70, 0x36, 0xe2, 0x6c, - 0x0a, 0xee, 0xfc, 0x2d, 0x80, 0xd6, 0x47, 0x17, 0x74, 0x1a, 0x66, 0xee, 0x6f, 0x97, 0xb7, 0x8a, - 0xa5, 0xca, 0xbd, 0x62, 0xa9, 0x50, 0x29, 0x97, 0xee, 0x95, 0x76, 0x3e, 0x2a, 0x4d, 0x0d, 0xa1, - 0x33, 0x70, 0xd2, 0xbb, 0x21, 0x6c, 0x3e, 0xd8, 0x2c, 0x3d, 0x28, 0xee, 0x94, 0xa6, 0xb8, 0x95, - 0xbf, 0x39, 0x18, 0x67, 0x5f, 0x1e, 0x68, 0x06, 0xa3, 0x0a, 0x40, 0xeb, 0xa3, 0x0d, 0x5a, 0x8c, - 0x1c, 0xae, 0xfd, 0x5f, 0x88, 0x32, 0x4b, 0xdd, 0x05, 0x59, 0x92, 0x7e, 0xcd, 0x41, 0x3a, 0xea, - 0x1d, 0x15, 0xbd, 0xd3, 0xef, 0x3b, 0x2d, 0x3d, 0x7d, 0x6d, 0xb0, 0x57, 0xe1, 0x95, 0x3f, 0x12, - 0x90, 0x29, 0x88, 0xa6, 0x18, 0x90, 0x72, 0x7d, 0xf1, 0x22, 0x50, 0xfd, 0x7d, 0x5f, 0x74, 0xd0, - 0x5a, 0xdf, 0x9f, 0x80, 0x28, 0xd8, 0x77, 0x07, 0xfc, 0x74, 0x84, 0xbe, 0xe7, 0x48, 0xb7, 0x8b, - 0x1a, 0xaa, 0xd0, 0x95, 0x01, 0xde, 0x84, 0x28, 0xa4, 0xf7, 0x06, 0x7e, 0x87, 0x42, 0x3f, 0x72, - 0x90, 0xed, 0x3c, 0xec, 0xa1, 0x6b, 0xc7, 0x98, 0xff, 0x33, 0xd7, 0x07, 0x53, 0x66, 0xe8, 0x9e, - 0xc1, 0x4c, 0xc8, 0x7c, 0x80, 0x2e, 0x76, 0x0f, 0x81, 0x7f, 0x14, 0xcd, 0x5c, 0xea, 0x43, 0x83, - 0x9d, 0x7d, 0x48, 0x3e, 0x7f, 0x06, 0x47, 0xa7, 0xe5, 0x5e, 0x0d, 0xb9, 0x27, 0x5f, 0xec, 0x5d, - 0x81, 0x1d, 0xfc, 0x9c, 0x83, 0x93, 0xa1, 0x8d, 0x12, 0xad, 0x84, 0xdb, 0xea, 0xd4, 0xef, 0x33, - 0x97, 0xfb, 0xd2, 0xf1, 0x40, 0x08, 0x2d, 0xac, 0x51, 0x10, 0x3a, 0x75, 0xe3, 0x28, 0x08, 0x1d, - 0x2b, 0x37, 0x81, 0x10, 0x5a, 0x3e, 0xa3, 0x20, 0x74, 0xaa, 0xf3, 0x51, 0x10, 0x3a, 0xd6, 0xe7, - 0xf5, 0x9b, 0x2f, 0x5f, 0x67, 0x87, 0x5e, 0xbd, 0xce, 0x0e, 0x1d, 0xbd, 0xce, 0x72, 0xcf, 0xed, - 0x2c, 0xf7, 0xb3, 0x9d, 0xe5, 0x7e, 0xb7, 0xb3, 0xdc, 0x4b, 0x3b, 0xcb, 0xfd, 0x69, 0x67, 0xb9, - 0xbf, 0xec, 0xec, 0xd0, 0x91, 0x9d, 0xe5, 0xbe, 0x7b, 0x93, 0x1d, 0x7a, 0xf9, 0x26, 0x3b, 0xf4, - 0xea, 0x4d, 0x76, 0xe8, 0xe3, 0x84, 0xfb, 0xff, 0x81, 0xbd, 0x38, 0x69, 0x80, 0x97, 0xff, 0x09, - 0x00, 0x00, 0xff, 0xff, 0x75, 0xbd, 0xa4, 0xf9, 0x43, 0x18, 0x00, 0x00, + 0x48, 0x8a, 0xd4, 0xcb, 0x59, 0x59, 0x9c, 0x39, 0xe7, 0xcc, 0x77, 0xe6, 0x7c, 0xe7, 0x41, 0x1a, + 0x96, 0x0d, 0xbd, 0x56, 0xa8, 0x29, 0x9a, 0x25, 0x15, 0x1a, 0x8a, 0x55, 0x97, 0x55, 0xf6, 0xa7, + 0xb1, 0x5f, 0x30, 0xb0, 0xfe, 0x58, 0xae, 0xe1, 0x7c, 0x43, 0xd7, 0x4c, 0x0d, 0xcd, 0x37, 0x9e, + 0xe4, 0xd9, 0x8a, 0x91, 0x97, 0x55, 0x13, 0xeb, 0xaa, 0xa8, 0x64, 0xe6, 0xeb, 0x5a, 0x5d, 0x23, + 0x02, 0x05, 0xe7, 0x17, 0x95, 0xcd, 0x64, 0xeb, 0x9a, 0x56, 0x57, 0x70, 0x81, 0x3c, 0xed, 0x5b, + 0x07, 0x85, 0x43, 0x5d, 0x6c, 0x34, 0xb0, 0x6e, 0xb0, 0xfd, 0x9c, 0x73, 0xa8, 0xd8, 0x90, 0xa9, + 0x40, 0xc1, 0xb2, 0x64, 0xa9, 0xb1, 0x4f, 0xfe, 0x50, 0x01, 0xbe, 0x04, 0xb3, 0xdb, 0xd8, 0xbc, + 0x47, 0x90, 0x18, 0x02, 0xfe, 0xc2, 0xc2, 0x86, 0x89, 0xd6, 0x60, 0xec, 0xa1, 0xac, 0x4a, 0x69, + 0x6e, 0x89, 0x5b, 0x99, 0x5a, 0x5d, 0xca, 0x87, 0x01, 0xca, 0x53, 0x9d, 0xbb, 0xb2, 0x2a, 0x09, + 0x44, 0x9a, 0xdf, 0x01, 0xe4, 0x35, 0x65, 0x34, 0x34, 0xd5, 0xc0, 0x68, 0x1d, 0x26, 0xa8, 0x9f, + 0x46, 0x9a, 0x5b, 0x1a, 0x5d, 0x49, 0xad, 0x2e, 0x76, 0x33, 0x27, 0xb8, 0xc2, 0x7c, 0x05, 0x96, + 0xb6, 0xb1, 0x29, 0x60, 0x13, 0xab, 0xa6, 0xac, 0xa9, 0xcc, 0xec, 0x6d, 0x4d, 0xdf, 0xd5, 0xeb, + 0x2e, 0xce, 0x8b, 0x10, 0xd7, 0xf4, 0x7a, 0x55, 0xa6, 0x48, 0x53, 0xab, 0xd3, 0x8e, 0x69, 0xea, + 0x63, 0xbe, 0x52, 0x29, 0x15, 0x37, 0x92, 0x76, 0x33, 0x37, 0xbe, 0xab, 0xd7, 0x4b, 0x45, 0x61, + 0x5c, 0xd3, 0xeb, 0x25, 0x89, 0x3f, 0xe2, 0xe0, 0x5f, 0x5d, 0xec, 0x32, 0xd0, 0x9f, 0x06, 0x41, + 0x6f, 0x86, 0x83, 0xee, 0x69, 0x89, 0xb9, 0xb5, 0x67, 0x8a, 0x26, 0x6e, 0xf9, 0x96, 0x51, 0x20, + 0xe5, 0x59, 0x47, 0x6b, 0x10, 0xa7, 0x3b, 0xcc, 0x8d, 0xee, 0x37, 0xc4, 0x64, 0xd1, 0x32, 0x4c, + 0x63, 0x55, 0xdc, 0x57, 0xb0, 0x54, 0x7d, 0x8c, 0x75, 0x43, 0xd6, 0xd4, 0x74, 0x6c, 0x89, 0x5b, + 0x49, 0x0a, 0x53, 0x6c, 0xf9, 0x01, 0x5d, 0xe5, 0x7f, 0xe1, 0x20, 0x4e, 0x75, 0x11, 0x82, 0x31, + 0x55, 0x7c, 0x84, 0xc9, 0x39, 0x49, 0x81, 0xfc, 0x46, 0xa7, 0x20, 0x26, 0x4b, 0x54, 0x75, 0x23, + 0x6e, 0x37, 0x73, 0xb1, 0x52, 0x51, 0x88, 0xc9, 0x12, 0x5a, 0x82, 0x94, 0x84, 0x8d, 0x9a, 0x2e, + 0x37, 0x1c, 0xef, 0xd2, 0xa3, 0x44, 0xc5, 0xbb, 0xe4, 0x58, 0x53, 0xb4, 0xba, 0x96, 0x1e, 0xa3, + 0xd6, 0x9c, 0xdf, 0xe8, 0x1c, 0x4c, 0x29, 0xa2, 0x89, 0x0d, 0xb3, 0x05, 0x6a, 0x9c, 0xec, 0x4e, + 0xd2, 0x55, 0x86, 0x09, 0xfd, 0x0f, 0x66, 0x75, 0xf7, 0xe2, 0xaa, 0x0c, 0x6f, 0x3a, 0xbe, 0xc4, + 0xad, 0x24, 0x84, 0x99, 0xd6, 0xc6, 0x16, 0x5d, 0xe7, 0xf7, 0x20, 0xd7, 0x79, 0xd1, 0x9b, 0x9a, + 0x7a, 0x20, 0xb7, 0x98, 0x40, 0x9d, 0xe0, 0x3a, 0x9c, 0x48, 0xc3, 0x84, 0xff, 0x72, 0xdc, 0x47, + 0xfe, 0x68, 0x3c, 0x8c, 0x60, 0xae, 0x55, 0xc6, 0x03, 0x1d, 0xa6, 0x6a, 0x64, 0xc5, 0xd2, 0x45, + 0x47, 0xc8, 0xa5, 0xc3, 0x87, 0xfd, 0xd2, 0xc1, 0x6f, 0x2f, 0xbf, 0xe9, 0x33, 0xb6, 0xa5, 0x9a, + 0xfa, 0x53, 0x21, 0x70, 0x02, 0xfa, 0x1c, 0xa6, 0x1a, 0x3a, 0x36, 0xb0, 0x59, 0xa5, 0x37, 0x6d, + 0xa4, 0x63, 0x83, 0x51, 0x30, 0x70, 0xe6, 0x3d, 0x62, 0x6c, 0x8f, 0xd8, 0x12, 0x26, 0x1b, 0x9e, + 0x27, 0x03, 0xdd, 0x82, 0x59, 0x49, 0xab, 0x59, 0x8f, 0xb0, 0x6a, 0x92, 0xd3, 0xab, 0x96, 0xae, + 0xd0, 0x48, 0x6f, 0xcc, 0xdb, 0xcd, 0xdc, 0x4c, 0xd1, 0xbb, 0x59, 0x11, 0x76, 0x84, 0x19, 0x9f, + 0x78, 0x45, 0x57, 0xd0, 0x06, 0x20, 0x09, 0x1f, 0x88, 0x96, 0x62, 0x56, 0xf1, 0x93, 0x86, 0xa6, + 0x9b, 0xc4, 0xc6, 0x98, 0xc7, 0x06, 0xdd, 0xdd, 0x22, 0x9b, 0xd4, 0x86, 0x6f, 0x45, 0x57, 0xd0, + 0x2e, 0x9c, 0x16, 0x15, 0x45, 0x3b, 0xac, 0xd6, 0x2c, 0xc3, 0xd4, 0x1e, 0x79, 0x0d, 0x39, 0xec, + 0x49, 0x6c, 0xa4, 0xed, 0x66, 0x6e, 0xfe, 0x96, 0x23, 0xb2, 0x49, 0x24, 0xda, 0xc6, 0xe6, 0xc5, + 0x8e, 0x55, 0x0a, 0x8a, 0x1a, 0x94, 0x55, 0x03, 0xd7, 0x2c, 0x1d, 0x57, 0x4d, 0xc5, 0xa0, 0xfc, + 0xa2, 0xa0, 0x88, 0xad, 0x12, 0xdb, 0xbc, 0xbf, 0xb3, 0x27, 0xcc, 0x88, 0xbe, 0x15, 0xc5, 0xc8, + 0xdc, 0x82, 0xb9, 0x90, 0x70, 0xa1, 0x19, 0x18, 0x7d, 0x88, 0x9f, 0xb2, 0x0c, 0x72, 0x7e, 0xa2, + 0x79, 0x18, 0x7f, 0x2c, 0x2a, 0x16, 0x66, 0x0c, 0xa3, 0x0f, 0x57, 0x62, 0x97, 0xb9, 0xcc, 0x0b, + 0x0e, 0x4e, 0x78, 0xaf, 0x3f, 0x34, 0xff, 0x02, 0x79, 0x16, 0xeb, 0xcc, 0xb3, 0x3c, 0xcc, 0xb9, + 0x57, 0x7c, 0xa0, 0x3b, 0x84, 0x57, 0x6b, 0x4f, 0xab, 0x06, 0x89, 0xd3, 0xa8, 0x30, 0xcb, 0xb6, + 0x6e, 0xbb, 0x3b, 0x7b, 0xe8, 0x14, 0xc4, 0xa9, 0x32, 0xcb, 0x4c, 0xf6, 0xc4, 0x7f, 0xc9, 0x01, + 0xbf, 0x8d, 0x4d, 0x52, 0x9e, 0xba, 0xe4, 0xd2, 0x7f, 0x21, 0x49, 0x4b, 0x4c, 0xb5, 0x95, 0x52, + 0x27, 0xec, 0x66, 0x2e, 0x41, 0x65, 0x4b, 0x45, 0x21, 0x41, 0xb7, 0x4b, 0x92, 0xa7, 0x00, 0xc7, + 0xfa, 0x2d, 0xc0, 0xbf, 0xc6, 0xe0, 0xdf, 0x5d, 0x41, 0xb0, 0xd4, 0xb3, 0x22, 0x52, 0xef, 0xa3, + 0xc8, 0x34, 0xe8, 0x65, 0xb2, 0xaf, 0xec, 0x3b, 0x0f, 0xb3, 0x9d, 0x24, 0xa4, 0x31, 0x99, 0xae, + 0x05, 0x58, 0xb6, 0x0a, 0x27, 0x7c, 0xfc, 0x1a, 0x25, 0xfc, 0x9a, 0xb6, 0x9b, 0xb9, 0x94, 0x97, + 0x5a, 0x29, 0xf9, 0xad, 0xb2, 0x8a, 0xff, 0x76, 0x1c, 0xce, 0x55, 0x1a, 0x92, 0x68, 0xe2, 0x5e, + 0x91, 0x1c, 0xbc, 0x3f, 0xfa, 0x83, 0x1f, 0xeb, 0x1a, 0xfc, 0xc3, 0x8e, 0x08, 0x8d, 0x92, 0x08, + 0xed, 0x86, 0x47, 0xa8, 0x2f, 0xc8, 0x7d, 0xc5, 0x68, 0x0d, 0x26, 0xdc, 0x96, 0x31, 0x46, 0xfc, + 0xca, 0xe4, 0xe9, 0x18, 0x94, 0x77, 0xc7, 0xa0, 0xfc, 0x86, 0xa6, 0x29, 0x0f, 0x9c, 0x1b, 0x13, + 0x5c, 0x51, 0x67, 0x10, 0xf1, 0xb6, 0x24, 0xa7, 0xcd, 0x06, 0xb5, 0xf6, 0x4c, 0x5d, 0x56, 0xeb, + 0x4c, 0x8f, 0x09, 0xa3, 0x3b, 0x61, 0x8c, 0x88, 0xf7, 0x61, 0xa1, 0x83, 0x2f, 0xe5, 0x00, 0x5f, + 0x26, 0x7a, 0x81, 0xef, 0xce, 0x25, 0xb4, 0x09, 0xd3, 0x92, 0x6c, 0x38, 0xde, 0x55, 0x69, 0x59, + 0x37, 0xd2, 0x89, 0x9e, 0xf7, 0x31, 0xc5, 0x54, 0x68, 0x5d, 0x7a, 0x2b, 0x84, 0x5c, 0x81, 0xff, + 0xf4, 0x0a, 0x2e, 0xcd, 0x40, 0x7e, 0x17, 0x32, 0xde, 0x7e, 0xc5, 0xda, 0xd0, 0x31, 0xc6, 0xb9, + 0xdf, 0x62, 0x30, 0x1d, 0x30, 0x87, 0xae, 0x40, 0x92, 0x16, 0xbc, 0x2e, 0x96, 0x08, 0xa7, 0xa9, + 0xbc, 0xc3, 0x69, 0x2a, 0x5f, 0x92, 0x50, 0x0e, 0x52, 0x4c, 0x97, 0xd4, 0x69, 0xea, 0x2a, 0xd0, + 0xa5, 0x72, 0x48, 0xb5, 0x0e, 0x99, 0x8a, 0x72, 0x90, 0xf2, 0x56, 0xe9, 0x31, 0x52, 0xa5, 0xe1, + 0xa0, 0x5d, 0x9e, 0x6f, 0x42, 0xaa, 0xa6, 0x58, 0x86, 0x89, 0xf5, 0xaa, 0x2c, 0x19, 0xe9, 0x71, + 0x92, 0x34, 0x1d, 0x08, 0xa7, 0xec, 0x66, 0x0e, 0x36, 0xa9, 0x5c, 0xa9, 0x68, 0x08, 0xc0, 0x74, + 0x4a, 0x92, 0x81, 0x16, 0xbc, 0x49, 0x1a, 0x27, 0x10, 0xda, 0x69, 0x99, 0x6e, 0x67, 0xc7, 0x04, + 0x19, 0xa8, 0x5a, 0x19, 0xb0, 0x00, 0x49, 0xd9, 0x60, 0x54, 0x21, 0x4c, 0x49, 0x08, 0x09, 0xd9, + 0xa0, 0x44, 0xe0, 0x7f, 0xe2, 0xe0, 0x74, 0x11, 0x9b, 0xa2, 0xac, 0x60, 0x29, 0x78, 0xa3, 0xd7, + 0x5b, 0x0d, 0x85, 0x5e, 0xe7, 0xb9, 0xf0, 0x0c, 0x0f, 0xa8, 0xb9, 0x7d, 0x07, 0x65, 0x20, 0x51, + 0xd3, 0x54, 0x67, 0xcf, 0x60, 0x37, 0xda, 0x7a, 0x46, 0xff, 0x07, 0xf0, 0xa4, 0x15, 0x1d, 0x3d, + 0x26, 0xed, 0x66, 0x2e, 0xd9, 0x6e, 0xf1, 0x49, 0xec, 0x66, 0x10, 0xff, 0x19, 0x2c, 0x84, 0xf2, + 0x87, 0xf5, 0x8c, 0x0f, 0x60, 0xc2, 0x9d, 0x99, 0x68, 0xb3, 0xe8, 0x13, 0xa8, 0xab, 0xc5, 0x7f, + 0xc3, 0xc1, 0x99, 0xce, 0x03, 0x8e, 0x51, 0x4e, 0x7d, 0x5c, 0x8c, 0x0d, 0xc4, 0x45, 0xbe, 0x16, + 0x96, 0x2c, 0x2d, 0x5f, 0xb7, 0x02, 0x31, 0x79, 0x27, 0xdc, 0xd5, 0x88, 0x90, 0xb6, 0x66, 0x82, + 0x1f, 0x38, 0x58, 0xdc, 0xd4, 0xb1, 0xf3, 0x7a, 0x12, 0xee, 0xf4, 0xdb, 0x39, 0x67, 0x98, 0x49, + 0xe1, 0x0e, 0x9c, 0x8d, 0x40, 0xc6, 0xae, 0x60, 0xb9, 0x35, 0xf4, 0x87, 0xd8, 0xf3, 0xbc, 0x05, + 0xf0, 0x5f, 0x8d, 0xc1, 0x22, 0xad, 0x50, 0x11, 0x4e, 0x1e, 0xa7, 0x64, 0x5c, 0xef, 0x2c, 0x19, + 0xbd, 0x3a, 0x83, 0xb7, 0xa0, 0xdc, 0xe8, 0x2c, 0x28, 0xbd, 0xd4, 0x7d, 0xe5, 0x66, 0xb8, 0x66, + 0x78, 0xcd, 0x5f, 0xa4, 0x68, 0x43, 0x5c, 0xe8, 0xd0, 0x2c, 0xa9, 0xe6, 0xfa, 0x1a, 0xc3, 0xec, + 0xa9, 0x60, 0x97, 0x3d, 0x09, 0xdd, 0x4f, 0x27, 0x6c, 0xa7, 0xfb, 0x55, 0x5f, 0xba, 0x4f, 0xf4, + 0xa1, 0xdb, 0xce, 0xfe, 0x60, 0xe1, 0x4c, 0x0c, 0x5c, 0x38, 0xf9, 0x1c, 0x9c, 0x8d, 0xe0, 0x01, + 0x6b, 0x50, 0xcf, 0x60, 0xb1, 0x88, 0x15, 0x1c, 0x49, 0x94, 0x7e, 0x29, 0x37, 0x0c, 0xdf, 0x73, + 0x70, 0x36, 0xe2, 0x6c, 0x0a, 0xee, 0xfc, 0x4d, 0x80, 0xf6, 0x47, 0x17, 0x74, 0x1a, 0xe6, 0xee, + 0xed, 0x54, 0xb6, 0x4b, 0xe5, 0xea, 0xdd, 0x52, 0xb9, 0x58, 0xad, 0x94, 0xef, 0x96, 0x77, 0x3f, + 0x2e, 0xcf, 0x8c, 0xa0, 0x33, 0x70, 0xd2, 0xbb, 0x21, 0x6c, 0xdd, 0xdf, 0x2a, 0xdf, 0x2f, 0xed, + 0x96, 0x67, 0xb8, 0xd5, 0xbf, 0x39, 0x98, 0x64, 0x5f, 0x1e, 0x68, 0x06, 0xa3, 0x2a, 0x40, 0xfb, + 0xa3, 0x0d, 0x5a, 0x8e, 0x1c, 0xae, 0xfd, 0x5f, 0x88, 0x32, 0x2b, 0xbd, 0x05, 0x59, 0x92, 0x7e, + 0xcd, 0x41, 0x3a, 0xea, 0x1d, 0x15, 0xbd, 0x3b, 0xe8, 0x3b, 0x2d, 0x3d, 0x7d, 0x7d, 0xb8, 0x57, + 0xe1, 0xd5, 0x3f, 0x12, 0x90, 0x29, 0x8a, 0xa6, 0x18, 0x90, 0x72, 0xef, 0xe2, 0x45, 0xa0, 0xfa, + 0xfb, 0xbe, 0xe8, 0xa0, 0xf5, 0x81, 0x3f, 0x01, 0x51, 0xb0, 0xef, 0x0d, 0xf9, 0xe9, 0x08, 0x7d, + 0xcf, 0x91, 0x6e, 0x17, 0x35, 0x54, 0xa1, 0xcb, 0x43, 0xbc, 0x09, 0x51, 0x48, 0xef, 0x0f, 0xfd, + 0x0e, 0x85, 0x7e, 0xe4, 0x20, 0xdb, 0x7d, 0xd8, 0x43, 0x57, 0x8f, 0x31, 0xff, 0x67, 0xae, 0x0d, + 0xa7, 0xcc, 0xd0, 0x3d, 0x83, 0xb9, 0x90, 0xf9, 0x00, 0x5d, 0xe8, 0x1d, 0x02, 0xff, 0x28, 0x9a, + 0xb9, 0x38, 0x80, 0x06, 0x3b, 0xfb, 0x90, 0x7c, 0xfe, 0x0c, 0x8e, 0x4e, 0x85, 0x7e, 0x0d, 0xb9, + 0x27, 0x5f, 0xe8, 0x5f, 0x81, 0x1d, 0xfc, 0x9c, 0x83, 0x93, 0xa1, 0x8d, 0x12, 0xad, 0x86, 0xdb, + 0xea, 0xd6, 0xef, 0x33, 0x97, 0x06, 0xd2, 0xf1, 0x40, 0x08, 0x2d, 0xac, 0x51, 0x10, 0xba, 0x75, + 0xe3, 0x28, 0x08, 0x5d, 0x2b, 0x37, 0x81, 0x10, 0x5a, 0x3e, 0xa3, 0x20, 0x74, 0xab, 0xf3, 0x51, + 0x10, 0xba, 0xd6, 0xe7, 0x8d, 0x1b, 0x2f, 0x5f, 0x67, 0x47, 0x5e, 0xbd, 0xce, 0x8e, 0x1c, 0xbd, + 0xce, 0x72, 0xcf, 0xed, 0x2c, 0xf7, 0xb3, 0x9d, 0xe5, 0x7e, 0xb7, 0xb3, 0xdc, 0x4b, 0x3b, 0xcb, + 0xfd, 0x69, 0x67, 0xb9, 0xbf, 0xec, 0xec, 0xc8, 0x91, 0x9d, 0xe5, 0xbe, 0x7b, 0x93, 0x1d, 0x79, + 0xf9, 0x26, 0x3b, 0xf2, 0xea, 0x4d, 0x76, 0xe4, 0x93, 0x84, 0xfb, 0x6f, 0x80, 0xfd, 0x38, 0x69, + 0x80, 0x97, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x92, 0x5b, 0x76, 0x93, 0x2a, 0x18, 0x00, 0x00, } func (x PluginKind) String() string { diff --git a/src/cloud/plugin/pluginpb/service.proto b/src/cloud/plugin/pluginpb/service.proto index c1bc7aca5ab..29731bbadf4 100644 --- a/src/cloud/plugin/pluginpb/service.proto +++ b/src/cloud/plugin/pluginpb/service.proto @@ -22,7 +22,7 @@ package px.services.internal; option go_package = "pluginpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/wrappers.proto"; import "src/api/proto/uuidpb/uuid.proto"; diff --git a/src/cloud/profile/controllers/server.go b/src/cloud/profile/controllers/server.go index 66e6391056f..10ab35c4532 100644 --- a/src/cloud/profile/controllers/server.go +++ b/src/cloud/profile/controllers/server.go @@ -167,12 +167,14 @@ func orgInfoToProto(o *datastore.OrgInfo) *profilepb.OrgInfo { } func toExternalError(err error) error { - if err == datastore.ErrOrgNotFound { + switch err { + case datastore.ErrOrgNotFound: return status.Error(codes.NotFound, "no such org") - } else if err == datastore.ErrUserNotFound { + case datastore.ErrUserNotFound: return status.Error(codes.NotFound, "no such user") + default: + return err } - return err } // CreateUser is the GRPC method to create new user. @@ -274,7 +276,6 @@ func (s *Server) CreateOrgAndUser(ctx context.Context, req *profilepb.CreateOrgA OrgID: utils.ProtoFromUUID(orgID), ProjectName: DefaultProjectName, }) - if err != nil { deleteErr := s.ods.DeleteOrgAndUsers(orgID) if deleteErr != nil { @@ -594,7 +595,6 @@ func (s *Server) AddOrgIDEConfig(ctx context.Context, req *profilepb.AddOrgIDECo Name: req.Config.IDEName, Path: req.Config.Path, }) - if err != nil { return nil, err } diff --git a/src/cloud/profile/datastore/datastore.go b/src/cloud/profile/datastore/datastore.go index aeb50422c16..817c06a9d9c 100644 --- a/src/cloud/profile/datastore/datastore.go +++ b/src/cloud/profile/datastore/datastore.go @@ -566,7 +566,6 @@ func (d *Datastore) UpdateUserSettings(settings *UserSettings) error { query = `UPDATE user_settings SET %s = %s WHERE user_id = :user_id` } _, err = d.db.NamedExec(fmt.Sprintf(query, strings.Join(cols, ","), strings.Join(params, ",")), settings) - if err != nil { return err } @@ -583,7 +582,6 @@ func (d *Datastore) UpdateUserSettings(settings *UserSettings) error { func (d *Datastore) createUserSettingsUsingTxn(tx *sqlx.Tx, id uuid.UUID) error { query := `INSERT INTO user_settings (user_id) VALUES ($1)` _, err := tx.Exec(query, id) - if err != nil { return err } @@ -636,7 +634,6 @@ func (d *Datastore) SetUserAttributes(attributes *UserAttributes) error { query = `UPDATE user_attributes SET %s = %s WHERE user_id = :user_id` } _, err = d.db.NamedExec(fmt.Sprintf(query, strings.Join(cols, ","), strings.Join(params, ",")), attributes) - if err != nil { return err } @@ -653,7 +650,6 @@ func (d *Datastore) SetUserAttributes(attributes *UserAttributes) error { func (d *Datastore) createUserAttributesUsingTxn(tx *sqlx.Tx, id uuid.UUID) error { query := `INSERT INTO user_attributes (user_id) VALUES ($1)` _, err := tx.Exec(query, id) - if err != nil { return err } diff --git a/src/cloud/profile/profilepb/BUILD.bazel b/src/cloud/profile/profilepb/BUILD.bazel index a02604f506f..5b5f0582ea5 100644 --- a/src/cloud/profile/profilepb/BUILD.bazel +++ b/src/cloud/profile/profilepb/BUILD.bazel @@ -22,7 +22,7 @@ pl_proto_library( visibility = ["//src/cloud:__subpackages__"], deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/cloud/profile/profilepb/service.pb.go b/src/cloud/profile/profilepb/service.pb.go index d8ee5c57fb9..e768d51e0e7 100755 --- a/src/cloud/profile/profilepb/service.pb.go +++ b/src/cloud/profile/profilepb/service.pb.go @@ -1967,116 +1967,115 @@ func init() { } var fileDescriptor_7b1fc6e171c8059b = []byte{ - // 1741 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcb, 0x6f, 0xdb, 0xc8, - 0x19, 0x37, 0xf5, 0xd6, 0xe7, 0xc4, 0x96, 0xa7, 0x8e, 0x23, 0xd3, 0x09, 0xe5, 0x32, 0x89, 0x1f, - 0x08, 0x22, 0x37, 0x6e, 0x80, 0x06, 0x4d, 0x8c, 0x46, 0xb6, 0x5c, 0x43, 0x49, 0x53, 0x19, 0x54, - 0x9c, 0x43, 0x91, 0x56, 0xa0, 0xc4, 0x31, 0x4d, 0x98, 0x22, 0x59, 0x92, 0x72, 0x23, 0xb4, 0x87, - 0x02, 0x39, 0xf5, 0xd6, 0x5b, 0xff, 0x80, 0x5e, 0xf6, 0xb8, 0xb7, 0x3d, 0xef, 0x6d, 0xf7, 0x96, - 0x63, 0x4e, 0xc6, 0x46, 0xb9, 0xec, 0x31, 0xc0, 0x9e, 0xf6, 0xb6, 0xe0, 0x70, 0x28, 0x51, 0x7c, - 0x58, 0x92, 0xbd, 0xd8, 0x93, 0xc5, 0x6f, 0xbe, 0xf9, 0x9e, 0xbf, 0xf9, 0x1e, 0x09, 0x6c, 0x5a, - 0x66, 0x7b, 0xab, 0xad, 0xea, 0x5d, 0x69, 0xcb, 0x30, 0xf5, 0x63, 0x45, 0xc5, 0xde, 0x5f, 0xa3, - 0xb5, 0x65, 0x61, 0xf3, 0x4c, 0x69, 0xe3, 0xb2, 0x61, 0xea, 0xb6, 0x8e, 0x66, 0x8d, 0xb7, 0x65, - 0x4a, 0xb1, 0xd8, 0x07, 0xb2, 0x62, 0x9f, 0x74, 0x5b, 0xe5, 0xb6, 0xde, 0xd9, 0x92, 0x75, 0x59, - 0xdf, 0x22, 0x3c, 0xad, 0xee, 0x31, 0xf9, 0x22, 0x1f, 0xe4, 0x97, 0x7b, 0x97, 0x5d, 0x91, 0x75, - 0x5d, 0x76, 0x65, 0xbb, 0x5c, 0xb8, 0x63, 0xd8, 0x3d, 0x7a, 0xc8, 0x05, 0x0f, 0xff, 0x61, 0x8a, - 0x86, 0x81, 0x4d, 0x8b, 0x9e, 0x97, 0x1c, 0x1b, 0x45, 0x43, 0x71, 0x19, 0xb6, 0xba, 0x5d, 0x45, - 0x32, 0x5a, 0xe4, 0x8f, 0xcb, 0xc0, 0xff, 0x90, 0x80, 0xdc, 0x91, 0x85, 0xcd, 0x9a, 0x76, 0xac, - 0xa3, 0x75, 0x48, 0x28, 0x52, 0x91, 0x59, 0x65, 0x36, 0x66, 0xb7, 0xe7, 0xcb, 0xc6, 0xdb, 0xb2, - 0xcb, 0x5f, 0x3e, 0x3a, 0xaa, 0x55, 0x77, 0x33, 0xfd, 0xf3, 0x52, 0xa2, 0x56, 0x15, 0x12, 0x8a, - 0x84, 0x1e, 0x42, 0x46, 0x37, 0xe5, 0xa6, 0x22, 0x15, 0x13, 0xd1, 0xcc, 0xf9, 0xfe, 0x79, 0x29, - 0x5d, 0x37, 0xe5, 0x5a, 0x55, 0x48, 0xeb, 0xa6, 0x5c, 0x93, 0xd0, 0x6d, 0x80, 0x63, 0xc5, 0xb4, - 0xec, 0xa6, 0x26, 0x76, 0x70, 0x31, 0xb5, 0xca, 0x6c, 0xe4, 0x85, 0x3c, 0xa1, 0xfc, 0x59, 0xec, - 0x60, 0xb4, 0x02, 0x79, 0x55, 0xf4, 0x4e, 0xd3, 0xe4, 0x34, 0xe7, 0x10, 0xc8, 0xe1, 0x22, 0xa4, - 0x71, 0x47, 0x54, 0xd4, 0x62, 0x86, 0x1c, 0xb8, 0x1f, 0x68, 0x1d, 0xe6, 0x69, 0xbc, 0x9b, 0x86, - 0xd2, 0xb6, 0xbb, 0x26, 0x2e, 0x66, 0xc9, 0xf9, 0x1c, 0x25, 0x1f, 0xba, 0x54, 0x54, 0x82, 0x59, - 0xc5, 0x6a, 0x8a, 0x86, 0x61, 0xea, 0x67, 0x58, 0x2a, 0xe6, 0x56, 0x99, 0x8d, 0x9c, 0x00, 0x8a, - 0x55, 0xa1, 0x14, 0x74, 0x1f, 0x16, 0x14, 0x09, 0x6b, 0xb6, 0x62, 0xf7, 0x9a, 0x0e, 0x49, 0x91, - 0xb0, 0x59, 0xcc, 0x13, 0x59, 0x05, 0xef, 0xe0, 0x90, 0xd2, 0xd1, 0x53, 0x28, 0x88, 0x5d, 0xfb, - 0x64, 0xc0, 0xe8, 0x44, 0x01, 0x1c, 0xde, 0x5d, 0xd4, 0x3f, 0x2f, 0xcd, 0x55, 0xba, 0xf6, 0x89, - 0xc7, 0x5b, 0xab, 0x0a, 0x73, 0xa2, 0xff, 0x5b, 0x7a, 0x9e, 0xca, 0x25, 0x0b, 0x29, 0xfe, 0x01, - 0xdc, 0x38, 0xc0, 0xb6, 0x13, 0xf7, 0xdd, 0xde, 0xbe, 0xe3, 0x8c, 0x80, 0xff, 0xde, 0xc5, 0x96, - 0x3d, 0xf4, 0x94, 0xf1, 0x79, 0xca, 0xff, 0x0d, 0xb8, 0x01, 0x7b, 0x40, 0x3e, 0xbd, 0x17, 0x65, - 0x14, 0x33, 0xa9, 0x51, 0xfc, 0x57, 0x0c, 0x64, 0x9d, 0x64, 0x4d, 0x85, 0x81, 0x65, 0xc8, 0x39, - 0x18, 0x20, 0x09, 0x4b, 0x10, 0x6b, 0xb3, 0xba, 0x29, 0x93, 0x7c, 0xed, 0xc0, 0xac, 0xa4, 0x77, - 0x44, 0x45, 0x73, 0x4f, 0x93, 0x44, 0xd8, 0xad, 0xb2, 0x8b, 0xd5, 0xb2, 0x87, 0xd5, 0x72, 0xc3, - 0x36, 0x15, 0x4d, 0x7e, 0x2d, 0xaa, 0x5d, 0x2c, 0x80, 0x7b, 0x81, 0x5c, 0xdf, 0x84, 0x02, 0xd6, - 0xc4, 0x96, 0x8a, 0x69, 0xce, 0x44, 0xd5, 0x22, 0x80, 0xc9, 0x09, 0xf3, 0x2e, 0xbd, 0xe2, 0x91, - 0xf9, 0xff, 0x24, 0x60, 0x61, 0xcf, 0xc4, 0xa2, 0x8d, 0x9d, 0xe8, 0x78, 0xd1, 0x18, 0xc2, 0x93, - 0xb9, 0x1c, 0x3c, 0x93, 0x17, 0xc2, 0x33, 0x15, 0x07, 0xcf, 0xb4, 0x1f, 0x9e, 0x91, 0xa0, 0xca, - 0x4c, 0x01, 0xaa, 0xec, 0x14, 0xa0, 0x4a, 0x14, 0x92, 0xfc, 0xff, 0x93, 0x70, 0xd3, 0x8d, 0x45, - 0xdd, 0x94, 0x2b, 0x9a, 0xe4, 0x8f, 0xc8, 0xef, 0x21, 0xa9, 0x9b, 0x32, 0x0d, 0xc7, 0x46, 0xd9, - 0x57, 0x8e, 0xca, 0x31, 0x57, 0xca, 0x75, 0x53, 0x16, 0x9c, 0x4b, 0x68, 0x07, 0x52, 0x5d, 0x0b, - 0x9b, 0xf4, 0xa9, 0x6f, 0x4e, 0x74, 0x99, 0xfc, 0x26, 0xd7, 0xd8, 0x0a, 0x24, 0xeb, 0xa6, 0x3c, - 0x02, 0x17, 0x66, 0x14, 0x2e, 0xa5, 0x51, 0xb8, 0xb8, 0x60, 0xf2, 0x01, 0x82, 0xfd, 0x96, 0x81, - 0x94, 0x23, 0x31, 0x90, 0xa5, 0xc4, 0x85, 0x59, 0x4a, 0xc6, 0x65, 0x29, 0x35, 0x36, 0x4b, 0xe9, - 0x29, 0xb2, 0x94, 0x99, 0x22, 0x4b, 0x4c, 0x21, 0xc1, 0xbf, 0x63, 0xa0, 0x18, 0x8e, 0x9a, 0x65, - 0xe8, 0x9a, 0x85, 0x2f, 0x03, 0xdc, 0x47, 0x90, 0x75, 0xc2, 0x7c, 0x41, 0x2d, 0x86, 0xfe, 0x79, - 0x29, 0x43, 0x6a, 0x7c, 0x55, 0xc8, 0x38, 0xbc, 0x35, 0x89, 0x57, 0xa1, 0x30, 0x30, 0xc2, 0xc3, - 0xc8, 0x05, 0x19, 0xda, 0x09, 0x67, 0x68, 0x8a, 0x07, 0xcd, 0x6f, 0xc2, 0xaf, 0x0e, 0xb0, 0x5d, - 0x37, 0xe5, 0xdd, 0x9e, 0xf3, 0xed, 0x29, 0x44, 0x90, 0xf2, 0x29, 0x23, 0xbf, 0xf9, 0xc7, 0xa4, - 0x32, 0x12, 0xd6, 0x2a, 0x11, 0xe0, 0x31, 0x07, 0x40, 0xc2, 0x04, 0x41, 0xc2, 0x17, 0x60, 0xce, - 0xbd, 0x69, 0xd1, 0x2b, 0xfc, 0x13, 0x98, 0x1f, 0x50, 0x68, 0x80, 0x37, 0x20, 0xa5, 0x9b, 0xb2, - 0x55, 0x64, 0x56, 0x93, 0x1b, 0xb3, 0xdb, 0x8b, 0x23, 0x58, 0xa6, 0x15, 0x50, 0x20, 0x1c, 0xfc, - 0x53, 0x58, 0xa8, 0x62, 0x15, 0x8f, 0x16, 0x96, 0x49, 0x8b, 0x23, 0xbf, 0x08, 0xc8, 0x7f, 0xdb, - 0xd5, 0xce, 0xff, 0xc8, 0xc0, 0xc2, 0x91, 0x21, 0x89, 0x97, 0x13, 0x8a, 0xf6, 0x61, 0x5e, 0x52, - 0x2c, 0x43, 0x15, 0x7b, 0x83, 0x86, 0x37, 0x49, 0x69, 0x9d, 0xa3, 0x97, 0xbc, 0x76, 0xf8, 0x64, - 0xb4, 0x1d, 0xa6, 0x88, 0x08, 0x36, 0x24, 0x62, 0x57, 0xd7, 0x55, 0x9a, 0x4a, 0x5f, 0xab, 0x1c, - 0x22, 0x34, 0x3d, 0x21, 0x42, 0x69, 0x75, 0xfa, 0x9a, 0x81, 0x82, 0xeb, 0xbb, 0x0f, 0x72, 0x53, - 0xb8, 0x1e, 0x6e, 0x09, 0x89, 0xb1, 0x86, 0x07, 0xdb, 0xc5, 0x15, 0x1b, 0x13, 0x7f, 0x00, 0x4b, - 0xb4, 0x0f, 0x37, 0xb0, 0x6d, 0x2b, 0xda, 0x00, 0x6a, 0x13, 0x3b, 0x42, 0x83, 0x71, 0x08, 0x37, - 0x43, 0x82, 0x28, 0x42, 0x37, 0xa1, 0x20, 0x6a, 0xa2, 0xda, 0xb3, 0x95, 0xb6, 0xd5, 0xd4, 0x0d, - 0x5b, 0xef, 0xda, 0xc4, 0xce, 0x9c, 0x30, 0x3f, 0xa0, 0xd7, 0x09, 0xd9, 0x2d, 0x28, 0x54, 0xe2, - 0xff, 0x18, 0x58, 0x1e, 0x42, 0xeb, 0xb2, 0xe6, 0x39, 0x71, 0x0e, 0x69, 0x1f, 0x0f, 0x90, 0x08, - 0xcb, 0x12, 0x85, 0x24, 0x9d, 0x75, 0x1e, 0x01, 0x1b, 0x65, 0x18, 0x75, 0x77, 0x09, 0x12, 0xfa, - 0x29, 0xb1, 0x2c, 0xe7, 0x1a, 0x52, 0x7f, 0x21, 0x24, 0xf4, 0x53, 0x7e, 0x0f, 0x8a, 0x34, 0x42, - 0x15, 0xdb, 0x36, 0x95, 0x56, 0xd7, 0xc6, 0x53, 0x7b, 0xc3, 0x3f, 0x86, 0xe5, 0x08, 0x21, 0x54, - 0xf3, 0x0a, 0xe4, 0x6d, 0xbd, 0x6b, 0x36, 0x2d, 0x8c, 0x35, 0xd7, 0x00, 0x21, 0xe7, 0x10, 0x1a, - 0x18, 0x6b, 0xfc, 0xbf, 0xa0, 0xd8, 0xb8, 0xaa, 0x7a, 0xf4, 0x3b, 0xbf, 0x86, 0xf1, 0x68, 0x1d, - 0x6a, 0x5f, 0x81, 0xe5, 0x46, 0x9c, 0xdd, 0x7c, 0x0d, 0x16, 0xa9, 0x53, 0x56, 0x4d, 0xf3, 0xbd, - 0xa5, 0xe9, 0x7b, 0x07, 0x5f, 0x1d, 0x8c, 0xa1, 0x9e, 0x28, 0x1a, 0x9b, 0xfb, 0x90, 0x76, 0x1a, - 0x85, 0x57, 0x27, 0x6f, 0x8c, 0xd4, 0x49, 0x6f, 0x5d, 0x10, 0x5c, 0x1e, 0xfe, 0x00, 0xf2, 0xb5, - 0xea, 0xfe, 0x9e, 0xae, 0x1d, 0x2b, 0x32, 0x5a, 0x83, 0x9c, 0x22, 0x61, 0x5f, 0x8d, 0xde, 0x9d, - 0xed, 0x9f, 0x97, 0xb2, 0xb5, 0xea, 0x3e, 0xa9, 0xfc, 0x59, 0x45, 0xc2, 0xa4, 0xa3, 0x20, 0x48, - 0x19, 0xa2, 0x7d, 0x42, 0x7b, 0x38, 0xf9, 0xcd, 0xff, 0x13, 0x96, 0x2a, 0x92, 0x44, 0x2c, 0xa4, - 0xe2, 0xae, 0x30, 0xd0, 0x95, 0x21, 0xd3, 0x26, 0x32, 0x68, 0xe4, 0x97, 0x46, 0x7c, 0x18, 0x6a, - 0xa0, 0x5c, 0x7c, 0x0d, 0x6e, 0x86, 0x94, 0xd3, 0x68, 0x0c, 0x45, 0x31, 0x13, 0x89, 0x3a, 0x83, - 0x65, 0xb7, 0xf8, 0xff, 0x4c, 0xae, 0xf8, 0x63, 0x9a, 0x88, 0x8f, 0x29, 0x7f, 0x0b, 0xd8, 0x28, - 0xbd, 0x14, 0x37, 0x36, 0xa9, 0x39, 0xfe, 0x23, 0xeb, 0x17, 0xb0, 0xe9, 0x4f, 0xe4, 0x1d, 0x07, - 0xb4, 0xd2, 0xb8, 0xfe, 0x06, 0xb2, 0x6e, 0xc4, 0x3c, 0x9c, 0xc5, 0x05, 0xd6, 0x63, 0xe3, 0x5f, - 0x7a, 0xb3, 0x53, 0x4d, 0x3b, 0x53, 0x6c, 0xfc, 0x4a, 0x3f, 0xc5, 0xda, 0x15, 0xf0, 0xbf, 0x0d, - 0xb3, 0x3e, 0x41, 0xe8, 0x0e, 0x5c, 0xb7, 0x14, 0x59, 0xc3, 0x52, 0xb3, 0xad, 0x8a, 0x4a, 0xc7, - 0xa2, 0x43, 0xc6, 0x35, 0x97, 0xb8, 0x47, 0x68, 0xbc, 0x04, 0xcb, 0xaf, 0xb1, 0xa9, 0x1c, 0xf7, - 0x46, 0x4c, 0xa0, 0x1e, 0x2d, 0x42, 0xfa, 0x4c, 0x54, 0xa9, 0x09, 0x39, 0xc1, 0xfd, 0xb8, 0xc4, - 0xb6, 0xbc, 0xfd, 0x65, 0x16, 0xe6, 0x0e, 0xdd, 0x2d, 0xb6, 0xe1, 0xc6, 0x03, 0xed, 0x00, 0x0c, - 0x37, 0x1d, 0xc4, 0x45, 0x8c, 0xe1, 0xbe, 0xa1, 0x82, 0x0d, 0xea, 0x40, 0x0f, 0x21, 0x4b, 0xdf, - 0x3a, 0x0a, 0x9e, 0xb1, 0xd1, 0xef, 0x1b, 0xbd, 0x20, 0x13, 0x95, 0x6f, 0x4b, 0x45, 0xfc, 0x08, - 0x63, 0xe4, 0x0a, 0x1b, 0x27, 0xec, 0xaf, 0x83, 0x96, 0x17, 0xdc, 0x61, 0xd1, 0xfd, 0x68, 0xa9, - 0x91, 0x9b, 0x6e, 0x9c, 0xf8, 0xa6, 0x6f, 0xa0, 0xa5, 0x53, 0x35, 0xba, 0x3b, 0xc9, 0xaa, 0xc2, - 0xde, 0x1b, 0xc3, 0x45, 0x53, 0xbb, 0x07, 0x30, 0x6c, 0x63, 0x81, 0xf0, 0x87, 0x66, 0xba, 0x38, - 0x2b, 0xdf, 0x90, 0x89, 0xd4, 0xdf, 0x08, 0xd1, 0x9d, 0x28, 0xe7, 0x03, 0xfd, 0x9b, 0xbd, 0x7b, - 0x31, 0x13, 0x35, 0x11, 0x03, 0x0a, 0x77, 0x5a, 0xb4, 0x16, 0x63, 0x6a, 0x50, 0xc7, 0xfa, 0x58, - 0x3e, 0xaa, 0xa6, 0x05, 0x0b, 0xa1, 0xae, 0x8a, 0xee, 0x45, 0x59, 0x18, 0xea, 0x9d, 0xec, 0xda, - 0x38, 0xb6, 0xa1, 0x8e, 0xc6, 0x18, 0x1d, 0x8d, 0xc9, 0x74, 0xc4, 0x36, 0x52, 0xf4, 0x12, 0x60, - 0x38, 0xa3, 0x07, 0x32, 0x1a, 0x1a, 0xfd, 0xd9, 0x52, 0xec, 0xb9, 0x2b, 0x6e, 0xfb, 0x5d, 0x0e, - 0xa0, 0x6e, 0xca, 0xde, 0x73, 0xdd, 0x82, 0x8c, 0x5b, 0xf8, 0xc2, 0xcf, 0x2d, 0x72, 0xed, 0x40, - 0x7f, 0x84, 0x6b, 0xfe, 0x25, 0x09, 0xad, 0x06, 0x43, 0x15, 0xdc, 0x9f, 0x62, 0xe4, 0x3c, 0xf7, - 0xf6, 0x20, 0x6f, 0x83, 0x0a, 0xbf, 0xda, 0xf0, 0x7a, 0x15, 0x23, 0xeb, 0x19, 0xe4, 0x07, 0x33, - 0x3b, 0xba, 0x1d, 0x01, 0x90, 0xe1, 0xfc, 0x11, 0x23, 0xe1, 0x09, 0xe4, 0x07, 0x4f, 0x2a, 0x20, - 0x21, 0xb8, 0x80, 0x86, 0x6b, 0x56, 0x95, 0xd4, 0x2c, 0x67, 0x81, 0x43, 0x2b, 0x11, 0x3e, 0x0c, - 0x32, 0x7e, 0x2b, 0xfa, 0x90, 0xe6, 0xf9, 0x35, 0x5c, 0x1f, 0x99, 0x72, 0xd0, 0xaf, 0xa3, 0x40, - 0x38, 0x32, 0x4c, 0xb1, 0xfc, 0x45, 0x2c, 0x54, 0xee, 0x1b, 0x98, 0x0f, 0x4c, 0x0c, 0x81, 0xc7, - 0x1c, 0x3d, 0xcc, 0x04, 0x1e, 0x73, 0xdc, 0xd0, 0x81, 0xbd, 0x0d, 0x72, 0x44, 0xc1, 0x5a, 0x04, - 0x0a, 0xa3, 0x74, 0xac, 0x8f, 0xe5, 0xa3, 0x6a, 0x9a, 0x50, 0x08, 0xf6, 0x67, 0x74, 0x37, 0x22, - 0x9c, 0xa1, 0xa1, 0x81, 0xbd, 0x37, 0x86, 0x8b, 0x2a, 0x78, 0xe5, 0xfd, 0x03, 0x9d, 0xbf, 0xd3, - 0x46, 0xd5, 0xdc, 0x70, 0x4b, 0x67, 0x8b, 0xa3, 0xf3, 0x80, 0x4f, 0xc0, 0x33, 0xb8, 0x21, 0xe0, - 0x33, 0xfd, 0x14, 0x57, 0x54, 0xd5, 0x47, 0xb7, 0xc2, 0x8f, 0x6d, 0x29, 0x34, 0x71, 0xef, 0x77, - 0x0c, 0xbb, 0x87, 0x8e, 0x60, 0x21, 0xd4, 0xc7, 0x51, 0xac, 0xc2, 0x40, 0x51, 0x89, 0x9d, 0x00, - 0x76, 0xff, 0xf0, 0xfe, 0x23, 0x37, 0xf3, 0xe1, 0x23, 0x37, 0xf3, 0xf9, 0x23, 0xc7, 0xfc, 0xbb, - 0xcf, 0x31, 0x5f, 0xf4, 0x39, 0xe6, 0x9b, 0x3e, 0xc7, 0xbc, 0xef, 0x73, 0xcc, 0x77, 0x7d, 0x8e, - 0xf9, 0xbe, 0xcf, 0xcd, 0x7c, 0xee, 0x73, 0xcc, 0x7f, 0x3f, 0x71, 0x33, 0xef, 0x3f, 0x71, 0x33, - 0x1f, 0x3e, 0x71, 0x33, 0x7f, 0xc9, 0x0f, 0xfe, 0xe3, 0xa0, 0x95, 0x21, 0x76, 0xfe, 0xf6, 0xa7, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x1a, 0x37, 0x6c, 0x19, 0x5e, 0x18, 0x00, 0x00, + // 1727 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xbb, 0x6f, 0xdb, 0xd6, + 0x1a, 0x37, 0xa9, 0xf7, 0xe7, 0xc4, 0x96, 0xcf, 0x75, 0x1c, 0x99, 0x4e, 0x28, 0x5f, 0x26, 0xf1, + 0x03, 0xc1, 0x95, 0x6f, 0x7c, 0x03, 0xdc, 0xe0, 0x26, 0xc6, 0x8d, 0x6c, 0xb9, 0x86, 0x92, 0xa6, + 0x32, 0xa8, 0x38, 0x43, 0x91, 0x56, 0xa0, 0xcd, 0x63, 0x86, 0x30, 0x4d, 0xb2, 0x24, 0xe5, 0x46, + 0x68, 0x87, 0x02, 0x99, 0xba, 0x75, 0xeb, 0x1f, 0xd0, 0xa5, 0x63, 0xb7, 0xce, 0xdd, 0xda, 0x2d, + 0x63, 0x26, 0xa3, 0x51, 0x96, 0x8e, 0x01, 0x3a, 0x75, 0x2b, 0x78, 0x78, 0x28, 0x51, 0x7c, 0x58, + 0x92, 0x5d, 0x74, 0xb2, 0xf8, 0x9d, 0xef, 0x7c, 0xcf, 0xdf, 0xf9, 0x1e, 0x09, 0xac, 0xda, 0xd6, + 0xc1, 0xda, 0x81, 0x66, 0xb4, 0xe5, 0x35, 0xd3, 0x32, 0x0e, 0x55, 0x0d, 0xfb, 0x7f, 0xcd, 0xfd, + 0x35, 0x1b, 0x5b, 0x27, 0xea, 0x01, 0xae, 0x98, 0x96, 0xe1, 0x18, 0x68, 0xd2, 0x7c, 0x59, 0xa1, + 0x14, 0x9b, 0x9b, 0x55, 0x0c, 0xc5, 0x20, 0xf4, 0x35, 0xf7, 0x97, 0xc7, 0xc2, 0x2d, 0x28, 0x86, + 0xa1, 0x78, 0x22, 0x1c, 0x63, 0xbf, 0x7d, 0xb8, 0x86, 0x8f, 0x4d, 0xa7, 0x43, 0x0f, 0xf9, 0xf0, + 0xe1, 0xe7, 0x96, 0x64, 0x9a, 0xd8, 0xb2, 0xe9, 0x79, 0xd9, 0x35, 0x45, 0x32, 0x55, 0x8f, 0x61, + 0xad, 0xdd, 0x56, 0x65, 0x73, 0x9f, 0xfc, 0xf1, 0x18, 0x84, 0xdf, 0x59, 0xc8, 0xef, 0xd9, 0xd8, + 0xaa, 0xeb, 0x87, 0x06, 0x5a, 0x06, 0x56, 0x95, 0x4b, 0xcc, 0x22, 0xb3, 0x32, 0xb9, 0x3e, 0x5d, + 0x31, 0x5f, 0x56, 0x3c, 0xfe, 0xca, 0xde, 0x5e, 0xbd, 0xb6, 0x99, 0xed, 0x9e, 0x96, 0xd9, 0x7a, + 0x4d, 0x64, 0x55, 0x19, 0xdd, 0x81, 0xac, 0x61, 0x29, 0x2d, 0x55, 0x2e, 0xb1, 0xf1, 0xcc, 0x85, + 0xee, 0x69, 0x39, 0xd3, 0xb0, 0x94, 0x7a, 0x4d, 0xcc, 0x18, 0x96, 0x52, 0x97, 0xd1, 0x75, 0x80, + 0x43, 0xd5, 0xb2, 0x9d, 0x96, 0x2e, 0x1d, 0xe3, 0x52, 0x7a, 0x91, 0x59, 0x29, 0x88, 0x05, 0x42, + 0xf9, 0x48, 0x3a, 0xc6, 0x68, 0x01, 0x0a, 0x9a, 0xe4, 0x9f, 0x66, 0xc8, 0x69, 0xde, 0x25, 0x90, + 0xc3, 0x59, 0xc8, 0xe0, 0x63, 0x49, 0xd5, 0x4a, 0x59, 0x72, 0xe0, 0x7d, 0xa0, 0x65, 0x98, 0xa6, + 0x61, 0x6d, 0x99, 0xea, 0x81, 0xd3, 0xb6, 0x70, 0x29, 0x47, 0xce, 0xa7, 0x28, 0x79, 0xd7, 0xa3, + 0xa2, 0x32, 0x4c, 0xaa, 0x76, 0x4b, 0x32, 0x4d, 0xcb, 0x38, 0xc1, 0x72, 0x29, 0xbf, 0xc8, 0xac, + 0xe4, 0x45, 0x50, 0xed, 0x2a, 0xa5, 0xa0, 0xdb, 0x30, 0xa3, 0xca, 0x58, 0x77, 0x54, 0xa7, 0xd3, + 0x72, 0x49, 0xaa, 0x8c, 0xad, 0x52, 0x81, 0xc8, 0x2a, 0xfa, 0x07, 0xbb, 0x94, 0x8e, 0x1e, 0x40, + 0x51, 0x6a, 0x3b, 0x2f, 0x7a, 0x8c, 0x6e, 0x14, 0xc0, 0xe5, 0xdd, 0x44, 0xdd, 0xd3, 0xf2, 0x54, + 0xb5, 0xed, 0xbc, 0xf0, 0x79, 0xeb, 0x35, 0x71, 0x4a, 0x0a, 0x7e, 0xcb, 0x8f, 0xd2, 0xf9, 0x54, + 0x31, 0x2d, 0xfc, 0x0b, 0xae, 0xec, 0x60, 0xc7, 0x8d, 0xfb, 0x66, 0x67, 0xdb, 0x75, 0x46, 0xc4, + 0x9f, 0xb5, 0xb1, 0xed, 0xf4, 0x3d, 0x65, 0x02, 0x9e, 0x0a, 0x9f, 0x02, 0xdf, 0x63, 0x0f, 0xc9, + 0xa7, 0xf7, 0xe2, 0x8c, 0x62, 0x46, 0x35, 0x4a, 0xf8, 0x91, 0x81, 0x9c, 0x9b, 0xac, 0xb1, 0x30, + 0x30, 0x0f, 0x79, 0x17, 0x03, 0x24, 0x61, 0x2c, 0xb1, 0x36, 0x67, 0x58, 0x0a, 0xc9, 0xd7, 0x06, + 0x4c, 0xca, 0xc6, 0xb1, 0xa4, 0xea, 0xde, 0x69, 0x8a, 0x08, 0xbb, 0x56, 0xf1, 0xb0, 0x5a, 0xf1, + 0xb1, 0x5a, 0x69, 0x3a, 0x96, 0xaa, 0x2b, 0xcf, 0x24, 0xad, 0x8d, 0x45, 0xf0, 0x2e, 0x90, 0xeb, + 0xab, 0x50, 0xc4, 0xba, 0xb4, 0xaf, 0x61, 0x9a, 0x33, 0x49, 0xb3, 0x09, 0x60, 0xf2, 0xe2, 0xb4, + 0x47, 0xaf, 0xfa, 0x64, 0xe1, 0x6b, 0x16, 0x66, 0xb6, 0x2c, 0x2c, 0x39, 0xd8, 0x8d, 0x8e, 0x1f, + 0x8d, 0x3e, 0x3c, 0x99, 0xf3, 0xc1, 0x33, 0x75, 0x26, 0x3c, 0xd3, 0x49, 0xf0, 0xcc, 0x04, 0xe1, + 0x19, 0x0b, 0xaa, 0xec, 0x18, 0xa0, 0xca, 0x8d, 0x01, 0x2a, 0xb6, 0x98, 0x12, 0xbe, 0x4b, 0xc1, + 0x55, 0x2f, 0x16, 0x0d, 0x4b, 0xa9, 0xea, 0x72, 0x30, 0x22, 0xff, 0x83, 0x94, 0x61, 0x29, 0x34, + 0x1c, 0x2b, 0x95, 0x40, 0xd5, 0xa9, 0x24, 0x5c, 0xa9, 0x34, 0x2c, 0x45, 0x74, 0x2f, 0xa1, 0x0d, + 0x48, 0xb7, 0x6d, 0x6c, 0xd1, 0xa7, 0xbe, 0x3a, 0xd2, 0x65, 0xf2, 0x9b, 0x5c, 0xe3, 0xaa, 0x90, + 0x6a, 0x58, 0xca, 0x00, 0x5c, 0x98, 0x41, 0xb8, 0x94, 0x07, 0xe1, 0xe2, 0x81, 0x29, 0x00, 0x08, + 0xee, 0x17, 0x06, 0xd2, 0xae, 0xc4, 0x50, 0x96, 0xd8, 0x33, 0xb3, 0x94, 0x4a, 0xca, 0x52, 0x7a, + 0x68, 0x96, 0x32, 0x63, 0x64, 0x29, 0x3b, 0x46, 0x96, 0x98, 0x22, 0x2b, 0xbc, 0x62, 0xa0, 0x14, + 0x8d, 0x9a, 0x6d, 0x1a, 0xba, 0x8d, 0xcf, 0x03, 0xdc, 0xbb, 0x90, 0x73, 0xc3, 0x7c, 0x46, 0x2d, + 0x86, 0xee, 0x69, 0x39, 0x4b, 0x6a, 0x7c, 0x4d, 0xcc, 0xba, 0xbc, 0x75, 0x59, 0xd0, 0xa0, 0xd8, + 0x33, 0xc2, 0xc7, 0xc8, 0x19, 0x19, 0xda, 0x88, 0x66, 0x68, 0x8c, 0x07, 0x2d, 0xac, 0xc2, 0x3f, + 0x76, 0xb0, 0xd3, 0xb0, 0x94, 0xcd, 0x8e, 0xfb, 0xed, 0x2b, 0x44, 0x90, 0x0e, 0x28, 0x23, 0xbf, + 0x85, 0x7b, 0xa4, 0x32, 0x12, 0xd6, 0x1a, 0x11, 0xe0, 0x33, 0x87, 0x40, 0xc2, 0x84, 0x41, 0x22, + 0x14, 0x61, 0xca, 0xbb, 0x69, 0xd3, 0x2b, 0xc2, 0x7d, 0x98, 0xee, 0x51, 0x68, 0x80, 0x57, 0x20, + 0x6d, 0x58, 0x8a, 0x5d, 0x62, 0x16, 0x53, 0x2b, 0x93, 0xeb, 0xb3, 0x03, 0x58, 0xa6, 0x15, 0x50, + 0x24, 0x1c, 0xc2, 0x03, 0x98, 0xa9, 0x61, 0x0d, 0x0f, 0x16, 0x96, 0x51, 0x8b, 0xa3, 0x30, 0x0b, + 0x28, 0x78, 0xdb, 0xd3, 0x2e, 0xfc, 0xc1, 0xc0, 0xcc, 0x9e, 0x29, 0x4b, 0xe7, 0x13, 0x8a, 0xb6, + 0x61, 0x5a, 0x56, 0x6d, 0x53, 0x93, 0x3a, 0xbd, 0x86, 0x37, 0x4a, 0x69, 0x9d, 0xa2, 0x97, 0xfc, + 0x76, 0x78, 0x7f, 0xb0, 0x1d, 0xa6, 0x89, 0x08, 0x2e, 0x22, 0x62, 0xd3, 0x30, 0x34, 0x9a, 0xca, + 0x40, 0xab, 0xec, 0x23, 0x34, 0x33, 0x22, 0x42, 0x69, 0x75, 0xfa, 0x89, 0x81, 0xa2, 0xe7, 0x7b, + 0x00, 0x72, 0x63, 0xb8, 0x1e, 0x6d, 0x09, 0xec, 0x50, 0xc3, 0xc3, 0xed, 0xe2, 0x82, 0x8d, 0x49, + 0xd8, 0x81, 0x39, 0xda, 0x87, 0x9b, 0xd8, 0x71, 0x54, 0xbd, 0x07, 0xb5, 0x91, 0x1d, 0xa1, 0xc1, + 0xd8, 0x85, 0xab, 0x11, 0x41, 0x14, 0xa1, 0xab, 0x50, 0x94, 0x74, 0x49, 0xeb, 0x38, 0xea, 0x81, + 0xdd, 0x32, 0x4c, 0xc7, 0x68, 0x3b, 0xc4, 0xce, 0xbc, 0x38, 0xdd, 0xa3, 0x37, 0x08, 0xd9, 0x2b, + 0x28, 0x54, 0xe2, 0xb7, 0x0c, 0xcc, 0xf7, 0xa1, 0x75, 0x5e, 0xf3, 0xdc, 0x38, 0x47, 0xb4, 0x0f, + 0x07, 0x48, 0x8c, 0x65, 0x6c, 0x31, 0x45, 0x67, 0x9d, 0xbb, 0xc0, 0xc5, 0x19, 0x46, 0xdd, 0x9d, + 0x03, 0xd6, 0x38, 0x22, 0x96, 0xe5, 0x3d, 0x43, 0x1a, 0x8f, 0x45, 0xd6, 0x38, 0x12, 0xb6, 0xa0, + 0x44, 0x23, 0x54, 0x75, 0x1c, 0x4b, 0xdd, 0x6f, 0x3b, 0x78, 0x6c, 0x6f, 0x84, 0x7b, 0x30, 0x1f, + 0x23, 0x84, 0x6a, 0x5e, 0x80, 0x82, 0x63, 0xb4, 0xad, 0x96, 0x8d, 0xb1, 0xee, 0x19, 0x20, 0xe6, + 0x5d, 0x42, 0x13, 0x63, 0x5d, 0xf8, 0x12, 0x4a, 0xcd, 0x8b, 0xaa, 0x47, 0xff, 0x0d, 0x6a, 0x18, + 0x8e, 0xd6, 0xbe, 0xf6, 0x05, 0x98, 0x6f, 0x26, 0xd9, 0x2d, 0xd4, 0x61, 0x96, 0x3a, 0x65, 0xd7, + 0xf5, 0xc0, 0x5b, 0x1a, 0xbf, 0x77, 0x08, 0xb5, 0xde, 0x18, 0xea, 0x8b, 0xa2, 0xb1, 0xb9, 0x0d, + 0x19, 0xb7, 0x51, 0xf8, 0x75, 0xf2, 0xca, 0x40, 0x9d, 0xf4, 0xd7, 0x05, 0xd1, 0xe3, 0x11, 0x76, + 0xa0, 0x50, 0xaf, 0x6d, 0x6f, 0x19, 0xfa, 0xa1, 0xaa, 0xa0, 0x25, 0xc8, 0xab, 0x32, 0x0e, 0xd4, + 0xe8, 0xcd, 0xc9, 0xee, 0x69, 0x39, 0x57, 0xaf, 0x6d, 0x93, 0xca, 0x9f, 0x53, 0x65, 0x4c, 0x3a, + 0x0a, 0x82, 0xb4, 0x29, 0x39, 0x2f, 0x68, 0x0f, 0x27, 0xbf, 0x85, 0x2f, 0x60, 0xae, 0x2a, 0xcb, + 0xc4, 0x42, 0x2a, 0xee, 0x02, 0x03, 0x5d, 0x05, 0xb2, 0x07, 0x44, 0x06, 0x8d, 0xfc, 0xdc, 0x80, + 0x0f, 0x7d, 0x0d, 0x94, 0x4b, 0xa8, 0xc3, 0xd5, 0x88, 0x72, 0x1a, 0x8d, 0xbe, 0x28, 0x66, 0x24, + 0x51, 0x27, 0x30, 0xef, 0x15, 0xff, 0xbf, 0xc8, 0x95, 0x60, 0x4c, 0xd9, 0xe4, 0x98, 0x0a, 0xd7, + 0x80, 0x8b, 0xd3, 0x4b, 0x71, 0xe3, 0x90, 0x9a, 0x13, 0x3c, 0xb2, 0xff, 0x06, 0x9b, 0x3e, 0x24, + 0xef, 0x38, 0xa4, 0x95, 0xc6, 0xf5, 0xdf, 0x90, 0xf3, 0x22, 0xe6, 0xe3, 0x2c, 0x29, 0xb0, 0x3e, + 0x9b, 0xf0, 0xc4, 0x9f, 0x9d, 0xea, 0xfa, 0x89, 0xea, 0xe0, 0xa7, 0xc6, 0x11, 0xd6, 0x2f, 0x80, + 0xff, 0x75, 0x98, 0x0c, 0x08, 0x42, 0x37, 0xe0, 0xb2, 0xad, 0x2a, 0x3a, 0x96, 0x5b, 0x07, 0x9a, + 0xa4, 0x1e, 0xdb, 0x74, 0xc8, 0xb8, 0xe4, 0x11, 0xb7, 0x08, 0x4d, 0x90, 0x61, 0xfe, 0x19, 0xb6, + 0xd4, 0xc3, 0xce, 0x80, 0x09, 0xd4, 0xa3, 0x59, 0xc8, 0x9c, 0x48, 0x1a, 0x35, 0x21, 0x2f, 0x7a, + 0x1f, 0xe7, 0xd8, 0x96, 0xd7, 0x7f, 0xc8, 0xc1, 0xd4, 0xae, 0xb7, 0xc5, 0x36, 0xbd, 0x78, 0xa0, + 0x0d, 0x80, 0xfe, 0xa6, 0x83, 0xf8, 0x98, 0x31, 0x3c, 0x30, 0x54, 0x70, 0x61, 0x1d, 0xe8, 0x0e, + 0xe4, 0xe8, 0x5b, 0x47, 0xe1, 0x33, 0x2e, 0xfe, 0x7d, 0xa3, 0xc7, 0x64, 0xa2, 0x0a, 0x6c, 0xa9, + 0x48, 0x18, 0x60, 0x8c, 0x5d, 0x61, 0x93, 0x84, 0x7d, 0xd2, 0x6b, 0x79, 0xe1, 0x1d, 0x16, 0xdd, + 0x8e, 0x97, 0x1a, 0xbb, 0xe9, 0x26, 0x89, 0x6f, 0x05, 0x06, 0x5a, 0x3a, 0x55, 0xa3, 0x9b, 0xa3, + 0xac, 0x2a, 0xdc, 0xad, 0x21, 0x5c, 0x34, 0xb5, 0x5b, 0x00, 0xfd, 0x36, 0x16, 0x0a, 0x7f, 0x64, + 0xa6, 0x4b, 0xb2, 0xf2, 0x39, 0x99, 0x48, 0x83, 0x8d, 0x10, 0xdd, 0x88, 0x73, 0x3e, 0xd4, 0xbf, + 0xb9, 0x9b, 0x67, 0x33, 0x51, 0x13, 0x31, 0xa0, 0x68, 0xa7, 0x45, 0x4b, 0x09, 0xa6, 0x86, 0x75, + 0x2c, 0x0f, 0xe5, 0xa3, 0x6a, 0xf6, 0x61, 0x26, 0xd2, 0x55, 0xd1, 0xad, 0x38, 0x0b, 0x23, 0xbd, + 0x93, 0x5b, 0x1a, 0xc6, 0xd6, 0xd7, 0xd1, 0x1c, 0xa2, 0xa3, 0x39, 0x9a, 0x8e, 0xc4, 0x46, 0x8a, + 0x9e, 0x00, 0xf4, 0x67, 0xf4, 0x50, 0x46, 0x23, 0xa3, 0x3f, 0x57, 0x4e, 0x3c, 0xf7, 0xc4, 0xad, + 0xbf, 0xca, 0x03, 0x34, 0x2c, 0xc5, 0x7f, 0xae, 0x6b, 0x90, 0xf5, 0x0a, 0x5f, 0xf4, 0xb9, 0xc5, + 0xae, 0x1d, 0xe8, 0x03, 0xb8, 0x14, 0x5c, 0x92, 0xd0, 0x62, 0x38, 0x54, 0xe1, 0xfd, 0x29, 0x41, + 0xce, 0x23, 0x7f, 0x0f, 0xf2, 0x37, 0xa8, 0xe8, 0xab, 0x8d, 0xae, 0x57, 0x09, 0xb2, 0x1e, 0x42, + 0xa1, 0x37, 0xb3, 0xa3, 0xeb, 0x31, 0x00, 0xe9, 0xcf, 0x1f, 0x09, 0x12, 0xee, 0x43, 0xa1, 0xf7, + 0xa4, 0x42, 0x12, 0xc2, 0x0b, 0x68, 0xb4, 0x66, 0xd5, 0x48, 0xcd, 0x72, 0x17, 0x38, 0xb4, 0x10, + 0xe3, 0x43, 0x2f, 0xe3, 0xd7, 0xe2, 0x0f, 0x69, 0x9e, 0x9f, 0xc1, 0xe5, 0x81, 0x29, 0x07, 0xfd, + 0x33, 0x0e, 0x84, 0x03, 0xc3, 0x14, 0x27, 0x9c, 0xc5, 0x42, 0xe5, 0x3e, 0x87, 0xe9, 0xd0, 0xc4, + 0x10, 0x7a, 0xcc, 0xf1, 0xc3, 0x4c, 0xe8, 0x31, 0x27, 0x0d, 0x1d, 0xd8, 0xdf, 0x20, 0x07, 0x14, + 0x2c, 0xc5, 0xa0, 0x30, 0x4e, 0xc7, 0xf2, 0x50, 0x3e, 0xaa, 0xa6, 0x05, 0xc5, 0x70, 0x7f, 0x46, + 0x37, 0x63, 0xc2, 0x19, 0x19, 0x1a, 0xb8, 0x5b, 0x43, 0xb8, 0xa8, 0x82, 0xa7, 0xfe, 0x3f, 0xd0, + 0x05, 0x3b, 0x6d, 0x5c, 0xcd, 0x8d, 0xb6, 0x74, 0xae, 0x34, 0x38, 0x0f, 0x04, 0x04, 0x3c, 0x84, + 0x2b, 0x22, 0x3e, 0x31, 0x8e, 0x70, 0x55, 0xd3, 0x02, 0x74, 0x3b, 0xfa, 0xd8, 0xe6, 0x22, 0x13, + 0xf7, 0xf6, 0xb1, 0xe9, 0x74, 0xd0, 0x1e, 0xcc, 0x44, 0xfa, 0x38, 0x4a, 0x54, 0x18, 0x2a, 0x2a, + 0x89, 0x13, 0xc0, 0xe6, 0xff, 0x5f, 0xbf, 0xe5, 0x27, 0xde, 0xbc, 0xe5, 0x27, 0xde, 0xbf, 0xe5, + 0x99, 0xaf, 0xba, 0x3c, 0xf3, 0x7d, 0x97, 0x67, 0x7e, 0xee, 0xf2, 0xcc, 0xeb, 0x2e, 0xcf, 0xfc, + 0xda, 0xe5, 0x99, 0xdf, 0xba, 0xfc, 0xc4, 0xfb, 0x2e, 0xcf, 0x7c, 0xf3, 0x8e, 0x9f, 0x78, 0xfd, + 0x8e, 0x9f, 0x78, 0xf3, 0x8e, 0x9f, 0xf8, 0xb8, 0xd0, 0xfb, 0xff, 0x81, 0xfd, 0x2c, 0xb1, 0xf3, + 0x3f, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x3e, 0xc6, 0x5a, 0xcc, 0x45, 0x18, 0x00, 0x00, } func (this *UserInfo) Equal(that interface{}) bool { diff --git a/src/cloud/profile/profilepb/service.proto b/src/cloud/profile/profilepb/service.proto index b68071cb71c..e288eeca12a 100644 --- a/src/cloud/profile/profilepb/service.proto +++ b/src/cloud/profile/profilepb/service.proto @@ -22,7 +22,7 @@ package px.services; option go_package = "profilepb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/wrappers.proto"; import "src/api/proto/uuidpb/uuid.proto"; diff --git a/src/cloud/project_manager/controllers/server.go b/src/cloud/project_manager/controllers/server.go index 20c8c7e953c..125d2bbc04a 100644 --- a/src/cloud/project_manager/controllers/server.go +++ b/src/cloud/project_manager/controllers/server.go @@ -131,7 +131,6 @@ func (s *Server) GetProjectForOrg(ctx context.Context, req *uuidpb.UUID) (*proje } projectInfo, err := s.datastore.GetProjectForOrg(parsedOrgID) - if err != nil { return nil, status.Error(codes.Internal, err.Error()) } diff --git a/src/cloud/project_manager/controllers/server_test.go b/src/cloud/project_manager/controllers/server_test.go index 5a4ceb6a204..000632e7ba2 100644 --- a/src/cloud/project_manager/controllers/server_test.go +++ b/src/cloud/project_manager/controllers/server_test.go @@ -35,8 +35,7 @@ import ( "px.dev/pixie/src/utils" ) -type fakeDatastore struct { -} +type fakeDatastore struct{} func (d *fakeDatastore) RegisterProject(orgID uuid.UUID, projectName string) error { return nil diff --git a/src/cloud/project_manager/datastore/datastore_test.go b/src/cloud/project_manager/datastore/datastore_test.go index c7ac9c9fb4b..5272dd8d396 100644 --- a/src/cloud/project_manager/datastore/datastore_test.go +++ b/src/cloud/project_manager/datastore/datastore_test.go @@ -24,8 +24,8 @@ import ( "testing" "github.com/gofrs/uuid" - _ "github.com/golang-migrate/migrate/source/go_bindata" - bindata "github.com/golang-migrate/migrate/source/go_bindata" + _ "github.com/golang-migrate/migrate/source/go_bindata" //nolint:staticcheck + bindata "github.com/golang-migrate/migrate/source/go_bindata" //nolint:staticcheck _ "github.com/jackc/pgx/stdlib" "github.com/jmoiron/sqlx" "github.com/stretchr/testify/assert" @@ -36,8 +36,10 @@ import ( "px.dev/pixie/src/shared/services/pgtest" ) -var testOrgID1 = uuid.FromStringOrNil("123e4567-e89b-12d3-a456-426655440000") -var testOrgID2 = uuid.FromStringOrNil("223e4567-e89b-12d3-a456-426655440000") +var ( + testOrgID1 = uuid.FromStringOrNil("123e4567-e89b-12d3-a456-426655440000") + testOrgID2 = uuid.FromStringOrNil("223e4567-e89b-12d3-a456-426655440000") +) func mustLoadTestData(db *sqlx.DB) { db.MustExec(`DELETE from projects`) diff --git a/src/cloud/project_manager/projectmanagerpb/BUILD.bazel b/src/cloud/project_manager/projectmanagerpb/BUILD.bazel index 0135b6476d7..33c9e4273b3 100644 --- a/src/cloud/project_manager/projectmanagerpb/BUILD.bazel +++ b/src/cloud/project_manager/projectmanagerpb/BUILD.bazel @@ -22,7 +22,7 @@ pl_proto_library( visibility = ["//src/cloud:__subpackages__"], deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/cloud/project_manager/projectmanagerpb/service.pb.go b/src/cloud/project_manager/projectmanagerpb/service.pb.go index 71a83951fbf..92925e73652 100755 --- a/src/cloud/project_manager/projectmanagerpb/service.pb.go +++ b/src/cloud/project_manager/projectmanagerpb/service.pb.go @@ -334,37 +334,36 @@ func init() { } var fileDescriptor_2c9d981df0c32c1d = []byte{ - // 470 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0x31, 0x6f, 0xd4, 0x30, - 0x14, 0xc7, 0xe3, 0x4a, 0xad, 0x38, 0x07, 0xa9, 0xc5, 0x12, 0xf4, 0x88, 0x90, 0x5b, 0x0e, 0x04, - 0x5d, 0xea, 0x88, 0xb2, 0x20, 0x24, 0x06, 0x4e, 0x55, 0x21, 0x03, 0x14, 0x05, 0x75, 0x41, 0x48, - 0x95, 0x93, 0xb8, 0x26, 0xe8, 0x12, 0xbb, 0x76, 0x52, 0x95, 0x8d, 0x8f, 0xc0, 0xc7, 0xe0, 0xa3, - 0x30, 0xde, 0xd8, 0x09, 0x71, 0xbe, 0x85, 0x8d, 0x7e, 0x04, 0xd4, 0xd8, 0x51, 0xef, 0xae, 0x3d, - 0x98, 0x6e, 0x4a, 0xde, 0xcb, 0xdf, 0xff, 0xdf, 0xcb, 0xcb, 0x7b, 0x81, 0xcf, 0xb4, 0x4a, 0xc3, - 0x74, 0x20, 0xea, 0x2c, 0x94, 0x4a, 0x7c, 0x66, 0x69, 0x75, 0x58, 0xd0, 0x92, 0x72, 0xa6, 0xda, - 0xd8, 0x85, 0x32, 0x09, 0x35, 0x53, 0x27, 0x79, 0xca, 0x88, 0x54, 0xa2, 0x12, 0xc8, 0x97, 0xa7, - 0xc4, 0x65, 0x74, 0xb0, 0xcd, 0xf3, 0xea, 0x53, 0x9d, 0x90, 0x54, 0x14, 0x21, 0x17, 0x5c, 0x84, - 0x8d, 0x26, 0xa9, 0x8f, 0x9a, 0xa8, 0x09, 0x9a, 0x3b, 0x7b, 0x36, 0xd8, 0xb8, 0xa0, 0x52, 0x99, - 0x5b, 0x59, 0x58, 0xd7, 0x79, 0x26, 0x93, 0xe6, 0x62, 0x05, 0xbd, 0x14, 0xfa, 0xef, 0x2c, 0x3e, - 0x2a, 0x8f, 0x04, 0xba, 0x0f, 0x6f, 0xb6, 0xd5, 0x95, 0xb4, 0x60, 0x5d, 0xb0, 0x09, 0xb6, 0x3a, - 0xb1, 0xef, 0x72, 0x6f, 0x69, 0xc1, 0xd0, 0x13, 0xb8, 0x22, 0x14, 0x3f, 0xcc, 0xb3, 0xee, 0xd2, - 0x26, 0xd8, 0xf2, 0x77, 0x56, 0x89, 0x3c, 0x25, 0xd6, 0x98, 0x1c, 0x1c, 0x44, 0xbb, 0xfd, 0x8e, - 0xf9, 0xb9, 0xb1, 0xbc, 0xaf, 0x78, 0xb4, 0x1b, 0x2f, 0x0b, 0xc5, 0xa3, 0xac, 0x27, 0xe0, 0xfa, - 0x2b, 0x56, 0x39, 0x4e, 0xff, 0xcb, 0x85, 0x4d, 0xcc, 0x8e, 0x6b, 0xa6, 0xab, 0x05, 0x01, 0x8f, - 0xe1, 0xdd, 0x48, 0x3b, 0xde, 0xcb, 0x13, 0x9a, 0x0f, 0x68, 0x32, 0x58, 0x30, 0xf2, 0x39, 0x0c, - 0xae, 0x43, 0x6a, 0x29, 0x4a, 0xcd, 0xd0, 0x3d, 0xd8, 0xa1, 0x6d, 0xb2, 0x01, 0xde, 0x88, 0x2f, - 0x13, 0xbd, 0x12, 0xde, 0x89, 0x19, 0xcf, 0x75, 0xc5, 0x94, 0x73, 0x58, 0x6c, 0xad, 0xaf, 0xe1, - 0xfa, 0x15, 0x9e, 0x2b, 0x74, 0x1b, 0xa2, 0x16, 0xa8, 0x9c, 0x84, 0x65, 0xae, 0xe2, 0x5b, 0xb2, - 0x15, 0xb7, 0x0f, 0x76, 0xfe, 0x2c, 0xc1, 0xdb, 0xce, 0xe2, 0x8d, 0x1d, 0xdf, 0xf7, 0x76, 0x52, - 0x11, 0x83, 0xe8, 0x6a, 0x3f, 0xd0, 0x23, 0x32, 0x31, 0xcc, 0x64, 0xee, 0x37, 0x0a, 0x1e, 0xff, - 0x57, 0xe7, 0xea, 0xfd, 0x08, 0x57, 0x67, 0x5e, 0x05, 0x3d, 0x98, 0x3a, 0x7b, 0x7d, 0x63, 0x83, - 0x87, 0xff, 0x16, 0x39, 0xf7, 0x17, 0x70, 0xed, 0x72, 0x70, 0xf7, 0x84, 0xda, 0x57, 0x1c, 0xcd, - 0xf6, 0x37, 0xe8, 0x4e, 0x59, 0x4d, 0x6e, 0x53, 0x3c, 0x79, 0xdc, 0xce, 0x3d, 0x9a, 0x06, 0xcf, - 0x59, 0x8b, 0xf9, 0x9e, 0xfd, 0xbd, 0xe1, 0x08, 0x7b, 0x67, 0x23, 0xec, 0x9d, 0x8f, 0x30, 0xf8, - 0x6a, 0x30, 0xf8, 0x6e, 0x30, 0xf8, 0x61, 0x30, 0x18, 0x1a, 0x0c, 0x7e, 0x19, 0x0c, 0x7e, 0x1b, - 0xec, 0x9d, 0x1b, 0x0c, 0xbe, 0x8d, 0xb1, 0x37, 0x1c, 0x63, 0xef, 0x6c, 0x8c, 0xbd, 0x0f, 0x6b, - 0xb3, 0xff, 0x98, 0x64, 0xa5, 0xd9, 0xff, 0xa7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x91, 0xb5, - 0xbe, 0x4d, 0x98, 0x04, 0x00, 0x00, + // 455 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0x4f, 0x6f, 0xd3, 0x30, + 0x18, 0xc6, 0xe3, 0x49, 0x9b, 0xa8, 0x83, 0xb4, 0x61, 0x01, 0x2b, 0x11, 0xf2, 0x46, 0x41, 0xb0, + 0x0b, 0x89, 0x18, 0x17, 0x84, 0xc4, 0x81, 0x6a, 0x1a, 0xe4, 0x00, 0x43, 0x41, 0xbb, 0x20, 0xa4, + 0xc9, 0x49, 0x8c, 0x15, 0xd4, 0xc6, 0x9e, 0x9d, 0x4c, 0xe5, 0xc6, 0x47, 0xe0, 0x63, 0xf0, 0x51, + 0x38, 0xf6, 0xd8, 0x13, 0xa2, 0xee, 0x85, 0x1b, 0xfd, 0x08, 0xa8, 0xb1, 0xa3, 0xfe, 0x87, 0x53, + 0x4f, 0x89, 0x5f, 0x3f, 0x7e, 0x7e, 0x6f, 0xde, 0xbc, 0xaf, 0xe1, 0x33, 0x25, 0x93, 0x20, 0xe9, + 0xf0, 0x32, 0x0d, 0x84, 0xe4, 0x9f, 0x69, 0x52, 0x5c, 0x74, 0x49, 0x4e, 0x18, 0x95, 0xf5, 0xda, + 0x2e, 0x45, 0x1c, 0x28, 0x2a, 0xaf, 0xb2, 0x84, 0xfa, 0x42, 0xf2, 0x82, 0x23, 0x57, 0xf4, 0x7c, + 0x1b, 0x51, 0xde, 0x4d, 0xc6, 0x19, 0xaf, 0xe2, 0xc1, 0xe4, 0xcd, 0x48, 0xbc, 0x83, 0x89, 0x39, + 0x11, 0x59, 0x60, 0x76, 0xca, 0x32, 0x4b, 0x45, 0x5c, 0x3d, 0x8c, 0xa0, 0x95, 0x40, 0xf7, 0x9d, + 0xa1, 0x84, 0xf9, 0x27, 0x8e, 0xee, 0xc1, 0xeb, 0x75, 0x12, 0x39, 0xe9, 0xd2, 0x26, 0x38, 0x04, + 0x47, 0x8d, 0xc8, 0xb5, 0xb1, 0xb7, 0xa4, 0x4b, 0xd1, 0x13, 0xb8, 0xc3, 0x25, 0xbb, 0xc8, 0xd2, + 0xe6, 0xd6, 0x21, 0x38, 0x72, 0x8f, 0x77, 0x7d, 0xd1, 0xf3, 0x8d, 0xb1, 0x7f, 0x7e, 0x1e, 0x9e, + 0xb4, 0x1b, 0xfa, 0xe7, 0xc1, 0xf6, 0x99, 0x64, 0xe1, 0x49, 0xb4, 0xcd, 0x25, 0x0b, 0xd3, 0x16, + 0x87, 0xfb, 0xaf, 0x68, 0x61, 0x39, 0xed, 0x2f, 0x13, 0x9b, 0x88, 0x5e, 0x96, 0x54, 0x15, 0x1b, + 0x02, 0x5e, 0xc2, 0x3b, 0xa1, 0xb2, 0xbc, 0x97, 0x57, 0x24, 0xeb, 0x90, 0xb8, 0xb3, 0x61, 0xe4, + 0x73, 0xe8, 0xad, 0x42, 0x2a, 0xc1, 0x73, 0x45, 0xd1, 0x5d, 0xd8, 0x20, 0x75, 0xb0, 0x02, 0x5e, + 0x8b, 0xa6, 0x81, 0x56, 0x0e, 0x6f, 0x47, 0x94, 0x65, 0xaa, 0xa0, 0xd2, 0x3a, 0x6c, 0x36, 0xd7, + 0xd7, 0x70, 0x7f, 0x89, 0x67, 0x13, 0x7d, 0x0c, 0x51, 0x0d, 0x94, 0x56, 0x42, 0x53, 0x9b, 0xf1, + 0x0d, 0x51, 0x8b, 0xeb, 0x8d, 0xe3, 0x3f, 0x5b, 0xf0, 0x96, 0xb5, 0x78, 0x63, 0xba, 0xf4, 0xbd, + 0x69, 0x48, 0x44, 0x21, 0x5a, 0xae, 0x07, 0x7a, 0xe8, 0xcf, 0xf4, 0xac, 0xbf, 0xf6, 0x1f, 0x79, + 0x8f, 0xfe, 0xab, 0xb3, 0xf9, 0x7e, 0x84, 0xbb, 0x0b, 0x9f, 0x82, 0xee, 0xcf, 0x9d, 0x5d, 0x5d, + 0x58, 0xef, 0xc1, 0xbf, 0x45, 0xd6, 0xfd, 0x05, 0xdc, 0x9b, 0x36, 0xee, 0x29, 0x97, 0x67, 0x92, + 0xa1, 0xc5, 0xfa, 0x7a, 0xcd, 0x39, 0xab, 0xd9, 0x69, 0x8a, 0x66, 0x8f, 0x9b, 0xbe, 0x47, 0xf3, + 0xe0, 0x35, 0x63, 0xb1, 0xde, 0xb3, 0x7d, 0xda, 0x1f, 0x62, 0x67, 0x30, 0xc4, 0xce, 0x78, 0x88, + 0xc1, 0x57, 0x8d, 0xc1, 0x77, 0x8d, 0xc1, 0x0f, 0x8d, 0x41, 0x5f, 0x63, 0xf0, 0x4b, 0x63, 0xf0, + 0x5b, 0x63, 0x67, 0xac, 0x31, 0xf8, 0x36, 0xc2, 0x4e, 0x7f, 0x84, 0x9d, 0xc1, 0x08, 0x3b, 0x1f, + 0xf6, 0x16, 0xaf, 0x92, 0x78, 0xa7, 0x9a, 0xff, 0xa7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x34, + 0x2a, 0x3d, 0xe0, 0x7f, 0x04, 0x00, 0x00, } func (this *ProjectInfo) Equal(that interface{}) bool { diff --git a/src/cloud/project_manager/projectmanagerpb/service.proto b/src/cloud/project_manager/projectmanagerpb/service.proto index a20f01c9a19..d3676b9fccc 100644 --- a/src/cloud/project_manager/projectmanagerpb/service.proto +++ b/src/cloud/project_manager/projectmanagerpb/service.proto @@ -22,7 +22,7 @@ package px.services; option go_package = "projectmanagerpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "src/api/proto/uuidpb/uuid.proto"; service ProjectManagerService { diff --git a/src/cloud/scriptmgr/controllers/placement_compile_test.go b/src/cloud/scriptmgr/controllers/placement_compile_test.go index 32918328f4a..9470384c803 100644 --- a/src/cloud/scriptmgr/controllers/placement_compile_test.go +++ b/src/cloud/scriptmgr/controllers/placement_compile_test.go @@ -215,6 +215,7 @@ const badServiceNameArgInFnPlacement = `{ } } }` + const badGlobalArgPlacement = `{ "name": "service-latencies", "args": { diff --git a/src/cloud/scriptmgr/controllers/server_test.go b/src/cloud/scriptmgr/controllers/server_test.go index fa5b2adced0..917eaa934dc 100644 --- a/src/cloud/scriptmgr/controllers/server_test.go +++ b/src/cloud/scriptmgr/controllers/server_test.go @@ -41,11 +41,15 @@ import ( "px.dev/pixie/src/utils/testingutils" ) -const bundleBucket = "test-bucket" -const bundlePath = "bundle.json" +const ( + bundleBucket = "test-bucket" + bundlePath = "bundle.json" +) -type scriptDef = map[string]string -type scriptsDef = map[string]scriptDef +type ( + scriptDef = map[string]string + scriptsDef = map[string]scriptDef +) var testLiveView = `{ "widgets": [{ diff --git a/src/cloud/scriptmgr/scriptmgrpb/BUILD.bazel b/src/cloud/scriptmgr/scriptmgrpb/BUILD.bazel index fecdf29d650..5b5949b9862 100644 --- a/src/cloud/scriptmgr/scriptmgrpb/BUILD.bazel +++ b/src/cloud/scriptmgr/scriptmgrpb/BUILD.bazel @@ -23,7 +23,7 @@ pl_proto_library( deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", "//src/api/proto/vispb:vis_pl_proto", - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/cloud/scriptmgr/scriptmgrpb/service.pb.go b/src/cloud/scriptmgr/scriptmgrpb/service.pb.go index 447d341ddfc..947e2752c35 100755 --- a/src/cloud/scriptmgr/scriptmgrpb/service.pb.go +++ b/src/cloud/scriptmgr/scriptmgrpb/service.pb.go @@ -615,51 +615,50 @@ func init() { } var fileDescriptor_e19e341d77057158 = []byte{ - // 705 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x4e, 0xdb, 0x4a, - 0x14, 0xce, 0x24, 0x88, 0x9b, 0x1c, 0x87, 0xbf, 0xb9, 0xc0, 0x8d, 0xc2, 0xc5, 0x09, 0xbe, 0x57, - 0x6a, 0x36, 0xd8, 0x52, 0x2a, 0x5a, 0xb5, 0xea, 0x06, 0x08, 0x4a, 0xa3, 0xb6, 0x52, 0x65, 0x04, - 0x0b, 0xba, 0x48, 0x1d, 0x7b, 0x1a, 0x8f, 0x9a, 0x90, 0x69, 0xc6, 0x49, 0xb3, 0xec, 0xa6, 0xfb, - 0x2e, 0xfb, 0x08, 0x7d, 0x8c, 0x2e, 0xbb, 0x64, 0xc9, 0x0a, 0x15, 0xb3, 0xe9, 0x92, 0x47, 0xa8, - 0x3c, 0x63, 0x27, 0x4e, 0x30, 0xb0, 0xea, 0x06, 0xe6, 0x9c, 0xf9, 0xce, 0x77, 0x7e, 0xbe, 0x33, - 0x0e, 0x6c, 0xf3, 0xbe, 0x6d, 0xd8, 0x9d, 0xde, 0xc0, 0x31, 0xb8, 0xdd, 0xa7, 0xcc, 0xeb, 0xb6, - 0xfb, 0x93, 0x13, 0x6b, 0x19, 0x9c, 0xf4, 0x87, 0xd4, 0x26, 0x3a, 0xeb, 0xf7, 0xbc, 0x1e, 0x56, - 0xd8, 0x48, 0x0f, 0x3d, 0xbc, 0xb8, 0xdd, 0xa6, 0x9e, 0x3b, 0x68, 0xe9, 0x76, 0xaf, 0x6b, 0xb4, - 0x7b, 0xed, 0x9e, 0x21, 0x30, 0xad, 0xc1, 0x3b, 0x61, 0x09, 0x43, 0x9c, 0x64, 0x6c, 0xb1, 0x14, - 0xa4, 0xb2, 0x18, 0x95, 0x30, 0x63, 0x30, 0xa0, 0x0e, 0x6b, 0x89, 0x7f, 0x21, 0x60, 0x73, 0x1a, - 0x30, 0xa4, 0x9c, 0xb5, 0x82, 0xbf, 0xf2, 0x5a, 0x5b, 0x81, 0xa5, 0x3a, 0xf1, 0x5e, 0xd2, 0x21, - 0x39, 0xa6, 0xe4, 0x23, 0x37, 0xc9, 0x07, 0xcd, 0x86, 0xe5, 0xc8, 0x7e, 0x45, 0x3c, 0xcb, 0xb1, - 0x3c, 0x0b, 0x3f, 0x80, 0x34, 0x75, 0x0a, 0xa8, 0x8c, 0x2a, 0x4a, 0x75, 0x49, 0x67, 0x23, 0x5d, - 0x26, 0xd2, 0x8f, 0x8e, 0x1a, 0xb5, 0xbd, 0x79, 0xff, 0xa2, 0x94, 0x6e, 0xd4, 0xcc, 0x34, 0x75, - 0x30, 0x86, 0x39, 0x87, 0x70, 0xbb, 0x90, 0x2e, 0xa3, 0x4a, 0xce, 0x14, 0xe7, 0xc0, 0x77, 0x6a, - 0x75, 0x49, 0x21, 0x23, 0x7d, 0xc1, 0x59, 0x7b, 0x0d, 0xcb, 0xd3, 0x79, 0x39, 0xc3, 0xcf, 0x00, - 0x3a, 0x74, 0x48, 0x9a, 0xc3, 0xc0, 0x53, 0x40, 0xe5, 0x4c, 0x45, 0xa9, 0x6e, 0xea, 0xb1, 0xe1, - 0xe8, 0xb3, 0x75, 0x99, 0xb9, 0x4e, 0xc4, 0xa0, 0xbd, 0x81, 0xf5, 0x18, 0xe3, 0x7e, 0xef, 0xd4, - 0x23, 0xa7, 0x5e, 0xd0, 0x10, 0xde, 0x85, 0xfc, 0x98, 0xb7, 0x79, 0x7b, 0x1b, 0x8b, 0xfe, 0x45, - 0x09, 0xa2, 0xf8, 0x46, 0xcd, 0x84, 0x88, 0xbb, 0xe1, 0x68, 0x5f, 0x11, 0xfc, 0x93, 0xc8, 0xce, - 0x19, 0x7e, 0x02, 0xd9, 0x6e, 0x58, 0x4f, 0x48, 0x7d, 0x4f, 0xd1, 0x63, 0x38, 0xde, 0x82, 0x3c, - 0x1b, 0x75, 0x9a, 0x76, 0x48, 0x17, 0x4e, 0x4d, 0x61, 0xa3, 0x4e, 0x94, 0x01, 0x97, 0x20, 0x33, - 0xa4, 0x5c, 0xcc, 0x4e, 0xa9, 0x2e, 0x04, 0xc4, 0x42, 0x42, 0xfd, 0x98, 0x72, 0x33, 0xb8, 0xd1, - 0x96, 0x60, 0xa1, 0x4e, 0xbc, 0x43, 0xb1, 0x5d, 0x42, 0xbf, 0xcf, 0x08, 0x16, 0xa5, 0xf9, 0xc7, - 0xe4, 0xc3, 0x1a, 0x2c, 0xb8, 0x16, 0x6f, 0x8e, 0xc7, 0x5a, 0x98, 0x2b, 0xa3, 0x4a, 0xd6, 0x54, - 0x5c, 0x8b, 0x47, 0xed, 0x6a, 0x75, 0x58, 0x8c, 0x17, 0xc6, 0x19, 0xde, 0x81, 0xbf, 0xe4, 0x2b, - 0x88, 0xd4, 0xdd, 0x98, 0x1a, 0xd4, 0x74, 0xd1, 0x66, 0x84, 0xd5, 0x4c, 0x58, 0x1d, 0x13, 0xc5, - 0x75, 0x7d, 0x0a, 0x39, 0x09, 0xb9, 0x43, 0xd4, 0xbc, 0x7f, 0x51, 0xca, 0xca, 0xd0, 0x46, 0xcd, - 0xcc, 0x4a, 0x7c, 0xc3, 0xd1, 0x3a, 0xb0, 0x96, 0xc0, 0xc9, 0x19, 0x7e, 0x7c, 0x43, 0xcd, 0x3b, - 0x8b, 0x9c, 0x68, 0x59, 0x84, 0xec, 0x8c, 0x8e, 0x63, 0x5b, 0xab, 0xc3, 0xea, 0xbe, 0x4b, 0xec, - 0xf7, 0x32, 0xf8, 0x60, 0x44, 0xb9, 0xec, 0xc0, 0x00, 0x85, 0xbb, 0x56, 0x75, 0xe7, 0x51, 0xd3, - 0xb5, 0xb8, 0x2b, 0xf2, 0xe5, 0xe4, 0x1e, 0x1e, 0x0a, 0xf7, 0x73, 0x8b, 0xbb, 0x26, 0xf0, 0xf1, - 0x59, 0x33, 0x60, 0x2d, 0x81, 0x88, 0x33, 0xbc, 0x0e, 0xf3, 0x44, 0x58, 0x82, 0x24, 0x6b, 0x86, - 0x56, 0xf5, 0x7b, 0x06, 0x96, 0xc3, 0x92, 0xdb, 0xfd, 0x43, 0xd9, 0x04, 0x7e, 0x01, 0xf9, 0xf8, - 0xe3, 0xc3, 0xff, 0x4e, 0x75, 0x38, 0xf3, 0x3d, 0x28, 0x6e, 0xde, 0x71, 0xcb, 0x19, 0x7e, 0x0b, - 0x7f, 0x27, 0xbc, 0x0c, 0xfc, 0xdf, 0x6d, 0x51, 0x31, 0x05, 0x8b, 0xff, 0xdf, 0x0f, 0xe2, 0x0c, - 0x1f, 0x00, 0x4c, 0x16, 0x09, 0x17, 0x67, 0x63, 0x26, 0xab, 0x5f, 0xdc, 0xb8, 0xf5, 0x8e, 0x33, - 0x7c, 0x02, 0x2b, 0x37, 0x24, 0xc7, 0x5b, 0xc9, 0x11, 0xf1, 0x22, 0xb5, 0xfb, 0x20, 0x92, 0xfb, - 0x86, 0x2e, 0x33, 0xdc, 0x49, 0x0b, 0x30, 0xc3, 0x9d, 0x28, 0xed, 0xde, 0xee, 0xd9, 0xa5, 0x9a, - 0x3a, 0xbf, 0x54, 0x53, 0xd7, 0x97, 0x2a, 0xfa, 0xe4, 0xab, 0xe8, 0x9b, 0xaf, 0xa2, 0x1f, 0xbe, - 0x8a, 0xce, 0x7c, 0x15, 0xfd, 0xf4, 0x55, 0xf4, 0xcb, 0x57, 0x53, 0xd7, 0xbe, 0x8a, 0xbe, 0x5c, - 0xa9, 0xa9, 0xb3, 0x2b, 0x35, 0x75, 0x7e, 0xa5, 0xa6, 0x4e, 0x94, 0xd8, 0xef, 0x4d, 0x6b, 0x5e, - 0x7c, 0xec, 0x1f, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xf4, 0x4f, 0x50, 0xf7, 0x99, 0x06, 0x00, + // 689 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcf, 0x6e, 0xd3, 0x4e, + 0x10, 0xce, 0x26, 0x55, 0x7f, 0xc9, 0x38, 0xfd, 0xb7, 0xbf, 0xb6, 0x44, 0x2e, 0x75, 0xd2, 0x05, + 0x89, 0x5c, 0xb0, 0xa5, 0xa0, 0x82, 0x40, 0x5c, 0xda, 0xa6, 0x0a, 0x11, 0x20, 0x21, 0x57, 0xed, + 0xa1, 0x1c, 0x82, 0x63, 0xaf, 0xe2, 0x15, 0x69, 0xb3, 0x64, 0xdd, 0x90, 0x23, 0x17, 0xee, 0x1c, + 0x79, 0x04, 0x1e, 0x83, 0x23, 0xc7, 0x1e, 0x7b, 0xaa, 0xa8, 0x7b, 0xe1, 0xd8, 0x47, 0x40, 0xf6, + 0xda, 0x89, 0x93, 0xba, 0xed, 0x89, 0x4b, 0xb2, 0x33, 0xf3, 0xcd, 0xb7, 0x33, 0xf3, 0x8d, 0x6d, + 0x78, 0x2c, 0xfa, 0xb6, 0x61, 0x77, 0x7b, 0x27, 0x8e, 0x21, 0xec, 0x3e, 0xe3, 0xde, 0x51, 0xa7, + 0x3f, 0x3e, 0xf1, 0xb6, 0x21, 0x68, 0x7f, 0xc0, 0x6c, 0xaa, 0xf3, 0x7e, 0xcf, 0xeb, 0x61, 0x85, + 0x0f, 0xf5, 0xc8, 0x23, 0xd4, 0xe5, 0x4e, 0xaf, 0xd3, 0x0b, 0xfd, 0x46, 0x70, 0x92, 0x10, 0xb5, + 0x1c, 0x30, 0x5a, 0x9c, 0x19, 0x32, 0x72, 0x72, 0xc2, 0x1c, 0xde, 0x0e, 0xff, 0x22, 0xc0, 0xfa, + 0x24, 0x60, 0xc0, 0x04, 0x6f, 0x07, 0xbf, 0x32, 0x4c, 0x96, 0x60, 0xa1, 0x41, 0xbd, 0x37, 0x6c, + 0x40, 0x0f, 0x18, 0xfd, 0x2c, 0x4c, 0xfa, 0x89, 0xd8, 0xb0, 0x18, 0xdb, 0x6f, 0xa9, 0x67, 0x39, + 0x96, 0x67, 0xe1, 0x47, 0x90, 0x65, 0x4e, 0x09, 0x55, 0x50, 0x55, 0xa9, 0x2d, 0xe8, 0x7c, 0xa8, + 0xcb, 0x8b, 0xf4, 0xfd, 0xfd, 0x66, 0x7d, 0x7b, 0xd6, 0x3f, 0x2f, 0x67, 0x9b, 0x75, 0x33, 0xcb, + 0x1c, 0x8c, 0x61, 0xc6, 0xa1, 0xc2, 0x2e, 0x65, 0x2b, 0xa8, 0x5a, 0x30, 0xc3, 0x73, 0xe0, 0x3b, + 0xb6, 0x8e, 0x68, 0x29, 0x27, 0x7d, 0xc1, 0x99, 0xbc, 0x83, 0xc5, 0xc9, 0x7b, 0x05, 0xc7, 0x2f, + 0x01, 0xba, 0x6c, 0x40, 0x5b, 0x83, 0xc0, 0x53, 0x42, 0x95, 0x5c, 0x55, 0xa9, 0xad, 0xeb, 0x89, + 0x19, 0xe8, 0xd3, 0x75, 0x99, 0x85, 0x6e, 0xcc, 0x40, 0xde, 0xc3, 0x6a, 0x82, 0x71, 0xa7, 0x77, + 0xec, 0xd1, 0x63, 0x2f, 0x68, 0x08, 0x6f, 0x41, 0x71, 0xc4, 0xdb, 0xba, 0xb9, 0x8d, 0x79, 0xff, + 0xbc, 0x0c, 0x71, 0x7e, 0xb3, 0x6e, 0x42, 0xcc, 0xdd, 0x74, 0xc8, 0x77, 0x04, 0xf7, 0x52, 0xd9, + 0x05, 0xc7, 0xcf, 0x21, 0x7f, 0x14, 0xd5, 0x13, 0x51, 0xdf, 0x51, 0xf4, 0x08, 0x8e, 0x37, 0xa0, + 0xc8, 0x87, 0xdd, 0x96, 0x1d, 0xd1, 0x45, 0x53, 0x53, 0xf8, 0xb0, 0x1b, 0xdf, 0x80, 0xcb, 0x90, + 0x1b, 0x30, 0x11, 0xce, 0x4e, 0xa9, 0xcd, 0x05, 0xc4, 0xa1, 0x84, 0xfa, 0x01, 0x13, 0x66, 0x10, + 0x21, 0x0b, 0x30, 0xd7, 0xa0, 0xde, 0x5e, 0xb8, 0x44, 0xa1, 0x7e, 0x5f, 0x11, 0xcc, 0x4b, 0xf3, + 0x9f, 0xc9, 0x87, 0x09, 0xcc, 0xb9, 0x96, 0x68, 0x8d, 0xc6, 0x5a, 0x9a, 0xa9, 0xa0, 0x6a, 0xde, + 0x54, 0x5c, 0x4b, 0xc4, 0xed, 0x92, 0x06, 0xcc, 0x27, 0x0b, 0x13, 0x1c, 0x6f, 0xc2, 0x7f, 0x72, + 0xd9, 0x63, 0x75, 0xd7, 0x26, 0x06, 0x35, 0x59, 0xb4, 0x19, 0x63, 0x89, 0x09, 0xcb, 0x23, 0xa2, + 0xa4, 0xae, 0x2f, 0xa0, 0x20, 0x21, 0xb7, 0x88, 0x5a, 0xf4, 0xcf, 0xcb, 0x79, 0x99, 0xda, 0xac, + 0x9b, 0x79, 0x89, 0x6f, 0x3a, 0xa4, 0x0b, 0x2b, 0x29, 0x9c, 0x82, 0xe3, 0x67, 0xd7, 0xd4, 0xbc, + 0xb5, 0xc8, 0xb1, 0x96, 0x2a, 0xe4, 0xa7, 0x74, 0x1c, 0xd9, 0xa4, 0x01, 0xcb, 0x3b, 0x2e, 0xb5, + 0x3f, 0xca, 0xe4, 0xdd, 0x21, 0x13, 0xb2, 0x03, 0x03, 0x14, 0xe1, 0x5a, 0xb5, 0xcd, 0xa7, 0x2d, + 0xd7, 0x12, 0x6e, 0x78, 0x5f, 0x41, 0xee, 0xe1, 0x5e, 0xe8, 0x7e, 0x65, 0x09, 0xd7, 0x04, 0x31, + 0x3a, 0x13, 0x03, 0x56, 0x52, 0x88, 0x04, 0xc7, 0xab, 0x30, 0x4b, 0x43, 0x2b, 0x24, 0xc9, 0x9b, + 0x91, 0x55, 0xfb, 0x99, 0x83, 0xc5, 0xa8, 0xe4, 0x4e, 0x7f, 0x4f, 0x36, 0x81, 0x5f, 0x43, 0x31, + 0xf9, 0xf0, 0xe1, 0xfb, 0x13, 0x1d, 0x4e, 0xbd, 0x0f, 0xd4, 0xf5, 0x5b, 0xa2, 0x82, 0xe3, 0x0f, + 0xf0, 0x7f, 0xca, 0x93, 0x81, 0x1f, 0xdc, 0x94, 0x95, 0x50, 0x50, 0x7d, 0x78, 0x37, 0x48, 0x70, + 0xbc, 0x0b, 0x30, 0x5e, 0x24, 0xac, 0x4e, 0xe7, 0x8c, 0x57, 0x5f, 0x5d, 0xbb, 0x31, 0x26, 0x38, + 0x3e, 0x84, 0xa5, 0x6b, 0x92, 0xe3, 0x8d, 0xf4, 0x8c, 0x64, 0x91, 0xe4, 0x2e, 0x88, 0xe4, 0xbe, + 0xa6, 0xcb, 0x14, 0x77, 0xda, 0x02, 0x4c, 0x71, 0xa7, 0x4a, 0xbb, 0xbd, 0x75, 0x7a, 0xa1, 0x65, + 0xce, 0x2e, 0xb4, 0xcc, 0xd5, 0x85, 0x86, 0xbe, 0xf8, 0x1a, 0xfa, 0xe1, 0x6b, 0xe8, 0x97, 0xaf, + 0xa1, 0x53, 0x5f, 0x43, 0xbf, 0x7d, 0x0d, 0xfd, 0xf1, 0xb5, 0xcc, 0x95, 0xaf, 0xa1, 0x6f, 0x97, + 0x5a, 0xe6, 0xf4, 0x52, 0xcb, 0x9c, 0x5d, 0x6a, 0x99, 0x43, 0x25, 0xf1, 0x59, 0x69, 0xcf, 0x86, + 0x2f, 0xfb, 0x27, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x48, 0x8c, 0xbb, 0xd4, 0x80, 0x06, 0x00, 0x00, } diff --git a/src/cloud/scriptmgr/scriptmgrpb/service.proto b/src/cloud/scriptmgr/scriptmgrpb/service.proto index 59cef599e55..c568e9db4a0 100644 --- a/src/cloud/scriptmgr/scriptmgrpb/service.proto +++ b/src/cloud/scriptmgr/scriptmgrpb/service.proto @@ -22,7 +22,7 @@ package px.services; option go_package = "scriptmgrpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "src/api/proto/uuidpb/uuid.proto"; import "src/api/proto/vispb/vis.proto"; diff --git a/src/cloud/shared/esutils/errors.go b/src/cloud/shared/esutils/errors.go index 34a9c73a386..af9647ba28c 100644 --- a/src/cloud/shared/esutils/errors.go +++ b/src/cloud/shared/esutils/errors.go @@ -24,8 +24,10 @@ import ( "github.com/olivere/elastic/v7" ) -var mergeFailureReg *regexp.Regexp -var settingsNonDynReg *regexp.Regexp +var ( + mergeFailureReg *regexp.Regexp + settingsNonDynReg *regexp.Regexp +) func init() { mergeFailureReg = regexp.MustCompile( diff --git a/src/cloud/shared/idprovider/client.go b/src/cloud/shared/idprovider/client.go index ba71d838cda..a6896852aad 100644 --- a/src/cloud/shared/idprovider/client.go +++ b/src/cloud/shared/idprovider/client.go @@ -462,7 +462,6 @@ func (c *HydraKratosClient) AcceptConsent(ctx context.Context, challenge string) ConsentChallenge: challenge, Context: ctx, }) - if err != nil { log.Debug("error on hydra.AcceptConsentRequest:") return nil, err @@ -532,7 +531,7 @@ func (c *HydraKratosClient) HandleLogin(session *sessions.Session, w http.Respon // Copy the header because the header contains a necessary Set-Cookie from the OAuth server. for k, vv := range respHeader { // We only want to cookie and Location headers, otherwise Firefox and Safari complain. - if !(k == "Set-Cookie" || k == "Location") { + if k != "Set-Cookie" && k != "Location" { continue } for _, v := range vv { diff --git a/src/cloud/shared/idprovider/client_test.go b/src/cloud/shared/idprovider/client_test.go index 52bc8c60d25..46039c63393 100644 --- a/src/cloud/shared/idprovider/client_test.go +++ b/src/cloud/shared/idprovider/client_test.go @@ -76,6 +76,7 @@ func fillDefaults(p *testClientConfig) *testClientConfig { return p } + func makeClientFromConfig(t *testing.T, p *testClientConfig) (*HydraKratosClient, func()) { p = fillDefaults(p) @@ -93,7 +94,7 @@ func makeClientFromConfig(t *testing.T, p *testClientConfig) (*HydraKratosClient assert.Equal(t, "abcd", r.Header.Get("ory_hydra_session")) // The actual endpoint sets a cookie, so we want do forward that as well. w.Header().Set("Set-Cookie", p.hydraPublicHostCookie) - http.Redirect(w, r, consentURL.String(), 302) + http.Redirect(w, r, consentURL.String(), http.StatusFound) })) acceptConsentRequestFn := func(params *hydraAdmin.AcceptConsentRequestParams) (*hydraAdmin.AcceptConsentRequestOK, error) { diff --git a/src/cloud/shared/messagespb/BUILD.bazel b/src/cloud/shared/messagespb/BUILD.bazel index 422e4689886..5231e8ef472 100644 --- a/src/cloud/shared/messagespb/BUILD.bazel +++ b/src/cloud/shared/messagespb/BUILD.bazel @@ -22,7 +22,7 @@ pl_proto_library( visibility = ["//src/cloud:__subpackages__"], deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -32,7 +32,7 @@ pl_cc_proto_library( visibility = ["//src/cloud:__subpackages__"], deps = [ "//src/api/proto/uuidpb:uuid_pl_cc_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/cloud/shared/messagespb/messages.pb.go b/src/cloud/shared/messagespb/messages.pb.go index b1c827a37f1..94e1348da71 100755 --- a/src/cloud/shared/messagespb/messages.pb.go +++ b/src/cloud/shared/messagespb/messages.pb.go @@ -94,28 +94,27 @@ func init() { } var fileDescriptor_149ebc172e39bd73 = []byte{ - // 326 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0x3a, 0x31, - 0x1c, 0xc7, 0xaf, 0xff, 0x3f, 0x9c, 0x50, 0x4d, 0x30, 0x37, 0x11, 0x86, 0xdf, 0x11, 0x5d, 0x88, - 0x89, 0xbd, 0xa8, 0x0b, 0x71, 0x32, 0x78, 0xcb, 0xe9, 0x60, 0x42, 0x72, 0x0e, 0x2e, 0x84, 0xbb, - 0x9e, 0xa5, 0x41, 0xe8, 0xa5, 0xe5, 0x0c, 0x71, 0xf2, 0x11, 0x7c, 0x0c, 0x13, 0x5f, 0xc4, 0x91, - 0x91, 0x89, 0x48, 0x6f, 0x71, 0xe4, 0x11, 0x0c, 0x6d, 0xd4, 0xc5, 0xa9, 0xdf, 0x6f, 0xfb, 0xf9, - 0xb4, 0xe9, 0x0f, 0x1f, 0x29, 0x99, 0x06, 0xe9, 0x83, 0x28, 0x68, 0xa0, 0x46, 0x43, 0x99, 0xd1, - 0x60, 0x92, 0x29, 0x35, 0x64, 0x99, 0xca, 0x93, 0x9f, 0x48, 0x72, 0x29, 0x66, 0xc2, 0x6b, 0xe6, - 0x73, 0x62, 0x50, 0x62, 0x51, 0xf2, 0x7d, 0xde, 0x3a, 0x66, 0x7c, 0x36, 0x2a, 0x12, 0x92, 0x8a, - 0x49, 0xc0, 0x04, 0x13, 0x81, 0x11, 0x92, 0xe2, 0xde, 0x34, 0x53, 0x4c, 0xb2, 0x17, 0xb5, 0xfc, - 0xed, 0xa3, 0xc3, 0x9c, 0x5b, 0x2c, 0x28, 0x0a, 0x4e, 0xf3, 0xc4, 0x2c, 0x16, 0x38, 0x78, 0x43, - 0xb8, 0x71, 0xcb, 0x9f, 0x78, 0x26, 0x2f, 0xc5, 0x74, 0x9a, 0xa5, 0xb3, 0x8c, 0x7a, 0xe7, 0xb8, - 0xfe, 0x68, 0xb6, 0x06, 0x9c, 0x36, 0x51, 0x1b, 0x75, 0x76, 0x4f, 0x1b, 0x24, 0x9f, 0x13, 0x6b, - 0x93, 0x38, 0x8e, 0xc2, 0xde, 0x9e, 0x5e, 0xf9, 0x35, 0x2b, 0x46, 0x61, 0xbf, 0x66, 0xf9, 0x88, - 0x7a, 0x27, 0xd8, 0x15, 0x92, 0x6d, 0xc5, 0x7f, 0x7f, 0x8b, 0x75, 0xbd, 0xf2, 0xab, 0x37, 0x92, - 0x45, 0x61, 0xbf, 0x2a, 0x24, 0x8b, 0xa8, 0x77, 0x88, 0x77, 0xc6, 0x5d, 0x35, 0x28, 0x38, 0x6d, - 0x56, 0xda, 0xa8, 0x53, 0xef, 0x61, 0xbd, 0xf2, 0xdd, 0xeb, 0xae, 0x8a, 0xa3, 0xb0, 0xef, 0x8e, - 0xbb, 0x2a, 0xe6, 0xf4, 0xaa, 0x52, 0xfb, 0xbf, 0x5f, 0xe9, 0x5d, 0x2c, 0xd6, 0xe0, 0x2c, 0xd7, - 0xe0, 0x6c, 0xd6, 0x80, 0x9e, 0x35, 0xa0, 0x57, 0x0d, 0xe8, 0x5d, 0x03, 0x5a, 0x68, 0x40, 0x1f, - 0x1a, 0xd0, 0xa7, 0x06, 0x67, 0xa3, 0x01, 0xbd, 0x94, 0xe0, 0x2c, 0x4a, 0x70, 0x96, 0x25, 0x38, - 0x77, 0xf8, 0x77, 0xd0, 0x89, 0x6b, 0xbe, 0x7d, 0xf6, 0x15, 0x00, 0x00, 0xff, 0xff, 0x90, 0x3c, - 0x8c, 0xc9, 0x8e, 0x01, 0x00, 0x00, + // 311 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4a, 0x03, 0x31, + 0x18, 0xc7, 0x2f, 0xda, 0x9e, 0x6d, 0x14, 0x2a, 0x87, 0x43, 0xe9, 0xf0, 0x5d, 0xd1, 0xa5, 0x38, + 0xe4, 0x50, 0x97, 0xe2, 0x24, 0xf5, 0x96, 0xe8, 0x20, 0x14, 0xce, 0xc1, 0xa5, 0xb4, 0x4d, 0x88, + 0xa1, 0xda, 0x84, 0xa4, 0x27, 0xc5, 0xc9, 0x47, 0xf0, 0x31, 0x04, 0x5f, 0xc4, 0xb1, 0x63, 0xa7, + 0x62, 0xd3, 0xc5, 0xb1, 0x8f, 0x20, 0xbd, 0xa0, 0x2e, 0x4e, 0xf9, 0x93, 0xff, 0xef, 0xf7, 0xc1, + 0xf7, 0xe1, 0x63, 0x6b, 0x86, 0xc9, 0xf0, 0x41, 0xe5, 0x2c, 0xb1, 0xf7, 0x7d, 0xc3, 0x59, 0xf2, + 0xc8, 0xad, 0xed, 0x0b, 0x6e, 0xf5, 0xe0, 0x37, 0x12, 0x6d, 0xd4, 0x44, 0x45, 0x75, 0x3d, 0x25, + 0x05, 0x4a, 0x3c, 0x4a, 0x7e, 0xfa, 0xc6, 0x81, 0x50, 0x42, 0x15, 0x50, 0xb2, 0x49, 0x9e, 0x6f, + 0xc4, 0x9b, 0xd9, 0x7d, 0x2d, 0x13, 0xdf, 0xe4, 0xb9, 0x64, 0x7a, 0x50, 0x3c, 0x1e, 0x38, 0x7c, + 0x47, 0xb8, 0x76, 0x2b, 0x9f, 0x25, 0x37, 0x97, 0x6a, 0x3c, 0xe6, 0xc3, 0x09, 0x67, 0xd1, 0x39, + 0xae, 0x3e, 0x15, 0x5f, 0x3d, 0xc9, 0xea, 0xa8, 0x89, 0x5a, 0xbb, 0xa7, 0x35, 0xa2, 0xa7, 0xc4, + 0xdb, 0x24, 0xcb, 0x68, 0xda, 0xd9, 0x73, 0x8b, 0xb8, 0xe2, 0x45, 0x9a, 0x76, 0x2b, 0x9e, 0xa7, + 0x2c, 0x3a, 0xc1, 0xa1, 0x32, 0x62, 0x23, 0x6e, 0xfd, 0x2f, 0x56, 0xdd, 0x22, 0x2e, 0xdf, 0x18, + 0x41, 0xd3, 0x6e, 0x59, 0x19, 0x41, 0x59, 0x74, 0x84, 0x77, 0x46, 0x6d, 0xdb, 0xcb, 0x25, 0xab, + 0x97, 0x9a, 0xa8, 0x55, 0xed, 0x60, 0xb7, 0x88, 0xc3, 0xeb, 0xb6, 0xcd, 0x68, 0xda, 0x0d, 0x47, + 0x6d, 0x9b, 0x49, 0x76, 0x55, 0xaa, 0x6c, 0xef, 0x97, 0x3a, 0x17, 0xb3, 0x25, 0x04, 0xf3, 0x25, + 0x04, 0xeb, 0x25, 0xa0, 0x17, 0x07, 0xe8, 0xcd, 0x01, 0xfa, 0x70, 0x80, 0x66, 0x0e, 0xd0, 0xa7, + 0x03, 0xf4, 0xe5, 0x20, 0x58, 0x3b, 0x40, 0xaf, 0x2b, 0x08, 0x66, 0x2b, 0x08, 0xe6, 0x2b, 0x08, + 0xee, 0xf0, 0xdf, 0x3d, 0x07, 0x61, 0xb1, 0xf6, 0xd9, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x56, + 0xd8, 0xd9, 0x7e, 0x75, 0x01, 0x00, 0x00, } func (this *VizierConnected) Equal(that interface{}) bool { diff --git a/src/cloud/shared/messagespb/messages.proto b/src/cloud/shared/messagespb/messages.proto index 7616d6bf0bd..9f1459be6f3 100644 --- a/src/cloud/shared/messagespb/messages.proto +++ b/src/cloud/shared/messagespb/messages.proto @@ -22,7 +22,7 @@ package px.cloud.shared.messages; option go_package = "messagespb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "src/api/proto/uuidpb/uuid.proto"; message VizierConnected { diff --git a/src/cloud/shared/vzshard/vzshard.go b/src/cloud/shared/vzshard/vzshard.go index 1bcd4918092..bdc6195cfda 100644 --- a/src/cloud/shared/vzshard/vzshard.go +++ b/src/cloud/shared/vzshard/vzshard.go @@ -57,11 +57,11 @@ func ShardMax() string { // GenerateShardRange shard range produces the hex values 00-ff for the shards as configured. func GenerateShardRange() []string { - min := minShard() - max := maxShard() - r := make([]string, max-min+1) - for i := min; i <= max; i++ { - r[i-min] = shardIntToHex(i) + minS := minShard() + maxS := maxShard() + r := make([]string, maxS-minS+1) + for i := minS; i <= maxS; i++ { + r[i-minS] = shardIntToHex(i) } return r } diff --git a/src/cloud/vzconn/bridge/bridge.go b/src/cloud/vzconn/bridge/bridge.go index e05fc435467..d985217754f 100644 --- a/src/cloud/vzconn/bridge/bridge.go +++ b/src/cloud/vzconn/bridge/bridge.go @@ -92,7 +92,6 @@ func (s *NATSBridgeController) Run() error { log.WithField("ClusterID:", s.clusterID).Info("Subscribing to cluster IDs") topics := vzshard.C2VTopic("*", s.clusterID) natsSub, err := s.nc.ChanSubscribe(topics, s.subCh) - if err != nil { s.l.WithError(err).Error("error with ChanQueueSubscribe") return err diff --git a/src/cloud/vzconn/bridge/grpc.go b/src/cloud/vzconn/bridge/grpc.go index 206657d5d2e..1d4c8e65175 100644 --- a/src/cloud/vzconn/bridge/grpc.go +++ b/src/cloud/vzconn/bridge/grpc.go @@ -40,9 +40,7 @@ import ( utils2 "px.dev/pixie/src/utils" ) -var ( - bridgeMetricsCollector = &natsBridgeMetricCollector{} -) +var bridgeMetricsCollector = &natsBridgeMetricCollector{} func init() { prometheus.MustRegister(bridgeMetricsCollector) diff --git a/src/cloud/vzconn/vzconnpb/BUILD.bazel b/src/cloud/vzconn/vzconnpb/BUILD.bazel index 38107c37f14..52bfd417d95 100644 --- a/src/cloud/vzconn/vzconnpb/BUILD.bazel +++ b/src/cloud/vzconn/vzconnpb/BUILD.bazel @@ -25,7 +25,7 @@ pl_proto_library( srcs = ["service.proto"], deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/cloud/vzconn/vzconnpb/service.pb.go b/src/cloud/vzconn/vzconnpb/service.pb.go index 34e3ad2ef07..27e6568343b 100755 --- a/src/cloud/vzconn/vzconnpb/service.pb.go +++ b/src/cloud/vzconn/vzconnpb/service.pb.go @@ -255,40 +255,40 @@ func init() { } var fileDescriptor_935788a74a5b0e3d = []byte{ - // 525 bytes of a gzipped FileDescriptorProto + // 514 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x31, 0x6f, 0xda, 0x40, - 0x18, 0xf5, 0x85, 0xb4, 0x82, 0xa3, 0x24, 0xf4, 0x94, 0x81, 0x22, 0xe5, 0x8c, 0x18, 0x5a, 0x86, - 0xe6, 0x5c, 0xd1, 0x25, 0xad, 0xaa, 0x4a, 0x01, 0x16, 0x5a, 0x15, 0x55, 0x4e, 0x61, 0xc8, 0x82, - 0xc0, 0xbe, 0xba, 0x27, 0xf0, 0x9d, 0xeb, 0xb3, 0x69, 0xc8, 0xd2, 0xfe, 0x84, 0xfe, 0x84, 0x8e, - 0xfd, 0x29, 0x1d, 0x19, 0x99, 0x50, 0x39, 0x96, 0x8e, 0xf9, 0x09, 0x15, 0x3e, 0x47, 0x84, 0x48, - 0x51, 0x32, 0x9d, 0xbf, 0xef, 0xbd, 0xf7, 0x7d, 0xcf, 0xf6, 0x3b, 0xf8, 0x4c, 0x86, 0x8e, 0xe5, - 0x8c, 0x45, 0xec, 0x5a, 0x93, 0x0b, 0x47, 0x70, 0x9e, 0x1e, 0xc1, 0xd0, 0x92, 0x34, 0x9c, 0x30, - 0x87, 0x92, 0x20, 0x14, 0x91, 0x40, 0xf9, 0xe0, 0x9c, 0xa4, 0x1d, 0x59, 0x3e, 0xf2, 0x58, 0xf4, - 0x25, 0x1e, 0x12, 0x47, 0xf8, 0x96, 0x27, 0x3c, 0x61, 0x25, 0x9c, 0x61, 0xfc, 0x39, 0xa9, 0x92, - 0x22, 0x79, 0xd2, 0xda, 0xf2, 0x13, 0x4f, 0x08, 0x6f, 0x4c, 0x37, 0xac, 0x01, 0x9f, 0xa6, 0x90, - 0xb9, 0xde, 0x3f, 0x08, 0x98, 0xc6, 0xac, 0x38, 0x66, 0x6e, 0x30, 0x4c, 0x0e, 0x4d, 0xa8, 0x0a, - 0x58, 0xec, 0xd5, 0x9b, 0x8d, 0x90, 0xb9, 0x1e, 0xfd, 0x40, 0xa5, 0x1c, 0x78, 0x14, 0x1d, 0xc0, - 0x07, 0x91, 0x08, 0x98, 0x53, 0x02, 0x15, 0x50, 0xcb, 0xd9, 0xba, 0x40, 0x87, 0x10, 0x4a, 0x2a, - 0x25, 0x13, 0xbc, 0xcf, 0xdc, 0xd2, 0x4e, 0x05, 0xd4, 0x32, 0x76, 0x2e, 0xed, 0xb4, 0x5d, 0xf4, - 0x14, 0x66, 0x7c, 0xe9, 0x95, 0x32, 0x15, 0x50, 0xcb, 0xd7, 0x0f, 0x88, 0xb6, 0x44, 0xae, 0x2c, - 0x91, 0x13, 0x3e, 0xb5, 0xd7, 0x84, 0xea, 0x47, 0x58, 0x6c, 0xd6, 0x7b, 0xf7, 0x59, 0x98, 0x4e, - 0xdc, 0xb9, 0x6b, 0xe2, 0x2f, 0x00, 0x4d, 0x9b, 0x7a, 0x4c, 0x46, 0x34, 0xec, 0xb1, 0x0b, 0x46, - 0xc3, 0x16, 0x0d, 0xc6, 0x62, 0xea, 0x53, 0x1e, 0xd9, 0xf4, 0x6b, 0x4c, 0x65, 0x84, 0x5e, 0xc1, - 0xfd, 0xd1, 0xb1, 0xec, 0x3b, 0xe3, 0x78, 0xcd, 0xea, 0xc7, 0xcc, 0xd5, 0xbb, 0x1a, 0x8f, 0xd5, - 0xc2, 0x2c, 0xbc, 0x3f, 0x96, 0x4d, 0x8d, 0x74, 0xdb, 0x2d, 0xbb, 0x30, 0xda, 0x94, 0xcc, 0x45, - 0x6f, 0x60, 0xf1, 0xba, 0x94, 0x0f, 0x7c, 0x9a, 0x78, 0xca, 0x35, 0x90, 0x5a, 0x98, 0x7b, 0x1b, - 0x6d, 0x67, 0xe0, 0x53, 0x7b, 0x6f, 0xb4, 0x55, 0xbf, 0xdb, 0xcd, 0x66, 0x8a, 0xbb, 0xd5, 0xef, - 0xb0, 0x72, 0xbb, 0x43, 0x19, 0x08, 0x2e, 0x29, 0x7a, 0x0d, 0x73, 0x93, 0x04, 0xeb, 0xa7, 0xe6, - 0xf2, 0xf5, 0x7d, 0x12, 0x9c, 0x13, 0xfd, 0xcf, 0x48, 0xb7, 0xdb, 0x6e, 0x35, 0x1e, 0xa9, 0x85, - 0x99, 0xd5, 0x13, 0xda, 0x2d, 0x3b, 0xab, 0xf9, 0x6d, 0x17, 0x99, 0x30, 0x9f, 0x6a, 0x37, 0xf6, - 0x6c, 0xa8, 0x5b, 0x6b, 0x1b, 0xf5, 0x39, 0x80, 0x85, 0xde, 0x59, 0x53, 0x70, 0x7e, 0xaa, 0x43, - 0x86, 0xbe, 0xc1, 0xd2, 0x6d, 0x96, 0xd0, 0x73, 0x72, 0x2d, 0x8d, 0xe4, 0x8e, 0x6f, 0x5b, 0x3e, - 0xba, 0x27, 0x3b, 0x7d, 0xcf, 0x0e, 0x84, 0x9d, 0x93, 0x4f, 0xa7, 0x3a, 0x01, 0xe8, 0x70, 0x4b, - 0x7c, 0x33, 0x8a, 0xe5, 0x6d, 0xf8, 0x66, 0x70, 0x6a, 0xe0, 0x05, 0x68, 0xbc, 0x9d, 0x2d, 0xb1, - 0x31, 0x5f, 0x62, 0xe3, 0x72, 0x89, 0xc1, 0x0f, 0x85, 0xc1, 0x6f, 0x85, 0xc1, 0x1f, 0x85, 0xc1, - 0x4c, 0x61, 0xf0, 0x57, 0x61, 0xf0, 0x4f, 0x61, 0xe3, 0x52, 0x61, 0xf0, 0x73, 0x85, 0x8d, 0xd9, - 0x0a, 0x1b, 0xf3, 0x15, 0x36, 0xce, 0xb2, 0x57, 0xf7, 0x70, 0xf8, 0x30, 0x49, 0xd4, 0xcb, 0xff, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x19, 0x1d, 0x5b, 0x9e, 0xab, 0x03, 0x00, 0x00, + 0x18, 0xf5, 0x85, 0xb4, 0x82, 0xa3, 0x24, 0xf4, 0xc4, 0x40, 0x91, 0x72, 0x46, 0x0c, 0x2d, 0x43, + 0x7b, 0xae, 0xe8, 0x92, 0x56, 0x55, 0xa5, 0x00, 0x0b, 0xad, 0x8a, 0x2a, 0xa7, 0x30, 0x64, 0x41, + 0x60, 0x5f, 0xad, 0x13, 0x70, 0xe7, 0xfa, 0x6c, 0x1a, 0xb2, 0xb4, 0x3f, 0xa1, 0x3f, 0xa1, 0x63, + 0x7f, 0x4a, 0x47, 0x46, 0x26, 0x54, 0x8e, 0xa5, 0x63, 0x7e, 0x42, 0x65, 0x9f, 0x23, 0x42, 0xa4, + 0x28, 0x99, 0xce, 0xdf, 0xf7, 0xde, 0xfb, 0xbe, 0x67, 0xfb, 0x1d, 0x7c, 0x26, 0x03, 0xc7, 0x72, + 0x26, 0x22, 0x72, 0xad, 0xd9, 0x85, 0x23, 0x38, 0x4f, 0x0f, 0x7f, 0x64, 0x49, 0x1a, 0xcc, 0x98, + 0x43, 0x89, 0x1f, 0x88, 0x50, 0xa0, 0xbc, 0x7f, 0x4e, 0xd2, 0x8e, 0xac, 0x94, 0x3c, 0xe1, 0x89, + 0xa4, 0x6f, 0xc5, 0x4f, 0x9a, 0x52, 0x79, 0xe2, 0x09, 0xe1, 0x4d, 0xa8, 0x95, 0x54, 0xa3, 0xe8, + 0x8b, 0x35, 0xe4, 0xf3, 0x14, 0x32, 0xe3, 0x35, 0x43, 0x9f, 0x69, 0xcc, 0x8a, 0x22, 0xe6, 0xfa, + 0xa3, 0xe4, 0xd0, 0x84, 0x9a, 0x80, 0xc5, 0x7e, 0xa3, 0xd5, 0x0c, 0x98, 0xeb, 0xd1, 0x8f, 0x54, + 0xca, 0xa1, 0x47, 0x51, 0x09, 0x3e, 0x08, 0x85, 0xcf, 0x9c, 0x32, 0xa8, 0x82, 0x7a, 0xce, 0xd6, + 0x05, 0x3a, 0x82, 0x50, 0x52, 0x29, 0x99, 0xe0, 0x03, 0xe6, 0x96, 0xf7, 0xaa, 0xa0, 0x9e, 0xb1, + 0x73, 0x69, 0xa7, 0xe3, 0xa2, 0xa7, 0x30, 0x33, 0x95, 0x5e, 0x39, 0x53, 0x05, 0xf5, 0x7c, 0xa3, + 0x44, 0xb4, 0x25, 0x72, 0x65, 0x89, 0x9c, 0xf0, 0xb9, 0x1d, 0x13, 0x6a, 0x9f, 0x60, 0xb1, 0xd5, + 0xe8, 0xdf, 0x67, 0x61, 0x3a, 0x71, 0xef, 0xae, 0x89, 0xbf, 0x00, 0x34, 0x6d, 0xea, 0x31, 0x19, + 0xd2, 0xa0, 0xcf, 0x2e, 0x18, 0x0d, 0xda, 0xd4, 0x9f, 0x88, 0xf9, 0x94, 0xf2, 0xd0, 0xa6, 0x5f, + 0x23, 0x2a, 0x43, 0xf4, 0x1a, 0x1e, 0x8e, 0x8f, 0xe5, 0xc0, 0x99, 0x44, 0x31, 0x6b, 0x10, 0x31, + 0x57, 0xef, 0x6a, 0x3e, 0x56, 0x2b, 0xb3, 0xf0, 0xe1, 0x58, 0xb6, 0x34, 0xd2, 0xeb, 0xb4, 0xed, + 0xc2, 0x78, 0x5b, 0x32, 0x17, 0xbd, 0x85, 0xc5, 0xeb, 0x52, 0x3e, 0x9c, 0xd2, 0xc4, 0x53, 0xae, + 0x89, 0xd4, 0xca, 0x3c, 0xd8, 0x6a, 0xbb, 0xc3, 0x29, 0xb5, 0x0f, 0xc6, 0x3b, 0xf5, 0xfb, 0xfd, + 0x6c, 0xa6, 0xb8, 0x5f, 0xfb, 0x0e, 0xab, 0xb7, 0x3b, 0x94, 0xbe, 0xe0, 0x92, 0xa2, 0x37, 0x30, + 0x37, 0x4b, 0xb0, 0x41, 0x6a, 0x2e, 0xdf, 0x38, 0x24, 0xfe, 0x39, 0xd1, 0xff, 0x8c, 0xf4, 0x7a, + 0x9d, 0x76, 0xf3, 0x91, 0x5a, 0x99, 0x59, 0x3d, 0xa1, 0xd3, 0xb6, 0xb3, 0x9a, 0xdf, 0x71, 0x91, + 0x09, 0xf3, 0xa9, 0x76, 0x6b, 0xcf, 0x86, 0xba, 0x15, 0xdb, 0x68, 0x2c, 0x01, 0x2c, 0xf4, 0xcf, + 0x5a, 0x82, 0xf3, 0x53, 0x9d, 0x25, 0xf4, 0x0d, 0x96, 0x6f, 0xb3, 0x84, 0x9e, 0x93, 0x6b, 0xa1, + 0x23, 0x77, 0x7c, 0xdb, 0xca, 0x8b, 0x7b, 0xb2, 0xd3, 0xf7, 0xec, 0x42, 0xd8, 0x3d, 0xf9, 0x7c, + 0xaa, 0x13, 0x80, 0x8e, 0x76, 0xc4, 0x37, 0xa3, 0x58, 0xd9, 0x85, 0x6f, 0x06, 0xa7, 0x0e, 0x5e, + 0x82, 0xe6, 0xbb, 0xc5, 0x1a, 0x1b, 0xcb, 0x35, 0x36, 0x2e, 0xd7, 0x18, 0xfc, 0x50, 0x18, 0xfc, + 0x56, 0x18, 0xfc, 0x51, 0x18, 0x2c, 0x14, 0x06, 0x7f, 0x15, 0x06, 0xff, 0x14, 0x36, 0x2e, 0x15, + 0x06, 0x3f, 0x37, 0xd8, 0x58, 0x6c, 0xb0, 0xb1, 0xdc, 0x60, 0xe3, 0x2c, 0x7b, 0x75, 0xdd, 0x46, + 0x0f, 0x93, 0x44, 0xbd, 0xfa, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x85, 0xe5, 0xde, 0xc3, 0x92, 0x03, + 0x00, 0x00, } func (this *V2CBridgeMessage) Equal(that interface{}) bool { diff --git a/src/cloud/vzconn/vzconnpb/service.proto b/src/cloud/vzconn/vzconnpb/service.proto index 9620e2f8eb3..2c5dce6cfd9 100644 --- a/src/cloud/vzconn/vzconnpb/service.proto +++ b/src/cloud/vzconn/vzconnpb/service.proto @@ -22,7 +22,7 @@ package px.services; option go_package = "vzconnpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "src/api/proto/uuidpb/uuid.proto"; diff --git a/src/cloud/vzmgr/controllers/vizier_updater.go b/src/cloud/vzmgr/controllers/vizier_updater.go index 6dfaef770ae..209f09d0483 100644 --- a/src/cloud/vzmgr/controllers/vizier_updater.go +++ b/src/cloud/vzmgr/controllers/vizier_updater.go @@ -238,7 +238,6 @@ func (u *Updater) sendNATSMessage(topic string, msg *types.Any, vizierID uuid.UU topic = vzshard.C2VTopic(topic, vizierID) log.WithField("topic", topic).Info("Sending message") err = u.nc.Publish(topic, b) - if err != nil { log.WithError(err).Error("Could not publish message to nats") } diff --git a/src/cloud/vzmgr/deployment/deployment_test.go b/src/cloud/vzmgr/deployment/deployment_test.go index 68a4c96e683..6e553c70e04 100644 --- a/src/cloud/vzmgr/deployment/deployment_test.go +++ b/src/cloud/vzmgr/deployment/deployment_test.go @@ -54,8 +54,7 @@ func (f *fakeDF) FetchOrgUserIDUsingDeploymentKey(ctx context.Context, key strin return uuid.Nil, uuid.Nil, uuid.Nil, vzerrors.ErrDeploymentKeyNotFound } -type fakeProvisioner struct { -} +type fakeProvisioner struct{} func (f *fakeProvisioner) ProvisionOrClaimVizier(ctx context.Context, orgID uuid.UUID, userID uuid.UUID, clusterUID string, clusterName string) (uuid.UUID, string, error) { if testOrgID == orgID && testUserID == userID && clusterUID == "cluster1" && clusterName == "test" { diff --git a/src/cloud/vzmgr/vzmgr_server.go b/src/cloud/vzmgr/vzmgr_server.go index 73dab8bb0b7..ef0ddbd7069 100644 --- a/src/cloud/vzmgr/vzmgr_server.go +++ b/src/cloud/vzmgr/vzmgr_server.go @@ -23,8 +23,6 @@ import ( "net/http" _ "net/http/pprof" - "px.dev/pixie/src/cloud/shared/messages" - bindata "github.com/golang-migrate/migrate/source/go_bindata" "github.com/nats-io/nats.go" log "github.com/sirupsen/logrus" @@ -33,6 +31,7 @@ import ( "google.golang.org/grpc" "px.dev/pixie/src/cloud/artifact_tracker/artifacttrackerpb" + "px.dev/pixie/src/cloud/shared/messages" "px.dev/pixie/src/cloud/shared/pgmigrate" "px.dev/pixie/src/cloud/shared/vzshard" "px.dev/pixie/src/cloud/vzmgr/controllers" diff --git a/src/cloud/vzmgr/vzmgrpb/BUILD.bazel b/src/cloud/vzmgr/vzmgrpb/BUILD.bazel index 343c86b67e3..c7f8aa07283 100644 --- a/src/cloud/vzmgr/vzmgrpb/BUILD.bazel +++ b/src/cloud/vzmgr/vzmgrpb/BUILD.bazel @@ -23,7 +23,7 @@ pl_proto_library( deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", "//src/shared/cvmsgspb:cvmsgs_pl_proto", - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/cloud/vzmgr/vzmgrpb/service.pb.go b/src/cloud/vzmgr/vzmgrpb/service.pb.go index eedb1f75a59..dcfb0c6ef14 100755 --- a/src/cloud/vzmgr/vzmgrpb/service.pb.go +++ b/src/cloud/vzmgr/vzmgrpb/service.pb.go @@ -1080,89 +1080,88 @@ func init() { } var fileDescriptor_7b112f5a7e47f58f = []byte{ - // 1305 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcf, 0x6f, 0xdb, 0xe4, - 0x1b, 0x8f, 0x93, 0x34, 0x6d, 0x9e, 0x34, 0x6d, 0xf6, 0xee, 0xbb, 0x2d, 0xf3, 0x24, 0xa7, 0xf3, - 0xb4, 0xef, 0x06, 0xa3, 0x0e, 0xeb, 0x18, 0x6a, 0x2b, 0x26, 0xb4, 0x36, 0x30, 0x65, 0x5d, 0xa9, - 0xe6, 0x36, 0xd5, 0x54, 0x21, 0x45, 0x4e, 0xfc, 0xd6, 0x35, 0x49, 0x6c, 0xe3, 0xd7, 0xa9, 0x9a, - 0x1e, 0x00, 0x71, 0xe3, 0xc6, 0x11, 0xb8, 0x71, 0x41, 0x48, 0xfc, 0x21, 0x70, 0xec, 0x71, 0xa7, - 0x88, 0xba, 0x17, 0x8e, 0xfb, 0x0b, 0x10, 0xf2, 0xfb, 0xda, 0xf9, 0x55, 0x7b, 0x4d, 0x36, 0x71, - 0xe0, 0xd2, 0xda, 0xaf, 0x3f, 0xcf, 0xef, 0xe7, 0x79, 0x9f, 0x4f, 0x0b, 0xb7, 0x89, 0x5d, 0x2f, - 0xd6, 0x9b, 0x66, 0x5b, 0x2d, 0x1e, 0x1e, 0xb7, 0x34, 0x9b, 0xfd, 0xb4, 0x6a, 0x45, 0x82, 0xed, - 0x43, 0xbd, 0x8e, 0x25, 0xcb, 0x36, 0x1d, 0x13, 0xfd, 0xcf, 0x3a, 0x92, 0xfc, 0x13, 0x22, 0xe9, - 0x86, 0x83, 0x6d, 0x43, 0x69, 0xf2, 0x8b, 0x9a, 0xee, 0x1c, 0xb4, 0x6b, 0x52, 0xdd, 0x6c, 0x15, - 0x35, 0x53, 0x33, 0x8b, 0x14, 0x5c, 0x6b, 0xef, 0xd3, 0x37, 0xfa, 0x42, 0x9f, 0x98, 0x12, 0xfe, - 0x86, 0x66, 0x9a, 0x5a, 0x13, 0xf7, 0x51, 0xb8, 0x65, 0x39, 0x1d, 0xff, 0x63, 0x61, 0xf4, 0xa3, - 0xa3, 0xb7, 0x30, 0x71, 0x94, 0x96, 0x15, 0x00, 0x3c, 0x4f, 0x15, 0x4b, 0x67, 0x88, 0x62, 0xbb, - 0xad, 0xab, 0x56, 0x8d, 0xfe, 0xf2, 0x01, 0x0b, 0x1e, 0x80, 0x1c, 0x28, 0x36, 0x56, 0x8b, 0xf5, - 0xc3, 0x16, 0xd1, 0x88, 0x55, 0xf3, 0x1f, 0x18, 0x42, 0xb4, 0x81, 0x5f, 0xb7, 0xb1, 0xe2, 0xe0, - 0x5d, 0xfd, 0x58, 0xc7, 0xf6, 0x7a, 0xb3, 0x4d, 0x1c, 0x6c, 0xcb, 0xf8, 0xcb, 0x36, 0x26, 0x0e, - 0xba, 0x0f, 0x29, 0xd3, 0xd6, 0xaa, 0xba, 0x9a, 0xe7, 0x16, 0xb8, 0xbb, 0x99, 0xa5, 0x79, 0xc9, - 0x3a, 0x92, 0x98, 0x19, 0xa9, 0x52, 0x29, 0x97, 0xd6, 0xd2, 0x6e, 0xb7, 0x30, 0xb5, 0x65, 0x6b, - 0xe5, 0x92, 0x3c, 0x65, 0xda, 0x5a, 0x59, 0x45, 0x37, 0x61, 0xd6, 0xb2, 0xcd, 0x2f, 0x70, 0xdd, - 0xa9, 0x1a, 0x4a, 0x0b, 0xe7, 0xe3, 0x0b, 0xdc, 0xdd, 0xb4, 0x9c, 0xf1, 0xcf, 0x3e, 0x53, 0x5a, - 0x58, 0x7c, 0x01, 0xd7, 0x9e, 0x60, 0x87, 0x19, 0x24, 0x6b, 0x9d, 0x2d, 0x5b, 0x93, 0x31, 0xb1, - 0x4c, 0x83, 0x60, 0xf4, 0x08, 0xe0, 0x90, 0x9e, 0x57, 0x75, 0x95, 0xe4, 0xb9, 0x85, 0x44, 0x98, - 0xd1, 0xac, 0xdb, 0x2d, 0xa4, 0x99, 0x78, 0xb9, 0x44, 0xe4, 0x34, 0x93, 0x28, 0xab, 0x44, 0xfc, - 0x0a, 0xf2, 0x83, 0x9a, 0xb7, 0x0f, 0x14, 0x5b, 0x0d, 0x62, 0x79, 0x00, 0xd9, 0x7d, 0xdb, 0x6c, - 0x55, 0xbd, 0x74, 0xa8, 0x41, 0x48, 0xe9, 0xb5, 0x79, 0xb7, 0x5b, 0xc8, 0x7c, 0x6a, 0x9b, 0x2d, - 0x0a, 0x2e, 0x97, 0xe4, 0xcc, 0x7e, 0xef, 0x45, 0x45, 0x8b, 0x90, 0x71, 0xcc, 0xbe, 0x08, 0x0d, - 0x86, 0xd9, 0xdf, 0x31, 0x03, 0x81, 0xb4, 0xe3, 0x3f, 0xaa, 0xe2, 0x4f, 0x71, 0xb8, 0x1e, 0xe2, - 0x80, 0x1f, 0xdc, 0x0e, 0x4c, 0x33, 0x57, 0x83, 0xc8, 0x56, 0xa5, 0xb0, 0x1e, 0x92, 0x22, 0x35, - 0x48, 0x7e, 0xd0, 0xc6, 0xbe, 0x29, 0x07, 0xaa, 0xf8, 0x5f, 0x38, 0x80, 0xfe, 0x39, 0x5a, 0x85, - 0x74, 0x2f, 0x83, 0x51, 0x55, 0x9b, 0x75, 0xbb, 0x85, 0x99, 0x20, 0x81, 0xf2, 0x4c, 0x90, 0xbf, - 0x81, 0x72, 0xc7, 0xc7, 0x2d, 0xf7, 0x2d, 0x98, 0x6e, 0x2c, 0x93, 0x6a, 0x5b, 0x57, 0xf3, 0x49, - 0x9a, 0x1c, 0x70, 0xbb, 0x85, 0xd4, 0xc6, 0x32, 0xa9, 0x94, 0x4b, 0x72, 0xaa, 0xb1, 0x4c, 0x2a, - 0xba, 0xfa, 0x34, 0x39, 0x93, 0xc8, 0x25, 0xc5, 0x5d, 0xb8, 0xd2, 0x8b, 0xcc, 0x73, 0x95, 0x04, - 0x95, 0x79, 0xcb, 0xa2, 0xef, 0xc0, 0xd5, 0x51, 0xbd, 0x7e, 0xc2, 0x57, 0x61, 0x36, 0x50, 0xec, - 0x9d, 0xfb, 0xaa, 0xaf, 0x79, 0xaa, 0x83, 0x69, 0x18, 0x4c, 0x69, 0xe6, 0xb0, 0xaf, 0x43, 0xfc, - 0x9b, 0x83, 0x2b, 0x25, 0x6c, 0x35, 0xcd, 0x4e, 0x0b, 0x1b, 0xce, 0x06, 0xee, 0x6c, 0x62, 0x47, - 0x51, 0x15, 0x47, 0x41, 0x77, 0x20, 0x1e, 0x9d, 0xda, 0x94, 0xdb, 0x2d, 0xc4, 0xcb, 0x25, 0x39, - 0xae, 0xab, 0x68, 0x05, 0xa0, 0x4e, 0x67, 0x4b, 0xad, 0x2a, 0x4e, 0x3e, 0x41, 0x05, 0x78, 0x89, - 0x0d, 0xb5, 0x14, 0x0c, 0xb5, 0xb4, 0x13, 0x0c, 0xb5, 0x9c, 0xf6, 0xd1, 0x8f, 0x1d, 0x84, 0x20, - 0xa9, 0x62, 0x52, 0x67, 0x39, 0x95, 0xe9, 0xf3, 0x40, 0x75, 0xa6, 0xc6, 0xad, 0xce, 0x07, 0x30, - 0xdd, 0x26, 0xac, 0x15, 0x52, 0xe1, 0x32, 0xb4, 0x5c, 0x15, 0x42, 0x1b, 0x21, 0xe5, 0x61, 0xcb, - 0x5e, 0xb9, 0xe2, 0xb9, 0x84, 0xf8, 0x6d, 0x1c, 0xb2, 0x43, 0x09, 0x18, 0x3f, 0xf0, 0x1c, 0x24, - 0x1a, 0xb8, 0xe3, 0x8f, 0xbe, 0xf7, 0xf8, 0x5f, 0x4d, 0x85, 0xf8, 0x23, 0x17, 0xdc, 0x8f, 0x43, - 0xa9, 0x08, 0x3a, 0x37, 0xf0, 0x8d, 0x0b, 0xf5, 0x2d, 0xfe, 0x06, 0xbe, 0x25, 0xc6, 0xf7, 0x6d, - 0x13, 0xf2, 0xcf, 0x74, 0xe2, 0x84, 0x3a, 0x36, 0xf9, 0xc5, 0x2d, 0x7e, 0x0e, 0xd7, 0x43, 0xd4, - 0xf9, 0x93, 0xf4, 0x31, 0x24, 0x1b, 0xb8, 0x13, 0x4c, 0xd0, 0xbd, 0xf0, 0x7b, 0x2b, 0x74, 0x5c, - 0x64, 0x2a, 0x28, 0xb6, 0xe9, 0x9d, 0x1f, 0xea, 0xeb, 0xd8, 0x6d, 0x35, 0x79, 0x66, 0xc5, 0xe7, - 0x74, 0x21, 0x84, 0xc7, 0xf4, 0x90, 0x75, 0x29, 0x33, 0x7c, 0x6b, 0x8c, 0x90, 0x68, 0x2b, 0x8b, - 0x47, 0xc0, 0x97, 0x70, 0x13, 0x47, 0x74, 0xc4, 0xbf, 0x19, 0x8c, 0x04, 0xfc, 0x33, 0xd3, 0x6c, - 0xb4, 0xad, 0x50, 0xcb, 0xb9, 0x7e, 0x38, 0x6c, 0xe8, 0xc4, 0x1d, 0xb8, 0x11, 0x8a, 0x7f, 0xbb, - 0xf8, 0x7f, 0xe7, 0xa0, 0x20, 0x63, 0x4d, 0xf7, 0x78, 0x02, 0xbb, 0x3c, 0xfb, 0xa0, 0xc0, 0x97, - 0x15, 0x98, 0xf7, 0xb6, 0x42, 0x9d, 0xb1, 0x09, 0xba, 0x1d, 0xd8, 0xb6, 0xbd, 0xe4, 0x76, 0x0b, - 0xd9, 0x8d, 0x65, 0xe2, 0xf3, 0x0c, 0x6f, 0x49, 0x64, 0x1b, 0xfd, 0x57, 0x5d, 0x45, 0xb7, 0x61, - 0x4e, 0xed, 0xe9, 0xab, 0xf6, 0xaf, 0x91, 0xac, 0x3a, 0x74, 0x17, 0x7d, 0x04, 0xb9, 0x41, 0x0b, - 0x94, 0x6a, 0x24, 0xa8, 0x09, 0xe4, 0x76, 0x0b, 0x73, 0x7d, 0x13, 0x1e, 0xe3, 0x90, 0xe7, 0x1a, - 0x43, 0xef, 0x4f, 0x93, 0x33, 0xc9, 0xdc, 0x94, 0xf8, 0x35, 0x2c, 0x44, 0x07, 0xd2, 0x5b, 0x21, - 0x6f, 0xbe, 0x4e, 0x0b, 0xe0, 0x6f, 0x94, 0x41, 0x26, 0xe4, 0xaf, 0x3a, 0x4a, 0x84, 0x36, 0x69, - 0x77, 0x6e, 0xd9, 0x9a, 0xc7, 0x3f, 0x98, 0x82, 0x9e, 0xe1, 0xc9, 0x27, 0x78, 0xe9, 0xb7, 0x69, - 0x98, 0xdd, 0xdd, 0xdb, 0xd4, 0xec, 0x6d, 0x56, 0x47, 0xf4, 0x02, 0x2e, 0x87, 0x90, 0x3b, 0xf4, - 0x7e, 0x78, 0xad, 0xa3, 0x79, 0x20, 0x3f, 0x6a, 0x1c, 0x3d, 0x87, 0xf9, 0x11, 0x0a, 0x87, 0x46, - 0x31, 0xfc, 0xe2, 0xc5, 0xec, 0x66, 0x90, 0xfa, 0xad, 0x40, 0x76, 0x68, 0x8d, 0x9f, 0x57, 0x18, - 0xb5, 0xb8, 0x91, 0x03, 0x97, 0xce, 0x71, 0x26, 0x24, 0x8d, 0x4d, 0xae, 0x58, 0x8c, 0xc5, 0x09, - 0xc9, 0x18, 0xda, 0x1c, 0xa0, 0xb1, 0xeb, 0xa6, 0x61, 0xe0, 0xba, 0xa3, 0x9b, 0x46, 0xb8, 0xeb, - 0x37, 0x43, 0x5c, 0x1f, 0x91, 0x69, 0xc0, 0xdc, 0x30, 0x8d, 0x41, 0xf7, 0x2e, 0xf0, 0x68, 0x90, - 0x44, 0xf1, 0xef, 0x8d, 0x07, 0xf6, 0x7d, 0xaf, 0xc0, 0xfc, 0x90, 0x13, 0x58, 0x45, 0xe2, 0x90, - 0x8b, 0xc3, 0x83, 0x11, 0x18, 0x11, 0x5e, 0x83, 0x79, 0x5c, 0x6f, 0x20, 0x0c, 0xa8, 0x62, 0xa9, - 0xfd, 0x2e, 0x32, 0x8d, 0x7d, 0x5d, 0x43, 0xff, 0x1f, 0x92, 0x3a, 0x0f, 0x08, 0xb4, 0xdf, 0xb9, - 0x10, 0xe7, 0x7b, 0x6f, 0xc0, 0x15, 0xf6, 0x75, 0xcb, 0x2e, 0x1b, 0xc4, 0x51, 0x9a, 0x4d, 0x06, - 0x43, 0xef, 0x84, 0x68, 0x18, 0xc1, 0x04, 0xc6, 0xde, 0x1d, 0x07, 0xea, 0xdb, 0xdb, 0x86, 0xdc, - 0xe8, 0x9c, 0x9e, 0x2f, 0x71, 0x74, 0xbf, 0x85, 0x0e, 0xf8, 0xd2, 0x0f, 0x49, 0xb8, 0xba, 0xbb, - 0x37, 0x74, 0xc1, 0x06, 0x73, 0x5b, 0x85, 0x14, 0x1b, 0xc6, 0xd7, 0x8f, 0x6a, 0xd8, 0x1a, 0xe0, - 0xc7, 0xb9, 0xc8, 0x91, 0x06, 0x49, 0x6f, 0xd7, 0x47, 0xcd, 0x48, 0x14, 0xad, 0x88, 0x9a, 0x91, - 0x68, 0xde, 0xa0, 0x42, 0xe2, 0x09, 0x76, 0x50, 0xf4, 0x55, 0x10, 0x6a, 0x46, 0x1a, 0x17, 0xee, - 0x5b, 0x91, 0x21, 0xc5, 0x56, 0x72, 0x54, 0xbe, 0xa2, 0x17, 0x36, 0x7f, 0xf5, 0x1c, 0x0b, 0xfd, - 0xc4, 0xfb, 0x13, 0x1c, 0x1d, 0xc3, 0xe5, 0x90, 0xe5, 0x19, 0x65, 0x20, 0x7a, 0x2f, 0xf3, 0xf7, - 0x27, 0x90, 0xf0, 0x5b, 0xe3, 0x67, 0x0e, 0x2e, 0x0f, 0xb6, 0x46, 0xd0, 0x17, 0xdf, 0x71, 0x90, - 0x8f, 0xda, 0x58, 0xe8, 0x61, 0xb8, 0x9d, 0x0b, 0x56, 0x35, 0xff, 0xe1, 0xa4, 0x62, 0xcc, 0xc7, - 0xb5, 0x47, 0x27, 0xa7, 0x42, 0xec, 0xe5, 0xa9, 0x10, 0x7b, 0x75, 0x2a, 0x70, 0xdf, 0xb8, 0x02, - 0xf7, 0xab, 0x2b, 0x70, 0x7f, 0xb8, 0x02, 0x77, 0xe2, 0x0a, 0xdc, 0x9f, 0xae, 0xc0, 0xfd, 0xe5, - 0x0a, 0xb1, 0x57, 0xae, 0xc0, 0x7d, 0x7f, 0x26, 0xc4, 0x4e, 0xce, 0x84, 0xd8, 0xcb, 0x33, 0x21, - 0xb6, 0x37, 0xed, 0xff, 0x2f, 0xa5, 0x96, 0xa2, 0xe9, 0x7e, 0xf0, 0x4f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xb0, 0x9a, 0x3e, 0x27, 0x6d, 0x11, 0x00, 0x00, + // 1292 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcf, 0x4f, 0xdb, 0x56, + 0x1c, 0x8f, 0x93, 0x10, 0xc8, 0x37, 0x04, 0xd2, 0x47, 0xa1, 0xa9, 0x2b, 0x39, 0xd4, 0x55, 0xd7, + 0x6e, 0x5d, 0x9d, 0x95, 0xae, 0x13, 0xa0, 0x55, 0x53, 0x21, 0x5b, 0x95, 0x52, 0x86, 0x6a, 0x08, + 0xaa, 0xd0, 0xa4, 0xc8, 0xc4, 0x0f, 0xd7, 0x4b, 0x62, 0x7b, 0x7e, 0x0e, 0x22, 0x1c, 0xb6, 0x69, + 0xb7, 0xdd, 0x76, 0xdc, 0x76, 0xdb, 0x65, 0x9a, 0xb4, 0x3f, 0x64, 0x3b, 0x72, 0xec, 0x29, 0x1a, + 0xe6, 0xb2, 0x63, 0xff, 0x82, 0x69, 0xb2, 0x9f, 0x9d, 0x5f, 0x3c, 0x97, 0xa4, 0xd5, 0x0e, 0xbb, + 0x80, 0xfd, 0xfc, 0xf9, 0xfe, 0xfe, 0x7e, 0xdf, 0xf7, 0x03, 0x70, 0x93, 0xd8, 0xb5, 0x62, 0xad, + 0x61, 0xb6, 0xd4, 0xe2, 0xe1, 0x71, 0x53, 0xb3, 0xe9, 0x4f, 0x6b, 0xbf, 0x48, 0xb0, 0x7d, 0xa8, + 0xd7, 0xb0, 0x64, 0xd9, 0xa6, 0x63, 0xa2, 0xcb, 0xd6, 0x91, 0x14, 0x9c, 0x10, 0x49, 0x37, 0x1c, + 0x6c, 0x1b, 0x4a, 0x83, 0xbf, 0xac, 0x99, 0x9a, 0xe9, 0x03, 0x8a, 0xde, 0x13, 0xc5, 0xf2, 0xd7, + 0x34, 0xd3, 0xd4, 0x1a, 0xb8, 0xe8, 0xbf, 0xed, 0xb7, 0x0e, 0x8a, 0xb8, 0x69, 0x39, 0xed, 0xe0, + 0x63, 0x61, 0xf8, 0xa3, 0xa3, 0x37, 0x31, 0x71, 0x94, 0xa6, 0x15, 0x02, 0x3c, 0x87, 0x14, 0x4b, + 0xa7, 0x88, 0x62, 0xab, 0xa5, 0xab, 0xd6, 0xbe, 0xff, 0x2b, 0x00, 0x2c, 0x7a, 0x00, 0xf2, 0x42, + 0xb1, 0xb1, 0x5a, 0xac, 0x1d, 0x36, 0x89, 0x46, 0xac, 0xfd, 0xe0, 0x81, 0x22, 0x44, 0x1b, 0xf8, + 0x75, 0x1b, 0x2b, 0x0e, 0xde, 0xd5, 0x8f, 0x75, 0x6c, 0xaf, 0x37, 0x5a, 0xc4, 0xc1, 0xb6, 0x8c, + 0xbf, 0x6a, 0x61, 0xe2, 0xa0, 0x7b, 0x90, 0x32, 0x6d, 0xad, 0xaa, 0xab, 0x79, 0x6e, 0x91, 0xbb, + 0x9d, 0x59, 0x9a, 0x95, 0xac, 0x23, 0x89, 0x9a, 0x91, 0x2a, 0x95, 0x72, 0x69, 0x2d, 0xed, 0x76, + 0x0a, 0x13, 0x5b, 0xb6, 0x56, 0x2e, 0xc9, 0x13, 0xa6, 0xad, 0x95, 0x55, 0x74, 0x1d, 0xa6, 0x2d, + 0xdb, 0xfc, 0x12, 0xd7, 0x9c, 0xaa, 0xa1, 0x34, 0x71, 0x3e, 0xbe, 0xc8, 0xdd, 0x4e, 0xcb, 0x99, + 0xe0, 0xec, 0x73, 0xa5, 0x89, 0xc5, 0xe7, 0x70, 0xe5, 0x31, 0x76, 0xa8, 0x41, 0xb2, 0xd6, 0xde, + 0xb2, 0x35, 0x19, 0x13, 0xcb, 0x34, 0x08, 0x46, 0x0f, 0x01, 0x0e, 0xfd, 0xf3, 0xaa, 0xae, 0x92, + 0x3c, 0xb7, 0x98, 0x60, 0x19, 0xcd, 0xba, 0x9d, 0x42, 0x9a, 0x8a, 0x97, 0x4b, 0x44, 0x4e, 0x53, + 0x89, 0xb2, 0x4a, 0xc4, 0xaf, 0x21, 0xdf, 0xaf, 0x79, 0xfb, 0x85, 0x62, 0xab, 0x61, 0x2c, 0xf7, + 0x21, 0x7b, 0x60, 0x9b, 0xcd, 0xaa, 0x97, 0x0e, 0x35, 0x0c, 0x29, 0xbd, 0x36, 0xeb, 0x76, 0x0a, + 0x99, 0xcf, 0x6c, 0xb3, 0xe9, 0x83, 0xcb, 0x25, 0x39, 0x73, 0xd0, 0x7d, 0x51, 0xd1, 0x5d, 0xc8, + 0x38, 0x66, 0x4f, 0xc4, 0x0f, 0x86, 0xda, 0xdf, 0x31, 0x43, 0x81, 0xb4, 0x13, 0x3c, 0xaa, 0xe2, + 0xcf, 0x71, 0xb8, 0xca, 0x70, 0x20, 0x08, 0x6e, 0x07, 0x26, 0xa9, 0xab, 0x61, 0x64, 0xab, 0x12, + 0xab, 0x55, 0xa4, 0x48, 0x0d, 0x52, 0x10, 0xb4, 0x71, 0x60, 0xca, 0xa1, 0x2a, 0xfe, 0x57, 0x0e, + 0xa0, 0x77, 0x8e, 0x56, 0x21, 0xdd, 0xcd, 0x60, 0x54, 0xd5, 0xa6, 0xdd, 0x4e, 0x61, 0x2a, 0x4c, + 0xa0, 0x3c, 0x15, 0xe6, 0xaf, 0xaf, 0xdc, 0xf1, 0x51, 0xcb, 0x7d, 0x03, 0x26, 0xeb, 0xcb, 0xa4, + 0xda, 0xd2, 0xd5, 0x7c, 0xd2, 0x4f, 0x0e, 0xb8, 0x9d, 0x42, 0x6a, 0x63, 0x99, 0x54, 0xca, 0x25, + 0x39, 0x55, 0x5f, 0x26, 0x15, 0x5d, 0x7d, 0x92, 0x9c, 0x4a, 0xe4, 0x92, 0xe2, 0x2e, 0xcc, 0x77, + 0x23, 0xf3, 0x5c, 0x25, 0x61, 0x65, 0xde, 0xb2, 0xe8, 0x3b, 0xb0, 0x30, 0xac, 0x37, 0x48, 0xf8, + 0x2a, 0x4c, 0x87, 0x8a, 0xbd, 0xf3, 0x40, 0xf5, 0x15, 0x4f, 0x75, 0x38, 0x0d, 0xfd, 0x29, 0xcd, + 0x1c, 0xf6, 0x74, 0x88, 0xff, 0x70, 0x30, 0x5f, 0xc2, 0x56, 0xc3, 0x6c, 0x37, 0xb1, 0xe1, 0x6c, + 0xe0, 0xf6, 0x26, 0x76, 0x14, 0x55, 0x71, 0x14, 0x74, 0x0b, 0xe2, 0xd1, 0xa9, 0x4d, 0xb9, 0x9d, + 0x42, 0xbc, 0x5c, 0x92, 0xe3, 0xba, 0x8a, 0x56, 0x00, 0x6a, 0xfe, 0x6c, 0xa9, 0x55, 0xc5, 0xc9, + 0x27, 0x7c, 0x01, 0x5e, 0xa2, 0x43, 0x2d, 0x85, 0x43, 0x2d, 0xed, 0x84, 0x43, 0x2d, 0xa7, 0x03, + 0xf4, 0x23, 0x07, 0x21, 0x48, 0xaa, 0x98, 0xd4, 0x68, 0x4e, 0x65, 0xff, 0xb9, 0xaf, 0x3a, 0x13, + 0xa3, 0x56, 0xe7, 0x43, 0x98, 0x6c, 0x11, 0xda, 0x0a, 0x29, 0xb6, 0x8c, 0x5f, 0xae, 0x0a, 0xf1, + 0x1b, 0x21, 0xe5, 0x61, 0xcb, 0x5e, 0xb9, 0xe2, 0xb9, 0x84, 0xf8, 0x5d, 0x1c, 0xb2, 0x03, 0x09, + 0x18, 0x3d, 0xf0, 0x1c, 0x24, 0xea, 0xb8, 0x1d, 0x8c, 0xbe, 0xf7, 0xf8, 0x7f, 0x4d, 0x85, 0xf8, + 0x13, 0x17, 0xde, 0x8f, 0x03, 0xa9, 0x08, 0x3b, 0x37, 0xf4, 0x8d, 0x63, 0xfa, 0x16, 0x7f, 0x03, + 0xdf, 0x12, 0xa3, 0xfb, 0xb6, 0x09, 0xf9, 0xa7, 0x3a, 0x71, 0x98, 0x8e, 0x8d, 0x7f, 0x71, 0x8b, + 0x5f, 0xc0, 0x55, 0x86, 0xba, 0x60, 0x92, 0x3e, 0x81, 0x64, 0x1d, 0xb7, 0xc3, 0x09, 0xba, 0xc3, + 0xbe, 0xb7, 0x98, 0xe3, 0x22, 0xfb, 0x82, 0x62, 0xcb, 0xbf, 0xf3, 0x99, 0xbe, 0x8e, 0xdc, 0x56, + 0xe3, 0x67, 0x56, 0x7c, 0xe6, 0x2f, 0x04, 0x76, 0x4c, 0x0f, 0x68, 0x97, 0x52, 0xc3, 0x37, 0x46, + 0x08, 0xc9, 0x6f, 0x65, 0xf1, 0x08, 0xf8, 0x12, 0x6e, 0xe0, 0x88, 0x8e, 0xf8, 0x2f, 0x83, 0x91, + 0x80, 0x7f, 0x6a, 0x9a, 0xf5, 0x96, 0xc5, 0xb4, 0x9c, 0xeb, 0x85, 0x43, 0x87, 0x4e, 0xdc, 0x81, + 0x6b, 0x4c, 0xfc, 0xdb, 0xc5, 0xff, 0x07, 0x07, 0x05, 0x19, 0x6b, 0xba, 0xc7, 0x13, 0xe8, 0xe5, + 0xd9, 0x03, 0x85, 0xbe, 0xac, 0xc0, 0xac, 0xb7, 0x15, 0x6a, 0x94, 0x4d, 0xf8, 0xdb, 0x81, 0x6e, + 0xdb, 0x4b, 0x6e, 0xa7, 0x90, 0xdd, 0x58, 0x26, 0x01, 0xcf, 0xf0, 0x96, 0x44, 0xb6, 0xde, 0x7b, + 0xd5, 0x55, 0x74, 0x13, 0x66, 0xd4, 0xae, 0xbe, 0x6a, 0xef, 0x1a, 0xc9, 0xaa, 0x03, 0x77, 0xd1, + 0xc7, 0x90, 0xeb, 0xb7, 0xe0, 0x53, 0x8d, 0x84, 0x6f, 0x02, 0xb9, 0x9d, 0xc2, 0x4c, 0xcf, 0x84, + 0xc7, 0x38, 0xe4, 0x99, 0xfa, 0xc0, 0xfb, 0x93, 0xe4, 0x54, 0x32, 0x37, 0x21, 0x7e, 0x03, 0x8b, + 0xd1, 0x81, 0x74, 0x57, 0xc8, 0x9b, 0xaf, 0xd3, 0x02, 0x04, 0x1b, 0xa5, 0x9f, 0x09, 0x05, 0xab, + 0xce, 0x27, 0x42, 0x9b, 0x7e, 0x77, 0x6e, 0xd9, 0x9a, 0xc7, 0x3f, 0xa8, 0x82, 0xae, 0xe1, 0xf1, + 0x27, 0x78, 0xe9, 0xf7, 0x49, 0x98, 0xde, 0xdd, 0xdb, 0xd4, 0xec, 0x6d, 0x5a, 0x47, 0xf4, 0x1c, + 0xe6, 0x18, 0xe4, 0x0e, 0x7d, 0xc0, 0xae, 0x75, 0x34, 0x0f, 0xe4, 0x87, 0x8d, 0xa3, 0x67, 0x30, + 0x3b, 0x44, 0xe1, 0xd0, 0x30, 0x86, 0xbf, 0x7b, 0x31, 0xbb, 0xe9, 0xa7, 0x7e, 0x2b, 0x90, 0x1d, + 0x58, 0xe3, 0xe7, 0x15, 0x46, 0x2d, 0x6e, 0xe4, 0xc0, 0xa5, 0x73, 0x9c, 0x09, 0x49, 0x23, 0x93, + 0x2b, 0x1a, 0x63, 0x71, 0x4c, 0x32, 0x86, 0x36, 0xfb, 0x68, 0xec, 0xba, 0x69, 0x18, 0xb8, 0xe6, + 0xe8, 0xa6, 0xc1, 0x76, 0xfd, 0x3a, 0xc3, 0xf5, 0x21, 0x99, 0x3a, 0xcc, 0x0c, 0xd2, 0x18, 0x74, + 0xe7, 0x02, 0x8f, 0xfa, 0x49, 0x14, 0xff, 0xfe, 0x68, 0xe0, 0xc0, 0xf7, 0x0a, 0xcc, 0x0e, 0x38, + 0x81, 0x55, 0x24, 0x0e, 0xb8, 0x38, 0x38, 0x18, 0xa1, 0x11, 0xe1, 0x35, 0x98, 0x47, 0xb5, 0x3a, + 0xc2, 0x80, 0x2a, 0x96, 0xda, 0xeb, 0x22, 0xd3, 0x38, 0xd0, 0x35, 0xf4, 0xce, 0x80, 0xd4, 0x79, + 0x40, 0xa8, 0xfd, 0xd6, 0x85, 0xb8, 0xc0, 0x7b, 0x03, 0xe6, 0xe9, 0xd7, 0x2d, 0xbb, 0x6c, 0x10, + 0x47, 0x69, 0x34, 0x28, 0x0c, 0xbd, 0xcb, 0xd0, 0x30, 0x84, 0x09, 0x8d, 0xbd, 0x37, 0x0a, 0x34, + 0xb0, 0xb7, 0x0d, 0xb9, 0xe1, 0x39, 0x3d, 0x5f, 0xe2, 0xe8, 0x7e, 0x63, 0x0e, 0xf8, 0xd2, 0x8f, + 0x49, 0x58, 0xd8, 0xdd, 0x1b, 0xb8, 0x60, 0xc3, 0xb9, 0xad, 0x42, 0x8a, 0x0e, 0xe3, 0xeb, 0x47, + 0x95, 0xb5, 0x06, 0xf8, 0x51, 0x2e, 0x72, 0xa4, 0x41, 0xd2, 0xdb, 0xf5, 0x51, 0x33, 0x12, 0x45, + 0x2b, 0xa2, 0x66, 0x24, 0x9a, 0x37, 0xa8, 0x90, 0x78, 0x8c, 0x1d, 0x14, 0x7d, 0x15, 0x30, 0xcd, + 0x48, 0xa3, 0xc2, 0x03, 0x2b, 0x32, 0xa4, 0xe8, 0x4a, 0x8e, 0xca, 0x57, 0xf4, 0xc2, 0xe6, 0x17, + 0xce, 0xb1, 0xd0, 0x4f, 0xbd, 0x3f, 0xc1, 0xd1, 0x31, 0xcc, 0x31, 0x96, 0x67, 0x94, 0x81, 0xe8, + 0xbd, 0xcc, 0xdf, 0x1b, 0x43, 0x22, 0x68, 0x8d, 0x5f, 0x38, 0x98, 0xeb, 0x6f, 0x8d, 0xb0, 0x2f, + 0xbe, 0xe7, 0x20, 0x1f, 0xb5, 0xb1, 0xd0, 0x03, 0xb6, 0x9d, 0x0b, 0x56, 0x35, 0xff, 0xd1, 0xb8, + 0x62, 0xd4, 0xc7, 0xb5, 0x87, 0x27, 0xa7, 0x42, 0xec, 0xe5, 0xa9, 0x10, 0x7b, 0x75, 0x2a, 0x70, + 0xdf, 0xba, 0x02, 0xf7, 0x9b, 0x2b, 0x70, 0x7f, 0xba, 0x02, 0x77, 0xe2, 0x0a, 0xdc, 0x5f, 0xae, + 0xc0, 0xfd, 0xed, 0x0a, 0xb1, 0x57, 0xae, 0xc0, 0xfd, 0x70, 0x26, 0xc4, 0x4e, 0xce, 0x84, 0xd8, + 0xcb, 0x33, 0x21, 0xb6, 0x37, 0x19, 0xfc, 0xcb, 0x64, 0x3f, 0xe5, 0xa7, 0xfb, 0xfe, 0xbf, 0x01, + 0x00, 0x00, 0xff, 0xff, 0xdf, 0x6a, 0xac, 0xc0, 0x54, 0x11, 0x00, 0x00, } func (this *CreateVizierClusterRequest) Equal(that interface{}) bool { diff --git a/src/cloud/vzmgr/vzmgrpb/service.proto b/src/cloud/vzmgr/vzmgrpb/service.proto index 778b8c39e3a..8d1ef0e7b0b 100644 --- a/src/cloud/vzmgr/vzmgrpb/service.proto +++ b/src/cloud/vzmgr/vzmgrpb/service.proto @@ -22,7 +22,7 @@ package px.services.internal; option go_package = "vzmgrpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; import "src/api/proto/uuidpb/uuid.proto"; diff --git a/src/common/testing/test_utils/cert_generator/cert_generator.go b/src/common/testing/test_utils/cert_generator/cert_generator.go index 4dfc90e7c0a..49fa7efe7af 100644 --- a/src/common/testing/test_utils/cert_generator/cert_generator.go +++ b/src/common/testing/test_utils/cert_generator/cert_generator.go @@ -33,14 +33,12 @@ import ( "github.com/spf13/viper" ) -var ( - subj = pkix.Name{ - Organization: []string{"Pixie Labs Inc."}, - Country: []string{"US"}, - Province: []string{"California"}, - Locality: []string{"San Francisco"}, - } -) +var subj = pkix.Name{ + Organization: []string{"Pixie Labs Inc."}, + Country: []string{"US"}, + Province: []string{"California"}, + Locality: []string{"San Francisco"}, +} // generateAndWriteCA generates a CA cert and writes it to the file pointed by the ca_crt flag. // It also returns the generated cert and privateKey so that they can be used to generate and sign @@ -64,7 +62,7 @@ func generateAndWriteCA() (*x509.Certificate, *rsa.PrivateKey) { if err != nil { panic(err) } - caCertOut, err := os.OpenFile(viper.GetString("ca_crt"), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666) + caCertOut, err := os.OpenFile(viper.GetString("ca_crt"), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o666) if err != nil { panic(err) } @@ -99,7 +97,7 @@ func generateAndWriteCertPair(ca *x509.Certificate, caKey *rsa.PrivateKey, certP if err != nil { panic(err) } - certOut, err := os.OpenFile(certPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666) + certOut, err := os.OpenFile(certPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o666) if err != nil { panic(err) } @@ -111,18 +109,20 @@ func generateAndWriteCertPair(ca *x509.Certificate, caKey *rsa.PrivateKey, certP if err != nil { panic(err) } - keyOut, err := os.OpenFile(keyPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600) + keyOut, err := os.OpenFile(keyPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o600) if err != nil { panic(err) } keyType := viper.GetString("secret_key_type") - if keyType == "pkcs1" { + switch keyType { + case "pkcs1": + err = pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(privateKey)}) if err != nil { panic(err) } - } else if keyType == "pkcs8" { + case "pkcs8": b, err := x509.MarshalPKCS8PrivateKey(privateKey) if err != nil { panic(err) @@ -132,7 +132,7 @@ func generateAndWriteCertPair(ca *x509.Certificate, caKey *rsa.PrivateKey, certP if err != nil { panic(err) } - } else { + default: panic(fmt.Sprintf("Unsupported private key type: %s", keyType)) } err = keyOut.Close() diff --git a/src/e2e_test/perf_tool/cmd/run.go b/src/e2e_test/perf_tool/cmd/run.go index 79179b82a9b..5d8a89a9f7a 100644 --- a/src/e2e_test/perf_tool/cmd/run.go +++ b/src/e2e_test/perf_tool/cmd/run.go @@ -246,6 +246,7 @@ func (bo *maxRetryBackoff) NextBackOff() time.Duration { } return time.Duration(0) } + func (bo *maxRetryBackoff) Reset() { bo.retries = 0 } diff --git a/src/e2e_test/perf_tool/datastudio/datastudio.go b/src/e2e_test/perf_tool/datastudio/datastudio.go index 9d024c901d3..88e95445914 100644 --- a/src/e2e_test/perf_tool/datastudio/datastudio.go +++ b/src/e2e_test/perf_tool/datastudio/datastudio.go @@ -34,11 +34,11 @@ import ( // GenerateViews generates all of the datastudio charts/queries from templates. func GenerateViews(outPath string, project string, dataset string, reportID string, expPageID string) error { queryOutPath := path.Join(outPath, "queries") - if err := os.MkdirAll(queryOutPath, 0775); err != nil { + if err := os.MkdirAll(queryOutPath, 0o775); err != nil { return err } chartOutPath := path.Join(outPath, "charts") - if err := os.MkdirAll(chartOutPath, 0775); err != nil { + if err := os.MkdirAll(chartOutPath, 0o775); err != nil { return err } diff --git a/src/e2e_test/perf_tool/experimentpb/BUILD.bazel b/src/e2e_test/perf_tool/experimentpb/BUILD.bazel index 1c6364bc97d..14c01bf4edf 100644 --- a/src/e2e_test/perf_tool/experimentpb/BUILD.bazel +++ b/src/e2e_test/perf_tool/experimentpb/BUILD.bazel @@ -21,7 +21,7 @@ pl_proto_library( srcs = ["experiment.proto"], visibility = ["//src/e2e_test/perf_tool:__subpackages__"], deps = [ - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/e2e_test/perf_tool/experimentpb/experiment.pb.go b/src/e2e_test/perf_tool/experimentpb/experiment.pb.go index a4154f1747d..dc43e5d79be 100755 --- a/src/e2e_test/perf_tool/experimentpb/experiment.pb.go +++ b/src/e2e_test/perf_tool/experimentpb/experiment.pb.go @@ -1560,120 +1560,119 @@ func init() { } var fileDescriptor_96d7e52dda1e6fe3 = []byte{ - // 1797 bytes of a gzipped FileDescriptorProto + // 1786 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcd, 0x73, 0x1b, 0x49, - 0x15, 0xd7, 0x48, 0xb2, 0x25, 0x3d, 0xc9, 0xb2, 0xdc, 0xd9, 0x04, 0xc5, 0x9b, 0x92, 0xb3, 0xda, - 0x02, 0x42, 0xd8, 0x58, 0x24, 0xcb, 0x87, 0xd9, 0x2c, 0x5b, 0x25, 0xc9, 0x06, 0x2b, 0x71, 0x6c, + 0x15, 0xd7, 0x48, 0xb2, 0x25, 0x3d, 0xc9, 0xb2, 0xdc, 0xf9, 0x40, 0xf1, 0xa6, 0xe4, 0xec, 0x6c, + 0x01, 0x21, 0xec, 0x5a, 0x24, 0xcb, 0x87, 0xd9, 0x2c, 0x5b, 0x25, 0xc9, 0x06, 0x2b, 0x71, 0x6c, 0xd1, 0xf2, 0x7a, 0x61, 0x8b, 0xaa, 0xa9, 0xf6, 0x4c, 0x47, 0x9a, 0xf2, 0x7c, 0x65, 0xba, 0x95, 0xb5, 0x39, 0x71, 0xa1, 0x38, 0x51, 0xc5, 0x01, 0xfe, 0x03, 0x0e, 0xfc, 0x09, 0xdc, 0x39, 0x00, - 0xb7, 0x1c, 0xf7, 0xe4, 0x22, 0xca, 0x85, 0xe3, 0x1e, 0xb8, 0x43, 0xf5, 0xc7, 0x7c, 0x48, 0x56, - 0x12, 0xa8, 0xe2, 0xd6, 0xfd, 0xe6, 0xf7, 0x3e, 0xfa, 0xf5, 0xfb, 0xbd, 0xd7, 0x12, 0x7c, 0x97, - 0x45, 0x56, 0x87, 0x3e, 0xa0, 0x26, 0xa7, 0x8c, 0x77, 0x42, 0x1a, 0x3d, 0x35, 0x79, 0x10, 0xb8, - 0x1d, 0x7a, 0x1e, 0xd2, 0xc8, 0xf1, 0xa8, 0xcf, 0xc3, 0xd3, 0xcc, 0x66, 0x3b, 0x8c, 0x02, 0x1e, - 0xa0, 0x5a, 0x78, 0xbe, 0x9d, 0x60, 0x37, 0x5b, 0xe3, 0x20, 0x18, 0xbb, 0xb4, 0x23, 0xbf, 0x9d, - 0x4e, 0x9f, 0x76, 0xec, 0x69, 0x44, 0xb8, 0x13, 0xf8, 0x0a, 0xbd, 0x79, 0x6f, 0xec, 0xf0, 0xc9, - 0xf4, 0x74, 0xdb, 0x0a, 0xbc, 0xce, 0x38, 0x18, 0x07, 0x29, 0x50, 0xec, 0xe4, 0x46, 0xae, 0x14, - 0xbc, 0xfd, 0xef, 0x3c, 0xd4, 0xf7, 0x12, 0x8f, 0xa3, 0x90, 0x5a, 0xe8, 0x21, 0x54, 0x9f, 0x3b, - 0xbf, 0x74, 0x68, 0x64, 0xb2, 0x90, 0x5a, 0x4d, 0xe3, 0xb6, 0x71, 0xa7, 0xfa, 0x60, 0x73, 0x3b, - 0x1b, 0xc5, 0xf6, 0x67, 0x41, 0x74, 0xe6, 0x06, 0xc4, 0x16, 0x0a, 0x18, 0x14, 0x5c, 0x2a, 0x77, - 0xa1, 0xfe, 0x85, 0xfe, 0x26, 0xd5, 0x59, 0x33, 0x7f, 0xbb, 0xf0, 0x16, 0xfd, 0xb5, 0x2f, 0x32, - 0x3b, 0x86, 0x1e, 0x42, 0xcd, 0xa3, 0x3c, 0x72, 0x2c, 0x6d, 0xa0, 0x20, 0x0d, 0x34, 0xe7, 0x0d, - 0x3c, 0x91, 0x08, 0xa9, 0x5e, 0xf5, 0x92, 0x35, 0x43, 0x1f, 0x43, 0xcd, 0x72, 0xa7, 0x8c, 0xc7, - 0xd1, 0x17, 0x65, 0xf4, 0x37, 0xe7, 0x95, 0xfb, 0x0a, 0xa1, 0xb4, 0xad, 0x74, 0x83, 0xbe, 0x03, - 0xe5, 0x68, 0xea, 0x2b, 0xcd, 0x15, 0xa9, 0x79, 0x7d, 0x5e, 0x13, 0x4f, 0x7d, 0xa9, 0x55, 0x8a, - 0xd4, 0x02, 0x7d, 0x00, 0x60, 0x05, 0x9e, 0xe7, 0x70, 0x93, 0x4d, 0x48, 0x73, 0xf5, 0xb6, 0x71, - 0xa7, 0xd2, 0x5b, 0x9b, 0x5d, 0x6e, 0x55, 0xfa, 0x52, 0x3a, 0xda, 0xef, 0xe2, 0x8a, 0x02, 0x8c, - 0x26, 0x04, 0x21, 0x28, 0x72, 0x32, 0x66, 0xcd, 0xd2, 0xed, 0xc2, 0x9d, 0x0a, 0x96, 0xeb, 0xf6, - 0x5f, 0x0d, 0xa8, 0x65, 0xd3, 0x21, 0x40, 0x3e, 0xf1, 0xa8, 0x4c, 0x7c, 0x05, 0xcb, 0xb5, 0xc8, - 0x89, 0x4d, 0x43, 0x37, 0xb8, 0x30, 0x19, 0xa7, 0x61, 0x9c, 0xd4, 0x85, 0x9c, 0xec, 0x4a, 0xc4, - 0x88, 0xd3, 0x10, 0x57, 0xed, 0x64, 0xcd, 0xd0, 0x8f, 0xa0, 0x36, 0xa1, 0xc4, 0xe5, 0x13, 0x6b, - 0x42, 0xad, 0xb3, 0x38, 0xa1, 0x0b, 0x39, 0xd9, 0x97, 0x88, 0xbe, 0x40, 0xe0, 0x39, 0x38, 0xfa, - 0x26, 0xac, 0x13, 0x4b, 0x54, 0x98, 0xc9, 0xa8, 0x4b, 0x2d, 0x1e, 0x44, 0x32, 0xab, 0x15, 0x5c, - 0x57, 0xe2, 0x91, 0x96, 0xb6, 0xff, 0x6e, 0x00, 0xa4, 0x31, 0xa0, 0x3e, 0x54, 0xc3, 0x88, 0x46, - 0xd4, 0xb7, 0x69, 0x44, 0x6d, 0x5d, 0x47, 0x5b, 0xf3, 0x5e, 0x87, 0x29, 0x40, 0x69, 0xee, 0xe7, - 0x70, 0x56, 0x0b, 0x7d, 0x04, 0x65, 0x76, 0x46, 0x9e, 0x3e, 0x0d, 0x5c, 0xbb, 0x99, 0x97, 0x16, - 0x6e, 0xcd, 0x5b, 0x18, 0xe9, 0xaf, 0x89, 0x7a, 0x82, 0x47, 0xdf, 0x86, 0x7c, 0x78, 0xde, 0x2c, - 0x2c, 0xab, 0x80, 0xe1, 0x79, 0xff, 0x60, 0x90, 0xa8, 0xe4, 0xc3, 0xf3, 0xde, 0x1a, 0xe8, 0x9c, - 0x99, 0xfc, 0x22, 0xa4, 0xed, 0xdf, 0x1b, 0x50, 0xcd, 0xa4, 0x04, 0x7d, 0x0c, 0x85, 0xb3, 0x1d, - 0xb6, 0xfc, 0x10, 0x8f, 0x77, 0x46, 0xc3, 0xc0, 0x66, 0x98, 0x12, 0xfb, 0x42, 0xa2, 0x7b, 0xa5, - 0xd9, 0xe5, 0x56, 0xe1, 0xf1, 0xce, 0x68, 0x3f, 0x87, 0x85, 0x1a, 0xfa, 0x21, 0x14, 0xc2, 0x73, - 0x77, 0xf9, 0x01, 0x86, 0xe7, 0x07, 0x19, 0x47, 0x4a, 0x55, 0xc8, 0x72, 0x58, 0xe8, 0xf4, 0x6a, - 0x00, 0xf2, 0x1e, 0x54, 0x58, 0xf7, 0x61, 0xe3, 0x8a, 0x37, 0x74, 0x0b, 0x2a, 0xa2, 0x48, 0x58, - 0x48, 0xac, 0xb8, 0x6a, 0x52, 0x41, 0xfb, 0x08, 0xea, 0xf3, 0x2e, 0xd0, 0x0d, 0x58, 0x65, 0x56, - 0xe4, 0x84, 0x5c, 0x83, 0xf5, 0x0e, 0x7d, 0x1d, 0xea, 0x6c, 0x6a, 0x59, 0x94, 0x31, 0xd3, 0x0a, - 0xdc, 0xa9, 0xe7, 0xcb, 0x80, 0x2b, 0x78, 0x4d, 0x4b, 0xfb, 0x52, 0xd8, 0xfe, 0x05, 0x54, 0x86, - 0x84, 0x5b, 0x13, 0x59, 0xac, 0xb7, 0xa0, 0x78, 0x41, 0x3c, 0x57, 0x59, 0xea, 0x95, 0x67, 0x97, - 0x5b, 0xc5, 0x9f, 0x77, 0x9f, 0x1c, 0x60, 0x29, 0x45, 0xf7, 0x61, 0x95, 0x93, 0x68, 0x4c, 0xb9, - 0x3e, 0xfa, 0xe2, 0x2d, 0x08, 0x33, 0xc7, 0x12, 0x80, 0x35, 0xb0, 0xfd, 0x9b, 0x3c, 0x54, 0x33, - 0x72, 0xf4, 0x2d, 0xa8, 0x90, 0xd0, 0x31, 0xc7, 0x51, 0x30, 0x0d, 0xb5, 0x97, 0xda, 0xec, 0x72, - 0xab, 0xdc, 0x1d, 0x0e, 0x7e, 0x22, 0x64, 0xb8, 0x4c, 0x42, 0x47, 0xae, 0x50, 0x07, 0xaa, 0x02, - 0xfa, 0x9c, 0x46, 0xcc, 0x09, 0x74, 0xf0, 0xbd, 0xfa, 0xec, 0x72, 0x0b, 0xba, 0xc3, 0xc1, 0x89, - 0x92, 0x62, 0x20, 0xa1, 0xa3, 0xd7, 0x82, 0x69, 0x67, 0x8e, 0x6f, 0xcb, 0x12, 0xa9, 0x60, 0xb9, - 0x4e, 0xd8, 0x57, 0xcc, 0xb0, 0x6f, 0x2e, 0xc1, 0x2b, 0x0b, 0x09, 0x16, 0x69, 0x73, 0xc9, 0x29, - 0x75, 0x53, 0x7a, 0xac, 0xaa, 0xb4, 0x49, 0x69, 0xcc, 0x0e, 0xd4, 0x81, 0x6b, 0xc4, 0xf7, 0x03, - 0x4e, 0xe6, 0xa9, 0x54, 0x92, 0x58, 0x94, 0x7e, 0x4a, 0xe8, 0xc4, 0x61, 0xe3, 0x0a, 0x3d, 0x44, - 0xbf, 0x11, 0x99, 0x35, 0x43, 0xc2, 0x27, 0xa2, 0x1c, 0x0b, 0x71, 0xbf, 0x11, 0x59, 0x1f, 0x0a, - 0x21, 0xae, 0x08, 0x80, 0x5c, 0xa2, 0xfb, 0x50, 0x0a, 0x45, 0x2e, 0x69, 0xdc, 0x31, 0xbe, 0xb6, - 0xe4, 0x02, 0x54, 0x43, 0xd3, 0xb8, 0xf6, 0x6f, 0x0d, 0xa8, 0xcf, 0x73, 0x0a, 0xbd, 0x0f, 0x6b, - 0x31, 0xa7, 0xa4, 0x5f, 0x5d, 0x36, 0xb5, 0x58, 0x28, 0x7c, 0xcd, 0x81, 0x48, 0x34, 0x56, 0x0e, - 0x33, 0xa0, 0x6e, 0x34, 0x9e, 0x8b, 0xa7, 0xf0, 0x5f, 0xc6, 0x73, 0x01, 0xd5, 0x0c, 0x59, 0xc5, - 0xf5, 0x48, 0xeb, 0x86, 0xea, 0xa0, 0x62, 0x8d, 0x5a, 0x00, 0xc9, 0x6d, 0xc4, 0x7e, 0x33, 0x12, - 0xf4, 0x7d, 0xa8, 0x33, 0xca, 0xcd, 0x78, 0x2e, 0x38, 0xea, 0xc2, 0xcb, 0xbd, 0xc6, 0xec, 0x72, - 0xab, 0x36, 0xa2, 0x5c, 0x8f, 0x83, 0xc1, 0x2e, 0xae, 0xb1, 0x74, 0x67, 0xb7, 0xff, 0x6c, 0x00, - 0xa4, 0x73, 0x06, 0xed, 0x28, 0x12, 0xab, 0x16, 0xf0, 0xee, 0x15, 0x12, 0x8f, 0x24, 0x89, 0x04, - 0x72, 0x91, 0xc3, 0x68, 0x07, 0x8a, 0x61, 0x14, 0x78, 0x9a, 0x04, 0xed, 0xc5, 0x16, 0x18, 0x78, - 0x94, 0x4f, 0xe8, 0x94, 0x8d, 0xac, 0x88, 0x84, 0x54, 0x58, 0xd8, 0xcf, 0x61, 0xa9, 0xb1, 0xac, - 0xf7, 0xda, 0xcb, 0x7a, 0xaf, 0x68, 0x5f, 0x7a, 0x68, 0xca, 0x3e, 0x31, 0x2b, 0xc0, 0xda, 0x5c, - 0x4c, 0xaf, 0x25, 0xfd, 0x2d, 0xa8, 0x30, 0x1e, 0x51, 0xe2, 0x39, 0xfe, 0x58, 0x06, 0x58, 0xc6, - 0xa9, 0x00, 0xfd, 0x18, 0x36, 0xac, 0xc0, 0x15, 0x3e, 0x44, 0x0c, 0xe2, 0x99, 0x10, 0xd8, 0x49, - 0x47, 0x55, 0x2f, 0x91, 0xed, 0xf8, 0x81, 0xb1, 0xbd, 0xab, 0x5f, 0x22, 0xb8, 0x91, 0xea, 0x0c, - 0xa5, 0x0a, 0xfa, 0x19, 0xac, 0x73, 0xea, 0x85, 0x2e, 0xe1, 0xd4, 0x7c, 0x4e, 0xdc, 0x29, 0x65, - 0xcd, 0xa2, 0x2c, 0x80, 0xce, 0x1b, 0xf2, 0xb8, 0x7d, 0xac, 0x55, 0x4e, 0xa4, 0xc6, 0x9e, 0xcf, - 0xa3, 0x0b, 0x5c, 0xe7, 0x73, 0x42, 0x84, 0x61, 0x8d, 0x93, 0x53, 0x97, 0x9a, 0xc1, 0x94, 0x87, - 0x53, 0xce, 0x9a, 0x2b, 0xd2, 0xee, 0xbd, 0x37, 0xda, 0x15, 0x0a, 0x47, 0x0a, 0xaf, 0xac, 0xd6, - 0x78, 0x46, 0xb4, 0xd9, 0x85, 0x6b, 0x4b, 0x5c, 0xa3, 0x06, 0x14, 0xce, 0xe8, 0x85, 0xce, 0x9f, - 0x58, 0xa2, 0x77, 0x60, 0x45, 0x9e, 0x46, 0x37, 0x4a, 0xb5, 0xf9, 0x28, 0xbf, 0x63, 0x6c, 0x9e, - 0xc2, 0xc6, 0x15, 0x2f, 0x4b, 0x0c, 0xfc, 0x20, 0x6b, 0xa0, 0xfa, 0xe0, 0xbd, 0xd7, 0x44, 0xad, - 0xac, 0x1c, 0x38, 0x8c, 0x67, 0x7c, 0xb4, 0x31, 0x5c, 0x5b, 0x82, 0x40, 0x0f, 0xa1, 0x14, 0xe7, - 0xc2, 0x90, 0xb9, 0x78, 0xb3, 0x55, 0x45, 0x37, 0xad, 0xd1, 0xfe, 0x8b, 0x71, 0xc5, 0xa8, 0x2c, - 0x9f, 0x47, 0xb0, 0xc6, 0x1c, 0x7f, 0xec, 0x52, 0x53, 0x95, 0x99, 0xa6, 0xc1, 0xfb, 0x0b, 0xc3, - 0x58, 0x42, 0x14, 0x67, 0x86, 0xe7, 0x07, 0x4a, 0x7f, 0x3f, 0x87, 0x6b, 0x2c, 0xf3, 0x01, 0xfd, - 0x14, 0x36, 0x6c, 0xc2, 0x89, 0xe9, 0x06, 0x72, 0xd2, 0x4c, 0x7d, 0x4e, 0x23, 0x9d, 0x80, 0x05, - 0x7b, 0xbb, 0x84, 0x93, 0x83, 0x40, 0x4c, 0x1e, 0x09, 0x4a, 0xec, 0xad, 0xdb, 0xf3, 0x1f, 0x44, - 0xf9, 0xab, 0x13, 0xc8, 0xb7, 0x5b, 0xfb, 0x0f, 0x06, 0x5c, 0x5f, 0x1a, 0x8b, 0x68, 0x53, 0xdc, - 0xf1, 0x28, 0xe3, 0xc4, 0x0b, 0xc5, 0x94, 0x8b, 0x7b, 0x59, 0x22, 0xec, 0x07, 0x2e, 0xda, 0x4a, - 0xc8, 0x24, 0x47, 0x81, 0xba, 0x5c, 0x50, 0xa2, 0x43, 0x31, 0x10, 0xde, 0x85, 0x8a, 0xbc, 0x06, - 0x69, 0x41, 0x4d, 0x8f, 0xb2, 0x14, 0x08, 0xed, 0x9b, 0x50, 0xe6, 0x64, 0x2c, 0x3e, 0xa9, 0x22, - 0xaf, 0xe0, 0x12, 0x27, 0xe3, 0x7e, 0xe0, 0x32, 0xf1, 0x42, 0xba, 0xbe, 0xf4, 0x4c, 0xff, 0xa7, - 0xb8, 0xee, 0x02, 0x30, 0xfa, 0xcc, 0x74, 0xec, 0x34, 0x30, 0x35, 0x2d, 0x47, 0xf4, 0xd9, 0x60, - 0xb7, 0x1f, 0xb8, 0xb8, 0xcc, 0xe8, 0xb3, 0x81, 0x2d, 0x8c, 0x7d, 0x02, 0x6b, 0x3a, 0x65, 0x9a, - 0xd6, 0xc5, 0xb7, 0xd1, 0xba, 0xa6, 0xf0, 0x8a, 0xd2, 0xed, 0x7f, 0xe5, 0xe1, 0x9d, 0x65, 0xbd, - 0xeb, 0xcd, 0xcf, 0x11, 0xf4, 0x0d, 0x58, 0xf7, 0x44, 0x6b, 0x37, 0xd5, 0xcc, 0x14, 0x7c, 0xd0, - 0xaf, 0x0c, 0x29, 0x3e, 0x10, 0xd2, 0xc7, 0xf4, 0x02, 0xdd, 0x85, 0x8d, 0x2c, 0x4e, 0xb1, 0x44, - 0xa5, 0x7a, 0x3d, 0x45, 0x4a, 0x7a, 0x8a, 0xa1, 0x10, 0x06, 0x11, 0x97, 0x27, 0x58, 0xc1, 0x72, - 0x2d, 0x8e, 0xc7, 0x64, 0x4c, 0xf1, 0xf1, 0x56, 0xde, 0x7a, 0x3c, 0x85, 0xd7, 0x1d, 0xeb, 0x24, - 0xf9, 0x15, 0x22, 0x63, 0x6f, 0xae, 0x4a, 0x2a, 0x7d, 0xf8, 0xf6, 0xde, 0xad, 0x7f, 0x9a, 0x88, - 0xfb, 0xd0, 0xcd, 0xa5, 0x9a, 0xde, 0x10, 0xdb, 0xfc, 0x04, 0x1a, 0x8b, 0x80, 0xff, 0xa5, 0xb1, - 0xb4, 0x4f, 0xa0, 0x9a, 0xf9, 0xf9, 0x22, 0x2a, 0xd1, 0x9f, 0x7a, 0xa6, 0x1f, 0xd8, 0x54, 0xbd, - 0x4e, 0x57, 0x70, 0xd9, 0x9f, 0x7a, 0x87, 0x62, 0x8f, 0xee, 0x42, 0x51, 0x7c, 0xd0, 0xdc, 0xba, - 0x31, 0x1f, 0xbb, 0x80, 0x48, 0xee, 0x4b, 0x4c, 0xfb, 0x1e, 0x94, 0x63, 0x09, 0x7a, 0x0f, 0x6a, - 0x1e, 0xb1, 0x26, 0x8e, 0x4f, 0xe5, 0x34, 0xd1, 0x81, 0x55, 0xb5, 0xec, 0x58, 0x0c, 0x98, 0x01, - 0x94, 0xf4, 0x6f, 0x21, 0xf4, 0x00, 0x4a, 0x6a, 0x18, 0xbd, 0xe6, 0xa7, 0x5a, 0x57, 0x4d, 0x2a, - 0xd9, 0x66, 0x34, 0xf0, 0x51, 0xb1, 0x6c, 0x34, 0xf2, 0x8f, 0x8a, 0xe5, 0x7c, 0xa3, 0xd0, 0xfe, - 0xb5, 0x01, 0x90, 0x62, 0xd0, 0x07, 0x50, 0x4c, 0x9c, 0xd6, 0x97, 0xdb, 0x12, 0x11, 0x60, 0x89, - 0x42, 0xdf, 0x83, 0x72, 0xfc, 0x03, 0x38, 0x79, 0x63, 0xbe, 0xf6, 0x86, 0x13, 0x68, 0xf2, 0xca, - 0x2b, 0xa4, 0xaf, 0xbc, 0xbb, 0x7f, 0x4c, 0xe2, 0x10, 0xf6, 0x51, 0x03, 0x6a, 0xa3, 0xe3, 0x2e, - 0x3e, 0x36, 0x4f, 0x06, 0x9f, 0x0f, 0xf6, 0x70, 0x23, 0x87, 0xae, 0xc1, 0xba, 0x92, 0x7c, 0x76, - 0x84, 0x1f, 0x1f, 0x1c, 0x75, 0x77, 0x47, 0x0d, 0x03, 0x6d, 0xc2, 0x0d, 0x25, 0x7c, 0xb2, 0x77, - 0x8c, 0x07, 0x7d, 0x13, 0xef, 0xf5, 0x8f, 0xf0, 0xee, 0x1e, 0x1e, 0x35, 0xf2, 0x68, 0x1d, 0xaa, - 0xa3, 0xe3, 0xa3, 0x61, 0x6c, 0xa1, 0x80, 0x10, 0xd4, 0xa5, 0x20, 0x35, 0x50, 0x44, 0x37, 0xe1, - 0xba, 0x94, 0x5d, 0xd1, 0x5f, 0x41, 0x25, 0x28, 0xe0, 0x4f, 0x0f, 0x1b, 0xab, 0x08, 0x60, 0xb5, - 0xf7, 0x29, 0x3e, 0x1c, 0x1c, 0x36, 0x4a, 0xbd, 0xde, 0x8b, 0x97, 0xad, 0xdc, 0x97, 0x2f, 0x5b, - 0xb9, 0xaf, 0x5e, 0xb6, 0x8c, 0x5f, 0xcd, 0x5a, 0xc6, 0x9f, 0x66, 0x2d, 0xe3, 0x6f, 0xb3, 0x96, - 0xf1, 0x62, 0xd6, 0x32, 0xfe, 0x31, 0x6b, 0x19, 0xff, 0x9c, 0xb5, 0x72, 0x5f, 0xcd, 0x5a, 0xc6, - 0xef, 0x5e, 0xb5, 0x72, 0x2f, 0x5e, 0xb5, 0x72, 0x5f, 0xbe, 0x6a, 0xe5, 0x3e, 0xaf, 0x65, 0xff, - 0x63, 0x38, 0x5d, 0x95, 0xb9, 0xf9, 0xf0, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x94, 0xdc, 0xc7, - 0x7b, 0x91, 0x10, 0x00, 0x00, + 0xb7, 0x1c, 0xf7, 0xe4, 0x22, 0xca, 0x85, 0xe3, 0x1e, 0xb8, 0x43, 0xf5, 0xc7, 0x8c, 0x46, 0xb2, + 0x92, 0x40, 0x15, 0xb7, 0x9e, 0x5f, 0xff, 0xde, 0xeb, 0xd7, 0xaf, 0xfb, 0xf7, 0x5e, 0x4b, 0xf0, + 0x5d, 0x16, 0xdb, 0x6d, 0xfa, 0x80, 0x5a, 0x9c, 0x32, 0xde, 0x8e, 0x68, 0xfc, 0xd4, 0xe2, 0x61, + 0xe8, 0xb5, 0xe9, 0x79, 0x44, 0x63, 0xd7, 0xa7, 0x01, 0x8f, 0x4e, 0x33, 0x1f, 0xdb, 0x51, 0x1c, + 0xf2, 0x10, 0xd5, 0xa2, 0xf3, 0xed, 0x94, 0xbb, 0xd9, 0x1a, 0x85, 0xe1, 0xc8, 0xa3, 0x6d, 0x39, + 0x77, 0x3a, 0x79, 0xda, 0x76, 0x26, 0x31, 0xe1, 0x6e, 0x18, 0x28, 0xf6, 0xe6, 0xf5, 0x51, 0x38, + 0x0a, 0xe5, 0xb0, 0x2d, 0x46, 0x0a, 0x35, 0xff, 0x9d, 0x87, 0xfa, 0x5e, 0xea, 0x78, 0x18, 0x51, + 0x1b, 0x3d, 0x84, 0xea, 0x73, 0xf7, 0x97, 0x2e, 0x8d, 0x2d, 0x16, 0x51, 0xbb, 0x69, 0xdc, 0x31, + 0xee, 0x56, 0x1f, 0x6c, 0x6e, 0x67, 0x17, 0xdb, 0xfe, 0x2c, 0x8c, 0xcf, 0xbc, 0x90, 0x38, 0xc2, + 0x00, 0x83, 0xa2, 0x4b, 0xe3, 0x0e, 0xd4, 0xbf, 0xd0, 0x73, 0xd2, 0x9c, 0x35, 0xf3, 0x77, 0x0a, + 0x6f, 0xb1, 0x5f, 0xfb, 0x22, 0xf3, 0xc5, 0xd0, 0x43, 0xa8, 0xf9, 0x94, 0xc7, 0xae, 0xad, 0x1d, + 0x14, 0xa4, 0x83, 0xe6, 0xbc, 0x83, 0x27, 0x92, 0x21, 0xcd, 0xab, 0x7e, 0x3a, 0x66, 0xe8, 0x63, + 0xa8, 0xd9, 0xde, 0x84, 0xf1, 0x24, 0xfa, 0xa2, 0x8c, 0xfe, 0xd6, 0xbc, 0x71, 0x4f, 0x31, 0x94, + 0xb5, 0x3d, 0xfb, 0x40, 0xdf, 0x81, 0x72, 0x3c, 0x09, 0x94, 0xe5, 0x8a, 0xb4, 0xbc, 0x31, 0x6f, + 0x89, 0x27, 0x81, 0xb4, 0x2a, 0xc5, 0x6a, 0x80, 0xde, 0x07, 0xb0, 0x43, 0xdf, 0x77, 0xb9, 0xc5, + 0xc6, 0xa4, 0xb9, 0x7a, 0xc7, 0xb8, 0x5b, 0xe9, 0xae, 0x4d, 0x2f, 0xb7, 0x2a, 0x3d, 0x89, 0x0e, + 0xf7, 0x3b, 0xb8, 0xa2, 0x08, 0xc3, 0x31, 0x41, 0x08, 0x8a, 0x9c, 0x8c, 0x58, 0xb3, 0x74, 0xa7, + 0x70, 0xb7, 0x82, 0xe5, 0xd8, 0xfc, 0xab, 0x01, 0xb5, 0x6c, 0x3a, 0x04, 0x29, 0x20, 0x3e, 0x95, + 0x89, 0xaf, 0x60, 0x39, 0x16, 0x39, 0x71, 0x68, 0xe4, 0x85, 0x17, 0x16, 0xe3, 0x34, 0x4a, 0x92, + 0xba, 0x90, 0x93, 0x5d, 0xc9, 0x18, 0x72, 0x1a, 0xe1, 0xaa, 0x93, 0x8e, 0x19, 0xfa, 0x11, 0xd4, + 0xc6, 0x94, 0x78, 0x7c, 0x6c, 0x8f, 0xa9, 0x7d, 0x96, 0x24, 0x74, 0x21, 0x27, 0xfb, 0x92, 0xd1, + 0x13, 0x0c, 0x3c, 0x47, 0x47, 0xdf, 0x84, 0x75, 0x62, 0x8b, 0x8b, 0x64, 0x31, 0xea, 0x51, 0x9b, + 0x87, 0xb1, 0xcc, 0x6a, 0x05, 0xd7, 0x15, 0x3c, 0xd4, 0xa8, 0xf9, 0x77, 0x03, 0x60, 0x16, 0x03, + 0xea, 0x41, 0x35, 0x8a, 0x69, 0x4c, 0x03, 0x87, 0xc6, 0xd4, 0xd1, 0xf7, 0x68, 0x6b, 0x7e, 0xd5, + 0xc1, 0x8c, 0xa0, 0x2c, 0xf7, 0x73, 0x38, 0x6b, 0x85, 0x3e, 0x82, 0x32, 0x3b, 0x23, 0x4f, 0x9f, + 0x86, 0x9e, 0xd3, 0xcc, 0x4b, 0x0f, 0xb7, 0xe7, 0x3d, 0x0c, 0xf5, 0x6c, 0x6a, 0x9e, 0xf2, 0xd1, + 0xb7, 0x21, 0x1f, 0x9d, 0x37, 0x0b, 0xcb, 0x6e, 0xc0, 0xe0, 0xbc, 0x77, 0xd0, 0x4f, 0x4d, 0xf2, + 0xd1, 0x79, 0x77, 0x0d, 0x74, 0xce, 0x2c, 0x7e, 0x11, 0x51, 0xf3, 0xf7, 0x06, 0x54, 0x33, 0x29, + 0x41, 0x1f, 0x43, 0xe1, 0x6c, 0x87, 0x2d, 0xdf, 0xc4, 0xe3, 0x9d, 0xe1, 0x20, 0x74, 0x18, 0xa6, + 0xc4, 0xb9, 0x90, 0xec, 0x6e, 0x69, 0x7a, 0xb9, 0x55, 0x78, 0xbc, 0x33, 0xdc, 0xcf, 0x61, 0x61, + 0x86, 0x7e, 0x08, 0x85, 0xe8, 0xdc, 0x5b, 0xbe, 0x81, 0xc1, 0xf9, 0x41, 0x66, 0x21, 0x65, 0x2a, + 0xb0, 0x1c, 0x16, 0x36, 0xdd, 0x1a, 0x80, 0x3c, 0x07, 0x15, 0xd6, 0x7d, 0xd8, 0xb8, 0xb2, 0x1a, + 0xba, 0x0d, 0x15, 0x71, 0x49, 0x58, 0x44, 0xec, 0xe4, 0xd6, 0xcc, 0x00, 0xf3, 0x08, 0xea, 0xf3, + 0x4b, 0xa0, 0x9b, 0xb0, 0xca, 0xec, 0xd8, 0x8d, 0xb8, 0x26, 0xeb, 0x2f, 0xf4, 0x75, 0xa8, 0xb3, + 0x89, 0x6d, 0x53, 0xc6, 0x2c, 0x3b, 0xf4, 0x26, 0x7e, 0x20, 0x03, 0xae, 0xe0, 0x35, 0x8d, 0xf6, + 0x24, 0x68, 0xfe, 0x02, 0x2a, 0x03, 0xc2, 0xed, 0xb1, 0xbc, 0xac, 0xb7, 0xa1, 0x78, 0x41, 0x7c, + 0x4f, 0x79, 0xea, 0x96, 0xa7, 0x97, 0x5b, 0xc5, 0x9f, 0x77, 0x9e, 0x1c, 0x60, 0x89, 0xa2, 0xfb, + 0xb0, 0xca, 0x49, 0x3c, 0xa2, 0x5c, 0x6f, 0x7d, 0xf1, 0x14, 0x84, 0x9b, 0x63, 0x49, 0xc0, 0x9a, + 0x68, 0xfe, 0x26, 0x0f, 0xd5, 0x0c, 0x8e, 0xbe, 0x05, 0x15, 0x12, 0xb9, 0xd6, 0x28, 0x0e, 0x27, + 0x91, 0x5e, 0xa5, 0x36, 0xbd, 0xdc, 0x2a, 0x77, 0x06, 0xfd, 0x9f, 0x08, 0x0c, 0x97, 0x49, 0xe4, + 0xca, 0x11, 0x6a, 0x43, 0x55, 0x50, 0x9f, 0xd3, 0x98, 0xb9, 0xa1, 0x0e, 0xbe, 0x5b, 0x9f, 0x5e, + 0x6e, 0x41, 0x67, 0xd0, 0x3f, 0x51, 0x28, 0x06, 0x12, 0xb9, 0x7a, 0x2c, 0x94, 0x76, 0xe6, 0x06, + 0x8e, 0xbc, 0x22, 0x15, 0x2c, 0xc7, 0xa9, 0xfa, 0x8a, 0x19, 0xf5, 0xcd, 0x25, 0x78, 0x65, 0x21, + 0xc1, 0x22, 0x6d, 0x1e, 0x39, 0xa5, 0xde, 0x4c, 0x1e, 0xab, 0x2a, 0x6d, 0x12, 0x4d, 0xd4, 0x81, + 0xda, 0x70, 0x8d, 0x04, 0x41, 0xc8, 0xc9, 0xbc, 0x94, 0x4a, 0x92, 0x8b, 0x66, 0x53, 0xa9, 0x9c, + 0x38, 0x6c, 0x5c, 0x91, 0x87, 0xa8, 0x37, 0x22, 0xb3, 0x56, 0x44, 0xf8, 0x58, 0x5c, 0xc7, 0x42, + 0x52, 0x6f, 0x44, 0xd6, 0x07, 0x02, 0xc4, 0x15, 0x41, 0x90, 0x43, 0x74, 0x1f, 0x4a, 0x91, 0xc8, + 0x25, 0x4d, 0x2a, 0xc6, 0xd7, 0x96, 0x1c, 0x80, 0x2a, 0x68, 0x9a, 0x67, 0xfe, 0xd6, 0x80, 0xfa, + 0xbc, 0xa6, 0xd0, 0x7b, 0xb0, 0x96, 0x68, 0x4a, 0xae, 0xab, 0xaf, 0x4d, 0x2d, 0x01, 0xc5, 0x5a, + 0x73, 0x24, 0x12, 0x8f, 0xd4, 0x82, 0x19, 0x52, 0x27, 0x1e, 0xcd, 0xc5, 0x53, 0xf8, 0x2f, 0xe3, + 0xb9, 0x80, 0x6a, 0x46, 0xac, 0xe2, 0x78, 0xa4, 0x77, 0x43, 0x55, 0x50, 0x31, 0x46, 0x2d, 0x80, + 0xf4, 0x34, 0x92, 0x75, 0x33, 0x08, 0xfa, 0x3e, 0xd4, 0x19, 0xe5, 0x56, 0xd2, 0x17, 0x5c, 0x75, + 0xe0, 0xe5, 0x6e, 0x63, 0x7a, 0xb9, 0x55, 0x1b, 0x52, 0xae, 0xdb, 0x41, 0x7f, 0x17, 0xd7, 0xd8, + 0xec, 0xcb, 0x31, 0xff, 0x6c, 0x00, 0xcc, 0xfa, 0x0c, 0xda, 0x51, 0x22, 0x56, 0x25, 0xe0, 0x9d, + 0x2b, 0x22, 0x1e, 0x4a, 0x11, 0x09, 0xe6, 0xa2, 0x86, 0xd1, 0x0e, 0x14, 0xa3, 0x38, 0xf4, 0xb5, + 0x08, 0xcc, 0xc5, 0x12, 0x18, 0xfa, 0x94, 0x8f, 0xe9, 0x84, 0x0d, 0xed, 0x98, 0x44, 0x54, 0x78, + 0xd8, 0xcf, 0x61, 0x69, 0xb1, 0xac, 0xf6, 0x3a, 0xcb, 0x6a, 0xaf, 0x28, 0x5f, 0xba, 0x69, 0xca, + 0x3a, 0x31, 0x2d, 0xc0, 0xda, 0x5c, 0x4c, 0xaf, 0x15, 0xfd, 0x6d, 0xa8, 0x30, 0x1e, 0x53, 0xe2, + 0xbb, 0xc1, 0x48, 0x06, 0x58, 0xc6, 0x33, 0x00, 0xfd, 0x18, 0x36, 0xec, 0xd0, 0x13, 0x6b, 0x88, + 0x18, 0xc4, 0x33, 0x21, 0x74, 0xd2, 0x8a, 0xaa, 0x1e, 0x1c, 0xdb, 0xc9, 0x83, 0x63, 0x7b, 0x57, + 0x3f, 0x38, 0x70, 0x63, 0x66, 0x33, 0x90, 0x26, 0xe8, 0x67, 0xb0, 0xce, 0xa9, 0x1f, 0x79, 0x84, + 0x53, 0xeb, 0x39, 0xf1, 0x26, 0x94, 0x35, 0x8b, 0xf2, 0x02, 0xb4, 0xdf, 0x90, 0xc7, 0xed, 0x63, + 0x6d, 0x72, 0x22, 0x2d, 0xf6, 0x02, 0x1e, 0x5f, 0xe0, 0x3a, 0x9f, 0x03, 0x11, 0x86, 0x35, 0x4e, + 0x4e, 0x3d, 0x6a, 0x85, 0x13, 0x1e, 0x4d, 0x38, 0x6b, 0xae, 0x48, 0xbf, 0x1f, 0xbc, 0xd1, 0xaf, + 0x30, 0x38, 0x52, 0x7c, 0xe5, 0xb5, 0xc6, 0x33, 0xd0, 0x66, 0x07, 0xae, 0x2d, 0x59, 0x1a, 0x35, + 0xa0, 0x70, 0x46, 0x2f, 0x74, 0xfe, 0xc4, 0x10, 0x5d, 0x87, 0x15, 0xb9, 0x1b, 0x5d, 0x28, 0xd5, + 0xc7, 0x47, 0xf9, 0x1d, 0x63, 0xf3, 0x14, 0x36, 0xae, 0xac, 0xb2, 0xc4, 0xc1, 0x0f, 0xb2, 0x0e, + 0xaa, 0x0f, 0xde, 0x7d, 0x4d, 0xd4, 0xca, 0xcb, 0x81, 0xcb, 0x78, 0x66, 0x0d, 0x13, 0xc3, 0xb5, + 0x25, 0x0c, 0xf4, 0x10, 0x4a, 0x49, 0x2e, 0x0c, 0x99, 0x8b, 0x37, 0x7b, 0x55, 0x72, 0xd3, 0x16, + 0xe6, 0x5f, 0x8c, 0x2b, 0x4e, 0xe5, 0xf5, 0x79, 0x04, 0x6b, 0xcc, 0x0d, 0x46, 0x1e, 0xb5, 0xd4, + 0x35, 0xd3, 0x32, 0x78, 0x6f, 0xa1, 0x19, 0x4b, 0x8a, 0xd2, 0xcc, 0xe0, 0xfc, 0x40, 0xd9, 0xef, + 0xe7, 0x70, 0x8d, 0x65, 0x26, 0xd0, 0x4f, 0x61, 0xc3, 0x21, 0x9c, 0x58, 0x5e, 0x28, 0x3b, 0xcd, + 0x24, 0xe0, 0x34, 0xd6, 0x09, 0x58, 0xf0, 0xb7, 0x4b, 0x38, 0x39, 0x08, 0x45, 0xe7, 0x91, 0xa4, + 0xd4, 0xdf, 0xba, 0x33, 0x3f, 0x21, 0xae, 0xbf, 0xda, 0x81, 0x7c, 0xbb, 0x99, 0x7f, 0x30, 0xe0, + 0xc6, 0xd2, 0x58, 0x44, 0x99, 0xe2, 0xae, 0x4f, 0x19, 0x27, 0x7e, 0x24, 0xba, 0x5c, 0x52, 0xcb, + 0x52, 0xb0, 0x17, 0x7a, 0x68, 0x2b, 0x15, 0x93, 0x6c, 0x05, 0xea, 0x70, 0x41, 0x41, 0x87, 0xa2, + 0x21, 0xbc, 0x03, 0x15, 0x79, 0x0c, 0xd2, 0x83, 0xea, 0x1e, 0x65, 0x09, 0x08, 0xeb, 0x5b, 0x50, + 0xe6, 0x64, 0x24, 0xa6, 0xd4, 0x25, 0xaf, 0xe0, 0x12, 0x27, 0xa3, 0x5e, 0xe8, 0x31, 0xf1, 0x42, + 0xba, 0xb1, 0x74, 0x4f, 0xff, 0xa7, 0xb8, 0xee, 0x01, 0x30, 0xfa, 0xcc, 0x72, 0x9d, 0x59, 0x60, + 0xaa, 0x5b, 0x0e, 0xe9, 0xb3, 0xfe, 0x6e, 0x2f, 0xf4, 0x70, 0x99, 0xd1, 0x67, 0x7d, 0x47, 0x38, + 0xfb, 0x04, 0xd6, 0x74, 0xca, 0xb4, 0xac, 0x8b, 0x6f, 0x93, 0x75, 0x4d, 0xf1, 0x95, 0xa4, 0xcd, + 0x7f, 0xe5, 0xe1, 0xfa, 0xb2, 0xda, 0xf5, 0xe6, 0xe7, 0x08, 0xfa, 0x06, 0xac, 0xfb, 0xa2, 0xb4, + 0x5b, 0xaa, 0x67, 0x0a, 0x3d, 0xe8, 0x57, 0x86, 0x84, 0x0f, 0x04, 0xfa, 0x98, 0x5e, 0xa0, 0x7b, + 0xb0, 0x91, 0xe5, 0x29, 0x95, 0xa8, 0x54, 0xaf, 0xcf, 0x98, 0x52, 0x9e, 0xa2, 0x29, 0x44, 0x61, + 0xcc, 0xe5, 0x0e, 0x56, 0xb0, 0x1c, 0x8b, 0xed, 0x31, 0x19, 0x53, 0xb2, 0xbd, 0x95, 0xb7, 0x6e, + 0x4f, 0xf1, 0x75, 0xc5, 0x3a, 0x49, 0x7f, 0x85, 0xc8, 0xd8, 0x9b, 0xab, 0x52, 0x4a, 0x1f, 0xbe, + 0xbd, 0x76, 0xeb, 0x9f, 0x26, 0xe2, 0x3c, 0x74, 0x71, 0xa9, 0xce, 0x4e, 0x88, 0x6d, 0x7e, 0x02, + 0x8d, 0x45, 0xc2, 0xff, 0x52, 0x58, 0xcc, 0x13, 0xa8, 0x66, 0x7e, 0xbe, 0x88, 0x9b, 0x18, 0x4c, + 0x7c, 0x2b, 0x08, 0x1d, 0xaa, 0x5e, 0xa7, 0x2b, 0xb8, 0x1c, 0x4c, 0xfc, 0x43, 0xf1, 0x8d, 0xee, + 0x41, 0x51, 0x4c, 0x68, 0x6d, 0xdd, 0x9c, 0x8f, 0x5d, 0x50, 0xa4, 0xf6, 0x25, 0xc7, 0xfc, 0x00, + 0xca, 0x09, 0x82, 0xde, 0x85, 0x9a, 0x4f, 0xec, 0xb1, 0x1b, 0x50, 0xd9, 0x4d, 0x74, 0x60, 0x55, + 0x8d, 0x1d, 0x8b, 0x06, 0xd3, 0x87, 0x92, 0xfe, 0x2d, 0x84, 0x1e, 0x40, 0x49, 0x35, 0xa3, 0xd7, + 0xfc, 0x54, 0xeb, 0xa8, 0x4e, 0x25, 0xcb, 0x8c, 0x26, 0x3e, 0x2a, 0x96, 0x8d, 0x46, 0xfe, 0x51, + 0xb1, 0x9c, 0x6f, 0x14, 0xcc, 0x5f, 0x1b, 0x00, 0x33, 0x0e, 0x7a, 0x1f, 0x8a, 0xe9, 0xa2, 0xf5, + 0xe5, 0xbe, 0x44, 0x04, 0x58, 0xb2, 0xd0, 0xf7, 0xa0, 0x9c, 0xfc, 0xce, 0x4d, 0xdf, 0x98, 0xaf, + 0x3d, 0xe1, 0x94, 0x9a, 0xbe, 0xf2, 0x0a, 0xb3, 0x57, 0xde, 0xbd, 0x3f, 0xa6, 0x71, 0x08, 0xff, + 0xa8, 0x01, 0xb5, 0xe1, 0x71, 0x07, 0x1f, 0x5b, 0x27, 0xfd, 0xcf, 0xfb, 0x7b, 0xb8, 0x91, 0x43, + 0xd7, 0x60, 0x5d, 0x21, 0x9f, 0x1d, 0xe1, 0xc7, 0x07, 0x47, 0x9d, 0xdd, 0x61, 0xc3, 0x40, 0x9b, + 0x70, 0x53, 0x81, 0x4f, 0xf6, 0x8e, 0x71, 0xbf, 0x67, 0xe1, 0xbd, 0xde, 0x11, 0xde, 0xdd, 0xc3, + 0xc3, 0x46, 0x1e, 0xad, 0x43, 0x75, 0x78, 0x7c, 0x34, 0x48, 0x3c, 0x14, 0x10, 0x82, 0xba, 0x04, + 0x66, 0x0e, 0x8a, 0xe8, 0x16, 0xdc, 0x90, 0xd8, 0x15, 0xfb, 0x15, 0x54, 0x82, 0x02, 0xfe, 0xf4, + 0xb0, 0xb1, 0x8a, 0x00, 0x56, 0xbb, 0x9f, 0xe2, 0xc3, 0xfe, 0x61, 0xa3, 0xd4, 0xed, 0xbe, 0x78, + 0xd9, 0xca, 0x7d, 0xf9, 0xb2, 0x95, 0xfb, 0xea, 0x65, 0xcb, 0xf8, 0xd5, 0xb4, 0x65, 0xfc, 0x69, + 0xda, 0x32, 0xfe, 0x36, 0x6d, 0x19, 0x2f, 0xa6, 0x2d, 0xe3, 0x1f, 0xd3, 0x96, 0xf1, 0xcf, 0x69, + 0x2b, 0xf7, 0xd5, 0xb4, 0x65, 0xfc, 0xee, 0x55, 0x2b, 0xf7, 0xe2, 0x55, 0x2b, 0xf7, 0xe5, 0xab, + 0x56, 0xee, 0xf3, 0x5a, 0xf6, 0xaf, 0x84, 0xd3, 0x55, 0x99, 0x9b, 0x0f, 0xff, 0x13, 0x00, 0x00, + 0xff, 0xff, 0x11, 0xaf, 0xeb, 0x55, 0x78, 0x10, 0x00, 0x00, } func (x ActionType) String() string { diff --git a/src/e2e_test/perf_tool/experimentpb/experiment.proto b/src/e2e_test/perf_tool/experimentpb/experiment.proto index d3c7d4a40dc..d5482d5d249 100644 --- a/src/e2e_test/perf_tool/experimentpb/experiment.proto +++ b/src/e2e_test/perf_tool/experimentpb/experiment.proto @@ -23,7 +23,7 @@ package px.perf_tool; option go_package = "experimentpb"; import "google/protobuf/duration.proto"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; // ExperimentSpec fully specifies how to run a single perf experiment. // An Experiment is fully specified by specifying all of the following: diff --git a/src/e2e_test/perf_tool/pkg/cluster/local/local.go b/src/e2e_test/perf_tool/pkg/cluster/local/local.go index d41efa662d3..9ed88de54f8 100644 --- a/src/e2e_test/perf_tool/pkg/cluster/local/local.go +++ b/src/e2e_test/perf_tool/pkg/cluster/local/local.go @@ -28,8 +28,7 @@ import ( ) // ClusterProvider uses whatever cluster your local kubeconfig points to. -type ClusterProvider struct { -} +type ClusterProvider struct{} var _ cluster.Provider = &ClusterProvider{} diff --git a/src/e2e_test/perf_tool/pkg/deploy/steps/common.go b/src/e2e_test/perf_tool/pkg/deploy/steps/common.go index 18f178cc81d..d4f18a96545 100644 --- a/src/e2e_test/perf_tool/pkg/deploy/steps/common.go +++ b/src/e2e_test/perf_tool/pkg/deploy/steps/common.go @@ -102,7 +102,7 @@ func (r *renderedYAML) patch(patches []*experimentpb.PatchSpec) error { } defer os.RemoveAll(tmpdir) - if err := os.WriteFile(path.Join(tmpdir, "resources.yaml"), r.yaml, 0666); err != nil { + if err := os.WriteFile(path.Join(tmpdir, "resources.yaml"), r.yaml, 0o666); err != nil { return err } diff --git a/src/e2e_test/perf_tool/pkg/suites/experiments.go b/src/e2e_test/perf_tool/pkg/suites/experiments.go index da565b3f015..998b31c7197 100644 --- a/src/e2e_test/perf_tool/pkg/suites/experiments.go +++ b/src/e2e_test/perf_tool/pkg/suites/experiments.go @@ -25,7 +25,6 @@ import ( "github.com/gogo/protobuf/types" "px.dev/pixie/src/e2e_test/perf_tool/experimentpb" - pb "px.dev/pixie/src/e2e_test/perf_tool/experimentpb" ) // HTTPLoadTestExperiment is an experiment that runs a simple client/server http loadtest. @@ -35,19 +34,19 @@ func HTTPLoadTestExperiment( metricPeriod time.Duration, predeployDur time.Duration, dur time.Duration, -) *pb.ExperimentSpec { - e := &pb.ExperimentSpec{ +) *experimentpb.ExperimentSpec { + e := &experimentpb.ExperimentSpec{ VizierSpec: VizierWorkload(), - WorkloadSpecs: []*pb.WorkloadSpec{ + WorkloadSpecs: []*experimentpb.WorkloadSpec{ HTTPLoadTestWorkload(numConnections, targetRPS, true), }, - MetricSpecs: []*pb.MetricSpec{ + MetricSpecs: []*experimentpb.MetricSpec{ ProcessStatsMetrics(metricPeriod), // Stagger the second query a little bit because of query stability issues. HeapMetrics(metricPeriod + (2 * time.Second)), HTTPDataLossMetric(metricPeriod), }, - RunSpec: &pb.RunSpec{ + RunSpec: &experimentpb.RunSpec{ Actions: []*experimentpb.ActionSpec{ { Type: experimentpb.START_VIZIER, @@ -87,18 +86,18 @@ func K8ssandraExperiment( metricPeriod time.Duration, predeployDur time.Duration, dur time.Duration, -) *pb.ExperimentSpec { - e := &pb.ExperimentSpec{ +) *experimentpb.ExperimentSpec { + e := &experimentpb.ExperimentSpec{ VizierSpec: VizierWorkload(), - WorkloadSpecs: []*pb.WorkloadSpec{ + WorkloadSpecs: []*experimentpb.WorkloadSpec{ K8ssandraWorkload(), }, - MetricSpecs: []*pb.MetricSpec{ + MetricSpecs: []*experimentpb.MetricSpec{ ProcessStatsMetrics(metricPeriod), // Stagger the second query a little bit because of query stability issues. HeapMetrics(metricPeriod + (2 * time.Second)), }, - RunSpec: &pb.RunSpec{ + RunSpec: &experimentpb.RunSpec{ Actions: []*experimentpb.ActionSpec{ { Type: experimentpb.START_VIZIER, @@ -137,18 +136,18 @@ func SockShopExperiment( metricPeriod time.Duration, predeployDur time.Duration, dur time.Duration, -) *pb.ExperimentSpec { - e := &pb.ExperimentSpec{ +) *experimentpb.ExperimentSpec { + e := &experimentpb.ExperimentSpec{ VizierSpec: VizierWorkload(), - WorkloadSpecs: []*pb.WorkloadSpec{ + WorkloadSpecs: []*experimentpb.WorkloadSpec{ SockShopWorkload(), }, - MetricSpecs: []*pb.MetricSpec{ + MetricSpecs: []*experimentpb.MetricSpec{ ProcessStatsMetrics(metricPeriod), // Stagger the second query a little bit because of query stability issues. HeapMetrics(metricPeriod + (2 * time.Second)), }, - RunSpec: &pb.RunSpec{ + RunSpec: &experimentpb.RunSpec{ Actions: []*experimentpb.ActionSpec{ { Type: experimentpb.START_VIZIER, @@ -187,18 +186,18 @@ func OnlineBoutiqueExperiment( metricPeriod time.Duration, predeployDur time.Duration, dur time.Duration, -) *pb.ExperimentSpec { - e := &pb.ExperimentSpec{ +) *experimentpb.ExperimentSpec { + e := &experimentpb.ExperimentSpec{ VizierSpec: VizierWorkload(), - WorkloadSpecs: []*pb.WorkloadSpec{ + WorkloadSpecs: []*experimentpb.WorkloadSpec{ OnlineBoutiqueWorkload(), }, - MetricSpecs: []*pb.MetricSpec{ + MetricSpecs: []*experimentpb.MetricSpec{ ProcessStatsMetrics(metricPeriod), // Stagger the second query a little bit because of query stability issues. HeapMetrics(metricPeriod + (2 * time.Second)), }, - RunSpec: &pb.RunSpec{ + RunSpec: &experimentpb.RunSpec{ Actions: []*experimentpb.ActionSpec{ { Type: experimentpb.START_VIZIER, @@ -237,18 +236,18 @@ func KafkaExperiment( metricPeriod time.Duration, predeployDur time.Duration, dur time.Duration, -) *pb.ExperimentSpec { - e := &pb.ExperimentSpec{ +) *experimentpb.ExperimentSpec { + e := &experimentpb.ExperimentSpec{ VizierSpec: VizierWorkload(), - WorkloadSpecs: []*pb.WorkloadSpec{ + WorkloadSpecs: []*experimentpb.WorkloadSpec{ KafkaWorkload(), }, - MetricSpecs: []*pb.MetricSpec{ + MetricSpecs: []*experimentpb.MetricSpec{ ProcessStatsMetrics(metricPeriod), // Stagger the second query a little bit because of query stability issues. HeapMetrics(metricPeriod + (2 * time.Second)), }, - RunSpec: &pb.RunSpec{ + RunSpec: &experimentpb.RunSpec{ Actions: []*experimentpb.ActionSpec{ { Type: experimentpb.START_VIZIER, @@ -288,19 +287,19 @@ func HTTPLoadApplicationOverheadExperiment( numConnections int, targetRPS int, metricPeriod time.Duration, -) *pb.ExperimentSpec { +) *experimentpb.ExperimentSpec { burninDur := 5 * time.Minute vizierDur := 10 * time.Minute noVizierDur := vizierDur - e := &pb.ExperimentSpec{ + e := &experimentpb.ExperimentSpec{ VizierSpec: VizierWorkload(), - WorkloadSpecs: []*pb.WorkloadSpec{ + WorkloadSpecs: []*experimentpb.WorkloadSpec{ HTTPLoadTestWorkload(numConnections, targetRPS, false), }, - MetricSpecs: []*pb.MetricSpec{ + MetricSpecs: []*experimentpb.MetricSpec{ addActionSelector(ProtocolLoadtestPromMetrics(metricPeriod), "no_vizier"), }, - RunSpec: &pb.RunSpec{ + RunSpec: &experimentpb.RunSpec{ Actions: []*experimentpb.ActionSpec{ { Type: experimentpb.START_WORKLOADS, @@ -348,7 +347,7 @@ func HTTPLoadApplicationOverheadExperiment( return e } -func addTags(e *pb.ExperimentSpec, tags ...string) *pb.ExperimentSpec { +func addTags(e *experimentpb.ExperimentSpec, tags ...string) *experimentpb.ExperimentSpec { if e.Tags == nil { e.Tags = []string{} } @@ -356,7 +355,7 @@ func addTags(e *pb.ExperimentSpec, tags ...string) *pb.ExperimentSpec { return e } -func addActionSelector(m *pb.MetricSpec, selector string) *pb.MetricSpec { +func addActionSelector(m *experimentpb.MetricSpec, selector string) *experimentpb.MetricSpec { m.ActionSelector = selector return m } diff --git a/src/e2e_test/perf_tool/pkg/suites/workloads.go b/src/e2e_test/perf_tool/pkg/suites/workloads.go index 28e68ce119f..e0679e5cfb8 100644 --- a/src/e2e_test/perf_tool/pkg/suites/workloads.go +++ b/src/e2e_test/perf_tool/pkg/suites/workloads.go @@ -141,6 +141,7 @@ func SockShopWorkload() *pb.WorkloadSpec { Healthchecks: HTTPHealthChecks("px-sock-shop", true), } } + func K8ssandraWorkload() *pb.WorkloadSpec { return &pb.WorkloadSpec{ Name: "px-python-demo", diff --git a/src/e2e_test/profiler_loadtest/go/main.go b/src/e2e_test/profiler_loadtest/go/main.go index cf4ba4cbf8b..7dcfed2a6e1 100644 --- a/src/e2e_test/profiler_loadtest/go/main.go +++ b/src/e2e_test/profiler_loadtest/go/main.go @@ -24,12 +24,11 @@ import ( "fmt" "log" "math/rand" + "net/http" + _ "net/http/pprof" "os" "strconv" "time" - - "net/http" - _ "net/http/pprof" ) type env struct { diff --git a/src/e2e_test/protocol_loadtest/grpc/grpc.go b/src/e2e_test/protocol_loadtest/grpc/grpc.go index efbe703eea1..c6d3e4b2f96 100644 --- a/src/e2e_test/protocol_loadtest/grpc/grpc.go +++ b/src/e2e_test/protocol_loadtest/grpc/grpc.go @@ -27,7 +27,6 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - // Enables gzip encoding for GRPC. _ "google.golang.org/grpc/encoding/gzip" @@ -35,8 +34,7 @@ import ( "px.dev/pixie/src/e2e_test/util" ) -type loadTestServer struct { -} +type loadTestServer struct{} // Implements the Unary loadtest endpoint. func (lt *loadTestServer) Unary(ctx context.Context, req *loadtestpb.UnaryRequest) (*loadtestpb.UnaryReply, error) { diff --git a/src/e2e_test/protocol_loadtest/grpc/loadtestpb/BUILD.bazel b/src/e2e_test/protocol_loadtest/grpc/loadtestpb/BUILD.bazel index 5412f17dcf7..25599a01b8b 100644 --- a/src/e2e_test/protocol_loadtest/grpc/loadtestpb/BUILD.bazel +++ b/src/e2e_test/protocol_loadtest/grpc/loadtestpb/BUILD.bazel @@ -22,7 +22,7 @@ pl_proto_library( name = "service_pl_proto", srcs = ["service.proto"], deps = [ - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -30,7 +30,7 @@ pl_cc_proto_library( name = "service_pl_cc_proto", proto = ":service_pl_proto", deps = [ - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/e2e_test/vizier/exectime/cmd/benchmark.go b/src/e2e_test/vizier/exectime/cmd/benchmark.go index 143e94b2205..28144467c9f 100644 --- a/src/e2e_test/vizier/exectime/cmd/benchmark.go +++ b/src/e2e_test/vizier/exectime/cmd/benchmark.go @@ -273,13 +273,15 @@ func isMutation(s *script.ExecutableScript) bool { return strings.Contains(s.ScriptString, "pxtrace") } -type distributionMap map[string]Distribution -type distributionContainer struct { - Type string - TimeDist *TimeDistribution `json:",omitempty"` - BytesDist *BytesDistribution `json:",omitempty"` - ErrorDist *ErrorDistribution `json:",omitempty"` -} +type ( + distributionMap map[string]Distribution + distributionContainer struct { + Type string + TimeDist *TimeDistribution `json:",omitempty"` + BytesDist *BytesDistribution `json:",omitempty"` + ErrorDist *ErrorDistribution `json:",omitempty"` + } +) func (dm *distributionMap) MarshalJSON() ([]byte, error) { containers := make(map[string]*distributionContainer, len(*dm)) @@ -331,8 +333,7 @@ type ScriptExecData struct { } // stdoutTableWriter writes the execStats out to a table in stdout. Implements ExecStatsWriter. -type stdoutTableWriter struct { -} +type stdoutTableWriter struct{} func sortByKeys(data *map[string]*ScriptExecData) []*ScriptExecData { sorted := make([]string, 0) @@ -412,7 +413,6 @@ px.display(df[['pod', 'service', 'namespace', 'node']]) // Accumulate the streamed data and block until all data is received. tw := vizier.NewStreamOutputAdapter(ctx, resp, vizier.FormatInMemory, nil) err = tw.Finish() - if err != nil { log.WithError(err).Infof("Error '%s' on '%s'", vizier.FormatErrorMessage(err), execScript.ScriptName) return nil, err diff --git a/src/e2e_test/vizier/exectime/cmd/compare.go b/src/e2e_test/vizier/exectime/cmd/compare.go index d1f6ad236a0..1ae45530fab 100644 --- a/src/e2e_test/vizier/exectime/cmd/compare.go +++ b/src/e2e_test/vizier/exectime/cmd/compare.go @@ -61,21 +61,21 @@ func (t *TimeDistribution) Diff(other Distribution) (DistributionDiff, error) { } // Diff computes the difference between this distribution and another bytes distribution. -func (t *BytesDistribution) Diff(other Distribution) (DistributionDiff, error) { +func (d *BytesDistribution) Diff(other Distribution) (DistributionDiff, error) { otherBytesDist, ok := other.(*BytesDistribution) if !ok { return nil, errors.New("BytesDistribution.Diff must be called with another BytesDistribution as argument") } - return &bytesDistributionDiff{t, otherBytesDist}, nil + return &bytesDistributionDiff{d, otherBytesDist}, nil } // Diff computes the difference between this distribution and another error distribution. -func (t *ErrorDistribution) Diff(other Distribution) (DistributionDiff, error) { +func (d *ErrorDistribution) Diff(other Distribution) (DistributionDiff, error) { otherErrorDist, ok := other.(*ErrorDistribution) if !ok { return nil, errors.New("ErrorDistribution.Diff must be called with another ErrorDistribution as argument") } - return &errorDistributionDiff{t, otherErrorDist}, nil + return &errorDistributionDiff{d, otherErrorDist}, nil } type timeDistributionDiff struct { diff --git a/src/e2e_test/vizier/planner/all_scripts_test.go b/src/e2e_test/vizier/planner/all_scripts_test.go index 4991c978878..49513d3075a 100644 --- a/src/e2e_test/vizier/planner/all_scripts_test.go +++ b/src/e2e_test/vizier/planner/all_scripts_test.go @@ -35,15 +35,14 @@ import ( "github.com/gogo/protobuf/types" "github.com/stretchr/testify/require" - "px.dev/pixie/src/carnot/planner/compilerpb" - "px.dev/pixie/src/e2e_test/vizier/planner/dump_schemas/godumpschemas" - "px.dev/pixie/src/api/proto/uuidpb" "px.dev/pixie/src/api/proto/vispb" "px.dev/pixie/src/carnot/goplanner" + "px.dev/pixie/src/carnot/planner/compilerpb" "px.dev/pixie/src/carnot/planner/distributedpb" "px.dev/pixie/src/carnot/planner/plannerpb" "px.dev/pixie/src/carnot/udfspb" + "px.dev/pixie/src/e2e_test/vizier/planner/dump_schemas/godumpschemas" "px.dev/pixie/src/table_store/schemapb" "px.dev/pixie/src/utils" funcs "px.dev/pixie/src/vizier/funcs/go" diff --git a/src/e2e_test/vizier/planner/dump_schemas/godumpschemas/dumpschemas.go b/src/e2e_test/vizier/planner/dump_schemas/godumpschemas/dumpschemas.go index 19ca7b457da..225dc34cf56 100644 --- a/src/e2e_test/vizier/planner/dump_schemas/godumpschemas/dumpschemas.go +++ b/src/e2e_test/vizier/planner/dump_schemas/godumpschemas/dumpschemas.go @@ -25,6 +25,7 @@ package godumpschemas // #include // #include "src/e2e_test/vizier/planner/dump_schemas/dump_schemas.h" import "C" + import ( "errors" "fmt" @@ -37,7 +38,6 @@ import ( // DumpSchemas dumps all the table schemas from stirling. func DumpSchemas() (*schemapb.Schema, error) { - var resLen C.int res := C.DumpSchemas(&resLen) defer C.SchemaStrFree(res) diff --git a/src/operator/apis/px.dev/v1alpha1/vizier_types.go b/src/operator/apis/px.dev/v1alpha1/vizier_types.go index 8956b75374e..51232a5bf35 100644 --- a/src/operator/apis/px.dev/v1alpha1/vizier_types.go +++ b/src/operator/apis/px.dev/v1alpha1/vizier_types.go @@ -19,7 +19,7 @@ // Generate the code for deep-copying the CRD in go. //go:generate controller-gen object // Generate the CRD YAMLs. -//go:generate controller-gen crd:trivialVersions=true rbac:roleName=operator-role webhook output:crd:artifacts:config=crd output:crd:dir:=../../../../../k8s/operator/crd/base +//go:generate controller-gen crd rbac:roleName=operator-role webhook output:crd:artifacts:config=crd output:crd:dir:=../../../../../k8s/operator/crd/base // Generate the clientset. //go:generate client-gen --input=px.dev/v1alpha1 --clientset-name=versioned --go-header-file=/dev/null --input-base=px.dev/pixie/src/operator/apis --output-package=px.dev/pixie/src/operator/client diff --git a/src/operator/apis/px.dev/v1alpha1/zz_generated.deepcopy.go b/src/operator/apis/px.dev/v1alpha1/zz_generated.deepcopy.go index d64a8011688..c60295643b2 100644 --- a/src/operator/apis/px.dev/v1alpha1/zz_generated.deepcopy.go +++ b/src/operator/apis/px.dev/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT. diff --git a/src/operator/controllers/monitor.go b/src/operator/controllers/monitor.go index db727391bc7..8d509066e06 100644 --- a/src/operator/controllers/monitor.go +++ b/src/operator/controllers/monitor.go @@ -46,8 +46,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "px.dev/pixie/src/api/proto/cloudpb" - "px.dev/pixie/src/operator/apis/px.dev/v1alpha1" - pixiev1alpha1 "px.dev/pixie/src/operator/apis/px.dev/v1alpha1" + "px.dev/pixie/src/operator/apis/px.dev/v1alpha1" //nolint:staticcheck + pixiev1alpha1 "px.dev/pixie/src/operator/apis/px.dev/v1alpha1" //nolint:staticcheck "px.dev/pixie/src/shared/status" "px.dev/pixie/src/utils/shared/k8s" ) @@ -415,7 +415,7 @@ func getStatefulMetadataPendingState(pods *concurrentPodMap, vz *v1alpha1.Vizier } for _, metadataPod := range labelMap { for _, ownerRef := range metadataPod.pod.OwnerReferences { - if !(ownerRef.Kind == "StatefulSet") { + if ownerRef.Kind != "StatefulSet" { continue } if metadataPod.pod.Status.Phase != v1.PodPending { @@ -672,7 +672,7 @@ func (m *VizierMonitor) repairVizier(state *vizierState) error { } // Delete pod if nats pod failed - if state.Reason == status.NATSPodFailed { + if state.Reason == status.NATSPodFailed { //nolint:staticcheck err := m.clientset.CoreV1().Pods(m.namespace).Delete(m.ctx, natsPodName, metav1.DeleteOptions{}) if err != nil { log.WithError(err).Error("Failed to delete NATS pod") @@ -808,7 +808,6 @@ func queryPodStatusz(client HTTPClient, pod *v1.Pod) (bool, string) { } body, err := io.ReadAll(resp.Body) - if err != nil { log.WithError(err).Error("Error reading the response body") return false, "" diff --git a/src/operator/controllers/monitor_test.go b/src/operator/controllers/monitor_test.go index 52dba094bfc..9467d85fb1d 100644 --- a/src/operator/controllers/monitor_test.go +++ b/src/operator/controllers/monitor_test.go @@ -1056,10 +1056,11 @@ func TestMonitor_getVizierVersionState(t *testing.T) { }). Return(&cloudpb.ArtifactSet{ Name: "vizier", - Artifact: []*cloudpb.Artifact{{ - VersionStr: test.latestVersion, - Timestamp: &types.Timestamp{Seconds: 10}, - }, + Artifact: []*cloudpb.Artifact{ + { + VersionStr: test.latestVersion, + Timestamp: &types.Timestamp{Seconds: 10}, + }, }, }, nil) diff --git a/src/operator/controllers/node_watcher.go b/src/operator/controllers/node_watcher.go index 372695c028d..5c9526628de 100644 --- a/src/operator/controllers/node_watcher.go +++ b/src/operator/controllers/node_watcher.go @@ -37,9 +37,7 @@ const ( degradedThreshold = .25 ) -var ( - kernelMinVersion = semver.Version{Major: 4, Minor: 14, Patch: 0} -) +var kernelMinVersion = semver.Version{Major: 4, Minor: 14, Patch: 0} func getNodeKernelVersion(node *v1.Node) string { version := node.Status.NodeInfo.KernelVersion diff --git a/src/operator/controllers/vizier_controller.go b/src/operator/controllers/vizier_controller.go index 364bd636193..9ad528367a5 100644 --- a/src/operator/controllers/vizier_controller.go +++ b/src/operator/controllers/vizier_controller.go @@ -810,7 +810,8 @@ func convertResourceType(originalLst v1.ResourceList) *vizierconfigpb.ResourceLi // generateVizierYAMLsConfig is responsible retrieving a yaml map of configurations from // Pixie Cloud. func generateVizierYAMLsConfig(ctx context.Context, ns string, k8sVersion string, vz *v1alpha1.Vizier, conn *grpc.ClientConn) (*cloudpb.ConfigForVizierResponse, - error) { + error, +) { client := cloudpb.NewConfigServiceClient(conn) req := &cloudpb.ConfigForVizierRequest{ diff --git a/src/operator/manager.go b/src/operator/manager.go index 4de5d5b08ee..69ecf9aa47c 100644 --- a/src/operator/manager.go +++ b/src/operator/manager.go @@ -32,12 +32,9 @@ import ( "px.dev/pixie/src/operator/apis/px.dev/v1alpha1" "px.dev/pixie/src/operator/controllers" "px.dev/pixie/src/utils/shared/k8s" - // +kubebuilder:scaffold:imports ) -var ( - scheme = runtime.NewScheme() -) +var scheme = runtime.NewScheme() const ( leaderElectionID = "27ad4010.px.dev" diff --git a/src/pixie_cli/pkg/auth/login.go b/src/pixie_cli/pkg/auth/login.go index a781195bbb8..72ca410abf5 100644 --- a/src/pixie_cli/pkg/auth/login.go +++ b/src/pixie_cli/pkg/auth/login.go @@ -47,13 +47,15 @@ import ( apiutils "px.dev/pixie/src/utils" ) -var errUserChallengeTimeout = errors.New("timeout waiting for user") -var errBrowserFailed = errors.New("browser failed to open") -var errServerListenerFailed = errors.New("failed to start up local server") -var errUserNotRegistered = errors.New("user is not registered. Please sign up") -var localServerRedirectURL = "http://localhost:8085/auth_complete" -var localServerPort = int32(8085) -var sentSegmentAlias = false +var ( + errUserChallengeTimeout = errors.New("timeout waiting for user") + errBrowserFailed = errors.New("browser failed to open") + errServerListenerFailed = errors.New("failed to start up local server") + errUserNotRegistered = errors.New("user is not registered. Please sign up") + localServerRedirectURL = "http://localhost:8085/auth_complete" + localServerPort = int32(8085) + sentSegmentAlias = false +) // SaveRefreshToken saves the refresh token in default spot. func SaveRefreshToken(token *RefreshToken) error { @@ -62,7 +64,7 @@ func SaveRefreshToken(token *RefreshToken) error { return err } - f, err := os.OpenFile(pixieAuthFilePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600) + f, err := os.OpenFile(pixieAuthFilePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o600) if err != nil { return err } @@ -287,7 +289,6 @@ func (p *PixieCloudLogin) tryBrowserAuth() (*RefreshToken, error) { } refreshToken, err := p.getRefreshToken(accessToken, "") - if err != nil { sendError(w, err) results <- result{nil, err} diff --git a/src/pixie_cli/pkg/cmd/api_key.go b/src/pixie_cli/pkg/cmd/api_key.go index 3f6a8101544..0486d4dcf07 100644 --- a/src/pixie_cli/pkg/cmd/api_key.go +++ b/src/pixie_cli/pkg/cmd/api_key.go @@ -141,8 +141,10 @@ var ListAPIKeyCmd = &cobra.Command{ defer w.Finish() w.SetHeader("api-keys", []string{"ID", "Key", "CreatedAt", "Description"}) for _, k := range keys { - _ = w.Write([]interface{}{utils2.UUIDFromProtoOrNil(k.ID), "", k.CreatedAt, - k.Desc}) + _ = w.Write([]interface{}{ + utils2.UUIDFromProtoOrNil(k.ID), "", k.CreatedAt, + k.Desc, + }) } }, } @@ -174,8 +176,10 @@ var LookupAPIKeyCmd = &cobra.Command{ w := components.CreateStreamWriter(format, os.Stdout) defer w.Finish() w.SetHeader("api-keys", []string{"ID", "Key", "CreatedAt", "Description"}) - _ = w.Write([]interface{}{utils2.UUIDFromProtoOrNil(k.ID), "", k.CreatedAt, - k.Desc}) + _ = w.Write([]interface{}{ + utils2.UUIDFromProtoOrNil(k.ID), "", k.CreatedAt, + k.Desc, + }) }, } @@ -205,8 +209,10 @@ var GetAPIKeyCmd = &cobra.Command{ w := components.CreateStreamWriter(format, os.Stdout) defer w.Finish() w.SetHeader("api-keys", []string{"ID", "Key", "CreatedAt", "Description"}) - _ = w.Write([]interface{}{utils2.UUIDFromProtoOrNil(k.ID), k.Key, k.CreatedAt, - k.Desc}) + _ = w.Write([]interface{}{ + utils2.UUIDFromProtoOrNil(k.ID), k.Key, k.CreatedAt, + k.Desc, + }) }, } diff --git a/src/pixie_cli/pkg/cmd/demo.go b/src/pixie_cli/pkg/cmd/demo.go index f87d2f9af3f..51ccd36c839 100644 --- a/src/pixie_cli/pkg/cmd/demo.go +++ b/src/pixie_cli/pkg/cmd/demo.go @@ -51,8 +51,10 @@ import ( const manifestFile = "manifest.json" -var errNamespaceAlreadyExists = errors.New("namespace already exists") -var errCertMgrDoesNotExist = errors.New("cert-manager does not exist") +var ( + errNamespaceAlreadyExists = errors.New("namespace already exists") + errCertMgrDoesNotExist = errors.New("cert-manager does not exist") +) func init() { DemoCmd.PersistentFlags().String("artifacts", "https://storage.googleapis.com/pixie-prod-artifacts/prod-demo-apps", "The path to the demo apps") diff --git a/src/pixie_cli/pkg/cmd/deployment_key.go b/src/pixie_cli/pkg/cmd/deployment_key.go index c8d60eff146..0be3adad1e2 100644 --- a/src/pixie_cli/pkg/cmd/deployment_key.go +++ b/src/pixie_cli/pkg/cmd/deployment_key.go @@ -142,8 +142,10 @@ var ListDeployKeyCmd = &cobra.Command{ defer w.Finish() w.SetHeader("deployment-keys", []string{"ID", "Key", "CreatedAt", "Description"}) for _, k := range keys { - _ = w.Write([]interface{}{utils2.UUIDFromProtoOrNil(k.ID), "", k.CreatedAt, - k.Desc}) + _ = w.Write([]interface{}{ + utils2.UUIDFromProtoOrNil(k.ID), "", k.CreatedAt, + k.Desc, + }) } }, } @@ -176,8 +178,10 @@ var LookupDeployKeyCmd = &cobra.Command{ w := components.CreateStreamWriter(format, os.Stdout) defer w.Finish() w.SetHeader("api-keys", []string{"ID", "Key", "CreatedAt", "Description"}) - _ = w.Write([]interface{}{utils2.UUIDFromProtoOrNil(k.ID), "", k.CreatedAt, - k.Desc}) + _ = w.Write([]interface{}{ + utils2.UUIDFromProtoOrNil(k.ID), "", k.CreatedAt, + k.Desc, + }) }, } @@ -207,8 +211,10 @@ var GetDeployKeyCmd = &cobra.Command{ w := components.CreateStreamWriter(format, os.Stdout) defer w.Finish() w.SetHeader("deployment-keys", []string{"ID", "Key", "CreatedAt", "Description"}) - _ = w.Write([]interface{}{utils2.UUIDFromProtoOrNil(k.ID), k.Key, k.CreatedAt, - k.Desc}) + _ = w.Write([]interface{}{ + utils2.UUIDFromProtoOrNil(k.ID), k.Key, k.CreatedAt, + k.Desc, + }) }, } diff --git a/src/pixie_cli/pkg/cmd/get.go b/src/pixie_cli/pkg/cmd/get.go index ddbde0d70f7..f44f128dc07 100644 --- a/src/pixie_cli/pkg/cmd/get.go +++ b/src/pixie_cli/pkg/cmd/get.go @@ -126,8 +126,10 @@ var GetViziersCmd = &cobra.Command{ time.Since(time.Unix(0, vz.LastHeartbeatNs)).Nanoseconds())) } } - _ = w.Write([]interface{}{vz.ClusterName, utils.UUIDFromProtoOrNil(vz.ID), vz.ClusterVersion, - prettyVersion(vz.OperatorVersion), prettyVersion(vz.VizierVersion), lastHeartbeat, vz.Status, vz.StatusMessage}) + _ = w.Write([]interface{}{ + vz.ClusterName, utils.UUIDFromProtoOrNil(vz.ID), vz.ClusterVersion, + prettyVersion(vz.OperatorVersion), prettyVersion(vz.VizierVersion), lastHeartbeat, vz.Status, vz.StatusMessage, + }) } }, } diff --git a/src/pixie_cli/pkg/cmd/run.go b/src/pixie_cli/pkg/cmd/run.go index aa5d2a0a890..b4e708e53f5 100644 --- a/src/pixie_cli/pkg/cmd/run.go +++ b/src/pixie_cli/pkg/cmd/run.go @@ -198,7 +198,6 @@ func createNewCobraCommand() *cobra.Command { ctx, cleanup := utils.WithSignalCancellable(context.Background()) defer cleanup() err = vizier.RunScriptAndOutputResults(ctx, conns, execScript, format, useEncryption) - if err != nil { vzErr, ok := err.(*vizier.ScriptExecutionError) switch { diff --git a/src/pixie_cli/pkg/cmd/script_utils.go b/src/pixie_cli/pkg/cmd/script_utils.go index 9bcbc250e63..d296ec1dd20 100644 --- a/src/pixie_cli/pkg/cmd/script_utils.go +++ b/src/pixie_cli/pkg/cmd/script_utils.go @@ -34,8 +34,10 @@ import ( "px.dev/pixie/src/utils/script" ) -const defaultBundleFile = "https://storage.googleapis.com/pixie-prod-artifacts/script-bundles/bundle-core.json" -const ossBundleFile = "https://artifacts.px.dev/pxl_scripts/bundle.json" +const ( + defaultBundleFile = "https://storage.googleapis.com/pixie-prod-artifacts/script-bundles/bundle-core.json" + ossBundleFile = "https://artifacts.px.dev/pxl_scripts/bundle.json" +) func mustCreateBundleReader() *script.BundleManager { br, err := createBundleReader() diff --git a/src/pixie_cli/pkg/cmd/update.go b/src/pixie_cli/pkg/cmd/update.go index 3092baf12cc..dc00ced4e0f 100644 --- a/src/pixie_cli/pkg/cmd/update.go +++ b/src/pixie_cli/pkg/cmd/update.go @@ -185,7 +185,6 @@ var VizierUpdateCmd = &cobra.Command{ } uj := utils.NewSerialTaskRunner(updateJobs) err = uj.RunAndMonitor() - if err != nil { _ = pxanalytics.Client().Enqueue(&analytics.Track{ UserId: pxconfig.Cfg().UniqueClientID, diff --git a/src/pixie_cli/pkg/components/table_renderer.go b/src/pixie_cli/pkg/components/table_renderer.go index ccaea84238b..f503993b28a 100644 --- a/src/pixie_cli/pkg/components/table_renderer.go +++ b/src/pixie_cli/pkg/components/table_renderer.go @@ -109,6 +109,7 @@ func (t *TableStreamWriter) Write(data []interface{}) error { t.data = append(t.data, data) return nil } + func (t *TableStreamWriter) stringifyRow(row []interface{}) []string { s := make([]string, len(row)) @@ -164,7 +165,7 @@ func (ms MapSlice) MarshalJSON() ([]byte, error) { if err != nil { return nil, err } - buf.WriteString(fmt.Sprintf("%q:", fmt.Sprintf("%v", mi.Key))) + buf.WriteString(fmt.Sprintf("%q:", fmt.Sprintf("%v", mi.Key))) //nolint:staticcheck buf.Write(b) if i < len(ms)-1 { buf.Write([]byte{','}) @@ -328,7 +329,7 @@ func (c *CSVStreamWriter) Write(data []interface{}) error { // Add surrounding quotes to any fields that contain commas or newlines. if strings.Contains(dataStr, ",") || strings.Contains(dataStr, "\n") { // CSV escapes quotes by double quoting. - dataStr = strings.Replace(dataStr, "\"", "\"\"", -1) + dataStr = strings.ReplaceAll(dataStr, "\"", "\"\"") dataStr = "\"" + dataStr + "\"" } buf.WriteString(dataStr) diff --git a/src/pixie_cli/pkg/live/live.go b/src/pixie_cli/pkg/live/live.go index 019e5ca1a21..3ea11f6d38a 100644 --- a/src/pixie_cli/pkg/live/live.go +++ b/src/pixie_cli/pkg/live/live.go @@ -59,9 +59,7 @@ const ( modalTypeAutocomplete ) -var ( - errMissingScript = errors.New("No script provided") -) +var errMissingScript = errors.New("No script provided") type sortType int @@ -123,7 +121,8 @@ type Modal interface { // New creates a new live view. func New(br *script.BundleManager, viziers []*vizier.Connector, cloudAddr string, aClient cloudpb.AutocompleteServiceClient, - execScript *script.ExecutableScript, useNewAC, useEncryption bool, clusterID uuid.UUID) (*View, error) { + execScript *script.ExecutableScript, useNewAC, useEncryption bool, clusterID uuid.UUID, +) (*View, error) { // App is the top level view. The layout is approximately as follows: // ------------------------------------------ // | View Information ... | @@ -314,6 +313,7 @@ func (v *View) clearErrorIfAny() { v.pages.RemovePage("error") } } + func (v *View) execCompleteWithError(err error) { v.searchClear() v.closeModal() @@ -490,7 +490,7 @@ func (v *View) createTviewTable(t components.TableView, formatter vizier.DataFor }) table.SetSelectionChangedFunc(func(row, column int) { - //fmt.Printf("%+v %+v\n", row, column) + // fmt.Printf("%+v %+v\n", row, column) // Switch the sort state. if row == 0 { cs := v.s.sortState[v.s.selectedTable][column] diff --git a/src/pixie_cli/pkg/pxanalytics/analytics.go b/src/pixie_cli/pkg/pxanalytics/analytics.go index efed08b6023..3f3a535ff4d 100644 --- a/src/pixie_cli/pkg/pxanalytics/analytics.go +++ b/src/pixie_cli/pkg/pxanalytics/analytics.go @@ -43,6 +43,7 @@ type disabledAnalyticsClient struct{} func (c disabledAnalyticsClient) Enqueue(analytics.Message) error { return nil } + func (c disabledAnalyticsClient) Close() error { return nil } diff --git a/src/pixie_cli/pkg/pxconfig/config.go b/src/pixie_cli/pkg/pxconfig/config.go index 39e3a5e90a3..869e4c16887 100644 --- a/src/pixie_cli/pkg/pxconfig/config.go +++ b/src/pixie_cli/pkg/pxconfig/config.go @@ -40,7 +40,7 @@ var ( ) func writeDefaultConfig(path string) (*ConfigInfo, error) { - f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0600) + f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0o600) if err != nil { return nil, err } diff --git a/src/pixie_cli/pkg/sentryhook/hook.go b/src/pixie_cli/pkg/sentryhook/hook.go index cc66bbfa348..64c3cbbbb4a 100644 --- a/src/pixie_cli/pkg/sentryhook/hook.go +++ b/src/pixie_cli/pkg/sentryhook/hook.go @@ -27,17 +27,15 @@ import ( log "github.com/sirupsen/logrus" ) -var ( - levelMap = map[log.Level]sentry.Level{ - log.TraceLevel: sentry.LevelDebug, - log.DebugLevel: sentry.LevelDebug, - log.InfoLevel: sentry.LevelInfo, - log.WarnLevel: sentry.LevelWarning, - log.ErrorLevel: sentry.LevelError, - log.FatalLevel: sentry.LevelFatal, - log.PanicLevel: sentry.LevelFatal, - } -) +var levelMap = map[log.Level]sentry.Level{ + log.TraceLevel: sentry.LevelDebug, + log.DebugLevel: sentry.LevelDebug, + log.InfoLevel: sentry.LevelInfo, + log.WarnLevel: sentry.LevelWarning, + log.ErrorLevel: sentry.LevelError, + log.FatalLevel: sentry.LevelFatal, + log.PanicLevel: sentry.LevelFatal, +} // Converter converts log entry to sentry. type Converter func(entry *log.Entry, event *sentry.Event, hub *sentry.Hub) diff --git a/src/pixie_cli/pkg/utils/cli_out.go b/src/pixie_cli/pkg/utils/cli_out.go index 575f5f2138c..25fb0c57043 100644 --- a/src/pixie_cli/pkg/utils/cli_out.go +++ b/src/pixie_cli/pkg/utils/cli_out.go @@ -121,7 +121,7 @@ func (c *CLIOutputEntry) Infof(format string, args ...interface{}) { // Info prints the input string to stdout. func (c *CLIOutputEntry) Info(str string) { - c.Infof(str) + c.Infof("%s", str) } // Errorf prints the input string to stderr formatted with the input args. @@ -131,7 +131,7 @@ func (c *CLIOutputEntry) Errorf(format string, args ...interface{}) { // Error prints the input string to stderr. func (c *CLIOutputEntry) Error(str string) { - c.write(os.Stderr, str) + c.write(os.Stderr, "%s", str) } // Fatalf prints the input string to stderr formatted with the input args. @@ -142,6 +142,6 @@ func (c *CLIOutputEntry) Fatalf(format string, args ...interface{}) { // Fatal prints the input string to stderr. func (c *CLIOutputEntry) Fatal(str string) { - c.write(os.Stderr, str) + c.write(os.Stderr, "%s", str) os.Exit(1) } diff --git a/src/pixie_cli/pkg/utils/cmd.go b/src/pixie_cli/pkg/utils/cmd.go index 3f956bd1042..52c8e1535e7 100644 --- a/src/pixie_cli/pkg/utils/cmd.go +++ b/src/pixie_cli/pkg/utils/cmd.go @@ -30,7 +30,6 @@ func ExecCommand(name string, args ...string) error { var stderr bytes.Buffer kcmd.Stderr = &stderr err := kcmd.Run() - if err != nil { return errors.New(stderr.String()) } diff --git a/src/pixie_cli/pkg/utils/dot_path.go b/src/pixie_cli/pkg/utils/dot_path.go index 1833405494c..426747c74a3 100644 --- a/src/pixie_cli/pkg/utils/dot_path.go +++ b/src/pixie_cli/pkg/utils/dot_path.go @@ -38,7 +38,7 @@ func ensureDotFolderPath() (string, error) { pixieDirPath := filepath.Join(home, pixieDotPath) if _, err := os.Stat(pixieDirPath); os.IsNotExist(err) { - err = os.Mkdir(pixieDirPath, 0744) + err = os.Mkdir(pixieDirPath, 0o744) if err != nil { return "", err } diff --git a/src/pixie_cli/pkg/vizier/data_formatter.go b/src/pixie_cli/pkg/vizier/data_formatter.go index 7bb70c042da..a5092bd8abd 100644 --- a/src/pixie_cli/pkg/vizier/data_formatter.go +++ b/src/pixie_cli/pkg/vizier/data_formatter.go @@ -34,8 +34,10 @@ import ( ) // For p50, p99, etc. -var latencyRegex = regexp.MustCompile(`(?i)^latency`) -var cpuRegex = regexp.MustCompile(`(?i)^cpu`) +var ( + latencyRegex = regexp.MustCompile(`(?i)^latency`) + cpuRegex = regexp.MustCompile(`(?i)^cpu`) +) const nanosPerSecond = float64(1000 * 1000 * 1000) diff --git a/src/pixie_cli/pkg/vizier/data_formatter_test.go b/src/pixie_cli/pkg/vizier/data_formatter_test.go index 89a7b26f9c7..7ce30a081a4 100644 --- a/src/pixie_cli/pkg/vizier/data_formatter_test.go +++ b/src/pixie_cli/pkg/vizier/data_formatter_test.go @@ -126,6 +126,7 @@ func TestScriptReferences(t *testing.T) { assert.Equal(t, "px-sock-shop/load-test-799f9dffff-s6m2c", formatter.FormatValue(0, `{"label":"px-sock-shop/load-test-799f9dffff-s6m2c","script":"px/pod","args":{"start_time":"-5m","pod":"px-sock-shop/load-test-799f9dffff-s6m2c"}}`)) } + func TestBytes(t *testing.T) { relation := &vizierpb.Relation{ Columns: []*vizierpb.Relation_ColumnInfo{ diff --git a/src/pixie_cli/pkg/vizier/logs.go b/src/pixie_cli/pkg/vizier/logs.go index 88bfef241e3..d5691be25ed 100644 --- a/src/pixie_cli/pkg/vizier/logs.go +++ b/src/pixie_cli/pkg/vizier/logs.go @@ -130,7 +130,6 @@ func (c *LogCollector) CollectPixieLogs(fName string) error { log.WithError(err).Warnf("failed to get cluster ID") } outputCh, err := RunSimpleHealthCheckScript(c.br, c.cloudAddr, clusterID) - if err != nil { entry := log.WithError(err) if _, ok := err.(*HealthCheckWarning); ok { diff --git a/src/pixie_cli/pkg/vizier/script.go b/src/pixie_cli/pkg/vizier/script.go index d58286038c6..cab9fcd3988 100644 --- a/src/pixie_cli/pkg/vizier/script.go +++ b/src/pixie_cli/pkg/vizier/script.go @@ -389,7 +389,6 @@ func RunSimpleHealthCheckScript(br *script.BundleManager, cloudAddr string, clus return nil, err } execScript, err := br.GetScript(script.AgentStatusDiagnosticsScript) - if err != nil { execScript, err = br.GetScript(script.AgentStatusScript) if err != nil { diff --git a/src/pixie_cli/pkg/vizier/stream_adapter.go b/src/pixie_cli/pkg/vizier/stream_adapter.go index ea2b80b97c5..75f446b7e32 100644 --- a/src/pixie_cli/pkg/vizier/stream_adapter.go +++ b/src/pixie_cli/pkg/vizier/stream_adapter.go @@ -93,7 +93,8 @@ const FormatInMemory string = "inmemory" // NewStreamOutputAdapterWithFactory creates a new vizier output adapter factory. func NewStreamOutputAdapterWithFactory(ctx context.Context, stream chan *ExecData, format string, decOpts *vizierpb.ExecuteScriptRequest_EncryptionOptions, - factoryFunc func(*vizierpb.ExecuteScriptResponse_MetaData) components.OutputStreamWriter) *StreamOutputAdapter { + factoryFunc func(*vizierpb.ExecuteScriptResponse_MetaData) components.OutputStreamWriter, +) *StreamOutputAdapter { enableFormat := format != "json" && format != FormatInMemory adapter := &StreamOutputAdapter{ @@ -254,7 +255,7 @@ func (v *StreamOutputAdapter) handleStream(ctx context.Context, stream chan *Exe case *vizierpb.ExecuteScriptResponse_Data: err = v.handleData(ctx, res) default: - err = fmt.Errorf("unhandled response type" + reflect.TypeOf(msg.Resp.Result).String()) + err = fmt.Errorf("unhandled response type %s", reflect.TypeOf(msg.Resp.Result).String()) } if err != nil { v.err = newScriptExecutionError(CodeBadData, "failed to handle data from Vizier: "+err.Error()) diff --git a/src/pixie_cli/px.go b/src/pixie_cli/px.go index 4d3c084acd6..1c1c2ff9798 100644 --- a/src/pixie_cli/px.go +++ b/src/pixie_cli/px.go @@ -89,7 +89,7 @@ func main() { if len(logFile) > 0 { utils.Info(fmt.Sprintf("Logging to %s", logFile)) - f, err := os.OpenFile(logFile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644) + f, err := os.OpenFile(logFile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0o644) if err != nil { log.WithError(err).Error("Cannot open log file") } diff --git a/src/pxl_scripts/px/collect_heap_dumps.pxl b/src/pxl_scripts/px/collect_heap_dumps.pxl new file mode 100644 index 00000000000..0f13080ac2a --- /dev/null +++ b/src/pxl_scripts/px/collect_heap_dumps.pxl @@ -0,0 +1,24 @@ +# Copyright 2018- The Pixie Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 + +import px + +df = px.GetAgentStatus(False) +df = df[['asid', 'hostname']] +heap_stats = px._HeapGrowthStacks() +df = df.merge(heap_stats, how='inner', left_on='asid', right_on='asid') +df = df[['hostname', 'heap']] +px.display(df) diff --git a/src/shared/artifacts/versionspb/BUILD.bazel b/src/shared/artifacts/versionspb/BUILD.bazel index 69682d1c1eb..0a53eeb1303 100644 --- a/src/shared/artifacts/versionspb/BUILD.bazel +++ b/src/shared/artifacts/versionspb/BUILD.bazel @@ -22,7 +22,7 @@ pl_proto_library( visibility = ["//src:__subpackages__"], deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/shared/artifacts/versionspb/versions.pb.go b/src/shared/artifacts/versionspb/versions.pb.go index 6c46ade32fc..37261326c0c 100755 --- a/src/shared/artifacts/versionspb/versions.pb.go +++ b/src/shared/artifacts/versionspb/versions.pb.go @@ -269,44 +269,43 @@ func init() { } var fileDescriptor_11101fe785e211c4 = []byte{ - // 583 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xcd, 0x6a, 0xdb, 0x4c, - 0x14, 0xd5, 0x58, 0xfe, 0x4c, 0x7c, 0x9d, 0x2f, 0x31, 0x13, 0x5a, 0x54, 0x63, 0xc6, 0xc6, 0xdd, - 0x84, 0x42, 0x65, 0xaa, 0x26, 0xa6, 0x8b, 0x52, 0x2a, 0x37, 0x86, 0x84, 0xda, 0x4a, 0x19, 0x2b, - 0xa4, 0xcd, 0x66, 0x18, 0x3b, 0x8a, 0x24, 0xb0, 0x22, 0xa1, 0x51, 0x42, 0xb3, 0xeb, 0x23, 0x14, - 0xfa, 0x12, 0x7d, 0x8b, 0x6e, 0xbb, 0xf4, 0x32, 0xab, 0xd0, 0xc8, 0x9b, 0x2e, 0xf3, 0x08, 0x25, - 0xfa, 0xb1, 0x4d, 0x1d, 0xba, 0xbb, 0xf7, 0x9c, 0x73, 0x7d, 0x8e, 0xef, 0x1d, 0x81, 0x2a, 0xc2, - 0x71, 0x5b, 0x38, 0x3c, 0xb4, 0x4e, 0xdb, 0x3c, 0x8c, 0xdc, 0x33, 0x3e, 0x8e, 0x44, 0xfb, 0xd2, - 0x0a, 0x85, 0xeb, 0x9f, 0x8b, 0x60, 0x34, 0x2f, 0xd5, 0x20, 0xf4, 0x23, 0x1f, 0x57, 0x82, 0xcf, - 0x6a, 0x0e, 0xd5, 0x9e, 0xdb, 0x6e, 0xe4, 0x5c, 0x8c, 0xd4, 0xb1, 0xef, 0xb5, 0x6d, 0xdf, 0xf6, - 0xdb, 0x89, 0x66, 0x74, 0x71, 0x96, 0x74, 0x49, 0x93, 0x54, 0xe9, 0x6c, 0xad, 0x61, 0xfb, 0xbe, - 0x3d, 0xb1, 0x16, 0xaa, 0xc8, 0xf5, 0x2c, 0x11, 0x71, 0x2f, 0x48, 0x05, 0x2d, 0x13, 0x2a, 0x7a, - 0x96, 0x61, 0x68, 0x45, 0x18, 0x43, 0xf1, 0x9c, 0x7b, 0x96, 0x82, 0x9a, 0x68, 0xbb, 0x4c, 0x93, - 0x1a, 0xbf, 0x80, 0xb5, 0x3c, 0xa6, 0x52, 0x68, 0xca, 0xdb, 0x15, 0xed, 0x91, 0xba, 0x14, 0x49, - 0xcd, 0xe7, 0xe9, 0x5c, 0xd6, 0xfa, 0x86, 0x60, 0x33, 0x87, 0x07, 0x6e, 0x18, 0xfa, 0xa1, 0xc0, - 0x6f, 0xe0, 0xff, 0x9c, 0x67, 0xd1, 0x55, 0x90, 0x7a, 0x6c, 0x68, 0x4f, 0x1e, 0xfc, 0x2d, 0xf3, - 0x2a, 0xb0, 0xe8, 0x3a, 0x5f, 0xea, 0x70, 0x0b, 0x4a, 0xc2, 0xe1, 0xda, 0x6e, 0x47, 0x29, 0xdc, - 0x87, 0xeb, 0x42, 0x7c, 0xd3, 0x28, 0x0d, 0xf7, 0x75, 0x6d, 0xb7, 0x43, 0x33, 0x06, 0xd7, 0xa1, - 0x78, 0x11, 0x4e, 0x84, 0x22, 0x37, 0xe5, 0xed, 0x72, 0x77, 0x2d, 0xbe, 0x69, 0x14, 0x8f, 0x68, - 0x5f, 0xd0, 0x04, 0x6d, 0x4d, 0x0b, 0xb0, 0x96, 0x1b, 0xe0, 0x57, 0x50, 0x9e, 0xef, 0x22, 0x89, - 0x52, 0xd1, 0x6a, 0x6a, 0xba, 0x2d, 0x35, 0xdf, 0x96, 0x6a, 0xe6, 0x0a, 0xba, 0x10, 0xe3, 0x06, - 0x54, 0xc6, 0xbe, 0xe7, 0xb9, 0x11, 0x73, 0xb8, 0x70, 0xd2, 0x34, 0x14, 0x52, 0x68, 0x9f, 0x0b, - 0xe7, 0x5e, 0x90, 0xfd, 0x21, 0x26, 0xa2, 0x50, 0x91, 0x53, 0x41, 0x06, 0x0d, 0xa3, 0x10, 0x1b, - 0xb0, 0xc5, 0x2f, 0xb9, 0x3b, 0xe1, 0xa3, 0x89, 0xc5, 0xe6, 0x4f, 0x40, 0x29, 0x36, 0xe5, 0x7f, - 0x2e, 0xa4, 0x5b, 0x50, 0x10, 0xc5, 0xf3, 0xc9, 0x9c, 0x12, 0xb8, 0x0e, 0xe5, 0xb1, 0xc3, 0xcf, - 0x6d, 0x6b, 0xe2, 0xdb, 0xca, 0x7f, 0x89, 0xdd, 0x02, 0xc0, 0x27, 0x50, 0x5b, 0x75, 0x63, 0x5e, - 0x7a, 0x16, 0xa5, 0x94, 0x5c, 0xb4, 0xfe, 0xa0, 0x69, 0x76, 0x3a, 0xaa, 0xac, 0x78, 0x66, 0xcc, - 0xb3, 0x1f, 0x08, 0xd6, 0x97, 0x23, 0xe2, 0x0d, 0x00, 0xdd, 0x64, 0x47, 0xc6, 0x7b, 0xe3, 0xf0, - 0xd8, 0xa8, 0x4a, 0x18, 0xc3, 0x86, 0x6e, 0xb2, 0xfe, 0x81, 0x71, 0xf4, 0x91, 0xe9, 0x83, 0xbd, - 0xce, 0x4e, 0x15, 0xe1, 0x2d, 0xd8, 0xd4, 0x4d, 0xb6, 0xa7, 0xd3, 0xe3, 0x03, 0x23, 0x03, 0x0b, - 0x7f, 0x81, 0x74, 0xd0, 0xd9, 0xa9, 0xca, 0xb8, 0x06, 0x8f, 0x75, 0x93, 0xbd, 0x3b, 0x34, 0x4c, - 0xfd, 0xc0, 0xe8, 0x51, 0x36, 0xec, 0x99, 0xec, 0x93, 0x3e, 0xe8, 0x0f, 0xab, 0x1a, 0x7e, 0x0a, - 0x8d, 0x15, 0xce, 0xec, 0x0d, 0x3e, 0xf4, 0x75, 0xb3, 0x97, 0x89, 0x5e, 0xe3, 0x26, 0xd4, 0x57, - 0x44, 0xcb, 0x61, 0x4e, 0xbb, 0x6f, 0xa7, 0xb7, 0x44, 0xba, 0xbe, 0x25, 0xd2, 0xdd, 0x2d, 0x41, - 0x5f, 0x62, 0x82, 0xbe, 0xc7, 0x04, 0xfd, 0x8c, 0x09, 0x9a, 0xc6, 0x04, 0xfd, 0x8a, 0x09, 0xfa, - 0x1d, 0x13, 0xe9, 0x2e, 0x26, 0xe8, 0xeb, 0x8c, 0x48, 0xd3, 0x19, 0x91, 0xae, 0x67, 0x44, 0x3a, - 0x81, 0xc5, 0xe7, 0x3a, 0x2a, 0x25, 0xcf, 0xe5, 0xe5, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3d, - 0x32, 0x0a, 0x38, 0xd8, 0x03, 0x00, 0x00, + // 572 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xcf, 0x6e, 0xd3, 0x4c, + 0x14, 0xc5, 0x3d, 0x71, 0xbe, 0xa8, 0xb9, 0xe9, 0xd7, 0x46, 0x53, 0x40, 0x26, 0x8a, 0x26, 0x51, + 0xd8, 0x54, 0x2c, 0x6c, 0x61, 0xda, 0x88, 0x05, 0x42, 0x38, 0x34, 0x52, 0x2b, 0x12, 0x17, 0x4d, + 0x5c, 0x15, 0xba, 0x19, 0x4d, 0x52, 0xd7, 0xb6, 0x14, 0xd7, 0x96, 0xc7, 0xad, 0xe8, 0x8e, 0x47, + 0x40, 0xe2, 0x25, 0x78, 0x0b, 0xb6, 0x2c, 0xb3, 0xec, 0xaa, 0xa2, 0xee, 0x86, 0x65, 0x1f, 0x01, + 0xd5, 0x7f, 0xd2, 0x88, 0x54, 0xec, 0xee, 0x9c, 0xfb, 0x1b, 0x9f, 0xe3, 0x7b, 0x6d, 0x50, 0x45, + 0x34, 0xd1, 0x84, 0xcb, 0x23, 0xfb, 0x58, 0xe3, 0x51, 0xec, 0x9d, 0xf0, 0x49, 0x2c, 0xb4, 0x73, + 0x3b, 0x12, 0x5e, 0x70, 0x2a, 0xc2, 0xf1, 0xbc, 0x54, 0xc3, 0x28, 0x88, 0x03, 0x5c, 0x0b, 0x3f, + 0xab, 0x85, 0xd4, 0x78, 0xe4, 0x04, 0x4e, 0x90, 0xea, 0xda, 0x5d, 0x95, 0x21, 0x8d, 0x96, 0x13, + 0x04, 0xce, 0xd4, 0xd6, 0xd2, 0xd3, 0xf8, 0xec, 0x44, 0x8b, 0x3d, 0xdf, 0x16, 0x31, 0xf7, 0xc3, + 0x0c, 0xe8, 0x58, 0x50, 0x33, 0x72, 0xab, 0x91, 0x1d, 0x63, 0x0c, 0xe5, 0x53, 0xee, 0xdb, 0x0a, + 0x6a, 0xa3, 0xcd, 0x2a, 0x4d, 0x6b, 0xfc, 0x02, 0x56, 0x8a, 0x34, 0x4a, 0xa9, 0x2d, 0x6f, 0xd6, + 0xf4, 0xc7, 0xea, 0x82, 0xb3, 0x5a, 0xdc, 0xa7, 0x73, 0xac, 0xf3, 0x0d, 0xc1, 0x7a, 0x21, 0x0f, + 0xbd, 0x28, 0x0a, 0x22, 0x81, 0xdf, 0xc0, 0xff, 0x45, 0x9f, 0xc5, 0x17, 0x61, 0xe6, 0xb1, 0xa6, + 0x3f, 0x7d, 0xf0, 0x59, 0xd6, 0x45, 0x68, 0xd3, 0x55, 0xbe, 0x70, 0xc2, 0x1d, 0xa8, 0x08, 0x97, + 0xeb, 0xdb, 0x5d, 0xa5, 0x74, 0x17, 0xae, 0x07, 0xc9, 0x55, 0xab, 0x32, 0xda, 0x35, 0xf4, 0xed, + 0x2e, 0xcd, 0x3b, 0xb8, 0x09, 0xe5, 0xb3, 0x68, 0x2a, 0x14, 0xb9, 0x2d, 0x6f, 0x56, 0x7b, 0x2b, + 0xc9, 0x55, 0xab, 0x7c, 0x40, 0x07, 0x82, 0xa6, 0x6a, 0x67, 0x56, 0x82, 0x95, 0xc2, 0x00, 0xbf, + 0x82, 0xea, 0x7c, 0x16, 0x69, 0x94, 0x9a, 0xde, 0x50, 0xb3, 0x69, 0xa9, 0xc5, 0xb4, 0x54, 0xab, + 0x20, 0xe8, 0x3d, 0x8c, 0x5b, 0x50, 0x9b, 0x04, 0xbe, 0xef, 0xc5, 0xcc, 0xe5, 0xc2, 0xcd, 0xd2, + 0x50, 0xc8, 0xa4, 0x5d, 0x2e, 0xdc, 0x3b, 0x20, 0x7f, 0x21, 0x26, 0xe2, 0x48, 0x91, 0x33, 0x20, + 0x97, 0x46, 0x71, 0x84, 0x4d, 0xd8, 0xe0, 0xe7, 0xdc, 0x9b, 0xf2, 0xf1, 0xd4, 0x66, 0xf3, 0x4d, + 0x2b, 0xe5, 0xb6, 0xfc, 0xcf, 0x81, 0xf4, 0x4a, 0x0a, 0xa2, 0x78, 0x7e, 0xb3, 0x68, 0x09, 0xdc, + 0x84, 0xea, 0xc4, 0xe5, 0xa7, 0x8e, 0x3d, 0x0d, 0x1c, 0xe5, 0xbf, 0xd4, 0xee, 0x5e, 0xc0, 0x47, + 0xd0, 0x58, 0x76, 0x63, 0x7e, 0xb6, 0x16, 0xa5, 0x92, 0x6e, 0xb4, 0xf9, 0xa0, 0x69, 0xbe, 0x3a, + 0xaa, 0x2c, 0x79, 0xe6, 0x9d, 0xe7, 0x3f, 0x10, 0xac, 0x2e, 0x46, 0xc4, 0x6b, 0x00, 0x86, 0xc5, + 0x0e, 0xcc, 0xf7, 0xe6, 0xfe, 0xa1, 0x59, 0x97, 0x30, 0x86, 0x35, 0xc3, 0x62, 0x83, 0x3d, 0xf3, + 0xe0, 0x23, 0x33, 0x86, 0x3b, 0xdd, 0xad, 0x3a, 0xc2, 0x1b, 0xb0, 0x6e, 0x58, 0x6c, 0xc7, 0xa0, + 0x87, 0x7b, 0x66, 0x2e, 0x96, 0xfe, 0x12, 0xe9, 0xb0, 0xbb, 0x55, 0x97, 0x71, 0x03, 0x9e, 0x18, + 0x16, 0x7b, 0xb7, 0x6f, 0x5a, 0xc6, 0x9e, 0xd9, 0xa7, 0x6c, 0xd4, 0xb7, 0xd8, 0x27, 0x63, 0x38, + 0x18, 0xd5, 0x75, 0xfc, 0x0c, 0x5a, 0x4b, 0x3d, 0xab, 0x3f, 0xfc, 0x30, 0x30, 0xac, 0x7e, 0x0e, + 0xbd, 0xc6, 0x6d, 0x68, 0x2e, 0x41, 0x8b, 0x61, 0x8e, 0x7b, 0x6f, 0x67, 0xd7, 0x44, 0xba, 0xbc, + 0x26, 0xd2, 0xed, 0x35, 0x41, 0x5f, 0x12, 0x82, 0xbe, 0x27, 0x04, 0xfd, 0x4c, 0x08, 0x9a, 0x25, + 0x04, 0xfd, 0x4a, 0x08, 0xfa, 0x9d, 0x10, 0xe9, 0x36, 0x21, 0xe8, 0xeb, 0x0d, 0x91, 0x66, 0x37, + 0x44, 0xba, 0xbc, 0x21, 0xd2, 0x11, 0xdc, 0xff, 0x95, 0xe3, 0x4a, 0xfa, 0xb9, 0xbc, 0xfc, 0x13, + 0x00, 0x00, 0xff, 0xff, 0x22, 0xf7, 0x10, 0x24, 0xbf, 0x03, 0x00, 0x00, } func (x ArtifactType) String() string { diff --git a/src/shared/artifacts/versionspb/versions.proto b/src/shared/artifacts/versionspb/versions.proto index e055fae69c9..4da072f3df8 100644 --- a/src/shared/artifacts/versionspb/versions.proto +++ b/src/shared/artifacts/versionspb/versions.proto @@ -22,7 +22,7 @@ package px.versions; option go_package = "versionspb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; // ArtifactType is the type of artifact that was released. diff --git a/src/shared/cvmsgspb/BUILD.bazel b/src/shared/cvmsgspb/BUILD.bazel index fbd4bc904bb..8cc40722c85 100644 --- a/src/shared/cvmsgspb/BUILD.bazel +++ b/src/shared/cvmsgspb/BUILD.bazel @@ -24,7 +24,7 @@ pl_proto_library( "//src/api/proto/uuidpb:uuid_pl_proto", "//src/api/proto/vizierpb:vizier_pl_proto", "//src/shared/k8s/metadatapb:metadata_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -36,7 +36,7 @@ pl_cc_proto_library( "//src/api/proto/uuidpb:uuid_pl_cc_proto", "//src/api/proto/vizierpb:vizier_pl_cc_proto", "//src/shared/k8s/metadatapb:metadata_pl_cc_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/shared/cvmsgspb/cvmsgs.pb.go b/src/shared/cvmsgspb/cvmsgs.pb.go index 841a1181076..6273be3da10 100755 --- a/src/shared/cvmsgspb/cvmsgs.pb.go +++ b/src/shared/cvmsgspb/cvmsgs.pb.go @@ -2251,166 +2251,165 @@ func init() { func init() { proto.RegisterFile("src/shared/cvmsgspb/cvmsgs.proto", fileDescriptor_5a48c2306678667b) } var fileDescriptor_5a48c2306678667b = []byte{ - // 2536 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0x4b, 0x6f, 0x24, 0x57, - 0x15, 0x76, 0xf5, 0xb3, 0xfa, 0xb8, 0xed, 0x2e, 0xdf, 0xf1, 0xa3, 0xa7, 0x99, 0xe9, 0xf6, 0x54, - 0x5e, 0x4e, 0xc8, 0xb4, 0x89, 0x09, 0x62, 0x62, 0x45, 0x09, 0xee, 0xc7, 0x4c, 0xb7, 0xc7, 0xd8, - 0x56, 0xf9, 0x81, 0xc8, 0xa6, 0x54, 0x5d, 0x75, 0xa7, 0xdd, 0x71, 0x77, 0x55, 0x4d, 0xdd, 0x2a, - 0x67, 0xcc, 0x2a, 0x0b, 0x84, 0xc4, 0x8e, 0x05, 0x0b, 0x7e, 0x00, 0x0b, 0x36, 0x08, 0x81, 0x84, - 0x10, 0x7f, 0x00, 0x81, 0xc4, 0x22, 0xcb, 0xac, 0x2c, 0xd2, 0xd9, 0xb0, 0x8c, 0xb2, 0x60, 0x83, - 0x90, 0xd0, 0x7d, 0x54, 0xf5, 0xdb, 0x9e, 0x24, 0xc3, 0x82, 0x95, 0xeb, 0x9e, 0x7b, 0xce, 0x77, - 0xce, 0x3d, 0xf7, 0xbc, 0x6e, 0x1b, 0xd6, 0x89, 0x67, 0x6e, 0x92, 0x33, 0xc3, 0xc3, 0xd6, 0xa6, - 0x79, 0xd1, 0x23, 0x6d, 0xe2, 0xb6, 0xc4, 0x47, 0xd9, 0xf5, 0x1c, 0xdf, 0x41, 0xf3, 0xee, 0xb3, - 0x72, 0xb8, 0x53, 0xb8, 0xdf, 0xee, 0xf8, 0x67, 0x41, 0xab, 0x6c, 0x3a, 0xbd, 0xcd, 0xb6, 0xd3, - 0x76, 0x36, 0x19, 0x4f, 0x2b, 0x78, 0xc2, 0x56, 0x6c, 0xc1, 0xbe, 0xb8, 0x6c, 0xe1, 0x76, 0xdb, - 0x71, 0xda, 0x5d, 0x3c, 0xe0, 0x32, 0xec, 0x4b, 0xb1, 0x55, 0x1a, 0xdf, 0xf2, 0x3b, 0x3d, 0x4c, - 0x7c, 0xa3, 0xe7, 0x86, 0x0c, 0xd4, 0x32, 0xc3, 0xed, 0x70, 0x8e, 0xcd, 0x20, 0xe8, 0x58, 0x6e, - 0x8b, 0xfd, 0x11, 0x0c, 0xaf, 0x8e, 0x32, 0x5c, 0x74, 0x7e, 0xd2, 0xc1, 0x9e, 0xdb, 0x12, 0x1f, - 0x86, 0xdb, 0x11, 0x7c, 0x1b, 0x43, 0x47, 0x3c, 0x7f, 0x40, 0x36, 0x7b, 0xd8, 0x37, 0x2c, 0xc3, - 0x37, 0xdc, 0x56, 0xf4, 0xc9, 0x39, 0xd5, 0x3f, 0x4a, 0xb0, 0xa2, 0xe1, 0x76, 0x87, 0xf8, 0xd8, - 0x3b, 0x65, 0x28, 0x1a, 0x7e, 0x1a, 0x60, 0xe2, 0xa3, 0x6d, 0xc8, 0x70, 0x58, 0xbd, 0x63, 0xe5, - 0xa5, 0x75, 0x69, 0x63, 0x7e, 0x2b, 0x57, 0x76, 0x9f, 0x95, 0xb9, 0x55, 0xe5, 0x93, 0x93, 0x66, - 0xad, 0x92, 0xed, 0x5f, 0x95, 0x64, 0x2e, 0xd6, 0xac, 0x69, 0x32, 0xe7, 0x6f, 0x5a, 0x68, 0x0d, - 0xd2, 0x1f, 0x7e, 0xe4, 0xeb, 0xe7, 0xf8, 0x32, 0x1f, 0x5b, 0x97, 0x36, 0x32, 0x5a, 0xea, 0xc3, - 0x8f, 0xfc, 0xc7, 0xf8, 0x12, 0xed, 0x40, 0xd6, 0xec, 0x06, 0x54, 0x99, 0xde, 0xb1, 0x9f, 0x38, - 0xf9, 0x04, 0xc3, 0x2d, 0x96, 0x87, 0x1c, 0x5e, 0xe6, 0x78, 0x55, 0xce, 0xd6, 0xb4, 0x9f, 0x38, - 0xda, 0xbc, 0x39, 0x58, 0xec, 0x26, 0xe4, 0xb8, 0x92, 0x50, 0x7f, 0x29, 0xc1, 0xd2, 0x04, 0x23, - 0xda, 0x84, 0x90, 0x55, 0x0f, 0x84, 0xd5, 0x99, 0xca, 0x62, 0xff, 0xaa, 0x04, 0x82, 0xeb, 0xa4, - 0x59, 0xd3, 0x40, 0xb0, 0x9c, 0x74, 0x2c, 0x74, 0x6f, 0x60, 0x8f, 0x6d, 0xf4, 0xb0, 0xb0, 0x36, - 0x04, 0xd9, 0x37, 0x7a, 0x18, 0xbd, 0x02, 0x8b, 0xc2, 0x0f, 0x17, 0xd8, 0x23, 0x1d, 0xc7, 0x66, - 0x46, 0x67, 0xb4, 0x05, 0x4e, 0x3d, 0xe5, 0x44, 0x61, 0xd6, 0xdf, 0x24, 0x58, 0x1a, 0x75, 0xe7, - 0x8e, 0x79, 0x8e, 0x9a, 0x90, 0x22, 0xbe, 0xe1, 0x07, 0x84, 0x59, 0xb4, 0xb8, 0xf5, 0xd6, 0xc8, - 0x79, 0x27, 0xf8, 0x05, 0xc5, 0x33, 0xfc, 0x8e, 0x63, 0x1f, 0x31, 0x41, 0x4d, 0x00, 0xa0, 0x12, - 0xcc, 0x0b, 0x6b, 0x86, 0xec, 0x05, 0x4e, 0xa2, 0xe6, 0xaa, 0x0d, 0x40, 0x93, 0xe2, 0x68, 0x11, - 0xe0, 0xe8, 0x58, 0x3f, 0xd9, 0x7f, 0xbc, 0x7f, 0xf0, 0xa3, 0x7d, 0x65, 0x0e, 0x65, 0x20, 0x79, - 0x74, 0xac, 0x1f, 0x3c, 0x56, 0x24, 0xb4, 0x06, 0xb7, 0x8e, 0x8e, 0xf5, 0x87, 0x3b, 0xcd, 0xbd, - 0x7a, 0x4d, 0xdf, 0x3f, 0x38, 0xd6, 0x1f, 0x1e, 0x9c, 0xec, 0xd7, 0x94, 0x98, 0xfa, 0xf7, 0x34, - 0xe4, 0xb8, 0x4d, 0x0d, 0x6c, 0x78, 0x7e, 0x0b, 0x1b, 0xdf, 0x2c, 0x28, 0x10, 0x24, 0x68, 0xc0, - 0x33, 0x9b, 0xe3, 0x1a, 0xfb, 0x46, 0xaf, 0x41, 0x8e, 0xd0, 0x78, 0xb3, 0x4d, 0xac, 0xdb, 0x41, - 0xaf, 0x85, 0xbd, 0x7c, 0x9c, 0x6d, 0x2f, 0x86, 0xe4, 0x7d, 0x46, 0x45, 0x87, 0x90, 0x75, 0x1d, - 0x4b, 0xe7, 0x5e, 0xc0, 0x24, 0x9f, 0x5a, 0x8f, 0x6f, 0xcc, 0x6f, 0xdd, 0x9f, 0x12, 0x38, 0x91, - 0xb1, 0xe5, 0x43, 0xc7, 0x3a, 0x12, 0xfc, 0x75, 0xdb, 0xf7, 0x2e, 0xb5, 0x79, 0x77, 0x40, 0x41, - 0x3f, 0x97, 0xe0, 0x5e, 0x60, 0x9f, 0x61, 0xa3, 0xeb, 0x9f, 0x5d, 0xea, 0x34, 0x25, 0x74, 0xb7, - 0x6b, 0xd8, 0x58, 0x1f, 0xd1, 0x93, 0x63, 0x7a, 0xde, 0xbf, 0x56, 0xcf, 0x49, 0x88, 0x52, 0x33, - 0x7c, 0xe3, 0x90, 0x62, 0x4c, 0x68, 0xbe, 0x1b, 0x5c, 0xc7, 0x83, 0xde, 0x81, 0xdb, 0xc3, 0x5a, - 0xf5, 0xae, 0x41, 0x7c, 0x3d, 0x70, 0x2d, 0xc3, 0xc7, 0x56, 0x3e, 0xcd, 0x1c, 0xb2, 0x3a, 0x64, - 0xfb, 0x9e, 0x41, 0xfc, 0x13, 0xbe, 0x8b, 0xde, 0x8a, 0x62, 0x4b, 0x66, 0xb1, 0x75, 0x7b, 0x8a, - 0xa9, 0x63, 0x31, 0xf4, 0x2d, 0xc8, 0xd8, 0x41, 0x4f, 0xb7, 0x1d, 0x0b, 0x93, 0xfc, 0xfc, 0xba, - 0xb4, 0x91, 0xd4, 0x64, 0x3b, 0xe8, 0xed, 0xd3, 0x35, 0x7a, 0x1b, 0x56, 0xe9, 0x66, 0xc7, 0x26, - 0xbe, 0x17, 0xf4, 0xb0, 0xed, 0x63, 0x4b, 0x70, 0x66, 0x19, 0xe7, 0xb2, 0x1d, 0xf4, 0x9a, 0x43, - 0x9b, 0x5c, 0xaa, 0x0c, 0xb7, 0xac, 0x0e, 0x31, 0x5a, 0x5d, 0xac, 0x1b, 0x81, 0xef, 0x08, 0xdb, - 0xf3, 0x0b, 0xeb, 0xd2, 0x86, 0xac, 0x2d, 0x89, 0xad, 0x9d, 0xc0, 0x77, 0xb8, 0xd9, 0x34, 0xa9, - 0xb8, 0x31, 0x7a, 0x0f, 0x13, 0x62, 0xb4, 0x71, 0x7e, 0x91, 0x27, 0x15, 0xa7, 0xfe, 0x90, 0x13, - 0x51, 0x1d, 0x6e, 0x9d, 0x3f, 0x20, 0x7a, 0x98, 0xa2, 0x61, 0x02, 0x2a, 0x2c, 0xaf, 0x57, 0xfa, - 0x57, 0xa5, 0xa5, 0xc7, 0x0f, 0x88, 0x48, 0x6d, 0x91, 0x88, 0xda, 0xd2, 0xf9, 0x38, 0x09, 0xbd, - 0x0e, 0x8a, 0xe3, 0x62, 0xcf, 0xf0, 0x9d, 0x01, 0xc6, 0x12, 0xd3, 0x97, 0x0b, 0xe9, 0x82, 0xb5, - 0x70, 0x0a, 0xca, 0xf8, 0xe5, 0x21, 0x05, 0xe2, 0xb4, 0x92, 0xb1, 0x6a, 0xa2, 0xd1, 0x4f, 0xf4, - 0x26, 0x24, 0x2f, 0x8c, 0x6e, 0xc0, 0x63, 0x79, 0x7e, 0x6b, 0x75, 0xc4, 0xe7, 0x91, 0xbc, 0xc6, - 0x99, 0xb6, 0x63, 0x0f, 0xa4, 0xc2, 0x19, 0xa8, 0x37, 0x87, 0xc9, 0x8b, 0xd0, 0xb4, 0x9b, 0x90, - 0x13, 0x4a, 0x72, 0x37, 0x21, 0x27, 0x95, 0xd4, 0x6e, 0x42, 0xce, 0x28, 0xb0, 0x9b, 0x90, 0x41, - 0x99, 0x57, 0xff, 0x15, 0x83, 0x4c, 0x24, 0x40, 0x93, 0x91, 0x15, 0x10, 0xae, 0x8a, 0x7d, 0xa3, - 0xed, 0x28, 0x94, 0x62, 0x2c, 0x94, 0x54, 0xaa, 0x8c, 0x77, 0x91, 0xf2, 0xf9, 0x03, 0x52, 0x1e, - 0x74, 0x11, 0xaa, 0xf9, 0xf0, 0xcc, 0x20, 0x38, 0x8a, 0xa9, 0xc9, 0x0b, 0x8d, 0x4f, 0xbb, 0xd0, - 0x55, 0x48, 0x79, 0xd8, 0x20, 0x51, 0x11, 0x15, 0x2b, 0xf4, 0x2e, 0x80, 0xe9, 0xd8, 0xbe, 0xd1, - 0xb1, 0xb1, 0x47, 0xf2, 0x49, 0x96, 0x74, 0x77, 0x46, 0xce, 0x5a, 0x0d, 0xb7, 0xc5, 0x89, 0x87, - 0xf8, 0x51, 0x03, 0xc0, 0xf4, 0x30, 0x4d, 0x07, 0xdd, 0xf0, 0xf3, 0x29, 0xe6, 0xa9, 0x42, 0x99, - 0x77, 0xdb, 0x72, 0xd8, 0x6d, 0xcb, 0xc7, 0x61, 0xb7, 0xad, 0x2c, 0xf4, 0xaf, 0x4a, 0x99, 0x2a, - 0x97, 0xd8, 0xf1, 0xb5, 0x8c, 0x19, 0x7e, 0xa2, 0xfb, 0x90, 0xc2, 0x17, 0xd8, 0xf6, 0x49, 0x3e, - 0xcd, 0x6c, 0x58, 0x19, 0xb1, 0xe1, 0xf1, 0x03, 0x52, 0xa7, 0xbb, 0x9a, 0x60, 0x42, 0x2f, 0xc1, - 0x82, 0x47, 0x31, 0x3d, 0x5f, 0x37, 0x9d, 0xc0, 0xf6, 0x59, 0x0e, 0xc6, 0xb5, 0xac, 0x20, 0x56, - 0x29, 0x4d, 0xfd, 0x95, 0x04, 0x72, 0x28, 0x89, 0xf2, 0x90, 0x0e, 0x1d, 0xc4, 0x5d, 0x1f, 0x2e, - 0xd1, 0x3b, 0x00, 0x4f, 0x3a, 0x1e, 0xf1, 0xf5, 0xa8, 0x48, 0x5e, 0x7b, 0x08, 0x2d, 0xc3, 0xb8, - 0xe9, 0x1a, 0x7d, 0x1f, 0x32, 0xac, 0x62, 0x30, 0xc9, 0xf8, 0x8d, 0x92, 0x32, 0x65, 0xa6, 0x4b, - 0xf5, 0x67, 0x31, 0xc8, 0x8d, 0x39, 0x76, 0x6a, 0x64, 0xbc, 0x07, 0x49, 0x7a, 0x8f, 0x58, 0x04, - 0xc6, 0xc6, 0xec, 0xc0, 0x18, 0x41, 0xc3, 0x1a, 0x17, 0x1b, 0x3e, 0x75, 0x7c, 0xf4, 0xd4, 0xb3, - 0x02, 0xe2, 0xc5, 0x5d, 0xe9, 0xc4, 0x1d, 0xa5, 0xa7, 0xdc, 0xd1, 0xbf, 0x25, 0x40, 0x63, 0x65, - 0x9d, 0x36, 0xee, 0x47, 0x63, 0x8d, 0x7b, 0xf3, 0xba, 0x3e, 0x40, 0x3b, 0x77, 0xb4, 0x18, 0x2b, - 0xb9, 0xdf, 0xa8, 0xf7, 0xbd, 0x04, 0x0b, 0xd8, 0xf3, 0x1c, 0x2f, 0x4a, 0x2d, 0xee, 0xaa, 0x2c, - 0x23, 0x8a, 0xcc, 0x52, 0xb7, 0x21, 0x37, 0xa6, 0x9c, 0x36, 0xfd, 0x46, 0x65, 0xb4, 0xe9, 0x37, - 0x2a, 0xbc, 0xe9, 0x67, 0x41, 0x6e, 0x54, 0xf4, 0xba, 0xa6, 0x1d, 0x68, 0x4a, 0x4c, 0x2d, 0x40, - 0x56, 0xcc, 0x52, 0x8e, 0xfd, 0xa4, 0xd3, 0xde, 0x4d, 0xc8, 0x92, 0x12, 0xdb, 0x4d, 0xc8, 0x31, - 0x25, 0xae, 0xae, 0x87, 0x8e, 0xe1, 0x7b, 0xbc, 0x7e, 0x8f, 0x70, 0xfc, 0x3a, 0x03, 0x20, 0xda, - 0x3d, 0x9d, 0xc1, 0x76, 0x9f, 0x63, 0x44, 0xb8, 0x33, 0x3c, 0x22, 0x7c, 0x79, 0x55, 0xca, 0x5a, - 0xad, 0xed, 0x48, 0x68, 0x68, 0x64, 0x78, 0x6b, 0xac, 0x22, 0x3d, 0x47, 0x73, 0xdb, 0x81, 0x25, - 0x96, 0x0b, 0x67, 0xa1, 0x33, 0x74, 0x9b, 0x70, 0xbf, 0x56, 0x56, 0xbe, 0xbc, 0x2a, 0x2d, 0x59, - 0xad, 0xed, 0xd1, 0x7d, 0x2d, 0x47, 0xd7, 0x91, 0xef, 0xf6, 0x09, 0xd5, 0x6a, 0xb2, 0xc3, 0x8a, - 0xf1, 0x74, 0x9a, 0x56, 0xee, 0x0d, 0x4d, 0x30, 0x8e, 0x0f, 0x9e, 0xc9, 0xaf, 0x3c, 0x78, 0xa6, - 0x26, 0x07, 0xcf, 0xd7, 0x20, 0x37, 0xde, 0xf8, 0xd2, 0x8c, 0x6b, 0xd1, 0xfc, 0xba, 0xed, 0x6d, - 0xca, 0x30, 0x2b, 0x4f, 0x19, 0x66, 0xd1, 0x53, 0x28, 0xd0, 0xf2, 0xea, 0x39, 0xdd, 0x69, 0x33, - 0x51, 0x86, 0x95, 0xc6, 0xb7, 0xa7, 0x78, 0x85, 0x06, 0x00, 0x2b, 0x01, 0x9e, 0xd3, 0x9d, 0x3e, - 0x08, 0xad, 0x99, 0xd3, 0x77, 0xd1, 0x4f, 0x9f, 0x6b, 0x1c, 0x5b, 0x64, 0xaa, 0xb7, 0x67, 0xa9, - 0xfe, 0xe6, 0x93, 0xd8, 0xff, 0x60, 0x36, 0x9a, 0x6c, 0x8d, 0x0b, 0xd3, 0x5a, 0x63, 0x05, 0x72, - 0xae, 0x87, 0x2f, 0x3a, 0x4e, 0x40, 0xc4, 0x79, 0xf3, 0xb9, 0x9b, 0x82, 0x7e, 0x31, 0x94, 0x10, - 0x19, 0xbf, 0x07, 0xcb, 0x63, 0x18, 0xbc, 0x27, 0x28, 0x37, 0xf6, 0x04, 0x34, 0x8a, 0x44, 0x37, - 0x0a, 0x2d, 0xb8, 0x73, 0xdd, 0x5d, 0xfe, 0x7f, 0xcd, 0x45, 0xea, 0x6f, 0x25, 0xb8, 0xcd, 0xab, - 0xd7, 0x48, 0x06, 0x8b, 0xd7, 0xee, 0x8b, 0xac, 0x5a, 0x35, 0x58, 0xe0, 0x65, 0x21, 0x1c, 0x83, - 0xb9, 0x8d, 0xa5, 0x99, 0x65, 0x84, 0x9b, 0xa5, 0x65, 0xcd, 0xa1, 0x95, 0x7a, 0x07, 0x0a, 0xd3, - 0xcc, 0x25, 0xae, 0x63, 0x13, 0xac, 0xfe, 0x4e, 0x82, 0x3b, 0x7c, 0xfb, 0xc0, 0xa3, 0x21, 0x67, - 0x74, 0xbb, 0x2f, 0xee, 0xf9, 0x9e, 0x87, 0x74, 0x58, 0x1e, 0xf8, 0x03, 0x33, 0x5c, 0xa2, 0x65, - 0x48, 0xfa, 0xce, 0x39, 0xb6, 0x45, 0x1b, 0xe7, 0x0b, 0xde, 0x62, 0x2d, 0xec, 0x76, 0x9d, 0x4b, - 0x1d, 0xfb, 0xa6, 0xc5, 0xea, 0xa6, 0x4c, 0x5b, 0x2c, 0x27, 0xd6, 0x7d, 0xd3, 0x52, 0x1f, 0xc2, - 0xdd, 0x19, 0x06, 0xf3, 0x23, 0xd1, 0x3c, 0xe1, 0xfe, 0xd2, 0x59, 0x63, 0xc6, 0xdc, 0x6c, 0x59, - 0x5b, 0xe0, 0xd4, 0x23, 0x4e, 0x54, 0xb7, 0x60, 0x39, 0xf2, 0x88, 0x8d, 0x4d, 0xfa, 0xc8, 0x65, - 0x7d, 0x27, 0x32, 0x2d, 0x36, 0x64, 0x1a, 0x6f, 0x54, 0xea, 0x3d, 0x98, 0x3f, 0xdd, 0x73, 0xda, - 0x61, 0xaa, 0x21, 0x48, 0xd0, 0x02, 0xc3, 0xf0, 0xb3, 0x1a, 0xfb, 0x56, 0xff, 0x92, 0x80, 0x5b, - 0xd5, 0xad, 0xd3, 0x9d, 0xc3, 0xe6, 0x91, 0xef, 0x61, 0xa3, 0x17, 0xfa, 0xf1, 0x4d, 0x00, 0x8f, - 0x7f, 0xea, 0xd1, 0x2f, 0x0a, 0x6c, 0xd8, 0x10, 0x0c, 0xcd, 0x9a, 0x96, 0x11, 0x0c, 0x4d, 0x6b, - 0xba, 0x11, 0xa8, 0x02, 0x32, 0x7e, 0x86, 0x4d, 0xdd, 0xc3, 0x4f, 0xc5, 0x78, 0xf6, 0x0a, 0xbd, - 0x0a, 0xc3, 0xed, 0x94, 0xc3, 0x9f, 0x70, 0xca, 0xf5, 0x67, 0xd8, 0x0c, 0x7c, 0x7c, 0x64, 0x7a, - 0x1d, 0xd7, 0x17, 0xd8, 0x8d, 0x39, 0x2d, 0x4d, 0x05, 0x35, 0xfc, 0x14, 0xbd, 0x0b, 0xa9, 0x33, - 0x8e, 0xc0, 0x9b, 0xd2, 0x4b, 0x13, 0x08, 0x0d, 0x96, 0x45, 0xd5, 0x33, 0x6c, 0x9e, 0x0f, 0xe4, - 0x93, 0x67, 0x4c, 0xfa, 0x07, 0x00, 0xa6, 0x61, 0x9b, 0xb8, 0xcb, 0x10, 0x92, 0x53, 0xe2, 0x71, - 0xf8, 0xec, 0x55, 0xc6, 0xda, 0x98, 0xd3, 0x32, 0x5c, 0x88, 0x22, 0x3c, 0x84, 0x05, 0x0b, 0xb7, - 0x82, 0xb6, 0xde, 0x75, 0xda, 0x0c, 0x44, 0x66, 0x20, 0xeb, 0x13, 0x66, 0xd4, 0x28, 0xd7, 0x9e, - 0xd3, 0x1e, 0xd8, 0x30, 0x6f, 0x0d, 0x48, 0xa8, 0x09, 0x8b, 0x1c, 0xc7, 0x75, 0x2c, 0xc2, 0x80, - 0x32, 0x0c, 0xe8, 0xde, 0x74, 0xa0, 0x43, 0xc7, 0x22, 0x03, 0xa4, 0xac, 0x35, 0x44, 0x43, 0x1f, - 0x4b, 0x90, 0x6f, 0x63, 0x9b, 0x76, 0x38, 0xac, 0x3b, 0x3e, 0xee, 0xea, 0x84, 0x79, 0x8f, 0xa1, - 0x02, 0x43, 0x7d, 0x63, 0x02, 0xf5, 0x91, 0x10, 0x38, 0x38, 0xc6, 0xdd, 0x11, 0x67, 0x57, 0x6e, - 0xf7, 0xaf, 0x4a, 0x2b, 0x53, 0xb7, 0x1b, 0x73, 0xda, 0x4a, 0xa8, 0xe8, 0xc0, 0x1f, 0xda, 0xa8, - 0x24, 0x21, 0xde, 0x23, 0x74, 0x60, 0x4a, 0x29, 0xe9, 0xdd, 0x84, 0x9c, 0x56, 0x64, 0x75, 0x19, - 0xd0, 0xa4, 0x2f, 0xd5, 0x3f, 0x24, 0x60, 0xf9, 0x74, 0xab, 0x3a, 0x14, 0x5e, 0x22, 0xea, 0xbf, - 0x5a, 0x7c, 0xd5, 0x21, 0x23, 0x22, 0x89, 0xb8, 0xa2, 0xac, 0xbc, 0x7a, 0x53, 0x28, 0x71, 0x45, - 0x8d, 0x39, 0x4d, 0xe6, 0xb1, 0x44, 0x5c, 0xf4, 0x3e, 0xa4, 0xcf, 0x04, 0x08, 0x8f, 0xc7, 0x97, - 0xaf, 0x8f, 0xa6, 0x08, 0x22, 0x75, 0xc6, 0x01, 0x06, 0x83, 0x19, 0x8f, 0xc6, 0xb5, 0x09, 0x79, - 0x5e, 0x80, 0xa9, 0x88, 0x18, 0xcc, 0xa2, 0x8b, 0xe7, 0x01, 0x44, 0x5c, 0x36, 0xcd, 0xcc, 0xbc, - 0x78, 0x16, 0x2e, 0x91, 0xde, 0xac, 0x35, 0x44, 0x43, 0x7b, 0x90, 0x1b, 0x89, 0x21, 0xe2, 0x8a, - 0x68, 0x54, 0xaf, 0x0b, 0xa2, 0x08, 0x6c, 0xc1, 0x1a, 0x26, 0xd2, 0xc9, 0xe3, 0xf6, 0x8c, 0x30, - 0x22, 0xae, 0x88, 0xce, 0x6f, 0x3f, 0x57, 0x1c, 0x71, 0x0d, 0x95, 0x42, 0xff, 0xaa, 0xb4, 0x3a, - 0x7d, 0xbf, 0x31, 0xa7, 0xad, 0x4e, 0x8b, 0x24, 0xe2, 0x0e, 0x42, 0x89, 0x3f, 0xdc, 0x53, 0x4a, - 0x9a, 0x16, 0x79, 0x38, 0xdd, 0xaa, 0x86, 0x65, 0xeb, 0xf5, 0xf1, 0x92, 0x9e, 0x99, 0x59, 0xc1, - 0xc7, 0xe6, 0xd1, 0xd8, 0x8d, 0xf3, 0xe8, 0x5d, 0x00, 0x82, 0x09, 0xad, 0xf1, 0x14, 0x9c, 0xbf, - 0x43, 0x32, 0x82, 0xd2, 0xb4, 0xd0, 0xab, 0xcc, 0x38, 0x71, 0xd9, 0xcb, 0x13, 0x73, 0xc4, 0x8e, - 0x7d, 0xa9, 0x51, 0x06, 0x55, 0x07, 0xa8, 0x6e, 0x9d, 0x7e, 0x0d, 0x83, 0x85, 0x82, 0xd8, 0x4d, - 0x0a, 0x7e, 0x2f, 0x01, 0x54, 0x3d, 0xc7, 0xe6, 0x8e, 0x43, 0xaf, 0x41, 0x6c, 0x76, 0x7b, 0x4b, - 0xf5, 0xaf, 0x4a, 0xb1, 0x66, 0x4d, 0x8b, 0x75, 0x2c, 0xfa, 0xce, 0xe4, 0xb7, 0x1a, 0xfe, 0x20, - 0x4d, 0x42, 0x80, 0x9c, 0xe9, 0x39, 0xb6, 0x8e, 0x9f, 0xb9, 0x1e, 0x3f, 0xad, 0x68, 0x6d, 0x8b, - 0x94, 0x5c, 0x8f, 0xa8, 0xb4, 0x27, 0xf2, 0xf6, 0x4c, 0xc4, 0xf3, 0x2b, 0x5c, 0xa2, 0x12, 0xcc, - 0x3f, 0xf1, 0xf8, 0x8b, 0xed, 0x52, 0x27, 0xac, 0xb8, 0xc6, 0x35, 0x88, 0x48, 0x47, 0xea, 0xf7, - 0xe0, 0xee, 0x23, 0xec, 0x0f, 0xac, 0x26, 0x2c, 0xab, 0x48, 0x10, 0xf5, 0x18, 0xd6, 0x35, 0xdc, - 0x8e, 0x29, 0x06, 0x1c, 0xbe, 0x50, 0xdf, 0x85, 0xe2, 0x2c, 0x31, 0x51, 0x3b, 0x0a, 0x20, 0x9b, - 0x82, 0x26, 0x44, 0xa3, 0xb5, 0x7a, 0x1f, 0x56, 0x46, 0xa5, 0xaf, 0x57, 0xf6, 0x67, 0x09, 0x56, - 0xc7, 0xf9, 0x85, 0x96, 0x5d, 0x48, 0x73, 0x67, 0xd1, 0x57, 0x30, 0x1d, 0xbf, 0xbf, 0x33, 0xd2, - 0x38, 0xa6, 0x4b, 0x95, 0xc5, 0x9a, 0x0f, 0xdd, 0x21, 0x40, 0xe1, 0x08, 0xb2, 0xc3, 0x1b, 0x53, - 0x06, 0xbb, 0xfb, 0xa3, 0x83, 0xdd, 0xda, 0x68, 0x93, 0x8a, 0x14, 0x0d, 0x4f, 0x76, 0xc7, 0x70, - 0x2f, 0xfc, 0x0d, 0xfd, 0xc0, 0xe3, 0x33, 0xc6, 0x10, 0xa3, 0x38, 0xf6, 0x66, 0x14, 0x00, 0xd2, - 0xf5, 0xc0, 0x82, 0x4d, 0x7d, 0x19, 0xd4, 0xeb, 0x50, 0xc5, 0x1c, 0x76, 0x02, 0x6b, 0x35, 0xdc, - 0xc5, 0xd3, 0x34, 0x6e, 0x43, 0x46, 0x14, 0x92, 0x1b, 0x26, 0x30, 0x2e, 0x46, 0xd3, 0x81, 0xf3, - 0x37, 0x2d, 0xb5, 0x00, 0xf9, 0x49, 0x58, 0xa1, 0xf2, 0x3f, 0x12, 0x28, 0x03, 0xb2, 0xf8, 0x41, - 0xf5, 0x00, 0x20, 0x70, 0x09, 0xf6, 0x78, 0xf3, 0xe3, 0xda, 0xca, 0x53, 0xff, 0xcd, 0x30, 0xd3, - 0x45, 0xb4, 0xdf, 0x73, 0x0c, 0xda, 0x5c, 0xeb, 0x00, 0x16, 0xb3, 0x80, 0x01, 0xc6, 0x06, 0x5d, - 0x22, 0x02, 0x9c, 0x71, 0x6e, 0x0a, 0xc3, 0x25, 0x29, 0xcc, 0x68, 0x7b, 0x8b, 0xdf, 0xd0, 0xde, - 0xee, 0x40, 0x26, 0xfa, 0x9f, 0x18, 0x4b, 0xb3, 0xb8, 0x36, 0x20, 0x88, 0x0a, 0xf9, 0xc6, 0x9f, - 0xa4, 0xf0, 0xe7, 0x0a, 0xf1, 0xea, 0x59, 0x82, 0x85, 0xd3, 0x0f, 0xf4, 0x91, 0xff, 0x6f, 0x44, - 0xa4, 0x46, 0x7d, 0x67, 0xef, 0xb8, 0xf1, 0x63, 0x45, 0x42, 0xb7, 0x20, 0x17, 0x72, 0x85, 0xc4, - 0x18, 0x5a, 0x05, 0xc4, 0x89, 0xb5, 0xe6, 0x51, 0xf5, 0x60, 0x7f, 0xbf, 0x5e, 0x3d, 0xae, 0xd7, - 0x94, 0x38, 0x42, 0xb0, 0x28, 0x98, 0x0f, 0x6b, 0x3b, 0xc7, 0xcd, 0xfd, 0x47, 0x4a, 0x62, 0x00, - 0x30, 0x60, 0x4c, 0xa2, 0x35, 0xb8, 0x35, 0xc4, 0x58, 0x17, 0xff, 0x47, 0x51, 0x52, 0x03, 0x84, - 0x5a, 0xfd, 0x91, 0xb6, 0x53, 0xab, 0xd7, 0x94, 0x74, 0xe5, 0xbd, 0x4f, 0x3e, 0x2b, 0xce, 0x7d, - 0xfa, 0x59, 0x71, 0xee, 0x8b, 0xcf, 0x8a, 0xd2, 0xc7, 0xfd, 0xa2, 0xf4, 0x9b, 0x7e, 0x51, 0xfa, - 0x6b, 0xbf, 0x28, 0x7d, 0xd2, 0x2f, 0x4a, 0xff, 0xe8, 0x17, 0xa5, 0x7f, 0xf6, 0x8b, 0x73, 0x5f, - 0xf4, 0x8b, 0xd2, 0x2f, 0x3e, 0x2f, 0xce, 0x7d, 0xf2, 0x79, 0x71, 0xee, 0xd3, 0xcf, 0x8b, 0x73, - 0x1f, 0xc8, 0xa1, 0xc7, 0x5b, 0x29, 0x56, 0x0f, 0xbf, 0xfb, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x8a, 0xb6, 0x6c, 0x28, 0xc2, 0x1c, 0x00, 0x00, + // 2525 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0x4b, 0x6f, 0xe3, 0xd6, + 0x15, 0x36, 0xf5, 0xa4, 0x8e, 0x65, 0x8b, 0xbe, 0xe3, 0x87, 0x46, 0x9d, 0x91, 0x3c, 0xcc, 0xcb, + 0x49, 0x33, 0x72, 0xe3, 0xa6, 0xe8, 0xc4, 0x08, 0x92, 0x5a, 0x8f, 0x19, 0xc9, 0xe3, 0xda, 0x06, + 0xfd, 0x28, 0x9a, 0x0d, 0x41, 0x91, 0x77, 0x64, 0xc5, 0x12, 0xc9, 0xe1, 0xa5, 0x9c, 0x71, 0x57, + 0x59, 0x14, 0x05, 0xba, 0xeb, 0xa2, 0x8b, 0xfe, 0x80, 0x2e, 0xba, 0x29, 0x8a, 0x16, 0x28, 0x8a, + 0xfe, 0x81, 0xa2, 0x05, 0xba, 0xc8, 0x32, 0x2b, 0xa3, 0x51, 0x36, 0x5d, 0x06, 0x59, 0x74, 0x53, + 0x14, 0x28, 0xee, 0x83, 0xd4, 0x8b, 0xb2, 0x27, 0xc9, 0x74, 0xd1, 0x95, 0x79, 0xcf, 0x3d, 0xe7, + 0x3b, 0xe7, 0x9e, 0x7b, 0x5e, 0x57, 0x86, 0x75, 0xe2, 0x99, 0x9b, 0xe4, 0xcc, 0xf0, 0xb0, 0xb5, + 0x69, 0x5e, 0xf4, 0x48, 0x9b, 0xb8, 0x2d, 0xf1, 0x51, 0x76, 0x3d, 0xc7, 0x77, 0xd0, 0xbc, 0xfb, + 0xac, 0x1c, 0xec, 0x14, 0x96, 0xdb, 0x4e, 0xdb, 0x61, 0xf4, 0x4d, 0xfa, 0xc5, 0x59, 0x0a, 0xb7, + 0xdb, 0x8e, 0xd3, 0xee, 0xe2, 0x4d, 0xb6, 0x6a, 0xf5, 0x9f, 0x6c, 0x1a, 0xf6, 0xa5, 0xd8, 0x2a, + 0x4d, 0x6e, 0xf9, 0x9d, 0x1e, 0x26, 0xbe, 0xd1, 0x73, 0x03, 0x06, 0x6a, 0x80, 0xe1, 0x76, 0x38, + 0xc7, 0x66, 0xbf, 0xdf, 0xb1, 0xdc, 0x16, 0xfb, 0x23, 0x18, 0x5e, 0x1d, 0x67, 0xb8, 0xe8, 0xfc, + 0xa4, 0x83, 0x3d, 0xb7, 0x25, 0x3e, 0x0c, 0xb7, 0x23, 0xf8, 0x36, 0x46, 0x4e, 0x72, 0xfe, 0x80, + 0x6c, 0xf6, 0xb0, 0x6f, 0x58, 0x86, 0x6f, 0xb8, 0xad, 0xf0, 0x93, 0x73, 0xaa, 0x7f, 0x94, 0x60, + 0x45, 0xc3, 0xed, 0x0e, 0xf1, 0xb1, 0x77, 0xca, 0x50, 0x34, 0xfc, 0xb4, 0x8f, 0x89, 0x8f, 0xb6, + 0x21, 0xc3, 0x61, 0xf5, 0x8e, 0x95, 0x97, 0xd6, 0xa5, 0x8d, 0xf9, 0xad, 0x5c, 0xd9, 0x7d, 0x56, + 0xe6, 0x56, 0x95, 0x4f, 0x4e, 0x9a, 0xb5, 0x4a, 0x76, 0x70, 0x55, 0x92, 0xb9, 0x58, 0xb3, 0xa6, + 0xc9, 0x9c, 0xbf, 0x69, 0xa1, 0x35, 0x48, 0x7f, 0xf8, 0x91, 0xaf, 0x9f, 0xe3, 0xcb, 0x7c, 0x6c, + 0x5d, 0xda, 0xc8, 0x68, 0xa9, 0x0f, 0x3f, 0xf2, 0x1f, 0xe3, 0x4b, 0xb4, 0x03, 0x59, 0xb3, 0xdb, + 0xa7, 0xca, 0xf4, 0x8e, 0xfd, 0xc4, 0xc9, 0x27, 0x18, 0x6e, 0xb1, 0x3c, 0xe2, 0xd7, 0x32, 0xc7, + 0xab, 0x72, 0xb6, 0xa6, 0xfd, 0xc4, 0xd1, 0xe6, 0xcd, 0xe1, 0x62, 0x37, 0x21, 0xc7, 0x95, 0x84, + 0xfa, 0x4b, 0x09, 0x96, 0xa6, 0x18, 0xd1, 0x26, 0x04, 0xac, 0x7a, 0x5f, 0x58, 0x9d, 0xa9, 0x2c, + 0x0e, 0xae, 0x4a, 0x20, 0xb8, 0x4e, 0x9a, 0x35, 0x0d, 0x04, 0xcb, 0x49, 0xc7, 0x42, 0xf7, 0x86, + 0xf6, 0xd8, 0x46, 0x0f, 0x0b, 0x6b, 0x03, 0x90, 0x7d, 0xa3, 0x87, 0xd1, 0x2b, 0xb0, 0x28, 0xfc, + 0x70, 0x81, 0x3d, 0xd2, 0x71, 0x6c, 0x66, 0x74, 0x46, 0x5b, 0xe0, 0xd4, 0x53, 0x4e, 0x14, 0x66, + 0xfd, 0x4d, 0x82, 0xa5, 0x71, 0x77, 0xee, 0x98, 0xe7, 0xa8, 0x09, 0x29, 0xe2, 0x1b, 0x7e, 0x9f, + 0x30, 0x8b, 0x16, 0xb7, 0xde, 0x1a, 0x3b, 0xef, 0x14, 0xbf, 0xa0, 0x78, 0x86, 0xdf, 0x71, 0xec, + 0x23, 0x26, 0xa8, 0x09, 0x00, 0x54, 0x82, 0x79, 0x61, 0xcd, 0x88, 0xbd, 0xc0, 0x49, 0xd4, 0x5c, + 0xb5, 0x01, 0x68, 0x5a, 0x1c, 0x2d, 0x02, 0x1c, 0x1d, 0xeb, 0x27, 0xfb, 0x8f, 0xf7, 0x0f, 0x7e, + 0xb4, 0xaf, 0xcc, 0xa1, 0x0c, 0x24, 0x8f, 0x8e, 0xf5, 0x83, 0xc7, 0x8a, 0x84, 0xd6, 0xe0, 0xd6, + 0xd1, 0xb1, 0xfe, 0x70, 0xa7, 0xb9, 0x57, 0xaf, 0xe9, 0xfb, 0x07, 0xc7, 0xfa, 0xc3, 0x83, 0x93, + 0xfd, 0x9a, 0x12, 0x53, 0xff, 0x9e, 0x86, 0x1c, 0xb7, 0xa9, 0x81, 0x0d, 0xcf, 0x6f, 0x61, 0xe3, + 0x9b, 0x05, 0x05, 0x82, 0x04, 0x0d, 0x78, 0x66, 0x73, 0x5c, 0x63, 0xdf, 0xe8, 0x35, 0xc8, 0x11, + 0x1a, 0x6f, 0xb6, 0x89, 0x75, 0xbb, 0xdf, 0x6b, 0x61, 0x2f, 0x1f, 0x67, 0xdb, 0x8b, 0x01, 0x79, + 0x9f, 0x51, 0xd1, 0x21, 0x64, 0x5d, 0xc7, 0xd2, 0xb9, 0x17, 0x30, 0xc9, 0xa7, 0xd6, 0xe3, 0x1b, + 0xf3, 0x5b, 0xf7, 0x23, 0x02, 0x27, 0x34, 0xb6, 0x7c, 0xe8, 0x58, 0x47, 0x82, 0xbf, 0x6e, 0xfb, + 0xde, 0xa5, 0x36, 0xef, 0x0e, 0x29, 0xe8, 0xe7, 0x12, 0xdc, 0xeb, 0xdb, 0x67, 0xd8, 0xe8, 0xfa, + 0x67, 0x97, 0x3a, 0x4d, 0x09, 0xdd, 0xed, 0x1a, 0x36, 0xd6, 0xc7, 0xf4, 0xe4, 0x98, 0x9e, 0xf7, + 0xaf, 0xd5, 0x73, 0x12, 0xa0, 0xd4, 0x0c, 0xdf, 0x38, 0xa4, 0x18, 0x53, 0x9a, 0xef, 0xf6, 0xaf, + 0xe3, 0x41, 0xef, 0xc0, 0xed, 0x51, 0xad, 0x7a, 0xd7, 0x20, 0xbe, 0xde, 0x77, 0x2d, 0xc3, 0xc7, + 0x56, 0x3e, 0xcd, 0x1c, 0xb2, 0x3a, 0x62, 0xfb, 0x9e, 0x41, 0xfc, 0x13, 0xbe, 0x8b, 0xde, 0x0a, + 0x63, 0x4b, 0x66, 0xb1, 0x75, 0x3b, 0xc2, 0xd4, 0x89, 0x18, 0xfa, 0x16, 0x64, 0xec, 0x7e, 0x4f, + 0xb7, 0x1d, 0x0b, 0x93, 0xfc, 0xfc, 0xba, 0xb4, 0x91, 0xd4, 0x64, 0xbb, 0xdf, 0xdb, 0xa7, 0x6b, + 0xf4, 0x36, 0xac, 0xd2, 0xcd, 0x8e, 0x4d, 0x7c, 0xaf, 0xdf, 0xc3, 0xb6, 0x8f, 0x2d, 0xc1, 0x99, + 0x65, 0x9c, 0xcb, 0x76, 0xbf, 0xd7, 0x1c, 0xd9, 0xe4, 0x52, 0x65, 0xb8, 0x65, 0x75, 0x88, 0xd1, + 0xea, 0x62, 0xdd, 0xe8, 0xfb, 0x8e, 0xb0, 0x3d, 0xbf, 0xb0, 0x2e, 0x6d, 0xc8, 0xda, 0x92, 0xd8, + 0xda, 0xe9, 0xfb, 0x0e, 0x37, 0x9b, 0x26, 0x15, 0x37, 0x46, 0xef, 0x61, 0x42, 0x8c, 0x36, 0xce, + 0x2f, 0xf2, 0xa4, 0xe2, 0xd4, 0x1f, 0x72, 0x22, 0xaa, 0xc3, 0xad, 0xf3, 0x07, 0x44, 0x0f, 0x52, + 0x34, 0x48, 0x40, 0x85, 0xe5, 0xf5, 0xca, 0xe0, 0xaa, 0xb4, 0xf4, 0xf8, 0x01, 0x11, 0xa9, 0x2d, + 0x12, 0x51, 0x5b, 0x3a, 0x9f, 0x24, 0xa1, 0xd7, 0x41, 0x71, 0x5c, 0xec, 0x19, 0xbe, 0x33, 0xc4, + 0x58, 0x62, 0xfa, 0x72, 0x01, 0x5d, 0xb0, 0x16, 0x4e, 0x41, 0x99, 0xbc, 0x3c, 0xa4, 0x40, 0x9c, + 0x56, 0x32, 0x56, 0x4d, 0x34, 0xfa, 0x89, 0xde, 0x84, 0xe4, 0x85, 0xd1, 0xed, 0xf3, 0x58, 0x9e, + 0xdf, 0x5a, 0x1d, 0xf3, 0x79, 0x28, 0xaf, 0x71, 0xa6, 0xed, 0xd8, 0x03, 0xa9, 0x70, 0x06, 0xea, + 0xcd, 0x61, 0xf2, 0x22, 0x34, 0xed, 0x26, 0xe4, 0x84, 0x92, 0xdc, 0x4d, 0xc8, 0x49, 0x25, 0xb5, + 0x9b, 0x90, 0x33, 0x0a, 0xec, 0x26, 0x64, 0x50, 0xe6, 0xd5, 0x7f, 0xc5, 0x20, 0x13, 0x0a, 0xd0, + 0x64, 0x64, 0x05, 0x84, 0xab, 0x62, 0xdf, 0x68, 0x3b, 0x0c, 0xa5, 0x18, 0x0b, 0x25, 0x95, 0x2a, + 0xe3, 0x5d, 0xa4, 0x7c, 0xfe, 0x80, 0x94, 0x87, 0x5d, 0x84, 0x6a, 0x3e, 0x3c, 0x33, 0x08, 0x0e, + 0x63, 0x6a, 0xfa, 0x42, 0xe3, 0x51, 0x17, 0xba, 0x0a, 0x29, 0x0f, 0x1b, 0x24, 0x2c, 0xa2, 0x62, + 0x85, 0xde, 0x05, 0x30, 0x1d, 0xdb, 0x37, 0x3a, 0x36, 0xf6, 0x48, 0x3e, 0xc9, 0x92, 0xee, 0xce, + 0xd8, 0x59, 0xab, 0xc1, 0xb6, 0x38, 0xf1, 0x08, 0x3f, 0x6a, 0x00, 0x98, 0x1e, 0xa6, 0xe9, 0xa0, + 0x1b, 0x7e, 0x3e, 0xc5, 0x3c, 0x55, 0x28, 0xf3, 0x6e, 0x5b, 0x0e, 0xba, 0x6d, 0xf9, 0x38, 0xe8, + 0xb6, 0x95, 0x85, 0xc1, 0x55, 0x29, 0x53, 0xe5, 0x12, 0x3b, 0xbe, 0x96, 0x31, 0x83, 0x4f, 0x74, + 0x1f, 0x52, 0xf8, 0x02, 0xdb, 0x3e, 0xc9, 0xa7, 0x99, 0x0d, 0x2b, 0x63, 0x36, 0x3c, 0x7e, 0x40, + 0xea, 0x74, 0x57, 0x13, 0x4c, 0xe8, 0x25, 0x58, 0xf0, 0x28, 0xa6, 0xe7, 0xeb, 0xa6, 0xd3, 0xb7, + 0x7d, 0x96, 0x83, 0x71, 0x2d, 0x2b, 0x88, 0x55, 0x4a, 0x53, 0x7f, 0x25, 0x81, 0x1c, 0x48, 0xa2, + 0x3c, 0xa4, 0x03, 0x07, 0x71, 0xd7, 0x07, 0x4b, 0xf4, 0x0e, 0xc0, 0x93, 0x8e, 0x47, 0x7c, 0x3d, + 0x2c, 0x92, 0xd7, 0x1e, 0x42, 0xcb, 0x30, 0x6e, 0xba, 0x46, 0xdf, 0x87, 0x0c, 0xab, 0x18, 0x4c, + 0x32, 0x7e, 0xa3, 0xa4, 0x4c, 0x99, 0xe9, 0x52, 0xfd, 0x59, 0x0c, 0x72, 0x13, 0x8e, 0x8d, 0x8c, + 0x8c, 0xf7, 0x20, 0x49, 0xef, 0x11, 0x8b, 0xc0, 0xd8, 0x98, 0x1d, 0x18, 0x63, 0x68, 0x58, 0xe3, + 0x62, 0xa3, 0xa7, 0x8e, 0x8f, 0x9f, 0x7a, 0x56, 0x40, 0xbc, 0xb8, 0x2b, 0x9d, 0xba, 0xa3, 0x74, + 0xc4, 0x1d, 0xfd, 0x5b, 0x02, 0x34, 0x51, 0xd6, 0x69, 0xe3, 0x7e, 0x34, 0xd1, 0xb8, 0x37, 0xaf, + 0xeb, 0x03, 0xb4, 0x73, 0x87, 0x8b, 0x89, 0x92, 0xfb, 0x8d, 0x7a, 0xdf, 0x4b, 0xb0, 0x80, 0x3d, + 0xcf, 0xf1, 0xc2, 0xd4, 0xe2, 0xae, 0xca, 0x32, 0xa2, 0xc8, 0x2c, 0x75, 0x1b, 0x72, 0x13, 0xca, + 0x69, 0xd3, 0x6f, 0x54, 0xc6, 0x9b, 0x7e, 0xa3, 0xc2, 0x9b, 0x7e, 0x16, 0xe4, 0x46, 0x45, 0xaf, + 0x6b, 0xda, 0x81, 0xa6, 0xc4, 0xd4, 0x02, 0x64, 0xc5, 0x2c, 0xe5, 0xd8, 0x4f, 0x3a, 0xed, 0xdd, + 0x84, 0x2c, 0x29, 0xb1, 0xdd, 0x84, 0x1c, 0x53, 0xe2, 0xea, 0x7a, 0xe0, 0x18, 0xbe, 0xc7, 0xeb, + 0xf7, 0x18, 0xc7, 0xaf, 0x33, 0x00, 0xa2, 0xdd, 0xd3, 0x19, 0x6c, 0xf7, 0x39, 0x46, 0x84, 0x3b, + 0xa3, 0x23, 0xc2, 0x97, 0x57, 0xa5, 0xac, 0xd5, 0xda, 0x0e, 0x85, 0x46, 0x46, 0x86, 0xb7, 0x26, + 0x2a, 0xd2, 0x73, 0x34, 0xb7, 0x1d, 0x58, 0x62, 0xb9, 0x70, 0x16, 0x38, 0x43, 0xb7, 0x09, 0xf7, + 0x6b, 0x65, 0xe5, 0xcb, 0xab, 0xd2, 0x92, 0xd5, 0xda, 0x1e, 0xdf, 0xd7, 0x72, 0x74, 0x1d, 0xfa, + 0x6e, 0x9f, 0x50, 0xad, 0x26, 0x3b, 0xac, 0x18, 0x4f, 0xa3, 0xb4, 0x72, 0x6f, 0x68, 0x82, 0x71, + 0x72, 0xf0, 0x4c, 0x7e, 0xe5, 0xc1, 0x33, 0x35, 0x3d, 0x78, 0xbe, 0x06, 0xb9, 0xc9, 0xc6, 0x97, + 0x66, 0x5c, 0x8b, 0xe6, 0xd7, 0x6d, 0x6f, 0x11, 0xc3, 0xac, 0x1c, 0x31, 0xcc, 0xa2, 0xa7, 0x50, + 0xa0, 0xe5, 0xd5, 0x73, 0xba, 0x51, 0x33, 0x51, 0x86, 0x95, 0xc6, 0xb7, 0x23, 0xbc, 0x42, 0x03, + 0x80, 0x95, 0x00, 0xcf, 0xe9, 0x46, 0x0f, 0x42, 0x6b, 0x66, 0xf4, 0x2e, 0xfa, 0xe9, 0x73, 0x8d, + 0x63, 0x8b, 0x4c, 0xf5, 0xf6, 0x2c, 0xd5, 0xdf, 0x7c, 0x12, 0xfb, 0x1f, 0xcc, 0x46, 0xd3, 0xad, + 0x71, 0x21, 0xaa, 0x35, 0x56, 0x20, 0xe7, 0x7a, 0xf8, 0xa2, 0xe3, 0xf4, 0x89, 0x38, 0x6f, 0x3e, + 0x77, 0x53, 0xd0, 0x2f, 0x06, 0x12, 0x22, 0xe3, 0xf7, 0x60, 0x79, 0x02, 0x83, 0xf7, 0x04, 0xe5, + 0xc6, 0x9e, 0x80, 0xc6, 0x91, 0xe8, 0x46, 0xa1, 0x05, 0x77, 0xae, 0xbb, 0xcb, 0xff, 0xaf, 0xb9, + 0x48, 0xfd, 0xad, 0x04, 0xb7, 0x79, 0xf5, 0x1a, 0xcb, 0x60, 0xf1, 0xda, 0x7d, 0x91, 0x55, 0xab, + 0x06, 0x0b, 0xbc, 0x2c, 0x04, 0x63, 0x30, 0xb7, 0xb1, 0x34, 0xb3, 0x8c, 0x70, 0xb3, 0xb4, 0xac, + 0x39, 0xb2, 0x52, 0xef, 0x40, 0x21, 0xca, 0x5c, 0xe2, 0x3a, 0x36, 0xc1, 0xea, 0xef, 0x24, 0xb8, + 0xc3, 0xb7, 0x0f, 0x3c, 0x1a, 0x72, 0x46, 0xb7, 0xfb, 0xe2, 0x9e, 0xef, 0x79, 0x48, 0x07, 0xe5, + 0x81, 0x3f, 0x30, 0x83, 0x25, 0x5a, 0x86, 0xa4, 0xef, 0x9c, 0x63, 0x5b, 0xb4, 0x71, 0xbe, 0xe0, + 0x2d, 0xd6, 0xc2, 0x6e, 0xd7, 0xb9, 0xd4, 0xb1, 0x6f, 0x5a, 0xac, 0x6e, 0xca, 0xb4, 0xc5, 0x72, + 0x62, 0xdd, 0x37, 0x2d, 0xf5, 0x21, 0xdc, 0x9d, 0x61, 0x30, 0x3f, 0x12, 0xcd, 0x13, 0xee, 0x2f, + 0x9d, 0x35, 0x66, 0xcc, 0xcd, 0x96, 0xb5, 0x05, 0x4e, 0x3d, 0xe2, 0x44, 0x75, 0x0b, 0x96, 0x43, + 0x8f, 0xd8, 0xd8, 0xa4, 0x8f, 0x5c, 0xd6, 0x77, 0x42, 0xd3, 0x62, 0x23, 0xa6, 0xf1, 0x46, 0xa5, + 0xde, 0x83, 0xf9, 0xd3, 0x3d, 0xa7, 0x1d, 0xa4, 0x1a, 0x82, 0x04, 0x2d, 0x30, 0x0c, 0x3f, 0xab, + 0xb1, 0x6f, 0xf5, 0x2f, 0x09, 0xb8, 0x55, 0xdd, 0x3a, 0xdd, 0x39, 0x6c, 0x1e, 0xf9, 0x1e, 0x36, + 0x7a, 0x81, 0x1f, 0xdf, 0x04, 0xf0, 0xf8, 0xa7, 0x1e, 0xfe, 0xa2, 0xc0, 0x86, 0x0d, 0xc1, 0xd0, + 0xac, 0x69, 0x19, 0xc1, 0xd0, 0xb4, 0xa2, 0x8d, 0x40, 0x15, 0x90, 0xf1, 0x33, 0x6c, 0xea, 0x1e, + 0x7e, 0x2a, 0xc6, 0xb3, 0x57, 0xe8, 0x55, 0x18, 0x6e, 0xa7, 0x1c, 0xfc, 0x84, 0x53, 0xae, 0x3f, + 0xc3, 0x66, 0xdf, 0xc7, 0x47, 0xa6, 0xd7, 0x71, 0x7d, 0x81, 0xdd, 0x98, 0xd3, 0xd2, 0x54, 0x50, + 0xc3, 0x4f, 0xd1, 0xbb, 0x90, 0x3a, 0xe3, 0x08, 0xbc, 0x29, 0xbd, 0x34, 0x85, 0xd0, 0x60, 0x59, + 0x54, 0x3d, 0xc3, 0xe6, 0xf9, 0x50, 0x3e, 0x79, 0xc6, 0xa4, 0x7f, 0x00, 0x60, 0x1a, 0xb6, 0x89, + 0xbb, 0x0c, 0x21, 0x19, 0x11, 0x8f, 0xa3, 0x67, 0xaf, 0x32, 0xd6, 0xc6, 0x9c, 0x96, 0xe1, 0x42, + 0x14, 0xe1, 0x21, 0x2c, 0x58, 0xb8, 0xd5, 0x6f, 0xeb, 0x5d, 0xa7, 0xcd, 0x40, 0x64, 0x06, 0xb2, + 0x3e, 0x65, 0x46, 0x8d, 0x72, 0xed, 0x39, 0xed, 0xa1, 0x0d, 0xf3, 0xd6, 0x90, 0x84, 0x9a, 0xb0, + 0xc8, 0x71, 0x5c, 0xc7, 0x22, 0x0c, 0x28, 0xc3, 0x80, 0xee, 0x45, 0x03, 0x1d, 0x3a, 0x16, 0x19, + 0x22, 0x65, 0xad, 0x11, 0x1a, 0xfa, 0x58, 0x82, 0x7c, 0x1b, 0xdb, 0xb4, 0xc3, 0x61, 0xdd, 0xf1, + 0x71, 0x57, 0x27, 0xcc, 0x7b, 0x0c, 0x15, 0x18, 0xea, 0x1b, 0x53, 0xa8, 0x8f, 0x84, 0xc0, 0xc1, + 0x31, 0xee, 0x8e, 0x39, 0xbb, 0x72, 0x7b, 0x70, 0x55, 0x5a, 0x89, 0xdc, 0x6e, 0xcc, 0x69, 0x2b, + 0x81, 0xa2, 0x03, 0x7f, 0x64, 0xa3, 0x92, 0x84, 0x78, 0x8f, 0xd0, 0x81, 0x29, 0xa5, 0xa4, 0x77, + 0x13, 0x72, 0x5a, 0x91, 0xd5, 0x65, 0x40, 0xd3, 0xbe, 0x54, 0xff, 0x90, 0x80, 0xe5, 0xd3, 0xad, + 0xea, 0x48, 0x78, 0x89, 0xa8, 0xff, 0x6a, 0xf1, 0x55, 0x87, 0x8c, 0x88, 0x24, 0xe2, 0x8a, 0xb2, + 0xf2, 0xea, 0x4d, 0xa1, 0xc4, 0x15, 0x35, 0xe6, 0x34, 0x99, 0xc7, 0x12, 0x71, 0xd1, 0xfb, 0x90, + 0x3e, 0x13, 0x20, 0x3c, 0x1e, 0x5f, 0xbe, 0x3e, 0x9a, 0x42, 0x88, 0xd4, 0x19, 0x07, 0x18, 0x0e, + 0x66, 0x3c, 0x1a, 0xd7, 0xa6, 0xe4, 0x79, 0x01, 0xa6, 0x22, 0x62, 0x30, 0x0b, 0x2f, 0x9e, 0x07, + 0x10, 0x71, 0xd9, 0x34, 0x33, 0xf3, 0xe2, 0x59, 0xb8, 0x84, 0x7a, 0xb3, 0xd6, 0x08, 0x0d, 0xed, + 0x41, 0x6e, 0x2c, 0x86, 0x88, 0x2b, 0xa2, 0x51, 0xbd, 0x2e, 0x88, 0x42, 0xb0, 0x05, 0x6b, 0x94, + 0x48, 0x27, 0x8f, 0xdb, 0x33, 0xc2, 0x88, 0xb8, 0x22, 0x3a, 0xbf, 0xfd, 0x5c, 0x71, 0xc4, 0x35, + 0x54, 0x0a, 0x83, 0xab, 0xd2, 0x6a, 0xf4, 0x7e, 0x63, 0x4e, 0x5b, 0x8d, 0x8a, 0x24, 0xe2, 0x0e, + 0x43, 0x89, 0x3f, 0xdc, 0x53, 0x4a, 0x9a, 0x16, 0x79, 0x38, 0xdd, 0xaa, 0x06, 0x65, 0xeb, 0xf5, + 0xc9, 0x92, 0x9e, 0x99, 0x59, 0xc1, 0x27, 0xe6, 0xd1, 0xd8, 0x8d, 0xf3, 0xe8, 0x5d, 0x00, 0x82, + 0x09, 0xad, 0xf1, 0x14, 0x9c, 0xbf, 0x43, 0x32, 0x82, 0xd2, 0xb4, 0xd0, 0xab, 0xcc, 0x38, 0x71, + 0xd9, 0xcb, 0x53, 0x73, 0xc4, 0x8e, 0x7d, 0xa9, 0x51, 0x06, 0x55, 0x07, 0xa8, 0x6e, 0x9d, 0x7e, + 0x0d, 0x83, 0x85, 0x82, 0xd8, 0x4d, 0x0a, 0x7e, 0x2f, 0x01, 0x54, 0x3d, 0xc7, 0xe6, 0x8e, 0x43, + 0xaf, 0x41, 0x6c, 0x76, 0x7b, 0x4b, 0x0d, 0xae, 0x4a, 0xb1, 0x66, 0x4d, 0x8b, 0x75, 0x2c, 0xfa, + 0xce, 0xe4, 0xb7, 0x1a, 0xfc, 0x20, 0x4d, 0x02, 0x80, 0x9c, 0xe9, 0x39, 0xb6, 0x8e, 0x9f, 0xb9, + 0x1e, 0x3f, 0xad, 0x68, 0x6d, 0x8b, 0x94, 0x5c, 0x0f, 0xa9, 0xb4, 0x27, 0xf2, 0xf6, 0x4c, 0xc4, + 0xf3, 0x2b, 0x58, 0xa2, 0x12, 0xcc, 0x3f, 0xf1, 0xf8, 0x8b, 0xed, 0x52, 0x27, 0xac, 0xb8, 0xc6, + 0x35, 0x08, 0x49, 0x47, 0xea, 0xf7, 0xe0, 0xee, 0x23, 0xec, 0x0f, 0xad, 0x26, 0x2c, 0xab, 0x48, + 0x3f, 0xec, 0x31, 0xac, 0x6b, 0xb8, 0x1d, 0x53, 0x0c, 0x38, 0x7c, 0xa1, 0xbe, 0x0b, 0xc5, 0x59, + 0x62, 0xa2, 0x76, 0x14, 0x40, 0x36, 0x05, 0x4d, 0x88, 0x86, 0x6b, 0xf5, 0x3e, 0xac, 0x8c, 0x4b, + 0x5f, 0xaf, 0xec, 0xcf, 0x12, 0xac, 0x4e, 0xf2, 0x0b, 0x2d, 0xbb, 0x90, 0xe6, 0xce, 0xa2, 0xaf, + 0x60, 0x3a, 0x7e, 0x7f, 0x67, 0xac, 0x71, 0x44, 0x4b, 0x95, 0xc5, 0x9a, 0x0f, 0xdd, 0x01, 0x40, + 0xe1, 0x08, 0xb2, 0xa3, 0x1b, 0x11, 0x83, 0xdd, 0xfd, 0xf1, 0xc1, 0x6e, 0x6d, 0xbc, 0x49, 0x85, + 0x8a, 0x46, 0x27, 0xbb, 0x63, 0xb8, 0x17, 0xfc, 0x86, 0x7e, 0xe0, 0xf1, 0x19, 0x63, 0x84, 0x51, + 0x1c, 0x7b, 0x33, 0x0c, 0x00, 0xe9, 0x7a, 0x60, 0xc1, 0xa6, 0xbe, 0x0c, 0xea, 0x75, 0xa8, 0x62, + 0x0e, 0x3b, 0x81, 0xb5, 0x1a, 0xee, 0xe2, 0x28, 0x8d, 0xdb, 0x90, 0x11, 0x85, 0xe4, 0x86, 0x09, + 0x8c, 0x8b, 0xd1, 0x74, 0xe0, 0xfc, 0x4d, 0x4b, 0x2d, 0x40, 0x7e, 0x1a, 0x56, 0xa8, 0xfc, 0x8f, + 0x04, 0xca, 0x90, 0x2c, 0x7e, 0x50, 0x3d, 0x00, 0xe8, 0xbb, 0x04, 0x7b, 0xbc, 0xf9, 0x71, 0x6d, + 0xe5, 0xc8, 0x7f, 0x33, 0xcc, 0x74, 0x11, 0xed, 0xf7, 0x1c, 0x83, 0x36, 0xd7, 0x3a, 0x80, 0xc5, + 0x2c, 0x60, 0x80, 0xb1, 0x61, 0x97, 0x08, 0x01, 0x67, 0x9c, 0x9b, 0xc2, 0x70, 0x49, 0x0a, 0x33, + 0xde, 0xde, 0xe2, 0x37, 0xb4, 0xb7, 0x3b, 0x90, 0x09, 0xff, 0x27, 0xc6, 0xd2, 0x2c, 0xae, 0x0d, + 0x09, 0xa2, 0x42, 0xbe, 0xf1, 0x27, 0x29, 0xf8, 0xb9, 0x42, 0xbc, 0x7a, 0x96, 0x60, 0xe1, 0xf4, + 0x03, 0x7d, 0xec, 0xff, 0x1b, 0x21, 0xa9, 0x51, 0xdf, 0xd9, 0x3b, 0x6e, 0xfc, 0x58, 0x91, 0xd0, + 0x2d, 0xc8, 0x05, 0x5c, 0x01, 0x31, 0x86, 0x56, 0x01, 0x71, 0x62, 0xad, 0x79, 0x54, 0x3d, 0xd8, + 0xdf, 0xaf, 0x57, 0x8f, 0xeb, 0x35, 0x25, 0x8e, 0x10, 0x2c, 0x0a, 0xe6, 0xc3, 0xda, 0xce, 0x71, + 0x73, 0xff, 0x91, 0x92, 0x18, 0x02, 0x0c, 0x19, 0x93, 0x68, 0x0d, 0x6e, 0x8d, 0x30, 0xd6, 0xc5, + 0xff, 0x51, 0x94, 0xd4, 0x10, 0xa1, 0x56, 0x7f, 0xa4, 0xed, 0xd4, 0xea, 0x35, 0x25, 0x5d, 0x79, + 0xef, 0x93, 0xcf, 0x8a, 0x73, 0x9f, 0x7e, 0x56, 0x9c, 0xfb, 0xe2, 0xb3, 0xa2, 0xf4, 0xf1, 0xa0, + 0x28, 0xfd, 0x66, 0x50, 0x94, 0xfe, 0x3a, 0x28, 0x4a, 0x9f, 0x0c, 0x8a, 0xd2, 0x3f, 0x06, 0x45, + 0xe9, 0x9f, 0x83, 0xe2, 0xdc, 0x17, 0x83, 0xa2, 0xf4, 0x8b, 0xcf, 0x8b, 0x73, 0x9f, 0x7c, 0x5e, + 0x9c, 0xfb, 0xf4, 0xf3, 0xe2, 0xdc, 0x07, 0x72, 0xe0, 0xf1, 0x56, 0x8a, 0xd5, 0xc3, 0xef, 0xfe, + 0x37, 0x00, 0x00, 0xff, 0xff, 0xee, 0x19, 0x61, 0x4d, 0xa9, 0x1c, 0x00, 0x00, } func (x VizierStatus) String() string { diff --git a/src/shared/cvmsgspb/cvmsgs.proto b/src/shared/cvmsgspb/cvmsgs.proto index d5414e9e24c..b7df368c225 100644 --- a/src/shared/cvmsgspb/cvmsgs.proto +++ b/src/shared/cvmsgspb/cvmsgs.proto @@ -32,7 +32,7 @@ package px.cvmsgspb; option go_package = "cvmsgspb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "google/protobuf/timestamp.proto"; import "src/api/proto/uuidpb/uuid.proto"; diff --git a/src/shared/k8s/metadatapb/BUILD.bazel b/src/shared/k8s/metadatapb/BUILD.bazel index cdc38d5f8a5..bba4b7b5324 100644 --- a/src/shared/k8s/metadatapb/BUILD.bazel +++ b/src/shared/k8s/metadatapb/BUILD.bazel @@ -23,7 +23,7 @@ pl_proto_library( visibility = ["//src:__subpackages__"], deps = [ "//src/shared/types/typespb:types_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -33,7 +33,7 @@ pl_cc_proto_library( visibility = ["//src:__subpackages__"], deps = [ "//src/shared/types/typespb/wrapper:cc_library", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/shared/k8s/metadatapb/metadata.pb.go b/src/shared/k8s/metadatapb/metadata.pb.go index aef95b693b1..c67435f3b35 100755 --- a/src/shared/k8s/metadatapb/metadata.pb.go +++ b/src/shared/k8s/metadatapb/metadata.pb.go @@ -4449,7 +4449,7 @@ func init() { } var fileDescriptor_281217845a4326db = []byte{ - // 4464 bytes of a gzipped FileDescriptorProto + // 4453 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x7b, 0x4f, 0x8c, 0x1b, 0x59, 0x5a, 0x78, 0x97, 0xff, 0xfb, 0x73, 0xb7, 0xbb, 0xfa, 0x75, 0x27, 0x71, 0x3a, 0xb3, 0xdd, 0x49, 0x25, 0x99, 0x49, 0xfa, 0xb7, 0xd3, 0xf9, 0x4d, 0x76, 0x16, 0x92, 0xd9, 0xd9, 0x99, 0x75, 0xdb, @@ -4457,278 +4457,278 @@ var fileDescriptor_281217845a4326db = []byte{ 0xb1, 0xab, 0x6a, 0xaa, 0xca, 0x21, 0x2d, 0x21, 0x84, 0x84, 0x56, 0x20, 0x10, 0x68, 0x11, 0x8b, 0x40, 0xc0, 0x8d, 0x0b, 0x07, 0x0e, 0x1c, 0x56, 0x80, 0xb8, 0x80, 0x90, 0x56, 0x42, 0xc0, 0x61, 0x0e, 0x8b, 0x34, 0xa7, 0x16, 0xe3, 0x41, 0x82, 0xe3, 0x0a, 0x89, 0x3b, 0x7a, 0xef, 0xd5, 0xff, - 0xb6, 0xdd, 0xee, 0x24, 0x03, 0xd9, 0xbd, 0x24, 0x7e, 0xef, 0xfb, 0x53, 0xdf, 0xfb, 0xfe, 0xbd, + 0xb6, 0xdd, 0xee, 0x24, 0x03, 0xd9, 0xbd, 0x24, 0xae, 0xf7, 0xfd, 0x79, 0xdf, 0xfb, 0xfe, 0xbd, 0xef, 0x7b, 0xef, 0x35, 0x5c, 0x73, 0xec, 0xfe, 0x0d, 0xe7, 0x89, 0x62, 0x6b, 0xea, 0x8d, 0xa7, 0xb7, 0x9c, 0x1b, 0x43, 0xcd, 0x55, 0x54, 0xc5, 0x55, 0xac, 0xbd, 0xe0, 0xe7, 0xb6, 0x65, 0x9b, - 0xae, 0x89, 0x2a, 0xd6, 0xf3, 0x6d, 0x86, 0xb8, 0xfd, 0xf4, 0x96, 0xb3, 0x1d, 0x22, 0xae, 0xbf, - 0x7d, 0xa0, 0xbb, 0x4f, 0x46, 0x7b, 0xdb, 0x7d, 0x73, 0x78, 0xe3, 0xc0, 0x3c, 0x30, 0x6f, 0x50, - 0x82, 0xbd, 0xd1, 0x3e, 0x1d, 0xd1, 0x01, 0xfd, 0xc5, 0x18, 0xad, 0x6f, 0x1e, 0x98, 0xe6, 0xc1, - 0x40, 0x0b, 0xb1, 0x5c, 0x7d, 0xa8, 0x39, 0xae, 0x32, 0xb4, 0x3c, 0x84, 0x2b, 0x11, 0x99, 0xdc, - 0x43, 0x4b, 0x73, 0xd8, 0xbf, 0xd6, 0x1e, 0xfb, 0x9f, 0x61, 0x09, 0x3f, 0x48, 0x43, 0xf9, 0x81, - 0x27, 0x44, 0x6b, 0xef, 0x97, 0xb4, 0xbe, 0x8b, 0xde, 0x81, 0xb4, 0x65, 0xaa, 0x15, 0xee, 0x22, - 0x77, 0xad, 0x74, 0xf3, 0x6b, 0xdb, 0xd3, 0x04, 0xde, 0x6e, 0x9b, 0xea, 0xee, 0x02, 0x26, 0xb8, - 0xa8, 0x06, 0x45, 0xcd, 0x50, 0x2d, 0x53, 0x37, 0x5c, 0xa7, 0x92, 0xa2, 0x84, 0x97, 0xa7, 0x13, - 0x8a, 0x3e, 0xea, 0xee, 0x02, 0x0e, 0xe9, 0xd0, 0xb7, 0x21, 0xef, 0x68, 0xf6, 0x33, 0xbd, 0xaf, - 0x55, 0xd2, 0x94, 0xc5, 0xa5, 0xe9, 0x2c, 0x3a, 0x0c, 0x71, 0x77, 0x01, 0xfb, 0x34, 0x44, 0x06, - 0x43, 0x19, 0x6a, 0x8e, 0xa5, 0xf4, 0xb5, 0x4a, 0xe6, 0x24, 0x19, 0x9a, 0x3e, 0x2a, 0x91, 0x21, - 0xa0, 0x43, 0xef, 0x42, 0xc6, 0x30, 0x55, 0xad, 0x92, 0xa5, 0xf4, 0x1b, 0x33, 0xe8, 0x4d, 0x95, - 0x90, 0x52, 0x6c, 0x74, 0x07, 0xc0, 0xd6, 0xac, 0x81, 0xde, 0x57, 0x3a, 0x9a, 0x5b, 0xc9, 0x51, - 0xda, 0x2b, 0xd3, 0x69, 0x71, 0x80, 0xbb, 0xbb, 0x80, 0x23, 0x94, 0x3b, 0x05, 0xc8, 0x99, 0xd4, - 0x06, 0xc2, 0x9f, 0x65, 0xa1, 0xcc, 0xcc, 0xe1, 0x1b, 0x07, 0x21, 0xc8, 0x10, 0x39, 0xa9, 0x5d, - 0x8a, 0x98, 0xfe, 0x46, 0x6f, 0x44, 0xd7, 0x9c, 0xa2, 0x80, 0xc8, 0x62, 0xce, 0x43, 0x7a, 0xa4, - 0xab, 0x54, 0x99, 0xc5, 0x9d, 0xfc, 0xf8, 0x68, 0x33, 0xdd, 0x93, 0xea, 0x98, 0xcc, 0xa1, 0xeb, - 0xc0, 0xdb, 0x9a, 0x63, 0x8e, 0xec, 0xbe, 0x26, 0x3f, 0xd3, 0x6c, 0x47, 0x37, 0x0d, 0xaa, 0xb3, - 0x22, 0x5e, 0xf6, 0xe7, 0x1f, 0xb1, 0x69, 0x74, 0x1f, 0xce, 0xf4, 0x6d, 0x4d, 0x71, 0x75, 0xd3, - 0x90, 0x03, 0x1f, 0x93, 0x0d, 0x87, 0xea, 0x28, 0xbd, 0x73, 0x6e, 0x7c, 0xb4, 0xb9, 0x5a, 0xf3, - 0x10, 0xba, 0x3e, 0xbc, 0xd9, 0xc1, 0xab, 0xfd, 0x63, 0x93, 0x0e, 0x61, 0xa6, 0x6a, 0x03, 0xed, - 0x38, 0xb3, 0x5c, 0xc8, 0xac, 0xee, 0x21, 0xc4, 0x98, 0xa9, 0xc7, 0x26, 0x1d, 0xd4, 0x80, 0xdc, - 0x40, 0xd9, 0xd3, 0x06, 0x4e, 0x25, 0x7f, 0x31, 0x7d, 0xad, 0x74, 0xf3, 0xdd, 0xe9, 0x2a, 0x8f, - 0xeb, 0x72, 0xbb, 0x41, 0xc9, 0x44, 0xc3, 0xb5, 0x0f, 0xb1, 0xc7, 0x03, 0x75, 0x80, 0x37, 0x7f, - 0xd9, 0xd0, 0x6c, 0xd9, 0xd6, 0xf6, 0x35, 0x5b, 0x33, 0xfa, 0x9a, 0x53, 0x29, 0x50, 0xbe, 0xd7, - 0x66, 0xf0, 0x25, 0x14, 0xd8, 0x27, 0xc0, 0xcb, 0x66, 0x6c, 0xec, 0xa0, 0xef, 0x42, 0x49, 0x31, - 0x0c, 0xd3, 0xa5, 0x8a, 0x70, 0x2a, 0x40, 0xf9, 0xdd, 0x9e, 0x5b, 0xce, 0x6a, 0x48, 0xcb, 0x84, - 0x8d, 0x72, 0x5b, 0xbf, 0x0d, 0xa5, 0xc8, 0x42, 0x10, 0x0f, 0xe9, 0xa7, 0xda, 0xa1, 0xe7, 0x1f, - 0xe4, 0x27, 0x5a, 0x83, 0xec, 0x33, 0x65, 0x30, 0xf2, 0x5d, 0x83, 0x0d, 0xde, 0x4b, 0xdd, 0xe2, - 0xd6, 0x3f, 0x00, 0x3e, 0xc9, 0xfb, 0x34, 0xf4, 0xf7, 0x32, 0x85, 0x22, 0x0f, 0x42, 0x07, 0xca, - 0x71, 0x05, 0x10, 0x27, 0x7d, 0xaa, 0x1b, 0xaa, 0xef, 0xa4, 0xe4, 0x77, 0xe0, 0xb8, 0xe9, 0x88, - 0xe3, 0x7a, 0xae, 0x99, 0x39, 0xee, 0x9a, 0xc2, 0x43, 0x28, 0x06, 0xc1, 0x89, 0xea, 0x50, 0xf0, - 0xb5, 0xe3, 0x25, 0xa4, 0x6b, 0xf3, 0x2a, 0x0f, 0x07, 0x94, 0xc2, 0xdf, 0x71, 0x90, 0x6e, 0x9b, - 0xea, 0xab, 0xe1, 0x86, 0xbe, 0x09, 0x19, 0xc7, 0xd2, 0xfa, 0x5e, 0x9e, 0xbb, 0x34, 0x33, 0x41, - 0x76, 0x2c, 0xad, 0x8f, 0x29, 0x3a, 0xfa, 0x16, 0xe4, 0x1c, 0x57, 0x71, 0x47, 0x8e, 0x97, 0xdd, - 0x2e, 0xcf, 0x26, 0xa4, 0xa8, 0xd8, 0x23, 0x11, 0xfe, 0x38, 0x0d, 0x79, 0x8f, 0x1d, 0x7a, 0x08, - 0xa0, 0x1a, 0x8e, 0x6c, 0x99, 0x03, 0xbd, 0xcf, 0xcc, 0x55, 0x9e, 0xc5, 0xac, 0xde, 0xec, 0xb4, - 0x29, 0xea, 0xce, 0xd2, 0xf8, 0x68, 0xb3, 0x18, 0x0c, 0x71, 0x51, 0x35, 0x1c, 0xf6, 0x13, 0x7d, - 0x0c, 0x4b, 0x24, 0x91, 0xc9, 0x8e, 0x36, 0xd0, 0xfa, 0xae, 0x69, 0x57, 0x52, 0xd4, 0x51, 0xbf, - 0x71, 0xe2, 0xda, 0x68, 0x1e, 0xec, 0x78, 0x54, 0xcc, 0x45, 0x17, 0x8d, 0xc8, 0x14, 0xba, 0x00, - 0x45, 0xca, 0x39, 0xe2, 0x01, 0x05, 0x32, 0x41, 0x4c, 0x8c, 0xd6, 0xa1, 0xf0, 0xc4, 0x74, 0x5c, - 0x0a, 0x63, 0xd9, 0x27, 0x18, 0x93, 0xd4, 0xe6, 0x8c, 0xf6, 0x54, 0x73, 0xa8, 0xe8, 0x06, 0x4d, - 0x35, 0x45, 0x1c, 0x4e, 0xa0, 0x6d, 0x58, 0xb5, 0x6c, 0xdd, 0xb4, 0x75, 0xf7, 0x50, 0xee, 0x0f, - 0x14, 0xc7, 0x61, 0x1f, 0xc8, 0x51, 0xbc, 0x15, 0x1f, 0x54, 0x23, 0x10, 0xff, 0x4b, 0xfe, 0x64, - 0x25, 0x7f, 0x91, 0xbb, 0x96, 0xc5, 0xc1, 0x78, 0xfd, 0x43, 0x58, 0x39, 0xb6, 0x8a, 0xd3, 0x04, - 0x83, 0xf0, 0x9b, 0x69, 0x58, 0xae, 0x99, 0x86, 0xab, 0xe8, 0x86, 0x66, 0x33, 0xc3, 0x4d, 0xcc, - 0xd6, 0x37, 0x61, 0xb1, 0xef, 0xa3, 0xc9, 0xba, 0xca, 0x18, 0xed, 0x2c, 0x8f, 0x8f, 0x36, 0x4b, - 0x01, 0xb9, 0x54, 0xc7, 0xa5, 0x00, 0x49, 0x52, 0xd1, 0x43, 0x58, 0x0e, 0x69, 0x88, 0x33, 0x30, - 0x2d, 0x96, 0x67, 0x79, 0x6e, 0x4c, 0x16, 0x0d, 0x97, 0xfb, 0xb1, 0x31, 0xda, 0x01, 0xe4, 0xb8, - 0x8a, 0xed, 0xc6, 0x13, 0x70, 0x86, 0x26, 0xe0, 0xb5, 0xf1, 0xd1, 0x26, 0xdf, 0x21, 0xd0, 0x68, - 0xf6, 0xe5, 0x9d, 0xf8, 0x8c, 0x83, 0x3e, 0x84, 0x15, 0xc7, 0x35, 0xad, 0x49, 0x1b, 0xc2, 0xea, - 0xf8, 0x68, 0x73, 0xb9, 0xe3, 0x9a, 0x56, 0x94, 0xc3, 0xb2, 0x13, 0x9b, 0x70, 0x50, 0x05, 0xf2, - 0x43, 0xcd, 0x71, 0x94, 0x03, 0xdf, 0x68, 0xfe, 0x10, 0x9d, 0x85, 0x9c, 0xad, 0x29, 0x8e, 0x69, - 0x50, 0x43, 0x15, 0xb1, 0x37, 0x42, 0x97, 0x61, 0xc9, 0xd6, 0x98, 0xe0, 0x7d, 0x73, 0x64, 0xb8, - 0x95, 0x02, 0xf9, 0x1c, 0x5e, 0xf4, 0x26, 0x6b, 0x64, 0x4e, 0xf8, 0x23, 0x0e, 0x0a, 0xf7, 0x6f, - 0x39, 0xe2, 0x33, 0xcd, 0x70, 0xa3, 0xdf, 0xe0, 0xe2, 0xdf, 0xb8, 0x0d, 0xb0, 0xaf, 0xdb, 0x0e, - 0x53, 0x81, 0x17, 0xc8, 0xeb, 0xdb, 0xac, 0xa2, 0xda, 0xf6, 0x2b, 0xaa, 0xed, 0x40, 0x5e, 0x5c, - 0xa4, 0xd8, 0x64, 0x8c, 0x7e, 0x1e, 0x8a, 0x03, 0xc5, 0xa7, 0x4c, 0x9f, 0x48, 0x59, 0x20, 0xc8, - 0x64, 0x28, 0xfc, 0x38, 0x03, 0xc5, 0x20, 0xb0, 0xd1, 0x2d, 0xc8, 0x5a, 0x4f, 0x14, 0x47, 0xf3, - 0xe2, 0x57, 0x98, 0x19, 0x69, 0x6d, 0x82, 0x89, 0x19, 0x01, 0x29, 0x36, 0xfa, 0xa6, 0xa1, 0xea, - 0x6c, 0x47, 0x29, 0xd2, 0x40, 0x7d, 0x73, 0x26, 0x79, 0xcd, 0x47, 0xc7, 0x11, 0xca, 0xa8, 0x76, - 0xd2, 0xd3, 0x2c, 0x90, 0x49, 0x58, 0x20, 0x4f, 0xc2, 0x53, 0xd6, 0x2d, 0x16, 0x90, 0x3b, 0x30, - 0x3e, 0xda, 0xcc, 0xed, 0x9a, 0x8e, 0x2b, 0xb5, 0x71, 0x8e, 0x80, 0x24, 0x0b, 0x5d, 0x84, 0x9c, - 0x65, 0xaa, 0x04, 0x87, 0xda, 0x75, 0xa7, 0x38, 0x3e, 0xda, 0xcc, 0xb6, 0x4d, 0x55, 0x6a, 0xe3, - 0xac, 0x65, 0xaa, 0x92, 0x85, 0xda, 0x50, 0xfc, 0xd4, 0x74, 0x58, 0xd8, 0x52, 0x1b, 0x97, 0x6f, - 0x5e, 0x9d, 0x29, 0xff, 0xc3, 0x56, 0x87, 0x46, 0xf2, 0xce, 0xe2, 0xf8, 0x68, 0xb3, 0xe0, 0x8f, - 0x70, 0xe1, 0x53, 0xd3, 0xa1, 0xbf, 0xd0, 0xc7, 0x80, 0xe2, 0x41, 0x32, 0x72, 0x82, 0xcd, 0xfb, - 0xfa, 0x9c, 0x71, 0x32, 0x72, 0xf0, 0x4a, 0x3f, 0x3e, 0xa1, 0x39, 0xc4, 0x51, 0x68, 0x19, 0xa3, - 0xa9, 0xb2, 0xe2, 0x56, 0x4a, 0x27, 0x3b, 0x8a, 0x87, 0x5d, 0x75, 0xd1, 0x7b, 0x90, 0xd3, 0x88, - 0x1b, 0x3a, 0x95, 0x45, 0x2a, 0xc8, 0x0c, 0x13, 0xfb, 0x1e, 0x8b, 0x3d, 0x8a, 0xe3, 0xbe, 0xbe, - 0x74, 0xdc, 0xd7, 0xef, 0x65, 0x0a, 0x29, 0x3e, 0x2d, 0xfc, 0x1e, 0x07, 0x8b, 0x51, 0x1b, 0xa3, - 0x0f, 0x20, 0x43, 0x0a, 0x7c, 0xcf, 0xb1, 0xb6, 0xe6, 0xf3, 0x8c, 0xee, 0xa1, 0xa5, 0x61, 0x4a, - 0x87, 0xaa, 0xc1, 0x3e, 0x95, 0xa2, 0x1c, 0x66, 0x2b, 0x90, 0x91, 0x27, 0x76, 0xab, 0x3f, 0xe0, - 0xa0, 0x18, 0x14, 0xf9, 0xaf, 0x68, 0xd7, 0xdd, 0x81, 0xbc, 0x33, 0xda, 0x73, 0x34, 0xda, 0x60, - 0x9c, 0x50, 0x95, 0xf9, 0xdf, 0xee, 0x50, 0x02, 0xec, 0x13, 0x0a, 0xff, 0xc5, 0x41, 0x39, 0x0e, - 0x43, 0x77, 0xa1, 0xa8, 0xa8, 0xaa, 0xad, 0x39, 0xc4, 0x63, 0xb8, 0x93, 0x3c, 0xc6, 0x27, 0xae, - 0x32, 0x12, 0x1c, 0xd2, 0xa2, 0xc7, 0xb0, 0x6a, 0x98, 0xae, 0x6c, 0x6b, 0x8a, 0x7a, 0x28, 0x87, - 0x2c, 0x53, 0xa7, 0x65, 0xb9, 0x62, 0x98, 0x2e, 0x26, 0x4c, 0xaa, 0x01, 0xeb, 0xf7, 0x21, 0x6b, - 0x99, 0xb6, 0x4b, 0x0a, 0x87, 0x13, 0x82, 0xdd, 0x67, 0xd6, 0x36, 0x6d, 0x17, 0x33, 0x22, 0xe1, - 0x2f, 0x38, 0x58, 0x4e, 0x7c, 0x04, 0x9d, 0x85, 0x94, 0x6e, 0xb1, 0xa4, 0xb8, 0x93, 0x1b, 0x1f, - 0x6d, 0xa6, 0xa4, 0x36, 0x4e, 0xe9, 0x56, 0x6c, 0x43, 0x4e, 0x25, 0x36, 0xe4, 0x99, 0x3b, 0xf9, - 0x2e, 0x80, 0xab, 0xd8, 0x07, 0x1a, 0x51, 0xc0, 0xbe, 0xd7, 0x7d, 0x5d, 0x3f, 0xc9, 0xca, 0x61, - 0xdd, 0x5c, 0x64, 0xc4, 0x58, 0xdb, 0x17, 0x9e, 0xc3, 0x62, 0x74, 0x15, 0x13, 0x37, 0x52, 0x04, - 0x19, 0xb2, 0x36, 0x2a, 0x62, 0x16, 0xd3, 0xdf, 0xe8, 0x3b, 0x64, 0x87, 0x37, 0x5d, 0xb3, 0x6f, - 0x0e, 0xbc, 0x1d, 0x72, 0x46, 0x07, 0x26, 0xb5, 0xdb, 0x1e, 0x2e, 0x0e, 0xa8, 0x84, 0x3f, 0xe5, - 0x60, 0x39, 0x21, 0xd8, 0xc4, 0x7a, 0x76, 0x76, 0xd3, 0x75, 0xba, 0x6a, 0x17, 0x5d, 0x83, 0x64, - 0xc3, 0xe5, 0xed, 0x87, 0xc9, 0x69, 0xe1, 0xb7, 0x38, 0xc8, 0x7b, 0x6d, 0xef, 0x2b, 0x0a, 0xa9, - 0xdb, 0xb1, 0x42, 0xf6, 0xea, 0x89, 0xdd, 0x76, 0x58, 0xcc, 0x0a, 0x7f, 0x9d, 0x86, 0x52, 0x64, - 0x16, 0x7d, 0xcb, 0x77, 0x51, 0x16, 0x42, 0x27, 0xf3, 0x8a, 0x78, 0x28, 0xfa, 0x3a, 0x40, 0x7f, - 0x30, 0x72, 0x5c, 0x52, 0x15, 0x59, 0x5e, 0x55, 0x44, 0x6b, 0xd5, 0x1a, 0x9b, 0x95, 0xda, 0xb8, - 0xe8, 0x21, 0x48, 0x16, 0x91, 0x9a, 0xe6, 0xb7, 0xf4, 0x49, 0x3b, 0x87, 0xf7, 0xa5, 0x48, 0x6a, - 0xbb, 0x09, 0x8b, 0xda, 0x73, 0x57, 0xb3, 0x0d, 0x65, 0x20, 0xeb, 0x16, 0xa9, 0x79, 0xd2, 0x7e, - 0x01, 0x26, 0x7a, 0xf3, 0x52, 0xdb, 0xc1, 0x25, 0x1f, 0x49, 0xb2, 0x48, 0xf0, 0xf1, 0x03, 0x53, - 0x51, 0xe5, 0x3d, 0x65, 0xa0, 0x18, 0x7d, 0x26, 0x22, 0xdb, 0xfd, 0xd0, 0xf8, 0x68, 0xb3, 0xdc, - 0x30, 0x15, 0x75, 0xc7, 0x03, 0x49, 0x6d, 0x5c, 0x1e, 0x44, 0xc7, 0x16, 0x49, 0xe4, 0xc1, 0x17, - 0x23, 0x15, 0x6a, 0x20, 0x06, 0x0d, 0x9e, 0xa7, 0x70, 0x2e, 0x40, 0x72, 0x6d, 0x65, 0x7f, 0x5f, - 0xef, 0xfb, 0xd5, 0x3d, 0xdb, 0x1e, 0x67, 0xd4, 0xe1, 0xbe, 0xdc, 0x5d, 0x46, 0xc7, 0xea, 0x79, - 0xba, 0xe4, 0x33, 0xda, 0x24, 0x90, 0xf0, 0x03, 0x2e, 0xb0, 0xdc, 0xd4, 0xf8, 0x8a, 0xc6, 0x52, - 0xea, 0x45, 0x62, 0x29, 0x88, 0xd0, 0x74, 0x24, 0x42, 0xfd, 0x04, 0x42, 0x01, 0x19, 0x56, 0x84, - 0x93, 0x09, 0x22, 0x86, 0xf0, 0xcf, 0x29, 0x58, 0x0a, 0x8b, 0x60, 0x63, 0xdf, 0x9c, 0x28, 0x98, - 0x17, 0x48, 0xa9, 0x09, 0x81, 0x34, 0xb9, 0xaa, 0x4d, 0xbf, 0x7c, 0x55, 0x9b, 0x39, 0x45, 0x55, - 0x7b, 0x19, 0xf2, 0xa4, 0xf8, 0x21, 0x32, 0x46, 0x2a, 0xa4, 0xb6, 0xa9, 0x12, 0x31, 0x49, 0x5d, - 0xd4, 0xd3, 0x13, 0xf9, 0x23, 0x97, 0xcc, 0x1f, 0x35, 0x28, 0x5a, 0xb6, 0xd9, 0x67, 0xbb, 0x47, - 0xfe, 0xa4, 0x68, 0x6a, 0x33, 0x54, 0xa2, 0x30, 0x1c, 0xd2, 0x09, 0x7f, 0x92, 0x82, 0x52, 0x04, - 0x34, 0x51, 0x97, 0x37, 0x20, 0x33, 0xb2, 0x3c, 0x65, 0x96, 0x6e, 0xae, 0x90, 0x6f, 0xb0, 0x83, - 0xc1, 0x9e, 0x64, 0xb8, 0xef, 0xdc, 0xbc, 0xb5, 0x53, 0x18, 0x1f, 0x6d, 0x66, 0x7a, 0x6d, 0xa9, - 0x8e, 0x29, 0xe2, 0xeb, 0xd1, 0x37, 0x5c, 0x82, 0x45, 0x6f, 0x99, 0xb2, 0x62, 0x1f, 0x38, 0x9e, - 0xfe, 0x4a, 0xde, 0x5c, 0xd5, 0x3e, 0x70, 0x88, 0x93, 0xf4, 0x75, 0x95, 0x75, 0x0f, 0xcc, 0x49, - 0x6a, 0xc4, 0x49, 0xfa, 0xba, 0x7a, 0x2f, 0x53, 0x48, 0xf3, 0x19, 0xe1, 0x2f, 0x73, 0xb4, 0x12, - 0xef, 0x59, 0x2a, 0x69, 0x87, 0x3c, 0x9f, 0xe2, 0x26, 0xf8, 0x94, 0xaf, 0xb6, 0xd4, 0xb4, 0x23, - 0xb7, 0x74, 0xd2, 0x7a, 0xaf, 0x85, 0x8e, 0xbe, 0x09, 0x4b, 0xd1, 0x3e, 0x93, 0x28, 0x89, 0xe4, - 0x39, 0x7e, 0x7c, 0xb4, 0xb9, 0x18, 0x69, 0x34, 0x1d, 0xbc, 0x18, 0xe9, 0x34, 0x1d, 0xf4, 0x56, - 0xb4, 0xd5, 0xa4, 0x4b, 0xaa, 0x94, 0x08, 0x61, 0xa4, 0x81, 0xa4, 0x07, 0x33, 0x5f, 0x41, 0x01, - 0x1f, 0x74, 0x43, 0x85, 0x97, 0xeb, 0x86, 0xf8, 0x17, 0xee, 0x86, 0x62, 0xd5, 0x4d, 0x71, 0xc6, - 0x39, 0x05, 0x24, 0xca, 0xa2, 0xb0, 0xdf, 0x59, 0x9c, 0xd2, 0xef, 0x44, 0xda, 0xa6, 0xa5, 0xa9, - 0x6d, 0x53, 0xa4, 0x1b, 0x2b, 0x4f, 0xeb, 0xc6, 0x96, 0x63, 0xdd, 0xd8, 0xd9, 0xe0, 0xf4, 0x73, - 0x85, 0xcd, 0xcf, 0x38, 0xc7, 0x44, 0x2f, 0x79, 0x8e, 0x29, 0xfc, 0x77, 0xf4, 0x88, 0x23, 0x0c, - 0x9c, 0x7e, 0x3c, 0x70, 0xfc, 0x38, 0x9b, 0x18, 0x38, 0xaf, 0x45, 0x82, 0x8e, 0x45, 0x6f, 0x36, - 0x19, 0xbd, 0xbe, 0x2d, 0xd5, 0x64, 0xef, 0x5a, 0x67, 0xb6, 0x54, 0xd1, 0x79, 0x28, 0x10, 0x0c, - 0xba, 0x38, 0x76, 0x3c, 0x41, 0x12, 0x3e, 0x75, 0x92, 0x09, 0x27, 0x35, 0x85, 0x97, 0x3c, 0xa9, - 0x89, 0x38, 0x45, 0x71, 0x9a, 0x53, 0x40, 0xcc, 0x29, 0x9a, 0x10, 0xf2, 0x90, 0x69, 0x99, 0x54, - 0xa2, 0x32, 0xbc, 0x35, 0x87, 0x0c, 0xb4, 0x6a, 0x08, 0x33, 0x07, 0x19, 0x0a, 0xdf, 0x4b, 0xc3, - 0x92, 0x57, 0x2d, 0xfc, 0xcc, 0xa6, 0x4b, 0x6f, 0xd3, 0x0e, 0x13, 0xa5, 0xbf, 0x69, 0x93, 0x14, - 0x99, 0xa3, 0x76, 0xa7, 0xf9, 0xc1, 0x37, 0x3c, 0xdb, 0x96, 0x8b, 0xb8, 0xe0, 0x59, 0xde, 0x39, - 0x56, 0x57, 0x16, 0xe6, 0xa8, 0x2b, 0xe3, 0x45, 0x6f, 0x71, 0x76, 0xd1, 0x2b, 0xfc, 0x88, 0x83, - 0xe5, 0xe0, 0x54, 0xfc, 0xc5, 0x2c, 0xf1, 0x3a, 0xc4, 0x9f, 0xf0, 0xf7, 0x1c, 0x94, 0xbd, 0xc2, - 0xa4, 0xc6, 0x4e, 0x4a, 0x82, 0x3a, 0x84, 0x7b, 0xb9, 0x3a, 0xe4, 0x74, 0x0b, 0xa9, 0x40, 0xbe, - 0x3f, 0x54, 0x07, 0xba, 0xe1, 0x1f, 0x3c, 0xfb, 0x43, 0x3f, 0xab, 0x65, 0x27, 0x56, 0x0f, 0x29, - 0x3e, 0x2d, 0x7c, 0x8f, 0x83, 0x15, 0x6f, 0x09, 0x5d, 0xcd, 0x1e, 0xea, 0xc6, 0x8b, 0xad, 0x62, - 0xa2, 0x2a, 0x53, 0xa7, 0x50, 0xe5, 0x3f, 0x70, 0x90, 0x69, 0x9a, 0xea, 0xab, 0x6a, 0x06, 0x7f, - 0x2e, 0xd6, 0x0c, 0x0a, 0xb3, 0x6f, 0x3e, 0x23, 0xd7, 0x1a, 0xef, 0x27, 0xae, 0x35, 0xae, 0x9c, - 0x40, 0x19, 0x3f, 0x29, 0xfa, 0x05, 0x28, 0xf8, 0xfc, 0xd0, 0x75, 0x16, 0x62, 0x7d, 0x5d, 0xb5, - 0x59, 0x1f, 0x59, 0x64, 0xf5, 0x02, 0xd9, 0xb3, 0xa5, 0x3a, 0x76, 0x68, 0xc0, 0xd5, 0x08, 0x14, - 0xbd, 0xc9, 0xd2, 0x30, 0x41, 0xf5, 0x9a, 0x81, 0xd2, 0xf8, 0x68, 0x33, 0xef, 0x61, 0xd2, 0x9c, - 0x4c, 0x10, 0x85, 0x7d, 0x28, 0x11, 0xf6, 0xfe, 0xb1, 0xc7, 0xb7, 0x63, 0x47, 0x63, 0xd7, 0x67, - 0x4b, 0xea, 0x11, 0x45, 0xda, 0xc7, 0x0a, 0xe4, 0xbd, 0x83, 0x1d, 0x2f, 0xb0, 0xfc, 0xa1, 0xf0, - 0xfb, 0x1c, 0x2c, 0x11, 0x9a, 0xf0, 0x14, 0xee, 0xc3, 0xd8, 0xa7, 0xfe, 0xdf, 0xec, 0x4f, 0x7d, - 0x45, 0xc7, 0x70, 0xff, 0xca, 0x01, 0x84, 0x3a, 0x47, 0xb7, 0xe3, 0x47, 0xce, 0x97, 0x67, 0xcb, - 0x14, 0xab, 0xb2, 0x6a, 0xd1, 0x53, 0xb2, 0xd4, 0x49, 0x4d, 0x49, 0x44, 0x7b, 0xd1, 0x13, 0xb2, - 0xbb, 0xb1, 0x52, 0x8d, 0x9d, 0x65, 0xbd, 0x35, 0xa7, 0x62, 0xa2, 0xb5, 0x9a, 0xf0, 0x87, 0x69, - 0xb6, 0xae, 0x9f, 0xde, 0x3c, 0x18, 0xda, 0x22, 0x7b, 0x6a, 0x5b, 0x44, 0x7d, 0x3f, 0x37, 0xdd, - 0xf7, 0xe3, 0xe1, 0x94, 0x9f, 0x19, 0x4e, 0x71, 0xcb, 0x14, 0x5e, 0xdc, 0x32, 0x3f, 0xe6, 0x00, - 0xc2, 0xd7, 0x0d, 0xaf, 0x28, 0x33, 0xbd, 0x1f, 0xcb, 0x4c, 0xd7, 0xe6, 0x79, 0x57, 0x11, 0xc9, - 0x4f, 0x3b, 0x89, 0xfc, 0xb4, 0x35, 0x17, 0x7d, 0x3c, 0x90, 0x06, 0xb0, 0x1a, 0xc2, 0xc2, 0x18, - 0x47, 0x91, 0x18, 0x2f, 0xbe, 0xba, 0xb0, 0xfd, 0x45, 0xa8, 0xd0, 0x6b, 0x7d, 0xff, 0x42, 0x12, - 0x6b, 0x9f, 0x8e, 0x74, 0x5b, 0x1b, 0x6a, 0x86, 0x3b, 0xe1, 0x5a, 0x72, 0x1d, 0x0a, 0xa6, 0xa5, - 0xd9, 0x0a, 0xbb, 0xb5, 0xa5, 0xbd, 0x89, 0x3f, 0x26, 0x55, 0x22, 0xbd, 0xa5, 0x64, 0xd1, 0x56, - 0xc4, 0xde, 0x48, 0xf8, 0x9d, 0x14, 0x2c, 0xc5, 0x3e, 0x81, 0xbe, 0x0b, 0x8b, 0x43, 0xc5, 0xed, - 0x3f, 0x91, 0xbd, 0x96, 0x82, 0x1d, 0xe3, 0xdd, 0x9a, 0x2e, 0x7c, 0x8c, 0x7c, 0xfb, 0x01, 0xa1, - 0x8d, 0x3e, 0xaa, 0x28, 0x0d, 0xc3, 0x19, 0x24, 0xc3, 0x0a, 0x63, 0xae, 0x3d, 0xb7, 0x48, 0x2e, - 0xa0, 0x5e, 0xc6, 0xb2, 0xc8, 0xcd, 0x39, 0xbf, 0x10, 0xd1, 0x01, 0xe6, 0x29, 0x33, 0x31, 0xe4, - 0xb5, 0xfe, 0x01, 0xf0, 0x49, 0x09, 0x4e, 0x75, 0x81, 0xfb, 0xbb, 0x1c, 0x2c, 0xb7, 0x4d, 0xb5, - 0xab, 0x0d, 0xad, 0x81, 0xe2, 0xb2, 0xdd, 0xe8, 0xff, 0xf2, 0xad, 0x80, 0xf0, 0xef, 0x1c, 0x94, - 0xe3, 0xde, 0x4c, 0xec, 0xec, 0xbd, 0x14, 0x72, 0xa8, 0x3c, 0x59, 0x1c, 0x8c, 0xd1, 0x16, 0xac, - 0x0c, 0x75, 0xc3, 0xbb, 0x7b, 0x70, 0x34, 0x12, 0x90, 0x8e, 0x77, 0xc2, 0xb6, 0x3c, 0xd4, 0x0d, - 0x7a, 0x9d, 0xd0, 0x61, 0xd3, 0xa8, 0x06, 0x85, 0xc8, 0x2d, 0x3f, 0x37, 0x3b, 0xd2, 0xe3, 0x36, - 0x08, 0x08, 0x91, 0x08, 0x05, 0xd7, 0x53, 0x96, 0x17, 0x56, 0xd7, 0x67, 0x2e, 0x2d, 0xaa, 0x59, - 0x1c, 0x90, 0x0a, 0x7f, 0x9b, 0x02, 0x3e, 0x19, 0x74, 0x33, 0x17, 0xfa, 0x2e, 0x9c, 0xdd, 0x1f, - 0x0d, 0x06, 0x87, 0xcc, 0x4d, 0x35, 0x55, 0x0e, 0x30, 0xd9, 0x55, 0xc0, 0x1a, 0x85, 0x36, 0x18, - 0x10, 0xfb, 0x54, 0x57, 0xa1, 0xcc, 0x54, 0x13, 0x60, 0x33, 0xdd, 0x2c, 0xd1, 0xd9, 0x00, 0xed, - 0x6d, 0x40, 0xca, 0x33, 0x45, 0x1f, 0x28, 0x7b, 0x03, 0x2d, 0x44, 0xcd, 0x52, 0xd4, 0x95, 0x00, - 0x12, 0xa0, 0xdf, 0x80, 0x55, 0x73, 0xcf, 0xd1, 0xec, 0x67, 0x9a, 0x2a, 0x1f, 0x68, 0x06, 0x09, - 0x39, 0xdd, 0x34, 0xd8, 0x46, 0x82, 0x91, 0x0f, 0xba, 0x1b, 0x40, 0xd0, 0x83, 0x58, 0x96, 0xcd, - 0x51, 0xff, 0x7f, 0x7b, 0x9e, 0x6c, 0x34, 0x39, 0xd7, 0x7e, 0x3f, 0x1b, 0x55, 0xde, 0x4f, 0xf1, - 0x5e, 0x18, 0x6b, 0x11, 0x17, 0x93, 0x2d, 0x62, 0xd4, 0x1d, 0xb2, 0x73, 0xbb, 0x43, 0xee, 0x54, - 0xee, 0x90, 0x9f, 0xdf, 0x1d, 0x0a, 0xa7, 0x74, 0x87, 0x22, 0xc5, 0x9f, 0xe4, 0x0e, 0x6f, 0x03, - 0xb2, 0xb5, 0x4f, 0x47, 0x9a, 0xe3, 0x46, 0x05, 0x5f, 0x62, 0xfc, 0x03, 0x48, 0xc0, 0x3f, 0xee, - 0x3d, 0xf0, 0x92, 0xde, 0x33, 0xf1, 0x94, 0xa8, 0xf4, 0xb2, 0xa7, 0x44, 0x64, 0xfb, 0xaf, 0x6b, - 0xd6, 0xc0, 0x3c, 0xa4, 0x9b, 0xd5, 0xff, 0xf2, 0xf6, 0x1f, 0x7e, 0xf9, 0xc5, 0xb6, 0xff, 0x08, - 0x7d, 0x7c, 0x43, 0xfe, 0x8f, 0x14, 0xac, 0x86, 0xc0, 0x70, 0xff, 0x17, 0x63, 0x35, 0xfe, 0x3b, - 0xf3, 0x70, 0xfe, 0x6a, 0x2a, 0x7d, 0x54, 0x83, 0x55, 0xfa, 0x28, 0x65, 0x44, 0xb3, 0x00, 0x0d, - 0xc5, 0x44, 0x20, 0x37, 0x14, 0xc7, 0xcb, 0x11, 0x24, 0xf4, 0x48, 0x20, 0x0f, 0xe2, 0x33, 0x0e, - 0x6a, 0xc1, 0x39, 0xf6, 0xb2, 0xc5, 0x56, 0x0c, 0x47, 0x0f, 0x9e, 0x68, 0x86, 0xe1, 0x5c, 0x19, - 0x1f, 0x6d, 0xae, 0x11, 0x46, 0xdd, 0x00, 0xc3, 0x63, 0xb6, 0x36, 0x38, 0x3e, 0xeb, 0x44, 0x0e, - 0xa9, 0xb2, 0xb1, 0x43, 0xaa, 0xa9, 0x6f, 0x7f, 0x84, 0xdf, 0x4e, 0x03, 0x9f, 0x34, 0xc3, 0xb4, - 0xc8, 0xe2, 0xa6, 0x26, 0xda, 0x68, 0xca, 0x48, 0x25, 0x52, 0xc6, 0x75, 0xe0, 0x99, 0x92, 0x22, - 0x31, 0xc7, 0x2e, 0xa9, 0x96, 0xbd, 0xf9, 0xaf, 0x78, 0xdb, 0x78, 0x07, 0xd6, 0x46, 0xc6, 0x04, - 0x02, 0x96, 0xb1, 0x56, 0x23, 0xb0, 0x29, 0xa1, 0x9f, 0x3f, 0x29, 0xf4, 0x27, 0x78, 0x5b, 0x2c, - 0xf4, 0xe9, 0x39, 0xff, 0x60, 0xa0, 0x93, 0xda, 0x29, 0xf2, 0x94, 0x2a, 0x8b, 0xcb, 0xc1, 0x34, - 0x7b, 0x4c, 0xf5, 0x37, 0x69, 0x28, 0xc7, 0x83, 0x6a, 0xe6, 0xe6, 0xfc, 0x1a, 0x55, 0x16, 0x68, - 0x17, 0x0a, 0x8e, 0x6b, 0x2b, 0xae, 0x76, 0x70, 0xe8, 0xbd, 0x46, 0xf8, 0xfa, 0x7c, 0x81, 0xcf, - 0x68, 0x70, 0x40, 0x3d, 0xb9, 0xb6, 0xca, 0x4e, 0xae, 0xad, 0xde, 0x85, 0xb3, 0xb6, 0xf6, 0x8c, - 0x29, 0xf6, 0x89, 0xee, 0xb8, 0xa6, 0x7d, 0x28, 0x0f, 0xf4, 0xa1, 0xee, 0xfa, 0xfb, 0x91, 0x0f, - 0xdd, 0x65, 0xc0, 0x06, 0x81, 0x91, 0x30, 0xb1, 0x94, 0x91, 0xa3, 0xb1, 0x2b, 0xab, 0x02, 0xf6, - 0x46, 0xe8, 0x3d, 0x38, 0x6f, 0xd9, 0xe6, 0x01, 0xa9, 0x72, 0x65, 0x55, 0x53, 0xe8, 0xf1, 0x54, - 0x20, 0x01, 0xdb, 0x57, 0xce, 0xf9, 0x08, 0x75, 0x0f, 0xee, 0x49, 0x22, 0xfc, 0x90, 0x03, 0x74, - 0x7c, 0x59, 0xa8, 0x1e, 0xcb, 0x58, 0xff, 0xff, 0x34, 0x2a, 0x89, 0x24, 0xac, 0x8f, 0xa1, 0x6c, - 0x13, 0x4f, 0x31, 0x0e, 0xbc, 0x84, 0xe3, 0x99, 0x7b, 0x46, 0x06, 0xc4, 0x0c, 0x9f, 0xe5, 0x9b, - 0x90, 0x39, 0x5e, 0xb2, 0xa3, 0x00, 0x41, 0x86, 0x73, 0x53, 0x30, 0x89, 0xd7, 0x0e, 0x95, 0xe7, - 0x72, 0x24, 0x3e, 0xbc, 0xda, 0xbe, 0x3c, 0x54, 0x9e, 0xf7, 0xc2, 0x59, 0x74, 0x01, 0x8a, 0x04, - 0xd1, 0x19, 0xd9, 0x07, 0xc1, 0x23, 0x96, 0xa1, 0xf2, 0xbc, 0x43, 0xc6, 0xc2, 0x97, 0x99, 0x68, - 0x82, 0xf9, 0x59, 0x29, 0x9a, 0x8e, 0x5d, 0x64, 0x4c, 0x49, 0x99, 0xb9, 0xa9, 0xc5, 0x48, 0x34, - 0xae, 0xf3, 0x73, 0xa4, 0xcc, 0xc2, 0xbc, 0x29, 0xb3, 0x38, 0x7f, 0xca, 0x84, 0xd3, 0xa6, 0xcc, - 0xd2, 0xf4, 0x94, 0xf9, 0x52, 0xc5, 0xd5, 0xe2, 0x4b, 0x66, 0x58, 0xe1, 0x47, 0x59, 0xd2, 0xbe, - 0xb1, 0xe7, 0x3b, 0x9e, 0x8f, 0xd5, 0x01, 0xe8, 0xcb, 0x00, 0x16, 0x2f, 0xdc, 0x1c, 0x2f, 0xc0, - 0x19, 0xe1, 0xee, 0x02, 0x2e, 0x5a, 0xc1, 0x5d, 0xf5, 0x23, 0xe0, 0xc3, 0xeb, 0x9d, 0x58, 0xec, - 0xcd, 0xf3, 0xcc, 0x31, 0xe0, 0x18, 0x5e, 0x54, 0x79, 0x7c, 0xdb, 0x50, 0xf6, 0xfe, 0x8c, 0xc6, - 0xe7, 0x9a, 0x3e, 0x29, 0x81, 0xc7, 0x6e, 0x85, 0x76, 0x17, 0xf0, 0x92, 0x13, 0xbb, 0x26, 0x7a, - 0x04, 0x7c, 0xe0, 0x8e, 0x3e, 0xcf, 0xdc, 0x49, 0x92, 0x26, 0x6e, 0x38, 0x88, 0xa4, 0x46, 0xe2, - 0xd2, 0xe3, 0x2e, 0x94, 0xe8, 0x3d, 0xad, 0xc7, 0x32, 0x3f, 0xcf, 0x99, 0x73, 0xc0, 0x0d, 0x8c, - 0xf0, 0xd4, 0xf0, 0x13, 0xe2, 0x21, 0xd4, 0xfc, 0xb2, 0xa3, 0xf9, 0x95, 0x13, 0xf5, 0xc1, 0x39, - 0xcf, 0x88, 0x02, 0xae, 0xbc, 0x9d, 0xec, 0xc2, 0x1e, 0xc3, 0x8a, 0x1a, 0xb8, 0x88, 0xcf, 0xba, - 0x34, 0x7f, 0xfd, 0x19, 0xb2, 0x56, 0x93, 0xb9, 0xea, 0x2a, 0x94, 0xbd, 0x22, 0xcf, 0xff, 0xb3, - 0x1d, 0xf6, 0x0c, 0x7a, 0x89, 0xcd, 0xfa, 0x7f, 0xb4, 0x43, 0xdf, 0xc7, 0x6b, 0xcf, 0xe4, 0x04, - 0x6e, 0x91, 0xe2, 0xae, 0x10, 0x50, 0x2f, 0x8a, 0xbf, 0x53, 0x80, 0x1c, 0x43, 0xbd, 0x97, 0x29, - 0x64, 0xf8, 0xec, 0xbd, 0x4c, 0x21, 0xcb, 0xe7, 0x84, 0xbf, 0xe2, 0xe0, 0xfc, 0x03, 0xdd, 0x71, - 0x74, 0xe3, 0xe0, 0xfe, 0x2d, 0x27, 0xa8, 0xcd, 0x59, 0xf8, 0x90, 0x9c, 0x11, 0xec, 0xf7, 0x2c, - 0x15, 0x87, 0xdb, 0xf8, 0x36, 0xac, 0xee, 0xdb, 0xe6, 0x30, 0xf9, 0x7d, 0xd6, 0x1c, 0xaf, 0x10, - 0x50, 0xec, 0xfb, 0x64, 0x97, 0x75, 0xcd, 0x24, 0x36, 0xbd, 0x0d, 0xc1, 0xcb, 0xae, 0x19, 0xc7, - 0xbd, 0x04, 0x8b, 0xfd, 0x91, 0xe3, 0x9a, 0x43, 0xd9, 0x35, 0x2d, 0xbd, 0xef, 0x5d, 0xe0, 0x94, - 0xd8, 0x5c, 0x97, 0x4c, 0x09, 0xff, 0xc4, 0xc1, 0xfa, 0x24, 0xc1, 0x1d, 0xcb, 0x34, 0x1c, 0x92, - 0xc1, 0xf3, 0xec, 0x53, 0xfe, 0x41, 0xd7, 0xcc, 0x43, 0xc5, 0x68, 0x1c, 0x63, 0x9f, 0x90, 0xf6, - 0x9e, 0xf4, 0x09, 0xb9, 0x27, 0x74, 0xb8, 0x2d, 0x31, 0xb1, 0xd7, 0x28, 0x94, 0x51, 0x55, 0x83, - 0xcd, 0xe9, 0x26, 0x9c, 0x89, 0x16, 0xea, 0x21, 0x11, 0xd3, 0xcc, 0x6a, 0x58, 0x94, 0x07, 0x34, - 0x5b, 0x8f, 0x20, 0xfc, 0xa3, 0x0d, 0x54, 0x82, 0x7c, 0x5d, 0xbc, 0x53, 0xed, 0x35, 0xba, 0xfc, - 0x02, 0x2a, 0x40, 0xa6, 0xd9, 0x6a, 0x8a, 0x3c, 0x87, 0x56, 0x60, 0xa9, 0xd6, 0xe8, 0x75, 0xba, - 0x22, 0x96, 0xef, 0x48, 0xb8, 0xd3, 0xe5, 0x53, 0x68, 0x13, 0x2e, 0xc4, 0xa6, 0xe4, 0x8f, 0xa4, - 0xee, 0xae, 0xbc, 0xdb, 0xea, 0x74, 0xe5, 0xa6, 0xd8, 0xe5, 0xd3, 0x5b, 0x7b, 0x50, 0xf0, 0x5f, - 0x53, 0x10, 0xfa, 0xf6, 0x6e, 0xb5, 0x23, 0xca, 0xbd, 0xe6, 0xfd, 0x66, 0xeb, 0xa3, 0x26, 0xbf, - 0x40, 0xbe, 0xd4, 0x16, 0x9b, 0x75, 0xa9, 0x79, 0x97, 0xe7, 0xc8, 0x00, 0xf7, 0x9a, 0x4d, 0x32, - 0x48, 0xa1, 0x25, 0x28, 0x76, 0x7a, 0xb5, 0x9a, 0x28, 0xd6, 0xc5, 0x3a, 0x9f, 0x46, 0x00, 0xb9, - 0x3b, 0x55, 0xa9, 0x21, 0xd6, 0xf9, 0x0c, 0x2a, 0x03, 0x74, 0x45, 0xfc, 0x40, 0x6a, 0x56, 0xbb, - 0x62, 0x9d, 0xcf, 0x6e, 0xd9, 0x50, 0x8a, 0xbc, 0xff, 0x40, 0x67, 0x60, 0xe5, 0x61, 0xab, 0x23, - 0xd7, 0x1a, 0xd5, 0x4e, 0x27, 0xf2, 0xa9, 0x0a, 0xac, 0x85, 0xd3, 0x77, 0x7b, 0x55, 0x5c, 0x6d, - 0x76, 0x45, 0xb1, 0xce, 0x73, 0xe8, 0x1c, 0xac, 0x86, 0x90, 0x9d, 0x1e, 0xee, 0x74, 0xab, 0x3b, - 0x0d, 0x91, 0x4f, 0xa1, 0xf3, 0x70, 0x26, 0x02, 0x10, 0x3b, 0x5d, 0x59, 0xbc, 0x73, 0xa7, 0x85, - 0xc9, 0xba, 0x7e, 0x83, 0x83, 0x72, 0xfc, 0x62, 0x1d, 0x5d, 0x80, 0x73, 0xb5, 0x56, 0xb3, 0x5b, - 0x95, 0x9a, 0x22, 0x96, 0x3b, 0xdd, 0x6a, 0x37, 0xba, 0xd0, 0x09, 0x40, 0x7f, 0xad, 0x1c, 0xda, - 0x80, 0xf5, 0x24, 0x30, 0xb2, 0xc0, 0xd4, 0x24, 0xe2, 0x8f, 0xaa, 0x52, 0x97, 0x10, 0xa7, 0xb7, - 0x7e, 0x05, 0xf8, 0xe4, 0x23, 0x6b, 0xc4, 0xc3, 0x62, 0xf7, 0x71, 0x3b, 0xfa, 0x7d, 0xa2, 0xfb, - 0x56, 0x5d, 0xee, 0xd4, 0x76, 0xc5, 0x7a, 0xaf, 0x41, 0x97, 0x5d, 0x84, 0x2c, 0x16, 0xab, 0xf5, - 0xc7, 0x7c, 0x0a, 0x2d, 0x43, 0x49, 0x6a, 0x4a, 0x5d, 0xa9, 0xda, 0x90, 0x3e, 0xa1, 0xea, 0x5e, - 0x81, 0xa5, 0x5e, 0xd3, 0x43, 0xa6, 0xca, 0xc8, 0xa0, 0x35, 0xe0, 0x03, 0x21, 0x3a, 0x32, 0xa3, - 0xcc, 0x6e, 0x55, 0x01, 0xc2, 0xb7, 0x79, 0x44, 0x93, 0x52, 0x5b, 0x6e, 0xe3, 0x56, 0xb7, 0x55, - 0x6b, 0x35, 0x22, 0x9f, 0xcf, 0x43, 0xba, 0x5b, 0x6b, 0xf3, 0x1c, 0xf9, 0xd1, 0xab, 0xb7, 0xf9, - 0x14, 0x71, 0xab, 0x4e, 0xad, 0xdb, 0xe6, 0xd3, 0x5b, 0x83, 0xe0, 0xad, 0x60, 0x97, 0x5d, 0x80, - 0xad, 0x75, 0x44, 0xfc, 0x48, 0xaa, 0x89, 0xf2, 0xf1, 0x35, 0x88, 0x1f, 0x77, 0x45, 0xdc, 0xac, - 0x36, 0xe4, 0x66, 0xf5, 0x01, 0x71, 0xc9, 0x32, 0x80, 0xef, 0x7f, 0x52, 0x9b, 0x79, 0x4d, 0xb3, - 0x55, 0x17, 0xe5, 0x36, 0xb5, 0x12, 0xa1, 0x68, 0xb4, 0xaa, 0x75, 0x79, 0xa7, 0xda, 0xa8, 0x36, - 0x6b, 0x22, 0xe6, 0x33, 0x5b, 0x2a, 0x9c, 0x9f, 0xfa, 0x9c, 0x91, 0xb8, 0x73, 0x17, 0x57, 0xef, - 0xdc, 0x91, 0x6a, 0x72, 0xbb, 0xd5, 0x90, 0x6a, 0x8f, 0x27, 0x88, 0xe0, 0x23, 0x34, 0x5a, 0xb5, - 0x6a, 0x83, 0xe7, 0xd0, 0x2a, 0x2c, 0xfb, 0x53, 0x9e, 0x28, 0x7c, 0x6a, 0xeb, 0x57, 0x23, 0x0f, - 0x0d, 0x29, 0xe7, 0x75, 0x38, 0x1b, 0x9a, 0x30, 0xc1, 0xf4, 0x3c, 0x9c, 0x49, 0xc0, 0xea, 0xad, - 0xda, 0x7d, 0x11, 0x33, 0xd7, 0x4c, 0x80, 0x6a, 0x58, 0x6a, 0xf1, 0x29, 0xf4, 0x35, 0x38, 0x9f, - 0x04, 0xf8, 0xc3, 0x3a, 0x9f, 0xde, 0x32, 0xa0, 0x18, 0xdc, 0xe9, 0xa0, 0xb3, 0x80, 0x98, 0x52, - 0x12, 0xc1, 0x17, 0x9f, 0x0f, 0xe3, 0x30, 0x3e, 0x1f, 0x86, 0xe4, 0x79, 0x38, 0x13, 0x99, 0x8f, - 0x78, 0x68, 0x7a, 0xeb, 0x5f, 0x38, 0x58, 0x4e, 0xdc, 0x67, 0x92, 0x25, 0x53, 0xf4, 0x6a, 0xbd, - 0x7e, 0x6c, 0xc9, 0x17, 0xe0, 0x5c, 0x02, 0x46, 0x72, 0x86, 0x67, 0xd4, 0x0d, 0x58, 0x4f, 0x00, - 0x03, 0xb3, 0x53, 0x23, 0x1f, 0x87, 0x4b, 0xcd, 0x10, 0x9e, 0x26, 0x56, 0x9c, 0x46, 0x5f, 0x6f, - 0x76, 0xf8, 0xcc, 0x04, 0x84, 0x80, 0x01, 0x41, 0xc8, 0x6e, 0xed, 0xd3, 0x87, 0x48, 0xd1, 0x53, - 0x10, 0xf4, 0x06, 0x54, 0x6a, 0xad, 0x66, 0x5d, 0xea, 0x4a, 0xad, 0x26, 0x8d, 0xc1, 0x5e, 0xe7, - 0x98, 0x09, 0xe3, 0xd0, 0x2e, 0xee, 0x91, 0xd5, 0x30, 0xcb, 0xc7, 0x41, 0x77, 0xaa, 0x8d, 0x8e, - 0xc8, 0xa7, 0xb6, 0x3e, 0xe7, 0xd8, 0x9f, 0x85, 0xc5, 0xa3, 0xd7, 0x57, 0x5c, 0x48, 0x16, 0xcb, - 0x62, 0x09, 0x18, 0x8b, 0x44, 0x0e, 0x09, 0xb0, 0x91, 0x80, 0x3c, 0x10, 0x1f, 0xb4, 0xf0, 0x63, - 0xb9, 0x8d, 0xc5, 0x4e, 0xa7, 0x87, 0x49, 0x42, 0xbb, 0x08, 0x6f, 0x24, 0x70, 0xea, 0x52, 0xe7, - 0x7e, 0x88, 0x11, 0xea, 0x2e, 0xc4, 0x68, 0x4b, 0xf5, 0x10, 0x21, 0x83, 0xde, 0x04, 0x21, 0x81, - 0xd0, 0x14, 0xbb, 0x1f, 0xb5, 0xf0, 0x7d, 0xb9, 0xd7, 0xac, 0x3e, 0xaa, 0x4a, 0x2c, 0x5d, 0x64, - 0xb7, 0x7e, 0xc8, 0xc1, 0xb9, 0x29, 0x47, 0x52, 0xe8, 0x2a, 0x5c, 0xaa, 0x8b, 0xed, 0x46, 0xeb, - 0xf1, 0x03, 0xb1, 0xd9, 0x8d, 0x70, 0x4a, 0x38, 0x89, 0x00, 0x1b, 0x13, 0xd1, 0xc2, 0xcf, 0x70, - 0xe8, 0x0a, 0x5c, 0x9c, 0x88, 0xd3, 0xc6, 0xad, 0xbb, 0x44, 0x68, 0xe6, 0xb9, 0xd7, 0xe0, 0xca, - 0x44, 0x2c, 0x2c, 0xb6, 0x1b, 0x52, 0xad, 0x2a, 0x93, 0xad, 0x85, 0xae, 0x7f, 0xeb, 0xd7, 0x39, - 0x38, 0x3b, 0xb9, 0x2f, 0x25, 0xaa, 0x89, 0x30, 0xe9, 0x74, 0x71, 0xb5, 0x2b, 0xde, 0x7d, 0x1c, - 0x91, 0xf7, 0x22, 0xbc, 0x31, 0x09, 0x01, 0x8b, 0x35, 0x2c, 0x56, 0xbb, 0x44, 0xda, 0x37, 0x41, - 0x98, 0x88, 0xd1, 0x6a, 0x34, 0xa4, 0xe6, 0x5d, 0xb9, 0xd7, 0xae, 0x13, 0xbc, 0xd4, 0xce, 0x77, - 0x3e, 0xfb, 0x62, 0x63, 0xe1, 0xf3, 0x2f, 0x36, 0x16, 0x7e, 0xf2, 0xc5, 0x06, 0xf7, 0x6b, 0xe3, - 0x0d, 0xee, 0xcf, 0xc7, 0x1b, 0xdc, 0x3f, 0x8e, 0x37, 0xb8, 0xcf, 0xc6, 0x1b, 0xdc, 0xbf, 0x8d, - 0x37, 0xb8, 0xff, 0x1c, 0x6f, 0x2c, 0xfc, 0x64, 0xbc, 0xc1, 0x7d, 0xff, 0xcb, 0x8d, 0x85, 0xcf, - 0xbe, 0xdc, 0x58, 0xf8, 0xfc, 0xcb, 0x8d, 0x85, 0x4f, 0x20, 0xac, 0x28, 0xf6, 0x72, 0xf4, 0x95, - 0xf4, 0x37, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x2f, 0x51, 0x4e, 0x35, 0x40, 0x00, 0x00, + 0xae, 0x89, 0x2a, 0xd6, 0xf3, 0x6d, 0x86, 0xb8, 0xfd, 0xf4, 0x96, 0xb3, 0x1d, 0x22, 0xae, 0xaf, + 0x1d, 0x98, 0x07, 0x26, 0x45, 0xba, 0x41, 0x7e, 0x31, 0xfc, 0xf5, 0xcd, 0x03, 0xd3, 0x3c, 0x18, + 0x68, 0x37, 0xe8, 0xd7, 0xde, 0x68, 0xff, 0x86, 0xab, 0x0f, 0x35, 0xc7, 0x55, 0x86, 0x96, 0x87, + 0x70, 0x25, 0x32, 0xb5, 0x7b, 0x68, 0x69, 0x0e, 0xfb, 0xd7, 0xda, 0x63, 0xff, 0x33, 0x2c, 0xe1, + 0x07, 0x69, 0x28, 0x3f, 0xf0, 0xe6, 0x6a, 0xed, 0xfd, 0x92, 0xd6, 0x77, 0xd1, 0x3b, 0x90, 0xb6, + 0x4c, 0xb5, 0xc2, 0x5d, 0xe4, 0xae, 0x95, 0x6e, 0x7e, 0x6d, 0x7b, 0x9a, 0x5c, 0xdb, 0x6d, 0x53, + 0xdd, 0x5d, 0xc0, 0x04, 0x17, 0xd5, 0xa0, 0xa8, 0x19, 0xaa, 0x65, 0xea, 0x86, 0xeb, 0x54, 0x52, + 0x94, 0xf0, 0xf2, 0x74, 0x42, 0xd1, 0x47, 0xdd, 0x5d, 0xc0, 0x21, 0x1d, 0xfa, 0x36, 0xe4, 0x1d, + 0xcd, 0x7e, 0xa6, 0xf7, 0xb5, 0x4a, 0x9a, 0xb2, 0xb8, 0x34, 0x9d, 0x45, 0x87, 0x21, 0xee, 0x2e, + 0x60, 0x9f, 0x86, 0xc8, 0x60, 0x28, 0x43, 0xcd, 0xb1, 0x94, 0xbe, 0x56, 0xc9, 0x9c, 0x24, 0x43, + 0xd3, 0x47, 0x25, 0x32, 0x04, 0x74, 0xe8, 0x5d, 0xc8, 0x18, 0xa6, 0xaa, 0x55, 0xb2, 0x94, 0x7e, + 0x63, 0x06, 0xbd, 0xa9, 0x12, 0x52, 0x8a, 0x8d, 0xee, 0x00, 0xd8, 0x9a, 0x35, 0xd0, 0xfb, 0x4a, + 0x47, 0x73, 0x2b, 0x39, 0x4a, 0x7b, 0x65, 0x3a, 0x2d, 0x0e, 0x70, 0x77, 0x17, 0x70, 0x84, 0x72, + 0xa7, 0x00, 0x39, 0x93, 0xda, 0x40, 0xf8, 0xb3, 0x2c, 0x94, 0x99, 0x39, 0x7c, 0xe3, 0x20, 0x04, + 0x19, 0x22, 0x27, 0xb5, 0x4b, 0x11, 0xd3, 0xdf, 0xe8, 0x8d, 0xe8, 0x9a, 0x53, 0x14, 0x10, 0x59, + 0xcc, 0x79, 0x48, 0x8f, 0x74, 0x95, 0x2a, 0xb3, 0xb8, 0x93, 0x1f, 0x1f, 0x6d, 0xa6, 0x7b, 0x52, + 0x1d, 0x93, 0x31, 0x74, 0x1d, 0x78, 0x5b, 0x73, 0xcc, 0x91, 0xdd, 0xd7, 0xe4, 0x67, 0x9a, 0xed, + 0xe8, 0xa6, 0x41, 0x75, 0x56, 0xc4, 0xcb, 0xfe, 0xf8, 0x23, 0x36, 0x8c, 0xee, 0xc3, 0x99, 0xbe, + 0xad, 0x29, 0xae, 0x6e, 0x1a, 0x72, 0xe0, 0x63, 0xb2, 0xe1, 0x50, 0x1d, 0xa5, 0x77, 0xce, 0x8d, + 0x8f, 0x36, 0x57, 0x6b, 0x1e, 0x42, 0xd7, 0x87, 0x37, 0x3b, 0x78, 0xb5, 0x7f, 0x6c, 0xd0, 0x21, + 0xcc, 0x54, 0x6d, 0xa0, 0x1d, 0x67, 0x96, 0x0b, 0x99, 0xd5, 0x3d, 0x84, 0x18, 0x33, 0xf5, 0xd8, + 0xa0, 0x83, 0x1a, 0x90, 0x1b, 0x28, 0x7b, 0xda, 0xc0, 0xa9, 0xe4, 0x2f, 0xa6, 0xaf, 0x95, 0x6e, + 0xbe, 0x3b, 0x5d, 0xe5, 0x71, 0x5d, 0x6e, 0x37, 0x28, 0x99, 0x68, 0xb8, 0xf6, 0x21, 0xf6, 0x78, + 0xa0, 0x0e, 0xf0, 0xe6, 0x2f, 0x1b, 0x9a, 0x2d, 0xdb, 0xda, 0xbe, 0x66, 0x6b, 0x46, 0x5f, 0x73, + 0x2a, 0x05, 0xca, 0xf7, 0xda, 0x0c, 0xbe, 0x84, 0x02, 0xfb, 0x04, 0x78, 0xd9, 0x8c, 0x7d, 0x3b, + 0xe8, 0xbb, 0x50, 0x52, 0x0c, 0xc3, 0x74, 0xa9, 0x22, 0x9c, 0x0a, 0x50, 0x7e, 0xb7, 0xe7, 0x96, + 0xb3, 0x1a, 0xd2, 0x32, 0x61, 0xa3, 0xdc, 0xd6, 0x6f, 0x43, 0x29, 0xb2, 0x10, 0xc4, 0x43, 0xfa, + 0xa9, 0x76, 0xe8, 0xf9, 0x07, 0xf9, 0x89, 0xd6, 0x20, 0xfb, 0x4c, 0x19, 0x8c, 0x7c, 0xd7, 0x60, + 0x1f, 0xef, 0xa5, 0x6e, 0x71, 0xeb, 0x1f, 0x00, 0x9f, 0xe4, 0x7d, 0x1a, 0xfa, 0x7b, 0x99, 0x42, + 0x91, 0x07, 0xa1, 0x03, 0xe5, 0xb8, 0x02, 0x88, 0x93, 0x3e, 0xd5, 0x0d, 0xd5, 0x77, 0x52, 0xf2, + 0x3b, 0x70, 0xdc, 0x74, 0xc4, 0x71, 0x3d, 0xd7, 0xcc, 0x1c, 0x77, 0x4d, 0xe1, 0x21, 0x14, 0x83, + 0xe0, 0x44, 0x75, 0x28, 0xf8, 0xda, 0xf1, 0x12, 0xd2, 0xb5, 0x79, 0x95, 0x87, 0x03, 0x4a, 0xe1, + 0xef, 0x38, 0x48, 0xb7, 0x4d, 0xf5, 0xd5, 0x70, 0x43, 0xdf, 0x84, 0x8c, 0x63, 0x69, 0x7d, 0x2f, + 0xcf, 0x5d, 0x9a, 0x99, 0x20, 0x3b, 0x96, 0xd6, 0xc7, 0x14, 0x1d, 0x7d, 0x0b, 0x72, 0x8e, 0xab, + 0xb8, 0x23, 0xc7, 0xcb, 0x6e, 0x97, 0x67, 0x13, 0x52, 0x54, 0xec, 0x91, 0x08, 0x7f, 0x9c, 0x86, + 0xbc, 0xc7, 0x0e, 0x3d, 0x04, 0x50, 0x0d, 0x47, 0xb6, 0xcc, 0x81, 0xde, 0x67, 0xe6, 0x2a, 0xcf, + 0x62, 0x56, 0x6f, 0x76, 0xda, 0x14, 0x75, 0x67, 0x69, 0x7c, 0xb4, 0x59, 0x0c, 0x3e, 0x71, 0x51, + 0x35, 0x1c, 0xf6, 0x13, 0x7d, 0x0c, 0x4b, 0x24, 0x91, 0xc9, 0x8e, 0x36, 0xd0, 0xfa, 0xae, 0x69, + 0x57, 0x52, 0xd4, 0x51, 0xbf, 0x71, 0xe2, 0xda, 0x68, 0x1e, 0xec, 0x78, 0x54, 0xcc, 0x45, 0x17, + 0x8d, 0xc8, 0x10, 0xba, 0x00, 0x45, 0xca, 0x39, 0xe2, 0x01, 0x05, 0x32, 0x40, 0x4c, 0x8c, 0xd6, + 0xa1, 0xf0, 0xc4, 0x74, 0x5c, 0x0a, 0x63, 0xd9, 0x27, 0xf8, 0x26, 0xa9, 0xcd, 0x19, 0xed, 0xa9, + 0xe6, 0x50, 0xd1, 0x0d, 0x9a, 0x6a, 0x8a, 0x38, 0x1c, 0x40, 0xdb, 0xb0, 0x6a, 0xd9, 0xba, 0x69, + 0xeb, 0xee, 0xa1, 0xdc, 0x1f, 0x28, 0x8e, 0xc3, 0x26, 0xc8, 0x51, 0xbc, 0x15, 0x1f, 0x54, 0x23, + 0x10, 0x7f, 0x26, 0x7f, 0xb0, 0x92, 0xbf, 0xc8, 0x5d, 0xcb, 0xe2, 0xe0, 0x7b, 0xfd, 0x43, 0x58, + 0x39, 0xb6, 0x8a, 0xd3, 0x04, 0x83, 0xf0, 0x9b, 0x69, 0x58, 0xae, 0x99, 0x86, 0xab, 0xe8, 0x86, + 0x66, 0x33, 0xc3, 0x4d, 0xcc, 0xd6, 0x37, 0x61, 0xb1, 0xef, 0xa3, 0xc9, 0xba, 0xca, 0x18, 0xed, + 0x2c, 0x8f, 0x8f, 0x36, 0x4b, 0x01, 0xb9, 0x54, 0xc7, 0xa5, 0x00, 0x49, 0x52, 0xd1, 0x43, 0x58, + 0x0e, 0x69, 0x88, 0x33, 0x30, 0x2d, 0x96, 0x67, 0x79, 0x6e, 0x4c, 0x16, 0x0d, 0x97, 0xfb, 0xb1, + 0x6f, 0xb4, 0x03, 0xc8, 0x71, 0x15, 0xdb, 0x8d, 0x27, 0xe0, 0x0c, 0x4d, 0xc0, 0x6b, 0xe3, 0xa3, + 0x4d, 0xbe, 0x43, 0xa0, 0xd1, 0xec, 0xcb, 0x3b, 0xf1, 0x11, 0x07, 0x7d, 0x08, 0x2b, 0x8e, 0x6b, + 0x5a, 0x93, 0x36, 0x84, 0xd5, 0xf1, 0xd1, 0xe6, 0x72, 0xc7, 0x35, 0xad, 0x28, 0x87, 0x65, 0x27, + 0x36, 0xe0, 0xa0, 0x0a, 0xe4, 0x87, 0x9a, 0xe3, 0x28, 0x07, 0xbe, 0xd1, 0xfc, 0x4f, 0x74, 0x16, + 0x72, 0xb6, 0xa6, 0x38, 0xa6, 0x41, 0x0d, 0x55, 0xc4, 0xde, 0x17, 0xba, 0x0c, 0x4b, 0xb6, 0xc6, + 0x04, 0xef, 0x9b, 0x23, 0xc3, 0xad, 0x14, 0xc8, 0x74, 0x78, 0xd1, 0x1b, 0xac, 0x91, 0x31, 0xe1, + 0x8f, 0x38, 0x28, 0xdc, 0xbf, 0xe5, 0x88, 0xcf, 0x34, 0xc3, 0x8d, 0xce, 0xc1, 0xc5, 0xe7, 0xb8, + 0x0d, 0xb0, 0xaf, 0xdb, 0x0e, 0x53, 0x81, 0x17, 0xc8, 0xeb, 0xdb, 0xac, 0xa2, 0xda, 0xf6, 0x2b, + 0xaa, 0xed, 0x40, 0x5e, 0x5c, 0xa4, 0xd8, 0xe4, 0x1b, 0xfd, 0x3c, 0x14, 0x07, 0x8a, 0x4f, 0x99, + 0x3e, 0x91, 0xb2, 0x40, 0x90, 0xc9, 0xa7, 0xf0, 0xe3, 0x0c, 0x14, 0x83, 0xc0, 0x46, 0xb7, 0x20, + 0x6b, 0x3d, 0x51, 0x1c, 0xcd, 0x8b, 0x5f, 0x61, 0x66, 0xa4, 0xb5, 0x09, 0x26, 0x66, 0x04, 0xa4, + 0xd8, 0xe8, 0x9b, 0x86, 0xaa, 0xb3, 0x1d, 0xa5, 0x48, 0x03, 0xf5, 0xcd, 0x99, 0xe4, 0x35, 0x1f, + 0x1d, 0x47, 0x28, 0xa3, 0xda, 0x49, 0x4f, 0xb3, 0x40, 0x26, 0x61, 0x81, 0x3c, 0x09, 0x4f, 0x59, + 0xb7, 0x58, 0x40, 0xee, 0xc0, 0xf8, 0x68, 0x33, 0xb7, 0x6b, 0x3a, 0xae, 0xd4, 0xc6, 0x39, 0x02, + 0x92, 0x2c, 0x74, 0x11, 0x72, 0x96, 0xa9, 0x12, 0x1c, 0x6a, 0xd7, 0x9d, 0xe2, 0xf8, 0x68, 0x33, + 0xdb, 0x36, 0x55, 0xa9, 0x8d, 0xb3, 0x96, 0xa9, 0x4a, 0x16, 0x6a, 0x43, 0xf1, 0x53, 0xd3, 0x61, + 0x61, 0x4b, 0x6d, 0x5c, 0xbe, 0x79, 0x75, 0xa6, 0xfc, 0x0f, 0x5b, 0x1d, 0x1a, 0xc9, 0x3b, 0x8b, + 0xe3, 0xa3, 0xcd, 0x82, 0xff, 0x85, 0x0b, 0x9f, 0x9a, 0x0e, 0xfd, 0x85, 0x3e, 0x06, 0x14, 0x0f, + 0x92, 0x91, 0x13, 0x6c, 0xde, 0xd7, 0xe7, 0x8c, 0x93, 0x91, 0x83, 0x57, 0xfa, 0xf1, 0x01, 0xcd, + 0x21, 0x8e, 0x42, 0xcb, 0x18, 0x4d, 0x95, 0x15, 0xb7, 0x52, 0x3a, 0xd9, 0x51, 0x3c, 0xec, 0xaa, + 0x8b, 0xde, 0x83, 0x9c, 0x46, 0xdc, 0xd0, 0xa9, 0x2c, 0x52, 0x41, 0x66, 0x98, 0xd8, 0xf7, 0x58, + 0xec, 0x51, 0x1c, 0xf7, 0xf5, 0xa5, 0xe3, 0xbe, 0x7e, 0x2f, 0x53, 0x48, 0xf1, 0x69, 0xe1, 0xf7, + 0x38, 0x58, 0x8c, 0xda, 0x18, 0x7d, 0x00, 0x19, 0x52, 0xe0, 0x7b, 0x8e, 0xb5, 0x35, 0x9f, 0x67, + 0x74, 0x0f, 0x2d, 0x0d, 0x53, 0x3a, 0x54, 0x0d, 0xf6, 0xa9, 0x14, 0xe5, 0x30, 0x5b, 0x81, 0x8c, + 0x3c, 0xb1, 0x5b, 0xfd, 0x01, 0x07, 0xc5, 0xa0, 0xc8, 0x7f, 0x45, 0xbb, 0xee, 0x0e, 0xe4, 0x9d, + 0xd1, 0x9e, 0xa3, 0xd1, 0x06, 0xe3, 0x84, 0xaa, 0xcc, 0x9f, 0xbb, 0x43, 0x09, 0xb0, 0x4f, 0x28, + 0xfc, 0x17, 0x07, 0xe5, 0x38, 0x0c, 0xdd, 0x85, 0xa2, 0xa2, 0xaa, 0xb6, 0xe6, 0x10, 0x8f, 0xe1, + 0x4e, 0xf2, 0x18, 0x9f, 0xb8, 0xca, 0x48, 0x70, 0x48, 0x8b, 0x1e, 0xc3, 0xaa, 0x61, 0xba, 0xb2, + 0xad, 0x29, 0xea, 0xa1, 0x1c, 0xb2, 0x4c, 0x9d, 0x96, 0xe5, 0x8a, 0x61, 0xba, 0x98, 0x30, 0xa9, + 0x06, 0xac, 0xdf, 0x87, 0xac, 0x65, 0xda, 0x2e, 0x29, 0x1c, 0x4e, 0x08, 0x76, 0x9f, 0x59, 0xdb, + 0xb4, 0x5d, 0xcc, 0x88, 0x84, 0xbf, 0xe0, 0x60, 0x39, 0x31, 0x09, 0x3a, 0x0b, 0x29, 0xdd, 0x62, + 0x49, 0x71, 0x27, 0x37, 0x3e, 0xda, 0x4c, 0x49, 0x6d, 0x9c, 0xd2, 0xad, 0xd8, 0x86, 0x9c, 0x4a, + 0x6c, 0xc8, 0x33, 0x77, 0xf2, 0x5d, 0x00, 0x57, 0xb1, 0x0f, 0x34, 0xa2, 0x80, 0x7d, 0xaf, 0xfb, + 0xba, 0x7e, 0x92, 0x95, 0xc3, 0xba, 0xb9, 0xc8, 0x88, 0xb1, 0xb6, 0x2f, 0x3c, 0x87, 0xc5, 0xe8, + 0x2a, 0x26, 0x6e, 0xa4, 0x08, 0x32, 0x64, 0x6d, 0x54, 0xc4, 0x2c, 0xa6, 0xbf, 0xd1, 0x77, 0xc8, + 0x0e, 0x6f, 0xba, 0x66, 0xdf, 0x1c, 0x78, 0x3b, 0xe4, 0x8c, 0x0e, 0x4c, 0x6a, 0xb7, 0x3d, 0x5c, + 0x1c, 0x50, 0x09, 0x7f, 0xca, 0xc1, 0x72, 0x42, 0xb0, 0x89, 0xf5, 0xec, 0xec, 0xa6, 0xeb, 0x74, + 0xd5, 0x2e, 0xba, 0x06, 0xc9, 0x86, 0xcb, 0xdb, 0x0f, 0x93, 0xc3, 0xc2, 0x6f, 0x71, 0x90, 0xf7, + 0xda, 0xde, 0x57, 0x14, 0x52, 0xb7, 0x63, 0x85, 0xec, 0xd5, 0x13, 0xbb, 0xed, 0xb0, 0x98, 0x15, + 0xfe, 0x3a, 0x0d, 0xa5, 0xc8, 0x28, 0xfa, 0x96, 0xef, 0xa2, 0x2c, 0x84, 0x4e, 0xe6, 0x15, 0xf1, + 0x50, 0xf4, 0x75, 0x80, 0xfe, 0x60, 0xe4, 0xb8, 0xa4, 0x2a, 0xb2, 0xbc, 0xaa, 0x88, 0xd6, 0xaa, + 0x35, 0x36, 0x2a, 0xb5, 0x71, 0xd1, 0x43, 0x90, 0x2c, 0x22, 0x35, 0xcd, 0x6f, 0xe9, 0x93, 0x76, + 0x0e, 0x6f, 0xa6, 0x48, 0x6a, 0xbb, 0x09, 0x8b, 0xda, 0x73, 0x57, 0xb3, 0x0d, 0x65, 0x20, 0xeb, + 0x16, 0xa9, 0x79, 0xd2, 0x7e, 0x01, 0x26, 0x7a, 0xe3, 0x52, 0xdb, 0xc1, 0x25, 0x1f, 0x49, 0xb2, + 0x48, 0xf0, 0xf1, 0x03, 0x53, 0x51, 0xe5, 0x3d, 0x65, 0xa0, 0x18, 0x7d, 0x26, 0x22, 0xdb, 0xfd, + 0xd0, 0xf8, 0x68, 0xb3, 0xdc, 0x30, 0x15, 0x75, 0xc7, 0x03, 0x49, 0x6d, 0x5c, 0x1e, 0x44, 0xbf, + 0x2d, 0x92, 0xc8, 0x83, 0x19, 0x23, 0x15, 0x6a, 0x20, 0x06, 0x0d, 0x9e, 0xa7, 0x70, 0x2e, 0x40, + 0x72, 0x6d, 0x65, 0x7f, 0x5f, 0xef, 0xfb, 0xd5, 0x3d, 0xdb, 0x1e, 0x67, 0xd4, 0xe1, 0xbe, 0xdc, + 0x5d, 0x46, 0xc7, 0xea, 0x79, 0xba, 0xe4, 0x33, 0xda, 0x24, 0x90, 0xf0, 0x03, 0x2e, 0xb0, 0xdc, + 0xd4, 0xf8, 0x8a, 0xc6, 0x52, 0xea, 0x45, 0x62, 0x29, 0x88, 0xd0, 0x74, 0x24, 0x42, 0xfd, 0x04, + 0x42, 0x01, 0x19, 0x56, 0x84, 0x93, 0x01, 0x22, 0x86, 0xf0, 0xcf, 0x29, 0x58, 0x0a, 0x8b, 0x60, + 0x63, 0xdf, 0x9c, 0x28, 0x98, 0x17, 0x48, 0xa9, 0x09, 0x81, 0x34, 0xb9, 0xaa, 0x4d, 0xbf, 0x7c, + 0x55, 0x9b, 0x39, 0x45, 0x55, 0x7b, 0x19, 0xf2, 0xa4, 0xf8, 0x21, 0x32, 0x46, 0x2a, 0xa4, 0xb6, + 0xa9, 0x12, 0x31, 0x49, 0x5d, 0xd4, 0xd3, 0x13, 0xf9, 0x23, 0x97, 0xcc, 0x1f, 0x35, 0x28, 0x5a, + 0xb6, 0xd9, 0x67, 0xbb, 0x47, 0xfe, 0xa4, 0x68, 0x6a, 0x33, 0x54, 0xa2, 0x30, 0x1c, 0xd2, 0x09, + 0x7f, 0x92, 0x82, 0x52, 0x04, 0x34, 0x51, 0x97, 0x37, 0x20, 0x33, 0xb2, 0x3c, 0x65, 0x96, 0x6e, + 0xae, 0x90, 0x39, 0xd8, 0xc1, 0x60, 0x4f, 0x32, 0xdc, 0x77, 0x6e, 0xde, 0xda, 0x29, 0x8c, 0x8f, + 0x36, 0x33, 0xbd, 0xb6, 0x54, 0xc7, 0x14, 0xf1, 0xf5, 0xe8, 0x1b, 0x2e, 0xc1, 0xa2, 0xb7, 0x4c, + 0x59, 0xb1, 0x0f, 0x1c, 0x4f, 0x7f, 0x25, 0x6f, 0xac, 0x6a, 0x1f, 0x38, 0xc4, 0x49, 0xfa, 0xba, + 0xca, 0xba, 0x07, 0xe6, 0x24, 0x35, 0xe2, 0x24, 0x7d, 0x5d, 0xbd, 0x97, 0x29, 0xa4, 0xf9, 0x8c, + 0xf0, 0x97, 0x39, 0x5a, 0x89, 0xf7, 0x2c, 0x95, 0xb4, 0x43, 0x9e, 0x4f, 0x71, 0x13, 0x7c, 0xca, + 0x57, 0x5b, 0x6a, 0xda, 0x91, 0x5b, 0x3a, 0x69, 0xbd, 0xd7, 0x42, 0x47, 0xdf, 0x84, 0xa5, 0x68, + 0x9f, 0x49, 0x94, 0x44, 0xf2, 0x1c, 0x3f, 0x3e, 0xda, 0x5c, 0x8c, 0x34, 0x9a, 0x0e, 0x5e, 0x8c, + 0x74, 0x9a, 0x0e, 0x7a, 0x2b, 0xda, 0x6a, 0xd2, 0x25, 0x55, 0x4a, 0x84, 0x30, 0xd2, 0x40, 0xd2, + 0x83, 0x99, 0xaf, 0xa0, 0x80, 0x0f, 0xba, 0xa1, 0xc2, 0xcb, 0x75, 0x43, 0xfc, 0x0b, 0x77, 0x43, + 0xb1, 0xea, 0xa6, 0x38, 0xe3, 0x9c, 0x02, 0x12, 0x65, 0x51, 0xd8, 0xef, 0x2c, 0x4e, 0xe9, 0x77, + 0x22, 0x6d, 0xd3, 0xd2, 0xd4, 0xb6, 0x29, 0xd2, 0x8d, 0x95, 0xa7, 0x75, 0x63, 0xcb, 0xb1, 0x6e, + 0xec, 0x6c, 0x70, 0xfa, 0xb9, 0xc2, 0xc6, 0x67, 0x9c, 0x63, 0xa2, 0x97, 0x3c, 0xc7, 0x14, 0xfe, + 0x3b, 0x7a, 0xc4, 0x11, 0x06, 0x4e, 0x3f, 0x1e, 0x38, 0x7e, 0x9c, 0x4d, 0x0c, 0x9c, 0xd7, 0x22, + 0x41, 0xc7, 0xa2, 0x37, 0x9b, 0x8c, 0x5e, 0xdf, 0x96, 0x6a, 0xb2, 0x77, 0xad, 0x33, 0x5b, 0xaa, + 0xe8, 0x3c, 0x14, 0x08, 0x06, 0x5d, 0x1c, 0x3b, 0x9e, 0x20, 0x09, 0x9f, 0x3a, 0xc9, 0x84, 0x93, + 0x9a, 0xc2, 0x4b, 0x9e, 0xd4, 0x44, 0x9c, 0xa2, 0x38, 0xcd, 0x29, 0x20, 0xe6, 0x14, 0x4d, 0x08, + 0x79, 0xc8, 0xb4, 0x4c, 0x2a, 0x51, 0x19, 0xde, 0x9a, 0x43, 0x06, 0x5a, 0x35, 0x84, 0x99, 0x83, + 0x7c, 0x0a, 0xdf, 0x4b, 0xc3, 0x92, 0x57, 0x2d, 0xfc, 0xcc, 0xa6, 0x4b, 0x6f, 0xd3, 0x0e, 0x13, + 0xa5, 0xbf, 0x69, 0x93, 0x14, 0x99, 0xa3, 0x76, 0xa7, 0xf9, 0xc1, 0x37, 0x3c, 0xdb, 0x96, 0x8b, + 0xb8, 0xe0, 0x59, 0xde, 0x39, 0x56, 0x57, 0x16, 0xe6, 0xa8, 0x2b, 0xe3, 0x45, 0x6f, 0x71, 0x76, + 0xd1, 0x2b, 0xfc, 0x88, 0x83, 0xe5, 0xe0, 0x54, 0xfc, 0xc5, 0x2c, 0xf1, 0x3a, 0xc4, 0x9f, 0xf0, + 0xf7, 0x1c, 0x94, 0xbd, 0xc2, 0xa4, 0xc6, 0x4e, 0x4a, 0x82, 0x3a, 0x84, 0x7b, 0xb9, 0x3a, 0xe4, + 0x74, 0x0b, 0xa9, 0x40, 0xbe, 0x3f, 0x54, 0x07, 0xba, 0xe1, 0x1f, 0x3c, 0xfb, 0x9f, 0x7e, 0x56, + 0xcb, 0x4e, 0xac, 0x1e, 0x52, 0x7c, 0x5a, 0xf8, 0x1e, 0x07, 0x2b, 0xde, 0x12, 0xba, 0x9a, 0x3d, + 0xd4, 0x8d, 0x17, 0x5b, 0xc5, 0x44, 0x55, 0xa6, 0x4e, 0xa1, 0xca, 0x7f, 0xe0, 0x20, 0xd3, 0x34, + 0xd5, 0x57, 0xd5, 0x0c, 0xfe, 0x5c, 0xac, 0x19, 0x14, 0x66, 0xdf, 0x7c, 0x46, 0xae, 0x35, 0xde, + 0x4f, 0x5c, 0x6b, 0x5c, 0x39, 0x81, 0x32, 0x7e, 0x52, 0xf4, 0x0b, 0x50, 0xf0, 0xf9, 0xa1, 0xeb, + 0x2c, 0xc4, 0xfa, 0xba, 0x6a, 0xb3, 0x3e, 0xb2, 0xc8, 0xea, 0x05, 0xb2, 0x67, 0x4b, 0x75, 0xec, + 0xd0, 0x80, 0xab, 0x11, 0x28, 0x7a, 0x93, 0xa5, 0x61, 0x82, 0xea, 0x35, 0x03, 0xa5, 0xf1, 0xd1, + 0x66, 0xde, 0xc3, 0xa4, 0x39, 0x99, 0x20, 0x0a, 0xfb, 0x50, 0x22, 0xec, 0xfd, 0x63, 0x8f, 0x6f, + 0xc7, 0x8e, 0xc6, 0xae, 0xcf, 0x96, 0xd4, 0x23, 0x8a, 0xb4, 0x8f, 0x15, 0xc8, 0x7b, 0x07, 0x3b, + 0x5e, 0x60, 0xf9, 0x9f, 0xc2, 0xef, 0x73, 0xb0, 0x44, 0x68, 0xc2, 0x53, 0xb8, 0x0f, 0x63, 0x53, + 0xfd, 0xbf, 0xd9, 0x53, 0x7d, 0x45, 0xc7, 0x70, 0xff, 0xca, 0x01, 0x84, 0x3a, 0x47, 0xb7, 0xe3, + 0x47, 0xce, 0x97, 0x67, 0xcb, 0x14, 0xab, 0xb2, 0x6a, 0xd1, 0x53, 0xb2, 0xd4, 0x49, 0x4d, 0x49, + 0x44, 0x7b, 0xd1, 0x13, 0xb2, 0xbb, 0xb1, 0x52, 0x8d, 0x9d, 0x65, 0xbd, 0x35, 0xa7, 0x62, 0xa2, + 0xb5, 0x9a, 0xf0, 0x87, 0x69, 0xb6, 0xae, 0x9f, 0xde, 0x3c, 0x18, 0xda, 0x22, 0x7b, 0x6a, 0x5b, + 0x44, 0x7d, 0x3f, 0x37, 0xdd, 0xf7, 0xe3, 0xe1, 0x94, 0x9f, 0x19, 0x4e, 0x71, 0xcb, 0x14, 0x5e, + 0xdc, 0x32, 0x3f, 0xe6, 0x00, 0xc2, 0xd7, 0x0d, 0xaf, 0x28, 0x33, 0xbd, 0x1f, 0xcb, 0x4c, 0xd7, + 0xe6, 0x79, 0x57, 0x11, 0xc9, 0x4f, 0x3b, 0x89, 0xfc, 0xb4, 0x35, 0x17, 0x7d, 0x3c, 0x90, 0x06, + 0xb0, 0x1a, 0xc2, 0xc2, 0x18, 0x47, 0x91, 0x18, 0x2f, 0xbe, 0xba, 0xb0, 0xfd, 0x45, 0xa8, 0xd0, + 0x6b, 0x7d, 0xff, 0x42, 0x12, 0x6b, 0x9f, 0x8e, 0x74, 0x5b, 0x1b, 0x6a, 0x86, 0x3b, 0xe1, 0x5a, + 0x72, 0x1d, 0x0a, 0xa6, 0xa5, 0xd9, 0x0a, 0xbb, 0xb5, 0xa5, 0xbd, 0x89, 0xff, 0x4d, 0xaa, 0x44, + 0x7a, 0x4b, 0xc9, 0xa2, 0xad, 0x88, 0xbd, 0x2f, 0xe1, 0x77, 0x52, 0xb0, 0x14, 0x9b, 0x02, 0x7d, + 0x17, 0x16, 0x87, 0x8a, 0xdb, 0x7f, 0x22, 0x7b, 0x2d, 0x05, 0x3b, 0xc6, 0xbb, 0x35, 0x5d, 0xf8, + 0x18, 0xf9, 0xf6, 0x03, 0x42, 0x1b, 0x7d, 0x54, 0x51, 0x1a, 0x86, 0x23, 0x48, 0x86, 0x15, 0xc6, + 0x5c, 0x7b, 0x6e, 0x91, 0x5c, 0x40, 0xbd, 0x8c, 0x65, 0x91, 0x9b, 0x73, 0xce, 0x10, 0xd1, 0x01, + 0xe6, 0x29, 0x33, 0x31, 0xe4, 0xb5, 0xfe, 0x01, 0xf0, 0x49, 0x09, 0x4e, 0x75, 0x81, 0xfb, 0xbb, + 0x1c, 0x2c, 0xb7, 0x4d, 0xb5, 0xab, 0x0d, 0xad, 0x81, 0xe2, 0xb2, 0xdd, 0xe8, 0xff, 0xf2, 0xad, + 0x80, 0xf0, 0xef, 0x1c, 0x94, 0xe3, 0xde, 0x4c, 0xec, 0xec, 0xbd, 0x14, 0x72, 0xa8, 0x3c, 0x59, + 0x1c, 0x7c, 0xa3, 0x2d, 0x58, 0x19, 0xea, 0x86, 0x77, 0xf7, 0xe0, 0x68, 0x24, 0x20, 0x1d, 0xef, + 0x84, 0x6d, 0x79, 0xa8, 0x1b, 0xf4, 0x3a, 0xa1, 0xc3, 0x86, 0x51, 0x0d, 0x0a, 0x91, 0x5b, 0x7e, + 0x6e, 0x76, 0xa4, 0xc7, 0x6d, 0x10, 0x10, 0x22, 0x11, 0x0a, 0xae, 0xa7, 0x2c, 0x2f, 0xac, 0xae, + 0xcf, 0x5c, 0x5a, 0x54, 0xb3, 0x38, 0x20, 0x15, 0xfe, 0x36, 0x05, 0x7c, 0x32, 0xe8, 0x66, 0x2e, + 0xf4, 0x5d, 0x38, 0xbb, 0x3f, 0x1a, 0x0c, 0x0e, 0x99, 0x9b, 0x6a, 0xaa, 0x1c, 0x60, 0xb2, 0xab, + 0x80, 0x35, 0x0a, 0x6d, 0x30, 0x20, 0xf6, 0xa9, 0xae, 0x42, 0x99, 0xa9, 0x26, 0xc0, 0x66, 0xba, + 0x59, 0xa2, 0xa3, 0x01, 0xda, 0xdb, 0x80, 0x94, 0x67, 0x8a, 0x3e, 0x50, 0xf6, 0x06, 0x5a, 0x88, + 0x9a, 0xa5, 0xa8, 0x2b, 0x01, 0x24, 0x40, 0xbf, 0x01, 0xab, 0xe6, 0x9e, 0xa3, 0xd9, 0xcf, 0x34, + 0x55, 0x3e, 0xd0, 0x0c, 0x12, 0x72, 0xba, 0x69, 0xb0, 0x8d, 0x04, 0x23, 0x1f, 0x74, 0x37, 0x80, + 0xa0, 0x07, 0xb1, 0x2c, 0x9b, 0xa3, 0xfe, 0xff, 0xf6, 0x3c, 0xd9, 0x68, 0x72, 0xae, 0xfd, 0x7e, + 0x36, 0xaa, 0xbc, 0x9f, 0xe2, 0xbd, 0x30, 0xd6, 0x22, 0x2e, 0x26, 0x5b, 0xc4, 0xa8, 0x3b, 0x64, + 0xe7, 0x76, 0x87, 0xdc, 0xa9, 0xdc, 0x21, 0x3f, 0xbf, 0x3b, 0x14, 0x4e, 0xe9, 0x0e, 0x45, 0x8a, + 0x3f, 0xc9, 0x1d, 0xde, 0x06, 0x64, 0x6b, 0x9f, 0x8e, 0x34, 0xc7, 0x8d, 0x0a, 0xbe, 0xc4, 0xf8, + 0x07, 0x90, 0x80, 0x7f, 0xdc, 0x7b, 0xe0, 0x25, 0xbd, 0x67, 0xe2, 0x29, 0x51, 0xe9, 0x65, 0x4f, + 0x89, 0xc8, 0xf6, 0x5f, 0xd7, 0xac, 0x81, 0x79, 0x48, 0x37, 0xab, 0xff, 0xe5, 0xed, 0x3f, 0x9c, + 0xf9, 0xc5, 0xb6, 0xff, 0x08, 0x7d, 0x7c, 0x43, 0xfe, 0x8f, 0x14, 0xac, 0x86, 0xc0, 0x70, 0xff, + 0x17, 0x63, 0x35, 0xfe, 0x3b, 0xf3, 0x70, 0xfe, 0x6a, 0x2a, 0x7d, 0x54, 0x83, 0x55, 0xfa, 0x28, + 0x65, 0x44, 0xb3, 0x00, 0x0d, 0xc5, 0x44, 0x20, 0x37, 0x14, 0xc7, 0xcb, 0x11, 0x24, 0xf4, 0x48, + 0x20, 0x0f, 0xe2, 0x23, 0x0e, 0x6a, 0xc1, 0x39, 0xf6, 0xb2, 0xc5, 0x56, 0x0c, 0x47, 0x0f, 0x9e, + 0x68, 0x86, 0xe1, 0x5c, 0x19, 0x1f, 0x6d, 0xae, 0x11, 0x46, 0xdd, 0x00, 0xc3, 0x63, 0xb6, 0x36, + 0x38, 0x3e, 0xea, 0x44, 0x0e, 0xa9, 0xb2, 0xb1, 0x43, 0xaa, 0xa9, 0x6f, 0x7f, 0x84, 0xdf, 0x4e, + 0x03, 0x9f, 0x34, 0xc3, 0xb4, 0xc8, 0xe2, 0xa6, 0x26, 0xda, 0x68, 0xca, 0x48, 0x25, 0x52, 0xc6, + 0x75, 0xe0, 0x99, 0x92, 0x22, 0x31, 0xc7, 0x2e, 0xa9, 0x96, 0xbd, 0xf1, 0xaf, 0x78, 0xdb, 0x78, + 0x07, 0xd6, 0x46, 0xc6, 0x04, 0x02, 0x96, 0xb1, 0x56, 0x23, 0xb0, 0x29, 0xa1, 0x9f, 0x3f, 0x29, + 0xf4, 0x27, 0x78, 0x5b, 0x2c, 0xf4, 0xe9, 0x39, 0xff, 0x60, 0xa0, 0x93, 0xda, 0x29, 0xf2, 0x94, + 0x2a, 0x8b, 0xcb, 0xc1, 0x30, 0x7b, 0x4c, 0xf5, 0x37, 0x69, 0x28, 0xc7, 0x83, 0x6a, 0xe6, 0xe6, + 0xfc, 0x1a, 0x55, 0x16, 0x68, 0x17, 0x0a, 0x8e, 0x6b, 0x2b, 0xae, 0x76, 0x70, 0xe8, 0xbd, 0x46, + 0xf8, 0xfa, 0x7c, 0x81, 0xcf, 0x68, 0x70, 0x40, 0x3d, 0xb9, 0xb6, 0xca, 0x4e, 0xae, 0xad, 0xde, + 0x85, 0xb3, 0xb6, 0xf6, 0x8c, 0x29, 0xf6, 0x89, 0xee, 0xb8, 0xa6, 0x7d, 0x28, 0x0f, 0xf4, 0xa1, + 0xee, 0xfa, 0xfb, 0x91, 0x0f, 0xdd, 0x65, 0xc0, 0x06, 0x81, 0x91, 0x30, 0xb1, 0x94, 0x91, 0xa3, + 0xb1, 0x2b, 0xab, 0x02, 0xf6, 0xbe, 0xd0, 0x7b, 0x70, 0xde, 0xb2, 0xcd, 0x03, 0x52, 0xe5, 0xca, + 0xaa, 0xa6, 0xd0, 0xe3, 0xa9, 0x40, 0x02, 0xb6, 0xaf, 0x9c, 0xf3, 0x11, 0xea, 0x1e, 0xdc, 0x93, + 0x44, 0xf8, 0x21, 0x07, 0xe8, 0xf8, 0xb2, 0x50, 0x3d, 0x96, 0xb1, 0xfe, 0xff, 0x69, 0x54, 0x12, + 0x49, 0x58, 0x1f, 0x43, 0xd9, 0x26, 0x9e, 0x62, 0x1c, 0x78, 0x09, 0xc7, 0x33, 0xf7, 0x8c, 0x0c, + 0x88, 0x19, 0x3e, 0xcb, 0x37, 0x21, 0x73, 0xbc, 0x64, 0x47, 0x01, 0x82, 0x0c, 0xe7, 0xa6, 0x60, + 0x12, 0xaf, 0x1d, 0x2a, 0xcf, 0xe5, 0x48, 0x7c, 0x78, 0xb5, 0x7d, 0x79, 0xa8, 0x3c, 0xef, 0x85, + 0xa3, 0xe8, 0x02, 0x14, 0x09, 0xa2, 0x33, 0xb2, 0x0f, 0x82, 0x47, 0x2c, 0x43, 0xe5, 0x79, 0x87, + 0x7c, 0x0b, 0x5f, 0x66, 0xa2, 0x09, 0xe6, 0x67, 0xa5, 0x68, 0x3a, 0x76, 0x91, 0x31, 0x25, 0x65, + 0xe6, 0xa6, 0x16, 0x23, 0xd1, 0xb8, 0xce, 0xcf, 0x91, 0x32, 0x0b, 0xf3, 0xa6, 0xcc, 0xe2, 0xfc, + 0x29, 0x13, 0x4e, 0x9b, 0x32, 0x4b, 0xd3, 0x53, 0xe6, 0x4b, 0x15, 0x57, 0x8b, 0x2f, 0x99, 0x61, + 0x85, 0x1f, 0x65, 0x49, 0xfb, 0xc6, 0x9e, 0xef, 0x78, 0x3e, 0x56, 0x07, 0xa0, 0x2f, 0x03, 0x58, + 0xbc, 0x70, 0x73, 0xbc, 0x00, 0x67, 0x84, 0xbb, 0x0b, 0xb8, 0x68, 0x05, 0x77, 0xd5, 0x8f, 0x80, + 0x0f, 0xaf, 0x77, 0x62, 0xb1, 0x37, 0xcf, 0x33, 0xc7, 0x80, 0x63, 0x78, 0x51, 0xe5, 0xf1, 0x6d, + 0x43, 0xd9, 0xfb, 0x33, 0x1a, 0x9f, 0x6b, 0xfa, 0xa4, 0x04, 0x1e, 0xbb, 0x15, 0xda, 0x5d, 0xc0, + 0x4b, 0x4e, 0xec, 0x9a, 0xe8, 0x11, 0xf0, 0x81, 0x3b, 0xfa, 0x3c, 0x73, 0x27, 0x49, 0x9a, 0xb8, + 0xe1, 0x20, 0x92, 0x1a, 0x89, 0x4b, 0x8f, 0xbb, 0x50, 0xa2, 0xf7, 0xb4, 0x1e, 0xcb, 0xfc, 0x3c, + 0x67, 0xce, 0x01, 0x37, 0x30, 0xc2, 0x53, 0xc3, 0x4f, 0x88, 0x87, 0x50, 0xf3, 0xcb, 0x8e, 0xe6, + 0x57, 0x4e, 0xd4, 0x07, 0xe7, 0x3c, 0x23, 0x0a, 0xb8, 0xf2, 0x76, 0xb2, 0x0b, 0x7b, 0x0c, 0x2b, + 0x6a, 0xe0, 0x22, 0x3e, 0xeb, 0xd2, 0xfc, 0xf5, 0x67, 0xc8, 0x5a, 0x4d, 0xe6, 0xaa, 0xab, 0x50, + 0xf6, 0x8a, 0x3c, 0xff, 0xcf, 0x76, 0xd8, 0x33, 0xe8, 0x25, 0x36, 0xea, 0xff, 0xd1, 0x0e, 0x7d, + 0x1f, 0xaf, 0x3d, 0x93, 0x13, 0xb8, 0x45, 0x8a, 0xbb, 0x42, 0x40, 0xbd, 0x28, 0xfe, 0x4e, 0x01, + 0x72, 0x0c, 0xf5, 0x5e, 0xa6, 0x90, 0xe1, 0xb3, 0xf7, 0x32, 0x85, 0x2c, 0x9f, 0x13, 0xfe, 0x8a, + 0x83, 0xf3, 0x0f, 0x74, 0xc7, 0xd1, 0x8d, 0x83, 0xfb, 0xb7, 0x9c, 0xa0, 0x36, 0x67, 0xe1, 0x43, + 0x72, 0x46, 0xb0, 0xdf, 0xb3, 0x54, 0x1c, 0x6e, 0xe3, 0xdb, 0xb0, 0xba, 0x6f, 0x9b, 0xc3, 0xe4, + 0xfc, 0xac, 0x39, 0x5e, 0x21, 0xa0, 0xd8, 0xfc, 0x64, 0x97, 0x75, 0xcd, 0x24, 0x36, 0xbd, 0x0d, + 0xc1, 0xcb, 0xae, 0x19, 0xc7, 0xbd, 0x04, 0x8b, 0xfd, 0x91, 0xe3, 0x9a, 0x43, 0xd9, 0x35, 0x2d, + 0xbd, 0xef, 0x5d, 0xe0, 0x94, 0xd8, 0x58, 0x97, 0x0c, 0x09, 0xff, 0xc4, 0xc1, 0xfa, 0x24, 0xc1, + 0x1d, 0xcb, 0x34, 0x1c, 0x92, 0xc1, 0xf3, 0x6c, 0x2a, 0xff, 0xa0, 0x6b, 0xe6, 0xa1, 0x62, 0x34, + 0x8e, 0xb1, 0x4f, 0x48, 0x7b, 0x4f, 0xfa, 0x84, 0xdc, 0x13, 0x3a, 0xdc, 0x96, 0x98, 0xd8, 0x6b, + 0x14, 0xca, 0xa8, 0xaa, 0xc1, 0xe6, 0x74, 0x13, 0xce, 0x44, 0x0b, 0xf5, 0x90, 0x88, 0x69, 0x66, + 0x35, 0x2c, 0xca, 0x03, 0x9a, 0xad, 0x47, 0x10, 0xfe, 0xd1, 0x06, 0x2a, 0x41, 0xbe, 0x2e, 0xde, + 0xa9, 0xf6, 0x1a, 0x5d, 0x7e, 0x01, 0x15, 0x20, 0xd3, 0x6c, 0x35, 0x45, 0x9e, 0x43, 0x2b, 0xb0, + 0x54, 0x6b, 0xf4, 0x3a, 0x5d, 0x11, 0xcb, 0x77, 0x24, 0xdc, 0xe9, 0xf2, 0x29, 0xb4, 0x09, 0x17, + 0x62, 0x43, 0xf2, 0x47, 0x52, 0x77, 0x57, 0xde, 0x6d, 0x75, 0xba, 0x72, 0x53, 0xec, 0xf2, 0xe9, + 0xad, 0x3d, 0x28, 0xf8, 0xaf, 0x29, 0x08, 0x7d, 0x7b, 0xb7, 0xda, 0x11, 0xe5, 0x5e, 0xf3, 0x7e, + 0xb3, 0xf5, 0x51, 0x93, 0x5f, 0x20, 0x33, 0xb5, 0xc5, 0x66, 0x5d, 0x6a, 0xde, 0xe5, 0x39, 0xf2, + 0x81, 0x7b, 0xcd, 0x26, 0xf9, 0x48, 0xa1, 0x25, 0x28, 0x76, 0x7a, 0xb5, 0x9a, 0x28, 0xd6, 0xc5, + 0x3a, 0x9f, 0x46, 0x00, 0xb9, 0x3b, 0x55, 0xa9, 0x21, 0xd6, 0xf9, 0x0c, 0x2a, 0x03, 0x74, 0x45, + 0xfc, 0x40, 0x6a, 0x56, 0xbb, 0x62, 0x9d, 0xcf, 0x6e, 0xd9, 0x50, 0x8a, 0xbc, 0xff, 0x40, 0x67, + 0x60, 0xe5, 0x61, 0xab, 0x23, 0xd7, 0x1a, 0xd5, 0x4e, 0x27, 0x32, 0x55, 0x05, 0xd6, 0xc2, 0xe1, + 0xbb, 0xbd, 0x2a, 0xae, 0x36, 0xbb, 0xa2, 0x58, 0xe7, 0x39, 0x74, 0x0e, 0x56, 0x43, 0xc8, 0x4e, + 0x0f, 0x77, 0xba, 0xd5, 0x9d, 0x86, 0xc8, 0xa7, 0xd0, 0x79, 0x38, 0x13, 0x01, 0x88, 0x9d, 0xae, + 0x2c, 0xde, 0xb9, 0xd3, 0xc2, 0x64, 0x5d, 0xbf, 0xc1, 0x41, 0x39, 0x7e, 0xb1, 0x8e, 0x2e, 0xc0, + 0xb9, 0x5a, 0xab, 0xd9, 0xad, 0x4a, 0x4d, 0x11, 0xcb, 0x9d, 0x6e, 0xb5, 0x1b, 0x5d, 0xe8, 0x04, + 0xa0, 0xbf, 0x56, 0x0e, 0x6d, 0xc0, 0x7a, 0x12, 0x18, 0x59, 0x60, 0x6a, 0x12, 0xf1, 0x47, 0x55, + 0xa9, 0x4b, 0x88, 0xd3, 0x5b, 0xbf, 0x02, 0x7c, 0xf2, 0x91, 0x35, 0xe2, 0x61, 0xb1, 0xfb, 0xb8, + 0x1d, 0x9d, 0x9f, 0xe8, 0xbe, 0x55, 0x97, 0x3b, 0xb5, 0x5d, 0xb1, 0xde, 0x6b, 0xd0, 0x65, 0x17, + 0x21, 0x8b, 0xc5, 0x6a, 0xfd, 0x31, 0x9f, 0x42, 0xcb, 0x50, 0x92, 0x9a, 0x52, 0x57, 0xaa, 0x36, + 0xa4, 0x4f, 0xa8, 0xba, 0x57, 0x60, 0xa9, 0xd7, 0xf4, 0x90, 0xa9, 0x32, 0x32, 0x68, 0x0d, 0xf8, + 0x40, 0x88, 0x8e, 0xcc, 0x28, 0xb3, 0x5b, 0x55, 0x80, 0xf0, 0x6d, 0x1e, 0xd1, 0xa4, 0xd4, 0x96, + 0xdb, 0xb8, 0xd5, 0x6d, 0xd5, 0x5a, 0x8d, 0xc8, 0xf4, 0x79, 0x48, 0x77, 0x6b, 0x6d, 0x9e, 0x23, + 0x3f, 0x7a, 0xf5, 0x36, 0x9f, 0x22, 0x6e, 0xd5, 0xa9, 0x75, 0xdb, 0x7c, 0x7a, 0x6b, 0x10, 0xbc, + 0x15, 0xec, 0xb2, 0x0b, 0xb0, 0xb5, 0x8e, 0x88, 0x1f, 0x49, 0x35, 0x51, 0x3e, 0xbe, 0x06, 0xf1, + 0xe3, 0xae, 0x88, 0x9b, 0xd5, 0x86, 0xdc, 0xac, 0x3e, 0x20, 0x2e, 0x59, 0x06, 0xf0, 0xfd, 0x4f, + 0x6a, 0x33, 0xaf, 0x69, 0xb6, 0xea, 0xa2, 0xdc, 0xa6, 0x56, 0x22, 0x14, 0x8d, 0x56, 0xb5, 0x2e, + 0xef, 0x54, 0x1b, 0xd5, 0x66, 0x4d, 0xc4, 0x7c, 0x66, 0x4b, 0x85, 0xf3, 0x53, 0x9f, 0x33, 0x12, + 0x77, 0xee, 0xe2, 0xea, 0x9d, 0x3b, 0x52, 0x4d, 0x6e, 0xb7, 0x1a, 0x52, 0xed, 0xf1, 0x04, 0x11, + 0x7c, 0x84, 0x46, 0xab, 0x56, 0x6d, 0xf0, 0x1c, 0x5a, 0x85, 0x65, 0x7f, 0xc8, 0x13, 0x85, 0x4f, + 0x6d, 0xfd, 0x6a, 0xe4, 0xa1, 0x21, 0xe5, 0xbc, 0x0e, 0x67, 0x43, 0x13, 0x26, 0x98, 0x9e, 0x87, + 0x33, 0x09, 0x58, 0xbd, 0x55, 0xbb, 0x2f, 0x62, 0xe6, 0x9a, 0x09, 0x50, 0x0d, 0x4b, 0x2d, 0x3e, + 0x85, 0xbe, 0x06, 0xe7, 0x93, 0x00, 0xff, 0xb3, 0xce, 0xa7, 0xb7, 0x0c, 0x28, 0x06, 0x77, 0x3a, + 0xe8, 0x2c, 0x20, 0xa6, 0x94, 0x44, 0xf0, 0xc5, 0xc7, 0xc3, 0x38, 0x8c, 0x8f, 0x87, 0x21, 0x79, + 0x1e, 0xce, 0x44, 0xc6, 0x23, 0x1e, 0x9a, 0xde, 0xfa, 0x17, 0x0e, 0x96, 0x13, 0xf7, 0x99, 0x64, + 0xc9, 0x14, 0xbd, 0x5a, 0xaf, 0x1f, 0x5b, 0xf2, 0x05, 0x38, 0x97, 0x80, 0x91, 0x9c, 0xe1, 0x19, + 0x75, 0x03, 0xd6, 0x13, 0xc0, 0xc0, 0xec, 0xd4, 0xc8, 0xc7, 0xe1, 0x52, 0x33, 0x84, 0xa7, 0x89, + 0x15, 0xa7, 0xd1, 0xd7, 0x9b, 0x1d, 0x3e, 0x33, 0x01, 0x21, 0x60, 0x40, 0x10, 0xb2, 0x5b, 0xfb, + 0xf4, 0x21, 0x52, 0xf4, 0x14, 0x04, 0xbd, 0x01, 0x95, 0x5a, 0xab, 0x59, 0x97, 0xba, 0x52, 0xab, + 0x49, 0x63, 0xb0, 0xd7, 0x39, 0x66, 0xc2, 0x38, 0xb4, 0x8b, 0x7b, 0x64, 0x35, 0xcc, 0xf2, 0x71, + 0xd0, 0x9d, 0x6a, 0xa3, 0x23, 0xf2, 0xa9, 0xad, 0xcf, 0x39, 0xf6, 0x67, 0x61, 0xf1, 0xe8, 0xf5, + 0x15, 0x17, 0x92, 0xc5, 0xb2, 0x58, 0x02, 0xc6, 0x22, 0x91, 0x43, 0x02, 0x6c, 0x24, 0x20, 0x0f, + 0xc4, 0x07, 0x2d, 0xfc, 0x58, 0x6e, 0x63, 0xb1, 0xd3, 0xe9, 0x61, 0x92, 0xd0, 0x2e, 0xc2, 0x1b, + 0x09, 0x9c, 0xba, 0xd4, 0xb9, 0x1f, 0x62, 0x84, 0xba, 0x0b, 0x31, 0xda, 0x52, 0x3d, 0x44, 0xc8, + 0xa0, 0x37, 0x41, 0x48, 0x20, 0x34, 0xc5, 0xee, 0x47, 0x2d, 0x7c, 0x5f, 0xee, 0x35, 0xab, 0x8f, + 0xaa, 0x12, 0x4b, 0x17, 0xd9, 0xad, 0x1f, 0x72, 0x70, 0x6e, 0xca, 0x91, 0x14, 0xba, 0x0a, 0x97, + 0xea, 0x62, 0xbb, 0xd1, 0x7a, 0xfc, 0x40, 0x6c, 0x76, 0x23, 0x9c, 0x12, 0x4e, 0x22, 0xc0, 0xc6, + 0x44, 0xb4, 0x70, 0x1a, 0x0e, 0x5d, 0x81, 0x8b, 0x13, 0x71, 0xda, 0xb8, 0x75, 0x97, 0x08, 0xcd, + 0x3c, 0xf7, 0x1a, 0x5c, 0x99, 0x88, 0x85, 0xc5, 0x76, 0x43, 0xaa, 0x55, 0x65, 0xb2, 0xb5, 0xd0, + 0xf5, 0x6f, 0xfd, 0x3a, 0x07, 0x67, 0x27, 0xf7, 0xa5, 0x44, 0x35, 0x11, 0x26, 0x9d, 0x2e, 0xae, + 0x76, 0xc5, 0xbb, 0x8f, 0x23, 0xf2, 0x5e, 0x84, 0x37, 0x26, 0x21, 0x60, 0xb1, 0x86, 0xc5, 0x6a, + 0x97, 0x48, 0xfb, 0x26, 0x08, 0x13, 0x31, 0x5a, 0x8d, 0x86, 0xd4, 0xbc, 0x2b, 0xf7, 0xda, 0x75, + 0x82, 0x97, 0xda, 0xf9, 0xce, 0x67, 0x5f, 0x6c, 0x2c, 0x7c, 0xfe, 0xc5, 0xc6, 0xc2, 0x4f, 0xbe, + 0xd8, 0xe0, 0x7e, 0x6d, 0xbc, 0xc1, 0xfd, 0xf9, 0x78, 0x83, 0xfb, 0xc7, 0xf1, 0x06, 0xf7, 0xd9, + 0x78, 0x83, 0xfb, 0xb7, 0xf1, 0x06, 0xf7, 0x9f, 0xe3, 0x8d, 0x85, 0x9f, 0x8c, 0x37, 0xb8, 0xef, + 0x7f, 0xb9, 0xb1, 0xf0, 0xd9, 0x97, 0x1b, 0x0b, 0x9f, 0x7f, 0xb9, 0xb1, 0xf0, 0x09, 0x84, 0x15, + 0xc5, 0x5e, 0x8e, 0xbe, 0x92, 0xfe, 0xc6, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x99, 0x8c, 0x0d, + 0x45, 0x1c, 0x40, 0x00, 0x00, } func (x DNSPolicy) String() string { diff --git a/src/shared/k8s/metadatapb/metadata.proto b/src/shared/k8s/metadatapb/metadata.proto index 7a835b6717d..b39a8ae80ab 100644 --- a/src/shared/k8s/metadatapb/metadata.proto +++ b/src/shared/k8s/metadatapb/metadata.proto @@ -22,7 +22,7 @@ package px.shared.k8s.metadatapb; option go_package = "metadatapb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "src/shared/types/typespb/types.proto"; diff --git a/src/shared/k8s/proto_utils_test.go b/src/shared/k8s/proto_utils_test.go index dedb796dbb7..e94f0c7ead4 100644 --- a/src/shared/k8s/proto_utils_test.go +++ b/src/shared/k8s/proto_utils_test.go @@ -21,14 +21,13 @@ package k8s_test import ( "testing" - "k8s.io/apimachinery/pkg/util/intstr" - "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/assert" apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/intstr" "px.dev/pixie/src/shared/k8s" "px.dev/pixie/src/shared/k8s/metadatapb" @@ -1647,10 +1646,11 @@ func TestReplicaSetToProto(t *testing.T) { }, } - selector := metav1.LabelSelector{MatchLabels: map[string]string{ - "env": "prod", - "managed": "helm", - }, + selector := metav1.LabelSelector{ + MatchLabels: map[string]string{ + "env": "prod", + "managed": "helm", + }, MatchExpressions: []metav1.LabelSelectorRequirement{ { Key: "app", @@ -1744,7 +1744,8 @@ func TestDeploymentToProto(t *testing.T) { { Kind: "Pod", Name: "pod", - UID: "1234"}, + UID: "1234", + }, }, Labels: map[string]string{ "env": "prod", diff --git a/src/shared/metadatapb/BUILD.bazel b/src/shared/metadatapb/BUILD.bazel index eedbd59526c..e406b652807 100644 --- a/src/shared/metadatapb/BUILD.bazel +++ b/src/shared/metadatapb/BUILD.bazel @@ -21,7 +21,7 @@ pl_proto_library( srcs = ["metadata.proto"], visibility = ["//src:__subpackages__"], deps = [ - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -30,7 +30,7 @@ pl_cc_proto_library( proto = ":metadata_pl_proto", visibility = ["//src:__subpackages__"], deps = [ - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/shared/scriptspb/BUILD.bazel b/src/shared/scriptspb/BUILD.bazel index 38af58e3043..bbca699651f 100644 --- a/src/shared/scriptspb/BUILD.bazel +++ b/src/shared/scriptspb/BUILD.bazel @@ -23,7 +23,7 @@ pl_proto_library( deps = [ "//src/common/base/statuspb:status_pl_proto", "//src/shared/types/typespb:types_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -34,7 +34,7 @@ pl_cc_proto_library( deps = [ "//src/common/base/statuspb:status_pl_cc_proto", "//src/shared/types/typespb/wrapper:cc_library", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/shared/services/events/track.go b/src/shared/services/events/track.go index 1fb09ba857d..0a45254ce3f 100644 --- a/src/shared/services/events/track.go +++ b/src/shared/services/events/track.go @@ -34,8 +34,10 @@ func init() { pflag.String("segment_write_key", "", "The key to use for segment") } -var client analytics.Client -var once sync.Once +var ( + client analytics.Client + once sync.Once +) type dummyClient struct{} diff --git a/src/shared/services/jwtpb/BUILD.bazel b/src/shared/services/jwtpb/BUILD.bazel index b0a4c346064..862d9f93403 100644 --- a/src/shared/services/jwtpb/BUILD.bazel +++ b/src/shared/services/jwtpb/BUILD.bazel @@ -22,7 +22,7 @@ pl_proto_library( visibility = ["//src:__subpackages__"], deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/shared/services/jwtpb/jwt.pb.go b/src/shared/services/jwtpb/jwt.pb.go index ad8f3979724..34af030b4a2 100755 --- a/src/shared/services/jwtpb/jwt.pb.go +++ b/src/shared/services/jwtpb/jwt.pb.go @@ -353,45 +353,44 @@ func init() { } var fileDescriptor_33e330850bad81da = []byte{ - // 598 bytes of a gzipped FileDescriptorProto + // 585 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x93, 0x4f, 0x6f, 0xd3, 0x3e, 0x18, 0xc7, 0xe3, 0xe5, 0xd7, 0xb4, 0x71, 0xb5, 0xfd, 0x90, 0x35, 0xa1, 0x68, 0x48, 0x4e, 0xd9, - 0x10, 0x2a, 0x87, 0xb5, 0x12, 0x9c, 0x60, 0xa7, 0x75, 0x3b, 0xd0, 0x49, 0x08, 0x64, 0x86, 0x90, - 0xb8, 0x54, 0xf9, 0xe3, 0x75, 0xae, 0xda, 0x3a, 0x8a, 0x1d, 0xe8, 0x91, 0x97, 0xc0, 0xcb, 0xe0, - 0x3d, 0xf0, 0x06, 0x38, 0xf6, 0xb8, 0x53, 0x44, 0xd3, 0x0b, 0xea, 0x69, 0xaf, 0x00, 0x21, 0x3b, - 0xff, 0xd6, 0x71, 0x49, 0x9e, 0xaf, 0xfd, 0x7d, 0x3e, 0x7d, 0xf2, 0xad, 0x0d, 0x8f, 0x44, 0x1c, - 0xf4, 0xc5, 0xb5, 0x17, 0xd3, 0xb0, 0x2f, 0x68, 0xfc, 0x99, 0x05, 0x54, 0xf4, 0x27, 0x5f, 0x64, - 0xe4, 0xab, 0x67, 0x2f, 0x8a, 0xb9, 0xe4, 0xc8, 0x8e, 0x16, 0xbd, 0x80, 0xcf, 0x66, 0x7c, 0x7e, - 0x70, 0x3c, 0x66, 0xf2, 0x3a, 0xf1, 0x95, 0xec, 0x8f, 0xf9, 0x98, 0xf7, 0xb5, 0xc3, 0x4f, 0xae, - 0xb4, 0xd2, 0x42, 0x57, 0x79, 0xe7, 0xe1, 0x1f, 0x13, 0xda, 0x17, 0x1f, 0x2f, 0xcf, 0xa6, 0x1e, - 0x9b, 0x09, 0x74, 0x04, 0x5b, 0x5e, 0x12, 0x32, 0x3a, 0x0f, 0xa8, 0x03, 0x3a, 0xa0, 0x6b, 0x0f, - 0x9a, 0x9b, 0xd4, 0x35, 0xbd, 0x24, 0x24, 0xd5, 0x06, 0x7a, 0x0a, 0x21, 0x5d, 0x44, 0x2c, 0xa6, - 0x62, 0xe4, 0x49, 0x67, 0xa7, 0x03, 0xba, 0x66, 0x6e, 0xa3, 0x8b, 0x88, 0xd8, 0xc5, 0xd6, 0xa9, - 0x44, 0x1d, 0x68, 0x4e, 0x24, 0x73, 0x4c, 0xcd, 0xd9, 0xcb, 0x52, 0xd7, 0xbc, 0xb8, 0x1c, 0x2a, - 0xdf, 0x44, 0x32, 0xa2, 0x1e, 0xe8, 0x09, 0xb4, 0x99, 0x10, 0x09, 0x0d, 0x15, 0xe8, 0xbf, 0x1a, - 0xc4, 0x3c, 0x49, 0x5a, 0xf9, 0xce, 0xa9, 0x44, 0x2e, 0xb4, 0x74, 0x1d, 0x3b, 0x8d, 0x7a, 0x24, - 0x26, 0x04, 0x29, 0x96, 0xd5, 0x40, 0x73, 0x2e, 0x47, 0x3e, 0xbd, 0xe2, 0x31, 0x75, 0xac, 0x9a, - 0x33, 0xf7, 0xaf, 0x88, 0x3d, 0xe7, 0x72, 0xa0, 0x77, 0xd0, 0x63, 0xd8, 0x14, 0x89, 0x3f, 0xa1, - 0x81, 0x74, 0x9a, 0x35, 0x49, 0x24, 0x3e, 0x29, 0xd7, 0xd1, 0x43, 0x68, 0x89, 0x80, 0x47, 0x54, - 0x38, 0xad, 0x8e, 0xd9, 0xb5, 0x49, 0xa1, 0xd0, 0x09, 0x6c, 0x27, 0x82, 0xc6, 0xa3, 0x40, 0xe7, - 0xe4, 0xd8, 0x1d, 0xd0, 0x6d, 0x3f, 0x77, 0x7a, 0x55, 0xec, 0xbd, 0x0f, 0x82, 0xc6, 0x55, 0x8e, - 0xaf, 0x0d, 0x02, 0x95, 0xbd, 0x48, 0xf5, 0x1c, 0xee, 0x15, 0xff, 0x5c, 0xd9, 0x0f, 0x75, 0xff, - 0xa3, 0x3b, 0xfd, 0xef, 0x73, 0xc3, 0x5d, 0xc4, 0x6e, 0xd1, 0x54, 0x53, 0x82, 0x69, 0x22, 0x64, - 0x3d, 0x45, 0xfb, 0x1f, 0xca, 0x59, 0x6e, 0xd8, 0xa2, 0x14, 0x4d, 0xf9, 0xc2, 0xe0, 0x7f, 0xb8, - 0x1b, 0x24, 0x42, 0xf2, 0x59, 0x01, 0x39, 0xfc, 0x01, 0xe0, 0xee, 0xd6, 0xf0, 0xe8, 0x18, 0x36, - 0xf5, 0xb7, 0xb2, 0xb0, 0x38, 0x03, 0xfb, 0x59, 0xea, 0x5a, 0xca, 0x33, 0x3c, 0xdf, 0xa4, 0xae, - 0x95, 0xe8, 0x8a, 0xe4, 0xef, 0x10, 0x3d, 0x83, 0x16, 0x8f, 0xc7, 0xca, 0xbd, 0xa3, 0xdd, 0x28, - 0x4b, 0xdd, 0xc6, 0xdb, 0x78, 0xac, 0xcd, 0x0d, 0xae, 0x0a, 0xa2, 0x5f, 0x21, 0xda, 0x87, 0x0d, - 0x3a, 0xf3, 0xd8, 0x34, 0x3f, 0x13, 0x24, 0x17, 0xe8, 0x15, 0x6c, 0x33, 0x31, 0xf2, 0x22, 0x36, - 0x52, 0x44, 0x7d, 0x0e, 0x5a, 0x83, 0x83, 0x2c, 0x75, 0xed, 0xa1, 0x38, 0x7d, 0x37, 0x54, 0x3f, - 0xbc, 0x49, 0x5d, 0x9b, 0x95, 0x82, 0xa8, 0x32, 0x62, 0xaa, 0x3c, 0x7c, 0x03, 0x1f, 0xdc, 0x4f, - 0x0e, 0xbd, 0x84, 0xb0, 0x8c, 0xbb, 0xfa, 0x04, 0x8d, 0x2b, 0x9c, 0x7a, 0x30, 0x5b, 0x94, 0x82, - 0x54, 0x65, 0xa8, 0x70, 0xf7, 0x23, 0x54, 0xb8, 0x32, 0xf7, 0x6d, 0x5c, 0xe1, 0xcc, 0x71, 0x41, - 0x29, 0x48, 0x55, 0x86, 0x83, 0x93, 0xe5, 0x0a, 0x1b, 0x37, 0x2b, 0x6c, 0xdc, 0xae, 0x30, 0xf8, - 0x9a, 0x61, 0xf0, 0x3d, 0xc3, 0xe0, 0x67, 0x86, 0xc1, 0x32, 0xc3, 0xe0, 0x57, 0x86, 0xc1, 0xef, - 0x0c, 0x1b, 0xb7, 0x19, 0x06, 0xdf, 0xd6, 0xd8, 0x58, 0xae, 0xb1, 0x71, 0xb3, 0xc6, 0xc6, 0xa7, - 0x86, 0xbe, 0xdd, 0xbe, 0xa5, 0x2f, 0xe8, 0x8b, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x51, 0xd9, - 0xda, 0x0b, 0x01, 0x04, 0x00, 0x00, + 0x10, 0x2a, 0x07, 0x5a, 0x09, 0x4e, 0xb0, 0x53, 0xbb, 0x1d, 0xe8, 0x24, 0x04, 0x32, 0x43, 0x48, + 0x5c, 0xaa, 0xfc, 0xf1, 0x8a, 0xab, 0xb6, 0x8e, 0x62, 0x07, 0x7a, 0xe4, 0x25, 0xf0, 0x32, 0x78, + 0x0f, 0xbc, 0x01, 0x8e, 0x3d, 0xee, 0x14, 0xd1, 0xf4, 0x82, 0x7a, 0xda, 0x2b, 0x40, 0xc8, 0xce, + 0xbf, 0x75, 0x5c, 0x92, 0xef, 0x63, 0x7f, 0x9f, 0x4f, 0x9f, 0x7c, 0x6b, 0xc3, 0x13, 0x11, 0x07, + 0x7d, 0xf1, 0xc9, 0x8b, 0x69, 0xd8, 0x17, 0x34, 0xfe, 0xcc, 0x02, 0x2a, 0xfa, 0xd3, 0x2f, 0x32, + 0xf2, 0xd5, 0xb3, 0x17, 0xc5, 0x5c, 0x72, 0x64, 0x47, 0xcb, 0x5e, 0xc0, 0xe7, 0x73, 0xbe, 0x38, + 0x3a, 0x9c, 0xf0, 0x09, 0xd7, 0xab, 0x7d, 0xa5, 0x72, 0xc3, 0xf1, 0x1f, 0x13, 0xda, 0x17, 0x1f, + 0x2e, 0xcf, 0x66, 0x1e, 0x9b, 0x0b, 0x74, 0x02, 0x5b, 0x5e, 0x12, 0x32, 0xba, 0x08, 0xa8, 0x03, + 0x3a, 0xa0, 0x6b, 0x0f, 0x9b, 0xdb, 0xd4, 0x35, 0xbd, 0x24, 0x24, 0xd5, 0x06, 0x7a, 0x0c, 0x21, + 0x5d, 0x46, 0x2c, 0xa6, 0x62, 0xec, 0x49, 0x67, 0xaf, 0x03, 0xba, 0x66, 0x6e, 0xa3, 0xcb, 0x88, + 0xd8, 0xc5, 0xd6, 0x40, 0xa2, 0x0e, 0x34, 0xa7, 0x92, 0x39, 0xa6, 0xe6, 0x1c, 0x64, 0xa9, 0x6b, + 0x5e, 0x5c, 0x8e, 0x94, 0x6f, 0x2a, 0x19, 0x51, 0x0f, 0xf4, 0x08, 0xda, 0x4c, 0x88, 0x84, 0x86, + 0x0a, 0xf4, 0x5f, 0x0d, 0x62, 0x9e, 0x24, 0xad, 0x7c, 0x67, 0x20, 0x91, 0x0b, 0x2d, 0xad, 0x63, + 0xa7, 0x51, 0x8f, 0xc4, 0x84, 0x20, 0xc5, 0xb2, 0x1a, 0x68, 0xc1, 0xe5, 0xd8, 0xa7, 0x57, 0x3c, + 0xa6, 0x8e, 0x55, 0x73, 0x16, 0xfe, 0x15, 0xb1, 0x17, 0x5c, 0x0e, 0xf5, 0x0e, 0x7a, 0x08, 0x9b, + 0x22, 0xf1, 0xa7, 0x34, 0x90, 0x4e, 0xb3, 0x26, 0x89, 0xc4, 0x27, 0xe5, 0x3a, 0xba, 0x0f, 0x2d, + 0x11, 0xf0, 0x88, 0x0a, 0xa7, 0xd5, 0x31, 0xbb, 0x36, 0x29, 0x2a, 0x74, 0x0a, 0xdb, 0x89, 0xa0, + 0xf1, 0x38, 0xd0, 0x39, 0x39, 0x76, 0x07, 0x74, 0xdb, 0xcf, 0x9c, 0x5e, 0x95, 0x6e, 0xef, 0xbd, + 0xa0, 0x71, 0x95, 0xe3, 0x2b, 0x83, 0x40, 0x65, 0x2f, 0x52, 0x3d, 0x87, 0x07, 0xc5, 0x1f, 0x54, + 0xf6, 0x43, 0xdd, 0xff, 0xe0, 0x56, 0xff, 0xbb, 0xdc, 0x70, 0x1b, 0xb1, 0x5f, 0x34, 0xd5, 0x94, + 0x60, 0x96, 0x08, 0x59, 0x4f, 0xd1, 0xfe, 0x87, 0x72, 0x96, 0x1b, 0x76, 0x28, 0x45, 0x53, 0xbe, + 0x30, 0xfc, 0x1f, 0xee, 0x07, 0x89, 0x90, 0x7c, 0x5e, 0x40, 0x8e, 0x7f, 0x00, 0xb8, 0xbf, 0x33, + 0x3c, 0x7a, 0x0a, 0x9b, 0xfa, 0x5b, 0x59, 0x58, 0x9c, 0x81, 0xc3, 0x2c, 0x75, 0x2d, 0xe5, 0x19, + 0x9d, 0x6f, 0x53, 0xd7, 0x4a, 0xb4, 0x22, 0xf9, 0x3b, 0x44, 0x4f, 0xa0, 0xc5, 0xe3, 0x89, 0x72, + 0xef, 0x69, 0x37, 0xca, 0x52, 0xb7, 0xf1, 0x26, 0x9e, 0x68, 0x73, 0x83, 0x2b, 0x41, 0xf4, 0x2b, + 0x44, 0x87, 0xb0, 0x41, 0xe7, 0x1e, 0x9b, 0xe5, 0x67, 0x82, 0xe4, 0x05, 0x7a, 0x09, 0xdb, 0x4c, + 0x8c, 0xbd, 0x88, 0x8d, 0x15, 0x51, 0x9f, 0x83, 0xd6, 0xf0, 0x28, 0x4b, 0x5d, 0x7b, 0x24, 0x06, + 0x6f, 0x47, 0xea, 0x87, 0xb7, 0xa9, 0x6b, 0xb3, 0xb2, 0x20, 0x4a, 0x46, 0x4c, 0xc9, 0xe3, 0xd7, + 0xf0, 0xde, 0xdd, 0xe4, 0xd0, 0x0b, 0x08, 0xcb, 0xb8, 0xab, 0x4f, 0xd0, 0xb8, 0xc2, 0xa9, 0x07, + 0xb3, 0x45, 0x59, 0x90, 0x4a, 0x86, 0x0a, 0x77, 0x37, 0x42, 0x85, 0x2b, 0x73, 0xdf, 0xc5, 0x15, + 0xce, 0x1c, 0x17, 0x94, 0x05, 0xa9, 0x64, 0x38, 0x3c, 0x5d, 0xad, 0xb1, 0x71, 0xbd, 0xc6, 0xc6, + 0xcd, 0x1a, 0x83, 0xaf, 0x19, 0x06, 0xdf, 0x33, 0x0c, 0x7e, 0x66, 0x18, 0xac, 0x32, 0x0c, 0x7e, + 0x65, 0x18, 0xfc, 0xce, 0xb0, 0x71, 0x93, 0x61, 0xf0, 0x6d, 0x83, 0x8d, 0xd5, 0x06, 0x1b, 0xd7, + 0x1b, 0x6c, 0x7c, 0x6c, 0xe8, 0x4b, 0xec, 0x5b, 0xfa, 0x82, 0x3e, 0xff, 0x1b, 0x00, 0x00, 0xff, + 0xff, 0x33, 0x6d, 0xf0, 0xc1, 0xe8, 0x03, 0x00, 0x00, } func (this *JWTClaims) Equal(that interface{}) bool { diff --git a/src/shared/services/jwtpb/jwt.proto b/src/shared/services/jwtpb/jwt.proto index 2f183cfbbed..f7441a9ebf9 100644 --- a/src/shared/services/jwtpb/jwt.proto +++ b/src/shared/services/jwtpb/jwt.proto @@ -22,7 +22,7 @@ package px.common; option go_package = "jwtpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; // Store the basic JWT claim information. message JWTClaims { diff --git a/src/shared/services/msgbus/jetstream.go b/src/shared/services/msgbus/jetstream.go index f12e58e948a..e4596077fc2 100644 --- a/src/shared/services/msgbus/jetstream.go +++ b/src/shared/services/msgbus/jetstream.go @@ -118,7 +118,6 @@ func (s *jetStreamStreamer) PersistentSubscribe(subject, persistentName string, nats.AckWait(s.ackWait), nats.DeliverAll(), ) - if err != nil { return nil, err } diff --git a/src/shared/services/msgbus/streamer.go b/src/shared/services/msgbus/streamer.go index 34c63db9d4b..dbdbacb7ed2 100644 --- a/src/shared/services/msgbus/streamer.go +++ b/src/shared/services/msgbus/streamer.go @@ -25,9 +25,11 @@ import ( ) // emptyQueueTimeout is the time we wait before we consider a queue to be empty. -const emptyQueueTimeout = 200 * time.Millisecond -const publishRetryInterval = 25 * time.Millisecond -const publishTimeout = 1 * time.Minute +const ( + emptyQueueTimeout = 200 * time.Millisecond + publishRetryInterval = 25 * time.Millisecond + publishTimeout = 1 * time.Minute +) // V2CDurableStream is the stream config for Durable v2c messages. var V2CDurableStream = &nats.StreamConfig{ diff --git a/src/shared/services/pg/pg.go b/src/shared/services/pg/pg.go index 775f7920891..20b1acf5ac7 100644 --- a/src/shared/services/pg/pg.go +++ b/src/shared/services/pg/pg.go @@ -34,8 +34,10 @@ import ( "github.com/spf13/viper" ) -const retryAttempts = 5 -const retryDelay = 1 * time.Second +const ( + retryAttempts = 5 + retryDelay = 1 * time.Second +) func init() { pflag.Uint32("postgres_port", 5432, "The port for postgres database") diff --git a/src/shared/services/sentryhook/hook.go b/src/shared/services/sentryhook/hook.go index 8e07a70c6d2..ea4ee78883b 100644 --- a/src/shared/services/sentryhook/hook.go +++ b/src/shared/services/sentryhook/hook.go @@ -26,17 +26,15 @@ import ( log "github.com/sirupsen/logrus" ) -var ( - levelMap = map[log.Level]sentry.Level{ - log.TraceLevel: sentry.LevelDebug, - log.DebugLevel: sentry.LevelDebug, - log.InfoLevel: sentry.LevelInfo, - log.WarnLevel: sentry.LevelWarning, - log.ErrorLevel: sentry.LevelError, - log.FatalLevel: sentry.LevelFatal, - log.PanicLevel: sentry.LevelFatal, - } -) +var levelMap = map[log.Level]sentry.Level{ + log.TraceLevel: sentry.LevelDebug, + log.DebugLevel: sentry.LevelDebug, + log.InfoLevel: sentry.LevelInfo, + log.WarnLevel: sentry.LevelWarning, + log.ErrorLevel: sentry.LevelError, + log.FatalLevel: sentry.LevelFatal, + log.PanicLevel: sentry.LevelFatal, +} // Converter converts log entry to sentry. type Converter func(entry *log.Entry, event *sentry.Event, hub *sentry.Hub) diff --git a/src/shared/services/server/grpc_server.go b/src/shared/services/server/grpc_server.go index 3f8257898d6..e2dd213e491 100644 --- a/src/shared/services/server/grpc_server.go +++ b/src/shared/services/server/grpc_server.go @@ -30,7 +30,6 @@ import ( log "github.com/sirupsen/logrus" "google.golang.org/grpc" "google.golang.org/grpc/codes" - // Enables gzip encoding for GRPC. _ "google.golang.org/grpc/encoding/gzip" "google.golang.org/grpc/status" diff --git a/src/shared/services/service_flags.go b/src/shared/services/service_flags.go index a5a88b2426a..26983703ca9 100644 --- a/src/shared/services/service_flags.go +++ b/src/shared/services/service_flags.go @@ -37,9 +37,7 @@ import ( version "px.dev/pixie/src/shared/goversion" ) -var ( - commonSetup sync.Once -) +var commonSetup sync.Once func init() { // Enable the k8s DNS resolver to lookup services. diff --git a/src/shared/services/testproto/BUILD.bazel b/src/shared/services/testproto/BUILD.bazel index 9a2f7ff186b..ea1023c811e 100644 --- a/src/shared/services/testproto/BUILD.bazel +++ b/src/shared/services/testproto/BUILD.bazel @@ -21,7 +21,7 @@ pl_proto_library( srcs = ["ping.proto"], visibility = ["//src:__subpackages__"], deps = [ - "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) diff --git a/src/shared/services/testproto/ping.pb.go b/src/shared/services/testproto/ping.pb.go index ed20ae86af1..f9938526b9a 100755 --- a/src/shared/services/testproto/ping.pb.go +++ b/src/shared/services/testproto/ping.pb.go @@ -125,25 +125,24 @@ func init() { } var fileDescriptor_90ddc51756b898ba = []byte{ - // 280 bytes of a gzipped FileDescriptorProto + // 264 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x28, 0x2e, 0x4a, 0xd6, 0x2f, 0xce, 0x48, 0x2c, 0x4a, 0x4d, 0xd1, 0x2f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0x2d, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0x29, 0x28, 0xca, 0x2f, 0xc9, 0xd7, 0x2f, 0xc8, 0xcc, 0x4b, 0xd7, 0x03, - 0x33, 0x85, 0x38, 0x0b, 0x2a, 0xf4, 0x92, 0xf3, 0x73, 0x73, 0xf3, 0xf3, 0xa4, 0x74, 0xd3, 0x33, - 0x4b, 0x32, 0x4a, 0x93, 0x40, 0x5c, 0xfd, 0xf4, 0xfc, 0xf4, 0x7c, 0x7d, 0xb0, 0x8a, 0xa4, 0xd2, - 0x34, 0x30, 0x0f, 0xa2, 0x13, 0xc4, 0x82, 0xe8, 0x54, 0x92, 0xe7, 0xe2, 0x0e, 0xc8, 0xcc, 0x4b, - 0x0f, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x11, 0x12, 0xe0, 0x62, 0x2e, 0x4a, 0x2d, 0x94, 0x60, - 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x02, 0x31, 0x95, 0x14, 0xb9, 0x38, 0x21, 0x0a, 0x0a, 0x72, 0x2a, - 0x85, 0x44, 0xb8, 0x58, 0x8b, 0x40, 0x0c, 0xa8, 0x02, 0x08, 0xc7, 0xe8, 0x34, 0x23, 0xc4, 0x90, - 0x60, 0x88, 0x1b, 0x85, 0x4c, 0xb8, 0x58, 0x40, 0x5c, 0x21, 0x31, 0x3d, 0xb8, 0xb3, 0xf4, 0x90, - 0x2c, 0x91, 0x12, 0xc1, 0x10, 0x07, 0x99, 0xed, 0xc4, 0x25, 0x00, 0xe2, 0x38, 0xe7, 0x64, 0xa6, - 0xe6, 0x95, 0x04, 0x97, 0x14, 0xa5, 0x26, 0xe6, 0x92, 0x66, 0x82, 0x06, 0x23, 0xcc, 0x0c, 0x90, - 0x43, 0x52, 0x8b, 0xc8, 0x31, 0xc3, 0x80, 0xd1, 0xc9, 0xea, 0xc2, 0x43, 0x39, 0x86, 0x1b, 0x0f, - 0xe5, 0x18, 0x3e, 0x3c, 0x94, 0x63, 0x6c, 0x78, 0x24, 0xc7, 0xb8, 0xe2, 0x91, 0x1c, 0xe3, 0x89, - 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0xf8, 0xe2, 0x91, 0x1c, 0xc3, - 0x87, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, - 0x43, 0x14, 0x0b, 0x28, 0x36, 0x92, 0xd8, 0xc0, 0x81, 0x6a, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, - 0x21, 0xf0, 0x1c, 0x0d, 0xba, 0x01, 0x00, 0x00, + 0x33, 0x85, 0x38, 0x0b, 0x2a, 0xf4, 0x92, 0xf3, 0x73, 0x73, 0xf3, 0xf3, 0xa4, 0x44, 0xd2, 0xf3, + 0xd3, 0xf3, 0x21, 0x0a, 0x40, 0x2c, 0x88, 0x02, 0x25, 0x79, 0x2e, 0xee, 0x80, 0xcc, 0xbc, 0xf4, + 0xa0, 0xd4, 0xc2, 0xd2, 0xd4, 0xe2, 0x12, 0x21, 0x01, 0x2e, 0xe6, 0xa2, 0xd4, 0x42, 0x09, 0x46, + 0x05, 0x46, 0x0d, 0xce, 0x20, 0x10, 0x53, 0x49, 0x91, 0x8b, 0x13, 0xa2, 0xa0, 0x20, 0xa7, 0x52, + 0x48, 0x84, 0x8b, 0xb5, 0x08, 0xc4, 0x80, 0x2a, 0x80, 0x70, 0x8c, 0x4e, 0x33, 0x42, 0x0c, 0x09, + 0x86, 0x38, 0x45, 0xc8, 0x84, 0x8b, 0x05, 0xc4, 0x15, 0x12, 0xd3, 0x83, 0xdb, 0xae, 0x87, 0x64, + 0x89, 0x94, 0x08, 0x86, 0x38, 0xc8, 0x6c, 0x27, 0x2e, 0x01, 0x10, 0xc7, 0x39, 0x27, 0x33, 0x35, + 0xaf, 0x24, 0xb8, 0xa4, 0x28, 0x35, 0x31, 0x97, 0x34, 0x13, 0x34, 0x18, 0x61, 0x66, 0x80, 0x1c, + 0x92, 0x5a, 0x44, 0x8e, 0x19, 0x06, 0x8c, 0x4e, 0x56, 0x17, 0x1e, 0xca, 0x31, 0xdc, 0x78, 0x28, + 0xc7, 0xf0, 0xe1, 0xa1, 0x1c, 0x63, 0xc3, 0x23, 0x39, 0xc6, 0x15, 0x8f, 0xe4, 0x18, 0x4f, 0x3c, + 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x17, 0x8f, 0xe4, 0x18, 0x3e, + 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, + 0xa2, 0x58, 0x40, 0x81, 0x9e, 0xc4, 0x06, 0x0e, 0x54, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xcc, 0xbe, 0x0c, 0xcd, 0xa1, 0x01, 0x00, 0x00, } func (this *PingRequest) Equal(that interface{}) bool { diff --git a/src/shared/services/testproto/ping.proto b/src/shared/services/testproto/ping.proto index 5ba52466591..eff0f63a0b1 100644 --- a/src/shared/services/testproto/ping.proto +++ b/src/shared/services/testproto/ping.proto @@ -22,7 +22,7 @@ package px.common; option go_package = "ping"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; message PingRequest { string req = 1; diff --git a/src/shared/services/utils/jwt_test.go b/src/shared/services/utils/jwt_test.go index 1bcf8bf4507..34c5217abc2 100644 --- a/src/shared/services/utils/jwt_test.go +++ b/src/shared/services/utils/jwt_test.go @@ -66,6 +66,7 @@ func TestProtoToToken_Standard(t *testing.T) { assert.Equal(t, int64(5), token.NotBefore().Unix()) assert.Equal(t, "subject", token.Subject()) } + func TestProtoToToken_User(t *testing.T) { p := getStandardClaimsPb() p.Scopes = []string{"user"} diff --git a/src/stirling/demo_apps/go_http/server/simple_http_server.go b/src/stirling/demo_apps/go_http/server/simple_http_server.go index 89556030b06..174875c8ad5 100644 --- a/src/stirling/demo_apps/go_http/server/simple_http_server.go +++ b/src/stirling/demo_apps/go_http/server/simple_http_server.go @@ -27,9 +27,11 @@ import ( "time" ) -var letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") -var cachedRespData []string -var mIterationsPerMs float64 +var ( + letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") + cachedRespData []string + mIterationsPerMs float64 +) func init() { // Compute the cached response data, generating randoms strings is slow @@ -68,13 +70,6 @@ func randStringRunes(n int) string { return string(b) } -func min(x, y int64) int64 { - if x < y { - return x - } - return y -} - func fakeLoad(w *http.ResponseWriter, latency float64, mIters, respSize int64) float64 { // add some jitters // latency = rand.NormFloat64()*latency/10 + latency diff --git a/src/stirling/demo_apps/wrk_sweeper/wrk_sweeper.go b/src/stirling/demo_apps/wrk_sweeper/wrk_sweeper.go index 5e9186de922..a4ffa26bceb 100644 --- a/src/stirling/demo_apps/wrk_sweeper/wrk_sweeper.go +++ b/src/stirling/demo_apps/wrk_sweeper/wrk_sweeper.go @@ -31,14 +31,16 @@ import ( ) // Flag strings. -var flagSpecDuration string -var flagSpecThreads string -var flagSpecConnections string -var flagSpecMessageSize string -var flagSpecKIters string -var flagWrkHost string -var flagPrefix string -var flagOutputDir string +var ( + flagSpecDuration string + flagSpecThreads string + flagSpecConnections string + flagSpecMessageSize string + flagSpecKIters string + flagWrkHost string + flagPrefix string + flagOutputDir string +) func init() { flag.StringVar(&flagSpecDuration, "d", "10", "The duration spec") @@ -112,29 +114,30 @@ func parseOrDie(s string) int64 { } return val } + func parseSpec(spec string) SequenceGenerator { expRegex := regexp.MustCompile(`exp\((\d+), \s*(\d+),\s*(\d+)\)`) linRegex := regexp.MustCompile(`lin\((\d+), \s*(\d+),\s*(\d+)\)`) expMatches := expRegex.FindStringSubmatch(spec) if len(expMatches) == 4 { - min := parseOrDie(expMatches[1]) - max := parseOrDie(expMatches[2]) + minSeq := parseOrDie(expMatches[1]) + maxSeq := parseOrDie(expMatches[2]) base := parseOrDie(expMatches[3]) return &expSequenceGenerator{ - Min: min, - Max: max, + Min: minSeq, + Max: maxSeq, Base: base, } } linMatches := linRegex.FindStringSubmatch(spec) if len(linMatches) == 4 { - min := parseOrDie(linMatches[1]) - max := parseOrDie(linMatches[2]) + minSeq := parseOrDie(linMatches[1]) + maxSeq := parseOrDie(linMatches[2]) step := parseOrDie(linMatches[3]) return &linSequenceGenerator{ - Min: min, - Max: max, + Min: minSeq, + Max: maxSeq, Step: step, } } @@ -188,7 +191,7 @@ func main() { flag.Parse() if flagOutputDir != "" { - err := os.MkdirAll(flagOutputDir, 0755) + err := os.MkdirAll(flagOutputDir, 0o755) if err != nil { panic("failed to create output dir" + err.Error()) } diff --git a/src/stirling/proto/BUILD.bazel b/src/stirling/proto/BUILD.bazel index 684ee455b75..a8f820fa498 100644 --- a/src/stirling/proto/BUILD.bazel +++ b/src/stirling/proto/BUILD.bazel @@ -34,6 +34,6 @@ pl_cc_proto_library( proto = ":stirling_pl_proto", deps = [ "//src/shared/types/typespb/wrapper:cc_library", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/dwarvifier_test.cc b/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/dwarvifier_test.cc index 27d540ea279..9aaf0032cf7 100644 --- a/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/dwarvifier_test.cc +++ b/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/dwarvifier_test.cc @@ -1807,21 +1807,21 @@ probes { scalar_var { name: "main__IntStruct_sym_addr1" type: UINT64 - constant: "4989600" + constant: "4989632" } } vars { scalar_var { name: "runtime__errorString_sym_addr2" type: UINT64 - constant: "4989792" + constant: "4989824" } } vars { scalar_var { name: "internal___poll__errNetClosing_sym_addr3" type: UINT64 - constant: "4989824" + constant: "4989856" } } vars { diff --git a/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/logicalpb/BUILD.bazel b/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/logicalpb/BUILD.bazel index a1e98744f29..836851243c1 100644 --- a/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/logicalpb/BUILD.bazel +++ b/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/logicalpb/BUILD.bazel @@ -23,7 +23,7 @@ pl_proto_library( srcs = ["logical.proto"], deps = [ "//src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/sharedpb:shared_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -32,7 +32,7 @@ pl_cc_proto_library( proto = ":logical_pl_proto", deps = [ "//src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/sharedpb:shared_pl_cc_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/logicalpb/logical.pb.go b/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/logicalpb/logical.pb.go index 38b4e1309d4..13d4bd461d9 100755 --- a/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/logicalpb/logical.pb.go +++ b/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/logicalpb/logical.pb.go @@ -877,73 +877,72 @@ func init() { } var fileDescriptor_f7e5876dffcc11b4 = []byte{ - // 1050 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6f, 0xdc, 0xc4, - 0x17, 0x5f, 0xef, 0x6e, 0xf6, 0xc7, 0xdb, 0x76, 0xd3, 0xef, 0xa8, 0xaa, 0xdc, 0x7c, 0x85, 0x13, - 0x59, 0x80, 0x22, 0xa4, 0x78, 0xdb, 0x34, 0x94, 0x1b, 0xa8, 0xdb, 0x34, 0x0d, 0x22, 0x29, 0x61, - 0x12, 0x45, 0xa8, 0x48, 0xac, 0x66, 0xed, 0x59, 0xc7, 0xaa, 0xed, 0x19, 0xcd, 0x8c, 0xa3, 0xee, - 0x0d, 0x2e, 0x70, 0xe0, 0xc2, 0x9f, 0xc1, 0x89, 0xbf, 0x83, 0x63, 0x8e, 0xe5, 0x52, 0x91, 0xcd, - 0x01, 0x8e, 0xfd, 0x13, 0x90, 0xc7, 0xf6, 0xae, 0x53, 0x22, 0xe1, 0x08, 0xc1, 0x6d, 0x9e, 0xc7, - 0x9f, 0xcf, 0xfb, 0xbc, 0xf7, 0xe6, 0xbd, 0x19, 0xf8, 0x52, 0x0a, 0x77, 0x20, 0x55, 0x20, 0xc2, - 0x20, 0xf6, 0x07, 0x92, 0x25, 0xc2, 0xa5, 0x23, 0x97, 0xc5, 0x31, 0x75, 0x15, 0x13, 0x72, 0xe0, - 0x4d, 0x63, 0x12, 0x05, 0xee, 0x48, 0x09, 0xe2, 0x52, 0x71, 0xc9, 0x4c, 0x01, 0x81, 0x18, 0x84, - 0xcc, 0x0f, 0x5c, 0x12, 0xf2, 0x71, 0xb1, 0x72, 0xb8, 0x60, 0x8a, 0xa1, 0xf7, 0xf9, 0x4b, 0xa7, - 0x20, 0x76, 0xde, 0xc2, 0x39, 0x81, 0x70, 0xf2, 0xbf, 0x57, 0x36, 0xfc, 0x40, 0x9d, 0x24, 0x63, - 0xc7, 0x65, 0xd1, 0xc0, 0x67, 0x3e, 0x1b, 0x68, 0xf8, 0x38, 0x99, 0x68, 0x4b, 0x1b, 0x7a, 0x95, - 0xd1, 0xae, 0x58, 0x3e, 0x63, 0x7e, 0x48, 0x17, 0x7f, 0x79, 0x89, 0x20, 0x2a, 0x60, 0x71, 0xbe, - 0x7f, 0xfc, 0x8f, 0x03, 0x92, 0x27, 0x44, 0x50, 0x8f, 0x8f, 0xf3, 0x45, 0xc6, 0x6b, 0x7f, 0x6b, - 0x40, 0xe7, 0x31, 0x8b, 0xa5, 0x22, 0xb1, 0x42, 0x08, 0x9a, 0x31, 0x89, 0xa8, 0x69, 0xac, 0x19, - 0xeb, 0x5d, 0xac, 0xd7, 0xe8, 0x09, 0x34, 0xd5, 0x94, 0x53, 0xb3, 0xbe, 0x66, 0xac, 0xf7, 0x37, - 0xef, 0x3b, 0x7f, 0x13, 0x7e, 0x4e, 0x7e, 0xe8, 0x92, 0x90, 0x88, 0xa3, 0x29, 0xa7, 0x58, 0xc3, - 0xd1, 0x0a, 0x74, 0xdc, 0xdc, 0x8d, 0xd9, 0xd0, 0xf4, 0x73, 0xdb, 0x76, 0xa0, 0xf3, 0x48, 0xf8, - 0x49, 0x44, 0x63, 0x85, 0xfa, 0x50, 0x0f, 0xbc, 0x5c, 0x40, 0x3d, 0xf0, 0x52, 0x49, 0xf4, 0x25, - 0x17, 0xda, 0x7d, 0x17, 0xeb, 0xb5, 0x7d, 0x1f, 0x7a, 0x98, 0xaa, 0x44, 0xc4, 0xc7, 0x24, 0x4c, - 0x68, 0x25, 0xc8, 0x77, 0x06, 0x74, 0xf6, 0x09, 0xcf, 0x00, 0x77, 0xa1, 0x13, 0x11, 0x3e, 0x2a, - 0x85, 0xda, 0x8e, 0x08, 0x7f, 0x96, 0x46, 0x3b, 0x84, 0xc6, 0x0b, 0x3a, 0xcd, 0x83, 0xbd, 0x57, - 0x31, 0xd8, 0xe1, 0xc1, 0xce, 0x2e, 0x0d, 0x39, 0x15, 0x38, 0x05, 0xa3, 0xff, 0x43, 0xf7, 0x34, - 0xf5, 0x33, 0x0a, 0x3c, 0x69, 0x36, 0xd6, 0x1a, 0x69, 0xac, 0xfa, 0xc3, 0xa7, 0x9e, 0xb4, 0x7f, - 0x37, 0xa0, 0xbf, 0x4f, 0xf8, 0xa1, 0x22, 0xf2, 0xe4, 0x91, 0x9b, 0x16, 0xf8, 0xdf, 0x96, 0x73, - 0x0f, 0x6e, 0x67, 0x72, 0x4e, 0x89, 0x08, 0xc8, 0x38, 0xa4, 0xda, 0x53, 0xa1, 0x0c, 0xe9, 0xbd, - 0xe3, 0x7c, 0x2b, 0x75, 0x2a, 0xd1, 0x36, 0x34, 0x5d, 0x16, 0x7b, 0x66, 0x73, 0xcd, 0x58, 0xef, - 0x55, 0x76, 0xfb, 0x98, 0xc5, 0x5e, 0x90, 0x06, 0x84, 0x35, 0xda, 0xe6, 0xb0, 0xbc, 0x4f, 0xf8, - 0x36, 0x0d, 0xa9, 0xa2, 0xff, 0x49, 0xa4, 0xf6, 0x16, 0xb4, 0x3e, 0x4f, 0x14, 0x4f, 0xae, 0x3e, - 0xc8, 0x77, 0xa0, 0x35, 0x09, 0x68, 0xe8, 0x49, 0xb3, 0xae, 0x23, 0xcf, 0x2d, 0xfb, 0x18, 0x6e, - 0x64, 0xa8, 0x5c, 0xe4, 0x2a, 0xf4, 0x98, 0xb6, 0xcb, 0x3a, 0x21, 0xfb, 0xa4, 0xa5, 0xbe, 0x07, - 0xfd, 0x2b, 0x53, 0x79, 0xf3, 0xb4, 0x9c, 0x45, 0xfb, 0x87, 0x36, 0x2c, 0x1d, 0x08, 0x36, 0xa6, - 0x57, 0xaa, 0xf9, 0x02, 0x40, 0xb7, 0x2a, 0x67, 0x41, 0xac, 0x74, 0xd8, 0xbd, 0xca, 0xcd, 0x75, - 0x34, 0x07, 0xe2, 0x12, 0x09, 0xda, 0x85, 0x96, 0x6e, 0xa9, 0x4c, 0x4f, 0x85, 0xc2, 0x15, 0x83, - 0xad, 0xe8, 0x7f, 0x9c, 0xe3, 0xd3, 0x03, 0x40, 0x84, 0x2f, 0xcd, 0xe6, 0xf5, 0x78, 0x8a, 0x26, - 0xc6, 0x1a, 0x8d, 0x9e, 0x41, 0x47, 0x50, 0x35, 0x3a, 0x25, 0xa1, 0x34, 0x97, 0x34, 0xd3, 0x83, - 0xaa, 0x4c, 0xa5, 0xf6, 0xc6, 0x6d, 0x41, 0xd5, 0x31, 0x09, 0x25, 0xfa, 0x2c, 0x3b, 0x3d, 0x9a, - 0xaf, 0x75, 0x3d, 0x65, 0x45, 0xeb, 0xeb, 0xf3, 0xa6, 0xc9, 0x5c, 0xb8, 0x35, 0x49, 0x62, 0x5d, - 0xf1, 0x51, 0x48, 0x14, 0x8d, 0xdd, 0xa9, 0xd9, 0xd6, 0x55, 0x78, 0x58, 0xb1, 0x0a, 0x3b, 0x39, - 0x7c, 0x2f, 0x43, 0xef, 0xd6, 0xf0, 0xf2, 0xe4, 0xf2, 0x27, 0x34, 0x86, 0xff, 0xa5, 0x8a, 0x65, - 0xda, 0xec, 0x23, 0xa2, 0xb7, 0xa4, 0xd9, 0xd1, 0xd2, 0x1f, 0x5e, 0x43, 0x7a, 0x69, 0x58, 0xe0, - 0xe5, 0xe8, 0x92, 0x2d, 0x11, 0x05, 0x94, 0xfa, 0xf0, 0x74, 0x9f, 0xcd, 0x9d, 0xf4, 0xb4, 0x93, - 0x8f, 0xae, 0xe1, 0xa4, 0xdc, 0xa8, 0xf8, 0x56, 0x74, 0xf9, 0x83, 0x44, 0x5f, 0x41, 0x3f, 0xef, - 0x8a, 0xc2, 0x45, 0x57, 0xbb, 0xd8, 0xaa, 0xea, 0xa2, 0xdc, 0x63, 0xf8, 0x26, 0x2b, 0x59, 0x12, - 0x3d, 0x85, 0x36, 0x17, 0x41, 0xac, 0x5e, 0x48, 0x13, 0x34, 0xeb, 0x46, 0xc5, 0x1a, 0x1c, 0x68, - 0x14, 0x2e, 0xd0, 0x43, 0x13, 0xee, 0xbc, 0x5d, 0xd5, 0x11, 0x8b, 0x29, 0x9b, 0xd8, 0x3f, 0xd7, - 0xa1, 0xbf, 0xe8, 0x9b, 0x43, 0x4e, 0xdd, 0xf4, 0x3c, 0x85, 0x24, 0xf6, 0x13, 0xe2, 0x67, 0xad, - 0xd9, 0xdf, 0x1c, 0x54, 0x74, 0xbb, 0x97, 0xc3, 0xf0, 0x9c, 0x00, 0x7d, 0x0c, 0xcd, 0x88, 0xf0, - 0x6c, 0xb6, 0xf4, 0x36, 0x3f, 0xa8, 0x48, 0xb4, 0x4f, 0x38, 0xd6, 0x38, 0xb4, 0x0b, 0xed, 0x2c, - 0x27, 0x45, 0xf7, 0x3a, 0xd7, 0x4b, 0x2c, 0x2e, 0xe0, 0xe8, 0x09, 0xb4, 0x78, 0x3a, 0x76, 0x8a, - 0xf6, 0xdd, 0xa8, 0x4a, 0xa4, 0x87, 0x15, 0xce, 0xc1, 0xf6, 0xbb, 0xd0, 0x19, 0x1e, 0xec, 0xe8, - 0x94, 0x21, 0x33, 0xad, 0x0f, 0xf3, 0x05, 0x89, 0x8a, 0xb1, 0x9d, 0x9b, 0xf6, 0xf7, 0x4d, 0xb8, - 0xbd, 0x48, 0xeb, 0x36, 0xe5, 0x21, 0x9b, 0xea, 0x7b, 0xfc, 0xaa, 0x99, 0xb7, 0x05, 0x0d, 0xa5, - 0xc2, 0x7c, 0xd8, 0xdd, 0x75, 0xb2, 0x17, 0x8f, 0x53, 0xbc, 0x78, 0x9c, 0xed, 0xfc, 0xc5, 0x33, - 0x6c, 0xcf, 0x5e, 0xaf, 0x36, 0x8e, 0x8e, 0xf6, 0x70, 0xfa, 0x3b, 0xfa, 0x1a, 0x96, 0xbd, 0x39, - 0xef, 0x48, 0x72, 0xea, 0xea, 0x07, 0x44, 0x6f, 0xf3, 0xc3, 0x8a, 0x49, 0x5e, 0xa8, 0x4a, 0xcb, - 0x8e, 0xfb, 0xde, 0x25, 0x1b, 0x05, 0xd0, 0x5b, 0x0c, 0xd1, 0x22, 0x69, 0x4f, 0xab, 0x26, 0xed, - 0xaa, 0xe0, 0xcb, 0x03, 0xba, 0xcc, 0xbd, 0xf2, 0xab, 0x01, 0xb0, 0xd8, 0x43, 0xef, 0x00, 0xa8, - 0xf9, 0x2d, 0x92, 0x67, 0xaa, 0xab, 0x8a, 0x1b, 0x04, 0x1d, 0x2c, 0xb2, 0x5e, 0xaf, 0x36, 0x99, - 0xfe, 0x2a, 0x4a, 0x47, 0x5c, 0xd0, 0xa0, 0xe7, 0xd0, 0x19, 0xf3, 0x89, 0x56, 0x64, 0x2e, 0x55, - 0xbb, 0xdc, 0x0b, 0xca, 0xe2, 0x2c, 0x0c, 0x6f, 0xcc, 0x5e, 0xaf, 0xce, 0x4f, 0x06, 0x9e, 0xf3, - 0x0d, 0x3f, 0x39, 0x3b, 0xb7, 0x6a, 0xaf, 0xce, 0xad, 0xda, 0x9b, 0x73, 0xcb, 0xf8, 0x66, 0x66, - 0x19, 0x3f, 0xcd, 0x2c, 0xe3, 0x97, 0x99, 0x65, 0x9c, 0xcd, 0x2c, 0xe3, 0xb7, 0x99, 0x65, 0xfc, - 0x31, 0xb3, 0x6a, 0x6f, 0x66, 0x96, 0xf1, 0xe3, 0x85, 0x55, 0x3b, 0xbb, 0xb0, 0x6a, 0xaf, 0x2e, - 0xac, 0xda, 0xf3, 0xee, 0xfc, 0x99, 0x3d, 0x6e, 0xe9, 0x83, 0xf0, 0xe0, 0xcf, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x6a, 0xbe, 0x05, 0x3c, 0xbb, 0x0b, 0x00, 0x00, + // 1038 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0xdc, 0x44, + 0x14, 0x5f, 0xef, 0x6e, 0xf6, 0xcf, 0xdb, 0x76, 0x53, 0x46, 0x51, 0xe5, 0x06, 0xe1, 0x44, 0x16, + 0xa0, 0x08, 0xa9, 0xde, 0x36, 0x0d, 0xe5, 0x06, 0xea, 0x36, 0x4d, 0x83, 0x48, 0x4a, 0x98, 0x44, + 0x11, 0x2a, 0x12, 0xab, 0x59, 0x7b, 0xd6, 0xb5, 0xea, 0xf5, 0x8c, 0x66, 0xc6, 0x51, 0xf7, 0x06, + 0x17, 0x38, 0x70, 0xe1, 0x63, 0x70, 0xe2, 0x73, 0x70, 0xcc, 0xb1, 0x5c, 0x2a, 0xb2, 0x39, 0xc0, + 0xb1, 0x1f, 0x01, 0x79, 0x6c, 0xef, 0x3a, 0x65, 0x25, 0xbc, 0x42, 0xf4, 0x36, 0xcf, 0xe3, 0xdf, + 0xef, 0xfd, 0xde, 0x7b, 0xf3, 0xde, 0x0c, 0x7c, 0x2d, 0x85, 0xdb, 0x93, 0x2a, 0x10, 0x61, 0x10, + 0xf9, 0x3d, 0xc9, 0x62, 0xe1, 0xd2, 0x81, 0xcb, 0xa2, 0x88, 0xba, 0x8a, 0x09, 0xd9, 0xf3, 0x26, + 0x11, 0x19, 0x07, 0xee, 0x40, 0x09, 0xe2, 0x52, 0x71, 0xc5, 0x4c, 0x00, 0x81, 0xe8, 0x85, 0xcc, + 0x0f, 0x5c, 0x12, 0xf2, 0x61, 0xbe, 0x72, 0xb8, 0x60, 0x8a, 0xa1, 0x0f, 0xf9, 0x0b, 0x27, 0x27, + 0x76, 0xde, 0xc0, 0x39, 0x81, 0x70, 0xb2, 0xbf, 0xd7, 0xd7, 0x7c, 0xe6, 0x33, 0x0d, 0xe9, 0x25, + 0xab, 0x14, 0xbd, 0x6e, 0xf9, 0x8c, 0xf9, 0x21, 0xed, 0x69, 0x6b, 0x18, 0x8f, 0x7a, 0x5e, 0x2c, + 0x88, 0x0a, 0x58, 0x94, 0xed, 0x9f, 0xfe, 0x67, 0xdd, 0xf2, 0x19, 0x11, 0xd4, 0xe3, 0xc3, 0x6c, + 0x91, 0xf2, 0xda, 0xdf, 0x1b, 0xd0, 0x7a, 0xc8, 0x22, 0xa9, 0x48, 0xa4, 0x10, 0x82, 0x7a, 0x44, + 0xc6, 0xd4, 0x34, 0x36, 0x8d, 0xad, 0x36, 0xd6, 0x6b, 0xf4, 0x08, 0xea, 0x6a, 0xc2, 0xa9, 0x59, + 0xdd, 0x34, 0xb6, 0xba, 0xdb, 0x77, 0x9d, 0x7f, 0x89, 0x32, 0x23, 0x3f, 0x76, 0x49, 0x48, 0xc4, + 0xc9, 0x84, 0x53, 0xac, 0xe1, 0x68, 0x1d, 0x5a, 0x6e, 0xe6, 0xc6, 0xac, 0x69, 0xfa, 0x99, 0x6d, + 0x3b, 0xd0, 0x7a, 0x20, 0xfc, 0x78, 0x4c, 0x23, 0x85, 0xba, 0x50, 0x0d, 0xbc, 0x4c, 0x40, 0x35, + 0xf0, 0x12, 0x49, 0xf4, 0x05, 0x17, 0xda, 0x7d, 0x1b, 0xeb, 0xb5, 0x7d, 0x17, 0x3a, 0x98, 0xaa, + 0x58, 0x44, 0xa7, 0x24, 0x8c, 0x69, 0x29, 0xc8, 0x0f, 0x06, 0xb4, 0x0e, 0x09, 0x4f, 0x01, 0xb7, + 0xa0, 0x35, 0x26, 0x7c, 0x50, 0x08, 0xb5, 0x39, 0x26, 0xfc, 0x49, 0x12, 0x6d, 0x1f, 0x6a, 0xcf, + 0xe9, 0x24, 0x0b, 0xf6, 0x4e, 0xc9, 0x60, 0xfb, 0x47, 0x7b, 0xfb, 0x34, 0xe4, 0x54, 0xe0, 0x04, + 0x8c, 0xde, 0x85, 0xf6, 0x59, 0xe2, 0x67, 0x10, 0x78, 0xd2, 0xac, 0x6d, 0xd6, 0x92, 0x58, 0xf5, + 0x87, 0xcf, 0x3d, 0x69, 0xff, 0x69, 0x40, 0xf7, 0x90, 0xf0, 0x63, 0x45, 0xe4, 0xb3, 0x07, 0x6e, + 0x52, 0xe0, 0xff, 0x5b, 0xce, 0x1d, 0x58, 0x4b, 0xe5, 0x9c, 0x11, 0x11, 0x90, 0x61, 0x48, 0xb5, + 0xa7, 0x5c, 0x19, 0xd2, 0x7b, 0xa7, 0xd9, 0x56, 0xe2, 0x54, 0xa2, 0x5d, 0xa8, 0xbb, 0x2c, 0xf2, + 0xcc, 0xfa, 0xa6, 0xb1, 0xd5, 0x29, 0xed, 0xf6, 0x21, 0x8b, 0xbc, 0x20, 0x09, 0x08, 0x6b, 0xb4, + 0xcd, 0x61, 0xf5, 0x90, 0xf0, 0x5d, 0x1a, 0x52, 0x45, 0xdf, 0x4a, 0xa4, 0xf6, 0x0e, 0x34, 0xbe, + 0x8c, 0x15, 0x8f, 0x17, 0x1f, 0xe4, 0x9b, 0xd0, 0x18, 0x05, 0x34, 0xf4, 0xa4, 0x59, 0xd5, 0x91, + 0x67, 0x96, 0x7d, 0x0a, 0xd7, 0x52, 0x54, 0x26, 0x72, 0x03, 0x3a, 0x4c, 0xdb, 0x45, 0x9d, 0x90, + 0x7e, 0xd2, 0x52, 0x3f, 0x80, 0xee, 0xc2, 0x54, 0x5e, 0x3f, 0x2b, 0x66, 0xd1, 0xfe, 0xa9, 0x09, + 0x2b, 0x47, 0x82, 0x0d, 0xe9, 0x42, 0x35, 0x5f, 0x01, 0xe8, 0x56, 0xe5, 0x2c, 0x88, 0x94, 0x0e, + 0xbb, 0x53, 0xba, 0xb9, 0x4e, 0x66, 0x40, 0x5c, 0x20, 0x41, 0xfb, 0xd0, 0xd0, 0x2d, 0x95, 0xea, + 0x29, 0x51, 0xb8, 0x7c, 0x7e, 0xe5, 0xfd, 0x8f, 0x33, 0x7c, 0x72, 0x00, 0x88, 0xf0, 0xa5, 0x59, + 0x5f, 0x8e, 0x27, 0x6f, 0x62, 0xac, 0xd1, 0xe8, 0x09, 0xb4, 0x04, 0x55, 0x83, 0x33, 0x12, 0x4a, + 0x73, 0x45, 0x33, 0xdd, 0x2b, 0xcb, 0x54, 0x68, 0x6f, 0xdc, 0x14, 0x54, 0x9d, 0x92, 0x50, 0xa2, + 0x2f, 0xd2, 0xd3, 0xa3, 0xf9, 0x1a, 0xcb, 0x29, 0xcb, 0x5b, 0x5f, 0x9f, 0x37, 0x4d, 0xe6, 0xc2, + 0x8d, 0x51, 0x1c, 0xe9, 0x8a, 0x0f, 0x42, 0xa2, 0x68, 0xe4, 0x4e, 0xcc, 0xa6, 0xae, 0xc2, 0xfd, + 0x92, 0x55, 0xd8, 0xcb, 0xe0, 0x07, 0x29, 0x7a, 0xbf, 0x82, 0x57, 0x47, 0x57, 0x3f, 0xa1, 0x21, + 0xbc, 0x93, 0x28, 0x96, 0x49, 0xb3, 0x0f, 0x88, 0xde, 0x92, 0x66, 0x4b, 0x4b, 0xbf, 0xbf, 0x84, + 0xf4, 0xc2, 0xb0, 0xc0, 0xab, 0xe3, 0x2b, 0xb6, 0x44, 0x14, 0x50, 0xe2, 0xc3, 0xd3, 0x7d, 0x36, + 0x73, 0xd2, 0xd1, 0x4e, 0x3e, 0x59, 0xc2, 0x49, 0xb1, 0x51, 0xf1, 0x8d, 0xf1, 0xd5, 0x0f, 0x12, + 0x7d, 0x03, 0xdd, 0xac, 0x2b, 0x72, 0x17, 0x6d, 0xed, 0x62, 0xa7, 0xac, 0x8b, 0x62, 0x8f, 0xe1, + 0xeb, 0xac, 0x60, 0x49, 0xf4, 0x18, 0x9a, 0x5c, 0x04, 0x91, 0x7a, 0x2e, 0x4d, 0xd0, 0xac, 0xb7, + 0x4b, 0xd6, 0xe0, 0x48, 0xa3, 0x70, 0x8e, 0xee, 0x9b, 0x70, 0xf3, 0xcd, 0xaa, 0x0e, 0x58, 0x44, + 0xd9, 0xc8, 0xfe, 0xb5, 0x0a, 0xdd, 0x79, 0xdf, 0x1c, 0x73, 0xea, 0x26, 0xe7, 0x29, 0x24, 0x91, + 0x1f, 0x13, 0x3f, 0x6d, 0xcd, 0xee, 0x76, 0xaf, 0xa4, 0xdb, 0x83, 0x0c, 0x86, 0x67, 0x04, 0xe8, + 0x53, 0xa8, 0x8f, 0x09, 0x4f, 0x67, 0x4b, 0x67, 0xfb, 0xa3, 0x92, 0x44, 0x87, 0x84, 0x63, 0x8d, + 0x43, 0xfb, 0xd0, 0x4c, 0x73, 0x92, 0x77, 0xaf, 0xb3, 0x5c, 0x62, 0x71, 0x0e, 0x47, 0x8f, 0xa0, + 0xc1, 0x93, 0xb1, 0x93, 0xb7, 0xef, 0xed, 0xb2, 0x44, 0x7a, 0x58, 0xe1, 0x0c, 0x6c, 0xbf, 0x0f, + 0xad, 0xfe, 0xd1, 0x9e, 0x4e, 0x19, 0x32, 0x93, 0xfa, 0x30, 0x5f, 0x90, 0x71, 0x3e, 0xb6, 0x33, + 0xd3, 0xfe, 0xb1, 0x0e, 0x6b, 0xf3, 0xb4, 0xee, 0x52, 0x1e, 0xb2, 0x89, 0xbe, 0xc7, 0x17, 0xcd, + 0xbc, 0x1d, 0xa8, 0x29, 0x15, 0x66, 0xc3, 0xee, 0x96, 0x93, 0xbe, 0x78, 0x9c, 0xfc, 0xc5, 0xe3, + 0xec, 0x66, 0x2f, 0x9e, 0x7e, 0x73, 0xfa, 0x6a, 0xa3, 0x76, 0x72, 0x72, 0x80, 0x93, 0xdf, 0xd1, + 0xb7, 0xb0, 0xea, 0xcd, 0x78, 0x07, 0x92, 0x53, 0x57, 0x3f, 0x20, 0x3a, 0xdb, 0x1f, 0x97, 0x4c, + 0xf2, 0x5c, 0x55, 0x52, 0x76, 0xdc, 0xf5, 0xae, 0xd8, 0x28, 0x80, 0xce, 0x7c, 0x88, 0xe6, 0x49, + 0x7b, 0x5c, 0x36, 0x69, 0x8b, 0x82, 0x2f, 0x0e, 0xe8, 0x22, 0xf7, 0xfa, 0xef, 0x06, 0xc0, 0x7c, + 0x0f, 0xbd, 0x07, 0xa0, 0x66, 0xb7, 0x48, 0x96, 0xa9, 0xb6, 0xca, 0x6f, 0x10, 0x74, 0x34, 0xcf, + 0x7a, 0xb5, 0xdc, 0x64, 0xfa, 0xa7, 0x28, 0x1d, 0x71, 0x4e, 0x83, 0x9e, 0x42, 0x6b, 0xc8, 0x47, + 0x5a, 0x91, 0xb9, 0x52, 0xee, 0x72, 0xcf, 0x29, 0xf3, 0xb3, 0xd0, 0xbf, 0x36, 0x7d, 0xb5, 0x31, + 0x3b, 0x19, 0x78, 0xc6, 0xd7, 0xff, 0xec, 0xfc, 0xc2, 0xaa, 0xbc, 0xbc, 0xb0, 0x2a, 0xaf, 0x2f, + 0x2c, 0xe3, 0xbb, 0xa9, 0x65, 0xfc, 0x32, 0xb5, 0x8c, 0xdf, 0xa6, 0x96, 0x71, 0x3e, 0xb5, 0x8c, + 0x3f, 0xa6, 0x96, 0xf1, 0xd7, 0xd4, 0xaa, 0xbc, 0x9e, 0x5a, 0xc6, 0xcf, 0x97, 0x56, 0xe5, 0xfc, + 0xd2, 0xaa, 0xbc, 0xbc, 0xb4, 0x2a, 0x4f, 0xdb, 0xb3, 0xd7, 0xf4, 0xb0, 0xa1, 0x0f, 0xc2, 0xbd, + 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x96, 0x8b, 0xbb, 0xe6, 0xa2, 0x0b, 0x00, 0x00, } func (this *Constant) Equal(that interface{}) bool { diff --git a/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/logicalpb/logical.proto b/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/logicalpb/logical.proto index 17d87344573..b30a5762c4a 100644 --- a/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/logicalpb/logical.proto +++ b/src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/logicalpb/logical.proto @@ -22,7 +22,7 @@ package px.stirling.dynamic_tracing.ir.logical; option go_package = "logicalpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "src/stirling/source_connectors/dynamic_tracer/dynamic_tracing/ir/sharedpb/shared.proto"; diff --git a/src/stirling/source_connectors/perf_profiler/testing/go/profiler_test_app_sqrt.go b/src/stirling/source_connectors/perf_profiler/testing/go/profiler_test_app_sqrt.go index 3a8351e1be7..d2afba415cb 100644 --- a/src/stirling/source_connectors/perf_profiler/testing/go/profiler_test_app_sqrt.go +++ b/src/stirling/source_connectors/perf_profiler/testing/go/profiler_test_app_sqrt.go @@ -27,9 +27,9 @@ import ( ) func sqrt(x float64) float64 { - var r = x - var precision = 1e-10 - var eps = math.Abs(x - r*r) + r := x + precision := 1e-10 + eps := math.Abs(x - r*r) for eps > precision { r = (r + x/r) / 2 eps = math.Abs(x - r*r) @@ -39,13 +39,13 @@ func sqrt(x float64) float64 { func sqrtOf1e39() float64 { // Runs for 70 iters. - var x = 1e39 + x := 1e39 return sqrt(x) } func sqrtOf1e18() float64 { // Runs for 35 iters. - var x = 1e18 + x := 1e18 return sqrt(x) } @@ -53,7 +53,7 @@ func main() { sigs := make(chan os.Signal, 1) signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM) - var done = false + done := false var x float64 var y float64 diff --git a/src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server/main.go b/src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server/main.go index e8d0767b258..25dcdb9031b 100644 --- a/src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server/main.go +++ b/src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server/main.go @@ -92,11 +92,11 @@ func (s *server) SayHelloBidirStreaming(stream pb.StreamingGreeter_SayHelloBidir } func main() { - var port = flag.Int("port", 50051, "The port to listen.") - var https = flag.Bool("https", false, "Whether or not to use https") - var cert = flag.String("cert", "", "Path to the .crt file.") - var key = flag.String("key", "", "Path to the .key file.") - var streaming = flag.Bool("streaming", false, "Whether or not to call streaming RPC") + port := flag.Int("port", 50051, "The port to listen.") + https := flag.Bool("https", false, "Whether or not to use https") + cert := flag.String("cert", "", "Path to the .crt file.") + key := flag.String("key", "", "Path to the .key file.") + streaming := flag.Bool("streaming", false, "Whether or not to call streaming RPC") const keyPairBase = "src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server" diff --git a/src/stirling/testing/demo_apps/go_grpc_tls_pl/server/greetpb/BUILD.bazel b/src/stirling/testing/demo_apps/go_grpc_tls_pl/server/greetpb/BUILD.bazel index 23a32d05eff..cf5e9ace27e 100644 --- a/src/stirling/testing/demo_apps/go_grpc_tls_pl/server/greetpb/BUILD.bazel +++ b/src/stirling/testing/demo_apps/go_grpc_tls_pl/server/greetpb/BUILD.bazel @@ -22,7 +22,7 @@ pl_proto_library( name = "service_pl_proto", srcs = ["service.proto"], deps = [ - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -30,7 +30,7 @@ pl_cc_proto_library( name = "service_pl_cc_proto", proto = ":service_pl_proto", deps = [ - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/stirling/testing/demo_apps/go_http/go_http_client/main.go b/src/stirling/testing/demo_apps/go_http/go_http_client/main.go index b840ca855ed..eb5488883fa 100644 --- a/src/stirling/testing/demo_apps/go_http/go_http_client/main.go +++ b/src/stirling/testing/demo_apps/go_http/go_http_client/main.go @@ -33,8 +33,10 @@ import ( "time" ) -var r = rand.New(rand.NewSource(1)) -var letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") +var ( + r = rand.New(rand.NewSource(1)) + letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") +) func randStringRunes(n int) string { b := make([]rune, n) @@ -70,7 +72,7 @@ func main() { fmt.Print("Starting to send requests...\n") for i := 0; i < *count || *count == 0; i++ { - if *reqType == "get" || *reqType == "mix" { + if *reqType == "get" || *reqType == "mix" { //nolint:staticcheck resp, err := http.Get("http://" + *address + "/sayhello?name=" + url.QueryEscape(*name)) if err != nil { panic(err) diff --git a/src/table_store/schemapb/BUILD.bazel b/src/table_store/schemapb/BUILD.bazel index 143076fbb30..8a85bb9eee3 100644 --- a/src/table_store/schemapb/BUILD.bazel +++ b/src/table_store/schemapb/BUILD.bazel @@ -22,7 +22,7 @@ pl_proto_library( visibility = ["//src:__subpackages__"], deps = [ "//src/shared/types/typespb:types_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -32,7 +32,7 @@ pl_cc_proto_library( visibility = ["//src:__subpackages__"], deps = [ "//src/shared/types/typespb/wrapper:cc_library", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/table_store/schemapb/schema.pb.go b/src/table_store/schemapb/schema.pb.go index 609ebb50cdf..93aada07afb 100755 --- a/src/table_store/schemapb/schema.pb.go +++ b/src/table_store/schemapb/schema.pb.go @@ -734,59 +734,58 @@ func init() { } var fileDescriptor_837edaf494876c32 = []byte{ - // 825 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0xcf, 0x6f, 0xe3, 0x44, - 0x14, 0xc7, 0xed, 0xa6, 0xc9, 0xa6, 0xcf, 0xee, 0x6a, 0x19, 0xf1, 0x63, 0xe9, 0xc1, 0x65, 0xb3, - 0x2d, 0xec, 0x01, 0x1c, 0x68, 0x57, 0xa5, 0x5a, 0x09, 0x0e, 0x61, 0xb7, 0x4a, 0xb5, 0x22, 0x42, - 0x93, 0x72, 0xe1, 0x40, 0x34, 0x76, 0xa7, 0x89, 0x85, 0xed, 0xb1, 0x3c, 0x93, 0x4d, 0x73, 0x43, - 0x5c, 0xb8, 0xf2, 0x37, 0x70, 0xe2, 0xcf, 0xe0, 0xc8, 0xb1, 0xc7, 0x15, 0x42, 0x88, 0xa6, 0x17, - 0x8e, 0xfd, 0x13, 0x90, 0xdf, 0x8c, 0x1b, 0x07, 0xd5, 0x94, 0x4b, 0xfb, 0x66, 0xfc, 0x7d, 0x9f, - 0xf7, 0xfa, 0xbe, 0xcf, 0x35, 0xec, 0xca, 0x3c, 0xec, 0x2a, 0x16, 0xc4, 0x7c, 0x24, 0x95, 0xc8, - 0x79, 0x57, 0x86, 0x13, 0x9e, 0xb0, 0x2c, 0x30, 0x81, 0x9f, 0xe5, 0x42, 0x09, 0xf2, 0x4e, 0x76, - 0xee, 0x57, 0x54, 0x7e, 0xa9, 0xda, 0xfa, 0x68, 0x1c, 0xa9, 0xc9, 0x34, 0xf0, 0x43, 0x91, 0x74, - 0xc7, 0x62, 0x2c, 0xba, 0xa8, 0x0f, 0xa6, 0x67, 0x78, 0xc2, 0x03, 0x46, 0x9a, 0xb3, 0xb5, 0x53, - 0x94, 0x93, 0x13, 0x96, 0xf3, 0xd3, 0xae, 0x9a, 0x67, 0x5c, 0xea, 0x9f, 0x59, 0xa0, 0x7f, 0x6b, - 0x55, 0xe7, 0x31, 0x6c, 0xf6, 0x84, 0x88, 0x39, 0x4b, 0xbf, 0x10, 0xf1, 0x34, 0x49, 0x09, 0x81, - 0xf5, 0x53, 0xa6, 0xd8, 0x43, 0xfb, 0xbd, 0xc6, 0x93, 0x36, 0xc5, 0xb8, 0xf3, 0x08, 0x9c, 0xe3, - 0x54, 0x1d, 0x3c, 0xbd, 0x45, 0xd2, 0x30, 0x92, 0x03, 0xd8, 0xfc, 0xfa, 0x38, 0x55, 0x9f, 0xec, - 0x1d, 0x1a, 0xd1, 0x6e, 0x45, 0xe4, 0xec, 0xbd, 0xe1, 0x17, 0x7f, 0x15, 0xd6, 0x35, 0x32, 0x93, - 0xf7, 0x18, 0x36, 0x8f, 0x62, 0xc1, 0x6e, 0x87, 0xdb, 0x46, 0xb4, 0x03, 0xf7, 0x4f, 0xa2, 0x84, - 0x1f, 0x3c, 0x1d, 0x0c, 0xff, 0xa3, 0x85, 0x6f, 0xc1, 0x1d, 0xaa, 0x3c, 0x4a, 0xc7, 0x46, 0x33, - 0xa8, 0x68, 0xdc, 0xde, 0xb3, 0xdf, 0xff, 0xdc, 0x3e, 0xc8, 0xce, 0xfd, 0x53, 0xfe, 0xaa, 0x9b, - 0x45, 0xe7, 0x11, 0xef, 0xd6, 0xda, 0xa1, 0xfb, 0xd4, 0xac, 0xe7, 0x4c, 0x31, 0xc3, 0xff, 0xa3, - 0x01, 0x2d, 0x83, 0x7e, 0x09, 0x6e, 0xa0, 0xa7, 0x36, 0x32, 0x25, 0xec, 0x27, 0xce, 0xde, 0xfb, - 0x7e, 0x8d, 0x75, 0xfe, 0xca, 0x88, 0xfb, 0x16, 0x75, 0x4c, 0x76, 0x41, 0x27, 0x2f, 0x00, 0xa2, - 0x62, 0xba, 0x1a, 0xb5, 0x86, 0xa8, 0x9d, 0x5a, 0x54, 0xc5, 0x88, 0xbe, 0x45, 0x37, 0x30, 0x13, - 0x31, 0x2f, 0xc1, 0x9d, 0x46, 0x38, 0x5a, 0x0d, 0x6a, 0xdc, 0xd1, 0xd3, 0x8a, 0x5d, 0x45, 0x4f, - 0x26, 0x1b, 0x61, 0x03, 0xd8, 0x54, 0x38, 0xf1, 0x54, 0x6a, 0xda, 0x3a, 0xd2, 0x3e, 0xa8, 0xa5, - 0xad, 0xfa, 0xd3, 0xb7, 0xa8, 0x5b, 0xe6, 0x97, 0xcd, 0x9d, 0x69, 0x9b, 0x35, 0xae, 0x79, 0x47, - 0x73, 0x2b, 0x3b, 0x51, 0x34, 0x67, 0xb2, 0x11, 0xd6, 0x07, 0x47, 0xa2, 0x39, 0x9a, 0xd5, 0x42, - 0xd6, 0x6e, 0x2d, 0xab, 0xba, 0x14, 0x7d, 0x8b, 0x82, 0xbc, 0x31, 0xb6, 0x07, 0xd0, 0x0e, 0x45, - 0x8c, 0x98, 0xce, 0x0f, 0x36, 0xb8, 0x54, 0xcc, 0x7a, 0x4c, 0x85, 0x13, 0x2c, 0xb3, 0x0f, 0xeb, - 0xa1, 0x88, 0xa5, 0xd9, 0xe0, 0xed, 0x5a, 0xbe, 0x26, 0x53, 0x14, 0x93, 0x77, 0xa1, 0x9d, 0x4e, - 0x93, 0x51, 0x2e, 0x66, 0x12, 0xad, 0x6c, 0xd0, 0x7b, 0xe9, 0x34, 0xa1, 0x62, 0x26, 0xc9, 0x03, - 0x68, 0x70, 0x31, 0x43, 0x5f, 0xda, 0xb4, 0x08, 0xf5, 0x8d, 0xc4, 0xd9, 0xe2, 0x8d, 0xec, 0x5c, - 0xaf, 0x41, 0x9b, 0xf2, 0x98, 0xa9, 0x48, 0xa4, 0xe4, 0x08, 0xee, 0x85, 0xc8, 0x2e, 0x7b, 0xf8, - 0xb0, 0xb6, 0x87, 0x32, 0xc7, 0x34, 0x73, 0x9c, 0x9e, 0x09, 0x5a, 0x26, 0xe3, 0xcb, 0xc2, 0x65, - 0x88, 0xfd, 0x6c, 0x50, 0x8c, 0xb7, 0x7e, 0x5c, 0x03, 0x58, 0x6a, 0xc9, 0x36, 0x38, 0x5a, 0x3d, - 0x4a, 0x59, 0xc2, 0x71, 0x9f, 0x37, 0x28, 0xe8, 0xab, 0x01, 0x4b, 0x38, 0xd9, 0xbf, 0x11, 0x14, - 0x6f, 0x07, 0xa2, 0xee, 0xef, 0x91, 0xe5, 0x5b, 0x5d, 0x4c, 0xec, 0x64, 0x9e, 0xf1, 0x32, 0xa9, - 0x88, 0x2b, 0x54, 0xac, 0xdf, 0xa8, 0x52, 0x9f, 0x73, 0x19, 0x92, 0x3e, 0xbc, 0x69, 0x04, 0x92, - 0x27, 0x2c, 0x55, 0x51, 0xa8, 0xf1, 0xeb, 0x88, 0x7f, 0x7b, 0x89, 0x1f, 0x9a, 0xc7, 0x58, 0x82, - 0xe8, 0x9c, 0xea, 0x1d, 0x39, 0x04, 0x37, 0x63, 0x4a, 0xf1, 0xdc, 0x34, 0xd8, 0x44, 0xc2, 0x5b, - 0x4b, 0xc2, 0x57, 0xfa, 0x29, 0x02, 0x9c, 0x6c, 0x79, 0xe8, 0xfc, 0x6c, 0x43, 0xf3, 0xa4, 0x98, - 0x29, 0xf9, 0x0c, 0xda, 0xb9, 0x99, 0xa3, 0xd9, 0xf7, 0x47, 0x77, 0x0e, 0x9c, 0xde, 0xa4, 0x90, - 0x23, 0x70, 0x72, 0x31, 0x1b, 0x05, 0xc5, 0x02, 0x71, 0xf9, 0xb0, 0x89, 0x96, 0xd5, 0xaf, 0x65, - 0x75, 0xd7, 0x28, 0xe4, 0xe6, 0xc4, 0xd1, 0x2e, 0x34, 0xa1, 0xa5, 0xed, 0x2a, 0xe2, 0xce, 0xaf, - 0x36, 0xb4, 0x86, 0x98, 0x49, 0x86, 0xe0, 0x96, 0x25, 0x47, 0x09, 0xcb, 0xcc, 0x6a, 0x7c, 0x5c, - 0xbf, 0xfe, 0xfa, 0xe3, 0x52, 0x36, 0xfc, 0x25, 0xcb, 0x5e, 0xa4, 0x2a, 0x9f, 0x53, 0x27, 0x5f, - 0xde, 0x6c, 0x31, 0x78, 0xf0, 0x6f, 0x41, 0xb1, 0x9d, 0xdf, 0xf1, 0xb9, 0xd9, 0x85, 0x22, 0x24, - 0x9f, 0x42, 0xf3, 0x15, 0x8b, 0xa7, 0xdc, 0xfc, 0x93, 0xfa, 0x1f, 0xd3, 0xd1, 0xfa, 0x67, 0x6b, - 0x87, 0x76, 0xef, 0xf3, 0x8b, 0x4b, 0xcf, 0x7a, 0x7d, 0xe9, 0x59, 0xd7, 0x97, 0x9e, 0xfd, 0xfd, - 0xc2, 0xb3, 0x7f, 0x59, 0x78, 0xf6, 0x6f, 0x0b, 0xcf, 0xbe, 0x58, 0x78, 0xf6, 0x5f, 0x0b, 0xcf, - 0xfe, 0x7b, 0xe1, 0x59, 0xd7, 0x0b, 0xcf, 0xfe, 0xe9, 0xca, 0xb3, 0x2e, 0xae, 0x3c, 0xeb, 0xf5, - 0x95, 0x67, 0x7d, 0xd3, 0x2e, 0x99, 0x41, 0x0b, 0x3f, 0x58, 0xfb, 0xff, 0x04, 0x00, 0x00, 0xff, - 0xff, 0xbd, 0x31, 0x06, 0x07, 0x47, 0x07, 0x00, 0x00, + // 810 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0x41, 0x6f, 0x1b, 0x45, + 0x14, 0xc7, 0x77, 0xe3, 0xd8, 0x75, 0xde, 0x6e, 0xaa, 0x32, 0x2a, 0x50, 0x7c, 0xd8, 0x50, 0x37, + 0x81, 0x1e, 0x90, 0x0d, 0x4e, 0x65, 0xa2, 0x4a, 0x70, 0x30, 0x6d, 0xe4, 0xa8, 0xc2, 0x42, 0xe3, + 0x70, 0xe1, 0x80, 0x35, 0xde, 0x4c, 0x93, 0x15, 0xbb, 0x3b, 0xab, 0x9d, 0x71, 0x1d, 0xdf, 0x10, + 0x17, 0xae, 0x7c, 0x06, 0x4e, 0x7c, 0x0c, 0x8e, 0x1c, 0x73, 0xac, 0x10, 0x42, 0xc4, 0xb9, 0x70, + 0xcc, 0x47, 0x40, 0xf3, 0x66, 0x36, 0x5e, 0xa3, 0x2e, 0xe1, 0x92, 0x3c, 0x8f, 0xff, 0xef, 0x37, + 0x7f, 0xbd, 0xff, 0x5b, 0x2f, 0xec, 0xc9, 0x3c, 0xec, 0x2a, 0x36, 0x8d, 0xf9, 0x44, 0x2a, 0x91, + 0xf3, 0xae, 0x0c, 0xcf, 0x78, 0xc2, 0xb2, 0xa9, 0x2d, 0x3a, 0x59, 0x2e, 0x94, 0x20, 0xef, 0x66, + 0xe7, 0x9d, 0x92, 0xaa, 0x53, 0xa8, 0x5a, 0xf7, 0x4f, 0xc5, 0xa9, 0x40, 0x4d, 0x57, 0x57, 0x46, + 0xde, 0xda, 0xd5, 0x54, 0x79, 0xc6, 0x72, 0x7e, 0xd2, 0x55, 0x8b, 0x8c, 0x4b, 0xf3, 0x37, 0x9b, + 0x9a, 0xff, 0x46, 0xd5, 0x7e, 0x04, 0xdb, 0x03, 0x21, 0x62, 0xce, 0xd2, 0x2f, 0x44, 0x3c, 0x4b, + 0x52, 0x42, 0x60, 0xf3, 0x84, 0x29, 0xf6, 0xc0, 0x7d, 0xbf, 0xf6, 0xb8, 0x49, 0xb1, 0x6e, 0x3f, + 0x04, 0xef, 0x28, 0x55, 0xfd, 0x27, 0x6f, 0x90, 0xd4, 0xac, 0xa4, 0x0f, 0xdb, 0x5f, 0x1f, 0xa5, + 0xea, 0x93, 0xde, 0x81, 0x15, 0xed, 0x95, 0x44, 0x5e, 0xef, 0xad, 0x8e, 0x36, 0x8f, 0xf7, 0x5a, + 0x99, 0xed, 0x7b, 0x04, 0xdb, 0x87, 0xb1, 0x60, 0x6f, 0x86, 0xbb, 0x56, 0xb4, 0x0b, 0x77, 0x8f, + 0xa3, 0x84, 0xf7, 0x9f, 0x8c, 0xc6, 0xff, 0x61, 0xe1, 0x5b, 0xf0, 0xc7, 0x2a, 0x8f, 0xd2, 0x53, + 0xab, 0x19, 0x95, 0x34, 0xfe, 0xe0, 0xe9, 0xef, 0x7f, 0xee, 0xf4, 0xb3, 0xf3, 0xce, 0x09, 0x7f, + 0xd5, 0xcd, 0xa2, 0xf3, 0x88, 0x77, 0x2b, 0xa7, 0x6e, 0x7c, 0x1a, 0xd6, 0x33, 0xa6, 0x98, 0xe5, + 0xff, 0x51, 0x83, 0x86, 0x45, 0xbf, 0x00, 0x7f, 0x6a, 0xa6, 0x36, 0xb1, 0x57, 0xb8, 0x8f, 0xbd, + 0xde, 0x07, 0x9d, 0x8a, 0x84, 0x3a, 0x6b, 0x23, 0x1e, 0x3a, 0xd4, 0xb3, 0xdd, 0x9a, 0x4e, 0x9e, + 0x03, 0x44, 0x7a, 0xba, 0x06, 0xb5, 0x81, 0xa8, 0xdd, 0x4a, 0x54, 0x29, 0x88, 0xa1, 0x43, 0xb7, + 0xb0, 0x13, 0x31, 0x2f, 0xc0, 0x9f, 0x45, 0x38, 0x5a, 0x03, 0xaa, 0xdd, 0xe2, 0x69, 0x2d, 0x2e, + 0xed, 0xc9, 0x76, 0x23, 0x6c, 0x04, 0xdb, 0x0a, 0x27, 0x9e, 0x4a, 0x43, 0xdb, 0x44, 0xda, 0x87, + 0x95, 0xb4, 0xf5, 0x7c, 0x86, 0x0e, 0xf5, 0x8b, 0xfe, 0xc2, 0xdc, 0x4b, 0x13, 0xb3, 0xc1, 0xd5, + 0x6f, 0x31, 0xb7, 0xb6, 0x13, 0xda, 0x9c, 0xed, 0x46, 0xd8, 0x10, 0x3c, 0x89, 0xe1, 0x18, 0x56, + 0x03, 0x59, 0x7b, 0x95, 0xac, 0xf2, 0x52, 0x0c, 0x1d, 0x0a, 0xf2, 0x26, 0xd8, 0x01, 0x40, 0x33, + 0x14, 0x31, 0x62, 0xda, 0x3f, 0xb8, 0xe0, 0x53, 0x31, 0x1f, 0x30, 0x15, 0x9e, 0xe1, 0x35, 0xfb, + 0xb0, 0x19, 0x8a, 0x58, 0xda, 0x0d, 0xde, 0xa9, 0xe4, 0x1b, 0x32, 0x45, 0x31, 0x79, 0x0f, 0x9a, + 0xe9, 0x2c, 0x99, 0xe4, 0x62, 0x2e, 0x31, 0xca, 0x1a, 0xbd, 0x93, 0xce, 0x12, 0x2a, 0xe6, 0x92, + 0xdc, 0x83, 0x1a, 0x17, 0x73, 0xcc, 0xa5, 0x49, 0x75, 0x69, 0x4e, 0x24, 0xce, 0x16, 0x4f, 0x64, + 0xfb, 0x7a, 0x03, 0x9a, 0x94, 0xc7, 0x4c, 0x45, 0x22, 0x25, 0x87, 0x70, 0x27, 0x44, 0x76, 0xe1, + 0xe1, 0xa3, 0x4a, 0x0f, 0x45, 0x8f, 0x35, 0x73, 0x94, 0xbe, 0x14, 0xb4, 0x68, 0xc6, 0x87, 0x85, + 0xcb, 0x10, 0xfd, 0x6c, 0x51, 0xac, 0x5b, 0x3f, 0x6e, 0x00, 0xac, 0xb4, 0x64, 0x07, 0x3c, 0xa3, + 0x9e, 0xa4, 0x2c, 0xe1, 0xb8, 0xcf, 0x5b, 0x14, 0xcc, 0xd1, 0x88, 0x25, 0x9c, 0xec, 0xdf, 0x08, + 0xf4, 0xd3, 0x81, 0xa8, 0xbb, 0x3d, 0xb2, 0x7a, 0xaa, 0xf5, 0xc4, 0x8e, 0x17, 0x19, 0x2f, 0x9a, + 0x74, 0x5d, 0xa2, 0xe2, 0xfd, 0xb5, 0x32, 0xf5, 0x19, 0x97, 0x21, 0x19, 0xc2, 0x7d, 0x2b, 0x90, + 0x3c, 0x61, 0xa9, 0x8a, 0x42, 0x83, 0xdf, 0x44, 0xfc, 0x3b, 0x2b, 0xfc, 0xd8, 0x7e, 0x8d, 0x57, + 0x10, 0xd3, 0x53, 0x3e, 0x23, 0x07, 0xe0, 0x67, 0x4c, 0x29, 0x9e, 0x5b, 0x83, 0x75, 0x24, 0xbc, + 0xbd, 0x22, 0x7c, 0x65, 0xbe, 0x45, 0x80, 0x97, 0xad, 0x3e, 0xb4, 0x7f, 0x76, 0xa1, 0x7e, 0xac, + 0x67, 0x4a, 0x3e, 0x83, 0x66, 0x6e, 0xe7, 0x68, 0xf7, 0xfd, 0xe1, 0xad, 0x03, 0xa7, 0x37, 0x2d, + 0xe4, 0x10, 0xbc, 0x5c, 0xcc, 0x27, 0x53, 0xbd, 0x40, 0x5c, 0x3e, 0xa8, 0x63, 0x64, 0xd5, 0x6b, + 0x59, 0xde, 0x35, 0x0a, 0xb9, 0xfd, 0xc4, 0x31, 0x2e, 0x0c, 0xa1, 0x61, 0xe2, 0xd2, 0x75, 0xfb, + 0x57, 0x17, 0x1a, 0x63, 0xec, 0x24, 0x63, 0xf0, 0x8b, 0x2b, 0x27, 0x09, 0xcb, 0xec, 0x6a, 0x7c, + 0x5c, 0xbd, 0xfe, 0xe6, 0x1d, 0x52, 0x18, 0xfe, 0x92, 0x65, 0xcf, 0x53, 0x95, 0x2f, 0xa8, 0x97, + 0xaf, 0x4e, 0x5a, 0x0c, 0xee, 0xfd, 0x5b, 0xa0, 0xb7, 0xf3, 0x3b, 0xbe, 0xb0, 0xbb, 0xa0, 0x4b, + 0xf2, 0x29, 0xd4, 0x5f, 0xb1, 0x78, 0xc6, 0xed, 0x8f, 0xd4, 0xff, 0x98, 0x8e, 0xd1, 0x3f, 0xdd, + 0x38, 0x70, 0x07, 0x9f, 0x5f, 0x5c, 0x06, 0xce, 0xeb, 0xcb, 0xc0, 0xb9, 0xbe, 0x0c, 0xdc, 0xef, + 0x97, 0x81, 0xfb, 0xcb, 0x32, 0x70, 0x7f, 0x5b, 0x06, 0xee, 0xc5, 0x32, 0x70, 0xff, 0x5a, 0x06, + 0xee, 0xdf, 0xcb, 0xc0, 0xb9, 0x5e, 0x06, 0xee, 0x4f, 0x57, 0x81, 0x73, 0x71, 0x15, 0x38, 0xaf, + 0xaf, 0x02, 0xe7, 0x9b, 0x66, 0xc1, 0x9c, 0x36, 0xf0, 0x85, 0xb5, 0xff, 0x4f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xc4, 0x65, 0x33, 0xdc, 0x2e, 0x07, 0x00, 0x00, } func (this *BooleanColumn) Equal(that interface{}) bool { diff --git a/src/table_store/schemapb/schema.proto b/src/table_store/schemapb/schema.proto index 4f4c3de8f4c..25b11d7f6c4 100644 --- a/src/table_store/schemapb/schema.proto +++ b/src/table_store/schemapb/schema.proto @@ -22,7 +22,7 @@ package px.table_store.schemapb; option go_package = "schemapb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "src/shared/types/typespb/types.proto"; // PX_CARNOT_UPDATE_FOR_NEW_TYPES. diff --git a/src/ui/package.json b/src/ui/package.json index 072b87fd2f3..11798ecec1e 100644 --- a/src/ui/package.json +++ b/src/ui/package.json @@ -39,7 +39,7 @@ "concurrently": "^6.2.0", "css-loader": "^5.2.6", "cypress": "^12.17.2", - "esbuild": "^0.18.2", + "esbuild": "^0.25.0", "esbuild-jest": "^0.5.0", "esbuild-loader": "^3.0.1", "eslint": "^8.42.0", diff --git a/src/ui/yarn.lock b/src/ui/yarn.lock index 8ace87d8e0f..9d3f45fa7f6 100644 --- a/src/ui/yarn.lock +++ b/src/ui/yarn.lock @@ -1751,6 +1751,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/aix-ppc64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/aix-ppc64@npm:0.25.0" + conditions: os=aix & cpu=ppc64 + languageName: node + linkType: hard + "@esbuild/android-arm64@npm:0.17.19": version: 0.17.19 resolution: "@esbuild/android-arm64@npm:0.17.19" @@ -1758,9 +1765,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/android-arm64@npm:0.18.2" +"@esbuild/android-arm64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/android-arm64@npm:0.25.0" conditions: os=android & cpu=arm64 languageName: node linkType: hard @@ -1772,9 +1779,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/android-arm@npm:0.18.2" +"@esbuild/android-arm@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/android-arm@npm:0.25.0" conditions: os=android & cpu=arm languageName: node linkType: hard @@ -1786,9 +1793,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-x64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/android-x64@npm:0.18.2" +"@esbuild/android-x64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/android-x64@npm:0.25.0" conditions: os=android & cpu=x64 languageName: node linkType: hard @@ -1800,9 +1807,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/darwin-arm64@npm:0.18.2" +"@esbuild/darwin-arm64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/darwin-arm64@npm:0.25.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -1814,9 +1821,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/darwin-x64@npm:0.18.2" +"@esbuild/darwin-x64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/darwin-x64@npm:0.25.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -1828,9 +1835,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/freebsd-arm64@npm:0.18.2" +"@esbuild/freebsd-arm64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/freebsd-arm64@npm:0.25.0" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard @@ -1842,9 +1849,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/freebsd-x64@npm:0.18.2" +"@esbuild/freebsd-x64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/freebsd-x64@npm:0.25.0" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard @@ -1856,9 +1863,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/linux-arm64@npm:0.18.2" +"@esbuild/linux-arm64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/linux-arm64@npm:0.25.0" conditions: os=linux & cpu=arm64 languageName: node linkType: hard @@ -1870,9 +1877,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/linux-arm@npm:0.18.2" +"@esbuild/linux-arm@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/linux-arm@npm:0.25.0" conditions: os=linux & cpu=arm languageName: node linkType: hard @@ -1884,9 +1891,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/linux-ia32@npm:0.18.2" +"@esbuild/linux-ia32@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/linux-ia32@npm:0.25.0" conditions: os=linux & cpu=ia32 languageName: node linkType: hard @@ -1898,9 +1905,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/linux-loong64@npm:0.18.2" +"@esbuild/linux-loong64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/linux-loong64@npm:0.25.0" conditions: os=linux & cpu=loong64 languageName: node linkType: hard @@ -1912,9 +1919,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/linux-mips64el@npm:0.18.2" +"@esbuild/linux-mips64el@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/linux-mips64el@npm:0.25.0" conditions: os=linux & cpu=mips64el languageName: node linkType: hard @@ -1926,9 +1933,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/linux-ppc64@npm:0.18.2" +"@esbuild/linux-ppc64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/linux-ppc64@npm:0.25.0" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard @@ -1940,9 +1947,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/linux-riscv64@npm:0.18.2" +"@esbuild/linux-riscv64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/linux-riscv64@npm:0.25.0" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard @@ -1954,9 +1961,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/linux-s390x@npm:0.18.2" +"@esbuild/linux-s390x@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/linux-s390x@npm:0.25.0" conditions: os=linux & cpu=s390x languageName: node linkType: hard @@ -1968,13 +1975,20 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/linux-x64@npm:0.18.2" +"@esbuild/linux-x64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/linux-x64@npm:0.25.0" conditions: os=linux & cpu=x64 languageName: node linkType: hard +"@esbuild/netbsd-arm64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/netbsd-arm64@npm:0.25.0" + conditions: os=netbsd & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/netbsd-x64@npm:0.17.19": version: 0.17.19 resolution: "@esbuild/netbsd-x64@npm:0.17.19" @@ -1982,13 +1996,20 @@ __metadata: languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/netbsd-x64@npm:0.18.2" +"@esbuild/netbsd-x64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/netbsd-x64@npm:0.25.0" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard +"@esbuild/openbsd-arm64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/openbsd-arm64@npm:0.25.0" + conditions: os=openbsd & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/openbsd-x64@npm:0.17.19": version: 0.17.19 resolution: "@esbuild/openbsd-x64@npm:0.17.19" @@ -1996,9 +2017,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/openbsd-x64@npm:0.18.2" +"@esbuild/openbsd-x64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/openbsd-x64@npm:0.25.0" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard @@ -2010,9 +2031,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/sunos-x64@npm:0.18.2" +"@esbuild/sunos-x64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/sunos-x64@npm:0.25.0" conditions: os=sunos & cpu=x64 languageName: node linkType: hard @@ -2024,9 +2045,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/win32-arm64@npm:0.18.2" +"@esbuild/win32-arm64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/win32-arm64@npm:0.25.0" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -2038,9 +2059,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/win32-ia32@npm:0.18.2" +"@esbuild/win32-ia32@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/win32-ia32@npm:0.25.0" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard @@ -2052,9 +2073,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.18.2": - version: 0.18.2 - resolution: "@esbuild/win32-x64@npm:0.18.2" +"@esbuild/win32-x64@npm:0.25.0": + version: 0.25.0 + resolution: "@esbuild/win32-x64@npm:0.25.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -2772,7 +2793,7 @@ __metadata: css-loader: ^5.2.6 cypress: ^12.17.2 date-fns: ^2.29.3 - esbuild: ^0.18.2 + esbuild: ^0.25.0 esbuild-jest: ^0.5.0 esbuild-loader: ^3.0.1 eslint: ^8.42.0 @@ -4910,9 +4931,9 @@ __metadata: languageName: node linkType: hard -"body-parser@npm:1.20.2": - version: 1.20.2 - resolution: "body-parser@npm:1.20.2" +"body-parser@npm:1.20.3": + version: 1.20.3 + resolution: "body-parser@npm:1.20.3" dependencies: bytes: 3.1.2 content-type: ~1.0.5 @@ -4922,11 +4943,11 @@ __metadata: http-errors: 2.0.0 iconv-lite: 0.4.24 on-finished: 2.4.1 - qs: 6.11.0 + qs: 6.13.0 raw-body: 2.5.2 type-is: ~1.6.18 unpipe: 1.0.0 - checksum: 14d37ec638ab5c93f6099ecaed7f28f890d222c650c69306872e00b9efa081ff6c596cd9afb9930656aae4d6c4e1c17537bea12bb73c87a217cb3cfea8896737 + checksum: 1a35c59a6be8d852b00946330141c4f142c6af0f970faa87f10ad74f1ee7118078056706a05ae3093c54dabca9cd3770fa62a170a85801da1a4324f04381167d languageName: node linkType: hard @@ -5144,6 +5165,16 @@ __metadata: languageName: node linkType: hard +"call-bind-apply-helpers@npm:^1.0.1": + version: 1.0.2 + resolution: "call-bind-apply-helpers@npm:1.0.2" + dependencies: + es-errors: ^1.3.0 + function-bind: ^1.1.2 + checksum: b2863d74fcf2a6948221f65d95b91b4b2d90cfe8927650b506141e669f7d5de65cea191bf788838bc40d13846b7886c5bc5c84ab96c3adbcf88ad69a72fcdc6b + languageName: node + linkType: hard + "call-bind@npm:^1.0.0, call-bind@npm:^1.0.2": version: 1.0.2 resolution: "call-bind@npm:1.0.2" @@ -5154,6 +5185,16 @@ __metadata: languageName: node linkType: hard +"call-bound@npm:^1.0.2": + version: 1.0.3 + resolution: "call-bound@npm:1.0.3" + dependencies: + call-bind-apply-helpers: ^1.0.1 + get-intrinsic: ^1.2.6 + checksum: a93bbe0f2d0a2d6c144a4349ccd0593d5d0d5d9309b69101710644af8964286420062f2cc3114dca120b9bc8cc07507952d4b1b3ea7672e0d7f6f1675efedb32 + languageName: node + linkType: hard + "callsites@npm:^3.0.0": version: 3.1.0 resolution: "callsites@npm:3.1.0" @@ -5788,10 +5829,10 @@ __metadata: languageName: node linkType: hard -"cookie@npm:0.6.0": - version: 0.6.0 - resolution: "cookie@npm:0.6.0" - checksum: f56a7d32a07db5458e79c726b77e3c2eff655c36792f2b6c58d351fb5f61531e5b1ab7f46987150136e366c65213cbe31729e02a3eaed630c3bf7334635fb410 +"cookie@npm:0.7.1": + version: 0.7.1 + resolution: "cookie@npm:0.7.1" + checksum: cec5e425549b3650eb5c3498a9ba3cde0b9cd419e3b36e4b92739d30b4d89e0b678b98c1ddc209ce7cf958cd3215671fd6ac47aec21f10c2a0cc68abd399d8a7 languageName: node linkType: hard @@ -6705,6 +6746,17 @@ __metadata: languageName: node linkType: hard +"dunder-proto@npm:^1.0.1": + version: 1.0.1 + resolution: "dunder-proto@npm:1.0.1" + dependencies: + call-bind-apply-helpers: ^1.0.1 + es-errors: ^1.3.0 + gopd: ^1.2.0 + checksum: 149207e36f07bd4941921b0ca929e3a28f1da7bd6b6ff8ff7f4e2f2e460675af4576eeba359c635723dc189b64cdd4787e0255897d5b135ccc5d15cb8685fc90 + languageName: node + linkType: hard + "duplexer@npm:^0.1.2": version: 0.1.2 resolution: "duplexer@npm:0.1.2" @@ -6764,6 +6816,13 @@ __metadata: languageName: node linkType: hard +"encodeurl@npm:~2.0.0": + version: 2.0.0 + resolution: "encodeurl@npm:2.0.0" + checksum: abf5cd51b78082cf8af7be6785813c33b6df2068ce5191a40ca8b1afe6a86f9230af9a9ce694a5ce4665955e5c1120871826df9c128a642e09c58d592e2807fe + languageName: node + linkType: hard + "encoding@npm:^0.1.12": version: 0.1.13 resolution: "encoding@npm:0.1.13" @@ -6898,6 +6957,20 @@ __metadata: languageName: node linkType: hard +"es-define-property@npm:^1.0.1": + version: 1.0.1 + resolution: "es-define-property@npm:1.0.1" + checksum: 0512f4e5d564021c9e3a644437b0155af2679d10d80f21adaf868e64d30efdfbd321631956f20f42d655fedb2e3a027da479fad3fa6048f768eb453a80a5f80a + languageName: node + linkType: hard + +"es-errors@npm:^1.3.0": + version: 1.3.0 + resolution: "es-errors@npm:1.3.0" + checksum: ec1414527a0ccacd7f15f4a3bc66e215f04f595ba23ca75cdae0927af099b5ec865f9f4d33e9d7e86f512f252876ac77d4281a7871531a50678132429b1271b5 + languageName: node + linkType: hard + "es-module-lexer@npm:^1.2.1": version: 1.2.1 resolution: "es-module-lexer@npm:1.2.1" @@ -6905,6 +6978,15 @@ __metadata: languageName: node linkType: hard +"es-object-atoms@npm:^1.0.0": + version: 1.1.1 + resolution: "es-object-atoms@npm:1.1.1" + dependencies: + es-errors: ^1.3.0 + checksum: 214d3767287b12f36d3d7267ef342bbbe1e89f899cfd67040309fc65032372a8e60201410a99a1645f2f90c1912c8c49c8668066f6bdd954bcd614dda2e3da97 + languageName: node + linkType: hard + "es-set-tostringtag@npm:^2.0.1": version: 2.0.1 resolution: "es-set-tostringtag@npm:2.0.1" @@ -7040,33 +7122,38 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.18.2": - version: 0.18.2 - resolution: "esbuild@npm:0.18.2" - dependencies: - "@esbuild/android-arm": 0.18.2 - "@esbuild/android-arm64": 0.18.2 - "@esbuild/android-x64": 0.18.2 - "@esbuild/darwin-arm64": 0.18.2 - "@esbuild/darwin-x64": 0.18.2 - "@esbuild/freebsd-arm64": 0.18.2 - "@esbuild/freebsd-x64": 0.18.2 - "@esbuild/linux-arm": 0.18.2 - "@esbuild/linux-arm64": 0.18.2 - "@esbuild/linux-ia32": 0.18.2 - "@esbuild/linux-loong64": 0.18.2 - "@esbuild/linux-mips64el": 0.18.2 - "@esbuild/linux-ppc64": 0.18.2 - "@esbuild/linux-riscv64": 0.18.2 - "@esbuild/linux-s390x": 0.18.2 - "@esbuild/linux-x64": 0.18.2 - "@esbuild/netbsd-x64": 0.18.2 - "@esbuild/openbsd-x64": 0.18.2 - "@esbuild/sunos-x64": 0.18.2 - "@esbuild/win32-arm64": 0.18.2 - "@esbuild/win32-ia32": 0.18.2 - "@esbuild/win32-x64": 0.18.2 +"esbuild@npm:^0.25.0": + version: 0.25.0 + resolution: "esbuild@npm:0.25.0" + dependencies: + "@esbuild/aix-ppc64": 0.25.0 + "@esbuild/android-arm": 0.25.0 + "@esbuild/android-arm64": 0.25.0 + "@esbuild/android-x64": 0.25.0 + "@esbuild/darwin-arm64": 0.25.0 + "@esbuild/darwin-x64": 0.25.0 + "@esbuild/freebsd-arm64": 0.25.0 + "@esbuild/freebsd-x64": 0.25.0 + "@esbuild/linux-arm": 0.25.0 + "@esbuild/linux-arm64": 0.25.0 + "@esbuild/linux-ia32": 0.25.0 + "@esbuild/linux-loong64": 0.25.0 + "@esbuild/linux-mips64el": 0.25.0 + "@esbuild/linux-ppc64": 0.25.0 + "@esbuild/linux-riscv64": 0.25.0 + "@esbuild/linux-s390x": 0.25.0 + "@esbuild/linux-x64": 0.25.0 + "@esbuild/netbsd-arm64": 0.25.0 + "@esbuild/netbsd-x64": 0.25.0 + "@esbuild/openbsd-arm64": 0.25.0 + "@esbuild/openbsd-x64": 0.25.0 + "@esbuild/sunos-x64": 0.25.0 + "@esbuild/win32-arm64": 0.25.0 + "@esbuild/win32-ia32": 0.25.0 + "@esbuild/win32-x64": 0.25.0 dependenciesMeta: + "@esbuild/aix-ppc64": + optional: true "@esbuild/android-arm": optional: true "@esbuild/android-arm64": @@ -7099,8 +7186,12 @@ __metadata: optional: true "@esbuild/linux-x64": optional: true + "@esbuild/netbsd-arm64": + optional: true "@esbuild/netbsd-x64": optional: true + "@esbuild/openbsd-arm64": + optional: true "@esbuild/openbsd-x64": optional: true "@esbuild/sunos-x64": @@ -7113,7 +7204,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 64d82cc5fa1280f1730f96fdb9a74a23effb01de63d020c99f9090ea792fe78199daf083e842eccd3a55ccbad3d1bafb2f4b86280b6c8ce203fa309f06312597 + checksum: 4d1e0cb7c059a373ea3edb20ca5efcea29efada03e4ea82b2b8ab1f2f062e4791e9744213308775d26e07a0225a7d8250da93da5c8e07ef61bb93d58caab8cf9 languageName: node linkType: hard @@ -7640,41 +7731,41 @@ __metadata: linkType: hard "express@npm:^4.17.3": - version: 4.19.2 - resolution: "express@npm:4.19.2" + version: 4.21.2 + resolution: "express@npm:4.21.2" dependencies: accepts: ~1.3.8 array-flatten: 1.1.1 - body-parser: 1.20.2 + body-parser: 1.20.3 content-disposition: 0.5.4 content-type: ~1.0.4 - cookie: 0.6.0 + cookie: 0.7.1 cookie-signature: 1.0.6 debug: 2.6.9 depd: 2.0.0 - encodeurl: ~1.0.2 + encodeurl: ~2.0.0 escape-html: ~1.0.3 etag: ~1.8.1 - finalhandler: 1.2.0 + finalhandler: 1.3.1 fresh: 0.5.2 http-errors: 2.0.0 - merge-descriptors: 1.0.1 + merge-descriptors: 1.0.3 methods: ~1.1.2 on-finished: 2.4.1 parseurl: ~1.3.3 - path-to-regexp: 0.1.7 + path-to-regexp: 0.1.12 proxy-addr: ~2.0.7 - qs: 6.11.0 + qs: 6.13.0 range-parser: ~1.2.1 safe-buffer: 5.2.1 - send: 0.18.0 - serve-static: 1.15.0 + send: 0.19.0 + serve-static: 1.16.2 setprototypeof: 1.2.0 statuses: 2.0.1 type-is: ~1.6.18 utils-merge: 1.0.1 vary: ~1.1.2 - checksum: 212dbd6c2c222a96a61bc927639c95970a53b06257080bb9e2838adb3bffdb966856551fdad1ab5dd654a217c35db94f987d0aa88d48fb04d306340f5f34dca5 + checksum: 3aef1d355622732e20b8f3a7c112d4391d44e2131f4f449e1f273a309752a41abfad714e881f177645517cbe29b3ccdc10b35e7e25c13506114244a5b72f549d languageName: node linkType: hard @@ -7948,18 +8039,18 @@ __metadata: languageName: node linkType: hard -"finalhandler@npm:1.2.0": - version: 1.2.0 - resolution: "finalhandler@npm:1.2.0" +"finalhandler@npm:1.3.1": + version: 1.3.1 + resolution: "finalhandler@npm:1.3.1" dependencies: debug: 2.6.9 - encodeurl: ~1.0.2 + encodeurl: ~2.0.0 escape-html: ~1.0.3 on-finished: 2.4.1 parseurl: ~1.3.3 statuses: 2.0.1 unpipe: ~1.0.0 - checksum: 92effbfd32e22a7dff2994acedbd9bcc3aa646a3e919ea6a53238090e87097f8ef07cced90aa2cc421abdf993aefbdd5b00104d55c7c5479a8d00ed105b45716 + checksum: a8c58cd97c9cd47679a870f6833a7b417043f5a288cd6af6d0f49b476c874a506100303a128b6d3b654c3d74fa4ff2ffed68a48a27e8630cda5c918f2977dcf4 languageName: node linkType: hard @@ -8165,6 +8256,13 @@ __metadata: languageName: node linkType: hard +"function-bind@npm:^1.1.2": + version: 1.1.2 + resolution: "function-bind@npm:1.1.2" + checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1 + languageName: node + linkType: hard + "function.prototype.name@npm:^1.1.5": version: 1.1.5 resolution: "function.prototype.name@npm:1.1.5" @@ -8243,6 +8341,24 @@ __metadata: languageName: node linkType: hard +"get-intrinsic@npm:^1.2.5, get-intrinsic@npm:^1.2.6": + version: 1.2.7 + resolution: "get-intrinsic@npm:1.2.7" + dependencies: + call-bind-apply-helpers: ^1.0.1 + es-define-property: ^1.0.1 + es-errors: ^1.3.0 + es-object-atoms: ^1.0.0 + function-bind: ^1.1.2 + get-proto: ^1.0.0 + gopd: ^1.2.0 + has-symbols: ^1.1.0 + hasown: ^2.0.2 + math-intrinsics: ^1.1.0 + checksum: a1597b3b432074f805b6a0ba1182130dd6517c0ea0c4eecc4b8834c803913e1ea62dfc412865be795b3dacb1555a21775b70cf9af7a18b1454ff3414e5442d4a + languageName: node + linkType: hard + "get-package-type@npm:^0.1.0": version: 0.1.0 resolution: "get-package-type@npm:0.1.0" @@ -8250,6 +8366,16 @@ __metadata: languageName: node linkType: hard +"get-proto@npm:^1.0.0": + version: 1.0.1 + resolution: "get-proto@npm:1.0.1" + dependencies: + dunder-proto: ^1.0.1 + es-object-atoms: ^1.0.0 + checksum: 4fc96afdb58ced9a67558698b91433e6b037aaa6f1493af77498d7c85b141382cf223c0e5946f334fb328ee85dfe6edd06d218eaf09556f4bc4ec6005d7f5f7b + languageName: node + linkType: hard + "get-stream@npm:^4.0.0": version: 4.1.0 resolution: "get-stream@npm:4.1.0" @@ -8452,6 +8578,13 @@ __metadata: languageName: node linkType: hard +"gopd@npm:^1.2.0": + version: 1.2.0 + resolution: "gopd@npm:1.2.0" + checksum: cc6d8e655e360955bdccaca51a12a474268f95bb793fc3e1f2bdadb075f28bfd1fd988dab872daf77a61d78cbaf13744bc8727a17cfb1d150d76047d805375f3 + languageName: node + linkType: hard + "got@npm:^11.7.0": version: 11.8.5 resolution: "got@npm:11.8.5" @@ -8592,6 +8725,13 @@ __metadata: languageName: node linkType: hard +"has-symbols@npm:^1.1.0": + version: 1.1.0 + resolution: "has-symbols@npm:1.1.0" + checksum: b2316c7302a0e8ba3aaba215f834e96c22c86f192e7310bdf689dd0e6999510c89b00fbc5742571507cebf25764d68c988b3a0da217369a73596191ac0ce694b + languageName: node + linkType: hard + "has-tostringtag@npm:^1.0.0": version: 1.0.0 resolution: "has-tostringtag@npm:1.0.0" @@ -8656,6 +8796,15 @@ __metadata: languageName: node linkType: hard +"hasown@npm:^2.0.2": + version: 2.0.2 + resolution: "hasown@npm:2.0.2" + dependencies: + function-bind: ^1.1.2 + checksum: e8516f776a15149ca6c6ed2ae3110c417a00b62260e222590e54aa367cbcd6ed99122020b37b7fbdf05748df57b265e70095d7bf35a47660587619b15ffb93db + languageName: node + linkType: hard + "he@npm:^1.2.0": version: 1.2.0 resolution: "he@npm:1.2.0" @@ -10974,6 +11123,13 @@ __metadata: languageName: node linkType: hard +"math-intrinsics@npm:^1.1.0": + version: 1.1.0 + resolution: "math-intrinsics@npm:1.1.0" + checksum: 0e513b29d120f478c85a70f49da0b8b19bc638975eca466f2eeae0071f3ad00454c621bf66e16dd435896c208e719fc91ad79bbfba4e400fe0b372e7c1c9c9a2 + languageName: node + linkType: hard + "media-typer@npm:0.3.0": version: 0.3.0 resolution: "media-typer@npm:0.3.0" @@ -10997,10 +11153,10 @@ __metadata: languageName: node linkType: hard -"merge-descriptors@npm:1.0.1": - version: 1.0.1 - resolution: "merge-descriptors@npm:1.0.1" - checksum: 5abc259d2ae25bb06d19ce2b94a21632583c74e2a9109ee1ba7fd147aa7362b380d971e0251069f8b3eb7d48c21ac839e21fa177b335e82c76ec172e30c31a26 +"merge-descriptors@npm:1.0.3": + version: 1.0.3 + resolution: "merge-descriptors@npm:1.0.3" + checksum: 52117adbe0313d5defa771c9993fe081e2d2df9b840597e966aadafde04ae8d0e3da46bac7ca4efc37d4d2b839436582659cd49c6a43eacb3fe3050896a105d1 languageName: node linkType: hard @@ -11361,11 +11517,11 @@ __metadata: linkType: hard "nanoid@npm:^3.3.6": - version: 3.3.7 - resolution: "nanoid@npm:3.3.7" + version: 3.3.8 + resolution: "nanoid@npm:3.3.8" bin: nanoid: bin/nanoid.cjs - checksum: d36c427e530713e4ac6567d488b489a36582ef89da1d6d4e3b87eded11eb10d7042a877958c6f104929809b2ab0bafa17652b076cdf84324aa75b30b722204f2 + checksum: dfe0adbc0c77e9655b550c333075f51bb28cfc7568afbf3237249904f9c86c9aaaed1f113f0fddddba75673ee31c758c30c43d4414f014a52a7a626efc5958c9 languageName: node linkType: hard @@ -11701,6 +11857,13 @@ __metadata: languageName: node linkType: hard +"object-inspect@npm:^1.13.3": + version: 1.13.4 + resolution: "object-inspect@npm:1.13.4" + checksum: 582810c6a8d2ef988ea0a39e69e115a138dad8f42dd445383b394877e5816eb4268489f316a6f74ee9c4e0a984b3eab1028e3e79d62b1ed67c726661d55c7a8b + languageName: node + linkType: hard + "object-keys@npm:^1.1.1": version: 1.1.1 resolution: "object-keys@npm:1.1.1" @@ -12178,10 +12341,10 @@ __metadata: languageName: node linkType: hard -"path-to-regexp@npm:0.1.7": - version: 0.1.7 - resolution: "path-to-regexp@npm:0.1.7" - checksum: 69a14ea24db543e8b0f4353305c5eac6907917031340e5a8b37df688e52accd09e3cebfe1660b70d76b6bd89152f52183f28c74813dbf454ba1a01c82a38abce +"path-to-regexp@npm:0.1.12": + version: 0.1.12 + resolution: "path-to-regexp@npm:0.1.12" + checksum: ab237858bee7b25ecd885189f175ab5b5161e7b712b360d44f5c4516b8d271da3e4bf7bf0a7b9153ecb04c7d90ce8ff5158614e1208819cf62bac2b08452722e languageName: node linkType: hard @@ -12553,12 +12716,12 @@ __metadata: languageName: node linkType: hard -"qs@npm:6.11.0": - version: 6.11.0 - resolution: "qs@npm:6.11.0" +"qs@npm:6.13.0": + version: 6.13.0 + resolution: "qs@npm:6.13.0" dependencies: - side-channel: ^1.0.4 - checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297 + side-channel: ^1.0.6 + checksum: e9404dc0fc2849245107108ce9ec2766cde3be1b271de0bf1021d049dc5b98d1a2901e67b431ac5509f865420a7ed80b7acb3980099fe1c118a1c5d2e1432ad8 languageName: node linkType: hard @@ -13562,9 +13725,9 @@ __metadata: languageName: node linkType: hard -"send@npm:0.18.0": - version: 0.18.0 - resolution: "send@npm:0.18.0" +"send@npm:0.19.0": + version: 0.19.0 + resolution: "send@npm:0.19.0" dependencies: debug: 2.6.9 depd: 2.0.0 @@ -13579,7 +13742,7 @@ __metadata: on-finished: 2.4.1 range-parser: ~1.2.1 statuses: 2.0.1 - checksum: 74fc07ebb58566b87b078ec63e5a3e41ecd987e4272ba67b7467e86c6ad51bc6b0b0154133b6d8b08a2ddda360464f71382f7ef864700f34844a76c8027817a8 + checksum: 5ae11bd900c1c2575525e2aa622e856804e2f96a09281ec1e39610d089f53aa69e13fd8db84b52f001d0318cf4bb0b3b904ad532fc4c0014eb90d32db0cff55f languageName: node linkType: hard @@ -13616,15 +13779,15 @@ __metadata: languageName: node linkType: hard -"serve-static@npm:1.15.0": - version: 1.15.0 - resolution: "serve-static@npm:1.15.0" +"serve-static@npm:1.16.2": + version: 1.16.2 + resolution: "serve-static@npm:1.16.2" dependencies: - encodeurl: ~1.0.2 + encodeurl: ~2.0.0 escape-html: ~1.0.3 parseurl: ~1.3.3 - send: 0.18.0 - checksum: af57fc13be40d90a12562e98c0b7855cf6e8bd4c107fe9a45c212bf023058d54a1871b1c89511c3958f70626fff47faeb795f5d83f8cf88514dbaeb2b724464d + send: 0.19.0 + checksum: dffc52feb4cc5c68e66d0c7f3c1824d4e989f71050aefc9bd5f822a42c54c9b814f595fc5f2b717f4c7cc05396145f3e90422af31186a93f76cf15f707019759 languageName: node linkType: hard @@ -13733,6 +13896,41 @@ __metadata: languageName: node linkType: hard +"side-channel-list@npm:^1.0.0": + version: 1.0.0 + resolution: "side-channel-list@npm:1.0.0" + dependencies: + es-errors: ^1.3.0 + object-inspect: ^1.13.3 + checksum: 603b928997abd21c5a5f02ae6b9cc36b72e3176ad6827fab0417ead74580cc4fb4d5c7d0a8a2ff4ead34d0f9e35701ed7a41853dac8a6d1a664fcce1a044f86f + languageName: node + linkType: hard + +"side-channel-map@npm:^1.0.1": + version: 1.0.1 + resolution: "side-channel-map@npm:1.0.1" + dependencies: + call-bound: ^1.0.2 + es-errors: ^1.3.0 + get-intrinsic: ^1.2.5 + object-inspect: ^1.13.3 + checksum: 42501371cdf71f4ccbbc9c9e2eb00aaaab80a4c1c429d5e8da713fd4d39ef3b8d4a4b37ed4f275798a65260a551a7131fd87fe67e922dba4ac18586d6aab8b06 + languageName: node + linkType: hard + +"side-channel-weakmap@npm:^1.0.2": + version: 1.0.2 + resolution: "side-channel-weakmap@npm:1.0.2" + dependencies: + call-bound: ^1.0.2 + es-errors: ^1.3.0 + get-intrinsic: ^1.2.5 + object-inspect: ^1.13.3 + side-channel-map: ^1.0.1 + checksum: a815c89bc78c5723c714ea1a77c938377ea710af20d4fb886d362b0d1f8ac73a17816a5f6640f354017d7e292a43da9c5e876c22145bac00b76cfb3468001736 + languageName: node + linkType: hard + "side-channel@npm:^1.0.4": version: 1.0.4 resolution: "side-channel@npm:1.0.4" @@ -13744,6 +13942,19 @@ __metadata: languageName: node linkType: hard +"side-channel@npm:^1.0.6": + version: 1.1.0 + resolution: "side-channel@npm:1.1.0" + dependencies: + es-errors: ^1.3.0 + object-inspect: ^1.13.3 + side-channel-list: ^1.0.0 + side-channel-map: ^1.0.1 + side-channel-weakmap: ^1.0.2 + checksum: bf73d6d6682034603eb8e99c63b50155017ed78a522d27c2acec0388a792c3ede3238b878b953a08157093b85d05797217d270b7666ba1f111345fbe933380ff + languageName: node + linkType: hard + "signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7": version: 3.0.7 resolution: "signal-exit@npm:3.0.7" diff --git a/src/utils/artifacts/manifest_updater/main.go b/src/utils/artifacts/manifest_updater/main.go index c3d71a436bd..8fed3025ee9 100644 --- a/src/utils/artifacts/manifest_updater/main.go +++ b/src/utils/artifacts/manifest_updater/main.go @@ -29,14 +29,13 @@ import ( "path/filepath" "time" + "cloud.google.com/go/storage" log "github.com/sirupsen/logrus" "github.com/spf13/pflag" "github.com/spf13/viper" + "google.golang.org/api/googleapi" "px.dev/pixie/src/shared/artifacts/manifest" - - "cloud.google.com/go/storage" - "google.golang.org/api/googleapi" ) func init() { @@ -171,14 +170,14 @@ func updateLocalManifest(updates *manifest.ArtifactManifest) error { if err := newManifest.Write(manifestBuf); err != nil { return err } - if err := os.WriteFile(path, manifestBuf.Bytes(), 0664); err != nil { + if err := os.WriteFile(path, manifestBuf.Bytes(), 0o664); err != nil { return err } sha256Bytes := sha256.Sum256(manifestBuf.Bytes()) sha256Str := fmt.Sprintf("%x", sha256Bytes) shaPath := path + ".sha256" - if err := os.WriteFile(shaPath, []byte(sha256Str), 0664); err != nil { + if err := os.WriteFile(shaPath, []byte(sha256Str), 0o664); err != nil { return err } @@ -186,7 +185,7 @@ func updateLocalManifest(updates *manifest.ArtifactManifest) error { } func createEmptyManifest(path string) (*os.File, error) { - if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil { + if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil { return nil, err } f, err := os.Create(path) diff --git a/src/utils/dev_dns_updater/dev_dns_updater.go b/src/utils/dev_dns_updater/dev_dns_updater.go index 8e6e2d3f16f..81146cee793 100644 --- a/src/utils/dev_dns_updater/dev_dns_updater.go +++ b/src/utils/dev_dns_updater/dev_dns_updater.go @@ -238,8 +238,10 @@ func cleanup(tmp *os.File) { } } -var sudoPass string -var sudoPassRead bool = false +var ( + sudoPass string + sudoPassRead bool = false +) func promptForSudoPass() error { u, err := user.Current() diff --git a/src/utils/erroraccumulator.go b/src/utils/erroraccumulator.go index 352fcfde07f..1ccf3451e7c 100644 --- a/src/utils/erroraccumulator.go +++ b/src/utils/erroraccumulator.go @@ -45,7 +45,7 @@ func (ea *ErrorAccumulator) Merge() error { if len(ea.errorStrs) == 0 { return nil } - return fmt.Errorf(indent(strings.Join(ea.errorStrs, "\n"))) + return fmt.Errorf("%s", indent(strings.Join(ea.errorStrs, "\n"))) } // MakeErrorAccumulator constructs the ErrorAccumulator. diff --git a/src/utils/script/err.go b/src/utils/script/err.go index 4ccc51edb11..c1b4b2f31a3 100644 --- a/src/utils/script/err.go +++ b/src/utils/script/err.go @@ -20,7 +20,5 @@ package script import "errors" -var ( - // ErrScriptNotFound is returned when the requested script does not exist. - ErrScriptNotFound = errors.New("Script not found (run `px run -l` to list available scripts)") -) +// ErrScriptNotFound is returned when the requested script does not exist. +var ErrScriptNotFound = errors.New("Script not found (run `px run -l` to list available scripts)") diff --git a/src/utils/shared/artifacts/yamls.go b/src/utils/shared/artifacts/yamls.go index f7b6151a021..96e8e112706 100644 --- a/src/utils/shared/artifacts/yamls.go +++ b/src/utils/shared/artifacts/yamls.go @@ -69,7 +69,6 @@ func downloadVizierYAMLs(conn *grpc.ClientConn, authToken, versionStr string, te // FetchVizierYAMLMap fetches Vizier YAML files and write to a map :. func FetchVizierYAMLMap(conn *grpc.ClientConn, authToken, versionStr string) (map[string]string, error) { reader, err := downloadVizierYAMLs(conn, authToken, versionStr, false) - if err != nil { return nil, err } @@ -85,7 +84,6 @@ func FetchVizierYAMLMap(conn *grpc.ClientConn, authToken, versionStr string) (ma // FetchVizierTemplates fetches the Vizier templates for the given version. func FetchVizierTemplates(conn *grpc.ClientConn, authToken, versionStr string) ([]*yamls.YAMLFile, error) { reader, err := downloadVizierYAMLs(conn, authToken, versionStr, true) - if err != nil { return nil, err } diff --git a/src/utils/shared/k8s/apply.go b/src/utils/shared/k8s/apply.go index e4a1ddd2ed2..c25858ce6d7 100644 --- a/src/utils/shared/k8s/apply.go +++ b/src/utils/shared/k8s/apply.go @@ -163,7 +163,7 @@ func GetResourcesFromYAML(yamlFile io.Reader) ([]*Resource, error) { _, gvk, err := unstructured.UnstructuredJSONScheme.Decode(ext.Raw, nil, nil) if err != nil { - log.WithError(err).Fatalf(err.Error()) + log.WithError(err).Fatal(err.Error()) return nil, err } diff --git a/src/utils/shared/k8s/auth.go b/src/utils/shared/k8s/auth.go index 248363671bc..a24883e1105 100644 --- a/src/utils/shared/k8s/auth.go +++ b/src/utils/shared/k8s/auth.go @@ -27,7 +27,6 @@ import ( "github.com/spf13/pflag" "k8s.io/client-go/discovery" "k8s.io/client-go/kubernetes" - // Blank import necessary for kubeConfig to work. _ "k8s.io/client-go/plugin/pkg/client/auth" "k8s.io/client-go/rest" diff --git a/src/utils/shared/k8s/delete.go b/src/utils/shared/k8s/delete.go index c9728f78c32..3adb2c8b986 100644 --- a/src/utils/shared/k8s/delete.go +++ b/src/utils/shared/k8s/delete.go @@ -253,7 +253,6 @@ func (o *ObjectDeleter) deleteResource(info *resource.Info, deleteOptions *metav deleteResponse, err := resource. NewHelper(info.Client, info.Mapping). DeleteWithOptions(info.Namespace, info.Name, deleteOptions) - if err != nil { return nil, cmdutil.AddSourceToErr("deleting", info.Source, err) } diff --git a/src/utils/shared/k8s/secrets.go b/src/utils/shared/k8s/secrets.go index 92336e442f3..8056fad6d83 100644 --- a/src/utils/shared/k8s/secrets.go +++ b/src/utils/shared/k8s/secrets.go @@ -29,7 +29,6 @@ import ( "strings" log "github.com/sirupsen/logrus" - v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation" diff --git a/src/utils/shared/yamls/extract.go b/src/utils/shared/yamls/extract.go index 0a0c001cdc6..b7d11b54b2b 100644 --- a/src/utils/shared/yamls/extract.go +++ b/src/utils/shared/yamls/extract.go @@ -52,7 +52,7 @@ func ConcatYAMLs(y1 string, y2 string) string { // ExtractYAMLs writes the generated YAMLs to a tar at the given path in the given format. func ExtractYAMLs(yamls []*YAMLFile, extractPath string, yamlDir string, format ExtractYAMLFormat) error { writeYAML := func(w *tar.Writer, name string, contents string) error { - if err := w.WriteHeader(&tar.Header{Name: name, Size: int64(len(contents)), Mode: 0777}); err != nil { + if err := w.WriteHeader(&tar.Header{Name: name, Size: int64(len(contents)), Mode: 0o777}); err != nil { return err } if _, err := w.Write([]byte(contents)); err != nil { @@ -62,7 +62,7 @@ func ExtractYAMLs(yamls []*YAMLFile, extractPath string, yamlDir string, format } filePath := path.Join(extractPath, "yamls.tar") - writer, err := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE, 0755) + writer, err := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE, 0o755) if err != nil { return fmt.Errorf("Failed trying to open extract_yaml path: %s", err) } diff --git a/src/utils/shared/yamls/templates.go b/src/utils/shared/yamls/templates.go index d6255aca5d3..be361776b26 100644 --- a/src/utils/shared/yamls/templates.go +++ b/src/utils/shared/yamls/templates.go @@ -39,8 +39,10 @@ import ( k8syaml "sigs.k8s.io/yaml" ) -var nonNamespacedKinds = []string{"Namespace", "ClusterRoleBinding", "ClusterRole"} -var templateKinds = []string{"DaemonSet", "Deployment", "StatefulSet"} +var ( + nonNamespacedKinds = []string{"Namespace", "ClusterRoleBinding", "ClusterRole"} + templateKinds = []string{"DaemonSet", "Deployment", "StatefulSet"} +) // YAMLTmplArguments is a wrapper around YAMLTmplValues. type YAMLTmplArguments struct { diff --git a/src/utils/template_generator/vizier_yamls/vizier_yamls.go b/src/utils/template_generator/vizier_yamls/vizier_yamls.go index ae134a28f32..339d26e9d40 100644 --- a/src/utils/template_generator/vizier_yamls/vizier_yamls.go +++ b/src/utils/template_generator/vizier_yamls/vizier_yamls.go @@ -481,7 +481,6 @@ func generateVzYAMLs(yamlMap map[string]string) ([]*yamls.YAMLFile, error) { }...) persistentYAML, err := yamls.TemplatizeK8sYAML(yamlMap[vizierMetadataPersistYAMLPath], tmplOptions) - if err != nil { return nil, err } diff --git a/src/utils/uuid_test.go b/src/utils/uuid_test.go index 958def190ba..76b98858701 100644 --- a/src/utils/uuid_test.go +++ b/src/utils/uuid_test.go @@ -30,9 +30,11 @@ import ( "px.dev/pixie/src/utils" ) -const uuidStr = "ea8aa095-697f-49f1-b127-d50e5b6e2645" -const hi uint64 = 0xea8aa095697f49f1 -const lo uint64 = 0xb127d50e5b6e2645 +const ( + uuidStr = "ea8aa095-697f-49f1-b127-d50e5b6e2645" + hi uint64 = 0xea8aa095697f49f1 + lo uint64 = 0xb127d50e5b6e2645 +) var enc = binary.BigEndian diff --git a/src/vizier/messages/messagespb/BUILD.bazel b/src/vizier/messages/messagespb/BUILD.bazel index cb98792dcd2..5be2739d0dc 100644 --- a/src/vizier/messages/messagespb/BUILD.bazel +++ b/src/vizier/messages/messagespb/BUILD.bazel @@ -32,7 +32,7 @@ pl_proto_library( "//src/shared/types/typespb:types_pl_proto", "//src/vizier/services/metadata/storepb:store_pl_proto", "//src/vizier/services/shared/agentpb:agent_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -52,7 +52,7 @@ pl_cc_proto_library( "//src/shared/types/typespb/wrapper:cc_library", "//src/vizier/services/metadata/storepb:store_pl_cc_proto", "//src/vizier/services/shared/agentpb:agent_pl_cc_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/vizier/messages/messagespb/messages.pb.go b/src/vizier/messages/messagespb/messages.pb.go index f1a6c2489dc..02713a1d90b 100755 --- a/src/vizier/messages/messagespb/messages.pb.go +++ b/src/vizier/messages/messagespb/messages.pb.go @@ -1257,105 +1257,104 @@ func init() { } var fileDescriptor_0046fd1b9991f89c = []byte{ - // 1559 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x58, 0x49, 0x6f, 0x1b, 0x47, - 0x16, 0x66, 0x93, 0x94, 0x44, 0x3d, 0xed, 0x25, 0xc9, 0xa6, 0xbc, 0x50, 0x1a, 0x0e, 0x3c, 0x96, - 0xed, 0x71, 0x73, 0x46, 0x9e, 0x81, 0x05, 0x0c, 0x6c, 0x8c, 0x29, 0x0e, 0x2c, 0x69, 0x22, 0xc3, - 0x6e, 0xc9, 0x0e, 0x20, 0x20, 0xe8, 0x14, 0xbb, 0x4b, 0x54, 0x43, 0xec, 0xc5, 0x55, 0x4d, 0x45, - 0x74, 0x2e, 0xf9, 0x09, 0x39, 0xe4, 0x94, 0x5f, 0x90, 0x5b, 0x7e, 0x41, 0xce, 0xc9, 0xd1, 0x47, - 0x9d, 0x84, 0x98, 0xbe, 0x04, 0xc9, 0xc5, 0x3f, 0x21, 0xa8, 0xa5, 0x17, 0x8a, 0x4d, 0xc9, 0x3e, - 0xb1, 0xea, 0xd5, 0xf7, 0xbe, 0x57, 0xf5, 0x96, 0xaa, 0xd7, 0x84, 0xfb, 0x8c, 0x5a, 0xb5, 0x63, - 0xe7, 0x8d, 0x43, 0x68, 0xcd, 0x25, 0x8c, 0xe1, 0x16, 0x61, 0xf1, 0x20, 0x68, 0xc6, 0x43, 0x3d, - 0xa0, 0x7e, 0xe8, 0x23, 0x14, 0x9c, 0xe8, 0x12, 0xad, 0x47, 0x2b, 0xd7, 0xee, 0xb7, 0x9c, 0xf0, - 0xb0, 0xd3, 0xd4, 0x2d, 0xdf, 0xad, 0xb5, 0xfc, 0x96, 0x5f, 0x13, 0xd0, 0x66, 0xe7, 0x40, 0xcc, - 0xc4, 0x44, 0x8c, 0x24, 0xc5, 0xb5, 0x65, 0x6e, 0x11, 0x07, 0x8e, 0x84, 0xd5, 0x3a, 0x1d, 0xc7, - 0x0e, 0x9a, 0xe2, 0x47, 0x01, 0x1e, 0x72, 0x80, 0x85, 0xa9, 0xe7, 0x87, 0xb5, 0xa0, 0x8d, 0x3d, - 0x8f, 0xd0, 0x9a, 0xed, 0xb0, 0x90, 0x3a, 0xcd, 0x4e, 0x48, 0x38, 0x38, 0x35, 0x33, 0x39, 0x42, - 0x29, 0x3e, 0xca, 0x52, 0xec, 0x7a, 0xd8, 0x75, 0x2c, 0x33, 0xa4, 0xd8, 0x72, 0xbc, 0x56, 0xcd, - 0xa1, 0xb5, 0xb6, 0xdf, 0x72, 0x2c, 0xdc, 0x0e, 0x9a, 0xd1, 0x48, 0xa9, 0xdf, 0x38, 0xa7, 0x1e, - 0x34, 0x6b, 0x29, 0xf2, 0x5b, 0x62, 0xd5, 0x77, 0x5d, 0xdf, 0xab, 0x35, 0x31, 0x23, 0x35, 0x16, - 0xe2, 0xb0, 0xc3, 0x5d, 0x24, 0x07, 0x0a, 0xb6, 0xca, 0x61, 0xec, 0x10, 0x53, 0x62, 0xd7, 0x8e, - 0xd6, 0xb9, 0x2b, 0x43, 0x6c, 0xe3, 0x10, 0x0b, 0x57, 0xca, 0xa1, 0x42, 0xfe, 0x23, 0xe5, 0x79, - 0x46, 0xe8, 0xb1, 0x63, 0x91, 0x04, 0x5e, 0x63, 0xa1, 0x4f, 0x89, 0x20, 0xf7, 0x29, 0x51, 0x1a, - 0x7a, 0x96, 0x86, 0xb2, 0x85, 0x5b, 0xc4, 0x0b, 0x83, 0xa6, 0xfc, 0x95, 0xf8, 0xea, 0x8f, 0xa3, - 0x30, 0xf5, 0x4a, 0xc0, 0x77, 0x64, 0xac, 0xd0, 0x97, 0x70, 0x85, 0x92, 0x96, 0xc3, 0x42, 0x42, - 0x4d, 0x81, 0x34, 0x29, 0x79, 0xdd, 0x21, 0x2c, 0x2c, 0x6b, 0x2b, 0xda, 0xea, 0xc4, 0xda, 0xaa, - 0x3e, 0x18, 0x5f, 0xdd, 0x50, 0x1a, 0x4f, 0xb8, 0x82, 0x21, 0xf1, 0x9b, 0x39, 0x63, 0x81, 0x66, - 0xc8, 0x91, 0x05, 0x57, 0x07, 0x2c, 0xb0, 0xc0, 0xf7, 0x18, 0x29, 0xe7, 0x85, 0x89, 0x3b, 0x1f, - 0x61, 0x42, 0x2a, 0x6c, 0xe6, 0x8c, 0x45, 0x9a, 0xb5, 0x80, 0x1e, 0xc1, 0xf8, 0x21, 0xc1, 0x34, - 0x6c, 0x12, 0x1c, 0x96, 0x47, 0x04, 0xed, 0xcd, 0x2c, 0xda, 0xcd, 0x08, 0xb4, 0x99, 0x33, 0x12, - 0x0d, 0xf4, 0x14, 0xa6, 0xe2, 0x89, 0x89, 0xad, 0xa3, 0xf2, 0xa8, 0xa0, 0x58, 0xb9, 0x90, 0xe2, - 0x89, 0x75, 0xb4, 0x99, 0x33, 0x26, 0x0f, 0x53, 0x73, 0xb4, 0x0d, 0xd3, 0x09, 0x91, 0xc7, 0x99, - 0xc6, 0x04, 0xd3, 0x5f, 0x2e, 0x64, 0x7a, 0x86, 0x05, 0x55, 0xb2, 0x07, 0x2e, 0x40, 0x5f, 0xc0, - 0x22, 0x39, 0x21, 0x56, 0x27, 0x24, 0xe6, 0xeb, 0x0e, 0xa1, 0xdd, 0x38, 0x32, 0x25, 0x41, 0x79, - 0x3b, 0x8b, 0xf2, 0x7f, 0x52, 0xe1, 0x05, 0xc7, 0x27, 0x81, 0x99, 0x27, 0x83, 0x62, 0xf4, 0x0a, - 0x10, 0x2f, 0x01, 0x12, 0xf8, 0x8e, 0x17, 0x9a, 0x8a, 0xa1, 0x0c, 0x82, 0xfb, 0x56, 0x16, 0xf7, - 0x5e, 0x8c, 0x56, 0xc9, 0xb3, 0x99, 0x33, 0xe6, 0xc2, 0xf3, 0x42, 0xbe, 0x6d, 0xcb, 0xf7, 0x0e, - 0x9c, 0x96, 0xd9, 0x09, 0x6c, 0x1c, 0x92, 0x98, 0x7a, 0x62, 0xf8, 0xb6, 0x37, 0x84, 0xc2, 0x4b, - 0x81, 0x4f, 0xc8, 0xe7, 0xad, 0x41, 0x31, 0xda, 0x87, 0x85, 0xa3, 0x75, 0x66, 0x46, 0x65, 0x11, - 0xb3, 0x4f, 0x0a, 0xf6, 0xbf, 0x65, 0xb1, 0xff, 0x7f, 0x9d, 0xed, 0x28, 0x78, 0x42, 0x8e, 0x8e, - 0x06, 0xa4, 0xf5, 0x11, 0x28, 0xb8, 0xac, 0xb5, 0x5d, 0x2c, 0x15, 0x66, 0x8b, 0xdb, 0xc5, 0x52, - 0x71, 0x76, 0xa4, 0x7a, 0x9a, 0x87, 0xb9, 0x81, 0x83, 0xf3, 0xaa, 0x49, 0xf9, 0xce, 0xf1, 0x0e, - 0x7c, 0x75, 0xd8, 0x8b, 0xaa, 0x26, 0xa1, 0xd9, 0xf2, 0x0e, 0x7c, 0x79, 0x2a, 0x5e, 0x35, 0x61, - 0x86, 0x1c, 0x39, 0xb0, 0x44, 0x89, 0xeb, 0x1f, 0x13, 0x33, 0x65, 0x28, 0x4a, 0x00, 0x59, 0x37, - 0xf7, 0xb2, 0xeb, 0x86, 0x2b, 0x25, 0xa6, 0x92, 0x24, 0xb8, 0x4a, 0xb3, 0x97, 0x90, 0x0f, 0xd7, - 0xe3, 0x02, 0xcd, 0x30, 0x56, 0x10, 0xc6, 0xee, 0x5f, 0x54, 0xa4, 0x59, 0xe6, 0x96, 0xe8, 0xb0, - 0x45, 0xe5, 0xe6, 0xea, 0xd7, 0x30, 0x9f, 0x11, 0xf7, 0xc1, 0xfc, 0xe9, 0xbf, 0x90, 0x2e, 0xcd, - 0x9f, 0x54, 0xda, 0x5b, 0x83, 0xe2, 0xc8, 0xf8, 0xef, 0x79, 0x40, 0x83, 0x79, 0x81, 0xf6, 0x61, - 0xbe, 0x2f, 0xbb, 0x06, 0xa3, 0x2a, 0x6f, 0x57, 0xfd, 0x68, 0x9d, 0xe9, 0xc9, 0x4d, 0xae, 0x1b, - 0x84, 0xf9, 0x1d, 0x6a, 0x91, 0x38, 0xaa, 0x73, 0xa9, 0xf4, 0x52, 0x21, 0x3d, 0x86, 0x1b, 0xae, - 0xc3, 0x98, 0xe3, 0xb5, 0xcc, 0x3e, 0x1b, 0xfd, 0x51, 0x7d, 0x30, 0xdc, 0xc8, 0x8e, 0xd4, 0x4e, - 0x6d, 0x3b, 0xe5, 0x6e, 0x77, 0xd8, 0x22, 0xea, 0xc2, 0xcd, 0x21, 0x76, 0xd5, 0x35, 0x2c, 0x23, - 0xfc, 0xaf, 0x4f, 0x33, 0x1c, 0xdf, 0xc8, 0xd7, 0xdc, 0xa1, 0xab, 0x91, 0xb3, 0xdf, 0xc0, 0x42, - 0xd6, 0x93, 0x81, 0x1e, 0x43, 0x91, 0xd7, 0x8e, 0x72, 0xef, 0xdd, 0x54, 0x64, 0xa3, 0xc7, 0x2c, - 0xda, 0x90, 0x7c, 0xc4, 0x84, 0x32, 0x2f, 0x12, 0x43, 0xe8, 0xa1, 0x1b, 0x50, 0xc4, 0xcc, 0xb1, - 0xc5, 0x01, 0xa6, 0xea, 0xa5, 0xde, 0xd9, 0x72, 0xf1, 0xc9, 0xee, 0x56, 0xc3, 0x10, 0xd2, 0xed, - 0x62, 0x29, 0x3f, 0x5b, 0xa8, 0xfe, 0x07, 0x16, 0x33, 0xdf, 0x92, 0x58, 0x59, 0xbb, 0x40, 0xd9, - 0x82, 0x29, 0xa1, 0xd4, 0xc0, 0x21, 0xe6, 0x76, 0x91, 0x01, 0x53, 0xb1, 0xff, 0x52, 0x5b, 0x17, - 0xd5, 0x21, 0x1b, 0x05, 0x5d, 0xf5, 0x19, 0x7a, 0x5f, 0x83, 0xa2, 0x47, 0xae, 0x11, 0xbb, 0x9f, - 0x74, 0x53, 0xb3, 0xea, 0x1f, 0x79, 0x98, 0x11, 0x56, 0x64, 0x9e, 0x08, 0x3b, 0x8f, 0x61, 0x94, - 0x59, 0x87, 0xc4, 0xc5, 0xe5, 0xfc, 0x4a, 0xe1, 0xdc, 0xbd, 0x16, 0xfb, 0x26, 0x6e, 0x1f, 0xf6, - 0x70, 0xb3, 0x2d, 0xf4, 0x0c, 0xa5, 0x85, 0x5e, 0xc0, 0x4c, 0x40, 0x7d, 0x8b, 0x30, 0x66, 0x5a, - 0x94, 0xe0, 0x90, 0xd8, 0xe5, 0xa2, 0x20, 0xba, 0x20, 0x87, 0x9f, 0x4b, 0x85, 0x0d, 0x89, 0x37, - 0xa6, 0x83, 0xbe, 0x39, 0xda, 0x07, 0x14, 0x51, 0x86, 0x84, 0xba, 0x8e, 0x27, 0x58, 0x47, 0x04, - 0xeb, 0xbd, 0x4b, 0x59, 0xf7, 0x62, 0x15, 0x63, 0x2e, 0x38, 0x2f, 0x42, 0x7f, 0x07, 0x64, 0xfb, - 0x84, 0x45, 0x15, 0xaf, 0x8e, 0xce, 0x1f, 0xe1, 0x92, 0x31, 0xcb, 0x57, 0xa4, 0x6b, 0x76, 0xe5, - 0xe1, 0xfe, 0x0d, 0x45, 0x4e, 0x7e, 0xd1, 0xd3, 0xda, 0x17, 0x35, 0x43, 0xc0, 0xe5, 0xb5, 0x5e, - 0xfd, 0x59, 0x83, 0xf1, 0xf8, 0xe1, 0x45, 0x0f, 0xa1, 0x24, 0x7b, 0x12, 0x95, 0x08, 0x13, 0x6b, - 0x33, 0x9c, 0x4e, 0xb6, 0xa0, 0xfa, 0xcb, 0x97, 0x5b, 0x8d, 0xfa, 0x44, 0xef, 0x6c, 0x79, 0x4c, - 0x66, 0x5e, 0xc3, 0x18, 0x13, 0xe8, 0x2d, 0x1b, 0x21, 0x28, 0x86, 0x8e, 0x2b, 0x5b, 0x98, 0x82, - 0x21, 0xc6, 0xa8, 0x01, 0x13, 0xea, 0x00, 0x22, 0x35, 0x64, 0x59, 0xfd, 0x75, 0xe8, 0xf6, 0x92, - 0x70, 0x1b, 0xd0, 0x49, 0x42, 0x7f, 0x1b, 0x66, 0x18, 0xaf, 0x0f, 0xcf, 0x22, 0xa6, 0xd7, 0x71, - 0x9b, 0x84, 0x96, 0x8b, 0xc2, 0xc8, 0x74, 0x24, 0x7e, 0x26, 0xa4, 0xd5, 0x2e, 0xa0, 0xfe, 0x1b, - 0x46, 0xa8, 0xaf, 0xc1, 0xa4, 0x4a, 0x10, 0xd3, 0x72, 0x6c, 0x2a, 0x36, 0x38, 0x5e, 0x9f, 0xe9, - 0x9d, 0x2d, 0x4f, 0xec, 0x4a, 0xf9, 0xc6, 0x56, 0xc3, 0x30, 0x26, 0x14, 0x68, 0xc3, 0xb1, 0x29, - 0xba, 0x03, 0xe3, 0x81, 0x6f, 0x0b, 0x3c, 0x2b, 0x17, 0x56, 0x0a, 0xab, 0xe3, 0xf5, 0xc9, 0xde, - 0xd9, 0x72, 0xe9, 0xb9, 0x6f, 0x73, 0x30, 0x33, 0x4a, 0x81, 0x6f, 0x73, 0x24, 0xdb, 0x2e, 0x96, - 0xb4, 0xd9, 0x7c, 0xf5, 0x3b, 0x0d, 0x26, 0xd3, 0x7d, 0x50, 0xec, 0x0e, 0x2d, 0xe5, 0x8e, 0x8c, - 0x83, 0xe4, 0xb3, 0x0e, 0x82, 0x9e, 0x66, 0xf9, 0x2d, 0xf3, 0x25, 0x1f, 0x3c, 0x6f, 0xda, 0x75, - 0xd5, 0x1a, 0x4c, 0xf5, 0xf5, 0x54, 0xa8, 0x02, 0x40, 0x49, 0xf4, 0x10, 0x89, 0xcd, 0x95, 0x8c, - 0x94, 0xa4, 0xfa, 0xbd, 0x06, 0xf3, 0x19, 0x2d, 0x13, 0x4f, 0x0b, 0xd9, 0x72, 0x5d, 0x92, 0x16, - 0x42, 0x89, 0xa7, 0x85, 0x40, 0x6f, 0xd9, 0xe8, 0x2e, 0x14, 0x79, 0xfd, 0xab, 0x33, 0x5c, 0x39, - 0x77, 0x2d, 0xf0, 0x72, 0x68, 0x63, 0xcf, 0x10, 0x18, 0x54, 0x86, 0x31, 0xec, 0xe1, 0x76, 0xf7, - 0x0d, 0x11, 0x01, 0x2e, 0x19, 0xd1, 0x54, 0x5d, 0x3e, 0x3f, 0x69, 0xb0, 0x34, 0xf4, 0x85, 0x45, - 0x5f, 0xc1, 0x62, 0xea, 0xb1, 0xb6, 0x49, 0xd0, 0xf6, 0xbb, 0x2e, 0xf1, 0xa2, 0x67, 0xb2, 0x9e, - 0x75, 0x23, 0xf5, 0x7f, 0xf9, 0xe8, 0x0e, 0xd5, 0xa3, 0xef, 0x9d, 0x84, 0xbf, 0x11, 0x33, 0xa5, - 0x3b, 0x93, 0x44, 0x8a, 0x6e, 0x43, 0xde, 0xb1, 0xd5, 0x63, 0x35, 0xe0, 0x95, 0xd1, 0xde, 0xd9, - 0x72, 0x7e, 0xab, 0x61, 0xe4, 0x1d, 0xbb, 0x7a, 0xaa, 0xc1, 0x42, 0x56, 0xcf, 0xa3, 0x18, 0xb4, - 0x4b, 0x19, 0xd0, 0x3f, 0x61, 0x84, 0x7f, 0x4a, 0xc9, 0x2a, 0x9b, 0x5e, 0xbb, 0x2e, 0x6e, 0x19, - 0xf5, 0x91, 0xa5, 0x7f, 0xe6, 0x1c, 0x90, 0x8d, 0xae, 0xd5, 0x26, 0xbb, 0x1c, 0x62, 0x48, 0x24, - 0xba, 0x07, 0xa3, 0x12, 0xa1, 0x42, 0x30, 0xdf, 0xa7, 0xb3, 0x2b, 0x06, 0x86, 0x82, 0xf4, 0x55, - 0x7f, 0xf1, 0x13, 0xaa, 0xbf, 0x5a, 0x87, 0xab, 0x43, 0x1a, 0xad, 0x8f, 0x3e, 0x5c, 0xf5, 0x51, - 0x7f, 0xfb, 0x13, 0xe9, 0xcf, 0x42, 0xe1, 0x88, 0x74, 0x05, 0xc1, 0xb8, 0xc1, 0x87, 0x68, 0x01, - 0x46, 0x8e, 0x71, 0xbb, 0x23, 0xbd, 0x30, 0x6e, 0xc8, 0x49, 0xf5, 0x73, 0x98, 0xde, 0x21, 0x21, - 0x75, 0x2c, 0x16, 0xf5, 0x2e, 0x77, 0x81, 0xdf, 0xac, 0x2e, 0x7f, 0xe0, 0xb9, 0xd8, 0x0c, 0xc9, - 0x49, 0xa8, 0x78, 0xf8, 0x63, 0xe0, 0x2a, 0xf8, 0x1e, 0x39, 0x09, 0xd1, 0x12, 0xf0, 0x92, 0x36, - 0x3d, 0xec, 0x46, 0xb4, 0x63, 0x81, 0x6f, 0x3f, 0xc3, 0x2e, 0xa9, 0xff, 0xf7, 0xed, 0xbb, 0x4a, - 0xee, 0xf4, 0x5d, 0x25, 0xf7, 0xe1, 0x5d, 0x45, 0xfb, 0xa6, 0x57, 0xd1, 0x7e, 0xe8, 0x55, 0xb4, - 0x5f, 0x7a, 0x15, 0xed, 0x6d, 0xaf, 0xa2, 0xfd, 0xda, 0xab, 0x68, 0xbf, 0xf5, 0x2a, 0xb9, 0x0f, - 0xbd, 0x8a, 0xf6, 0xed, 0xfb, 0x4a, 0xee, 0xed, 0xfb, 0x4a, 0xee, 0xf4, 0x7d, 0x25, 0xb7, 0x0f, - 0xc9, 0x3f, 0x04, 0xcd, 0x51, 0xf1, 0xb1, 0xf9, 0xe0, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x82, - 0xe8, 0x3e, 0x85, 0x4a, 0x10, 0x00, 0x00, + // 1544 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x58, 0x4b, 0x6f, 0x1b, 0x47, + 0x12, 0xe6, 0x90, 0x94, 0x44, 0x95, 0xde, 0x2d, 0xc9, 0xa6, 0xfc, 0xa0, 0xb4, 0x5c, 0x78, 0x2d, + 0xdb, 0xeb, 0xe1, 0xae, 0xbc, 0x0b, 0x0b, 0x58, 0xd8, 0x58, 0x53, 0x5c, 0x58, 0xd2, 0x46, 0x86, + 0x3d, 0x92, 0x1d, 0x40, 0x40, 0x30, 0x69, 0xce, 0xb4, 0xa8, 0x81, 0x38, 0x0f, 0x77, 0x0f, 0x15, + 0xd1, 0xb9, 0xe4, 0x27, 0xe4, 0x90, 0x53, 0x7e, 0x41, 0x6e, 0xf9, 0x05, 0x39, 0x27, 0x47, 0x1f, + 0x75, 0x12, 0x62, 0xfa, 0x12, 0x24, 0x17, 0xff, 0x84, 0xa0, 0x1f, 0xf3, 0xa0, 0x38, 0x94, 0xec, + 0x93, 0x7a, 0xaa, 0xbf, 0xfa, 0xaa, 0xbb, 0x1e, 0x5d, 0x45, 0xc1, 0x7d, 0x46, 0xad, 0xda, 0xb1, + 0xf3, 0xc6, 0x21, 0xb4, 0xe6, 0x12, 0xc6, 0x70, 0x8b, 0xb0, 0x78, 0x11, 0x34, 0xe3, 0xa5, 0x1e, + 0x50, 0x3f, 0xf4, 0x11, 0x0a, 0x4e, 0x74, 0x89, 0xd6, 0xa3, 0x9d, 0x6b, 0x0b, 0x2d, 0xbf, 0xe5, + 0x8b, 0xed, 0x1a, 0x5f, 0x49, 0xe4, 0xb5, 0x65, 0x4e, 0x8c, 0x03, 0xa7, 0x26, 0x77, 0x3a, 0x1d, + 0xc7, 0x0e, 0x9a, 0xe2, 0x8f, 0x02, 0x3c, 0xe4, 0x00, 0x0b, 0x53, 0xcf, 0x0f, 0x6b, 0x41, 0x1b, + 0x7b, 0x1e, 0xa1, 0x35, 0xdb, 0x61, 0x21, 0x75, 0x9a, 0x9d, 0x90, 0x70, 0x70, 0xea, 0xcb, 0xe4, + 0x08, 0xa5, 0xf8, 0x28, 0x4b, 0xb1, 0xeb, 0x61, 0xd7, 0xb1, 0xcc, 0x90, 0x62, 0xcb, 0xf1, 0x5a, + 0x35, 0x87, 0xd6, 0xda, 0x7e, 0xcb, 0xb1, 0x70, 0x3b, 0x68, 0x46, 0x2b, 0xa5, 0x7e, 0xe3, 0x9c, + 0x7a, 0xd0, 0xac, 0xa5, 0xc8, 0x6f, 0x89, 0x5d, 0xdf, 0x75, 0x7d, 0xaf, 0xd6, 0xc4, 0x8c, 0xd4, + 0x58, 0x88, 0xc3, 0x0e, 0xf7, 0x84, 0x5c, 0x28, 0xd8, 0x2a, 0x87, 0xb1, 0x43, 0x4c, 0x89, 0x5d, + 0x3b, 0x5a, 0xe7, 0x1e, 0x0b, 0xb1, 0x8d, 0x43, 0x2c, 0x3c, 0x26, 0x97, 0x0a, 0xf9, 0x8f, 0x94, + 0x83, 0x19, 0xa1, 0xc7, 0x8e, 0x45, 0x12, 0x78, 0x8d, 0x85, 0x3e, 0x25, 0x82, 0xdc, 0xa7, 0x44, + 0x69, 0xe8, 0x59, 0x1a, 0xca, 0x16, 0x6e, 0x11, 0x2f, 0x0c, 0x9a, 0xf2, 0xaf, 0xc4, 0x57, 0x7f, + 0x1c, 0x85, 0xa9, 0x57, 0x02, 0xbe, 0x23, 0x43, 0x82, 0xbe, 0x84, 0x2b, 0x94, 0xb4, 0x1c, 0x16, + 0x12, 0x6a, 0x0a, 0xa4, 0x49, 0xc9, 0xeb, 0x0e, 0x61, 0x61, 0x59, 0x5b, 0xd1, 0x56, 0x27, 0xd6, + 0x56, 0xf5, 0xc1, 0x30, 0xea, 0x86, 0xd2, 0x78, 0xc2, 0x15, 0x0c, 0x89, 0xdf, 0xcc, 0x19, 0x0b, + 0x34, 0x43, 0x8e, 0x2c, 0xb8, 0x3a, 0x60, 0x81, 0x05, 0xbe, 0xc7, 0x48, 0x39, 0x2f, 0x4c, 0xdc, + 0xf9, 0x08, 0x13, 0x52, 0x61, 0x33, 0x67, 0x2c, 0xd2, 0xac, 0x0d, 0xf4, 0x08, 0xc6, 0x0f, 0x09, + 0xa6, 0x61, 0x93, 0xe0, 0xb0, 0x3c, 0x22, 0x68, 0x6f, 0x66, 0xd1, 0x6e, 0x46, 0xa0, 0xcd, 0x9c, + 0x91, 0x68, 0xa0, 0xa7, 0x30, 0x15, 0x7f, 0x98, 0xd8, 0x3a, 0x2a, 0x8f, 0x0a, 0x8a, 0x95, 0x0b, + 0x29, 0x9e, 0x58, 0x47, 0x9b, 0x39, 0x63, 0xf2, 0x30, 0xf5, 0x8d, 0xb6, 0x61, 0x3a, 0x21, 0xf2, + 0x38, 0xd3, 0x98, 0x60, 0xfa, 0xcb, 0x85, 0x4c, 0xcf, 0xb0, 0xa0, 0x4a, 0xce, 0xc0, 0x05, 0xe8, + 0x0b, 0x58, 0x24, 0x27, 0xc4, 0xea, 0x84, 0xc4, 0x7c, 0xdd, 0x21, 0xb4, 0x1b, 0x47, 0xa6, 0x24, + 0x28, 0x6f, 0x67, 0x51, 0xfe, 0x4f, 0x2a, 0xbc, 0xe0, 0xf8, 0x24, 0x30, 0xf3, 0x64, 0x50, 0x8c, + 0x5e, 0x01, 0xe2, 0x25, 0x40, 0x02, 0xdf, 0xf1, 0x42, 0x53, 0x31, 0x94, 0x41, 0x70, 0xdf, 0xca, + 0xe2, 0xde, 0x8b, 0xd1, 0x2a, 0x79, 0x36, 0x73, 0xc6, 0x5c, 0x78, 0x5e, 0xc8, 0x8f, 0x6d, 0xf9, + 0xde, 0x81, 0xd3, 0x32, 0x3b, 0x81, 0x8d, 0x43, 0x12, 0x53, 0x4f, 0x0c, 0x3f, 0xf6, 0x86, 0x50, + 0x78, 0x29, 0xf0, 0x09, 0xf9, 0xbc, 0x35, 0x28, 0x46, 0xfb, 0xb0, 0x70, 0xb4, 0xce, 0xcc, 0xa8, + 0x2c, 0x62, 0xf6, 0x49, 0xc1, 0xfe, 0xb7, 0x2c, 0xf6, 0xff, 0xaf, 0xb3, 0x1d, 0x05, 0x4f, 0xc8, + 0xd1, 0xd1, 0x80, 0xb4, 0x3e, 0x02, 0x05, 0x97, 0xb5, 0xb6, 0x8b, 0xa5, 0xc2, 0x6c, 0x71, 0xbb, + 0x58, 0x2a, 0xce, 0x8e, 0x54, 0x4f, 0xf3, 0x30, 0x37, 0x70, 0x71, 0x5e, 0x35, 0x29, 0xdf, 0x39, + 0xde, 0x81, 0xaf, 0x2e, 0x7b, 0x51, 0xd5, 0x24, 0x34, 0x5b, 0xde, 0x81, 0x2f, 0x6f, 0xc5, 0xab, + 0x26, 0xcc, 0x90, 0x23, 0x07, 0x96, 0x28, 0x71, 0xfd, 0x63, 0x62, 0xa6, 0x0c, 0x45, 0x09, 0x20, + 0xeb, 0xe6, 0x5e, 0x76, 0xdd, 0x70, 0xa5, 0xc4, 0x54, 0x92, 0x04, 0x57, 0x69, 0xf6, 0x16, 0xf2, + 0xe1, 0x7a, 0x5c, 0xa0, 0x19, 0xc6, 0x0a, 0xc2, 0xd8, 0xfd, 0x8b, 0x8a, 0x34, 0xcb, 0xdc, 0x12, + 0x1d, 0xb6, 0xa9, 0xdc, 0x5c, 0xfd, 0x1a, 0xe6, 0x33, 0xe2, 0x3e, 0x98, 0x3f, 0xfd, 0x0f, 0xd2, + 0xa5, 0xf9, 0x93, 0x4a, 0x7b, 0x6b, 0x50, 0x1c, 0x19, 0xff, 0x3d, 0x0f, 0x68, 0x30, 0x2f, 0xd0, + 0x3e, 0xcc, 0xf7, 0x65, 0xd7, 0x60, 0x54, 0xe5, 0xeb, 0xaa, 0x1f, 0xad, 0x33, 0x3d, 0x79, 0xc9, + 0x75, 0x83, 0x30, 0xbf, 0x43, 0x2d, 0x12, 0x47, 0x75, 0x2e, 0x95, 0x5e, 0x2a, 0xa4, 0xc7, 0x70, + 0xc3, 0x75, 0x18, 0x73, 0xbc, 0x96, 0xd9, 0x67, 0xa3, 0x3f, 0xaa, 0x0f, 0x86, 0x1b, 0xd9, 0x91, + 0xda, 0xa9, 0x63, 0xa7, 0xdc, 0xed, 0x0e, 0xdb, 0x44, 0x5d, 0xb8, 0x39, 0xc4, 0xae, 0x7a, 0x86, + 0x65, 0x84, 0xff, 0xf5, 0x69, 0x86, 0xe3, 0x17, 0xf9, 0x9a, 0x3b, 0x74, 0x37, 0x72, 0xf6, 0x1b, + 0x58, 0xc8, 0x6a, 0x19, 0xe8, 0x31, 0x14, 0x79, 0xed, 0x28, 0xf7, 0xde, 0x4d, 0x45, 0x36, 0x6a, + 0x66, 0xd1, 0x81, 0x64, 0x13, 0x13, 0xca, 0xbc, 0x48, 0x0c, 0xa1, 0x87, 0x6e, 0x40, 0x11, 0x33, + 0xc7, 0x16, 0x17, 0x98, 0xaa, 0x97, 0x7a, 0x67, 0xcb, 0xc5, 0x27, 0xbb, 0x5b, 0x0d, 0x43, 0x48, + 0xb7, 0x8b, 0xa5, 0xfc, 0x6c, 0xa1, 0xfa, 0x1f, 0x58, 0xcc, 0xec, 0x25, 0xb1, 0xb2, 0x76, 0x81, + 0xb2, 0x05, 0x53, 0x42, 0xa9, 0x81, 0x43, 0xcc, 0xed, 0x22, 0x03, 0xa6, 0x62, 0xff, 0xa5, 0x8e, + 0x2e, 0xaa, 0x43, 0x0e, 0x0a, 0xba, 0x9a, 0x33, 0xf4, 0xbe, 0x01, 0x45, 0x8f, 0x5c, 0x23, 0x4e, + 0x3f, 0xe9, 0xa6, 0xbe, 0xaa, 0x7f, 0xe4, 0x61, 0x46, 0x58, 0x91, 0x79, 0x22, 0xec, 0x3c, 0x86, + 0x51, 0x66, 0x1d, 0x12, 0x17, 0x97, 0xf3, 0x2b, 0x85, 0x73, 0xef, 0x5a, 0xec, 0x9b, 0x78, 0x7c, + 0xd8, 0xc3, 0xcd, 0xb6, 0xd0, 0x33, 0x94, 0x16, 0x7a, 0x01, 0x33, 0x01, 0xf5, 0x2d, 0xc2, 0x98, + 0x69, 0x51, 0x82, 0x43, 0x62, 0x97, 0x8b, 0x82, 0xe8, 0x82, 0x1c, 0x7e, 0x2e, 0x15, 0x36, 0x24, + 0xde, 0x98, 0x0e, 0xfa, 0xbe, 0xd1, 0x3e, 0xa0, 0x88, 0x32, 0x24, 0xd4, 0x75, 0x3c, 0xc1, 0x3a, + 0x22, 0x58, 0xef, 0x5d, 0xca, 0xba, 0x17, 0xab, 0x18, 0x73, 0xc1, 0x79, 0x11, 0xfa, 0x3b, 0x20, + 0xdb, 0x27, 0x2c, 0xaa, 0x78, 0x75, 0x75, 0xde, 0x84, 0x4b, 0xc6, 0x2c, 0xdf, 0x91, 0xae, 0xd9, + 0x95, 0x97, 0xfb, 0x37, 0x14, 0x39, 0xf9, 0x45, 0xad, 0xb5, 0x2f, 0x6a, 0x86, 0x80, 0xcb, 0x67, + 0xbd, 0xfa, 0xb3, 0x06, 0xe3, 0x71, 0xe3, 0x45, 0x0f, 0xa1, 0x24, 0x67, 0x12, 0x95, 0x08, 0x13, + 0x6b, 0x33, 0x9c, 0x4e, 0x8e, 0xa0, 0xfa, 0xcb, 0x97, 0x5b, 0x8d, 0xfa, 0x44, 0xef, 0x6c, 0x79, + 0x4c, 0x66, 0x5e, 0xc3, 0x18, 0x13, 0xe8, 0x2d, 0x1b, 0x21, 0x28, 0x86, 0x8e, 0x2b, 0x47, 0x98, + 0x82, 0x21, 0xd6, 0xa8, 0x01, 0x13, 0xea, 0x02, 0x22, 0x35, 0x64, 0x59, 0xfd, 0x75, 0xe8, 0xf1, + 0x92, 0x70, 0x1b, 0xd0, 0x49, 0x42, 0x7f, 0x1b, 0x66, 0x18, 0xaf, 0x0f, 0xcf, 0x22, 0xa6, 0xd7, + 0x71, 0x9b, 0x84, 0x96, 0x8b, 0xc2, 0xc8, 0x74, 0x24, 0x7e, 0x26, 0xa4, 0xd5, 0x2e, 0xa0, 0xfe, + 0x17, 0x46, 0xa8, 0xaf, 0xc1, 0xa4, 0x4a, 0x10, 0xd3, 0x72, 0x6c, 0x2a, 0x0e, 0x38, 0x5e, 0x9f, + 0xe9, 0x9d, 0x2d, 0x4f, 0xec, 0x4a, 0xf9, 0xc6, 0x56, 0xc3, 0x30, 0x26, 0x14, 0x68, 0xc3, 0xb1, + 0x29, 0xba, 0x03, 0xe3, 0x81, 0x6f, 0x0b, 0x3c, 0x2b, 0x17, 0x56, 0x0a, 0xab, 0xe3, 0xf5, 0xc9, + 0xde, 0xd9, 0x72, 0xe9, 0xb9, 0x6f, 0x73, 0x30, 0x33, 0x4a, 0x81, 0x6f, 0x73, 0x24, 0xdb, 0x2e, + 0x96, 0xb4, 0xd9, 0x7c, 0xf5, 0x3b, 0x0d, 0x26, 0xd3, 0x73, 0x50, 0xec, 0x0e, 0x2d, 0xe5, 0x8e, + 0x8c, 0x8b, 0xe4, 0xb3, 0x2e, 0x82, 0x9e, 0x66, 0xf9, 0x2d, 0xb3, 0x93, 0x0f, 0xde, 0x37, 0xed, + 0xba, 0x6a, 0x0d, 0xa6, 0xfa, 0x66, 0x2a, 0x54, 0x01, 0xa0, 0x24, 0x6a, 0x44, 0xe2, 0x70, 0x25, + 0x23, 0x25, 0xa9, 0x7e, 0xaf, 0xc1, 0x7c, 0xc6, 0xc8, 0xc4, 0xd3, 0x42, 0x8e, 0x5c, 0x97, 0xa4, + 0x85, 0x50, 0xe2, 0x69, 0x21, 0xd0, 0x5b, 0x36, 0xba, 0x0b, 0x45, 0x5e, 0xff, 0xea, 0x0e, 0x57, + 0xce, 0x3d, 0x0b, 0xbc, 0x1c, 0xda, 0xd8, 0x33, 0x04, 0x06, 0x95, 0x61, 0x0c, 0x7b, 0xb8, 0xdd, + 0x7d, 0x43, 0x44, 0x80, 0x4b, 0x46, 0xf4, 0xa9, 0x1e, 0x9f, 0x9f, 0x34, 0x58, 0x1a, 0xda, 0x61, + 0xd1, 0x57, 0xb0, 0x98, 0x6a, 0xd6, 0x36, 0x09, 0xda, 0x7e, 0xd7, 0x25, 0x5e, 0xd4, 0x26, 0xeb, + 0x59, 0x2f, 0x52, 0xff, 0x2f, 0x1f, 0xdd, 0xa1, 0x7a, 0xf4, 0x7b, 0x27, 0xe1, 0x6f, 0xc4, 0x4c, + 0xe9, 0xc9, 0x24, 0x91, 0xa2, 0xdb, 0x90, 0x77, 0x6c, 0xd5, 0xac, 0x06, 0xbc, 0x32, 0xda, 0x3b, + 0x5b, 0xce, 0x6f, 0x35, 0x8c, 0xbc, 0x63, 0x57, 0x4f, 0x35, 0x58, 0xc8, 0x9a, 0x79, 0x14, 0x83, + 0x76, 0x29, 0x03, 0xfa, 0x27, 0x8c, 0xf0, 0x9f, 0x52, 0xb2, 0xca, 0xa6, 0xd7, 0xae, 0x8b, 0x57, + 0x46, 0xfd, 0xc8, 0xd2, 0x3f, 0x73, 0x0e, 0xc8, 0x46, 0xd7, 0x6a, 0x93, 0x5d, 0x0e, 0x31, 0x24, + 0x12, 0xdd, 0x83, 0x51, 0x89, 0x50, 0x21, 0x98, 0xef, 0xd3, 0xd9, 0x15, 0x0b, 0x43, 0x41, 0xfa, + 0xaa, 0xbf, 0xf8, 0x09, 0xd5, 0x5f, 0xad, 0xc3, 0xd5, 0x21, 0x83, 0xd6, 0x47, 0x5f, 0xae, 0xfa, + 0xa8, 0x7f, 0xfc, 0x89, 0xf4, 0x67, 0xa1, 0x70, 0x44, 0xba, 0x82, 0x60, 0xdc, 0xe0, 0x4b, 0xb4, + 0x00, 0x23, 0xc7, 0xb8, 0xdd, 0x91, 0x5e, 0x18, 0x37, 0xe4, 0x47, 0xf5, 0x73, 0x98, 0xde, 0x21, + 0x21, 0x75, 0x2c, 0x16, 0xcd, 0x2e, 0x77, 0x81, 0xbf, 0xac, 0x2e, 0x6f, 0xf0, 0x5c, 0x6c, 0x86, + 0xe4, 0x24, 0x54, 0x3c, 0xbc, 0x19, 0xb8, 0x0a, 0xbe, 0x47, 0x4e, 0x42, 0xb4, 0x04, 0xbc, 0xa4, + 0x4d, 0x0f, 0xbb, 0x11, 0xed, 0x58, 0xe0, 0xdb, 0xcf, 0xb0, 0x4b, 0xea, 0xff, 0x7d, 0xfb, 0xae, + 0x92, 0x3b, 0x7d, 0x57, 0xc9, 0x7d, 0x78, 0x57, 0xd1, 0xbe, 0xe9, 0x55, 0xb4, 0x1f, 0x7a, 0x15, + 0xed, 0x97, 0x5e, 0x45, 0x7b, 0xdb, 0xab, 0x68, 0xbf, 0xf6, 0x2a, 0xda, 0x6f, 0xbd, 0x4a, 0xee, + 0x43, 0xaf, 0xa2, 0x7d, 0xfb, 0xbe, 0x92, 0x7b, 0xfb, 0xbe, 0x92, 0x3b, 0x7d, 0x5f, 0xc9, 0xed, + 0x43, 0xf2, 0x8f, 0x80, 0xe6, 0xa8, 0xf8, 0xb1, 0xf9, 0xe0, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x5c, 0x2e, 0x01, 0x20, 0x31, 0x10, 0x00, 0x00, } func (this *VizierMessage) Equal(that interface{}) bool { diff --git a/src/vizier/messages/messagespb/messages.proto b/src/vizier/messages/messagespb/messages.proto index 80c3c3d7967..92bc4785084 100644 --- a/src/vizier/messages/messagespb/messages.proto +++ b/src/vizier/messages/messagespb/messages.proto @@ -22,7 +22,7 @@ package px.vizier.messages; option go_package = "messagespb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "src/api/proto/uuidpb/uuid.proto"; import "src/carnot/planner/distributedpb/distributed_plan.proto"; import "src/carnot/planner/dynamic_tracing/ir/logicalpb/logical.proto"; diff --git a/src/vizier/services/cloud_connector/bridge/server_test.go b/src/vizier/services/cloud_connector/bridge/server_test.go index 55e7aa87e69..312b609815f 100644 --- a/src/vizier/services/cloud_connector/bridge/server_test.go +++ b/src/vizier/services/cloud_connector/bridge/server_test.go @@ -79,7 +79,7 @@ func handleMsg(srv vzconnpb.VZConnService_NATSBridgeServer, msg *vzconnpb.V2CBri return nil } if msg.Topic == "randomtopicNeedsResponse" { - var unmarshal = &cvmsgspb.VLogMessage{} + unmarshal := &cvmsgspb.VLogMessage{} err := types.UnmarshalAny(msg.Msg, unmarshal) if err != nil { return err diff --git a/src/vizier/services/cloud_connector/bridge/vzinfo.go b/src/vizier/services/cloud_connector/bridge/vzinfo.go index 4e967d1528e..98c4d65ad43 100644 --- a/src/vizier/services/cloud_connector/bridge/vzinfo.go +++ b/src/vizier/services/cloud_connector/bridge/vzinfo.go @@ -52,8 +52,10 @@ import ( const k8sStateUpdatePeriod = 10 * time.Second -const privateImageRepo = "gcr.io/pixie-oss/pixie-dev" -const publicImageRepo = "gcr.io/pixie-oss/pixie-prod" +const ( + privateImageRepo = "gcr.io/pixie-oss/pixie-dev" + publicImageRepo = "gcr.io/pixie-oss/pixie-prod" +) // K8sState describes the Kubernetes state of the Vizier instance. type K8sState struct { diff --git a/src/vizier/services/cloud_connector/cloud_connector_server.go b/src/vizier/services/cloud_connector/cloud_connector_server.go index d7c612d67d0..68628fcebcc 100644 --- a/src/vizier/services/cloud_connector/cloud_connector_server.go +++ b/src/vizier/services/cloud_connector/cloud_connector_server.go @@ -60,6 +60,7 @@ func init() { pflag.Bool("disable_auto_update", false, "Whether auto-update should be disabled") pflag.Duration("metrics_scrape_period", 15*time.Minute, "Period that the metrics scraper should run at.") } + func newVzServiceClient() (vizierpb.VizierServiceClient, error) { dialOpts, err := services.GetGRPCClientDialOpts() if err != nil { @@ -132,7 +133,6 @@ func main() { viper.GetDuration("renew_period"), "cloud-conn-election", ) - if err != nil { log.WithError(err).Fatal("Failed to connect to leader election manager.") } diff --git a/src/vizier/services/metadata/controllers/agent/agent.go b/src/vizier/services/metadata/controllers/agent/agent.go index 3409af53cd4..b4e2a5014d8 100644 --- a/src/vizier/services/metadata/controllers/agent/agent.go +++ b/src/vizier/services/metadata/controllers/agent/agent.go @@ -243,7 +243,6 @@ func (m *ManagerImpl) deleteAgentWrapper(agentID uuid.UUID) error { // We cannot lock the entire call to `deleteAgentWrapper`, which would allow for perfect consistency, // since the update to the metadata store may hit the network. err := m.agtStore.DeleteAgent(agentID) - if err != nil { log.WithError(err).Warnf("Failed to delete agent %s", agentID.String()) return err @@ -277,7 +276,6 @@ func (m *ManagerImpl) createAgentWrapper(agentID uuid.UUID, agentInfo *agentpb.A // We cannot lock the entire call to `createAgentWrapper`, which would allow for perfect consistency, // since the update to the metadata store may hit the network. err := m.agtStore.CreateAgent(agentID, agentInfo) - if err != nil { log.WithError(err).Warnf("Failed to create agent %s", agentID.String()) return err @@ -311,7 +309,6 @@ func (m *ManagerImpl) updateAgentWrapper(agentID uuid.UUID, agentInfo *agentpb.A // We cannot lock the entire call to `updateAgentWrapper`, which would allow for perfect consistency, // since the update to the metadata store may hit the network. err := m.agtStore.UpdateAgent(agentID, agentInfo) - if err != nil { log.WithError(err).Warnf("Failed to update agent %s", agentID.String()) return err @@ -345,7 +342,6 @@ func (m *ManagerImpl) updateAgentDataInfoWrapper(agentID uuid.UUID, agentDataInf // We cannot lock the entire call to `updateAgentDataInfoWrapper`, which would allow for perfect consistency, // since the update to the metadata store may hit the network. err := m.agtStore.UpdateAgentDataInfo(agentID, agentDataInfo) - if err != nil { log.WithError(err).Warnf("Failed to update agent data info for agent %s", agentID.String()) return err @@ -603,7 +599,8 @@ func (m *ManagerImpl) UpdateConfig(ns string, podName string, key string, value // if the input cursor has never read the initial state before, the full initial agent state is read out. // Afterwards, the changes to the agent state are read out as a delta to the previous state. func (m *ManagerImpl) GetAgentUpdates(cursorID uuid.UUID) ([]*metadata_servicepb.AgentUpdate, - *storepb.ComputedSchema, error) { + *storepb.ComputedSchema, error, +) { schemaUpdated := false var updatedAgentsUpdates []*metadata_servicepb.AgentUpdate diff --git a/src/vizier/services/metadata/controllers/agent_topic_listener.go b/src/vizier/services/metadata/controllers/agent_topic_listener.go index e1977867436..e8b72cfa463 100644 --- a/src/vizier/services/metadata/controllers/agent_topic_listener.go +++ b/src/vizier/services/metadata/controllers/agent_topic_listener.go @@ -103,7 +103,8 @@ type AgentHandler struct { // NewAgentTopicListener creates a new agent topic listener. func NewAgentTopicListener(agtMgr agent.Manager, tpMgr *tracepoint.Manager, - sendMsgFn SendMessageFn) (*AgentTopicListener, error) { + sendMsgFn SendMessageFn, +) (*AgentTopicListener, error) { atl := &AgentTopicListener{ agtMgr: agtMgr, tpMgr: tpMgr, diff --git a/src/vizier/services/metadata/controllers/cronscript/store_test.go b/src/vizier/services/metadata/controllers/cronscript/store_test.go index 7429b14ad73..db3e635b65f 100644 --- a/src/vizier/services/metadata/controllers/cronscript/store_test.go +++ b/src/vizier/services/metadata/controllers/cronscript/store_test.go @@ -23,12 +23,11 @@ import ( "testing" "time" - "github.com/gogo/protobuf/types" - "github.com/cockroachdb/pebble" "github.com/cockroachdb/pebble/vfs" "github.com/gofrs/uuid" "github.com/gogo/protobuf/proto" + "github.com/gogo/protobuf/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/vizier/services/metadata/controllers/k8smeta/k8s_metadata_handler_test.go b/src/vizier/services/metadata/controllers/k8smeta/k8s_metadata_handler_test.go index 51b230483e6..b50a5c93079 100644 --- a/src/vizier/services/metadata/controllers/k8smeta/k8s_metadata_handler_test.go +++ b/src/vizier/services/metadata/controllers/k8smeta/k8s_metadata_handler_test.go @@ -176,12 +176,14 @@ func createDeploymentObject() *storepb.K8SResource { } } -type ResourceStore map[int64]*storepb.K8SResourceUpdate -type InMemoryStore struct { - ResourceStoreByTopic map[string]ResourceStore - RVStore map[string]int64 - FullResourceStore map[int64]*storepb.K8SResource -} +type ( + ResourceStore map[int64]*storepb.K8SResourceUpdate + InMemoryStore struct { + ResourceStoreByTopic map[string]ResourceStore + RVStore map[string]int64 + FullResourceStore map[int64]*storepb.K8SResource + } +) func (s *InMemoryStore) AddResourceUpdateForTopic(uv int64, topic string, r *storepb.K8SResourceUpdate) error { if _, ok := s.ResourceStoreByTopic[topic]; !ok { @@ -501,10 +503,11 @@ func TestHandler_ProcessUpdates(t *testing.T) { // Reset prevUpdateVersion for proto comparison. m.GetK8SMetadataMessage().GetK8SMetadataUpdate().PrevUpdateVersion = 0 - if prevUpdateVersion == 3 { + switch prevUpdateVersion { + case 3: assert.Equal(t, expectedNodeMsg, m) wg.Done() - } else if prevUpdateVersion == 4 { + case 4: assert.Equal(t, expectedNSMsg, m) wg.Done() } @@ -520,10 +523,11 @@ func TestHandler_ProcessUpdates(t *testing.T) { // Reset prevUpdateVersion for proto comparison. m.GetK8SMetadataMessage().GetK8SMetadataUpdate().PrevUpdateVersion = 0 - if prevUpdateVersion == 3 { + switch prevUpdateVersion { + case 3: assert.Equal(t, expectedNodeMsg, m) wg.Done() - } else if prevUpdateVersion == 4 { + case 4: assert.Equal(t, expectedNSMsg, m) wg.Done() } diff --git a/src/vizier/services/metadata/controllers/k8smeta/k8s_metadata_store.go b/src/vizier/services/metadata/controllers/k8smeta/k8s_metadata_store.go index fe71312864e..37a9e5c8937 100644 --- a/src/vizier/services/metadata/controllers/k8smeta/k8s_metadata_store.go +++ b/src/vizier/services/metadata/controllers/k8smeta/k8s_metadata_store.go @@ -137,11 +137,7 @@ func (m *Datastore) FetchResourceUpdates(topic string, from int64, to int64) ([] // Merge the topic-specific and unscoped updates in order. tIdx := 0 uIdx := 0 - for { - if tIdx == len(tKeys) && uIdx == len(uKeys) { - break - } - + for tIdx < len(tKeys) || uIdx < len(uKeys) { var uVersion int64 = -1 var tVersion int64 = -1 var err error diff --git a/src/vizier/services/metadata/controllers/message_bus.go b/src/vizier/services/metadata/controllers/message_bus.go index 95eb20e0215..fafee905dbc 100644 --- a/src/vizier/services/metadata/controllers/message_bus.go +++ b/src/vizier/services/metadata/controllers/message_bus.go @@ -53,7 +53,8 @@ type MessageBusController struct { // NewMessageBusController creates a new controller for handling NATS messages. func NewMessageBusController(conn *nats.Conn, agtMgr agent.Manager, tpMgr *tracepoint.Manager, k8smetaHandler *k8smeta.Handler, - isLeader *bool) (*MessageBusController, error) { + isLeader *bool, +) (*MessageBusController, error) { ch := make(chan *nats.Msg, 8192) listeners := make(map[string]TopicListener) subscriptions := make([]*nats.Subscription, 0) diff --git a/src/vizier/services/metadata/controllers/server.go b/src/vizier/services/metadata/controllers/server.go index d23b2be5e52..8c4a11eebe9 100644 --- a/src/vizier/services/metadata/controllers/server.go +++ b/src/vizier/services/metadata/controllers/server.go @@ -257,7 +257,7 @@ func (s *Server) GetAgentUpdates(req *metadatapb.AgentUpdatesRequest, srv metada } } else { // Chunk up the data so we don't overwhelm the query broker with a lot of data at once. - for !(finishedUpdates && finishedSchema) { + for !finishedUpdates || !finishedSchema { select { case <-srv.Context().Done(): log.Infof("Client closed context for GetAgentUpdates") diff --git a/src/vizier/services/metadata/controllers/server_test.go b/src/vizier/services/metadata/controllers/server_test.go index befa5630ec0..9a9dc844c9a 100644 --- a/src/vizier/services/metadata/controllers/server_test.go +++ b/src/vizier/services/metadata/controllers/server_test.go @@ -46,7 +46,6 @@ import ( "px.dev/pixie/src/carnot/planner/dynamic_tracing/ir/logicalpb" "px.dev/pixie/src/common/base/statuspb" "px.dev/pixie/src/shared/bloomfilterpb" - sharedmetadatapb "px.dev/pixie/src/shared/metadatapb" "px.dev/pixie/src/shared/services/env" "px.dev/pixie/src/shared/services/server" diff --git a/src/vizier/services/metadata/controllers/tracepoint/tracepoint.go b/src/vizier/services/metadata/controllers/tracepoint/tracepoint.go index 3557495354a..fb24dd141de 100644 --- a/src/vizier/services/metadata/controllers/tracepoint/tracepoint.go +++ b/src/vizier/services/metadata/controllers/tracepoint/tracepoint.go @@ -38,11 +38,9 @@ import ( "px.dev/pixie/src/vizier/services/shared/agentpb" ) -var ( - // ErrTracepointAlreadyExists is produced if a tracepoint already exists with the given name - // and does not have a matching schema. - ErrTracepointAlreadyExists = errors.New("TracepointDeployment already exists") -) +// ErrTracepointAlreadyExists is produced if a tracepoint already exists with the given name +// and does not have a matching schema. +var ErrTracepointAlreadyExists = errors.New("TracepointDeployment already exists") // agentMessenger is a controller that lets us message all agents and all active agents. type agentMessenger interface { @@ -446,7 +444,6 @@ func (m *Manager) RegisterTracepoint(agents []*agentpb.Agent, tracepointID uuid. } err = m.agtMgr.MessageAgents(validAgentsForProgram.AgentIDs, msg) - if err != nil { return err } diff --git a/src/vizier/services/metadata/metadata_server.go b/src/vizier/services/metadata/metadata_server.go index d94ea9d810c..b2959d80e98 100644 --- a/src/vizier/services/metadata/metadata_server.go +++ b/src/vizier/services/metadata/metadata_server.go @@ -138,11 +138,11 @@ func cleanupOldPebbleData() { func mustInitPebbleDatastore() *pebbledb.DataStore { cleanupOldPebbleData() log.Infof("Using pebbledb: %s for metadata", pebbleOpenDir) - pebbleDb, err := pebble.Open(pebbleOpenDir, &pebble.Options{}) + pebbleDB, err := pebble.Open(pebbleOpenDir, &pebble.Options{}) if err != nil { log.WithError(err).Fatal("Failed to open pebble database. If out of space, increase the storage size of the `metadata-pv-claim` PersistentVolumeClaim and restart the vizier-metadata pod") } - return pebbledb.New(pebbleDb, pebbledbTTLDuration) + return pebbledb.New(pebbleDB, pebbledbTTLDuration) } func etcdTLSConfig() (*tls.Config, error) { @@ -272,7 +272,6 @@ func main() { mc, err := controllers.NewMessageBusController(nc, agtMgr, tracepointMgr, mdh, &isLeader) - if err != nil { log.WithError(err).Fatal("Failed to connect to message bus") } diff --git a/src/vizier/services/metadata/metadatapb/BUILD.bazel b/src/vizier/services/metadata/metadatapb/BUILD.bazel index c620ae08fb5..11b8b4962db 100644 --- a/src/vizier/services/metadata/metadatapb/BUILD.bazel +++ b/src/vizier/services/metadata/metadatapb/BUILD.bazel @@ -30,7 +30,7 @@ pl_proto_library( "//src/table_store/schemapb:schema_pl_proto", "//src/vizier/messages/messagespb:messages_pl_proto", "//src/vizier/services/shared/agentpb:agent_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -48,7 +48,7 @@ pl_cc_proto_library( "//src/table_store/schemapb:schema_pl_cc_proto", "//src/vizier/messages/messagespb:messages_pl_cc_proto", "//src/vizier/services/shared/agentpb:agent_pl_cc_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/vizier/services/metadata/metadatapb/service.pb.go b/src/vizier/services/metadata/metadatapb/service.pb.go index cef07c38f8f..64e34931455 100755 --- a/src/vizier/services/metadata/metadatapb/service.pb.go +++ b/src/vizier/services/metadata/metadatapb/service.pb.go @@ -1943,134 +1943,134 @@ func init() { } var fileDescriptor_bfe4468195647430 = []byte{ - // 2028 bytes of a gzipped FileDescriptorProto + // 2017 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xdd, 0x6f, 0x23, 0x57, - 0x15, 0xf7, 0x78, 0xf2, 0xe1, 0x9c, 0x64, 0xf3, 0x71, 0x93, 0x6c, 0x13, 0x2f, 0x75, 0xb6, 0x23, + 0x15, 0xf7, 0x78, 0xf2, 0xe1, 0x9c, 0x64, 0xf3, 0x71, 0xe3, 0x6c, 0x1d, 0x2f, 0x75, 0xb6, 0x23, 0xa0, 0xab, 0x4d, 0x77, 0xa6, 0x6b, 0xba, 0x4d, 0xd9, 0x96, 0xaa, 0x9b, 0xb8, 0x4d, 0xac, 0x6c, - 0xdb, 0x30, 0xce, 0x06, 0x89, 0x17, 0x6b, 0x3c, 0x73, 0xe3, 0x0c, 0xf5, 0x7c, 0x30, 0x73, 0x1d, - 0x12, 0x84, 0x04, 0x42, 0xe2, 0x0d, 0x55, 0xf4, 0x01, 0xa4, 0xbe, 0x81, 0x78, 0x81, 0x67, 0xfe, - 0x00, 0x04, 0x4f, 0x3c, 0xee, 0x13, 0xaa, 0x10, 0x5a, 0xb1, 0xde, 0x17, 0x9e, 0x50, 0xff, 0x04, - 0x74, 0xbf, 0xec, 0x19, 0x7b, 0x6c, 0xc7, 0x01, 0xf1, 0xc4, 0x53, 0xee, 0x9c, 0x39, 0xe7, 0x77, - 0xcf, 0xfd, 0x9d, 0x73, 0xef, 0xfd, 0x8d, 0x03, 0x0f, 0xe2, 0xc8, 0x36, 0xce, 0xdd, 0x1f, 0xba, - 0x38, 0x32, 0x62, 0x1c, 0x9d, 0xbb, 0x36, 0x8e, 0x0d, 0x0f, 0x13, 0xcb, 0xb1, 0x88, 0xd5, 0x1d, - 0x84, 0x0d, 0xf9, 0x52, 0x0f, 0xa3, 0x80, 0x04, 0xe8, 0x56, 0x78, 0xa1, 0xf3, 0x28, 0x5d, 0x46, - 0xe9, 0xd2, 0xb9, 0x78, 0xaf, 0xe9, 0x92, 0xb3, 0x76, 0x43, 0xb7, 0x03, 0xcf, 0x68, 0x06, 0xcd, - 0xc0, 0x60, 0x31, 0x8d, 0xf6, 0x29, 0x7b, 0x62, 0x0f, 0x6c, 0xc4, 0xb1, 0x8a, 0xa5, 0x66, 0x10, - 0x34, 0x5b, 0xb8, 0xe7, 0xe5, 0xb4, 0x23, 0x8b, 0xb8, 0x81, 0x2f, 0xde, 0x6f, 0xf5, 0xbf, 0x27, - 0xae, 0x87, 0x63, 0x62, 0x79, 0xa1, 0x74, 0xa0, 0x6b, 0xb0, 0x42, 0x97, 0x7b, 0x18, 0xed, 0xb6, - 0xeb, 0x84, 0x0d, 0xf6, 0x47, 0x38, 0xec, 0x50, 0x07, 0xdb, 0x8a, 0xfc, 0x80, 0x18, 0x61, 0xcb, - 0xf2, 0x7d, 0x1c, 0x19, 0x8e, 0x1b, 0x93, 0xc8, 0x6d, 0xb4, 0x09, 0xa6, 0xce, 0x89, 0xa7, 0x3a, - 0xf5, 0x10, 0x81, 0xdf, 0xca, 0x0a, 0xbc, 0xf4, 0x2d, 0xcf, 0xb5, 0xeb, 0x24, 0xb2, 0x6c, 0xd7, - 0x6f, 0x1a, 0x6e, 0x64, 0xb4, 0x82, 0xa6, 0x6b, 0x5b, 0xad, 0xb0, 0x21, 0x47, 0x22, 0xfc, 0x6b, - 0x2c, 0x3c, 0xf0, 0xbc, 0xc0, 0x37, 0x1a, 0x56, 0x8c, 0x8d, 0x98, 0x58, 0xa4, 0x1d, 0x53, 0x36, - 0xd9, 0x20, 0xe9, 0x46, 0xac, 0x46, 0x0b, 0xd7, 0x63, 0x12, 0x44, 0xd8, 0x88, 0xed, 0x33, 0xec, - 0x31, 0xd2, 0xd9, 0x40, 0xb8, 0xdd, 0x4b, 0x94, 0xca, 0xc3, 0x71, 0x6c, 0x35, 0x59, 0xa9, 0xf8, - 0x20, 0x6c, 0x74, 0x87, 0xc2, 0x5d, 0xcf, 0xaa, 0x6c, 0x7c, 0x66, 0x45, 0xd8, 0x31, 0xac, 0x26, - 0xf6, 0x49, 0xd8, 0xe0, 0x7f, 0x85, 0xff, 0x6d, 0xea, 0x2f, 0xde, 0xdb, 0xe7, 0x5e, 0xdc, 0xa4, - 0x98, 0x7c, 0xc0, 0x3d, 0xb4, 0x25, 0xb8, 0x51, 0x63, 0x09, 0x99, 0xf8, 0xfb, 0x6d, 0x1c, 0x13, - 0xad, 0x0a, 0x8b, 0xd2, 0x10, 0x87, 0x81, 0x1f, 0x63, 0xb4, 0x03, 0x33, 0x3c, 0xe7, 0x8d, 0xfc, - 0x6d, 0xe5, 0xce, 0x7c, 0x79, 0x4b, 0x0f, 0x2f, 0xf4, 0xc4, 0xd2, 0x74, 0xb9, 0x34, 0x5d, 0x04, - 0x0a, 0x77, 0x0d, 0xc1, 0xf2, 0x23, 0x9a, 0x4c, 0xd5, 0x3f, 0x0d, 0x24, 0x7c, 0x0d, 0x56, 0x12, - 0x36, 0x31, 0xc3, 0xbb, 0x30, 0xe5, 0xfa, 0xa7, 0xc1, 0x86, 0x72, 0x5b, 0xbd, 0x33, 0x5f, 0xbe, - 0xab, 0x8f, 0x68, 0x44, 0x9d, 0x45, 0x7f, 0x28, 0x9e, 0x4c, 0x16, 0xa7, 0x3d, 0x57, 0xe0, 0x46, - 0xca, 0x8e, 0xde, 0x81, 0x69, 0xc6, 0xc3, 0x86, 0xc2, 0x52, 0xfe, 0x7a, 0x16, 0x24, 0xe7, 0x45, - 0xe7, 0x7c, 0xb1, 0x70, 0x93, 0x07, 0xa1, 0x0a, 0xcc, 0xf0, 0x62, 0x8a, 0x15, 0xbf, 0x76, 0xb5, - 0xf0, 0x1a, 0x8b, 0x31, 0x45, 0x2c, 0x7a, 0x0c, 0xf3, 0xbc, 0xcd, 0xea, 0x6c, 0x71, 0x2a, 0x83, - 0xda, 0xa6, 0x50, 0xdc, 0xac, 0x8b, 0xee, 0xd3, 0x53, 0x6d, 0xab, 0xef, 0xb1, 0x97, 0x8c, 0x1f, - 0xb0, 0xbb, 0x63, 0xed, 0x73, 0x05, 0x56, 0xd9, 0x2c, 0x4f, 0x42, 0xc7, 0x22, 0x38, 0x16, 0x84, - 0xa2, 0x2a, 0xac, 0x7a, 0xd6, 0x45, 0xbd, 0xcd, 0xac, 0x75, 0xd7, 0x27, 0x38, 0x3a, 0xb7, 0x5a, - 0x62, 0xdd, 0x9b, 0x3a, 0xdf, 0x67, 0xba, 0xdc, 0x67, 0x7a, 0x45, 0xec, 0x43, 0x73, 0xc5, 0xb3, - 0x2e, 0x38, 0x54, 0x55, 0xc4, 0xa0, 0x1d, 0xd8, 0xe8, 0x41, 0xc5, 0xf5, 0x10, 0x47, 0xf5, 0x48, - 0x94, 0x88, 0x11, 0x31, 0x6d, 0xae, 0x77, 0x83, 0xe2, 0x23, 0x1c, 0xc9, 0xfa, 0x69, 0xff, 0x52, - 0x60, 0x3e, 0x91, 0x1b, 0xda, 0x81, 0x02, 0xa3, 0xa5, 0xee, 0x3a, 0x22, 0x91, 0x25, 0xba, 0x6c, - 0xbe, 0x89, 0xf5, 0x27, 0x4f, 0xaa, 0x95, 0xdd, 0xf9, 0xce, 0xb3, 0xad, 0x59, 0xde, 0x09, 0x15, - 0x73, 0x96, 0x79, 0x57, 0x1d, 0x54, 0x84, 0x59, 0x07, 0xb7, 0x30, 0xc1, 0x0e, 0x9b, 0xb0, 0x70, - 0x90, 0x33, 0xa5, 0x01, 0xbd, 0x2b, 0x4b, 0xaa, 0x4e, 0x52, 0xd2, 0x83, 0x9c, 0x2c, 0xea, 0x7b, - 0x30, 0x47, 0x5b, 0x83, 0x17, 0x63, 0x8a, 0x61, 0xbc, 0x92, 0xc0, 0xe8, 0xee, 0x34, 0x16, 0x56, - 0xb1, 0x88, 0x45, 0x69, 0x3f, 0xc8, 0x99, 0x05, 0x47, 0x8c, 0x77, 0x0b, 0x30, 0xc3, 0xb9, 0xd1, - 0x3e, 0xcb, 0xc3, 0x5a, 0xba, 0x18, 0xa2, 0x93, 0x3f, 0x84, 0x1b, 0x7c, 0xe5, 0x82, 0x44, 0xd1, - 0xd2, 0x77, 0xc6, 0xb7, 0x34, 0x47, 0x32, 0x17, 0xac, 0x04, 0x2c, 0x3a, 0x92, 0x70, 0x7c, 0x47, - 0xd1, 0x7e, 0x54, 0xaf, 0xd4, 0x44, 0x7c, 0x27, 0xb2, 0x26, 0xe2, 0x88, 0xdc, 0x10, 0xa3, 0x32, - 0xac, 0xa7, 0x10, 0x45, 0xa2, 0x0e, 0x63, 0xb5, 0x60, 0xae, 0x26, 0x9d, 0x79, 0x16, 0x0e, 0xfa, - 0x2a, 0x2c, 0x62, 0xdf, 0xa9, 0x07, 0xa7, 0xf5, 0x73, 0x1c, 0xc5, 0x6e, 0xe0, 0x33, 0xfa, 0x0a, - 0xe6, 0x02, 0xf6, 0x9d, 0x8f, 0x4f, 0x4f, 0xb8, 0x4d, 0xab, 0xc0, 0xda, 0x77, 0x5c, 0x72, 0x76, - 0x14, 0xe1, 0x53, 0xf7, 0xe2, 0x10, 0x5f, 0xca, 0x06, 0xbd, 0x09, 0x33, 0x21, 0xb3, 0xb1, 0x56, - 0x98, 0x33, 0xc5, 0x13, 0x5a, 0x83, 0x69, 0xd6, 0x95, 0xac, 0xd2, 0x73, 0x26, 0x7f, 0xd0, 0x3e, - 0x55, 0x60, 0xbd, 0x0f, 0x46, 0x50, 0xbb, 0x0f, 0xea, 0x27, 0xe7, 0x92, 0xd0, 0x07, 0x23, 0x09, - 0xcd, 0x04, 0xd0, 0x0f, 0x4f, 0x4c, 0x8a, 0x50, 0x7c, 0x0d, 0xf2, 0x87, 0x27, 0x68, 0x19, 0xd4, - 0x4f, 0xf0, 0xa5, 0xc8, 0x89, 0x0e, 0x69, 0x42, 0xe7, 0x56, 0xab, 0xcd, 0x7b, 0x7d, 0xc1, 0xe4, - 0x0f, 0xda, 0xdf, 0xf2, 0xb0, 0x69, 0xe2, 0xa6, 0x1b, 0x13, 0x1c, 0x1d, 0x47, 0x96, 0x8d, 0xc3, - 0xc0, 0xf5, 0x89, 0x5c, 0x9c, 0x03, 0x85, 0x88, 0x0f, 0x65, 0x66, 0x07, 0x23, 0x33, 0x1b, 0x8a, - 0xa4, 0x0f, 0x58, 0xcc, 0x2e, 0x72, 0xf1, 0xaf, 0x0a, 0xac, 0x0c, 0xce, 0xfd, 0x03, 0x58, 0x27, - 0x5d, 0x63, 0xdd, 0xc1, 0x61, 0x2b, 0xb8, 0xf4, 0x7a, 0x67, 0xde, 0x6e, 0x56, 0x93, 0xa4, 0xef, - 0x39, 0xdd, 0x8d, 0x74, 0x79, 0xbb, 0xf5, 0xf0, 0x2b, 0x5d, 0x24, 0x73, 0x8d, 0x64, 0x58, 0x11, - 0x82, 0x29, 0xdf, 0xf2, 0xb0, 0x28, 0x1c, 0x1b, 0xa3, 0x37, 0x40, 0x25, 0xa4, 0x25, 0xf6, 0xe6, - 0xf0, 0x63, 0x67, 0x77, 0xb6, 0xf3, 0x6c, 0x4b, 0x3d, 0x3e, 0x7e, 0x6c, 0x52, 0x77, 0xed, 0x0f, - 0x79, 0x28, 0x66, 0x51, 0x22, 0x4a, 0xfe, 0x3d, 0x98, 0xef, 0x25, 0x70, 0x7d, 0x82, 0x45, 0xfd, - 0x7b, 0x26, 0x71, 0x50, 0x27, 0xc1, 0xd1, 0x76, 0xdf, 0x99, 0xbf, 0x4a, 0xa7, 0x91, 0x77, 0xbb, - 0x9e, 0x3e, 0xda, 0x8b, 0x3f, 0x82, 0xe5, 0x7e, 0xb4, 0x04, 0x80, 0x32, 0x16, 0x00, 0xbd, 0x0a, - 0x79, 0xd7, 0x11, 0x33, 0x0d, 0x9c, 0x8d, 0x33, 0x9d, 0x67, 0x5b, 0xf9, 0x6a, 0xc5, 0xcc, 0xbb, - 0x4e, 0x97, 0x6b, 0xb5, 0xc7, 0xb5, 0xf6, 0x01, 0x6c, 0xec, 0x63, 0xd2, 0x4b, 0x20, 0x71, 0xbf, - 0xa2, 0xbb, 0xa0, 0xba, 0x8e, 0xa4, 0x6a, 0x00, 0x99, 0xb1, 0x5f, 0xad, 0xc4, 0x26, 0x75, 0xd2, - 0x7e, 0xa3, 0xc2, 0x66, 0x06, 0x90, 0x20, 0xff, 0x2c, 0x8b, 0xfc, 0x0f, 0x46, 0x92, 0x3f, 0x14, - 0xac, 0x8f, 0x7b, 0x9c, 0xa2, 0xbe, 0xf8, 0x79, 0x1e, 0x96, 0xfa, 0x1c, 0x04, 0x41, 0xca, 0x78, - 0x82, 0xee, 0xc3, 0x34, 0xe5, 0x94, 0x77, 0xe3, 0x62, 0xf9, 0x56, 0x8a, 0xf5, 0xc7, 0xee, 0x29, - 0xde, 0xbb, 0xb4, 0x5b, 0x98, 0xcf, 0xca, 0x3d, 0x91, 0x01, 0x05, 0xee, 0x81, 0xe3, 0x0d, 0x95, - 0x2d, 0x2b, 0xb3, 0x56, 0x5d, 0xa7, 0x6e, 0x11, 0xa6, 0x12, 0x0d, 0xbf, 0x0b, 0x8b, 0xf8, 0x22, - 0xc4, 0x36, 0x55, 0x97, 0x3c, 0x81, 0xe9, 0xf1, 0x09, 0xdc, 0x90, 0x21, 0x7c, 0x91, 0xaf, 0xc0, - 0x02, 0x3f, 0x86, 0xeb, 0x14, 0x32, 0xde, 0x98, 0xb9, 0xad, 0xde, 0x99, 0x33, 0xe7, 0xb9, 0xed, - 0x23, 0x6a, 0xd2, 0x0c, 0x78, 0xc9, 0xc4, 0x5e, 0x70, 0x8e, 0x07, 0xf7, 0xff, 0x1a, 0x4c, 0xf3, - 0x30, 0x85, 0x85, 0xf1, 0x07, 0x6d, 0x1f, 0x36, 0x06, 0x03, 0x44, 0x49, 0x27, 0x69, 0x51, 0xcd, - 0x86, 0x55, 0x7e, 0x01, 0xec, 0x05, 0xfe, 0xa9, 0xdb, 0x94, 0xb3, 0x8e, 0x39, 0x37, 0xe7, 0xc4, - 0xb9, 0x49, 0x2f, 0x0d, 0x7e, 0xd1, 0x84, 0x81, 0x53, 0x4f, 0xb4, 0x30, 0xbf, 0x8e, 0x8e, 0x02, - 0x87, 0xae, 0x4f, 0xdb, 0x83, 0xb5, 0xf4, 0x24, 0xd7, 0xc9, 0x74, 0x15, 0x56, 0xf6, 0x31, 0xa9, - 0xd9, 0x91, 0x1b, 0x12, 0xa9, 0x8b, 0xb4, 0x3f, 0x29, 0x80, 0x92, 0x56, 0x01, 0x7c, 0x02, 0xb3, - 0x31, 0x37, 0x89, 0x8e, 0x7e, 0x67, 0x5c, 0x47, 0xf7, 0x21, 0xe8, 0xe2, 0xf9, 0x7d, 0x9f, 0x44, - 0x97, 0xa6, 0x04, 0x2b, 0xd6, 0x60, 0x21, 0xf9, 0x22, 0x83, 0xa6, 0x7b, 0x49, 0x9a, 0xe6, 0xcb, - 0x2f, 0xb1, 0xe3, 0x59, 0x68, 0x72, 0x7d, 0x2f, 0x0a, 0x7c, 0x1e, 0x2f, 0xf8, 0x7b, 0x98, 0x7f, - 0x4b, 0xd1, 0x0e, 0x61, 0xe3, 0x91, 0xe3, 0x7c, 0x1c, 0x71, 0x8a, 0xc4, 0x7b, 0x51, 0x07, 0x83, - 0xaa, 0x72, 0x6a, 0x10, 0x0c, 0x0d, 0xc5, 0x13, 0x6e, 0xda, 0x2d, 0xd8, 0xcc, 0x00, 0x13, 0x0a, - 0xee, 0xdb, 0xb0, 0x5a, 0x61, 0x3a, 0x2b, 0x3d, 0xc9, 0x43, 0x98, 0xe3, 0xd1, 0x23, 0x94, 0xdc, - 0x42, 0xe7, 0xd9, 0x56, 0x81, 0x87, 0x55, 0x2b, 0x66, 0x81, 0xfb, 0x57, 0x1d, 0xed, 0x26, 0xac, - 0xa5, 0x21, 0xc5, 0x54, 0x7f, 0x54, 0x60, 0xa5, 0xd6, 0x5f, 0x2e, 0xf4, 0xa4, 0xbf, 0x2e, 0x6f, - 0x8f, 0xac, 0xcb, 0x00, 0xc0, 0xff, 0xb2, 0x2c, 0x6b, 0x80, 0x6a, 0x03, 0x7d, 0xa1, 0xfd, 0x59, - 0x81, 0xc5, 0xf7, 0x2f, 0xb0, 0xdd, 0xa6, 0xf7, 0x1c, 0xed, 0xd0, 0x18, 0xdd, 0x85, 0x15, 0x2c, - 0x2d, 0x75, 0xfa, 0x85, 0x5b, 0xf7, 0x79, 0x43, 0xab, 0xe6, 0x52, 0xf7, 0xc5, 0xb1, 0xeb, 0xe1, - 0x8f, 0x62, 0xa4, 0xc3, 0xaa, 0x1d, 0x78, 0xa1, 0xdb, 0xb2, 0x52, 0xde, 0x79, 0xe6, 0xbd, 0x92, - 0x78, 0x25, 0xfc, 0x5f, 0x85, 0xa5, 0xc6, 0x25, 0x93, 0xe9, 0x51, 0x60, 0xe3, 0x38, 0x16, 0x12, - 0x4e, 0x35, 0x17, 0x99, 0xf9, 0x48, 0x5a, 0xd1, 0x36, 0xac, 0x44, 0xd8, 0x0e, 0x22, 0x27, 0xe9, - 0x3a, 0xc5, 0x5c, 0x97, 0xc5, 0x8b, 0xae, 0xb3, 0xf6, 0xdb, 0x3c, 0x7c, 0xc5, 0x64, 0xc6, 0xee, - 0x52, 0x4c, 0x1c, 0xb7, 0x5b, 0xff, 0x8d, 0x8e, 0x40, 0x6f, 0xc1, 0x5c, 0xf7, 0x33, 0x5f, 0xd0, - 0x5d, 0x1c, 0x50, 0x0a, 0xc7, 0xd2, 0xc3, 0xec, 0x39, 0xa3, 0x6d, 0x98, 0xc6, 0x51, 0x14, 0x44, - 0x42, 0x5f, 0x64, 0x9d, 0x06, 0x54, 0xe8, 0x33, 0x1f, 0x74, 0x02, 0x3d, 0x72, 0xd9, 0xd1, 0x1c, - 0x0b, 0xb9, 0xbf, 0x3d, 0xb2, 0xa5, 0xd2, 0xb5, 0x3b, 0xc8, 0x99, 0x8b, 0x38, 0x65, 0xa1, 0xf2, - 0x3f, 0x62, 0x5c, 0x68, 0x5b, 0xf0, 0xf2, 0x10, 0x92, 0x44, 0x2f, 0x6c, 0xc1, 0xcb, 0xfb, 0x98, - 0x3c, 0x6a, 0xb5, 0xfa, 0x1c, 0xba, 0xa7, 0xd3, 0xaf, 0x55, 0x28, 0x0d, 0xf3, 0x10, 0x27, 0x15, - 0x86, 0x59, 0x3e, 0x9d, 0xdc, 0x11, 0x87, 0xe3, 0x4e, 0xaa, 0x11, 0x68, 0x7a, 0x7f, 0xa6, 0x12, - 0xbb, 0xf8, 0xab, 0x3c, 0x2c, 0xf5, 0xbd, 0xfc, 0x7f, 0x91, 0xdb, 0x2d, 0x52, 0xfe, 0xbb, 0x0a, - 0x4b, 0xf2, 0xf7, 0x84, 0x1a, 0x07, 0x42, 0x17, 0xb0, 0x44, 0x79, 0x4e, 0x7e, 0xa2, 0xbd, 0x7e, - 0xd5, 0x4f, 0x3b, 0x59, 0xfb, 0xe2, 0xfd, 0x09, 0x22, 0x78, 0xf5, 0x5e, 0x57, 0x10, 0x06, 0x60, - 0x77, 0x11, 0xff, 0x8a, 0x1b, 0xfd, 0x13, 0x49, 0xea, 0x07, 0x9d, 0xe2, 0xf6, 0x95, 0x7c, 0x45, - 0xd3, 0x79, 0xb0, 0x20, 0x17, 0x48, 0xf5, 0x1b, 0xba, 0x37, 0x3e, 0xd7, 0x84, 0xfa, 0x2c, 0xea, - 0x57, 0x75, 0x17, 0xd3, 0x5d, 0xc2, 0xf2, 0x3e, 0x26, 0xa9, 0xcf, 0x35, 0x74, 0x7f, 0x92, 0x4f, - 0x3b, 0x3e, 0x6d, 0x79, 0xf2, 0xaf, 0xc1, 0xf2, 0xef, 0x55, 0xd8, 0x94, 0xe5, 0x4d, 0x88, 0x4f, - 0x51, 0xe8, 0x9f, 0x29, 0x80, 0x06, 0x3f, 0x25, 0xd0, 0x9b, 0xd7, 0xfb, 0xb8, 0x2b, 0xee, 0x5c, - 0xf3, 0x9b, 0x05, 0xfd, 0x54, 0x61, 0xda, 0x26, 0xad, 0xaa, 0xd1, 0x83, 0x49, 0x55, 0x38, 0xcf, - 0xe2, 0xcd, 0xeb, 0x89, 0x77, 0xf4, 0x63, 0x58, 0xee, 0x97, 0x94, 0xe8, 0x8d, 0x31, 0x2b, 0xca, - 0x94, 0xac, 0xc5, 0x07, 0x13, 0x46, 0x89, 0x5a, 0xfd, 0x5c, 0x81, 0x75, 0x59, 0x2b, 0x2e, 0x14, - 0x65, 0x9d, 0x62, 0x58, 0x48, 0xea, 0xc7, 0x31, 0xbb, 0x31, 0x43, 0xcf, 0x8e, 0xd9, 0x8d, 0x59, - 0xe2, 0xb4, 0xfc, 0xcb, 0x19, 0xb8, 0xd9, 0x53, 0x06, 0x35, 0x12, 0x44, 0x58, 0xe6, 0xe3, 0x89, - 0x6d, 0xca, 0xa4, 0x01, 0xd2, 0xaf, 0xac, 0x2d, 0x79, 0x2e, 0xc6, 0x84, 0x5a, 0x94, 0xb5, 0xc7, - 0x80, 0xa8, 0x1b, 0xd3, 0x1e, 0xc3, 0x14, 0xe5, 0x98, 0xf6, 0x18, 0xaa, 0x1d, 0x69, 0x0d, 0x92, - 0x42, 0x6f, 0x4c, 0x0d, 0x32, 0x64, 0xe6, 0x98, 0x1a, 0x64, 0xa9, 0x48, 0x4a, 0x74, 0xed, 0xaa, - 0x44, 0xd7, 0x26, 0x24, 0x7a, 0x50, 0xdc, 0xa1, 0x4f, 0x15, 0x58, 0xcf, 0xbc, 0xf2, 0xd1, 0x37, - 0xc7, 0xb4, 0xf4, 0x70, 0x2d, 0x55, 0x7c, 0x78, 0x9d, 0x50, 0x91, 0xd0, 0x67, 0x0a, 0xdc, 0xcc, - 0xbe, 0xf2, 0xd1, 0xc3, 0x6b, 0xe9, 0x04, 0x9e, 0xd2, 0xdb, 0xff, 0x81, 0xc6, 0xd8, 0x7d, 0xef, - 0xe9, 0xf3, 0x52, 0xee, 0x8b, 0xe7, 0xa5, 0xdc, 0x97, 0xcf, 0x4b, 0xca, 0x4f, 0x3a, 0x25, 0xe5, - 0x77, 0x9d, 0x92, 0xf2, 0x97, 0x4e, 0x49, 0x79, 0xda, 0x29, 0x29, 0xff, 0xe8, 0x94, 0x94, 0x7f, - 0x76, 0x4a, 0xb9, 0x2f, 0x3b, 0x25, 0xe5, 0x17, 0x2f, 0x4a, 0xb9, 0xa7, 0x2f, 0x4a, 0xb9, 0x2f, - 0x5e, 0x94, 0x72, 0xdf, 0x85, 0xde, 0x3f, 0xa4, 0x1a, 0x33, 0x4c, 0x21, 0x7c, 0xe3, 0xdf, 0x01, - 0x00, 0x00, 0xff, 0xff, 0xfc, 0x9b, 0xbc, 0xee, 0xc2, 0x1a, 0x00, 0x00, + 0xdb, 0x30, 0xce, 0x06, 0x89, 0x17, 0x6b, 0x3c, 0x73, 0xe3, 0x1d, 0xea, 0xf9, 0x60, 0xe6, 0x3a, + 0x24, 0x08, 0x09, 0x84, 0xc4, 0x1b, 0xaa, 0xe8, 0x03, 0x48, 0x7d, 0x03, 0xf1, 0x02, 0xcf, 0xfc, + 0x01, 0x08, 0x9e, 0x78, 0xdc, 0x27, 0x54, 0x21, 0xb4, 0x22, 0xde, 0x17, 0x9e, 0x50, 0xff, 0x04, + 0x74, 0xbf, 0xec, 0xb1, 0x3d, 0xb6, 0xe3, 0x80, 0x78, 0xe2, 0x29, 0x77, 0xce, 0x9c, 0xf3, 0xbb, + 0xe7, 0xfe, 0xce, 0xb9, 0xf7, 0xfe, 0xc6, 0x81, 0x07, 0x71, 0x64, 0x1b, 0x67, 0xee, 0x0f, 0x5d, + 0x1c, 0x19, 0x31, 0x8e, 0xce, 0x5c, 0x1b, 0xc7, 0x86, 0x87, 0x89, 0xe5, 0x58, 0xc4, 0xea, 0x0e, + 0xc2, 0x86, 0x7c, 0xa9, 0x87, 0x51, 0x40, 0x02, 0x74, 0x2b, 0x3c, 0xd7, 0x79, 0x94, 0x2e, 0xa3, + 0x74, 0xe9, 0x5c, 0xcc, 0x37, 0x83, 0x66, 0xc0, 0xfc, 0x0c, 0x3a, 0xe2, 0x21, 0xc5, 0x52, 0x33, + 0x08, 0x9a, 0x2d, 0x6c, 0xb0, 0xa7, 0x46, 0xfb, 0xd4, 0x70, 0xda, 0x91, 0x45, 0xdc, 0xc0, 0x17, + 0xef, 0xb7, 0x06, 0xdf, 0x13, 0xd7, 0xc3, 0x31, 0xb1, 0xbc, 0x50, 0x3a, 0xd0, 0x54, 0xad, 0xd0, + 0xe5, 0x1e, 0x46, 0xbb, 0xed, 0x3a, 0x61, 0x83, 0xfd, 0x11, 0x0e, 0x3b, 0xd4, 0xc1, 0xb6, 0x22, + 0x3f, 0x20, 0x46, 0xd8, 0xb2, 0x7c, 0x1f, 0x47, 0x86, 0xe3, 0xc6, 0x24, 0x72, 0x1b, 0x6d, 0x82, + 0xa9, 0x73, 0xe2, 0xa9, 0x4e, 0x3d, 0x44, 0xe0, 0xb7, 0xd2, 0x02, 0x2f, 0x7c, 0xcb, 0x73, 0xed, + 0x3a, 0x89, 0x2c, 0xdb, 0xf5, 0x9b, 0x86, 0x1b, 0x19, 0xad, 0xa0, 0xe9, 0xda, 0x56, 0x2b, 0x6c, + 0xc8, 0x91, 0x08, 0xff, 0x1a, 0x0b, 0x0f, 0x3c, 0x2f, 0xf0, 0x8d, 0x86, 0x15, 0x63, 0x23, 0x26, + 0x16, 0x69, 0xc7, 0x94, 0x34, 0x36, 0x48, 0xba, 0x11, 0xab, 0xd1, 0xc2, 0xf5, 0x98, 0x04, 0x11, + 0x36, 0x62, 0xfb, 0x29, 0xf6, 0x18, 0xb7, 0x6c, 0x20, 0xdc, 0xee, 0x25, 0x2a, 0xe2, 0xe1, 0x38, + 0xb6, 0x9a, 0xac, 0x22, 0x7c, 0x10, 0x36, 0xba, 0x43, 0xe1, 0xae, 0xa7, 0x15, 0x30, 0x7e, 0x6a, + 0x45, 0xd8, 0x31, 0xac, 0x26, 0xf6, 0x49, 0xd8, 0xe0, 0x7f, 0x85, 0xff, 0x6d, 0xea, 0x2f, 0xde, + 0xdb, 0x67, 0x5e, 0xdc, 0xa4, 0x98, 0x7c, 0xc0, 0x3d, 0xb4, 0x15, 0xb8, 0x51, 0x63, 0x09, 0x99, + 0xf8, 0xfb, 0x6d, 0x1c, 0x13, 0xad, 0x0a, 0xcb, 0xd2, 0x10, 0x87, 0x81, 0x1f, 0x63, 0xb4, 0x03, + 0x73, 0x3c, 0xe7, 0x42, 0xf6, 0xb6, 0x72, 0x67, 0xb1, 0xbc, 0xa5, 0x87, 0xe7, 0x7a, 0x62, 0x69, + 0xba, 0x5c, 0x9a, 0x2e, 0x02, 0x85, 0xbb, 0x86, 0x60, 0xf5, 0x11, 0x4d, 0xa6, 0xea, 0x9f, 0x06, + 0x12, 0xbe, 0x06, 0x6b, 0x09, 0x9b, 0x98, 0xe1, 0x5d, 0x98, 0x71, 0xfd, 0xd3, 0xa0, 0xa0, 0xdc, + 0x56, 0xef, 0x2c, 0x96, 0xef, 0xea, 0x63, 0xfa, 0x4d, 0x67, 0xd1, 0x1f, 0x8a, 0x27, 0x93, 0xc5, + 0x69, 0x97, 0x0a, 0xdc, 0xe8, 0xb3, 0xa3, 0x77, 0x60, 0x96, 0xf1, 0x50, 0x50, 0x58, 0xca, 0x5f, + 0x4f, 0x83, 0xe4, 0xbc, 0xe8, 0x9c, 0x2f, 0x16, 0x6e, 0xf2, 0x20, 0x54, 0x81, 0x39, 0x5e, 0x4c, + 0xb1, 0xe2, 0xd7, 0xae, 0x16, 0x5e, 0x63, 0x31, 0xa6, 0x88, 0x45, 0x8f, 0x61, 0x91, 0xb7, 0x59, + 0x9d, 0x2d, 0x4e, 0x65, 0x50, 0xdb, 0x14, 0x8a, 0x9b, 0x75, 0xd1, 0x7d, 0x7a, 0x5f, 0xdb, 0xea, + 0x7b, 0xec, 0x25, 0xe3, 0x07, 0xec, 0xee, 0x58, 0xfb, 0x5c, 0x81, 0x75, 0x36, 0xcb, 0x93, 0xd0, + 0xb1, 0x08, 0x8e, 0x05, 0xa1, 0xa8, 0x0a, 0xeb, 0x9e, 0x75, 0x5e, 0x6f, 0x33, 0x6b, 0xdd, 0xf5, + 0x09, 0x8e, 0xce, 0xac, 0x96, 0x58, 0xf7, 0xa6, 0xce, 0xf7, 0x99, 0x2e, 0xf7, 0x99, 0x5e, 0x11, + 0xfb, 0xd0, 0x5c, 0xf3, 0xac, 0x73, 0x0e, 0x55, 0x15, 0x31, 0x68, 0x07, 0x0a, 0x3d, 0xa8, 0xb8, + 0x1e, 0xe2, 0xa8, 0x1e, 0x89, 0x12, 0x31, 0x22, 0x66, 0xcd, 0x8d, 0x6e, 0x50, 0x7c, 0x84, 0x23, + 0x59, 0x3f, 0xed, 0x5f, 0x0a, 0x2c, 0x26, 0x72, 0x43, 0x3b, 0x90, 0x63, 0xb4, 0xd4, 0x5d, 0x47, + 0x24, 0xb2, 0x42, 0x97, 0xcd, 0x37, 0xb1, 0xfe, 0xe4, 0x49, 0xb5, 0xb2, 0xbb, 0xd8, 0x79, 0xbe, + 0x35, 0xcf, 0x3b, 0xa1, 0x62, 0xce, 0x33, 0xef, 0xaa, 0x83, 0x8a, 0x30, 0xef, 0xe0, 0x16, 0x26, + 0xd8, 0x61, 0x13, 0xe6, 0x0e, 0x32, 0xa6, 0x34, 0xa0, 0x77, 0x65, 0x49, 0xd5, 0x69, 0x4a, 0x7a, + 0x90, 0x91, 0x45, 0x7d, 0x0f, 0x16, 0x68, 0x6b, 0xf0, 0x62, 0xcc, 0x30, 0x8c, 0x57, 0x12, 0x18, + 0xdd, 0x9d, 0xc6, 0xc2, 0x2a, 0x16, 0xb1, 0x28, 0xed, 0x07, 0x19, 0x33, 0xe7, 0x88, 0xf1, 0x6e, + 0x0e, 0xe6, 0x38, 0x37, 0xda, 0x67, 0x59, 0xc8, 0xf7, 0x17, 0x43, 0x74, 0xf2, 0x87, 0x70, 0x83, + 0xaf, 0x5c, 0x90, 0x28, 0x5a, 0xfa, 0xce, 0xe4, 0x96, 0xe6, 0x48, 0xe6, 0x92, 0x95, 0x80, 0x45, + 0x47, 0x12, 0x8e, 0xef, 0x28, 0xda, 0x8f, 0xea, 0x95, 0x9a, 0x88, 0xef, 0x44, 0xd6, 0x44, 0x1c, + 0x91, 0x1b, 0x62, 0x54, 0x86, 0x8d, 0x3e, 0x44, 0x91, 0xa8, 0xc3, 0x58, 0xcd, 0x99, 0xeb, 0x49, + 0x67, 0x9e, 0x85, 0x83, 0xbe, 0x0a, 0xcb, 0xd8, 0x77, 0xea, 0xc1, 0x69, 0xfd, 0x0c, 0x47, 0xb1, + 0x1b, 0xf8, 0x8c, 0xbe, 0x9c, 0xb9, 0x84, 0x7d, 0xe7, 0xe3, 0xd3, 0x13, 0x6e, 0xd3, 0x2a, 0x90, + 0xff, 0x8e, 0x4b, 0x9e, 0x1e, 0x45, 0xf8, 0xd4, 0x3d, 0x3f, 0xc4, 0x17, 0xb2, 0x41, 0x6f, 0xc2, + 0x5c, 0xc8, 0x6c, 0xac, 0x15, 0x16, 0x4c, 0xf1, 0x84, 0xf2, 0x30, 0xcb, 0xba, 0x92, 0x55, 0x7a, + 0xc1, 0xe4, 0x0f, 0xda, 0xa7, 0x0a, 0x6c, 0x0c, 0xc0, 0x08, 0x6a, 0xf7, 0x41, 0xfd, 0xe4, 0x4c, + 0x12, 0xfa, 0x60, 0x2c, 0xa1, 0xa9, 0x00, 0xfa, 0xe1, 0x89, 0x49, 0x11, 0x8a, 0xaf, 0x41, 0xf6, + 0xf0, 0x04, 0xad, 0x82, 0xfa, 0x09, 0xbe, 0x10, 0x39, 0xd1, 0x21, 0x4d, 0xe8, 0xcc, 0x6a, 0xb5, + 0x79, 0xaf, 0x2f, 0x99, 0xfc, 0x41, 0xfb, 0x5b, 0x16, 0x36, 0x4d, 0xdc, 0x74, 0x63, 0x82, 0xa3, + 0xe3, 0xc8, 0xb2, 0x71, 0x18, 0xb8, 0x3e, 0x91, 0x8b, 0x73, 0x20, 0x17, 0xf1, 0xa1, 0xcc, 0xec, + 0x60, 0x6c, 0x66, 0x23, 0x91, 0xf4, 0x21, 0x8b, 0xd9, 0x45, 0x2e, 0xfe, 0x55, 0x81, 0xb5, 0xe1, + 0xb9, 0x7f, 0x00, 0x1b, 0xa4, 0x6b, 0xac, 0x3b, 0x38, 0x6c, 0x05, 0x17, 0x5e, 0xef, 0xcc, 0xdb, + 0x4d, 0x6b, 0x92, 0xfe, 0x7b, 0x4e, 0x77, 0x23, 0x5d, 0xde, 0x6e, 0x3d, 0xfc, 0x4a, 0x17, 0xc9, + 0xcc, 0x93, 0x14, 0x2b, 0x42, 0x30, 0xe3, 0x5b, 0x1e, 0x16, 0x85, 0x63, 0x63, 0xf4, 0x06, 0xa8, + 0x84, 0xb4, 0xc4, 0xde, 0x1c, 0x7d, 0xec, 0xec, 0xce, 0x77, 0x9e, 0x6f, 0xa9, 0xc7, 0xc7, 0x8f, + 0x4d, 0xea, 0xae, 0xfd, 0x21, 0x0b, 0xc5, 0x34, 0x4a, 0x44, 0xc9, 0xbf, 0x07, 0x8b, 0xbd, 0x04, + 0xae, 0x4f, 0xb0, 0xa8, 0x7f, 0xcf, 0x24, 0x0e, 0xea, 0x24, 0x38, 0xda, 0x1e, 0x38, 0xf3, 0xd7, + 0xe9, 0x34, 0xf2, 0x6e, 0xd7, 0xfb, 0x8f, 0xf6, 0xe2, 0x8f, 0x60, 0x75, 0x10, 0x2d, 0x01, 0xa0, + 0x4c, 0x04, 0x40, 0xaf, 0x42, 0xd6, 0x75, 0xc4, 0x4c, 0x43, 0x67, 0xe3, 0x5c, 0xe7, 0xf9, 0x56, + 0xb6, 0x5a, 0x31, 0xb3, 0xae, 0xd3, 0xe5, 0x5a, 0xed, 0x71, 0xad, 0x7d, 0x00, 0x85, 0x7d, 0x4c, + 0x7a, 0x09, 0x24, 0xee, 0x57, 0x74, 0x17, 0x54, 0xd7, 0x91, 0x54, 0x0d, 0x21, 0x33, 0xf6, 0xab, + 0x95, 0xd8, 0xa4, 0x4e, 0xda, 0x6f, 0x54, 0xd8, 0x4c, 0x01, 0x12, 0xe4, 0x3f, 0x4d, 0x23, 0xff, + 0x83, 0xb1, 0xe4, 0x8f, 0x04, 0x1b, 0xe0, 0x1e, 0xf7, 0x51, 0x5f, 0xfc, 0x3c, 0x0b, 0x2b, 0x03, + 0x0e, 0x82, 0x20, 0x65, 0x32, 0x41, 0xf7, 0x61, 0x96, 0x72, 0xca, 0xbb, 0x71, 0xb9, 0x7c, 0xab, + 0x8f, 0xf5, 0xc7, 0xee, 0x29, 0xde, 0xbb, 0xb0, 0x5b, 0x98, 0xcf, 0xca, 0x3d, 0x91, 0x01, 0x39, + 0xee, 0x81, 0xe3, 0x82, 0xca, 0x96, 0x95, 0x5a, 0xab, 0xae, 0x53, 0xb7, 0x08, 0x33, 0x89, 0x86, + 0xdf, 0x85, 0x65, 0x7c, 0x1e, 0x62, 0x9b, 0xaa, 0x4b, 0x9e, 0xc0, 0xec, 0xe4, 0x04, 0x6e, 0xc8, + 0x10, 0xbe, 0xc8, 0x57, 0x60, 0x89, 0x1f, 0xc3, 0x75, 0x0a, 0x19, 0x17, 0xe6, 0x6e, 0xab, 0x77, + 0x16, 0xcc, 0x45, 0x6e, 0xfb, 0x88, 0x9a, 0x34, 0x03, 0x5e, 0x32, 0xb1, 0x17, 0x9c, 0xe1, 0xe1, + 0xfd, 0x9f, 0x87, 0x59, 0x1e, 0xa6, 0xb0, 0x30, 0xfe, 0xa0, 0xed, 0x43, 0x61, 0x38, 0x40, 0x94, + 0x74, 0x9a, 0x16, 0xd5, 0x6c, 0x58, 0xe7, 0x17, 0xc0, 0x5e, 0xe0, 0x9f, 0xba, 0x4d, 0x39, 0xeb, + 0x84, 0x73, 0x73, 0x41, 0x9c, 0x9b, 0xf4, 0xd2, 0xe0, 0x17, 0x4d, 0x18, 0x38, 0xf5, 0x44, 0x0b, + 0xf3, 0xeb, 0xe8, 0x28, 0x70, 0xe8, 0xfa, 0xb4, 0x3d, 0xc8, 0xf7, 0x4f, 0x72, 0x9d, 0x4c, 0xd7, + 0x61, 0x6d, 0x1f, 0x93, 0x9a, 0x1d, 0xb9, 0x21, 0x91, 0xba, 0x48, 0xfb, 0x93, 0x02, 0x28, 0x69, + 0x15, 0xc0, 0x27, 0x30, 0x1f, 0x73, 0x93, 0xe8, 0xe8, 0x77, 0x26, 0x75, 0xf4, 0x00, 0x82, 0x2e, + 0x9e, 0xdf, 0xf7, 0x49, 0x74, 0x61, 0x4a, 0xb0, 0x62, 0x0d, 0x96, 0x92, 0x2f, 0x52, 0x68, 0xba, + 0x97, 0xa4, 0x69, 0xb1, 0xfc, 0x12, 0x3b, 0x9e, 0x85, 0x26, 0xd7, 0xf7, 0xa2, 0xc0, 0xe7, 0xf1, + 0x82, 0xbf, 0x87, 0xd9, 0xb7, 0x14, 0xed, 0x10, 0x0a, 0x8f, 0x1c, 0xe7, 0xe3, 0x88, 0x53, 0x24, + 0xde, 0x8b, 0x3a, 0x18, 0x54, 0x95, 0x53, 0x83, 0x60, 0x68, 0x24, 0x9e, 0x70, 0xd3, 0x6e, 0xc1, + 0x66, 0x0a, 0x98, 0x50, 0x70, 0xdf, 0x86, 0xf5, 0x0a, 0xd3, 0x59, 0xfd, 0x93, 0x3c, 0x84, 0x05, + 0x1e, 0x3d, 0x46, 0xc9, 0x2d, 0x75, 0x9e, 0x6f, 0xe5, 0x78, 0x58, 0xb5, 0x62, 0xe6, 0xb8, 0x7f, + 0xd5, 0xd1, 0x6e, 0x42, 0xbe, 0x1f, 0x52, 0x4c, 0xf5, 0x47, 0x05, 0xd6, 0x6a, 0x83, 0xe5, 0x42, + 0x4f, 0x06, 0xeb, 0xf2, 0xf6, 0xd8, 0xba, 0x0c, 0x01, 0xfc, 0x2f, 0xcb, 0x92, 0x07, 0x54, 0x1b, + 0xea, 0x0b, 0xed, 0xcf, 0x0a, 0x2c, 0xbf, 0x7f, 0x8e, 0xed, 0x36, 0xbd, 0xe7, 0x68, 0x87, 0xc6, + 0xe8, 0x2e, 0xac, 0x61, 0x69, 0xa9, 0xd3, 0x2f, 0xdc, 0xba, 0xcf, 0x1b, 0x5a, 0x35, 0x57, 0xba, + 0x2f, 0x8e, 0x5d, 0x0f, 0x7f, 0x14, 0x23, 0x1d, 0xd6, 0xed, 0xc0, 0x0b, 0xdd, 0x96, 0xd5, 0xe7, + 0x9d, 0x65, 0xde, 0x6b, 0x89, 0x57, 0xc2, 0xff, 0x55, 0x58, 0x69, 0x5c, 0x30, 0x99, 0x1e, 0x05, + 0x36, 0x8e, 0x63, 0x21, 0xe1, 0x54, 0x73, 0x99, 0x99, 0x8f, 0xa4, 0x15, 0x6d, 0xc3, 0x5a, 0x84, + 0xed, 0x20, 0x72, 0x92, 0xae, 0x33, 0xcc, 0x75, 0x55, 0xbc, 0xe8, 0x3a, 0x6b, 0xbf, 0xcd, 0xc2, + 0x57, 0x4c, 0x66, 0xec, 0x2e, 0xc5, 0xc4, 0x71, 0xbb, 0xf5, 0xdf, 0xe8, 0x08, 0xf4, 0x16, 0x2c, + 0x74, 0x3f, 0xf3, 0x05, 0xdd, 0xc5, 0x21, 0xa5, 0x70, 0x2c, 0x3d, 0xcc, 0x9e, 0x33, 0xda, 0x86, + 0x59, 0x1c, 0x45, 0x41, 0x24, 0xf4, 0x45, 0xda, 0x69, 0x40, 0x85, 0x3e, 0xf3, 0x41, 0x27, 0xd0, + 0x23, 0x97, 0x1d, 0xcd, 0xb1, 0x90, 0xfb, 0xdb, 0x63, 0x5b, 0xaa, 0xbf, 0x76, 0x07, 0x19, 0x73, + 0x19, 0xf7, 0x59, 0xa8, 0xfc, 0x8f, 0x18, 0x17, 0xda, 0x16, 0xbc, 0x3c, 0x82, 0x24, 0xd1, 0x0b, + 0x5b, 0xf0, 0xf2, 0x3e, 0x26, 0x8f, 0x5a, 0xad, 0x01, 0x87, 0xee, 0xe9, 0xf4, 0x6b, 0x15, 0x4a, + 0xa3, 0x3c, 0xc4, 0x49, 0x85, 0x61, 0x9e, 0x4f, 0x27, 0x77, 0xc4, 0xe1, 0xa4, 0x93, 0x6a, 0x0c, + 0x9a, 0x3e, 0x98, 0xa9, 0xc4, 0x2e, 0xfe, 0x2a, 0x0b, 0x2b, 0x03, 0x2f, 0xff, 0x5f, 0xe4, 0x76, + 0x8b, 0x94, 0xff, 0xae, 0xc2, 0x8a, 0xfc, 0x3d, 0xa1, 0xc6, 0x81, 0xd0, 0x39, 0xac, 0x50, 0x9e, + 0x93, 0x9f, 0x68, 0xaf, 0x5f, 0xf5, 0xd3, 0x4e, 0xd6, 0xbe, 0x78, 0x7f, 0x8a, 0x08, 0x5e, 0xbd, + 0xd7, 0x15, 0x84, 0x01, 0xd8, 0x5d, 0xc4, 0xbf, 0xe2, 0xc6, 0xff, 0x44, 0xd2, 0xf7, 0x83, 0x4e, + 0x71, 0xfb, 0x4a, 0xbe, 0xa2, 0xe9, 0x3c, 0x58, 0x92, 0x0b, 0xa4, 0xfa, 0x0d, 0xdd, 0x9b, 0x9c, + 0x6b, 0x42, 0x7d, 0x16, 0xf5, 0xab, 0xba, 0x8b, 0xe9, 0x2e, 0x60, 0x75, 0x1f, 0x93, 0xbe, 0xcf, + 0x35, 0x74, 0x7f, 0x9a, 0x4f, 0x3b, 0x3e, 0x6d, 0x79, 0xfa, 0xaf, 0xc1, 0xf2, 0xef, 0x55, 0xd8, + 0x94, 0xe5, 0x4d, 0x88, 0x4f, 0x51, 0xe8, 0x9f, 0x29, 0x80, 0x86, 0x3f, 0x25, 0xd0, 0x9b, 0xd7, + 0xfb, 0xb8, 0x2b, 0xee, 0x5c, 0xf3, 0x9b, 0x05, 0xfd, 0x54, 0x61, 0xda, 0xa6, 0x5f, 0x55, 0xa3, + 0x07, 0xd3, 0xaa, 0x70, 0x9e, 0xc5, 0x9b, 0xd7, 0x13, 0xef, 0xe8, 0xc7, 0xb0, 0x3a, 0x28, 0x29, + 0xd1, 0x1b, 0x13, 0x56, 0x94, 0x2a, 0x59, 0x8b, 0x0f, 0xa6, 0x8c, 0x12, 0xb5, 0xfa, 0xb9, 0x02, + 0x1b, 0xb2, 0x56, 0x5c, 0x28, 0xca, 0x3a, 0xc5, 0xb0, 0x94, 0xd4, 0x8f, 0x13, 0x76, 0x63, 0x8a, + 0x9e, 0x9d, 0xb0, 0x1b, 0xd3, 0xc4, 0x69, 0xf9, 0x97, 0x73, 0x70, 0xb3, 0xa7, 0x0c, 0x6a, 0x24, + 0x88, 0xb0, 0xcc, 0xc7, 0x13, 0xdb, 0x94, 0x49, 0x03, 0xa4, 0x5f, 0x59, 0x5b, 0xf2, 0x5c, 0x8c, + 0x29, 0xb5, 0x28, 0x6b, 0x8f, 0x21, 0x51, 0x37, 0xa1, 0x3d, 0x46, 0x29, 0xca, 0x09, 0xed, 0x31, + 0x52, 0x3b, 0xd2, 0x1a, 0x24, 0x85, 0xde, 0x84, 0x1a, 0xa4, 0xc8, 0xcc, 0x09, 0x35, 0x48, 0x53, + 0x91, 0x94, 0xe8, 0xda, 0x55, 0x89, 0xae, 0x4d, 0x49, 0xf4, 0xb0, 0xb8, 0x43, 0x9f, 0x2a, 0xb0, + 0x91, 0x7a, 0xe5, 0xa3, 0x6f, 0x4e, 0x68, 0xe9, 0xd1, 0x5a, 0xaa, 0xf8, 0xf0, 0x3a, 0xa1, 0x22, + 0xa1, 0xcf, 0x14, 0xb8, 0x99, 0x7e, 0xe5, 0xa3, 0x87, 0xd7, 0xd2, 0x09, 0x3c, 0xa5, 0xb7, 0xff, + 0x03, 0x8d, 0xb1, 0xfb, 0xde, 0xb3, 0xcb, 0x52, 0xe6, 0x8b, 0xcb, 0x52, 0xe6, 0xcb, 0xcb, 0x92, + 0xf2, 0x93, 0x4e, 0x49, 0xf9, 0x5d, 0xa7, 0xa4, 0xfc, 0xa5, 0x53, 0x52, 0x9e, 0x75, 0x4a, 0xca, + 0x3f, 0x3a, 0x25, 0xe5, 0x9f, 0x9d, 0x52, 0xe6, 0xcb, 0x4e, 0x49, 0xf9, 0xc5, 0x8b, 0x52, 0xe6, + 0xd9, 0x8b, 0x52, 0xe6, 0x8b, 0x17, 0xa5, 0xcc, 0x77, 0xa1, 0xf7, 0x7f, 0xa7, 0xc6, 0x1c, 0x53, + 0x08, 0xdf, 0xf8, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x51, 0x26, 0x6f, 0xf1, 0xa9, 0x1a, 0x00, + 0x00, } func (this *SchemaRequest) Equal(that interface{}) bool { diff --git a/src/vizier/services/metadata/metadatapb/service.proto b/src/vizier/services/metadata/metadatapb/service.proto index efc7030248d..7a184c73d15 100644 --- a/src/vizier/services/metadata/metadatapb/service.proto +++ b/src/vizier/services/metadata/metadatapb/service.proto @@ -22,7 +22,7 @@ package px.vizier.services.metadata; option go_package = "metadatapb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "src/api/proto/uuidpb/uuid.proto"; diff --git a/src/vizier/services/metadata/storepb/BUILD.bazel b/src/vizier/services/metadata/storepb/BUILD.bazel index f869803f7ad..c2a677a2c8f 100644 --- a/src/vizier/services/metadata/storepb/BUILD.bazel +++ b/src/vizier/services/metadata/storepb/BUILD.bazel @@ -26,7 +26,7 @@ pl_proto_library( "//src/common/base/statuspb:status_pl_proto", "//src/shared/k8s/metadatapb:metadata_pl_proto", "//src/shared/types/typespb:types_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -40,7 +40,7 @@ pl_cc_proto_library( "//src/common/base/statuspb:status_pl_cc_proto", "//src/shared/k8s/metadatapb:metadata_pl_cc_proto", "//src/shared/types/typespb/wrapper:cc_library", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/vizier/services/metadata/storepb/store.pb.go b/src/vizier/services/metadata/storepb/store.pb.go index 90cfde99a8c..17bd3150f69 100755 --- a/src/vizier/services/metadata/storepb/store.pb.go +++ b/src/vizier/services/metadata/storepb/store.pb.go @@ -741,88 +741,87 @@ func init() { } var fileDescriptor_27ea71ea705227d1 = []byte{ - // 1283 bytes of a gzipped FileDescriptorProto + // 1273 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xf7, 0xc6, 0x4e, 0x62, 0x3f, 0xb7, 0xf9, 0x33, 0xa1, 0xd4, 0x4a, 0xc5, 0x3a, 0x98, 0x42, - 0x5d, 0x2a, 0x76, 0x69, 0xa8, 0x44, 0x54, 0x54, 0xfe, 0xd8, 0x2e, 0xc4, 0x14, 0x45, 0xd5, 0x3a, - 0xb9, 0x70, 0x59, 0x8d, 0x77, 0xa7, 0xee, 0xaa, 0xde, 0x9d, 0xd1, 0xcc, 0xb8, 0x8a, 0x2b, 0x0e, - 0x7c, 0x04, 0x24, 0x3e, 0x04, 0x70, 0xe4, 0x5b, 0x70, 0xec, 0xb1, 0x48, 0x28, 0xa2, 0xae, 0x90, - 0x38, 0xf6, 0xc2, 0x1d, 0xcd, 0xcc, 0xfe, 0xb1, 0x69, 0x93, 0x96, 0x8b, 0xfd, 0x66, 0xe6, 0xf7, - 0xfb, 0xcd, 0x7b, 0x6f, 0xde, 0xbc, 0x59, 0xf8, 0x50, 0xf0, 0xc0, 0x7d, 0x18, 0x3d, 0x8a, 0x08, - 0x77, 0x05, 0xe1, 0x0f, 0xa3, 0x80, 0x08, 0x37, 0x26, 0x12, 0x87, 0x58, 0x62, 0x57, 0x48, 0xca, - 0x09, 0x1b, 0x9a, 0x7f, 0x87, 0x71, 0x2a, 0x29, 0xba, 0xc4, 0x8e, 0x1d, 0x43, 0x70, 0x32, 0x82, - 0x93, 0x11, 0xb6, 0x3f, 0x18, 0x45, 0xf2, 0xfe, 0x64, 0xe8, 0x04, 0x34, 0x76, 0x47, 0x74, 0x44, - 0x5d, 0xcd, 0x19, 0x4e, 0xee, 0xe9, 0x91, 0x1e, 0x68, 0xcb, 0x68, 0x6d, 0x37, 0x47, 0x94, 0x8e, - 0xc6, 0xa4, 0x40, 0xc9, 0x28, 0x26, 0x42, 0xe2, 0x98, 0x65, 0x00, 0xe5, 0x1e, 0x66, 0x91, 0x41, - 0xb8, 0x93, 0x49, 0x14, 0xb2, 0xa1, 0xfe, 0x4b, 0x01, 0xb7, 0x14, 0x20, 0xc0, 0x3c, 0xa1, 0xd2, - 0x65, 0x63, 0x9c, 0x24, 0x84, 0xbb, 0xe1, 0x34, 0xc1, 0x71, 0x14, 0xf8, 0x92, 0xe3, 0x20, 0x4a, - 0x46, 0x6e, 0xc4, 0xdd, 0x31, 0x1d, 0x45, 0x01, 0x1e, 0xb3, 0x61, 0x66, 0xa5, 0xf4, 0x77, 0x35, - 0x9d, 0xc6, 0x31, 0x4d, 0xdc, 0x21, 0x16, 0xc4, 0x15, 0x12, 0xcb, 0x89, 0xd0, 0x21, 0x2b, 0x23, - 0x85, 0xb5, 0x15, 0x4c, 0xdc, 0xc7, 0x9c, 0x84, 0xee, 0x83, 0xbd, 0x22, 0x41, 0x6c, 0x98, 0x9b, - 0x29, 0xf2, 0xf2, 0x1c, 0x52, 0x4e, 0x19, 0x11, 0xe6, 0x97, 0x0d, 0xcd, 0xbf, 0x41, 0xb5, 0xfe, - 0xb1, 0x60, 0xed, 0x90, 0xe3, 0x80, 0x30, 0x1a, 0x25, 0xb2, 0x9f, 0xdc, 0xa3, 0xe8, 0x0a, 0x2c, - 0x45, 0x61, 0xc3, 0xda, 0xb1, 0xda, 0xf5, 0xdd, 0x75, 0x87, 0x1d, 0x3b, 0x26, 0x56, 0xe7, 0xe8, - 0xa8, 0xdf, 0xeb, 0xac, 0xcc, 0x4e, 0x9a, 0x4b, 0xfd, 0x9e, 0xb7, 0x14, 0x85, 0x68, 0x08, 0x20, - 0x73, 0x6a, 0x63, 0x49, 0x13, 0x3a, 0x8a, 0x60, 0xb2, 0xe0, 0xa4, 0x59, 0x70, 0xfe, 0x93, 0x05, - 0x27, 0xe2, 0x4e, 0x16, 0x7b, 0xb1, 0x75, 0x8f, 0xb0, 0x31, 0x9d, 0xc6, 0x24, 0x91, 0xde, 0x9c, - 0x2a, 0x42, 0x50, 0x49, 0x70, 0x4c, 0x1a, 0xe5, 0x1d, 0xab, 0x5d, 0xf3, 0xb4, 0x8d, 0x3a, 0xb0, - 0x46, 0x8e, 0x19, 0x09, 0x24, 0x09, 0x7d, 0x95, 0x1c, 0xd2, 0xa8, 0xec, 0x58, 0xed, 0xb5, 0xdd, - 0x4b, 0x6a, 0xef, 0x2c, 0x6d, 0xce, 0x37, 0xd1, 0x3d, 0xd2, 0x9d, 0x06, 0x63, 0x32, 0x50, 0x10, - 0xef, 0x7c, 0x46, 0xd1, 0xc3, 0xd6, 0xef, 0x16, 0x5c, 0xf8, 0x62, 0x44, 0x12, 0x59, 0x78, 0x30, - 0xd0, 0x4c, 0x74, 0x1d, 0x96, 0x8d, 0xa8, 0xf5, 0x6a, 0x51, 0x83, 0x44, 0xd7, 0x60, 0xc5, 0x20, - 0xd2, 0x24, 0x6c, 0x2d, 0x70, 0x8c, 0xae, 0x97, 0x42, 0xd2, 0xf4, 0x96, 0x5f, 0x9d, 0xde, 0x8f, - 0xa1, 0x8a, 0x95, 0x87, 0x7e, 0x14, 0xea, 0x00, 0x5f, 0x02, 0xaf, 0xcf, 0x4e, 0x9a, 0xab, 0x3a, - 0x8c, 0x7e, 0xcf, 0x5b, 0xd5, 0xe8, 0x7e, 0xd8, 0xfa, 0xb5, 0x02, 0xb5, 0x43, 0x3c, 0x1c, 0x13, - 0x7d, 0x9c, 0x59, 0x06, 0xad, 0xb9, 0x0c, 0x22, 0xa8, 0x84, 0x44, 0x04, 0x8d, 0x55, 0x33, 0xa7, - 0x6c, 0xd4, 0x01, 0x24, 0x24, 0xe6, 0xd2, 0xcf, 0x2b, 0xdf, 0x4f, 0x4c, 0x40, 0xe5, 0xce, 0x1b, - 0xb3, 0x93, 0xe6, 0xc6, 0x40, 0xad, 0x1e, 0x66, 0x8b, 0x07, 0x03, 0x6f, 0x43, 0x2c, 0xce, 0x08, - 0xf4, 0x19, 0x6c, 0x0a, 0x49, 0xd9, 0xa2, 0x44, 0x59, 0x4b, 0x6c, 0xcd, 0x4e, 0x9a, 0xeb, 0x03, - 0x49, 0xd9, 0xbc, 0xc2, 0xba, 0x58, 0x98, 0x10, 0xe8, 0x0e, 0xac, 0x06, 0x74, 0x3c, 0x89, 0x13, - 0xd1, 0xa8, 0xec, 0x94, 0xdb, 0xf5, 0xdd, 0xeb, 0xce, 0x19, 0x97, 0xdc, 0xc9, 0xa3, 0x74, 0xba, - 0x9a, 0xa5, 0x4c, 0x2f, 0x53, 0x40, 0x36, 0x80, 0x54, 0x00, 0x19, 0x3d, 0x22, 0x61, 0x63, 0x79, - 0xc7, 0x6a, 0x57, 0xbd, 0xb9, 0x19, 0x74, 0x0d, 0x36, 0xb3, 0x11, 0x96, 0x11, 0x4d, 0xfc, 0x07, - 0x64, 0xda, 0x58, 0xd1, 0x29, 0xd9, 0x58, 0x58, 0xb8, 0x43, 0xa6, 0xdb, 0x7f, 0x58, 0x00, 0xc5, - 0x26, 0x2f, 0xcd, 0xaa, 0x0b, 0x35, 0xe5, 0x95, 0xaf, 0xee, 0x97, 0x4e, 0xdc, 0xda, 0x2e, 0x52, - 0xee, 0x9b, 0xfb, 0xd6, 0xc3, 0x12, 0x1f, 0x4e, 0x19, 0xf1, 0xaa, 0x61, 0x6a, 0xa1, 0x3d, 0x38, - 0xc7, 0xb0, 0x94, 0x84, 0x27, 0x86, 0x53, 0xd6, 0x9c, 0x0b, 0x05, 0xe7, 0xae, 0x59, 0xd5, 0xb4, - 0x3a, 0x2b, 0x06, 0xf9, 0x01, 0x56, 0xe6, 0x0e, 0xf0, 0x13, 0x38, 0x2f, 0x48, 0x8c, 0x13, 0xa9, - 0xae, 0x9a, 0x92, 0x5b, 0xd6, 0x72, 0x6f, 0x16, 0x72, 0x83, 0x74, 0x59, 0xeb, 0x9d, 0x13, 0x73, - 0xa3, 0xd6, 0x2f, 0x65, 0x58, 0xeb, 0xd2, 0x98, 0x4d, 0xd4, 0x0d, 0x09, 0xee, 0x93, 0x18, 0xa3, - 0x4f, 0x61, 0x45, 0x67, 0x41, 0x34, 0x2c, 0x7d, 0x14, 0xef, 0xbd, 0xde, 0x51, 0x78, 0x29, 0x0b, - 0xfd, 0x68, 0xc1, 0x45, 0x6d, 0xfa, 0x2a, 0x3b, 0xbe, 0xa4, 0x7e, 0x56, 0xce, 0xaa, 0xac, 0x94, - 0x62, 0xef, 0x4c, 0xc5, 0x45, 0x77, 0xcc, 0x06, 0x07, 0x38, 0x26, 0x87, 0xd4, 0x54, 0x7c, 0x28, - 0x6e, 0x27, 0x92, 0x4f, 0x3b, 0x17, 0x67, 0x27, 0xcd, 0xad, 0x17, 0x56, 0x7b, 0xc2, 0xdb, 0x92, - 0x2f, 0x52, 0xb6, 0xbb, 0x50, 0xcd, 0x00, 0x0b, 0x37, 0xcc, 0xc4, 0xf8, 0x7a, 0x37, 0x6c, 0xfb, - 0x3b, 0x68, 0x9c, 0xe6, 0x0e, 0xda, 0x80, 0xb2, 0xaa, 0x23, 0x53, 0x18, 0xca, 0x44, 0x5f, 0xc3, - 0xf2, 0x43, 0x3c, 0x9e, 0x90, 0xb4, 0x3b, 0xdc, 0xf8, 0x3f, 0x51, 0xe7, 0xc1, 0x18, 0x89, 0x9b, - 0x4b, 0x7b, 0x56, 0xeb, 0xa7, 0x0a, 0xd4, 0xef, 0xec, 0x09, 0x8f, 0x08, 0x3a, 0xe1, 0x01, 0x41, - 0xd7, 0xa1, 0xcc, 0x68, 0xd6, 0xb1, 0xdf, 0xd2, 0xbd, 0x47, 0xb7, 0x7d, 0xe7, 0xc1, 0x5e, 0x21, - 0xcc, 0x86, 0xce, 0x5d, 0x1a, 0xee, 0x97, 0x3c, 0x85, 0x45, 0x7d, 0xa8, 0x05, 0x34, 0x91, 0x38, - 0x4a, 0x08, 0x4f, 0xdd, 0xba, 0x7a, 0x3a, 0xb1, 0x9b, 0x41, 0x8f, 0x58, 0x88, 0x25, 0xd9, 0x2f, - 0x79, 0x05, 0x1b, 0xdd, 0x82, 0xd5, 0x34, 0x8a, 0xb4, 0xa9, 0xbd, 0x7d, 0xba, 0xd0, 0xc0, 0x00, - 0xf7, 0x4b, 0x5e, 0xc6, 0x41, 0x5d, 0xa8, 0x91, 0x24, 0xd4, 0x0d, 0x58, 0xa4, 0x6d, 0xee, 0x9d, - 0xd3, 0x05, 0x6e, 0x67, 0x50, 0xe5, 0x43, 0xce, 0x53, 0x22, 0xaa, 0xc6, 0x04, 0xc3, 0x81, 0x29, - 0xfb, 0x33, 0x45, 0x0e, 0x32, 0xa8, 0x12, 0xc9, 0x79, 0xe8, 0x06, 0x54, 0x12, 0x1a, 0x12, 0xdd, - 0x01, 0xea, 0xbb, 0xf6, 0x19, 0x7c, 0x1a, 0x2a, 0xaa, 0x46, 0xa3, 0xaf, 0xa0, 0xce, 0x09, 0x1b, - 0x47, 0x01, 0xf6, 0x05, 0x91, 0xba, 0xa3, 0xd6, 0x77, 0x2f, 0x9f, 0x4e, 0xf6, 0x0c, 0x78, 0x40, - 0xe4, 0x7e, 0xc9, 0x03, 0x9e, 0x8f, 0xd0, 0x97, 0x00, 0x61, 0xfe, 0x06, 0x36, 0xaa, 0xaf, 0xd2, - 0x29, 0xde, 0x4b, 0xa5, 0x53, 0x30, 0x3b, 0x00, 0x55, 0x9e, 0x56, 0x46, 0xeb, 0x08, 0x36, 0xe7, - 0x0a, 0xc5, 0x9c, 0x1e, 0xfa, 0x1c, 0x56, 0x26, 0xda, 0x4a, 0x2b, 0xa6, 0x7d, 0x96, 0xb3, 0xf3, - 0x4c, 0x2f, 0xe5, 0xb5, 0xfe, 0x5a, 0x82, 0x8d, 0x2e, 0xa7, 0xc9, 0x20, 0xe0, 0x11, 0x93, 0x1e, - 0x11, 0x93, 0xb1, 0x44, 0x37, 0xa1, 0x26, 0xf4, 0xd8, 0x3f, 0xfd, 0xeb, 0xe1, 0xdc, 0xec, 0xa4, - 0x59, 0x35, 0xac, 0x7e, 0xcf, 0xab, 0x1a, 0x7c, 0x3f, 0x44, 0x7b, 0x50, 0xcb, 0x9f, 0x8c, 0xb4, - 0x1c, 0xb7, 0x1d, 0xf3, 0x45, 0xe6, 0x64, 0x5f, 0x64, 0x4e, 0xfe, 0x4e, 0x78, 0x05, 0x18, 0x5d, - 0x85, 0x65, 0xc2, 0x39, 0xe5, 0x69, 0xed, 0xbd, 0xf4, 0xe5, 0x35, 0x08, 0xf4, 0x3e, 0x6c, 0x92, - 0x63, 0x12, 0x4c, 0x74, 0xab, 0x57, 0x0a, 0x7e, 0x62, 0x2a, 0xae, 0xec, 0xad, 0xe7, 0x0b, 0x6a, - 0x93, 0x03, 0x81, 0x1c, 0xd8, 0x0a, 0x68, 0xcc, 0xa2, 0x31, 0x5e, 0x40, 0x2f, 0x6b, 0xf4, 0xe6, - 0xdc, 0x52, 0x8a, 0xbf, 0x02, 0xeb, 0xc3, 0xa9, 0x24, 0xc2, 0x67, 0x9c, 0x06, 0x44, 0x08, 0x12, - 0xea, 0x32, 0x2a, 0x7b, 0x6b, 0x7a, 0xfa, 0x6e, 0x36, 0xab, 0xde, 0x1c, 0x4e, 0x02, 0xca, 0xc3, - 0x79, 0xe8, 0xaa, 0x86, 0x6e, 0xa4, 0x0b, 0x39, 0xb8, 0x73, 0xeb, 0xf1, 0x53, 0xbb, 0xf4, 0xe4, - 0xa9, 0x5d, 0x7a, 0xfe, 0xd4, 0xb6, 0xbe, 0x9f, 0xd9, 0xd6, 0xcf, 0x33, 0xdb, 0xfa, 0x6d, 0x66, - 0x5b, 0x8f, 0x67, 0xb6, 0xf5, 0xe7, 0xcc, 0xb6, 0xfe, 0x9e, 0xd9, 0xa5, 0xe7, 0x33, 0xdb, 0xfa, - 0xe1, 0x99, 0x5d, 0x7a, 0xfc, 0xcc, 0x2e, 0x3d, 0x79, 0x66, 0x97, 0xbe, 0x5d, 0x4d, 0xbf, 0x95, - 0x87, 0x2b, 0x3a, 0x75, 0x1f, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x84, 0xe1, 0xe7, 0x5a, - 0x0b, 0x00, 0x00, + 0x14, 0xf7, 0xc6, 0x4e, 0x62, 0x3f, 0xb7, 0xf9, 0x33, 0x69, 0xa9, 0x95, 0x8a, 0x75, 0x30, 0x85, + 0xba, 0x54, 0xda, 0xa5, 0xa1, 0x12, 0x51, 0x51, 0xf9, 0x63, 0xbb, 0x10, 0x53, 0x14, 0x55, 0xeb, + 0xe4, 0xc2, 0x65, 0x35, 0xde, 0x9d, 0xba, 0xab, 0x7a, 0x77, 0x46, 0x33, 0xe3, 0x2a, 0xae, 0x38, + 0xf0, 0x11, 0x90, 0xf8, 0x10, 0xc0, 0x91, 0x6f, 0xc1, 0xb1, 0xc7, 0x22, 0xa1, 0x88, 0x6e, 0x85, + 0xc4, 0xb1, 0x17, 0xee, 0x68, 0x66, 0x76, 0xd7, 0x36, 0x6d, 0xd2, 0x72, 0xb1, 0xdf, 0xcc, 0xfc, + 0x7e, 0xbf, 0x79, 0xef, 0xcd, 0x9b, 0x37, 0x0b, 0x1f, 0x0a, 0x1e, 0xb8, 0x8f, 0xa2, 0xc7, 0x11, + 0xe1, 0xae, 0x20, 0xfc, 0x51, 0x14, 0x10, 0xe1, 0xc6, 0x44, 0xe2, 0x10, 0x4b, 0xec, 0x0a, 0x49, + 0x39, 0x61, 0x43, 0xf3, 0xef, 0x30, 0x4e, 0x25, 0x45, 0x97, 0xd9, 0xb1, 0x63, 0x08, 0x4e, 0x4e, + 0x70, 0x72, 0xc2, 0xf6, 0x85, 0x11, 0x1d, 0x51, 0x8d, 0x73, 0x95, 0x65, 0x28, 0xdb, 0xcd, 0x11, + 0xa5, 0xa3, 0x31, 0x71, 0xf5, 0x68, 0x38, 0xb9, 0xef, 0xca, 0x28, 0x26, 0x42, 0xe2, 0x98, 0xe5, + 0x00, 0xe5, 0x05, 0x66, 0x91, 0x41, 0xb8, 0x93, 0x49, 0x14, 0xb2, 0xa1, 0xfe, 0xcb, 0x00, 0xb7, + 0x15, 0x20, 0xc0, 0x3c, 0xa1, 0xd2, 0x65, 0x63, 0x9c, 0x24, 0x84, 0xbb, 0xe1, 0x34, 0xc1, 0x71, + 0x14, 0xf8, 0x92, 0xe3, 0x20, 0x4a, 0x46, 0x6e, 0xc4, 0xdd, 0x31, 0x1d, 0x45, 0x01, 0x1e, 0xb3, + 0x61, 0x6e, 0x65, 0xf4, 0xf7, 0x34, 0x9d, 0xc6, 0x31, 0x4d, 0xdc, 0x21, 0x16, 0xc4, 0x15, 0x12, + 0xcb, 0x89, 0xd0, 0x91, 0x29, 0x23, 0x83, 0xb5, 0x15, 0x4c, 0x3c, 0xc0, 0x9c, 0x84, 0xee, 0xc3, + 0xbd, 0x59, 0x1e, 0xd8, 0xb0, 0x30, 0x33, 0xe4, 0x95, 0x39, 0xa4, 0x9c, 0x32, 0x22, 0xcc, 0x2f, + 0x1b, 0x9a, 0x7f, 0x83, 0x6a, 0xfd, 0x63, 0xc1, 0xda, 0x21, 0xc7, 0x01, 0x61, 0x34, 0x4a, 0x64, + 0x3f, 0xb9, 0x4f, 0xd1, 0x55, 0x58, 0x8a, 0xc2, 0x86, 0xb5, 0x63, 0xb5, 0xeb, 0xbb, 0xeb, 0x0e, + 0x3b, 0x76, 0x4c, 0xac, 0xce, 0xd1, 0x51, 0xbf, 0xd7, 0x59, 0x49, 0x4f, 0x9a, 0x4b, 0xfd, 0x9e, + 0xb7, 0x14, 0x85, 0x68, 0x08, 0x20, 0x0b, 0x6a, 0x63, 0x49, 0x13, 0x3a, 0x8a, 0x60, 0xb2, 0xe0, + 0x64, 0x59, 0x70, 0xfe, 0x93, 0x05, 0x27, 0xe2, 0x4e, 0x1e, 0xfb, 0x6c, 0xeb, 0x1e, 0x61, 0x63, + 0x3a, 0x8d, 0x49, 0x22, 0xbd, 0x39, 0x55, 0x84, 0xa0, 0x92, 0xe0, 0x98, 0x34, 0xca, 0x3b, 0x56, + 0xbb, 0xe6, 0x69, 0x1b, 0x75, 0x60, 0x8d, 0x1c, 0x33, 0x12, 0x48, 0x12, 0xfa, 0x2a, 0x39, 0xa4, + 0x51, 0xd9, 0xb1, 0xda, 0x6b, 0xbb, 0x97, 0xd5, 0xde, 0x79, 0xda, 0x9c, 0x6f, 0xa2, 0xfb, 0xa4, + 0x3b, 0x0d, 0xc6, 0x64, 0xa0, 0x20, 0xde, 0xf9, 0x9c, 0xa2, 0x87, 0xad, 0xdf, 0x2d, 0xb8, 0xf8, + 0xc5, 0x88, 0x24, 0x72, 0xe6, 0xc1, 0x40, 0x33, 0xd1, 0x0d, 0x58, 0x36, 0xa2, 0xd6, 0xeb, 0x45, + 0x0d, 0x12, 0x5d, 0x87, 0x15, 0x83, 0xc8, 0x92, 0xb0, 0xb5, 0xc0, 0x31, 0xba, 0x5e, 0x06, 0xc9, + 0xd2, 0x5b, 0x7e, 0x7d, 0x7a, 0x3f, 0x86, 0x2a, 0x56, 0x1e, 0xfa, 0x51, 0xa8, 0x03, 0x7c, 0x05, + 0xbc, 0x9e, 0x9e, 0x34, 0x57, 0x75, 0x18, 0xfd, 0x9e, 0xb7, 0xaa, 0xd1, 0xfd, 0xb0, 0xf5, 0x6b, + 0x05, 0x6a, 0x87, 0x78, 0x38, 0x26, 0xfa, 0x38, 0xf3, 0x0c, 0x5a, 0x73, 0x19, 0x44, 0x50, 0x09, + 0x89, 0x08, 0x1a, 0xab, 0x66, 0x4e, 0xd9, 0xa8, 0x03, 0x48, 0x48, 0xcc, 0xa5, 0x5f, 0x54, 0xbe, + 0x9f, 0x98, 0x80, 0xca, 0x9d, 0x0b, 0xe9, 0x49, 0x73, 0x63, 0xa0, 0x56, 0x0f, 0xf3, 0xc5, 0x83, + 0x81, 0xb7, 0x21, 0x16, 0x67, 0x04, 0xfa, 0x0c, 0x36, 0x85, 0xa4, 0x6c, 0x51, 0xa2, 0xac, 0x25, + 0xb6, 0xd2, 0x93, 0xe6, 0xfa, 0x40, 0x52, 0x36, 0xaf, 0xb0, 0x2e, 0x16, 0x26, 0x04, 0xba, 0x0b, + 0xab, 0x01, 0x1d, 0x4f, 0xe2, 0x44, 0x34, 0x2a, 0x3b, 0xe5, 0x76, 0x7d, 0xf7, 0x86, 0x73, 0xc6, + 0x5d, 0x76, 0x8a, 0x28, 0x9d, 0xae, 0x66, 0x29, 0xd3, 0xcb, 0x15, 0x90, 0x0d, 0x20, 0x15, 0x40, + 0x46, 0x8f, 0x49, 0xd8, 0x58, 0xde, 0xb1, 0xda, 0x55, 0x6f, 0x6e, 0x06, 0x5d, 0x87, 0xcd, 0x7c, + 0x84, 0x65, 0x44, 0x13, 0xff, 0x21, 0x99, 0x36, 0x56, 0x74, 0x4a, 0x36, 0x16, 0x16, 0xee, 0x92, + 0xe9, 0xf6, 0x1f, 0x16, 0xc0, 0x6c, 0x93, 0x57, 0x66, 0xd5, 0x85, 0x9a, 0xf2, 0xca, 0x57, 0xf7, + 0x4b, 0x27, 0x6e, 0x6d, 0x17, 0x29, 0xf7, 0xcd, 0x7d, 0xeb, 0x61, 0x89, 0x0f, 0xa7, 0x8c, 0x78, + 0xd5, 0x30, 0xb3, 0xd0, 0x1e, 0x9c, 0x63, 0x58, 0x4a, 0xc2, 0x13, 0xc3, 0x29, 0x6b, 0xce, 0xc5, + 0x19, 0xe7, 0x9e, 0x59, 0xd5, 0xb4, 0x3a, 0x9b, 0x0d, 0x8a, 0x03, 0xac, 0xcc, 0x1d, 0xe0, 0x27, + 0x70, 0x5e, 0x90, 0x18, 0x27, 0x52, 0x5d, 0x35, 0x25, 0xb7, 0xac, 0xe5, 0xde, 0x9a, 0xc9, 0x0d, + 0xb2, 0x65, 0xad, 0x77, 0x4e, 0xcc, 0x8d, 0x5a, 0xbf, 0x94, 0x61, 0xad, 0x4b, 0x63, 0x36, 0x51, + 0x37, 0x24, 0x78, 0x40, 0x62, 0x8c, 0x3e, 0x85, 0x15, 0x9d, 0x05, 0xd1, 0xb0, 0xf4, 0x51, 0xbc, + 0xff, 0x66, 0x47, 0xe1, 0x65, 0x2c, 0xf4, 0xa3, 0x05, 0x97, 0xb4, 0xe9, 0xab, 0xec, 0xf8, 0x92, + 0xfa, 0x79, 0x39, 0xab, 0xb2, 0x52, 0x8a, 0xbd, 0x33, 0x15, 0x17, 0xdd, 0x31, 0x1b, 0x1c, 0xe0, + 0x98, 0x1c, 0x52, 0x53, 0xf1, 0xa1, 0xb8, 0x93, 0x48, 0x3e, 0xed, 0x5c, 0x4a, 0x4f, 0x9a, 0x5b, + 0x2f, 0xad, 0xf6, 0x84, 0xb7, 0x25, 0x5f, 0xa6, 0x6c, 0x77, 0xa1, 0x9a, 0x03, 0x16, 0x6e, 0x98, + 0x89, 0xf1, 0xcd, 0x6e, 0xd8, 0xf6, 0x77, 0xd0, 0x38, 0xcd, 0x1d, 0xb4, 0x01, 0x65, 0x55, 0x47, + 0xa6, 0x30, 0x94, 0x89, 0xbe, 0x86, 0xe5, 0x47, 0x78, 0x3c, 0x21, 0x59, 0x77, 0xb8, 0xf9, 0x7f, + 0xa2, 0x2e, 0x82, 0x31, 0x12, 0xb7, 0x96, 0xf6, 0xac, 0xd6, 0x4f, 0x15, 0xa8, 0xdf, 0xdd, 0x13, + 0x1e, 0x11, 0x74, 0xc2, 0x03, 0x82, 0x6e, 0x40, 0x99, 0xd1, 0xbc, 0x63, 0xbf, 0xad, 0x7b, 0x8f, + 0x6e, 0xfb, 0xce, 0xc3, 0xbd, 0x99, 0x30, 0x1b, 0x3a, 0xf7, 0x68, 0xb8, 0x5f, 0xf2, 0x14, 0x16, + 0xf5, 0xa1, 0x16, 0xd0, 0x44, 0xe2, 0x28, 0x21, 0x3c, 0x73, 0xeb, 0xda, 0xe9, 0xc4, 0x6e, 0x0e, + 0x3d, 0x62, 0x21, 0x96, 0x64, 0xbf, 0xe4, 0xcd, 0xd8, 0xe8, 0x36, 0xac, 0x66, 0x51, 0x64, 0x4d, + 0xed, 0x9d, 0xd3, 0x85, 0x06, 0x06, 0xb8, 0x5f, 0xf2, 0x72, 0x0e, 0xea, 0x42, 0x8d, 0x24, 0xa1, + 0x6e, 0xc0, 0x22, 0x6b, 0x73, 0xef, 0x9e, 0x2e, 0x70, 0x27, 0x87, 0x2a, 0x1f, 0x0a, 0x9e, 0x12, + 0x51, 0x35, 0x26, 0x18, 0x0e, 0x4c, 0xd9, 0x9f, 0x29, 0x72, 0x90, 0x43, 0x95, 0x48, 0xc1, 0x43, + 0x37, 0xa1, 0x92, 0xd0, 0x90, 0xe8, 0x0e, 0x50, 0xdf, 0xb5, 0xcf, 0xe0, 0xd3, 0x50, 0x51, 0x35, + 0x1a, 0x7d, 0x05, 0x75, 0x4e, 0xd8, 0x38, 0x0a, 0xb0, 0x2f, 0x88, 0xd4, 0x1d, 0xb5, 0xbe, 0x7b, + 0xe5, 0x74, 0xb2, 0x67, 0xc0, 0x03, 0x22, 0xf7, 0x4b, 0x1e, 0xf0, 0x62, 0x84, 0xbe, 0x04, 0x08, + 0x8b, 0x37, 0xb0, 0x51, 0x7d, 0x9d, 0xce, 0xec, 0xbd, 0x54, 0x3a, 0x33, 0x66, 0x07, 0xa0, 0xca, + 0xb3, 0xca, 0x68, 0x1d, 0xc1, 0xe6, 0x5c, 0xa1, 0x98, 0xd3, 0x43, 0x9f, 0xc3, 0xca, 0x44, 0x5b, + 0x59, 0xc5, 0xb4, 0xcf, 0x72, 0x76, 0x9e, 0xe9, 0x65, 0xbc, 0xd6, 0x5f, 0x4b, 0xb0, 0xd1, 0xe5, + 0x34, 0x19, 0x04, 0x3c, 0x62, 0xd2, 0x23, 0x62, 0x32, 0x96, 0xe8, 0x16, 0xd4, 0x84, 0x1e, 0xfb, + 0xa7, 0x7f, 0x3d, 0x9c, 0x4b, 0x4f, 0x9a, 0x55, 0xc3, 0xea, 0xf7, 0xbc, 0xaa, 0xc1, 0xf7, 0x43, + 0xb4, 0x07, 0xb5, 0xe2, 0xc9, 0xc8, 0xca, 0x71, 0xdb, 0x31, 0x5f, 0x64, 0x4e, 0xfe, 0x45, 0xe6, + 0x14, 0xef, 0x84, 0x37, 0x03, 0xa3, 0x6b, 0xb0, 0x4c, 0x38, 0xa7, 0x3c, 0xab, 0xbd, 0x57, 0xbe, + 0xbc, 0x06, 0x81, 0x3e, 0x80, 0x4d, 0x72, 0x4c, 0x82, 0x89, 0x6e, 0xf5, 0x4a, 0xc1, 0x4f, 0x4c, + 0xc5, 0x95, 0xbd, 0xf5, 0x62, 0x41, 0x6d, 0x72, 0x20, 0x90, 0x03, 0x5b, 0x01, 0x8d, 0x59, 0x34, + 0xc6, 0x0b, 0xe8, 0x65, 0x8d, 0xde, 0x9c, 0x5b, 0xca, 0xf0, 0x57, 0x61, 0x7d, 0x38, 0x95, 0x44, + 0xf8, 0x8c, 0xd3, 0x80, 0x08, 0x41, 0x42, 0x5d, 0x46, 0x65, 0x6f, 0x4d, 0x4f, 0xdf, 0xcb, 0x67, + 0xd5, 0x9b, 0xc3, 0x49, 0x40, 0x79, 0x38, 0x0f, 0x5d, 0xd5, 0xd0, 0x8d, 0x6c, 0xa1, 0x00, 0x77, + 0x6e, 0x3f, 0x79, 0x66, 0x97, 0x9e, 0x3e, 0xb3, 0x4b, 0x2f, 0x9e, 0xd9, 0xd6, 0xf7, 0xa9, 0x6d, + 0xfd, 0x9c, 0xda, 0xd6, 0x6f, 0xa9, 0x6d, 0x3d, 0x49, 0x6d, 0xeb, 0xcf, 0xd4, 0xb6, 0xfe, 0x4e, + 0xed, 0xd2, 0x8b, 0xd4, 0xb6, 0x7e, 0x78, 0x6e, 0x97, 0x9e, 0x3c, 0xb7, 0x4b, 0x4f, 0x9f, 0xdb, + 0xa5, 0x6f, 0x57, 0xb3, 0x4f, 0xe2, 0xe1, 0x8a, 0x4e, 0xdd, 0x47, 0xff, 0x06, 0x00, 0x00, 0xff, + 0xff, 0xbb, 0xe3, 0x37, 0x9a, 0x41, 0x0b, 0x00, 0x00, } func (this *TracepointInfo) Equal(that interface{}) bool { diff --git a/src/vizier/services/metadata/storepb/store.proto b/src/vizier/services/metadata/storepb/store.proto index 10d434147d3..975b04d3685 100644 --- a/src/vizier/services/metadata/storepb/store.proto +++ b/src/vizier/services/metadata/storepb/store.proto @@ -22,7 +22,7 @@ package px.vizier.services.metadata; option go_package = "storepb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "src/api/proto/uuidpb/uuid.proto"; import "src/carnot/planner/dynamic_tracing/ir/logicalpb/logical.proto"; diff --git a/src/vizier/services/query_broker/controllers/data_privacy.go b/src/vizier/services/query_broker/controllers/data_privacy.go index b8d02c59efa..0fd1f506e09 100644 --- a/src/vizier/services/query_broker/controllers/data_privacy.go +++ b/src/vizier/services/query_broker/controllers/data_privacy.go @@ -26,7 +26,6 @@ import ( "github.com/spf13/viper" "px.dev/pixie/src/carnot/planner/distributedpb" - pixie "px.dev/pixie/src/operator/apis/px.dev/v1alpha1" ) diff --git a/src/vizier/services/query_broker/controllers/launch_query.go b/src/vizier/services/query_broker/controllers/launch_query.go index e81b68d7436..6545ef087c1 100644 --- a/src/vizier/services/query_broker/controllers/launch_query.go +++ b/src/vizier/services/query_broker/controllers/launch_query.go @@ -21,10 +21,9 @@ package controllers import ( "fmt" - "golang.org/x/sync/errgroup" - "github.com/gofrs/uuid" "github.com/nats-io/nats.go" + "golang.org/x/sync/errgroup" "px.dev/pixie/src/carnot/planpb" "px.dev/pixie/src/utils" diff --git a/src/vizier/services/query_broker/controllers/launch_query_test.go b/src/vizier/services/query_broker/controllers/launch_query_test.go index 2bb766f865b..620c516b67b 100644 --- a/src/vizier/services/query_broker/controllers/launch_query_test.go +++ b/src/vizier/services/query_broker/controllers/launch_query_test.go @@ -36,9 +36,11 @@ import ( "px.dev/pixie/src/vizier/services/query_broker/controllers" ) -const queryIDStr = "11285cdd-1de9-4ab1-ae6a-0ba08c8c676c" -const agent1ID = "21285cdd-1de9-4ab1-ae6a-0ba08c8c676c" -const agent2ID = "31285cdd-1de9-4ab1-ae6a-0ba08c8c676c" +const ( + queryIDStr = "11285cdd-1de9-4ab1-ae6a-0ba08c8c676c" + agent1ID = "21285cdd-1de9-4ab1-ae6a-0ba08c8c676c" + agent2ID = "31285cdd-1de9-4ab1-ae6a-0ba08c8c676c" +) func TestLaunchQuery(t *testing.T) { // Check that the query is broadcasted to all agents. diff --git a/src/vizier/services/query_broker/controllers/mutation_executor.go b/src/vizier/services/query_broker/controllers/mutation_executor.go index ca928fc04e4..f14ad3028de 100644 --- a/src/vizier/services/query_broker/controllers/mutation_executor.go +++ b/src/vizier/services/query_broker/controllers/mutation_executor.go @@ -69,7 +69,8 @@ func NewMutationExecutor( planner Planner, mdtp metadatapb.MetadataTracepointServiceClient, mdconf metadatapb.MetadataConfigServiceClient, - distributedState *distributedpb.DistributedState) MutationExecutor { + distributedState *distributedpb.DistributedState, +) MutationExecutor { return &MutationExecutorImpl{ planner: planner, mdtp: mdtp, diff --git a/src/vizier/services/query_broker/controllers/proto_utils.go b/src/vizier/services/query_broker/controllers/proto_utils.go index 4afa110b06f..bf363f5c5a6 100644 --- a/src/vizier/services/query_broker/controllers/proto_utils.go +++ b/src/vizier/services/query_broker/controllers/proto_utils.go @@ -372,7 +372,8 @@ func RowBatchToVizierRowBatch(rb *schemapb.RowBatchData, tableID string) (*vizie func BuildExecuteScriptResponse(r *carnotpb.TransferResultChunkRequest, // Map of the received table names to their table ID on the output proto. tableIDMap map[string]string, - compilationTimeNs int64) (*vizierpb.ExecuteScriptResponse, error) { + compilationTimeNs int64, +) (*vizierpb.ExecuteScriptResponse, error) { res := &vizierpb.ExecuteScriptResponse{ QueryID: utils.UUIDFromProtoOrNil(r.QueryID).String(), } @@ -424,7 +425,8 @@ func BuildExecuteScriptResponse(r *carnotpb.TransferResultChunkRequest, func QueryPlanResponse(queryID uuid.UUID, plan *distributedpb.DistributedPlan, planMap map[uuid.UUID]*planpb.Plan, agentStats *[]*queryresultspb.AgentExecutionStats, planTableID string, - maxQueryPlanStringSizeBytes int) ([]*vizierpb.ExecuteScriptResponse, error) { + maxQueryPlanStringSizeBytes int, +) ([]*vizierpb.ExecuteScriptResponse, error) { queryPlan, err := GetQueryPlanAsDotString(plan, planMap, agentStats) if err != nil { log.WithError(err).Error("error with query plan") @@ -545,7 +547,8 @@ func AgentRelationToVizierRelation(relation *schemapb.Relation) *vizierpb.Relati // TableRelationResponses returns the query metadata table schemas as ExecuteScriptResponses. func TableRelationResponses(queryID uuid.UUID, tableIDMap map[string]string, - planMap map[uuid.UUID]*planpb.Plan) ([]*vizierpb.ExecuteScriptResponse, error) { + planMap map[uuid.UUID]*planpb.Plan, +) ([]*vizierpb.ExecuteScriptResponse, error) { var results []*vizierpb.ExecuteScriptResponse schemas := OutputSchemaFromPlan(planMap) diff --git a/src/vizier/services/query_broker/controllers/proto_utils_test.go b/src/vizier/services/query_broker/controllers/proto_utils_test.go index 3ee93a2e2d1..ea8e68bc7f3 100644 --- a/src/vizier/services/query_broker/controllers/proto_utils_test.go +++ b/src/vizier/services/query_broker/controllers/proto_utils_test.go @@ -536,13 +536,14 @@ func TestQueryPlanResponse(t *testing.T) { { ColData: &vizierpb.Column_StringData{ StringData: &vizierpb.StringColumn{ - Data: [][]byte{[]byte( - "digraph {\n\tsubgraph cluster_s0 {\n\t\tID = \"cluster_s0\";\n" + - "\t\tcolor=\"lightgrey\";label=\"agent::3ca421d4-5f85-4c99-8248-02252204e281\\n" + - "123ns\";\n\t\tn1[color=\"blue\",label=\"memory_source_operator[2]\\" + - "nself_time: 70ns\\ntotal_time: 73ns\\nbytes: 456 B\\nrecords_processed: 12\"" + - ",shape=\"rect\"];\n\t\tn2[color=\"yellow\",label=\"grpc_sink_operator[3]\\n\"" + - ",shape=\"rect\"];\n\t\tn1->n2;\n\t\t\n\t}\n\t\n}"), + Data: [][]byte{ + []byte( + "digraph {\n\tsubgraph cluster_s0 {\n\t\tID = \"cluster_s0\";\n" + + "\t\tcolor=\"lightgrey\";label=\"agent::3ca421d4-5f85-4c99-8248-02252204e281\\n" + + "123ns\";\n\t\tn1[color=\"blue\",label=\"memory_source_operator[2]\\" + + "nself_time: 70ns\\ntotal_time: 73ns\\nbytes: 456 B\\nrecords_processed: 12\"" + + ",shape=\"rect\"];\n\t\tn2[color=\"yellow\",label=\"grpc_sink_operator[3]\\n\"" + + ",shape=\"rect\"];\n\t\tn1->n2;\n\t\t\n\t}\n\t\n}"), }, }, }, @@ -573,13 +574,14 @@ func TestQueryPlanResponse(t *testing.T) { { ColData: &vizierpb.Column_StringData{ StringData: &vizierpb.StringColumn{ - Data: [][]byte{[]byte( - "digraph {\n\tsubgraph cluster_s0 {\n\t\tID = \"cluster_s0\";\n\t\t" + - "color=\"lightgrey\";label=\"agent::3ca421d4-5f85-4c99-8248-02252204e281" + - "\\n123ns\";\n\t\tn1[color=\"blue\",label=\"memory_source_operator[2]\\n" + - "self_time: 70ns\\ntotal_time: 73ns\\nbytes: 456 B\\nrecords_processed: 12\"," + - "shape=\"rect\"];\n\t\tn2[color=\"yellow\",label=\"grpc_sink_operator[3]\\n\"," + - "shape=\"rect\"];\n\t\tn1->n2;"), + Data: [][]byte{ + []byte( + "digraph {\n\tsubgraph cluster_s0 {\n\t\tID = \"cluster_s0\";\n\t\t" + + "color=\"lightgrey\";label=\"agent::3ca421d4-5f85-4c99-8248-02252204e281" + + "\\n123ns\";\n\t\tn1[color=\"blue\",label=\"memory_source_operator[2]\\n" + + "self_time: 70ns\\ntotal_time: 73ns\\nbytes: 456 B\\nrecords_processed: 12\"," + + "shape=\"rect\"];\n\t\tn2[color=\"yellow\",label=\"grpc_sink_operator[3]\\n\"," + + "shape=\"rect\"];\n\t\tn1->n2;"), }, }, }, @@ -602,8 +604,9 @@ func TestQueryPlanResponse(t *testing.T) { { ColData: &vizierpb.Column_StringData{ StringData: &vizierpb.StringColumn{ - Data: [][]byte{[]byte( - "\n\t\t\n\t}\n\t\n}"), + Data: [][]byte{ + []byte( + "\n\t\t\n\t}\n\t\n}"), }, }, }, @@ -660,7 +663,8 @@ func TestTableRelationResponses(t *testing.T) { ID: "agent1_table_id", Relation: &vizierpb.Relation{ Columns: []*vizierpb.Relation_ColumnInfo{ - {ColumnName: "time_", + { + ColumnName: "time_", ColumnType: 6, ColumnDesc: "", ColumnSemanticType: 1, @@ -688,7 +692,8 @@ func TestTableRelationResponses(t *testing.T) { ID: "agent2_table_id", Relation: &vizierpb.Relation{ Columns: []*vizierpb.Relation_ColumnInfo{ - {ColumnName: "time_", + { + ColumnName: "time_", ColumnType: 6, ColumnDesc: "", ColumnSemanticType: 1, diff --git a/src/vizier/services/query_broker/controllers/query_executor.go b/src/vizier/services/query_broker/controllers/query_executor.go index d0fe7c5a55f..4d8ff7b7b6b 100644 --- a/src/vizier/services/query_broker/controllers/query_executor.go +++ b/src/vizier/services/query_broker/controllers/query_executor.go @@ -24,8 +24,6 @@ import ( "strings" "time" - "golang.org/x/sync/errgroup" - "github.com/gofrs/uuid" "github.com/nats-io/nats.go" "github.com/prometheus/client_golang/prometheus" @@ -33,6 +31,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/pflag" "github.com/spf13/viper" + "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -44,8 +43,10 @@ import ( "px.dev/pixie/src/vizier/services/metadata/metadatapb" ) -var queryExecTimeSummary *prometheus.SummaryVec -var queryExecNumPEMSummary *prometheus.SummaryVec +var ( + queryExecTimeSummary *prometheus.SummaryVec + queryExecNumPEMSummary *prometheus.SummaryVec +) func init() { queryExecTimeSummary = promauto.NewSummaryVec( diff --git a/src/vizier/services/query_broker/controllers/query_executor_test.go b/src/vizier/services/query_broker/controllers/query_executor_test.go index 68152e14573..1bbe5b35b19 100644 --- a/src/vizier/services/query_broker/controllers/query_executor_test.go +++ b/src/vizier/services/query_broker/controllers/query_executor_test.go @@ -24,11 +24,6 @@ import ( "testing" "github.com/gofrs/uuid" - - "px.dev/pixie/src/vizier/services/metadata/metadatapb" - - "px.dev/pixie/src/common/base/statuspb" - "github.com/gogo/protobuf/proto" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" @@ -38,7 +33,9 @@ import ( "px.dev/pixie/src/carnot/carnotpb" "px.dev/pixie/src/carnot/planner/distributedpb" "px.dev/pixie/src/carnot/planpb" + "px.dev/pixie/src/common/base/statuspb" "px.dev/pixie/src/utils/testingutils" + "px.dev/pixie/src/vizier/services/metadata/metadatapb" "px.dev/pixie/src/vizier/services/query_broker/controllers" mock_controllers "px.dev/pixie/src/vizier/services/query_broker/controllers/mock" "px.dev/pixie/src/vizier/services/query_broker/tracker" @@ -292,7 +289,8 @@ type fakeResultForwarder struct { // RegisterQuery registers a query. func (f *fakeResultForwarder) RegisterQuery(queryID uuid.UUID, tableIDMap map[string]string, compilationTimeNs int64, - queryPlanOpts *controllers.QueryPlanOpts, queryName string) error { + queryPlanOpts *controllers.QueryPlanOpts, queryName string, +) error { f.QueryRegistered = queryID f.TableIDMap = tableIDMap f.StreamedQueryPlanOpts = queryPlanOpts @@ -301,7 +299,8 @@ func (f *fakeResultForwarder) RegisterQuery(queryID uuid.UUID, tableIDMap map[st // StreamResults streams the results to the resultCh. func (f *fakeResultForwarder) StreamResults(ctx context.Context, queryID uuid.UUID, - resultCh chan<- *vizierpb.ExecuteScriptResponse) error { + resultCh chan<- *vizierpb.ExecuteScriptResponse, +) error { f.QueryStreamed = queryID for _, expectedResult := range f.ClientResultsToSend { diff --git a/src/vizier/services/query_broker/controllers/query_plan_debug.go b/src/vizier/services/query_broker/controllers/query_plan_debug.go index 3824f868163..d9e78a2d909 100644 --- a/src/vizier/services/query_broker/controllers/query_plan_debug.go +++ b/src/vizier/services/query_broker/controllers/query_plan_debug.go @@ -84,7 +84,8 @@ func nodeExecTiming(nodeID int64, execStats *map[int64]*queryresultspb.OperatorE // GetQueryPlanAsDotString converts the plan into a dotstring that can be rendered by GraphViz. func GetQueryPlanAsDotString(distributedPlan *distributedpb.DistributedPlan, planMap map[uuid.UUID]*planpb.Plan, - planExecStats *[]*queryresultspb.AgentExecutionStats) (string, error) { + planExecStats *[]*queryresultspb.AgentExecutionStats, +) (string, error) { g := dot.NewGraph(dot.Directed) execDetails := make(map[uuid.UUID]*queryresultspb.AgentExecutionStats) if planExecStats != nil { diff --git a/src/vizier/services/query_broker/controllers/query_result_forwarder.go b/src/vizier/services/query_broker/controllers/query_result_forwarder.go index 24da23fe7bf..2bdac3f0647 100644 --- a/src/vizier/services/query_broker/controllers/query_result_forwarder.go +++ b/src/vizier/services/query_broker/controllers/query_result_forwarder.go @@ -38,8 +38,10 @@ import ( "px.dev/pixie/src/utils" ) -var queryExecRecordsSummary *prometheus.SummaryVec -var queryExecBytesSummary *prometheus.SummaryVec +var ( + queryExecRecordsSummary *prometheus.SummaryVec + queryExecBytesSummary *prometheus.SummaryVec +) func init() { queryExecRecordsSummary = promauto.NewSummaryVec( @@ -169,7 +171,8 @@ type activeQuery struct { func newActiveQuery(producerCtx context.Context, tableIDMap map[string]string, compilationTimeNs int64, - queryPlanOpts *QueryPlanOpts, watchdogCancel context.CancelFunc, queryName string) *activeQuery { + queryPlanOpts *QueryPlanOpts, watchdogCancel context.CancelFunc, queryName string, +) *activeQuery { aq := &activeQuery{ queryResultCh: make(chan *carnotpb.TransferResultChunkRequest, activeQueryBufferSize), tableIDMap: tableIDMap, @@ -330,7 +333,6 @@ func (a *activeQuery) handleRequest(ctx context.Context, queryID uuid.UUID, msg if a.queryPlanOpts != nil { qpResps, err := QueryPlanResponse(queryID, a.queryPlanOpts.Plan, a.queryPlanOpts.PlanMap, a.agentExecStats, a.queryPlanOpts.TableID, maxQueryPlanStringSize) - if err != nil { return err } @@ -472,7 +474,8 @@ func NewQueryResultForwarderWithOptions(opts ...QueryResultForwarderOption) Quer func (f *QueryResultForwarderImpl) RegisterQuery(queryID uuid.UUID, tableIDMap map[string]string, compilationTimeNs int64, queryPlanOpts *QueryPlanOpts, - queryName string) error { + queryName string, +) error { f.activeQueriesMutex.Lock() defer f.activeQueriesMutex.Unlock() @@ -495,12 +498,15 @@ func (f *QueryResultForwarderImpl) RegisterQuery(queryID uuid.UUID, tableIDMap m } // The max size of the query plan string, including a buffer for the rest of the message. -const maxQueryPlanBufferSize int = 64 * 1024 -const maxQueryPlanStringSize = 1024*1024 - maxQueryPlanBufferSize +const ( + maxQueryPlanBufferSize int = 64 * 1024 + maxQueryPlanStringSize = 1024*1024 - maxQueryPlanBufferSize +) // StreamResults streams results from the agent streams to the client stream. func (f *QueryResultForwarderImpl) StreamResults(ctx context.Context, queryID uuid.UUID, - resultCh chan<- *vizierpb.ExecuteScriptResponse) error { + resultCh chan<- *vizierpb.ExecuteScriptResponse, +) error { f.activeQueriesMutex.Lock() activeQuery, present := f.activeQueries[queryID] f.activeQueriesMutex.Unlock() diff --git a/src/vizier/services/query_broker/controllers/query_result_forwarder_test.go b/src/vizier/services/query_broker/controllers/query_result_forwarder_test.go index 4fdc657875d..795d0e5448d 100644 --- a/src/vizier/services/query_broker/controllers/query_result_forwarder_test.go +++ b/src/vizier/services/query_broker/controllers/query_result_forwarder_test.go @@ -52,7 +52,8 @@ func makeInitiateConnectionRequest(queryID uuid.UUID) *carnotpb.TransferResultCh } func makeRowBatchResult(t *testing.T, queryID uuid.UUID, tableName string, tableID string, - eos bool) (*vizierpb.RowBatchData, *carnotpb.TransferResultChunkRequest) { + eos bool, +) (*vizierpb.RowBatchData, *carnotpb.TransferResultChunkRequest) { rb := new(schemapb.RowBatchData) if err := proto.UnmarshalText(rowBatchPb, rb); err != nil { t.Fatalf("Cannot unmarshal proto %v", err) @@ -81,7 +82,8 @@ func makeRowBatchResult(t *testing.T, queryID uuid.UUID, tableName string, table } func makeExecStatsResult(t *testing.T, queryID uuid.UUID) (*vizierpb.QueryExecutionStats, - *carnotpb.TransferResultChunkRequest) { + *carnotpb.TransferResultChunkRequest, +) { execStats := &queryresultspb.QueryExecutionStats{ Timing: &queryresultspb.QueryTimingInfo{ ExecutionTimeNs: 5010, diff --git a/src/vizier/services/query_broker/controllers/server.go b/src/vizier/services/query_broker/controllers/server.go index 290722b678d..9626a8046d0 100644 --- a/src/vizier/services/query_broker/controllers/server.go +++ b/src/vizier/services/query_broker/controllers/server.go @@ -96,7 +96,8 @@ type QueryExecutorFactory func(*Server, MutationExecFactory) QueryExecutor // NewServer creates GRPC handlers. func NewServer(env querybrokerenv.QueryBrokerEnv, agentsTracker AgentsTracker, dataPrivacy DataPrivacy, mds metadatapb.MetadataTracepointServiceClient, mdconf metadatapb.MetadataConfigServiceClient, - natsConn *nats.Conn, queryExecFactory QueryExecutorFactory) (*Server, error) { + natsConn *nats.Conn, queryExecFactory QueryExecutorFactory, +) (*Server, error) { var udfInfo udfspb.UDFInfo if err := loadUDFInfo(&udfInfo); err != nil { return nil, err @@ -119,7 +120,8 @@ func NewServerWithForwarderAndPlanner(env querybrokerenv.QueryBrokerEnv, mdconf metadatapb.MetadataConfigServiceClient, natsConn *nats.Conn, planner Planner, - queryExecFactory QueryExecutorFactory) (*Server, error) { + queryExecFactory QueryExecutorFactory, +) (*Server, error) { s := &Server{ env: env, agentsTracker: agentsTracker, @@ -380,7 +382,7 @@ func (s *Server) TransferResultChunk(srv carnotpb.ResultSinkService_TransferResu // Stop the client stream, if it still exists in the result forwarder. // It may have already been cancelled before this point. log.Errorf("TransferResultChunk cancelling client stream for query %s: %s", queryID.String(), message) - clientStreamErr := fmt.Errorf(message) + clientStreamErr := fmt.Errorf("%s", message) s.resultForwarder.ProducerCancelStream(queryID, clientStreamErr) } } diff --git a/src/vizier/services/query_broker/query_broker_server.go b/src/vizier/services/query_broker/query_broker_server.go index ac5dc24f293..ef037d32f8b 100644 --- a/src/vizier/services/query_broker/query_broker_server.go +++ b/src/vizier/services/query_broker/query_broker_server.go @@ -133,7 +133,6 @@ func main() { } return err }, bOpts) - if err != nil { log.WithError(err).Fatal("Failed to connect to Metadata Service.") } diff --git a/src/vizier/services/query_broker/script_runner/cloud_source.go b/src/vizier/services/query_broker/script_runner/cloud_source.go index 5d1e9f6afa3..2903214d509 100644 --- a/src/vizier/services/query_broker/script_runner/cloud_source.go +++ b/src/vizier/services/query_broker/script_runner/cloud_source.go @@ -32,11 +32,10 @@ import ( log "github.com/sirupsen/logrus" "google.golang.org/grpc/metadata" - "px.dev/pixie/src/utils" - "px.dev/pixie/src/shared/cvmsgspb" "px.dev/pixie/src/shared/scripts" svcutils "px.dev/pixie/src/shared/services/utils" + "px.dev/pixie/src/utils" "px.dev/pixie/src/vizier/services/metadata/metadatapb" ) diff --git a/src/vizier/services/query_broker/script_runner/script_runner.go b/src/vizier/services/query_broker/script_runner/script_runner.go index 96237bc2e7d..48f78b9427b 100644 --- a/src/vizier/services/query_broker/script_runner/script_runner.go +++ b/src/vizier/services/query_broker/script_runner/script_runner.go @@ -25,19 +25,17 @@ import ( "sync" "time" - "google.golang.org/grpc/status" - - "px.dev/pixie/src/carnot/planner/compilerpb" - "px.dev/pixie/src/common/base/statuspb" - "github.com/gofrs/uuid" "github.com/gogo/protobuf/types" log "github.com/sirupsen/logrus" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" + "google.golang.org/grpc/status" "gopkg.in/yaml.v2" "px.dev/pixie/src/api/proto/vizierpb" + "px.dev/pixie/src/carnot/planner/compilerpb" + "px.dev/pixie/src/common/base/statuspb" "px.dev/pixie/src/shared/cvmsgs" "px.dev/pixie/src/shared/cvmsgspb" "px.dev/pixie/src/shared/scripts" diff --git a/src/vizier/services/shared/agentpb/BUILD.bazel b/src/vizier/services/shared/agentpb/BUILD.bazel index 45281555e2c..25370ce5ab1 100644 --- a/src/vizier/services/shared/agentpb/BUILD.bazel +++ b/src/vizier/services/shared/agentpb/BUILD.bazel @@ -22,7 +22,7 @@ pl_proto_library( visibility = ["//src/vizier:__subpackages__"], deps = [ "//src/api/proto/uuidpb:uuid_pl_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_proto", ], ) @@ -32,7 +32,7 @@ pl_cc_proto_library( visibility = ["//src/vizier:__subpackages__"], deps = [ "//src/api/proto/uuidpb:uuid_pl_cc_proto", - "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto", + "@gogo_grpc_proto//gogoproto:gogo_pl_cc_proto", ], ) diff --git a/src/vizier/services/shared/agentpb/agent.pb.go b/src/vizier/services/shared/agentpb/agent.pb.go index 28f81f966db..4cd57a106ea 100755 --- a/src/vizier/services/shared/agentpb/agent.pb.go +++ b/src/vizier/services/shared/agentpb/agent.pb.go @@ -483,62 +483,61 @@ func init() { } var fileDescriptor_fef0af3bd5248f34 = []byte{ - // 879 bytes of a gzipped FileDescriptorProto + // 864 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x41, 0x6f, 0x1b, 0x45, - 0x14, 0xf6, 0xc6, 0x49, 0x6c, 0x4f, 0xe2, 0xc6, 0x9d, 0x56, 0xd4, 0x84, 0x6a, 0x37, 0x72, 0x41, - 0x2a, 0x05, 0xd6, 0x28, 0x48, 0xd0, 0x0b, 0x20, 0x3b, 0x76, 0xb1, 0xd5, 0xb2, 0xb1, 0x66, 0x9d, - 0x20, 0xb8, 0x8c, 0xc6, 0xbb, 0x93, 0x78, 0xe8, 0x7a, 0x77, 0x34, 0x33, 0xb6, 0xaa, 0x9e, 0x38, - 0x72, 0xe4, 0x2f, 0x70, 0xe3, 0xa7, 0x70, 0xcc, 0xb1, 0x27, 0x8b, 0x6c, 0x38, 0xf4, 0xd8, 0x9f, - 0x80, 0xf6, 0xad, 0xdd, 0xd4, 0x8d, 0x44, 0x72, 0xda, 0xf7, 0xde, 0xf7, 0x7d, 0xef, 0xcd, 0x7c, - 0x6f, 0x64, 0x23, 0x57, 0xab, 0xa0, 0x39, 0x13, 0x2f, 0x05, 0x57, 0x4d, 0xcd, 0xd5, 0x4c, 0x04, - 0x5c, 0x37, 0xf5, 0x98, 0x29, 0x1e, 0x36, 0xd9, 0x29, 0x8f, 0x8d, 0x1c, 0xe5, 0x5f, 0x57, 0xaa, - 0xc4, 0x24, 0xd8, 0x91, 0x2f, 0xdc, 0x9c, 0xee, 0x2e, 0xe9, 0x6e, 0x4e, 0x77, 0x81, 0xb6, 0xfb, - 0xc5, 0xa9, 0x30, 0xe3, 0xe9, 0xc8, 0x0d, 0x92, 0x49, 0xf3, 0x34, 0x39, 0x4d, 0x9a, 0xa0, 0x1b, - 0x4d, 0x4f, 0x20, 0x83, 0x04, 0xa2, 0xbc, 0xdf, 0xae, 0x93, 0xcd, 0x67, 0x52, 0xe4, 0xb4, 0xe6, - 0x74, 0x2a, 0x42, 0x39, 0x82, 0x4f, 0x4e, 0x68, 0x3c, 0x46, 0xb7, 0x5b, 0x59, 0xe3, 0x03, 0x26, - 0xd9, 0x48, 0x44, 0xc2, 0x08, 0xae, 0xf1, 0x03, 0x54, 0x0d, 0x92, 0x28, 0xe2, 0x81, 0xd1, 0x34, - 0x64, 0x86, 0xd5, 0xad, 0x3d, 0xeb, 0x61, 0x99, 0x6c, 0x2f, 0x8b, 0x1d, 0x66, 0x58, 0xe3, 0x77, - 0x0b, 0xed, 0x80, 0x74, 0xc0, 0x14, 0x9b, 0x70, 0xc3, 0x95, 0xc6, 0x53, 0xf4, 0x89, 0x54, 0xc9, - 0x89, 0x88, 0xb8, 0xa2, 0xda, 0xb0, 0xe0, 0x39, 0x35, 0x8a, 0x05, 0x9c, 0x6a, 0x36, 0x91, 0x11, - 0xa7, 0x92, 0x2b, 0x91, 0x84, 0x74, 0xa2, 0xa1, 0xe1, 0x46, 0xfb, 0xe3, 0x74, 0xee, 0xec, 0x0d, - 0x16, 0x02, 0x3f, 0xe3, 0x0f, 0x33, 0xba, 0x0f, 0xec, 0x01, 0x90, 0x7f, 0xf4, 0xc9, 0x9e, 0xfc, - 0x7f, 0x86, 0x6e, 0xfc, 0xbb, 0x86, 0x2a, 0x70, 0x94, 0x7e, 0x7c, 0x92, 0xe0, 0x6f, 0x50, 0x19, - 0xbc, 0xa2, 0x22, 0x84, 0x39, 0x5b, 0xfb, 0x3b, 0xae, 0x7c, 0xe1, 0xe6, 0x77, 0x77, 0x8f, 0x8e, - 0xfa, 0x9d, 0xf6, 0x56, 0x3a, 0x77, 0x4a, 0xb9, 0xa2, 0x43, 0x4a, 0xc0, 0xee, 0x87, 0xf8, 0x09, - 0xaa, 0x8c, 0x13, 0x6d, 0xa8, 0x88, 0x4f, 0x92, 0xfa, 0x1a, 0x28, 0x3f, 0x75, 0xaf, 0x59, 0x88, - 0xdb, 0x4b, 0x34, 0x8c, 0x25, 0xe5, 0xf1, 0x22, 0xc2, 0x9f, 0x23, 0x24, 0x24, 0x65, 0x61, 0xa8, - 0xb8, 0xd6, 0xf5, 0xe2, 0x9e, 0xf5, 0xb0, 0xd2, 0xae, 0xa6, 0x73, 0xa7, 0xd2, 0x1f, 0xb4, 0xf2, - 0x22, 0xa9, 0x08, 0xb9, 0x08, 0xf1, 0x31, 0xda, 0x0e, 0xde, 0x31, 0xbf, 0xbe, 0x0e, 0x83, 0xf7, - 0xaf, 0x1d, 0x7c, 0x65, 0x6d, 0x64, 0xa5, 0x0f, 0x1e, 0x20, 0x24, 0xdf, 0x6e, 0xa6, 0xbe, 0x01, - 0x5d, 0xbf, 0xbc, 0x59, 0xd7, 0xcb, 0x8d, 0x92, 0x77, 0x7a, 0x34, 0x02, 0x54, 0x7d, 0xca, 0x55, - 0xcc, 0xa3, 0x63, 0xae, 0xb4, 0x48, 0x62, 0x5c, 0x47, 0xa5, 0x59, 0x1e, 0x82, 0xd1, 0x55, 0xb2, - 0x4c, 0xf1, 0x47, 0xa8, 0x32, 0x61, 0xbf, 0x26, 0x8a, 0x2a, 0x3e, 0x03, 0x2b, 0xab, 0xa4, 0x0c, - 0x05, 0xc2, 0x67, 0x00, 0x8a, 0x78, 0x01, 0x16, 0x17, 0x60, 0x56, 0x20, 0x7c, 0xd6, 0x78, 0x6d, - 0xa1, 0xf2, 0xd2, 0x53, 0xbc, 0x8b, 0xc0, 0xd5, 0x98, 0x4d, 0x38, 0x4c, 0xa8, 0x90, 0xb7, 0x39, - 0xfe, 0x10, 0x95, 0x65, 0x12, 0x52, 0xc0, 0xd6, 0x00, 0x2b, 0xc9, 0x24, 0xf4, 0x32, 0xe8, 0x01, - 0x2a, 0xe5, 0x8b, 0x94, 0x0b, 0xf7, 0x51, 0x3a, 0x77, 0x36, 0xa1, 0xeb, 0x80, 0x6c, 0xc2, 0x9e, - 0x24, 0x7e, 0x82, 0x36, 0x9f, 0xc3, 0x6d, 0x16, 0x8e, 0xbb, 0xd7, 0x7a, 0xb3, 0x72, 0x79, 0xb2, - 0x50, 0xe3, 0xc7, 0xa8, 0x9e, 0x47, 0x74, 0xcc, 0x59, 0xc8, 0x95, 0xa6, 0x22, 0xd6, 0x86, 0x45, - 0x11, 0x0f, 0xc1, 0xf5, 0x32, 0xf9, 0x20, 0xc7, 0x7b, 0x39, 0xdc, 0x5f, 0xa2, 0x8d, 0xb9, 0x85, - 0x36, 0xc0, 0x6f, 0xfc, 0x1d, 0x5a, 0x87, 0x47, 0x97, 0x3f, 0xd7, 0x47, 0x37, 0xdb, 0x12, 0xbc, - 0x3a, 0xd0, 0xe1, 0xaf, 0xd1, 0xad, 0x40, 0x71, 0x66, 0x38, 0x35, 0x62, 0xc2, 0x69, 0xac, 0xc1, - 0x91, 0x62, 0xbb, 0x96, 0xce, 0x9d, 0xed, 0x03, 0x40, 0x86, 0x62, 0xc2, 0x3d, 0x9f, 0x6c, 0x07, - 0x97, 0x99, 0xc6, 0xdf, 0xa3, 0xdb, 0x11, 0xd3, 0x26, 0x3b, 0xb9, 0x32, 0x23, 0xce, 0x4c, 0x26, - 0x2d, 0x82, 0xf4, 0x4e, 0x3a, 0x77, 0x76, 0x9e, 0x31, 0x6d, 0x7a, 0x4b, 0xcc, 0xf3, 0xc9, 0x4e, - 0xb4, 0x52, 0xd0, 0xf8, 0x3e, 0x5a, 0x67, 0x5a, 0x84, 0x60, 0x61, 0xb5, 0x5d, 0x4e, 0xe7, 0xce, - 0x7a, 0xcb, 0xef, 0x77, 0x08, 0x54, 0x1b, 0x7f, 0x5a, 0x68, 0x0b, 0x8e, 0xea, 0x1b, 0x66, 0xa6, - 0x1a, 0x1f, 0xa2, 0x7b, 0xb1, 0xa6, 0x5a, 0xc4, 0x01, 0xa7, 0xab, 0x73, 0xe1, 0xe6, 0xc5, 0x76, - 0x3d, 0x9d, 0x3b, 0x77, 0x3d, 0xdf, 0xcf, 0x18, 0x2b, 0xb3, 0xc9, 0xdd, 0x58, 0x5f, 0xad, 0xe2, - 0x16, 0xda, 0xd0, 0x86, 0x99, 0xfc, 0x01, 0xdc, 0xda, 0xff, 0xec, 0x66, 0xc6, 0x65, 0xa7, 0xe1, - 0x24, 0x57, 0x3e, 0x7a, 0x89, 0xd0, 0x65, 0x11, 0xdf, 0x43, 0x77, 0x5a, 0x3f, 0x74, 0xbd, 0x21, - 0xf5, 0x87, 0xad, 0x61, 0x97, 0x1e, 0x79, 0x4f, 0xbd, 0xc3, 0x9f, 0xbc, 0x5a, 0xe1, 0x7d, 0xa0, - 0xd7, 0x6d, 0x3d, 0x1b, 0xf6, 0x7e, 0xae, 0x59, 0xf8, 0x3e, 0xaa, 0xaf, 0x2a, 0x48, 0xd7, 0x1f, - 0x1c, 0x7a, 0x7e, 0xff, 0xb8, 0x5b, 0x5b, 0x7b, 0x1f, 0xed, 0xf4, 0xfd, 0x83, 0x43, 0xcf, 0xeb, - 0x1e, 0x0c, 0xbb, 0x9d, 0x5a, 0xb1, 0xfd, 0xed, 0xd9, 0xb9, 0x5d, 0x78, 0x75, 0x6e, 0x17, 0xde, - 0x9c, 0xdb, 0xd6, 0x6f, 0xa9, 0x6d, 0xfd, 0x95, 0xda, 0xd6, 0xdf, 0xa9, 0x6d, 0x9d, 0xa5, 0xb6, - 0xf5, 0x4f, 0x6a, 0x5b, 0xaf, 0x53, 0xbb, 0xf0, 0x26, 0xb5, 0xad, 0x3f, 0x2e, 0xec, 0xc2, 0xd9, - 0x85, 0x5d, 0x78, 0x75, 0x61, 0x17, 0x7e, 0x29, 0x2d, 0xfe, 0x38, 0x46, 0x9b, 0xf0, 0x13, 0xfe, - 0xd5, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4a, 0xa6, 0x4a, 0x57, 0x65, 0x06, 0x00, 0x00, + 0x14, 0xf6, 0xc6, 0x49, 0x6c, 0x4f, 0xe2, 0xc6, 0x9d, 0x46, 0xd4, 0x84, 0x6a, 0x37, 0x72, 0x41, + 0x2a, 0x05, 0xad, 0x51, 0x90, 0xa0, 0x17, 0x40, 0x76, 0xec, 0x62, 0xab, 0x65, 0x63, 0xcd, 0x3a, + 0x41, 0x70, 0x19, 0x8d, 0x77, 0x27, 0xc9, 0xd0, 0xf5, 0xee, 0x68, 0x66, 0x62, 0x55, 0x3d, 0x71, + 0xe4, 0xc8, 0x5f, 0xe0, 0xc6, 0x4f, 0xe1, 0x98, 0x63, 0x4f, 0x16, 0xd9, 0x70, 0xe8, 0xb1, 0x3f, + 0x01, 0xed, 0xdb, 0x75, 0x53, 0xb7, 0x52, 0x93, 0xd3, 0xbe, 0x79, 0xdf, 0xf7, 0xbd, 0x37, 0xf3, + 0xbd, 0x27, 0x1b, 0xb9, 0x5a, 0x05, 0xed, 0x99, 0x78, 0x21, 0xb8, 0x6a, 0x6b, 0xae, 0x66, 0x22, + 0xe0, 0xba, 0xad, 0x4f, 0x99, 0xe2, 0x61, 0x9b, 0x9d, 0xf0, 0xd8, 0xc8, 0x49, 0xfe, 0x75, 0xa5, + 0x4a, 0x4c, 0x82, 0x1d, 0xf9, 0xdc, 0xcd, 0xe9, 0xee, 0x82, 0xee, 0xe6, 0x74, 0x17, 0x68, 0x3b, + 0xdb, 0x27, 0xc9, 0x49, 0x02, 0xdc, 0x76, 0x16, 0xe5, 0xb2, 0x1d, 0x27, 0x6b, 0xc3, 0xa4, 0x68, + 0xe7, 0xc8, 0xd9, 0x99, 0x08, 0xe5, 0x04, 0x3e, 0x39, 0xa1, 0xf5, 0x08, 0xdd, 0xee, 0x64, 0xfa, + 0x7d, 0x26, 0xd9, 0x44, 0x44, 0xc2, 0x08, 0xae, 0xf1, 0x7d, 0x54, 0x0f, 0x92, 0x28, 0xe2, 0x81, + 0xd1, 0x34, 0x64, 0x86, 0x35, 0xad, 0x5d, 0xeb, 0x41, 0x95, 0x6c, 0x2e, 0x92, 0x3d, 0x66, 0x58, + 0xeb, 0x0f, 0x0b, 0x6d, 0x81, 0x74, 0xc4, 0x14, 0x9b, 0x72, 0xc3, 0x95, 0xc6, 0x67, 0xe8, 0x33, + 0xa9, 0x92, 0x63, 0x11, 0x71, 0x45, 0xb5, 0x61, 0xc1, 0x33, 0x6a, 0x14, 0x0b, 0x38, 0xd5, 0x6c, + 0x2a, 0x23, 0x4e, 0x25, 0x57, 0x22, 0x09, 0xe9, 0x54, 0x43, 0xc1, 0xb5, 0xee, 0xa7, 0xe9, 0xdc, + 0xd9, 0x1d, 0x15, 0x02, 0x3f, 0xe3, 0x8f, 0x33, 0xba, 0x0f, 0xec, 0x11, 0x90, 0x7f, 0xf2, 0xc9, + 0xae, 0xfc, 0x30, 0x43, 0xb7, 0xfe, 0x5b, 0x41, 0x35, 0xb8, 0xca, 0x30, 0x3e, 0x4e, 0xf0, 0xb7, + 0xa8, 0x0a, 0x96, 0x50, 0x11, 0x42, 0x9f, 0x8d, 0xbd, 0x2d, 0x57, 0x3e, 0x77, 0xf3, 0xb7, 0xbb, + 0x87, 0x87, 0xc3, 0x5e, 0x77, 0x23, 0x9d, 0x3b, 0x95, 0x5c, 0xd1, 0x23, 0x15, 0x60, 0x0f, 0x43, + 0xfc, 0x18, 0xd5, 0x4e, 0x13, 0x6d, 0xa8, 0x88, 0x8f, 0x93, 0xe6, 0x0a, 0x28, 0x3f, 0x77, 0xaf, + 0xf1, 0xdd, 0x1d, 0x24, 0x1a, 0xda, 0x92, 0xea, 0x69, 0x11, 0xe1, 0x2f, 0x11, 0x12, 0x92, 0xb2, + 0x30, 0x54, 0x5c, 0xeb, 0x66, 0x79, 0xd7, 0x7a, 0x50, 0xeb, 0xd6, 0xd3, 0xb9, 0x53, 0x1b, 0x8e, + 0x3a, 0x79, 0x92, 0xd4, 0x84, 0x2c, 0x42, 0x7c, 0x84, 0x36, 0x83, 0xb7, 0xcc, 0x6f, 0xae, 0x42, + 0xe3, 0xbd, 0x6b, 0x1b, 0xbf, 0x37, 0x36, 0xb2, 0x54, 0x07, 0x8f, 0x10, 0x92, 0x6f, 0x26, 0xd3, + 0x5c, 0x83, 0xaa, 0x5f, 0xdd, 0xac, 0xea, 0xd5, 0x44, 0xc9, 0x5b, 0x35, 0x5a, 0x01, 0xaa, 0x3f, + 0xe1, 0x2a, 0xe6, 0xd1, 0x11, 0x57, 0x5a, 0x24, 0x31, 0x6e, 0xa2, 0xca, 0x2c, 0x0f, 0xc1, 0xe8, + 0x3a, 0x59, 0x1c, 0xf1, 0x27, 0xa8, 0x36, 0x65, 0xbf, 0x25, 0x8a, 0x2a, 0x3e, 0x03, 0x2b, 0xeb, + 0xa4, 0x0a, 0x09, 0xc2, 0x67, 0x00, 0x8a, 0xb8, 0x00, 0xcb, 0x05, 0x98, 0x25, 0x08, 0x9f, 0xb5, + 0x5e, 0x59, 0xa8, 0xba, 0xf0, 0x14, 0xef, 0x20, 0x70, 0x35, 0x66, 0x53, 0x0e, 0x1d, 0x6a, 0xe4, + 0xcd, 0x19, 0x7f, 0x8c, 0xaa, 0x32, 0x09, 0x29, 0x60, 0x2b, 0x80, 0x55, 0x64, 0x12, 0x7a, 0x19, + 0x74, 0x1f, 0x55, 0xf2, 0x41, 0xca, 0xc2, 0x7d, 0x94, 0xce, 0x9d, 0x75, 0xa8, 0x3a, 0x22, 0xeb, + 0x30, 0x27, 0x89, 0x1f, 0xa3, 0xf5, 0x67, 0xf0, 0x9a, 0xc2, 0x71, 0xf7, 0x5a, 0x6f, 0x96, 0x1e, + 0x4f, 0x0a, 0x35, 0x7e, 0x84, 0x9a, 0x79, 0x44, 0x4f, 0x39, 0x0b, 0xb9, 0xd2, 0x54, 0xc4, 0xda, + 0xb0, 0x28, 0xe2, 0x21, 0xb8, 0x5e, 0x25, 0x1f, 0xe5, 0xf8, 0x20, 0x87, 0x87, 0x0b, 0xb4, 0x35, + 0xb7, 0xd0, 0x1a, 0xf8, 0x8d, 0xbf, 0x47, 0xab, 0xb0, 0x74, 0xf9, 0xba, 0x3e, 0xbc, 0xd9, 0x94, + 0x60, 0xeb, 0x40, 0x87, 0xbf, 0x41, 0xb7, 0x02, 0xc5, 0x99, 0xe1, 0xd4, 0x88, 0x29, 0xa7, 0xb1, + 0x06, 0x47, 0xca, 0xdd, 0x46, 0x3a, 0x77, 0x36, 0xf7, 0x01, 0x19, 0x8b, 0x29, 0xf7, 0x7c, 0xb2, + 0x19, 0x5c, 0x9d, 0x34, 0xfe, 0x01, 0xdd, 0x8e, 0x98, 0x36, 0xd9, 0xcd, 0x95, 0x99, 0x70, 0x66, + 0x32, 0x69, 0x19, 0xa4, 0x77, 0xd2, 0xb9, 0xb3, 0xf5, 0x94, 0x69, 0x33, 0x58, 0x60, 0x9e, 0x4f, + 0xb6, 0xa2, 0xa5, 0x84, 0xc6, 0xf7, 0xd0, 0x2a, 0xd3, 0x22, 0x04, 0x0b, 0xeb, 0xdd, 0x6a, 0x3a, + 0x77, 0x56, 0x3b, 0xfe, 0xb0, 0x47, 0x20, 0xdb, 0xfa, 0xcb, 0x42, 0x1b, 0x70, 0x55, 0xdf, 0x30, + 0x73, 0xa6, 0xf1, 0x01, 0xba, 0x1b, 0x6b, 0xaa, 0x45, 0x1c, 0x70, 0xba, 0xdc, 0x17, 0x5e, 0x5e, + 0xee, 0x36, 0xd3, 0xb9, 0xb3, 0xed, 0xf9, 0x7e, 0xc6, 0x58, 0xea, 0x4d, 0xb6, 0x63, 0xfd, 0x7e, + 0x16, 0x77, 0xd0, 0x9a, 0x36, 0xcc, 0xe4, 0x0b, 0x70, 0x6b, 0xef, 0x8b, 0x9b, 0x19, 0x97, 0xdd, + 0x86, 0x93, 0x5c, 0xf9, 0xf0, 0x05, 0x42, 0x57, 0x49, 0x7c, 0x17, 0xdd, 0xe9, 0xfc, 0xd8, 0xf7, + 0xc6, 0xd4, 0x1f, 0x77, 0xc6, 0x7d, 0x7a, 0xe8, 0x3d, 0xf1, 0x0e, 0x7e, 0xf6, 0x1a, 0xa5, 0x77, + 0x81, 0x41, 0xbf, 0xf3, 0x74, 0x3c, 0xf8, 0xa5, 0x61, 0xe1, 0x7b, 0xa8, 0xb9, 0xac, 0x20, 0x7d, + 0x7f, 0x74, 0xe0, 0xf9, 0xc3, 0xa3, 0x7e, 0x63, 0xe5, 0x5d, 0xb4, 0x37, 0xf4, 0xf7, 0x0f, 0x3c, + 0xaf, 0xbf, 0x3f, 0xee, 0xf7, 0x1a, 0xe5, 0xee, 0x77, 0xe7, 0x17, 0x76, 0xe9, 0xe5, 0x85, 0x5d, + 0x7a, 0x7d, 0x61, 0x5b, 0xbf, 0xa7, 0xb6, 0xf5, 0x77, 0x6a, 0x5b, 0xff, 0xa4, 0xb6, 0x75, 0x9e, + 0xda, 0xd6, 0xbf, 0xa9, 0x6d, 0xbd, 0x4a, 0xed, 0xd2, 0xeb, 0xd4, 0xb6, 0xfe, 0xbc, 0xb4, 0x4b, + 0xe7, 0x97, 0x76, 0xe9, 0xe5, 0xa5, 0x5d, 0xfa, 0xb5, 0x52, 0xfc, 0x3f, 0x4c, 0xd6, 0xe1, 0x27, + 0xfc, 0xeb, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe9, 0xec, 0x47, 0x21, 0x4c, 0x06, 0x00, 0x00, } func (x AgentState) String() string { diff --git a/src/vizier/services/shared/agentpb/agent.proto b/src/vizier/services/shared/agentpb/agent.proto index e717818533f..b95cb1def0f 100644 --- a/src/vizier/services/shared/agentpb/agent.proto +++ b/src/vizier/services/shared/agentpb/agent.proto @@ -22,7 +22,7 @@ package px.vizier.services.shared.agent; option go_package = "agentpb"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +import "gogoproto/gogo.proto"; import "src/api/proto/uuidpb/uuid.proto"; // AgentCapabilities describes functions that the agent has available. diff --git a/third_party/gogoproto/BUILD.bazel b/third_party/gogoproto/BUILD.bazel new file mode 100644 index 00000000000..09cdf0d445b --- /dev/null +++ b/third_party/gogoproto/BUILD.bazel @@ -0,0 +1,21 @@ +# Copyright 2018- The Pixie Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 + +filegoup = filegroup( + name = "bazel", + srcs = ["gogo.proto"], + visibility = ["//visibility:public"], +) diff --git a/third_party/github.com/gogo/protobuf/gogoproto/gogo.proto b/third_party/gogoproto/gogo.proto similarity index 100% rename from third_party/github.com/gogo/protobuf/gogoproto/gogo.proto rename to third_party/gogoproto/gogo.proto diff --git a/tools/arc_addons/pixielabs/lint/ArcanistGolangCiLinter.php b/tools/arc_addons/pixielabs/lint/ArcanistGolangCiLinter.php index 9f01eabb5d9..b609f034a30 100644 --- a/tools/arc_addons/pixielabs/lint/ArcanistGolangCiLinter.php +++ b/tools/arc_addons/pixielabs/lint/ArcanistGolangCiLinter.php @@ -49,7 +49,7 @@ public function getInstallInstructions() { } protected function getDefaultFlags() { - return array('--out-format=checkstyle'); + return array('--output.text.path=stdout'); } protected function getPathArgumentForLinterFuture($path) { @@ -95,6 +95,10 @@ protected function parseLinterOutput($path, $err, $stdout, $stderr) { return [$message]; } + $lines = explode("\n", $stdout); + // golangci-lint outputs a summary at the end of the output. This is the only + // non XML output. Remove it to parse the XML correctly. + $stdout = preg_replace('/\d+ issue(?:s)?\./', '', $stdout); $ok = @$report_dom->loadXML($stdout); if (!$ok) { diff --git a/tools/chef/base_image_version.txt b/tools/chef/base_image_version.txt index 25f55ac2588..f8fcc96b15e 100644 --- a/tools/chef/base_image_version.txt +++ b/tools/chef/base_image_version.txt @@ -1 +1 @@ -202409092308 +202503281433 diff --git a/tools/chef/cookbooks/px_dev/attributes/linux.rb b/tools/chef/cookbooks/px_dev/attributes/linux.rb index 0c938ef3fff..07a7494f33a 100644 --- a/tools/chef/cookbooks/px_dev/attributes/linux.rb +++ b/tools/chef/cookbooks/px_dev/attributes/linux.rb @@ -33,14 +33,14 @@ '648b599397548e4bb92429eec6391374c2cbb0edb835e3b3f03d4281c011f401' default['golang']['download_path'] = - 'https://go.dev/dl/go1.21.0.linux-amd64.tar.gz' + 'https://go.dev/dl/go1.24.0.linux-amd64.tar.gz' default['golang']['sha256'] = - 'd0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742' + 'dea9ca38a0b852a74e81c26134671af7c0fbe65d81b0dc1c5bfe22cf7d4c8858' default['golangci-lint']['download_path'] = - 'https://github.com/golangci/golangci-lint/releases/download/v1.51.1/golangci-lint-1.51.1-linux-amd64.tar.gz' + 'https://github.com/golangci/golangci-lint/releases/download/v2.0.2/golangci-lint-2.0.2-linux-amd64.tar.gz' default['golangci-lint']['sha256'] = - '17aeb26c76820c22efa0e1838b0ab93e90cfedef43fbfc9a2f33f27eb9e5e070' + '89cc8a7810dc63b9a37900da03e37c3601caf46d42265d774e0f1a5d883d53e2' default['nodejs']['download_path'] = 'https://nodejs.org/dist/v18.16.0/node-v18.16.0-linux-x64.tar.xz' diff --git a/tools/chef/cookbooks/px_dev/attributes/mac_os_x.rb b/tools/chef/cookbooks/px_dev/attributes/mac_os_x.rb index 11d9e60c8c3..92e374303ea 100644 --- a/tools/chef/cookbooks/px_dev/attributes/mac_os_x.rb +++ b/tools/chef/cookbooks/px_dev/attributes/mac_os_x.rb @@ -34,14 +34,14 @@ '8d3709d957c7115610e764621569728be102d213fee15bc1d1aa9d465eb2c258' default['golang']['download_path'] = - 'https://go.dev/dl/go1.21.0.darwin-amd64.tar.gz' + 'https://go.dev/dl/go1.24.0.darwin-amd64.tar.gz' default['golang']['sha256'] = - 'b314de9f704ab122c077d2ec8e67e3670affe8865479d1f01991e7ac55d65e70' + '7af054e5088b68c24b3d6e135e5ca8d91bbd5a05cb7f7f0187367b3e6e9e05ee' default['golangci-lint']['download_path'] = - 'https://github.com/golangci/golangci-lint/releases/download/v1.51.1/golangci-lint-1.51.1-darwin-amd64.tar.gz' + 'https://github.com/golangci/golangci-lint/releases/download/v2.0.2/golangci-lint-2.0.2-darwin-amd64.tar.gz' default['golangci-lint']['sha256'] = - 'fba08acc4027f69f07cef48fbff70b8a7ecdfaa1c2aba9ad3fb31d60d9f5d4bc' + 'a88cbdc86b483fe44e90bf2dcc3fec2af8c754116e6edf0aa6592cac5baa7a0e' default['nodejs']['download_path'] = 'https://nodejs.org/dist/v18.16.0/node-v18.16.0-darwin-x64.tar.gz' diff --git a/tools/chef/cookbooks/px_dev/recipes/golang.rb b/tools/chef/cookbooks/px_dev/recipes/golang.rb index 0d2ea5d9a53..d03c3281b11 100644 --- a/tools/chef/cookbooks/px_dev/recipes/golang.rb +++ b/tools/chef/cookbooks/px_dev/recipes/golang.rb @@ -42,7 +42,7 @@ execute 'install go binaries' do ENV['GOPATH'] = "/opt/px_dev/gopath" command %(go install github.com/golang/mock/mockgen@v1.5.0 && \ - go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1 && \ + go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.2 && \ go install k8s.io/code-generator/cmd/client-gen@v0.20.6 && \ go install github.com/go-bindata/go-bindata/go-bindata@v3.1.2+incompatible && \ go install github.com/google/go-containerregistry/cmd/crane@v0.15.2 && \ diff --git a/tools/chef/cookbooks/px_dev/recipes/linux.rb b/tools/chef/cookbooks/px_dev/recipes/linux.rb index c805c98fb20..aea415ac1e9 100644 --- a/tools/chef/cookbooks/px_dev/recipes/linux.rb +++ b/tools/chef/cookbooks/px_dev/recipes/linux.rb @@ -56,6 +56,16 @@ 'qemu-system-x86', 'qemu-user-static', 'qemu-utils', + + # Minikube dependencies for kvm + 'libnss3-tools', + 'libvirt-daemon-system', + 'libvirt-clients', + 'qemu-kvm', + 'virt-manager', + + # Pixie dependencies + 'mkcert', ] apt_package apt_pkg_list do diff --git a/vizier-chart/Chart.yaml b/vizier-chart/Chart.yaml new file mode 100644 index 00000000000..b91fc292c74 --- /dev/null +++ b/vizier-chart/Chart.yaml @@ -0,0 +1,4 @@ +apiVersion: v2 +name: vizier-chart +type: application +version: 0.14.15 diff --git a/vizier-chart/helm-install.sh b/vizier-chart/helm-install.sh new file mode 100644 index 00000000000..5d14b60d58a --- /dev/null +++ b/vizier-chart/helm-install.sh @@ -0,0 +1,40 @@ + +#First you install pixie via px deploy, then run this script +kubectl get secret -n pl -o json | jq -r '.items[] | select(.metadata.annotations | has("helm.sh/release-name") | not) | .metadata.name' | xargs -I {} kubectl annotate -n pl --overwrite secret {} meta.helm.sh/release-name=pixie meta.helm.sh/release-namespace=pl +kubectl get svc -n pl -o json | jq -r '.items[] | select(.metadata.annotations | has("helm.sh/release-name") | not) | .metadata.name' | xargs -I {} kubectl annotate -n pl --overwrite svc {} meta.helm.sh/release-name=pixie meta.helm.sh/release-namespace=pl +kubectl get sa -n pl -o json | jq -r '.items[] | select(.metadata.annotations | has("helm.sh/release-name") | not) | .metadata.name' | xargs -I {} kubectl annotate -n pl sa --overwrite {} meta.helm.sh/release-name=pixie meta.helm.sh/release-namespace=pl +kubectl get cm -n pl -o json | jq -r '.items[] | select(.metadata.annotations | has("helm.sh/release-name") | not) | .metadata.name' | xargs -I {} kubectl annotate -n pl cm --overwrite {} meta.helm.sh/release-name=pixie meta.helm.sh/release-namespace=pl +kubectl get pvc -n pl -o json | jq -r '.items[] | select(.metadata.annotations | has("helm.sh/release-name") | not) | .metadata.name' | xargs -I {} kubectl annotate -n pl pvc --overwrite {} meta.helm.sh/release-name=pixie meta.helm.sh/release-namespace=pl +kubectl get clusterrole -n pl -o json | jq -r '.items[] | select(.metadata.annotations | has("helm.sh/release-name") | not) | .metadata.name' | xargs -I {} kubectl annotate -n pl clusterrole --overwrite {} meta.helm.sh/release-name=pixie meta.helm.sh/release-namespace=pl +kubectl get clusterrolebinding -n pl -o json | jq -r '.items[] | select(.metadata.annotations | has("helm.sh/release-name") | not) | .metadata.name' | xargs -I {} kubectl annotate -n pl clusterrolebinding --overwrite {} meta.helm.sh/release-name=pixie meta.helm.sh/release-namespace=pl +kubectl get role -n pl -o json | jq -r '.items[] | select(.metadata.annotations | has("helm.sh/release-name") | not) | .metadata.name' | xargs -I {} kubectl annotate -n pl role --overwrite {} meta.helm.sh/release-name=pixie meta.helm.sh/release-namespace=pl +kubectl get rolebinding -n pl -o json | jq -r '.items[] | select(.metadata.annotations | has("helm.sh/release-name") | not) | .metadata.name' | xargs -I {} kubectl annotate -n pl rolebinding --overwrite {} meta.helm.sh/release-name=pixie meta.helm.sh/release-namespace=pl +kubectl get ds -n pl -o json | jq -r '.items[] | select(.metadata.annotations | has("helm.sh/release-name") | not) | .metadata.name' | xargs -I {} kubectl annotate -n pl ds --overwrite {} meta.helm.sh/release-name=pixie meta.helm.sh/release-namespace=pl +kubectl get deployment -n pl -o json | jq -r '.items[] | select(.metadata.annotations | has("helm.sh/release-name") | not) | .metadata.name' | xargs -I {} kubectl annotate -n pl deployment --overwrite {} meta.helm.sh/release-name=pixie meta.helm.sh/release-namespace=pl +kubectl get statefulset -n pl -o json | jq -r '.items[] | select(.metadata.annotations | has("helm.sh/release-name") | not) | .metadata.name' | xargs -I {} kubectl annotate -n pl statefulset --overwrite {} meta.helm.sh/release-name=pixie meta.helm.sh/release-namespace=pl + + + +kubectl get sa -n pl -o json | jq '.items[] | .metadata | select(.labels."app.kubernetes.io/managed-by=Helm" | not) | .name' | xargs -I {} kubectl label -n pl sa --overwrite {} app.kubernetes.io/managed-by=Helm +kubectl get svc -n pl -o json | jq '.items[] | .metadata | select(.labels."app.kubernetes.io/managed-by=Helm" | not) | .name' | xargs -I {} kubectl label -n pl svc --overwrite {} app.kubernetes.io/managed-by=Helm +kubectl get secret -n pl -o json | jq '.items[] | .metadata | select(.labels."app.kubernetes.io/managed-by=Helm" | not) | .name' | xargs -I {} kubectl label -n pl secret --overwrite {} app.kubernetes.io/managed-by=Helm +kubectl get cm -n pl -o json | jq '.items[] | .metadata | select(.labels."app.kubernetes.io/managed-by=Helm" | not) | .name' | xargs -I {} kubectl label -n pl cm --overwrite {} app.kubernetes.io/managed-by=Helm +kubectl get pvc -n pl -o json | jq '.items[] | .metadata | select(.labels."app.kubernetes.io/managed-by=Helm" | not) | .name' | xargs -I {} kubectl label -n pl pvc --overwrite {} app.kubernetes.io/managed-by=Helm +kubectl get clusterrole -n pl -o json | jq '.items[] | .metadata | select(.labels."app.kubernetes.io/managed-by=Helm" | not) | .name' | xargs -I {} kubectl label -n pl clusterrole --overwrite {} app.kubernetes.io/managed-by=Helm +kubectl get clusterrolebinding -n pl -o json | jq '.items[] | .metadata | select(.labels."app.kubernetes.io/managed-by=Helm" | not) | .name' | xargs -I {} kubectl label -n pl clusterrolebinding --overwrite {} app.kubernetes.io/managed-by=Helm +kubectl get role -n pl -o json | jq '.items[] | .metadata | select(.labels."app.kubernetes.io/managed-by=Helm" | not) | .name' | xargs -I {} kubectl label -n pl role --overwrite {} app.kubernetes.io/managed-by=Helm +kubectl get rolebinding -n pl -o json | jq '.items[] | .metadata | select(.labels."app.kubernetes.io/managed-by=Helm" | not) | .name' | xargs -I {} kubectl label -n pl rolebinding --overwrite {} app.kubernetes.io/managed-by=Helm +kubectl get ds -n pl -o json | jq '.items[] | .metadata | select(.labels."app.kubernetes.io/managed-by=Helm" | not) | .name' | xargs -I {} kubectl label -n pl ds --overwrite {} app.kubernetes.io/managed-by=Helm +kubectl get deployment -n pl -o json | jq '.items[] | .metadata | select(.labels."app.kubernetes.io/managed-by=Helm" | not) | .name' | xargs -I {} kubectl label -n pl deployment --overwrite {} app.kubernetes.io/managed-by=Helm +kubectl get statefulset -n pl -o json | jq '.items[] | .metadata | select(.labels."app.kubernetes.io/managed-by=Helm" | not) | .name' | xargs -I {} kubectl label -n pl statefulset --overwrite {} app.kubernetes.io/managed-by=Helm + +keyid=f60a3c55-91fe-4dbc-b984-bf6ed4fdc323 +key=$(px api-key get $keyid) +if [ ! -f myvalues.yaml ]; then + echo "Error: myvalues.yaml not found" + exit 1 +fi + +helm upgrade --install pixie . --namespace pl --create-namespace --values myvalues.yaml + + diff --git a/vizier-chart/templates/00_secrets.yaml b/vizier-chart/templates/00_secrets.yaml new file mode 100644 index 00000000000..f87370a1825 --- /dev/null +++ b/vizier-chart/templates/00_secrets.yaml @@ -0,0 +1,100 @@ +--- +apiVersion: v1 +data: + PL_CLOUD_ADDR: {{ if .Values.cloudAddr }}"{{ .Values.cloudAddr }}"{{ else }}"withpixie.ai:443"{{ end }} + PL_CLUSTER_NAME: "{{ .Values.clusterName }}" + PL_UPDATE_CLOUD_ADDR: {{ if .Values.cloudUpdateAddr }}"{{ .Values.cloudUpdateAddr }}"{{ else }}"withpixie.ai:443"{{ end }} +kind: ConfigMap +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + creationTimestamp: null + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + name: pl-cloud-config + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +data: + PL_CUSTOM_ANNOTATIONS: "{{ .Values.customAnnotations }}" + PL_CUSTOM_LABELS: "{{ .Values.customLabels }}" + PL_DISABLE_AUTO_UPDATE: {{ if .Values.disableAutoUpdate }}"{{ .Values.disableAutoUpdate }}"{{ else }}"false"{{ end }} + PL_ETCD_OPERATOR_ENABLED: {{ if .Values.useEtcdOperator }}"true"{{else}}"false"{{end}} + PL_MD_ETCD_SERVER: https://pl-etcd-client.{{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }}.svc:2379 + PX_MEMORY_LIMIT: "{{ .Values.pemMemoryLimit }}" + PX_MEMORY_REQUEST: "{{ .Values.pemMemoryRequest }}" +kind: ConfigMap +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + creationTimestamp: null + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + name: pl-cluster-config + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: Secret +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + creationTimestamp: null + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + name: pl-cluster-secrets + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +stringData: + sentry-dsn: "{{ .Values.sentryDSN }}" +--- +apiVersion: v1 +kind: Secret +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + creationTimestamp: null + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + name: pl-deploy-secrets + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +stringData: + deploy-key: "{{ .Values.deployKey }}" diff --git a/vizier-chart/templates/01_nats.yaml b/vizier-chart/templates/01_nats.yaml new file mode 100644 index 00000000000..29aedb8877f --- /dev/null +++ b/vizier-chart/templates/01_nats.yaml @@ -0,0 +1,246 @@ +--- +apiVersion: v1 +data: + nats.conf: | + pid_file: "/var/run/nats/nats.pid" + http: 8222 + + tls { + ca_file: "/etc/nats-server-tls-certs/ca.crt", + cert_file: "/etc/nats-server-tls-certs/server.crt", + key_file: "/etc/nats-server-tls-certs/server.key", + timeout: 3 + verify: true + } +kind: ConfigMap +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + name: nats-config + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + name: pl-nats + name: pl-nats + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + ports: + - name: client + port: 4222 + selector: + app: pl-monitoring + name: pl-nats +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + name: pl-nats + name: pl-nats-mgmt + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + clusterIP: None + ports: + - name: cluster + port: 6222 + - name: monitor + port: 8222 + - name: metrics + port: 7777 + - name: leafnodes + port: 7422 + - name: gateways + port: 7522 + selector: + app: pl-monitoring + name: pl-nats +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + name: pl-nats + name: pl-nats + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + replicas: 1 + selector: + matchLabels: + app: pl-monitoring + name: pl-nats + serviceName: pl-nats + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + name: pl-nats + plane: control + spec: + containers: + - command: + - nats-server + - --config + - /etc/nats-config/nats.conf + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: CLUSTER_ADVERTISE + value: $(POD_NAME).pl-nats.$(POD_NAMESPACE).svc + image: '{{ if .Values.registry }}{{ .Values.registry }}/gcr.io-pixie-oss-pixie-prod-vizier-deps-nats:2.9.19-scratch@sha256:5de59286eb54ead4d4a9279846098d4097b9c17a3c0588182398a7250cde1af9{{else}}gcr.io/pixie-oss/pixie-prod/vizier-deps/nats:2.9.19-scratch@sha256:5de59286eb54ead4d4a9279846098d4097b9c17a3c0588182398a7250cde1af9{{end}}' + lifecycle: + preStop: + exec: + command: + - /bin/sh + - -c + - /nats-server -sl=ldm=/var/run/nats/nats.pid && /bin/sleep 60 + livenessProbe: + httpGet: + path: / + port: 8222 + initialDelaySeconds: 10 + timeoutSeconds: 5 + name: pl-nats + ports: + - containerPort: 4222 + name: client + - containerPort: 7422 + name: leafnodes + - containerPort: 6222 + name: cluster + - containerPort: 8222 + name: monitor + - containerPort: 7777 + name: metrics + readinessProbe: + httpGet: + path: / + port: 8222 + initialDelaySeconds: 10 + timeoutSeconds: 5 + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /etc/nats-config + name: config-volume + - mountPath: /etc/nats-server-tls-certs + name: nats-server-tls-volume + - mountPath: /var/run/nats + name: pid + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + shareProcessNamespace: true + terminationGracePeriodSeconds: 60 + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: nats-server-tls-volume + secret: + secretName: service-tls-certs + - configMap: + name: nats-config + name: config-volume + - emptyDir: {} + name: pid diff --git a/vizier-chart/templates/02_etcd.yaml b/vizier-chart/templates/02_etcd.yaml new file mode 100644 index 00000000000..4f514ee8aaa --- /dev/null +++ b/vizier-chart/templates/02_etcd.yaml @@ -0,0 +1,238 @@ +{{if .Values.useEtcdOperator}} +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + etcd_cluster: pl-etcd + name: pl-etcd + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + clusterIP: None + ports: + - name: client + port: 2379 + - name: peer + port: 2380 + publishNotReadyAddresses: true + selector: + app: pl-monitoring + etcd_cluster: pl-etcd +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + etcd_cluster: pl-etcd + name: pl-etcd-client + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + ports: + - name: etcd-client + port: 2379 + selector: + app: pl-monitoring + etcd_cluster: pl-etcd +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + etcd_cluster: pl-etcd + name: pl-etcd + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + podManagementPolicy: Parallel + replicas: 3 + selector: + matchLabels: + app: pl-monitoring + etcd_cluster: pl-etcd + serviceName: pl-etcd + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + etcd_cluster: pl-etcd + plane: control + name: pl-etcd + spec: + containers: + - env: + - name: INITIAL_CLUSTER_SIZE + value: "3" + - name: CLUSTER_NAME + value: pl-etcd + - name: ETCDCTL_API + value: "3" + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: DATA_DIR + value: /var/run/etcd + - name: ETCD_AUTO_COMPACTION_RETENTION + value: "5" + - name: ETCD_AUTO_COMPACTION_MODE + value: revision + image: '{{ if .Values.registry }}{{ .Values.registry }}/gcr.io-pixie-oss-pixie-dev-public-etcd:3.5.9@sha256:e18afc6dda592b426834342393c4c4bd076cb46fa7e10fa7818952cae3047ca9{{else}}gcr.io/pixie-oss/pixie-dev-public/etcd:3.5.9@sha256:e18afc6dda592b426834342393c4c4bd076cb46fa7e10fa7818952cae3047ca9{{end}}' + lifecycle: + preStop: + exec: + command: + - /etc/etcd/scripts/prestop.sh + livenessProbe: + exec: + command: + - /etc/etcd/scripts/healthcheck.sh + failureThreshold: 5 + initialDelaySeconds: 60 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 5 + name: etcd + ports: + - containerPort: 2379 + name: client + - containerPort: 2380 + name: server + readinessProbe: + exec: + command: + - /etc/etcd/scripts/healthcheck.sh + failureThreshold: 3 + initialDelaySeconds: 1 + periodSeconds: 5 + successThreshold: 1 + timeoutSeconds: 5 + securityContext: + capabilities: + add: + - NET_RAW + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /var/run/etcd + name: etcd-data + - mountPath: /etc/etcdtls/member/peer-tls + name: member-peer-tls + - mountPath: /etc/etcdtls/member/server-tls + name: member-server-tls + - mountPath: /etc/etcdtls/client/etcd-tls + name: etcd-client-tls + securityContext: + seccompProfile: + type: RuntimeDefault + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: member-peer-tls + secret: + secretName: etcd-peer-tls-certs + - name: member-server-tls + secret: + secretName: etcd-server-tls-certs + - name: etcd-client-tls + secret: + secretName: etcd-client-tls-certs + - emptyDir: {} + name: etcd-data +--- +apiVersion: {{ if .Values.useBetaPdbVersion }}"policy/v1beta1"{{ else }}"policy/v1"{{ end }} +kind: PodDisruptionBudget +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + name: pl-etcd-pdb + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + minAvailable: 51% + selector: + matchLabels: + app: pl-monitoring + etcd_cluster: pl-etcd + +{{- end}} \ No newline at end of file diff --git a/vizier-chart/templates/03_vizier_etcd.yaml b/vizier-chart/templates/03_vizier_etcd.yaml new file mode 100644 index 00000000000..87ccb522974 --- /dev/null +++ b/vizier-chart/templates/03_vizier_etcd.yaml @@ -0,0 +1,2309 @@ +{{if and (not .Values.autopilot) .Values.useEtcdOperator}} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: cloud-conn-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cert-provisioner-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: query-broker-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cert-provisioner-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - secrets + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-ns-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - services + - events + - pods/log + verbs: + - get + - watch + - list +- apiGroups: + - batch + resources: + - jobs + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - "" + resources: + - secrets + - pods + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - px.dev + resources: + - viziers + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create +- apiGroups: + - coordination.k8s.io + resourceNames: + - cloud-conn-election + resources: + - leases + verbs: + - get + - update +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - configmaps + - secrets + - pods + - services + - persistentvolumes + - persistentvolumeclaims + - serviceaccounts + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - "" + resources: + - events + - pods/log + verbs: + - get + - watch + - list +- apiGroups: + - apps + resources: + - deployments + - daemonsets + - statefulsets + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - batch + resources: + - cronjobs + - jobs + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - coordination.k8s.io + resourceNames: + - cloud-conn-election + - metadata-election + resources: + - leases + verbs: + - get + - update +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create +- apiGroups: + - px.dev + resources: + - viziers + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - px.dev + resources: + - viziers/status + verbs: + - get + - list + - watch +- apiGroups: + - rbac.authorization.k8s.io + resources: + - roles + - rolebindings + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-vizier-crd-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - px.dev + resources: + - viziers + - viziers/status + verbs: + - get + - list + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - endpoints + verbs: + - get + - list + - watch +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create +- apiGroups: + - coordination.k8s.io + resourceNames: + - metadata-election + resources: + - leases + verbs: + - get + - update +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + creationTimestamp: null + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-query-broker-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - list + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - nodes + verbs: + - get + - watch + - list +- apiGroups: + - "" + resourceNames: + - kube-system + resources: + - namespaces + verbs: + - get +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-node-view + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - nodes + verbs: + - get + - watch + - list +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-cluster-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - rbac.authorization.k8s.io + resources: + - clusterroles + - clusterrolebindings + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - "" + resourceNames: + - kube-system + resources: + - namespaces + verbs: + - get +- apiGroups: + - "" + resources: + - nodes + - pods + - services + - endpoints + - namespaces + verbs: + - get + - watch + - list +- apiGroups: + - apps + resources: + - replicasets + - deployments + verbs: + - get + - watch + - list +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - pods + - services + - endpoints + - namespaces + verbs: + - watch + - get + - list +- apiGroups: + - apps + resources: + - replicasets + - deployments + verbs: + - watch + - get + - list +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cert-provisioner-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-cert-provisioner-role +subjects: +- kind: ServiceAccount + name: pl-cert-provisioner-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-cloud-connector-ns-role +subjects: +- kind: ServiceAccount + name: cloud-conn-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-updater-role +subjects: +- kind: ServiceAccount + name: pl-updater-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-crd-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-crd-role +subjects: +- kind: ServiceAccount + name: default + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-crd-metadata-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-crd-role +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-metadata-role +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-query-broker-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-query-broker-role +subjects: +- kind: ServiceAccount + name: query-broker-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-query-broker-crd-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-crd-role +subjects: +- kind: ServiceAccount + name: query-broker-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-cloud-connector-role +subjects: +- kind: ServiceAccount + name: cloud-conn-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-node-view-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-node-view +subjects: +- kind: ServiceAccount + name: default + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-updater-cluster-role +subjects: +- kind: ServiceAccount + name: pl-updater-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-vizier-metadata +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-node-view-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-node-view +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +data: + PL_CLIENT_TLS_CERT: /certs/client.crt + PL_CLIENT_TLS_KEY: /certs/client.key + PL_SERVER_TLS_CERT: /certs/server.crt + PL_SERVER_TLS_KEY: /certs/server.key + PL_TLS_CA_CERT: /certs/ca.crt +kind: ConfigMap +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-tls-config + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +data: + PL_CLIENT_TLS_CERT: /certs/client.crt + PL_CLIENT_TLS_KEY: /certs/client.key + PL_SERVER_TLS_CERT: /certs/server.crt + PL_SERVER_TLS_KEY: /certs/server.key + PL_TLS_CA_CERT: /certs/ca.crt +kind: ConfigMap +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-tls-config + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: kelvin-service + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + clusterIP: None + ports: + - name: tcp-http2 + port: 59300 + protocol: TCP + targetPort: 59300 + selector: + app: pl-monitoring + component: vizier + name: kelvin + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: vizier-cloud-connector-svc + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + ports: + - name: tcp-http2 + port: 50800 + protocol: TCP + targetPort: 50800 + selector: + app: pl-monitoring + component: vizier + name: vizier-cloud-connector + vizier-bootstrap: "true" + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-metadata-svc + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + ports: + - name: tcp-http2 + port: 50400 + protocol: TCP + targetPort: 50400 + selector: + app: pl-monitoring + component: vizier + name: vizier-metadata + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-query-broker-svc + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + ports: + - name: tcp-http2 + port: 50300 + protocol: TCP + targetPort: 50300 + - name: tcp-grpc-web + port: 50305 + protocol: TCP + targetPort: 50305 + selector: + app: pl-monitoring + component: vizier + name: vizier-query-broker + type: ClusterIP +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: kelvin + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: kelvin + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: kelvin + plane: data + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: PL_CLUSTER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + - name: PL_SENTRY_DSN + valueFrom: + secretKeyRef: + key: sentry-dsn + name: pl-cluster-secrets + optional: true + - name: PL_HOST_PATH + value: /host + - name: PL_POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: PL_HOST_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_VIZIER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + optional: true + - name: PL_VIZIER_NAME + valueFrom: + secretKeyRef: + key: cluster-name + name: pl-cluster-secrets + optional: true + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: TCMALLOC_SAMPLE_PARAMETER + value: "1048576" + envFrom: + - configMapRef: + name: pl-tls-config + image: '{{ .Values.imageRegistry }}/vizier-kelvin_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + name: app + ports: + - containerPort: 59300 + resources: {} + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /certs + name: certs + - mountPath: /sys + name: sys + readOnly: true + initContainers: + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/readyz"; until [ $(curl + -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do echo "waiting + for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-cloud-connector-svc + - name: SERVICE_PORT + value: "50800" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: cc-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/healthz"; until [ + $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do + echo "waiting for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-query-broker-svc + - name: SERVICE_PORT + value: "50300" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: qb-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + terminationGracePeriodSeconds: 30 + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs + - hostPath: + path: /sys + type: Directory + name: sys +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: vizier-cloud-connector + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + replicas: 1 + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-cloud-connector + vizier-bootstrap: "true" + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-cloud-connector + plane: control + vizier-bootstrap: "true" + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_CLUSTER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + optional: true + - name: PL_VIZIER_NAME + valueFrom: + secretKeyRef: + key: cluster-name + name: pl-cluster-secrets + optional: true + - name: PL_DEPLOY_KEY + valueFrom: + secretKeyRef: + key: deploy-key + name: {{ if .Values.customDeployKeySecret }}"{{ .Values.customDeployKeySecret }}"{{else}}"pl-deploy-secrets"{{end}} + optional: true + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_MAX_EXPECTED_CLOCK_SKEW + value: "2000" + - name: PL_RENEW_PERIOD + value: {{ if .Values.electionPeriodMs }}"{{ .Values.electionPeriodMs }}"{{else}}"7500"{{end}} + envFrom: + - configMapRef: + name: pl-cloud-config + - configMapRef: + name: pl-cloud-connector-tls-config + - configMapRef: + name: pl-cluster-config + optional: true + image: '{{ .Values.imageRegistry }}/vizier-cloud_connector_server_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 50800 + scheme: HTTPS + name: app + ports: + - containerPort: 50800 + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /certs + name: certs + initContainers: + - command: + - sh + - -c + - set -xe; URL="${PROTOCOL}://${SERVICE_NAME}:${SERVICE_PORT}${HEALTH_PATH}"; + until [ $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 + ]; do echo "waiting for ${URL}"; sleep 2; done; + env: + - name: SERVICE_NAME + value: pl-nats-mgmt + - name: SERVICE_PORT + value: "8222" + - name: HEALTH_PATH + value: "" + - name: PROTOCOL + value: http + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: nats-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + serviceAccountName: cloud-conn-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-metadata + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + replicas: 1 + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-metadata + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + px.dev/metrics_port: "50400" + px.dev/metrics_scrape: "true" + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-metadata + plane: control + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_MAX_EXPECTED_CLOCK_SKEW + value: "2000" + - name: PL_RENEW_PERIOD + value: {{ if .Values.electionPeriodMs }}"{{ .Values.electionPeriodMs }}"{{else}}"7500"{{end}} + - name: PL_MD_ETCD_SERVER + value: https://pl-etcd-client.$(PL_POD_NAMESPACE).svc:2379 + - name: PL_ETCD_OPERATOR_ENABLED + value: "true" + envFrom: + - configMapRef: + name: pl-tls-config + image: '{{ .Values.imageRegistry }}/vizier-metadata_server_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 50400 + scheme: HTTPS + initialDelaySeconds: 120 + periodSeconds: 10 + name: app + readinessProbe: + failureThreshold: 5 + httpGet: + path: /healthz + port: 50400 + scheme: HTTPS + initialDelaySeconds: 30 + periodSeconds: 10 + volumeMounts: + - mountPath: /certs + name: certs + initContainers: + - command: + - sh + - -c + - set -xe; URL="${PROTOCOL}://${SERVICE_NAME}:${SERVICE_PORT}${HEALTH_PATH}"; + until [ $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 + ]; do echo "waiting for ${URL}"; sleep 2; done; + env: + - name: SERVICE_NAME + value: pl-nats-mgmt + - name: SERVICE_PORT + value: "8222" + - name: HEALTH_PATH + value: "" + - name: PROTOCOL + value: http + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: nats-wait + - command: + - sh + - -c + - set -xe; ETCD_PATH="${PL_MD_ETCD_SERVER}"; URL="${ETCD_PATH}${HEALTH_PATH}"; + until [ $(curl --cacert /certs/ca.crt --key /certs/client.key --cert /certs/client.crt + -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do echo "waiting + for ${URL}"; sleep 2; done; + env: + - name: HEALTH_PATH + value: /health + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_MD_ETCD_SERVER + value: https://pl-etcd-client.$(PL_POD_NAMESPACE).svc:2379 + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: etcd-wait + volumeMounts: + - mountPath: /certs + name: certs + serviceAccountName: metadata-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-query-broker + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + replicas: 1 + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-query-broker + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + px.dev/metrics_port: "50300" + px.dev/metrics_scrape: "true" + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-query-broker + plane: control + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: PL_CLUSTER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + - name: PL_SENTRY_DSN + valueFrom: + secretKeyRef: + key: sentry-dsn + name: pl-cluster-secrets + optional: true + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_POD_IP_ADDRESS + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_CLOUD_ADDR + valueFrom: + configMapKeyRef: + key: PL_CLOUD_ADDR + name: pl-cloud-config + - name: PL_DATA_ACCESS + value: {{ if .Values.dataAccess }}"{{ .Values.dataAccess }}"{{else}}"Full"{{end}} + envFrom: + - configMapRef: + name: pl-tls-config + image: '{{ .Values.imageRegistry }}/vizier-query_broker_server_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 50300 + scheme: HTTPS + name: app + ports: + - containerPort: 50300 + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /certs + name: certs + initContainers: + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/readyz"; until [ $(curl + -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do echo "waiting + for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-cloud-connector-svc + - name: SERVICE_PORT + value: "50800" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: cc-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/healthz"; until [ + $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do + echo "waiting for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-metadata-svc + - name: SERVICE_PORT + value: "50400" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: mds-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + serviceAccountName: query-broker-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs + - configMap: + name: proxy-envoy-config + name: envoy-yaml +--- +apiVersion: apps/v1 +kind: DaemonSet +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-pem + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-pem + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-pem + plane: data + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - args: [] + env: + - name: PL_PEM_ENV_VAR_PLACEHOLDER + value: "true" # This is un-used, and is just a placeholder used to templatize our YAMLs for Helm. + {{- range $key, $value := .Values.customPEMFlags}} + - name: {{$key}} + value: "{{$value}}" + {{- end}} + {{- if .Values.datastreamBufferSpikeSize }} + - name: PL_DATASTREAM_BUFFER_SPIKE_SIZE + value: "{{ .Values.datastreamBufferSpikeSize }}" + {{- end}} + {{- if .Values.datastreamBufferSize }} + - name: PL_DATASTREAM_BUFFER_SIZE + value: "{{ .Values.datastreamBufferSize }}" + {{- end}} + - name: TCMALLOC_SAMPLE_PARAMETER + value: "1048576" + - name: PL_CLIENT_TLS_CERT + value: /certs/client.crt + - name: PL_CLIENT_TLS_KEY + value: /certs/client.key + - name: PL_TLS_CA_CERT + value: /certs/ca.crt + - name: PL_DISABLE_SSL + value: "false" + - name: PL_HOST_PATH + value: /host + - name: PL_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_HOST_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_VIZIER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + optional: true + - name: PL_VIZIER_NAME + valueFrom: + secretKeyRef: + key: cluster-name + name: pl-cluster-secrets + optional: true + - name: PL_CLOCK_CONVERTER + value: {{ if .Values.clockConverter }}"{{ .Values.clockConverter }}"{{else}}"default"{{end}} + image: '{{ .Values.imageRegistry }}/vizier-pem_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + name: pem + resources: + limits: + memory: {{ if .Values.pemMemoryLimit }}"{{ .Values.pemMemoryLimit }}"{{else}}"2Gi"{{end}} + requests: + memory: {{ if .Values.pemMemoryRequest }}"{{ .Values.pemMemoryRequest }}"{{else}}"2Gi"{{end}} + securityContext: + capabilities: + add: + - SYS_PTRACE + - SYS_ADMIN + privileged: true + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /host + name: host-root + readOnly: true + - mountPath: /sys + name: sys + readOnly: true + - mountPath: /certs + name: certs + dnsPolicy: ClusterFirstWithHostNet + hostNetwork: true + hostPID: true + initContainers: + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/healthz"; until [ + $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do + echo "waiting for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-query-broker-svc + - name: SERVICE_PORT + value: "50300" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: qb-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + seccompProfile: + type: RuntimeDefault + terminationGracePeriodSeconds: 10 + tolerations: + - effect: NoSchedule + key: node-role.kubernetes.io/master + - effect: NoExecute + operator: Exists + - effect: NoSchedule + operator: Exists + volumes: + - hostPath: + path: / + type: Directory + name: host-root + - hostPath: + path: /sys + type: Directory + name: sys + - name: certs + secret: + secretName: service-tls-certs + updateStrategy: + rollingUpdate: + maxUnavailable: 20 + type: RollingUpdate +--- +apiVersion: batch/v1 +kind: Job +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: cert-provisioner-job + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + backoffLimit: 1 + completions: 1 + parallelism: 1 + template: + metadata: + labels: + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: cert-provisioner-job + spec: + containers: + - env: + - name: PL_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + envFrom: + - configMapRef: + name: pl-cloud-config + - configMapRef: + name: pl-cluster-config + optional: true + image: '{{ .Values.imageRegistry }}/vizier-cert_provisioner_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + name: provisioner + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + restartPolicy: Never + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + serviceAccountName: pl-cert-provisioner-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + +{{- end}} \ No newline at end of file diff --git a/vizier-chart/templates/04_vizier_persistent.yaml b/vizier-chart/templates/04_vizier_persistent.yaml new file mode 100644 index 00000000000..1f306913ac2 --- /dev/null +++ b/vizier-chart/templates/04_vizier_persistent.yaml @@ -0,0 +1,2343 @@ +{{if and (not .Values.autopilot) (not .Values.useEtcdOperator)}} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: cloud-conn-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cert-provisioner-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: query-broker-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cert-provisioner-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - secrets + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-ns-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - services + - events + - pods/log + verbs: + - get + - watch + - list +- apiGroups: + - batch + resources: + - jobs + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - "" + resources: + - secrets + - pods + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - px.dev + resources: + - viziers + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create +- apiGroups: + - coordination.k8s.io + resourceNames: + - cloud-conn-election + resources: + - leases + verbs: + - get + - update +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - configmaps + - secrets + - pods + - services + - persistentvolumes + - persistentvolumeclaims + - serviceaccounts + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - "" + resources: + - events + - pods/log + verbs: + - get + - watch + - list +- apiGroups: + - apps + resources: + - deployments + - daemonsets + - statefulsets + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - batch + resources: + - cronjobs + - jobs + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - coordination.k8s.io + resourceNames: + - cloud-conn-election + - metadata-election + resources: + - leases + verbs: + - get + - update +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create +- apiGroups: + - px.dev + resources: + - viziers + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - px.dev + resources: + - viziers/status + verbs: + - get + - list + - watch +- apiGroups: + - rbac.authorization.k8s.io + resources: + - roles + - rolebindings + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-vizier-crd-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - px.dev + resources: + - viziers + - viziers/status + verbs: + - get + - list + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - endpoints + verbs: + - get + - list + - watch +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create +- apiGroups: + - coordination.k8s.io + resourceNames: + - metadata-election + resources: + - leases + verbs: + - get + - update +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + creationTimestamp: null + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-query-broker-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - list + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - nodes + verbs: + - get + - watch + - list +- apiGroups: + - "" + resourceNames: + - kube-system + resources: + - namespaces + verbs: + - get +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-node-view + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - nodes + verbs: + - get + - watch + - list +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-cluster-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - rbac.authorization.k8s.io + resources: + - clusterroles + - clusterrolebindings + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - "" + resourceNames: + - kube-system + resources: + - namespaces + verbs: + - get +- apiGroups: + - "" + resources: + - nodes + - pods + - services + - endpoints + - namespaces + verbs: + - get + - watch + - list +- apiGroups: + - apps + resources: + - replicasets + - deployments + verbs: + - get + - watch + - list +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - pods + - services + - endpoints + - namespaces + verbs: + - watch + - get + - list +- apiGroups: + - apps + resources: + - replicasets + - deployments + verbs: + - watch + - get + - list +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cert-provisioner-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-cert-provisioner-role +subjects: +- kind: ServiceAccount + name: pl-cert-provisioner-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-cloud-connector-ns-role +subjects: +- kind: ServiceAccount + name: cloud-conn-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-updater-role +subjects: +- kind: ServiceAccount + name: pl-updater-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-crd-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-crd-role +subjects: +- kind: ServiceAccount + name: default + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-crd-metadata-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-crd-role +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-metadata-role +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-query-broker-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-query-broker-role +subjects: +- kind: ServiceAccount + name: query-broker-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-query-broker-crd-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-crd-role +subjects: +- kind: ServiceAccount + name: query-broker-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-cloud-connector-role +subjects: +- kind: ServiceAccount + name: cloud-conn-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-node-view-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-node-view +subjects: +- kind: ServiceAccount + name: default + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-updater-cluster-role +subjects: +- kind: ServiceAccount + name: pl-updater-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-vizier-metadata +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-node-view-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-node-view +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +data: + PL_CLIENT_TLS_CERT: /certs/client.crt + PL_CLIENT_TLS_KEY: /certs/client.key + PL_SERVER_TLS_CERT: /certs/server.crt + PL_SERVER_TLS_KEY: /certs/server.key + PL_TLS_CA_CERT: /certs/ca.crt +kind: ConfigMap +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-tls-config + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +data: + PL_CLIENT_TLS_CERT: /certs/client.crt + PL_CLIENT_TLS_KEY: /certs/client.key + PL_SERVER_TLS_CERT: /certs/server.crt + PL_SERVER_TLS_KEY: /certs/server.key + PL_TLS_CA_CERT: /certs/ca.crt +kind: ConfigMap +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-tls-config + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: kelvin-service + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + clusterIP: None + ports: + - name: tcp-http2 + port: 59300 + protocol: TCP + targetPort: 59300 + selector: + app: pl-monitoring + component: vizier + name: kelvin + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: vizier-cloud-connector-svc + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + ports: + - name: tcp-http2 + port: 50800 + protocol: TCP + targetPort: 50800 + selector: + app: pl-monitoring + component: vizier + name: vizier-cloud-connector + vizier-bootstrap: "true" + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-metadata-svc + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + ports: + - name: tcp-http2 + port: 50400 + protocol: TCP + targetPort: 50400 + selector: + app: pl-monitoring + component: vizier + name: vizier-metadata + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-query-broker-svc + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + ports: + - name: tcp-http2 + port: 50300 + protocol: TCP + targetPort: 50300 + - name: tcp-grpc-web + port: 50305 + protocol: TCP + targetPort: 50305 + selector: + app: pl-monitoring + component: vizier + name: vizier-query-broker + type: ClusterIP +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: metadata-pv-claim + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 16Gi +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: kelvin + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: kelvin + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: kelvin + plane: data + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: PL_CLUSTER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + - name: PL_SENTRY_DSN + valueFrom: + secretKeyRef: + key: sentry-dsn + name: pl-cluster-secrets + optional: true + - name: PL_HOST_PATH + value: /host + - name: PL_POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: PL_HOST_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_VIZIER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + optional: true + - name: PL_VIZIER_NAME + valueFrom: + secretKeyRef: + key: cluster-name + name: pl-cluster-secrets + optional: true + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: TCMALLOC_SAMPLE_PARAMETER + value: "1048576" + envFrom: + - configMapRef: + name: pl-tls-config + image: '{{ .Values.imageRegistry }}/vizier-kelvin_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + name: app + ports: + - containerPort: 59300 + resources: {} + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /certs + name: certs + - mountPath: /sys + name: sys + readOnly: true + initContainers: + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/readyz"; until [ $(curl + -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do echo "waiting + for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-cloud-connector-svc + - name: SERVICE_PORT + value: "50800" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: cc-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/healthz"; until [ + $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do + echo "waiting for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-query-broker-svc + - name: SERVICE_PORT + value: "50300" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: qb-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + terminationGracePeriodSeconds: 30 + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs + - hostPath: + path: /sys + type: Directory + name: sys +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: vizier-cloud-connector + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + replicas: 1 + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-cloud-connector + vizier-bootstrap: "true" + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-cloud-connector + plane: control + vizier-bootstrap: "true" + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_CLUSTER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + optional: true + - name: PL_VIZIER_NAME + valueFrom: + secretKeyRef: + key: cluster-name + name: pl-cluster-secrets + optional: true + - name: PL_DEPLOY_KEY + valueFrom: + secretKeyRef: + key: deploy-key + name: {{ if .Values.customDeployKeySecret }}"{{ .Values.customDeployKeySecret }}"{{else}}"pl-deploy-secrets"{{end}} + optional: true + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_MAX_EXPECTED_CLOCK_SKEW + value: "2000" + - name: PL_RENEW_PERIOD + value: {{ if .Values.electionPeriodMs }}"{{ .Values.electionPeriodMs }}"{{else}}"7500"{{end}} + envFrom: + - configMapRef: + name: pl-cloud-config + - configMapRef: + name: pl-cloud-connector-tls-config + - configMapRef: + name: pl-cluster-config + optional: true + image: '{{ .Values.imageRegistry }}/vizier-cloud_connector_server_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 50800 + scheme: HTTPS + name: app + ports: + - containerPort: 50800 + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /certs + name: certs + initContainers: + - command: + - sh + - -c + - set -xe; URL="${PROTOCOL}://${SERVICE_NAME}:${SERVICE_PORT}${HEALTH_PATH}"; + until [ $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 + ]; do echo "waiting for ${URL}"; sleep 2; done; + env: + - name: SERVICE_NAME + value: pl-nats-mgmt + - name: SERVICE_PORT + value: "8222" + - name: HEALTH_PATH + value: "" + - name: PROTOCOL + value: http + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: nats-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + serviceAccountName: cloud-conn-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-query-broker + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + replicas: 1 + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-query-broker + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + px.dev/metrics_port: "50300" + px.dev/metrics_scrape: "true" + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-query-broker + plane: control + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: PL_CLUSTER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + - name: PL_SENTRY_DSN + valueFrom: + secretKeyRef: + key: sentry-dsn + name: pl-cluster-secrets + optional: true + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_POD_IP_ADDRESS + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_CLOUD_ADDR + valueFrom: + configMapKeyRef: + key: PL_CLOUD_ADDR + name: pl-cloud-config + - name: PL_DATA_ACCESS + value: {{ if .Values.dataAccess }}"{{ .Values.dataAccess }}"{{else}}"Full"{{end}} + envFrom: + - configMapRef: + name: pl-tls-config + image: '{{ .Values.imageRegistry }}/vizier-query_broker_server_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 50300 + scheme: HTTPS + name: app + ports: + - containerPort: 50300 + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /certs + name: certs + initContainers: + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/readyz"; until [ $(curl + -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do echo "waiting + for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-cloud-connector-svc + - name: SERVICE_PORT + value: "50800" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: cc-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/healthz"; until [ + $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do + echo "waiting for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-metadata-svc + - name: SERVICE_PORT + value: "50400" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: mds-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + serviceAccountName: query-broker-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs + - configMap: + name: proxy-envoy-config + name: envoy-yaml +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-metadata + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + replicas: 1 + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-metadata + serviceName: vizier-metadata + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + px.dev/metrics_port: "50400" + px.dev/metrics_scrape: "true" + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-metadata + plane: control + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_MAX_EXPECTED_CLOCK_SKEW + value: "2000" + - name: PL_RENEW_PERIOD + value: {{ if .Values.electionPeriodMs }}"{{ .Values.electionPeriodMs }}"{{else}}"7500"{{end}} + - name: PL_ETCD_OPERATOR_ENABLED + value: "false" + envFrom: + - configMapRef: + name: pl-tls-config + image: '{{ .Values.imageRegistry }}/vizier-metadata_server_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 50400 + scheme: HTTPS + initialDelaySeconds: 120 + periodSeconds: 10 + name: app + readinessProbe: + failureThreshold: 5 + httpGet: + path: /healthz + port: 50400 + scheme: HTTPS + initialDelaySeconds: 30 + periodSeconds: 10 + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /certs + name: certs + - mountPath: /metadata + name: metadata-volume + initContainers: + - command: + - sh + - -c + - set -xe; URL="${PROTOCOL}://${SERVICE_NAME}:${SERVICE_PORT}${HEALTH_PATH}"; + until [ $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 + ]; do echo "waiting for ${URL}"; sleep 2; done; + env: + - name: SERVICE_NAME + value: pl-nats-mgmt + - name: SERVICE_PORT + value: "8222" + - name: HEALTH_PATH + value: "" + - name: PROTOCOL + value: http + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: nats-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + serviceAccountName: metadata-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs + - name: metadata-volume + persistentVolumeClaim: + claimName: metadata-pv-claim + updateStrategy: + type: RollingUpdate +--- +apiVersion: apps/v1 +kind: DaemonSet +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-pem + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-pem + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-pem + plane: data + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - args: [] + env: + - name: PL_PEM_ENV_VAR_PLACEHOLDER + value: "true" # This is un-used, and is just a placeholder used to templatize our YAMLs for Helm. + {{- range $key, $value := .Values.customPEMFlags}} + - name: {{$key}} + value: "{{$value}}" + {{- end}} + {{- if .Values.datastreamBufferSpikeSize }} + - name: PL_DATASTREAM_BUFFER_SPIKE_SIZE + value: "{{ .Values.datastreamBufferSpikeSize }}" + {{- end}} + {{- if .Values.datastreamBufferSize }} + - name: PL_DATASTREAM_BUFFER_SIZE + value: "{{ .Values.datastreamBufferSize }}" + {{- end}} + - name: TCMALLOC_SAMPLE_PARAMETER + value: "1048576" + - name: PL_CLIENT_TLS_CERT + value: /certs/client.crt + - name: PL_CLIENT_TLS_KEY + value: /certs/client.key + - name: PL_TLS_CA_CERT + value: /certs/ca.crt + - name: PL_DISABLE_SSL + value: "false" + - name: PL_HOST_PATH + value: /host + - name: PL_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_HOST_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_VIZIER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + optional: true + - name: PL_VIZIER_NAME + valueFrom: + secretKeyRef: + key: cluster-name + name: pl-cluster-secrets + optional: true + - name: PL_CLOCK_CONVERTER + value: {{ if .Values.clockConverter }}"{{ .Values.clockConverter }}"{{else}}"default"{{end}} + image: '{{ .Values.imageRegistry }}/vizier-pem_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + name: pem + resources: + limits: + memory: {{ if .Values.pemMemoryLimit }}"{{ .Values.pemMemoryLimit }}"{{else}}"2Gi"{{end}} + requests: + memory: {{ if .Values.pemMemoryRequest }}"{{ .Values.pemMemoryRequest }}"{{else}}"2Gi"{{end}} + securityContext: + capabilities: + add: + - SYS_PTRACE + - SYS_ADMIN + privileged: true + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /host + name: host-root + readOnly: true + - mountPath: /sys + name: sys + readOnly: true + - mountPath: /certs + name: certs + dnsPolicy: ClusterFirstWithHostNet + hostNetwork: true + hostPID: true + initContainers: + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/healthz"; until [ + $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do + echo "waiting for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-query-broker-svc + - name: SERVICE_PORT + value: "50300" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: qb-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + seccompProfile: + type: RuntimeDefault + terminationGracePeriodSeconds: 10 + tolerations: + - effect: NoSchedule + key: node-role.kubernetes.io/master + - effect: NoExecute + operator: Exists + - effect: NoSchedule + operator: Exists + volumes: + - hostPath: + path: / + type: Directory + name: host-root + - hostPath: + path: /sys + type: Directory + name: sys + - name: certs + secret: + secretName: service-tls-certs + updateStrategy: + rollingUpdate: + maxUnavailable: 20 + type: RollingUpdate +--- +apiVersion: batch/v1 +kind: Job +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: cert-provisioner-job + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + backoffLimit: 1 + completions: 1 + parallelism: 1 + template: + metadata: + labels: + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: cert-provisioner-job + spec: + containers: + - env: + - name: PL_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + envFrom: + - configMapRef: + name: pl-cloud-config + - configMapRef: + name: pl-cluster-config + optional: true + image: '{{ .Values.imageRegistry }}/vizier-cert_provisioner_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + name: provisioner + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + restartPolicy: Never + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + serviceAccountName: pl-cert-provisioner-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + +{{- end}} \ No newline at end of file diff --git a/vizier-chart/templates/05_vizier_etcd_ap.yaml b/vizier-chart/templates/05_vizier_etcd_ap.yaml new file mode 100644 index 00000000000..3c246bd3b11 --- /dev/null +++ b/vizier-chart/templates/05_vizier_etcd_ap.yaml @@ -0,0 +1,2330 @@ +{{if and (.Values.autopilot) (.Values.useEtcdOperator)}} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: cloud-conn-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cert-provisioner-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: query-broker-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cert-provisioner-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - secrets + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-ns-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - services + - events + - pods/log + verbs: + - get + - watch + - list +- apiGroups: + - batch + resources: + - jobs + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - "" + resources: + - secrets + - pods + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - px.dev + resources: + - viziers + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create +- apiGroups: + - coordination.k8s.io + resourceNames: + - cloud-conn-election + resources: + - leases + verbs: + - get + - update +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - configmaps + - secrets + - pods + - services + - persistentvolumes + - persistentvolumeclaims + - serviceaccounts + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - "" + resources: + - events + - pods/log + verbs: + - get + - watch + - list +- apiGroups: + - apps + resources: + - deployments + - daemonsets + - statefulsets + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - batch + resources: + - cronjobs + - jobs + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - coordination.k8s.io + resourceNames: + - cloud-conn-election + - metadata-election + resources: + - leases + verbs: + - get + - update +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create +- apiGroups: + - px.dev + resources: + - viziers + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - px.dev + resources: + - viziers/status + verbs: + - get + - list + - watch +- apiGroups: + - rbac.authorization.k8s.io + resources: + - roles + - rolebindings + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-vizier-crd-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - px.dev + resources: + - viziers + - viziers/status + verbs: + - get + - list + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - endpoints + verbs: + - get + - list + - watch +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create +- apiGroups: + - coordination.k8s.io + resourceNames: + - metadata-election + resources: + - leases + verbs: + - get + - update +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + creationTimestamp: null + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-query-broker-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - list + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - nodes + verbs: + - get + - watch + - list +- apiGroups: + - "" + resourceNames: + - kube-system + resources: + - namespaces + verbs: + - get +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-node-view + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - nodes + verbs: + - get + - watch + - list +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-cluster-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - rbac.authorization.k8s.io + resources: + - clusterroles + - clusterrolebindings + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - "" + resourceNames: + - kube-system + resources: + - namespaces + verbs: + - get +- apiGroups: + - "" + resources: + - nodes + - pods + - services + - endpoints + - namespaces + verbs: + - get + - watch + - list +- apiGroups: + - apps + resources: + - replicasets + - deployments + verbs: + - get + - watch + - list +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - pods + - services + - endpoints + - namespaces + verbs: + - watch + - get + - list +- apiGroups: + - apps + resources: + - replicasets + - deployments + verbs: + - watch + - get + - list +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cert-provisioner-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-cert-provisioner-role +subjects: +- kind: ServiceAccount + name: pl-cert-provisioner-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-cloud-connector-ns-role +subjects: +- kind: ServiceAccount + name: cloud-conn-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-updater-role +subjects: +- kind: ServiceAccount + name: pl-updater-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-crd-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-crd-role +subjects: +- kind: ServiceAccount + name: default + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-crd-metadata-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-crd-role +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-metadata-role +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-query-broker-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-query-broker-role +subjects: +- kind: ServiceAccount + name: query-broker-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-query-broker-crd-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-crd-role +subjects: +- kind: ServiceAccount + name: query-broker-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-cloud-connector-role +subjects: +- kind: ServiceAccount + name: cloud-conn-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-node-view-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-node-view +subjects: +- kind: ServiceAccount + name: default + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-updater-cluster-role +subjects: +- kind: ServiceAccount + name: pl-updater-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-vizier-metadata +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-node-view-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-node-view +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +data: + PL_CLIENT_TLS_CERT: /certs/client.crt + PL_CLIENT_TLS_KEY: /certs/client.key + PL_SERVER_TLS_CERT: /certs/server.crt + PL_SERVER_TLS_KEY: /certs/server.key + PL_TLS_CA_CERT: /certs/ca.crt +kind: ConfigMap +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-tls-config + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +data: + PL_CLIENT_TLS_CERT: /certs/client.crt + PL_CLIENT_TLS_KEY: /certs/client.key + PL_SERVER_TLS_CERT: /certs/server.crt + PL_SERVER_TLS_KEY: /certs/server.key + PL_TLS_CA_CERT: /certs/ca.crt +kind: ConfigMap +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-tls-config + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: kelvin-service + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + clusterIP: None + ports: + - name: tcp-http2 + port: 59300 + protocol: TCP + targetPort: 59300 + selector: + app: pl-monitoring + component: vizier + name: kelvin + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: vizier-cloud-connector-svc + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + ports: + - name: tcp-http2 + port: 50800 + protocol: TCP + targetPort: 50800 + selector: + app: pl-monitoring + component: vizier + name: vizier-cloud-connector + vizier-bootstrap: "true" + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-metadata-svc + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + ports: + - name: tcp-http2 + port: 50400 + protocol: TCP + targetPort: 50400 + selector: + app: pl-monitoring + component: vizier + name: vizier-metadata + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-query-broker-svc + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + ports: + - name: tcp-http2 + port: 50300 + protocol: TCP + targetPort: 50300 + - name: tcp-grpc-web + port: 50305 + protocol: TCP + targetPort: 50305 + selector: + app: pl-monitoring + component: vizier + name: vizier-query-broker + type: ClusterIP +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: kelvin + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: kelvin + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: kelvin + plane: data + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: PL_CLUSTER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + - name: PL_SENTRY_DSN + valueFrom: + secretKeyRef: + key: sentry-dsn + name: pl-cluster-secrets + optional: true + - name: PL_HOST_PATH + value: /host + - name: PL_POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: PL_HOST_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_VIZIER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + optional: true + - name: PL_VIZIER_NAME + valueFrom: + secretKeyRef: + key: cluster-name + name: pl-cluster-secrets + optional: true + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: TCMALLOC_SAMPLE_PARAMETER + value: "1048576" + envFrom: + - configMapRef: + name: pl-tls-config + image: '{{ .Values.imageRegistry }}/vizier-kelvin_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + name: app + ports: + - containerPort: 59300 + resources: {} + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /certs + name: certs + - mountPath: /sys + name: sys + readOnly: true + initContainers: + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/readyz"; until [ $(curl + -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do echo "waiting + for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-cloud-connector-svc + - name: SERVICE_PORT + value: "50800" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: cc-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/healthz"; until [ + $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do + echo "waiting for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-query-broker-svc + - name: SERVICE_PORT + value: "50300" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: qb-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + terminationGracePeriodSeconds: 30 + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs + - hostPath: + path: /sys + type: Directory + name: sys +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: vizier-cloud-connector + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + replicas: 1 + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-cloud-connector + vizier-bootstrap: "true" + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-cloud-connector + plane: control + vizier-bootstrap: "true" + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_CLUSTER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + optional: true + - name: PL_VIZIER_NAME + valueFrom: + secretKeyRef: + key: cluster-name + name: pl-cluster-secrets + optional: true + - name: PL_DEPLOY_KEY + valueFrom: + secretKeyRef: + key: deploy-key + name: {{ if .Values.customDeployKeySecret }}"{{ .Values.customDeployKeySecret }}"{{else}}"pl-deploy-secrets"{{end}} + optional: true + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_MAX_EXPECTED_CLOCK_SKEW + value: "2000" + - name: PL_RENEW_PERIOD + value: {{ if .Values.electionPeriodMs }}"{{ .Values.electionPeriodMs }}"{{else}}"7500"{{end}} + envFrom: + - configMapRef: + name: pl-cloud-config + - configMapRef: + name: pl-cloud-connector-tls-config + - configMapRef: + name: pl-cluster-config + optional: true + image: '{{ .Values.imageRegistry }}/vizier-cloud_connector_server_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 50800 + scheme: HTTPS + name: app + ports: + - containerPort: 50800 + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /certs + name: certs + initContainers: + - command: + - sh + - -c + - set -xe; URL="${PROTOCOL}://${SERVICE_NAME}:${SERVICE_PORT}${HEALTH_PATH}"; + until [ $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 + ]; do echo "waiting for ${URL}"; sleep 2; done; + env: + - name: SERVICE_NAME + value: pl-nats-mgmt + - name: SERVICE_PORT + value: "8222" + - name: HEALTH_PATH + value: "" + - name: PROTOCOL + value: http + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: nats-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + serviceAccountName: cloud-conn-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-metadata + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + replicas: 1 + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-metadata + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + px.dev/metrics_port: "50400" + px.dev/metrics_scrape: "true" + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-metadata + plane: control + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_MAX_EXPECTED_CLOCK_SKEW + value: "2000" + - name: PL_RENEW_PERIOD + value: {{ if .Values.electionPeriodMs }}"{{ .Values.electionPeriodMs }}"{{else}}"7500"{{end}} + - name: PL_MD_ETCD_SERVER + value: https://pl-etcd-client.$(PL_POD_NAMESPACE).svc:2379 + - name: PL_ETCD_OPERATOR_ENABLED + value: "true" + envFrom: + - configMapRef: + name: pl-tls-config + image: '{{ .Values.imageRegistry }}/vizier-metadata_server_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 50400 + scheme: HTTPS + initialDelaySeconds: 120 + periodSeconds: 10 + name: app + readinessProbe: + failureThreshold: 5 + httpGet: + path: /healthz + port: 50400 + scheme: HTTPS + initialDelaySeconds: 30 + periodSeconds: 10 + volumeMounts: + - mountPath: /certs + name: certs + initContainers: + - command: + - sh + - -c + - set -xe; URL="${PROTOCOL}://${SERVICE_NAME}:${SERVICE_PORT}${HEALTH_PATH}"; + until [ $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 + ]; do echo "waiting for ${URL}"; sleep 2; done; + env: + - name: SERVICE_NAME + value: pl-nats-mgmt + - name: SERVICE_PORT + value: "8222" + - name: HEALTH_PATH + value: "" + - name: PROTOCOL + value: http + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: nats-wait + - command: + - sh + - -c + - set -xe; ETCD_PATH="${PL_MD_ETCD_SERVER}"; URL="${ETCD_PATH}${HEALTH_PATH}"; + until [ $(curl --cacert /certs/ca.crt --key /certs/client.key --cert /certs/client.crt + -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do echo "waiting + for ${URL}"; sleep 2; done; + env: + - name: HEALTH_PATH + value: /health + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_MD_ETCD_SERVER + value: https://pl-etcd-client.$(PL_POD_NAMESPACE).svc:2379 + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: etcd-wait + volumeMounts: + - mountPath: /certs + name: certs + serviceAccountName: metadata-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-query-broker + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + replicas: 1 + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-query-broker + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + px.dev/metrics_port: "50300" + px.dev/metrics_scrape: "true" + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-query-broker + plane: control + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: PL_CLUSTER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + - name: PL_SENTRY_DSN + valueFrom: + secretKeyRef: + key: sentry-dsn + name: pl-cluster-secrets + optional: true + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_POD_IP_ADDRESS + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_CLOUD_ADDR + valueFrom: + configMapKeyRef: + key: PL_CLOUD_ADDR + name: pl-cloud-config + - name: PL_DATA_ACCESS + value: {{ if .Values.dataAccess }}"{{ .Values.dataAccess }}"{{else}}"Full"{{end}} + envFrom: + - configMapRef: + name: pl-tls-config + image: '{{ .Values.imageRegistry }}/vizier-query_broker_server_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 50300 + scheme: HTTPS + name: app + ports: + - containerPort: 50300 + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /certs + name: certs + initContainers: + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/readyz"; until [ $(curl + -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do echo "waiting + for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-cloud-connector-svc + - name: SERVICE_PORT + value: "50800" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: cc-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/healthz"; until [ + $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do + echo "waiting for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-metadata-svc + - name: SERVICE_PORT + value: "50400" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: mds-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + serviceAccountName: query-broker-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs + - configMap: + name: proxy-envoy-config + name: envoy-yaml +--- +apiVersion: apps/v1 +kind: DaemonSet +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-pem + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-pem + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-pem + plane: data + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - args: [] + env: + - name: PL_PEM_ENV_VAR_PLACEHOLDER + value: "true" # This is un-used, and is just a placeholder used to templatize our YAMLs for Helm. + {{- range $key, $value := .Values.customPEMFlags}} + - name: {{$key}} + value: "{{$value}}" + {{- end}} + {{- if .Values.datastreamBufferSpikeSize }} + - name: PL_DATASTREAM_BUFFER_SPIKE_SIZE + value: "{{ .Values.datastreamBufferSpikeSize }}" + {{- end}} + {{- if .Values.datastreamBufferSize }} + - name: PL_DATASTREAM_BUFFER_SIZE + value: "{{ .Values.datastreamBufferSize }}" + {{- end}} + - name: TCMALLOC_SAMPLE_PARAMETER + value: "1048576" + - name: PL_CLIENT_TLS_CERT + value: /certs/client.crt + - name: PL_CLIENT_TLS_KEY + value: /certs/client.key + - name: PL_TLS_CA_CERT + value: /certs/ca.crt + - name: PL_DISABLE_SSL + value: "false" + - name: PL_HOST_PATH + value: /host + - name: PL_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_HOST_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_VIZIER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + optional: true + - name: PL_VIZIER_NAME + valueFrom: + secretKeyRef: + key: cluster-name + name: pl-cluster-secrets + optional: true + - name: PL_CLOCK_CONVERTER + value: {{ if .Values.clockConverter }}"{{ .Values.clockConverter }}"{{else}}"default"{{end}} + image: '{{ .Values.imageRegistry }}/vizier-pem_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + name: pem + resources: + limits: + memory: {{ if .Values.pemMemoryLimit }}"{{ .Values.pemMemoryLimit }}"{{else}}"2Gi"{{end}} + requests: + memory: {{ if .Values.pemMemoryRequest }}"{{ .Values.pemMemoryRequest }}"{{else}}"2Gi"{{end}} + securityContext: + capabilities: + add: + - SYS_PTRACE + - SYS_ADMIN + privileged: true + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /host/lib + name: host-lib + readOnly: true + - mountPath: /host/var + name: host-var + readOnly: true + - mountPath: /host/boot + name: host-boot + readOnly: true + - mountPath: /host/etc + name: host-etc + readOnly: true + - mountPath: /sys + name: sys + readOnly: true + - mountPath: /certs + name: certs + dnsPolicy: ClusterFirstWithHostNet + hostNetwork: true + hostPID: true + initContainers: + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/healthz"; until [ + $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do + echo "waiting for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-query-broker-svc + - name: SERVICE_PORT + value: "50300" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: qb-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + seccompProfile: + type: RuntimeDefault + terminationGracePeriodSeconds: 10 + tolerations: + - effect: NoSchedule + key: node-role.kubernetes.io/master + - effect: NoExecute + operator: Exists + - effect: NoSchedule + operator: Exists + volumes: + - hostPath: + path: /lib + type: Directory + name: host-lib + - hostPath: + path: /var + type: Directory + name: host-var + - hostPath: + path: /boot + type: Directory + name: host-boot + - hostPath: + path: /etc + type: Directory + name: host-etc + - hostPath: + path: /sys + type: Directory + name: sys + - name: certs + secret: + secretName: service-tls-certs + updateStrategy: + rollingUpdate: + maxUnavailable: 20 + type: RollingUpdate +--- +apiVersion: batch/v1 +kind: Job +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: cert-provisioner-job + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + backoffLimit: 1 + completions: 1 + parallelism: 1 + template: + metadata: + labels: + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: cert-provisioner-job + spec: + containers: + - env: + - name: PL_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + envFrom: + - configMapRef: + name: pl-cloud-config + - configMapRef: + name: pl-cluster-config + optional: true + image: '{{ .Values.imageRegistry }}/vizier-cert_provisioner_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + name: provisioner + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + restartPolicy: Never + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + serviceAccountName: pl-cert-provisioner-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + +{{- end}} \ No newline at end of file diff --git a/vizier-chart/templates/06_vizier_persistent_ap.yaml b/vizier-chart/templates/06_vizier_persistent_ap.yaml new file mode 100644 index 00000000000..99940e52bd5 --- /dev/null +++ b/vizier-chart/templates/06_vizier_persistent_ap.yaml @@ -0,0 +1,2364 @@ +{{if and (.Values.autopilot) (not .Values.useEtcdOperator)}} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: cloud-conn-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cert-provisioner-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: query-broker-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cert-provisioner-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - secrets + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-ns-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - services + - events + - pods/log + verbs: + - get + - watch + - list +- apiGroups: + - batch + resources: + - jobs + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - "" + resources: + - secrets + - pods + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - px.dev + resources: + - viziers + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create +- apiGroups: + - coordination.k8s.io + resourceNames: + - cloud-conn-election + resources: + - leases + verbs: + - get + - update +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - configmaps + - secrets + - pods + - services + - persistentvolumes + - persistentvolumeclaims + - serviceaccounts + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - "" + resources: + - events + - pods/log + verbs: + - get + - watch + - list +- apiGroups: + - apps + resources: + - deployments + - daemonsets + - statefulsets + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - batch + resources: + - cronjobs + - jobs + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - coordination.k8s.io + resourceNames: + - cloud-conn-election + - metadata-election + resources: + - leases + verbs: + - get + - update +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create +- apiGroups: + - px.dev + resources: + - viziers + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - px.dev + resources: + - viziers/status + verbs: + - get + - list + - watch +- apiGroups: + - rbac.authorization.k8s.io + resources: + - roles + - rolebindings + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-vizier-crd-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - px.dev + resources: + - viziers + - viziers/status + verbs: + - get + - list + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - endpoints + verbs: + - get + - list + - watch +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create +- apiGroups: + - coordination.k8s.io + resourceNames: + - metadata-election + resources: + - leases + verbs: + - get + - update +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + creationTimestamp: null + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-query-broker-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - list + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - nodes + verbs: + - get + - watch + - list +- apiGroups: + - "" + resourceNames: + - kube-system + resources: + - namespaces + verbs: + - get +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-node-view + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - nodes + verbs: + - get + - watch + - list +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-cluster-role + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - rbac.authorization.k8s.io + resources: + - clusterroles + - clusterrolebindings + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - "" + resourceNames: + - kube-system + resources: + - namespaces + verbs: + - get +- apiGroups: + - "" + resources: + - nodes + - pods + - services + - endpoints + - namespaces + verbs: + - get + - watch + - list +- apiGroups: + - apps + resources: + - replicasets + - deployments + verbs: + - get + - watch + - list +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +rules: +- apiGroups: + - "" + resources: + - pods + - services + - endpoints + - namespaces + verbs: + - watch + - get + - list +- apiGroups: + - apps + resources: + - replicasets + - deployments + verbs: + - watch + - get + - list +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cert-provisioner-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-cert-provisioner-role +subjects: +- kind: ServiceAccount + name: pl-cert-provisioner-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-cloud-connector-ns-role +subjects: +- kind: ServiceAccount + name: cloud-conn-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-updater-role +subjects: +- kind: ServiceAccount + name: pl-updater-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-crd-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-crd-role +subjects: +- kind: ServiceAccount + name: default + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-crd-metadata-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-crd-role +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-metadata-role +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-query-broker-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-query-broker-role +subjects: +- kind: ServiceAccount + name: query-broker-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-query-broker-crd-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: pl-vizier-crd-role +subjects: +- kind: ServiceAccount + name: query-broker-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-cloud-connector-role +subjects: +- kind: ServiceAccount + name: cloud-conn-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-node-view-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-node-view +subjects: +- kind: ServiceAccount + name: default + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-updater-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-updater-cluster-role +subjects: +- kind: ServiceAccount + name: pl-updater-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-vizier-metadata +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-vizier-metadata-node-view-cluster-binding + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: pl-node-view +subjects: +- kind: ServiceAccount + name: metadata-service-account + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +data: + PL_CLIENT_TLS_CERT: /certs/client.crt + PL_CLIENT_TLS_KEY: /certs/client.key + PL_SERVER_TLS_CERT: /certs/server.crt + PL_SERVER_TLS_KEY: /certs/server.key + PL_TLS_CA_CERT: /certs/ca.crt +kind: ConfigMap +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: pl-cloud-connector-tls-config + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +data: + PL_CLIENT_TLS_CERT: /certs/client.crt + PL_CLIENT_TLS_KEY: /certs/client.key + PL_SERVER_TLS_CERT: /certs/server.crt + PL_SERVER_TLS_KEY: /certs/server.key + PL_TLS_CA_CERT: /certs/ca.crt +kind: ConfigMap +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: pl-tls-config + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: kelvin-service + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + clusterIP: None + ports: + - name: tcp-http2 + port: 59300 + protocol: TCP + targetPort: 59300 + selector: + app: pl-monitoring + component: vizier + name: kelvin + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: vizier-cloud-connector-svc + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + ports: + - name: tcp-http2 + port: 50800 + protocol: TCP + targetPort: 50800 + selector: + app: pl-monitoring + component: vizier + name: vizier-cloud-connector + vizier-bootstrap: "true" + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-metadata-svc + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + ports: + - name: tcp-http2 + port: 50400 + protocol: TCP + targetPort: 50400 + selector: + app: pl-monitoring + component: vizier + name: vizier-metadata + type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-query-broker-svc + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + ports: + - name: tcp-http2 + port: 50300 + protocol: TCP + targetPort: 50300 + - name: tcp-grpc-web + port: 50305 + protocol: TCP + targetPort: 50305 + selector: + app: pl-monitoring + component: vizier + name: vizier-query-broker + type: ClusterIP +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: metadata-pv-claim + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 16Gi +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: kelvin + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: kelvin + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: kelvin + plane: data + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: PL_CLUSTER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + - name: PL_SENTRY_DSN + valueFrom: + secretKeyRef: + key: sentry-dsn + name: pl-cluster-secrets + optional: true + - name: PL_HOST_PATH + value: /host + - name: PL_POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: PL_HOST_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_VIZIER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + optional: true + - name: PL_VIZIER_NAME + valueFrom: + secretKeyRef: + key: cluster-name + name: pl-cluster-secrets + optional: true + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: TCMALLOC_SAMPLE_PARAMETER + value: "1048576" + envFrom: + - configMapRef: + name: pl-tls-config + image: '{{ .Values.imageRegistry }}/vizier-kelvin_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + name: app + ports: + - containerPort: 59300 + resources: {} + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /certs + name: certs + - mountPath: /sys + name: sys + readOnly: true + initContainers: + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/readyz"; until [ $(curl + -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do echo "waiting + for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-cloud-connector-svc + - name: SERVICE_PORT + value: "50800" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: cc-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/healthz"; until [ + $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do + echo "waiting for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-query-broker-svc + - name: SERVICE_PORT + value: "50300" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: qb-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + terminationGracePeriodSeconds: 30 + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs + - hostPath: + path: /sys + type: Directory + name: sys +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: vizier-cloud-connector + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + replicas: 1 + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-cloud-connector + vizier-bootstrap: "true" + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-cloud-connector + plane: control + vizier-bootstrap: "true" + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_CLUSTER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + optional: true + - name: PL_VIZIER_NAME + valueFrom: + secretKeyRef: + key: cluster-name + name: pl-cluster-secrets + optional: true + - name: PL_DEPLOY_KEY + valueFrom: + secretKeyRef: + key: deploy-key + name: {{ if .Values.customDeployKeySecret }}"{{ .Values.customDeployKeySecret }}"{{else}}"pl-deploy-secrets"{{end}} + optional: true + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_MAX_EXPECTED_CLOCK_SKEW + value: "2000" + - name: PL_RENEW_PERIOD + value: {{ if .Values.electionPeriodMs }}"{{ .Values.electionPeriodMs }}"{{else}}"7500"{{end}} + envFrom: + - configMapRef: + name: pl-cloud-config + - configMapRef: + name: pl-cloud-connector-tls-config + - configMapRef: + name: pl-cluster-config + optional: true + image: '{{ .Values.imageRegistry }}/vizier-cloud_connector_server_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 50800 + scheme: HTTPS + name: app + ports: + - containerPort: 50800 + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /certs + name: certs + initContainers: + - command: + - sh + - -c + - set -xe; URL="${PROTOCOL}://${SERVICE_NAME}:${SERVICE_PORT}${HEALTH_PATH}"; + until [ $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 + ]; do echo "waiting for ${URL}"; sleep 2; done; + env: + - name: SERVICE_NAME + value: pl-nats-mgmt + - name: SERVICE_PORT + value: "8222" + - name: HEALTH_PATH + value: "" + - name: PROTOCOL + value: http + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: nats-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + serviceAccountName: cloud-conn-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-query-broker + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + replicas: 1 + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-query-broker + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + px.dev/metrics_port: "50300" + px.dev/metrics_scrape: "true" + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-query-broker + plane: control + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: PL_CLUSTER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + - name: PL_SENTRY_DSN + valueFrom: + secretKeyRef: + key: sentry-dsn + name: pl-cluster-secrets + optional: true + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_POD_IP_ADDRESS + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_CLOUD_ADDR + valueFrom: + configMapKeyRef: + key: PL_CLOUD_ADDR + name: pl-cloud-config + - name: PL_DATA_ACCESS + value: {{ if .Values.dataAccess }}"{{ .Values.dataAccess }}"{{else}}"Full"{{end}} + envFrom: + - configMapRef: + name: pl-tls-config + image: '{{ .Values.imageRegistry }}/vizier-query_broker_server_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 50300 + scheme: HTTPS + name: app + ports: + - containerPort: 50300 + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /certs + name: certs + initContainers: + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/readyz"; until [ $(curl + -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do echo "waiting + for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-cloud-connector-svc + - name: SERVICE_PORT + value: "50800" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: cc-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/healthz"; until [ + $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do + echo "waiting for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-metadata-svc + - name: SERVICE_PORT + value: "50400" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: mds-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + serviceAccountName: query-broker-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs + - configMap: + name: proxy-envoy-config + name: envoy-yaml +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-metadata + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + replicas: 1 + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-metadata + serviceName: vizier-metadata + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + px.dev/metrics_port: "50400" + px.dev/metrics_scrape: "true" + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-metadata + plane: control + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - env: + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_MAX_EXPECTED_CLOCK_SKEW + value: "2000" + - name: PL_RENEW_PERIOD + value: {{ if .Values.electionPeriodMs }}"{{ .Values.electionPeriodMs }}"{{else}}"7500"{{end}} + - name: PL_ETCD_OPERATOR_ENABLED + value: "false" + envFrom: + - configMapRef: + name: pl-tls-config + image: '{{ .Values.imageRegistry }}/vizier-metadata_server_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 50400 + scheme: HTTPS + initialDelaySeconds: 120 + periodSeconds: 10 + name: app + readinessProbe: + failureThreshold: 5 + httpGet: + path: /healthz + port: 50400 + scheme: HTTPS + initialDelaySeconds: 30 + periodSeconds: 10 + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /certs + name: certs + - mountPath: /metadata + name: metadata-volume + initContainers: + - command: + - sh + - -c + - set -xe; URL="${PROTOCOL}://${SERVICE_NAME}:${SERVICE_PORT}${HEALTH_PATH}"; + until [ $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 + ]; do echo "waiting for ${URL}"; sleep 2; done; + env: + - name: SERVICE_NAME + value: pl-nats-mgmt + - name: SERVICE_PORT + value: "8222" + - name: HEALTH_PATH + value: "" + - name: PROTOCOL + value: http + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: nats-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + serviceAccountName: metadata-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + volumes: + - name: certs + secret: + secretName: service-tls-certs + - name: metadata-volume + persistentVolumeClaim: + claimName: metadata-pv-claim + updateStrategy: + type: RollingUpdate +--- +apiVersion: apps/v1 +kind: DaemonSet +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-pem + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + selector: + matchLabels: + app: pl-monitoring + component: vizier + name: vizier-pem + template: + metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + name: vizier-pem + plane: data + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/os + operator: Exists + - key: kubernetes.io/os + operator: In + values: + - linux + - matchExpressions: + - key: beta.kubernetes.io/os + operator: Exists + - key: beta.kubernetes.io/os + operator: In + values: + - linux + containers: + - args: [] + env: + - name: PL_PEM_ENV_VAR_PLACEHOLDER + value: "true" # This is un-used, and is just a placeholder used to templatize our YAMLs for Helm. + {{- range $key, $value := .Values.customPEMFlags}} + - name: {{$key}} + value: "{{$value}}" + {{- end}} + {{- if .Values.datastreamBufferSpikeSize }} + - name: PL_DATASTREAM_BUFFER_SPIKE_SIZE + value: "{{ .Values.datastreamBufferSpikeSize }}" + {{- end}} + {{- if .Values.datastreamBufferSize }} + - name: PL_DATASTREAM_BUFFER_SIZE + value: "{{ .Values.datastreamBufferSize }}" + {{- end}} + - name: TCMALLOC_SAMPLE_PARAMETER + value: "1048576" + - name: PL_CLIENT_TLS_CERT + value: /certs/client.crt + - name: PL_CLIENT_TLS_KEY + value: /certs/client.key + - name: PL_TLS_CA_CERT + value: /certs/ca.crt + - name: PL_DISABLE_SSL + value: "false" + - name: PL_HOST_PATH + value: /host + - name: PL_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: PL_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: PL_HOST_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP + - name: PL_JWT_SIGNING_KEY + valueFrom: + secretKeyRef: + key: jwt-signing-key + name: pl-cluster-secrets + - name: PL_VIZIER_ID + valueFrom: + secretKeyRef: + key: cluster-id + name: pl-cluster-secrets + optional: true + - name: PL_VIZIER_NAME + valueFrom: + secretKeyRef: + key: cluster-name + name: pl-cluster-secrets + optional: true + - name: PL_CLOCK_CONVERTER + value: {{ if .Values.clockConverter }}"{{ .Values.clockConverter }}"{{else}}"default"{{end}} + image: '{{ .Values.imageRegistry }}/vizier-pem_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + name: pem + resources: + limits: + memory: {{ if .Values.pemMemoryLimit }}"{{ .Values.pemMemoryLimit }}"{{else}}"2Gi"{{end}} + requests: + memory: {{ if .Values.pemMemoryRequest }}"{{ .Values.pemMemoryRequest }}"{{else}}"2Gi"{{end}} + securityContext: + capabilities: + add: + - SYS_PTRACE + - SYS_ADMIN + privileged: true + seccompProfile: + type: RuntimeDefault + volumeMounts: + - mountPath: /host/lib + name: host-lib + readOnly: true + - mountPath: /host/var + name: host-var + readOnly: true + - mountPath: /host/boot + name: host-boot + readOnly: true + - mountPath: /host/etc + name: host-etc + readOnly: true + - mountPath: /sys + name: sys + readOnly: true + - mountPath: /certs + name: certs + dnsPolicy: ClusterFirstWithHostNet + hostNetwork: true + hostPID: true + initContainers: + - command: + - sh + - -c + - 'set -x; URL="https://${SERVICE_NAME}:${SERVICE_PORT}/healthz"; until [ + $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do + echo "waiting for ${URL}"; sleep 2; done; ' + env: + - name: SERVICE_NAME + value: vizier-query-broker-svc + - name: SERVICE_PORT + value: "50300" + image: '{{ if .Values.registry }}{{ .Values.registry }}/ghcr.io-pixie-io-pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{else}}ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd{{end}}' + name: qb-wait + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + securityContext: + seccompProfile: + type: RuntimeDefault + terminationGracePeriodSeconds: 10 + tolerations: + - effect: NoSchedule + key: node-role.kubernetes.io/master + - effect: NoExecute + operator: Exists + - effect: NoSchedule + operator: Exists + volumes: + - hostPath: + path: /lib + type: Directory + name: host-lib + - hostPath: + path: /var + type: Directory + name: host-var + - hostPath: + path: /boot + type: Directory + name: host-boot + - hostPath: + path: /etc + type: Directory + name: host-etc + - hostPath: + path: /sys + type: Directory + name: sys + - name: certs + secret: + secretName: service-tls-certs + updateStrategy: + rollingUpdate: + maxUnavailable: 20 + type: RollingUpdate +--- +apiVersion: batch/v1 +kind: Job +metadata: + annotations: + {{if .Values.customAnnotations}}{{range $element := split "," .Values.customAnnotations -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + labels: + {{if .Values.customLabels}}{{range $element := split "," .Values.customLabels -}} + {{ $kv := split "=" $element -}} + {{if eq (len $kv) 2 -}} + {{ $kv._0 }}: "{{ $kv._1 }}" + {{- end}} + {{end}}{{end}} + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: cert-provisioner-job + namespace: {{ if .Release.Namespace }}{{ .Release.Namespace }}{{ else }}pl{{ end }} +spec: + backoffLimit: 1 + completions: 1 + parallelism: 1 + template: + metadata: + labels: + app: pl-monitoring + component: vizier + vizier-bootstrap: "true" + name: cert-provisioner-job + spec: + containers: + - env: + - name: PL_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + envFrom: + - configMapRef: + name: pl-cloud-config + - configMapRef: + name: pl-cluster-config + optional: true + image: '{{ .Values.imageRegistry }}/vizier-cert_provisioner_image:{{ .Values.imageTag }}' + imagePullPolicy: Always + name: provisioner + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault + restartPolicy: Never + securityContext: + fsGroup: 10100 + runAsGroup: 10100 + runAsNonRoot: true + runAsUser: 10100 + seccompProfile: + type: RuntimeDefault + serviceAccountName: pl-cert-provisioner-service-account + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: amd64 + - effect: NoSchedule + key: kubernetes.io/arch + operator: Equal + value: arm64 + - effect: NoExecute + key: kubernetes.io/arch + operator: Equal + value: arm64 + +{{- end}} \ No newline at end of file diff --git a/vizier-chart/values.yaml b/vizier-chart/values.yaml new file mode 100644 index 00000000000..e2eee6365bb --- /dev/null +++ b/vizier-chart/values.yaml @@ -0,0 +1,7 @@ +deployKey: $PIXIE_DEPLOY_KEY +clusterName: honeypixie +cloudAddr: getcosmic.ai +devCloudNamespace: plc +namespace: pl +imageTag: 2025-05-09_14-20-42.033_UTC +imageRegistry: mbgurcay