diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000000..de993fc708e --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,28 @@ +version: 2 +updates: + - package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "weekly" + day: "wednesday" + time: "16:00" + rebase-strategy: "disabled" + groups: + minor-and-patch: + update-types: + - "patch" + - "minor" + + - package-ecosystem: "github-actions" + # Workflow files stored in the default location of `.github/workflows`. (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.) + directory: "/" + schedule: + interval: "weekly" + day: wednesday + time: "16:00" + groups: + actions: + update-types: + - "patch" + - "minor" + - "major" diff --git a/.github/labeler.yml b/.github/labeler.yml index f8558dcf47e..cd3b29fce2a 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,49 +1,82 @@ area/graphql: - - graphql/**/* +- changed-files: + - any-glob-to-any-file: graphql/** + area/documentation: - - "**/*.md" - - "**/*.pdf" - - "**/*.tex" +- changed-files: + - any-glob-to-any-file: + - '**/*.md' + - '**/*.pdf' + - '**/*.tex' + area/bulk-loader: - - dgraph/cmd/bulk/**/* +- changed-files: + - any-glob-to-any-file: dgraph/cmd/bulk/** + area/live-loader: - - dgraph/cmd/live/**/* +- changed-files: + - any-glob-to-any-file: dgraph/cmd/live/** + area/querylang: - - dql/**/* +- changed-files: + - any-glob-to-any-file: dql/** + area/integrations: - - contrib/**/* - - .github/**/* - - .travis/**/* +- changed-files: + - any-glob-to-any-file: + - contrib/** + - .github/** + - .travis/** + area/testing/jepsen: - - contrib/jepsen/**/* +- changed-files: + - any-glob-to-any-file: contrib/jepsen/** + area/enterprise: - - ee/**/* +- changed-files: + - any-glob-to-any-file: ee/** + area/enterprise/backup: - - ee/backup/**/* +- changed-files: + - any-glob-to-any-file: ee/backup/** + area/enterprise/acl: - - ee/acl/**/* +- changed-files: + - any-glob-to-any-file: ee/acl/** + area/schema: - - schema/**/* +- changed-files: + - any-glob-to-any-file: schema/** + area/testing: - - systest/**/* - - "**/*test.go" - - graphql/e2e/**/* - - "**/*test.yaml" - - t/**/* - - testutil/**/* - - tlstest/**/* +- changed-files: + - any-glob-to-any-file: + - systest/** + - '**/*test.go' + - graphql/e2e/** + - '**/*test.yaml' + - t/** + - testutil/** + - tlstest/** + area/core: - - protos/**/* - - posting/**/* - - raftwal/**/* - - query/**/* - - schema/**/* - - protos/**/* - - x/**/* - - xidmap/**/* - - worker/**/* - - graphql/**/* +- changed-files: + - any-glob-to-any-file: + - protos/** + - posting/** + - raftwal/** + - query/** + - schema/** + - protos/** + - x/** + - xidmap/** + - worker/** + - graphql/** + go: - - "**/*.go" +- changed-files: + - any-glob-to-any-file: '**/*.go' + python: - - "**/*.py" +- changed-files: + - any-glob-to-any-file: '**/*.py' diff --git a/.github/workflows/cd-dgraph.yml b/.github/workflows/cd-dgraph.yml index 898dbcafcbd..ca12f96665f 100644 --- a/.github/workflows/cd-dgraph.yml +++ b/.github/workflows/cd-dgraph.yml @@ -31,7 +31,7 @@ jobs: with: go-version: ${{ env.GOVERSION }} - name: Install protobuf-compiler - run: sudo apt-get install -y protobuf-compiler + run: sudo apt update && sudo apt install -y protobuf-compiler - name: Check protobuf run: | cd ./protos @@ -72,7 +72,7 @@ jobs: - name: Tar Archive for Dgraph Linux Build run: cd dgraph && tar -zcvf dgraph-linux-amd64.tar.gz dgraph - name: Upload Build Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: | badger/badger-checksum-linux-amd64.sha256 @@ -97,7 +97,7 @@ jobs: make docker-image-standalone DGRAPH_VERSION=${{ env.DGRAPH_RELEASE_VERSION }}-amd64 [[ "${{ inputs.latest }}" = true ]] && docker tag dgraph/standalone:${{ env.DGRAPH_RELEASE_VERSION }}-amd64 dgraph/standalone:latest-amd64 || true - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD_TOKEN }} @@ -126,7 +126,7 @@ jobs: with: go-version: ${{ env.GOVERSION }} - name: Install protobuf-compiler - run: sudo apt-get install -y protobuf-compiler + run: sudo apt update && sudo apt install -y protobuf-compiler - name: Check protobuf run: | cd ./protos @@ -167,7 +167,7 @@ jobs: - name: Tar Archive for Dgraph Linux Build run: cd dgraph && tar -zcvf dgraph-linux-arm64.tar.gz dgraph - name: Upload Build Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: | badger/badger-checksum-linux-arm64.sha256 @@ -192,7 +192,7 @@ jobs: make docker-image-standalone DGRAPH_VERSION=${{ env.DGRAPH_RELEASE_VERSION }}-arm64 [[ "${{ inputs.latest }}" = true ]] && docker tag dgraph/standalone:${{ env.DGRAPH_RELEASE_VERSION }}-arm64 dgraph/standalone:latest-arm64 || true - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD_TOKEN }} @@ -227,7 +227,7 @@ jobs: echo "making a new release for dgraph "$DGRAPH_RELEASE_VERSION echo "DGRAPH_RELEASE_VERSION=$DGRAPH_RELEASE_VERSION" >> $GITHUB_ENV - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD_TOKEN }} diff --git a/.github/workflows/ci-aqua-security-trivy-tests.yml b/.github/workflows/ci-aqua-security-trivy-tests.yml index 1d149fa3068..5aee2227c7f 100644 --- a/.github/workflows/ci-aqua-security-trivy-tests.yml +++ b/.github/workflows/ci-aqua-security-trivy-tests.yml @@ -29,6 +29,10 @@ on: - 'release/**' schedule: - cron: "0 0 * * *" + +permissions: + security-events: write + jobs: build: name: trivy-tests diff --git a/.github/workflows/ci-dgraph-code-coverage.yml b/.github/workflows/ci-dgraph-code-coverage.yml index 951b16a02b0..f9795b65eaf 100644 --- a/.github/workflows/ci-dgraph-code-coverage.yml +++ b/.github/workflows/ci-dgraph-code-coverage.yml @@ -36,18 +36,6 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GOVERSION }} - - name: Set up Node - uses: actions/setup-node@v3 - with: - node-version: 16 - - name: Install protobuf-compiler - run: sudo apt-get install -y protobuf-compiler - - name: Check protobuf - run: | - cd ./protos - go mod tidy - make regenerate - git diff --exit-code -- . - name: Make Linux Build and Docker Image with coverage enabled run: make coverage-docker-image - name: Build Test Binary diff --git a/.github/workflows/ci-dgraph-ldbc-tests.yml b/.github/workflows/ci-dgraph-ldbc-tests.yml index f3c47bd34a3..fda1a17a80b 100644 --- a/.github/workflows/ci-dgraph-ldbc-tests.yml +++ b/.github/workflows/ci-dgraph-ldbc-tests.yml @@ -43,18 +43,6 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GOVERSION }} - - name: Set up Node - uses: actions/setup-node@v4 - with: - node-version: 16 - - name: Install protobuf-compiler - run: sudo apt-get install -y protobuf-compiler - - name: Check protobuf - run: | - cd ./protos - go mod tidy - make regenerate - git diff --exit-code -- . - name: Make Linux Build and Docker Image run: make docker-image - name: Build Test Binary diff --git a/.github/workflows/ci-dgraph-load-tests.yml b/.github/workflows/ci-dgraph-load-tests.yml index b0df2228afb..7eda3385a64 100644 --- a/.github/workflows/ci-dgraph-load-tests.yml +++ b/.github/workflows/ci-dgraph-load-tests.yml @@ -42,18 +42,6 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GOVERSION }} - - name: Set up Node - uses: actions/setup-node@v4 - with: - node-version: 16 - - name: Install protobuf-compiler - run: sudo apt-get install -y protobuf-compiler - - name: Check protobuf - run: | - cd ./protos - go mod tidy - make regenerate - git diff --exit-code -- . - name: Make Linux Build and Docker Image run: make docker-image # this internally builds dgraph binary - name: Build Test Binary diff --git a/.github/workflows/ci-dgraph-tests-arm64.yml b/.github/workflows/ci-dgraph-tests-arm64.yml index 153d25aaf44..0a36bb09514 100644 --- a/.github/workflows/ci-dgraph-tests-arm64.yml +++ b/.github/workflows/ci-dgraph-tests-arm64.yml @@ -42,12 +42,8 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GOVERSION }} - - name: Set up Node - uses: actions/setup-node@v4 - with: - node-version: 16 - name: Install protobuf-compiler - run: sudo apt-get install -y protobuf-compiler + run: sudo apt update && sudo apt install -y protobuf-compiler - name: Check protobuf run: | cd ./protos diff --git a/.github/workflows/ci-dgraph-tests.yml b/.github/workflows/ci-dgraph-tests.yml index e580235cf2c..d171fa2a471 100644 --- a/.github/workflows/ci-dgraph-tests.yml +++ b/.github/workflows/ci-dgraph-tests.yml @@ -42,12 +42,8 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GOVERSION }} - - name: Set up Node - uses: actions/setup-node@v4 - with: - node-version: 16 - name: Install protobuf-compiler - run: sudo apt-get install -y protobuf-compiler + run: sudo apt update && sudo apt install -y protobuf-compiler - name: Check protobuf run: | cd ./protos diff --git a/.github/workflows/ci-dgraph-upgrade-tests.yml b/.github/workflows/ci-dgraph-upgrade-tests.yml index c8056853904..7b6612dfc9a 100644 --- a/.github/workflows/ci-dgraph-upgrade-tests.yml +++ b/.github/workflows/ci-dgraph-upgrade-tests.yml @@ -9,8 +9,6 @@ on: branches: - main - 'release/**' - schedule: - - cron: "00 20 * * *" # 1 run per day jobs: dgraph-upgrade-tests: if: github.event.pull_request.draft == false diff --git a/.github/workflows/ci-golang-lint.yml b/.github/workflows/ci-golang-lint.yml index 664cee4c121..d0e9368f14f 100644 --- a/.github/workflows/ci-golang-lint.yml +++ b/.github/workflows/ci-golang-lint.yml @@ -44,7 +44,7 @@ jobs: with: go-version: ${{ env.GOVERSION }} - name: golang-lint - uses: golangci/golangci-lint-action@v4 + uses: golangci/golangci-lint-action@v6 with: # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. version: latest diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index c406f84750c..566d8acfa8d 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -1,10 +1,14 @@ name: labeler on: - pull_request_target: + pull_request: + types: + - opened + - reopened + - synchronize + - ready_for_review branches: - main - - "release/v**" - types: [opened] + - 'release/**' jobs: label: permissions: @@ -12,6 +16,5 @@ jobs: pull-requests: write runs-on: ubuntu-latest steps: - - uses: actions/labeler@v4 - with: - repo-token: "${{ secrets.GH_TOKEN }}" + - uses: actions/checkout@v4 + - uses: actions/labeler@v5 diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 352f6023cce..8be177dd3c3 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -1,7 +1,7 @@ name: 'Close stale issues and PRs' on: schedule: - - cron: '00 02,14 * * *' + - cron: '00 02 * * *' permissions: issues: write @@ -13,6 +13,7 @@ jobs: steps: - uses: actions/stale@v9 with: + days-before-issue-stale: 180 stale-issue-message: 'This issue has been stale for 60 days and will be closed automatically in 7 days. Comment to keep it open.' stale-pr-message: 'This PR has been stale for 60 days and will be closed automatically in 7 days. Comment to keep it open.' operations-per-run: 250 diff --git a/Makefile b/Makefile index 968def51b0e..96c07e5e128 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ install: .PHONY: install_oss oss_install install_oss oss_install: - $(MAKE) BUILD_TAGS=oss install + $(MAKE) BUILD_TAGS=oss,jemalloc install .PHONY: uninstall uninstall: diff --git a/README.md b/README.md index ee1971ea44d..8db35e6fef7 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Dgraph supports [GraphQL query syntax](https://dgraph.io/docs/main/query-languag ## Status -Dgraph is at [version v23.1.0][rel] and is production-ready. Apart from the vast open source community, it is being used in +Dgraph is at [version v24.0.2][rel] and is production-ready. Apart from the vast open source community, it is being used in production at multiple Fortune 500 companies, and by [Intuit Katlas](https://github.com/intuit/katlas) and [VMware Purser](https://github.com/vmware/purser). A hosted version of Dgraph is available at [https://cloud.dgraph.io](https://cloud.dgraph.io). diff --git a/algo/heap.go b/algo/heap.go index 751e4ab828e..d020bef5a66 100644 --- a/algo/heap.go +++ b/algo/heap.go @@ -17,7 +17,7 @@ package algo import ( - "github.com/dgraph-io/dgraph/codec" + "github.com/dgraph-io/dgraph/v24/codec" ) type elem struct { diff --git a/algo/packed.go b/algo/packed.go index f025d733814..b105ef3aef0 100644 --- a/algo/packed.go +++ b/algo/packed.go @@ -20,8 +20,8 @@ import ( "container/heap" "sort" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) // ApplyFilterPacked applies the filter to a list of packed uids. diff --git a/algo/packed_test.go b/algo/packed_test.go index 444de2bbcee..2281a8893c5 100644 --- a/algo/packed_test.go +++ b/algo/packed_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) func newUidPack(data []uint64) *pb.UidPack { diff --git a/algo/uidlist.go b/algo/uidlist.go index cb37232f3bd..32277a9c752 100644 --- a/algo/uidlist.go +++ b/algo/uidlist.go @@ -20,8 +20,8 @@ import ( "container/heap" "sort" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) const jump = 32 // Jump size in InsersectWithJump. diff --git a/algo/uidlist_test.go b/algo/uidlist_test.go index 50fddb30b38..183d4e43fe0 100644 --- a/algo/uidlist_test.go +++ b/algo/uidlist_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) func newList(data []uint64) *pb.List { diff --git a/check_upgrade/check_upgrade.go b/check_upgrade/check_upgrade.go index 4c4ec02f52a..f975d8c1beb 100644 --- a/check_upgrade/check_upgrade.go +++ b/check_upgrade/check_upgrade.go @@ -30,8 +30,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/check_upgrade/check_upgrade_test.go b/check_upgrade/check_upgrade_test.go index 663fe529366..a1efcf654e8 100644 --- a/check_upgrade/check_upgrade_test.go +++ b/check_upgrade/check_upgrade_test.go @@ -27,10 +27,10 @@ import ( "testing" "time" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" ) diff --git a/chunker/chunk.go b/chunker/chunk.go index b2cf9e5db81..098ab1e12fb 100644 --- a/chunker/chunk.go +++ b/chunker/chunk.go @@ -30,9 +30,9 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/x" ) // Chunker describes the interface to parse and process the input to the live and bulk loaders. diff --git a/chunker/json_parser.go b/chunker/json_parser.go index 1d82f9a44bd..038d919feb3 100644 --- a/chunker/json_parser.go +++ b/chunker/json_parser.go @@ -30,11 +30,11 @@ import ( "github.com/twpayne/go-geom" "github.com/twpayne/go-geom/encoding/geojson" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/simdjson-go" ) diff --git a/chunker/json_parser_test.go b/chunker/json_parser_test.go index fe1a581b1ca..b928087561c 100644 --- a/chunker/json_parser_test.go +++ b/chunker/json_parser_test.go @@ -31,10 +31,10 @@ import ( "github.com/golang/glog" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" ) func makeNquad(sub, pred string, val *api.Value) *api.NQuad { diff --git a/chunker/rdf_parser.go b/chunker/rdf_parser.go index 197418089ca..961e8e5cf7d 100644 --- a/chunker/rdf_parser.go +++ b/chunker/rdf_parser.go @@ -24,12 +24,12 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/chunker/rdf_parser_test.go b/chunker/rdf_parser_test.go index 491aa90f100..9cf1073d413 100644 --- a/chunker/rdf_parser_test.go +++ b/chunker/rdf_parser_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" ) var testNQuads = []struct { diff --git a/chunker/rdf_state.go b/chunker/rdf_state.go index ba669f08fc8..5a2fdfe7d6a 100644 --- a/chunker/rdf_state.go +++ b/chunker/rdf_state.go @@ -19,7 +19,7 @@ package chunker import ( "strconv" - "github.com/dgraph-io/dgraph/lex" + "github.com/dgraph-io/dgraph/v24/lex" ) // The constants represent different types of lexed Items possible for an rdf N-Quad. diff --git a/codec/benchmark/benchmark.go b/codec/benchmark/benchmark.go index 5bddca78c86..39c15809ebe 100644 --- a/codec/benchmark/benchmark.go +++ b/codec/benchmark/benchmark.go @@ -33,9 +33,9 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) // So, with SIMD instructions before, we were getting great performance, but at the cost of diff --git a/codec/codec.go b/codec/codec.go index 60359f474fa..2a17eb83bb5 100644 --- a/codec/codec.go +++ b/codec/codec.go @@ -25,8 +25,8 @@ import ( "github.com/dgryski/go-groupvarint" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/codec/codec_test.go b/codec/codec_test.go index 31d0b483214..56903af2f99 100644 --- a/codec/codec_test.go +++ b/codec/codec_test.go @@ -29,8 +29,8 @@ import ( "github.com/dustin/go-humanize" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/compose/compose.go b/compose/compose.go index be0d900a085..54610f5536b 100644 --- a/compose/compose.go +++ b/compose/compose.go @@ -30,7 +30,7 @@ import ( "github.com/spf13/pflag" yaml "gopkg.in/yaml.v2" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type stringMap map[string]string diff --git a/conn/node.go b/conn/node.go index 2c205cccfe7..582cd16d0c1 100644 --- a/conn/node.go +++ b/conn/node.go @@ -35,10 +35,10 @@ import ( otrace "go.opencensus.io/trace" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/raftwal" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/conn/node_test.go b/conn/node_test.go index 7b7887f9071..f312a674e35 100644 --- a/conn/node_test.go +++ b/conn/node_test.go @@ -28,8 +28,8 @@ import ( "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/raftwal" ) func (n *Node) run(wg *sync.WaitGroup) { diff --git a/conn/pool.go b/conn/pool.go index e317c8adc6b..db866441d5c 100644 --- a/conn/pool.go +++ b/conn/pool.go @@ -30,9 +30,9 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/conn/raft_server.go b/conn/raft_server.go index ee8f2862406..55faf838afb 100644 --- a/conn/raft_server.go +++ b/conn/raft_server.go @@ -30,9 +30,9 @@ import ( "go.etcd.io/etcd/raft/v3/raftpb" otrace "go.opencensus.io/trace" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) type sendmsg struct { diff --git a/contrib/integration/acctupsert/main.go b/contrib/integration/acctupsert/main.go index 2a257573662..4943fd00efc 100644 --- a/contrib/integration/acctupsert/main.go +++ b/contrib/integration/acctupsert/main.go @@ -29,10 +29,10 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/contrib/integration/bank/main.go b/contrib/integration/bank/main.go index 4a180590048..bae7b6a6812 100644 --- a/contrib/integration/bank/main.go +++ b/contrib/integration/bank/main.go @@ -39,9 +39,9 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/contrib/integration/bigdata/main.go b/contrib/integration/bigdata/main.go index 721a49b57b3..387095aa572 100644 --- a/contrib/integration/bigdata/main.go +++ b/contrib/integration/bigdata/main.go @@ -31,9 +31,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/x" ) var addrs = flag.String("addrs", "", "comma separated dgraph addresses") diff --git a/contrib/integration/mutates/main.go b/contrib/integration/mutates/main.go index abbf2ca351a..8d67447e732 100644 --- a/contrib/integration/mutates/main.go +++ b/contrib/integration/mutates/main.go @@ -26,9 +26,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/x" ) var alpha = flag.String("alpha", "localhost:9080", "Dgraph alpha addr") diff --git a/contrib/integration/swap/main.go b/contrib/integration/swap/main.go index 28db51a5815..39ba1f22e45 100644 --- a/contrib/integration/swap/main.go +++ b/contrib/integration/swap/main.go @@ -30,10 +30,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/contrib/integration/testtxn/main_test.go b/contrib/integration/testtxn/main_test.go index 3e88c76f48e..4f6cfba29da 100644 --- a/contrib/integration/testtxn/main_test.go +++ b/contrib/integration/testtxn/main_test.go @@ -33,10 +33,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type state struct { diff --git a/contrib/jepsen/main.go b/contrib/jepsen/main.go index 327ba35cc99..1f1216b34e9 100644 --- a/contrib/jepsen/main.go +++ b/contrib/jepsen/main.go @@ -45,7 +45,7 @@ import ( "github.com/spf13/pflag" - "github.com/dgraph-io/dgraph/contrib/jepsen/browser" + "github.com/dgraph-io/dgraph/v24/contrib/jepsen/browser" ) type jepsenTest struct { diff --git a/dgraph/Makefile b/dgraph/Makefile index f7886f8eeb1..aed940881a5 100644 --- a/dgraph/Makefile +++ b/dgraph/Makefile @@ -64,7 +64,7 @@ endif # jemalloc stuff HAS_JEMALLOC = $(shell test -f /usr/local/lib/libjemalloc.a && echo "jemalloc") -JEMALLOC_URL = "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2" +JEMALLOC_URL = "https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2" # go install variables HAS_SHA256SUM = $(shell which sha256sum) @@ -107,7 +107,7 @@ jemalloc: echo "Downloading jemalloc" ; \ curl -f -s -L ${JEMALLOC_URL} -o jemalloc.tar.bz2 ; \ tar xjf ./jemalloc.tar.bz2 ; \ - cd jemalloc-5.2.1 ; \ + cd jemalloc-5.3.0 ; \ ./configure --with-jemalloc-prefix='je_' --with-malloc-conf='background_thread:true,metadata_thp:auto'; \ make ; \ if [ "$(USER_ID)" = "0" ]; then \ @@ -117,4 +117,3 @@ jemalloc: sudo make install ; \ fi \ fi - diff --git a/dgraph/cmd/alpha/admin.go b/dgraph/cmd/alpha/admin.go index 1c66a0410ca..3c42622f653 100644 --- a/dgraph/cmd/alpha/admin.go +++ b/dgraph/cmd/alpha/admin.go @@ -24,10 +24,10 @@ import ( "strconv" "strings" - "github.com/dgraph-io/dgraph/graphql/admin" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/admin" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) type allowedMethods map[string]bool diff --git a/dgraph/cmd/alpha/dashboard.go b/dgraph/cmd/alpha/dashboard.go index c2b4797dcf8..db26957def7 100644 --- a/dgraph/cmd/alpha/dashboard.go +++ b/dgraph/cmd/alpha/dashboard.go @@ -20,7 +20,7 @@ import ( "encoding/json" "net/http" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type keyword struct { diff --git a/dgraph/cmd/alpha/http.go b/dgraph/cmd/alpha/http.go index 8ebde0f59b0..2b51282c727 100644 --- a/dgraph/cmd/alpha/http.go +++ b/dgraph/cmd/alpha/http.go @@ -36,13 +36,13 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc/metadata" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/admin" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/admin" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/x" ) func allowed(method string) bool { diff --git a/dgraph/cmd/alpha/http_test.go b/dgraph/cmd/alpha/http_test.go index ea01f7c75fd..3173eea4374 100644 --- a/dgraph/cmd/alpha/http_test.go +++ b/dgraph/cmd/alpha/http_test.go @@ -35,10 +35,10 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type res struct { diff --git a/dgraph/cmd/alpha/login_ee.go b/dgraph/cmd/alpha/login_ee.go index 09130892f7d..8122714fe82 100644 --- a/dgraph/cmd/alpha/login_ee.go +++ b/dgraph/cmd/alpha/login_ee.go @@ -20,9 +20,9 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/x" ) func loginHandler(w http.ResponseWriter, r *http.Request) { diff --git a/dgraph/cmd/alpha/mutations_mode/mutations_mode_test.go b/dgraph/cmd/alpha/mutations_mode/mutations_mode_test.go index b665148d1b1..4fa1eff95a6 100644 --- a/dgraph/cmd/alpha/mutations_mode/mutations_mode_test.go +++ b/dgraph/cmd/alpha/mutations_mode/mutations_mode_test.go @@ -27,9 +27,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" ) // Tests in this file require a cluster running with the --limit "mutations=;" flag. diff --git a/dgraph/cmd/alpha/run.go b/dgraph/cmd/alpha/run.go index 857843ff45a..ec0d8d672d6 100644 --- a/dgraph/cmd/alpha/run.go +++ b/dgraph/cmd/alpha/run.go @@ -49,17 +49,17 @@ import ( hapi "google.golang.org/grpc/health/grpc_health_v1" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/ee/audit" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/graphql/admin" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/ee/audit" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/graphql/admin" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" _ "github.com/dgraph-io/gqlparser/v2/validator/rules" // make gql validator init() all rules "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/alpha/run_test.go b/dgraph/cmd/alpha/run_test.go index 957d45e58fe..87188b62842 100644 --- a/dgraph/cmd/alpha/run_test.go +++ b/dgraph/cmd/alpha/run_test.go @@ -44,14 +44,14 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/encoding/gzip" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type defaultContextKey int diff --git a/dgraph/cmd/alpha/upsert_test.go b/dgraph/cmd/alpha/upsert_test.go index bac99ba9cd7..f6b75035eb1 100644 --- a/dgraph/cmd/alpha/upsert_test.go +++ b/dgraph/cmd/alpha/upsert_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type QueryResult struct { diff --git a/dgraph/cmd/bulk/count_index.go b/dgraph/cmd/bulk/count_index.go index d307b1a906d..9f76e58f7d1 100644 --- a/dgraph/cmd/bulk/count_index.go +++ b/dgraph/cmd/bulk/count_index.go @@ -26,10 +26,10 @@ import ( "github.com/golang/glog" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/bulk/loader.go b/dgraph/cmd/bulk/loader.go index e102dc7e411..04ca30d5511 100644 --- a/dgraph/cmd/bulk/loader.go +++ b/dgraph/cmd/bulk/loader.go @@ -39,14 +39,14 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/filestore" - gqlSchema "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" - "github.com/dgraph-io/dgraph/xidmap" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/filestore" + gqlSchema "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/x" + "github.com/dgraph-io/dgraph/v24/xidmap" ) type options struct { diff --git a/dgraph/cmd/bulk/mapper.go b/dgraph/cmd/bulk/mapper.go index ada9fb467ac..563a256128a 100644 --- a/dgraph/cmd/bulk/mapper.go +++ b/dgraph/cmd/bulk/mapper.go @@ -33,16 +33,16 @@ import ( "github.com/golang/glog" "github.com/golang/snappy" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/ee/acl" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/ee/acl" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/bulk/merge_shards.go b/dgraph/cmd/bulk/merge_shards.go index 594481c2b72..b4628db1437 100644 --- a/dgraph/cmd/bulk/merge_shards.go +++ b/dgraph/cmd/bulk/merge_shards.go @@ -23,7 +23,7 @@ import ( "sort" "strings" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/dgraph/cmd/bulk/progress.go b/dgraph/cmd/bulk/progress.go index aa7d4c3a964..fa2d49b177b 100644 --- a/dgraph/cmd/bulk/progress.go +++ b/dgraph/cmd/bulk/progress.go @@ -23,7 +23,7 @@ import ( "github.com/dustin/go-humanize" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/bulk/reduce.go b/dgraph/cmd/bulk/reduce.go index 3a99718e703..6495c163d2f 100644 --- a/dgraph/cmd/bulk/reduce.go +++ b/dgraph/cmd/bulk/reduce.go @@ -41,10 +41,10 @@ import ( bo "github.com/dgraph-io/badger/v4/options" bpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/bulk/run.go b/dgraph/cmd/bulk/run.go index 773329b0678..00066ea5ec3 100644 --- a/dgraph/cmd/bulk/run.go +++ b/dgraph/cmd/bulk/run.go @@ -32,12 +32,12 @@ import ( "github.com/spf13/cobra" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/filestore" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/filestore" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/bulk/schema.go b/dgraph/cmd/bulk/schema.go index 58513afb2ba..b4b2949dd80 100644 --- a/dgraph/cmd/bulk/schema.go +++ b/dgraph/cmd/bulk/schema.go @@ -23,11 +23,11 @@ import ( "sync" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - wk "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + wk "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) type schemaStore struct { diff --git a/dgraph/cmd/bulk/shard_map.go b/dgraph/cmd/bulk/shard_map.go index 8f82988d274..24d3538a53d 100644 --- a/dgraph/cmd/bulk/shard_map.go +++ b/dgraph/cmd/bulk/shard_map.go @@ -19,7 +19,7 @@ package bulk import ( "sync" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type shardMap struct { diff --git a/dgraph/cmd/cert/info.go b/dgraph/cmd/cert/info.go index 8b338c9824e..4a168b7048e 100644 --- a/dgraph/cmd/cert/info.go +++ b/dgraph/cmd/cert/info.go @@ -31,7 +31,7 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type certInfo struct { diff --git a/dgraph/cmd/cert/run.go b/dgraph/cmd/cert/run.go index 31e948674ef..d0080956789 100644 --- a/dgraph/cmd/cert/run.go +++ b/dgraph/cmd/cert/run.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // Cert is the sub-command invoked when running "dgraph cert". diff --git a/dgraph/cmd/conv/conv.go b/dgraph/cmd/conv/conv.go index 565f1ee9685..21496bd7fad 100644 --- a/dgraph/cmd/conv/conv.go +++ b/dgraph/cmd/conv/conv.go @@ -29,7 +29,7 @@ import ( "github.com/golang/glog" geojson "github.com/paulmach/go.geojson" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // TODO: Reconsider if we need this binary. diff --git a/dgraph/cmd/conv/run.go b/dgraph/cmd/conv/run.go index b3ff05c51ae..b59018ff8b4 100644 --- a/dgraph/cmd/conv/run.go +++ b/dgraph/cmd/conv/run.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // Conv is the sub-command invoked when running "dgraph conv". diff --git a/dgraph/cmd/debug/run.go b/dgraph/cmd/debug/run.go index 4b721fe0776..278760e211f 100644 --- a/dgraph/cmd/debug/run.go +++ b/dgraph/cmd/debug/run.go @@ -38,13 +38,13 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/raftwal" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/debug/wal.go b/dgraph/cmd/debug/wal.go index 3c763cbcd0b..81021f7d689 100644 --- a/dgraph/cmd/debug/wal.go +++ b/dgraph/cmd/debug/wal.go @@ -27,9 +27,9 @@ import ( "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/raftwal" + "github.com/dgraph-io/dgraph/v24/x" ) func printEntry(es raftpb.Entry, pending map[uint64]bool, isZero bool) { diff --git a/dgraph/cmd/debuginfo/run.go b/dgraph/cmd/debuginfo/run.go index 597c9b0ab07..363c02fd496 100644 --- a/dgraph/cmd/debuginfo/run.go +++ b/dgraph/cmd/debuginfo/run.go @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type debugInfoCmdOpts struct { diff --git a/dgraph/cmd/decrypt/decrypt.go b/dgraph/cmd/decrypt/decrypt.go index d96ef8df319..cce1c6cc1d9 100644 --- a/dgraph/cmd/decrypt/decrypt.go +++ b/dgraph/cmd/decrypt/decrypt.go @@ -25,9 +25,9 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/x" ) type options struct { diff --git a/dgraph/cmd/increment/increment.go b/dgraph/cmd/increment/increment.go index 81f11828770..130fa485e24 100644 --- a/dgraph/cmd/increment/increment.go +++ b/dgraph/cmd/increment/increment.go @@ -31,9 +31,9 @@ import ( "github.com/spf13/viper" "go.opencensus.io/trace" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/increment/increment_test.go b/dgraph/cmd/increment/increment_test.go index 45b91c8e0cf..1f9e744d52e 100644 --- a/dgraph/cmd/increment/increment_test.go +++ b/dgraph/cmd/increment/increment_test.go @@ -32,9 +32,9 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/metadata" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" ) const N = 10 diff --git a/dgraph/cmd/live/batch.go b/dgraph/cmd/live/batch.go index c95e653b59a..d4b9b94cdba 100644 --- a/dgraph/cmd/live/batch.go +++ b/dgraph/cmd/live/batch.go @@ -34,14 +34,14 @@ import ( "google.golang.org/grpc/status" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" - "github.com/dgraph-io/dgraph/xidmap" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" + "github.com/dgraph-io/dgraph/v24/xidmap" ) // batchMutationOptions sets the clients batch mode to Pending number of buffers each of Size. diff --git a/dgraph/cmd/live/load-json/load_test.go b/dgraph/cmd/live/load-json/load_test.go index 314f18e0c32..5648e3f8d27 100644 --- a/dgraph/cmd/live/load-json/load_test.go +++ b/dgraph/cmd/live/load-json/load_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var alphaService = testutil.SockAddr diff --git a/dgraph/cmd/live/load-uids/load_test.go b/dgraph/cmd/live/load-uids/load_test.go index 8ce2531a48d..bee0e4dec1a 100644 --- a/dgraph/cmd/live/load-uids/load_test.go +++ b/dgraph/cmd/live/load-uids/load_test.go @@ -33,11 +33,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/dgraph/cmd/live/run.go b/dgraph/cmd/live/run.go index e33db2acea1..23a5318e7f8 100644 --- a/dgraph/cmd/live/run.go +++ b/dgraph/cmd/live/run.go @@ -44,16 +44,16 @@ import ( "github.com/dgraph-io/badger/v4" bopt "github.com/dgraph-io/badger/v4/options" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/filestore" - schemapkg "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" - "github.com/dgraph-io/dgraph/xidmap" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/filestore" + schemapkg "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" + "github.com/dgraph-io/dgraph/v24/xidmap" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/migrate/run.go b/dgraph/cmd/migrate/run.go index 8f5d5b3a3a8..8afdc81de02 100644 --- a/dgraph/cmd/migrate/run.go +++ b/dgraph/cmd/migrate/run.go @@ -27,7 +27,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/dgraph/cmd/migrate/table_info.go b/dgraph/cmd/migrate/table_info.go index 743f476e20c..02a0b51a9c0 100644 --- a/dgraph/cmd/migrate/table_info.go +++ b/dgraph/cmd/migrate/table_info.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type keyType int diff --git a/dgraph/cmd/migrate/utils.go b/dgraph/cmd/migrate/utils.go index 603f5726cdc..ebb4caefaa2 100644 --- a/dgraph/cmd/migrate/utils.go +++ b/dgraph/cmd/migrate/utils.go @@ -27,7 +27,7 @@ import ( "github.com/go-sql-driver/mysql" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) func getPool(host, port, user, password, db string) (*sql.DB, diff --git a/dgraph/cmd/root.go b/dgraph/cmd/root.go index cd752d5fa5a..71aa4e2af8f 100644 --- a/dgraph/cmd/root.go +++ b/dgraph/cmd/root.go @@ -32,21 +32,21 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - checkupgrade "github.com/dgraph-io/dgraph/check_upgrade" - "github.com/dgraph-io/dgraph/dgraph/cmd/alpha" - "github.com/dgraph-io/dgraph/dgraph/cmd/bulk" - "github.com/dgraph-io/dgraph/dgraph/cmd/cert" - "github.com/dgraph-io/dgraph/dgraph/cmd/conv" - "github.com/dgraph-io/dgraph/dgraph/cmd/debug" - "github.com/dgraph-io/dgraph/dgraph/cmd/debuginfo" - "github.com/dgraph-io/dgraph/dgraph/cmd/decrypt" - "github.com/dgraph-io/dgraph/dgraph/cmd/increment" - "github.com/dgraph-io/dgraph/dgraph/cmd/live" - "github.com/dgraph-io/dgraph/dgraph/cmd/migrate" - "github.com/dgraph-io/dgraph/dgraph/cmd/version" - "github.com/dgraph-io/dgraph/dgraph/cmd/zero" - "github.com/dgraph-io/dgraph/upgrade" - "github.com/dgraph-io/dgraph/x" + checkupgrade "github.com/dgraph-io/dgraph/v24/check_upgrade" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/alpha" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/bulk" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/cert" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/conv" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/debug" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/debuginfo" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/decrypt" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/increment" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/live" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/migrate" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/version" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/zero" + "github.com/dgraph-io/dgraph/v24/upgrade" + "github.com/dgraph-io/dgraph/v24/x" ) // RootCmd represents the base command when called without any subcommands diff --git a/dgraph/cmd/root_ee.go b/dgraph/cmd/root_ee.go index 12c6e12dcbf..22f12fbc57c 100644 --- a/dgraph/cmd/root_ee.go +++ b/dgraph/cmd/root_ee.go @@ -14,9 +14,9 @@ package cmd import ( - acl "github.com/dgraph-io/dgraph/ee/acl" - "github.com/dgraph-io/dgraph/ee/audit" - "github.com/dgraph-io/dgraph/ee/backup" + acl "github.com/dgraph-io/dgraph/v24/ee/acl" + "github.com/dgraph-io/dgraph/v24/ee/audit" + "github.com/dgraph-io/dgraph/v24/ee/backup" ) func init() { diff --git a/dgraph/cmd/version/run.go b/dgraph/cmd/version/run.go index 72b6e92094a..0d9cd139301 100644 --- a/dgraph/cmd/version/run.go +++ b/dgraph/cmd/version/run.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // Version is the sub-command invoked when running "dgraph version". diff --git a/dgraph/cmd/version/version_test.go b/dgraph/cmd/version/version_test.go index a1824c576e5..872247b0585 100644 --- a/dgraph/cmd/version/version_test.go +++ b/dgraph/cmd/version/version_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) // Test `dgraph version` with an empty config file. diff --git a/dgraph/cmd/zero/assign.go b/dgraph/cmd/zero/assign.go index 18ead6d6d15..608b265c394 100644 --- a/dgraph/cmd/zero/assign.go +++ b/dgraph/cmd/zero/assign.go @@ -26,8 +26,8 @@ import ( otrace "go.opencensus.io/trace" "google.golang.org/grpc/metadata" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) var emptyAssignedIds pb.AssignedIds diff --git a/dgraph/cmd/zero/http.go b/dgraph/cmd/zero/http.go index b36c7d18615..c60ad6eeee6 100644 --- a/dgraph/cmd/zero/http.go +++ b/dgraph/cmd/zero/http.go @@ -29,9 +29,9 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) // intFromQueryParam checks for name as a query param, converts it to uint64 and returns it. diff --git a/dgraph/cmd/zero/license.go b/dgraph/cmd/zero/license.go index a7fe91dec6c..bf05aa5d1f2 100644 --- a/dgraph/cmd/zero/license.go +++ b/dgraph/cmd/zero/license.go @@ -22,7 +22,7 @@ package zero import ( "net/http" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/zero/license_ee.go b/dgraph/cmd/zero/license_ee.go index 14cb8676ee7..bd113a17665 100644 --- a/dgraph/cmd/zero/license_ee.go +++ b/dgraph/cmd/zero/license_ee.go @@ -8,7 +8,7 @@ * may not use this file except in compliance with the License. You * may obtain a copy of the License at * - * https://github.com/dgraph-io/dgraph/blob/master/licenses/DCL.txt + * https://github.com/dgraph-io/dgraph/v24/blob/master/licenses/DCL.txt */ package zero @@ -25,9 +25,9 @@ import ( "github.com/gogo/protobuf/proto" "github.com/golang/glog" - "github.com/dgraph-io/dgraph/ee/audit" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee/audit" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/zero/oracle.go b/dgraph/cmd/zero/oracle.go index 97b4dd07e72..3187f43d1e7 100644 --- a/dgraph/cmd/zero/oracle.go +++ b/dgraph/cmd/zero/oracle.go @@ -28,10 +28,10 @@ import ( otrace "go.opencensus.io/trace" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok/hnsw" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok/hnsw" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/zero/raft.go b/dgraph/cmd/zero/raft.go index b41290812d1..731bd05798c 100644 --- a/dgraph/cmd/zero/raft.go +++ b/dgraph/cmd/zero/raft.go @@ -38,10 +38,10 @@ import ( "go.opencensus.io/tag" otrace "go.opencensus.io/trace" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/ee/audit" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/ee/audit" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/zero/run.go b/dgraph/cmd/zero/run.go index e73e31a2cf5..0bd25781fdd 100644 --- a/dgraph/cmd/zero/run.go +++ b/dgraph/cmd/zero/run.go @@ -38,13 +38,13 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/ee/audit" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/ee/audit" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/raftwal" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/zero/tablet.go b/dgraph/cmd/zero/tablet.go index c6accb75334..db5b8cde008 100644 --- a/dgraph/cmd/zero/tablet.go +++ b/dgraph/cmd/zero/tablet.go @@ -27,8 +27,8 @@ import ( "github.com/pkg/errors" otrace "go.opencensus.io/trace" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/dgraph/cmd/zero/zero.go b/dgraph/cmd/zero/zero.go index d5bce3206ef..fc5f2a791f6 100644 --- a/dgraph/cmd/zero/zero.go +++ b/dgraph/cmd/zero/zero.go @@ -30,11 +30,11 @@ import ( "github.com/pkg/errors" otrace "go.opencensus.io/trace" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/telemetry" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/telemetry" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/cmd/zero/zero_test.go b/dgraph/cmd/zero/zero_test.go index 0197cc724e2..c8a32d9ae4f 100644 --- a/dgraph/cmd/zero/zero_test.go +++ b/dgraph/cmd/zero/zero_test.go @@ -32,9 +32,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/testutil" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraph/main.go b/dgraph/main.go index ff6ce9bb815..9393005a4c0 100644 --- a/dgraph/main.go +++ b/dgraph/main.go @@ -24,7 +24,7 @@ import ( "github.com/dustin/go-humanize" "github.com/golang/glog" - "github.com/dgraph-io/dgraph/dgraph/cmd" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd" "github.com/dgraph-io/ristretto/z" ) diff --git a/dgraphapi/cluster.go b/dgraphapi/cluster.go index 8f833d06d5f..82f7698a91b 100644 --- a/dgraphapi/cluster.go +++ b/dgraphapi/cluster.go @@ -30,10 +30,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/dgraphapi/vector.go b/dgraphapi/vector.go index de3dad04878..662158067ef 100644 --- a/dgraphapi/vector.go +++ b/dgraphapi/vector.go @@ -22,7 +22,7 @@ import ( "math/rand" "strings" - "github.com/dgraph-io/dgo/v230/protos/api" + "github.com/dgraph-io/dgo/v240/protos/api" ) func GenerateRandomVector(size int) []float32 { diff --git a/dgraphtest/compose_cluster.go b/dgraphtest/compose_cluster.go index 640b66ba9f4..baea45c60c5 100644 --- a/dgraphtest/compose_cluster.go +++ b/dgraphtest/compose_cluster.go @@ -17,9 +17,9 @@ package dgraphtest import ( - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/testutil" ) type ComposeCluster struct{} diff --git a/dgraphtest/dcloud_cluster.go b/dgraphtest/dcloud_cluster.go index eb3923a4944..d49f35f1ce5 100644 --- a/dgraphtest/dcloud_cluster.go +++ b/dgraphtest/dcloud_cluster.go @@ -27,9 +27,9 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" ) type DCloudCluster struct { diff --git a/dgraphtest/load.go b/dgraphtest/load.go index 5093fecb726..2607f15eda6 100644 --- a/dgraphtest/load.go +++ b/dgraphtest/load.go @@ -33,10 +33,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/dgraphtest/local_cluster.go b/dgraphtest/local_cluster.go index 0248255fa47..792e616820d 100644 --- a/dgraphtest/local_cluster.go +++ b/dgraphtest/local_cluster.go @@ -44,10 +44,10 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/x" ) // cluster's network struct @@ -268,7 +268,7 @@ func (c *LocalCluster) destroyContainers() error { ctx, cancel := context.WithTimeout(context.Background(), requestTimeout) defer cancel() - ro := types.ContainerRemoveOptions{RemoveVolumes: true, Force: true} + ro := container.RemoveOptions{RemoveVolumes: true, Force: true} for _, zo := range c.zeros { if err := c.dcli.ContainerRemove(ctx, zo.cid(), ro); err != nil { return errors.Wrapf(err, "error removing zero [%v]", zo.cname()) @@ -284,21 +284,10 @@ func (c *LocalCluster) destroyContainers() error { return nil } -// CheckRunningServices checks open ports using lsof and returns the output as a string -func CheckRunningServices() (string, error) { - lsofCmd := exec.Command("lsof", "-i", "-n") - output, err := runCommand(lsofCmd) +func (c *LocalCluster) printPortMappings() error { + containers, err := c.dcli.ContainerList(context.Background(), container.ListOptions{}) if err != nil { - return "", fmt.Errorf("error running lsof command: %v", err) - } - return output, nil -} - -// ListRunningContainers lists running Docker containers using the Docker Go client -func (c *LocalCluster) listRunningContainers() (string, error) { - containers, err := c.dcli.ContainerList(context.Background(), types.ContainerListOptions{}) - if err != nil { - return "", fmt.Errorf("error listing Docker containers: %v", err) + return errors.Wrap(err, "error listing docker containers") } var result bytes.Buffer @@ -306,16 +295,10 @@ func (c *LocalCluster) listRunningContainers() (string, error) { result.WriteString(fmt.Sprintf("ID: %s, Image: %s, Command: %s, Status: %s\n", container.ID[:10], container.Image, container.Command, container.Status)) - result.WriteString("Port Mappings:\n") - for _, port := range container.Ports { - result.WriteString(fmt.Sprintf(" %s:%d -> %d\n", port.IP, port.PublicPort, port.PrivatePort)) - } - result.WriteString("\n") - result.WriteString("Port Mappings:\n") info, err := c.dcli.ContainerInspect(context.Background(), container.ID) if err != nil { - return "", errors.Wrap(err, "error inspecting container") + return errors.Wrapf(err, "error inspecting container [%v]", container.ID) } for port, bindings := range info.NetworkSettings.Ports { @@ -327,42 +310,9 @@ func (c *LocalCluster) listRunningContainers() (string, error) { result.WriteString("\n") } - return result.String(), nil -} - -// runCommand executes a command and returns its output or an error -func runCommand(cmd *exec.Cmd) (string, error) { - var out bytes.Buffer - var stderr bytes.Buffer - cmd.Stdout = &out - cmd.Stderr = &stderr - err := cmd.Run() - if err != nil { - return "", fmt.Errorf("%v: %v", err, stderr.String()) - } - return out.String(), nil -} - -func (c *LocalCluster) printNetworkStuff() { - log.Printf("Checking running services and ports using lsof, netstat, and Docker...\n") - - // Check running services using lsof - lsofOutput, err := CheckRunningServices() - if err != nil { - fmt.Printf("Error checking running services: %v\n", err) - } else { - log.Printf("Output of lsof -i:") - log.Println(lsofOutput) - } - - // List running Docker containers - dockerOutput, err := c.listRunningContainers() - if err != nil { - fmt.Printf("Error listing Docker containers: %v\n", err) - } else { - log.Printf("Running Docker containers:") - log.Println(dockerOutput) - } + log.Printf("[INFO] ======== CONTAINERS' PORT MAPPINGS ========") + log.Println(result.String()) + return nil } func (c *LocalCluster) Cleanup(verbose bool) { @@ -377,6 +327,9 @@ func (c *LocalCluster) Cleanup(verbose bool) { if err := c.printInspectContainers(); err != nil { log.Printf("[WARNING] error printing inspect container output: %v", err) } + if err := c.printPortMappings(); err != nil { + log.Printf("[WARNING] error printing port mappings: %v", err) + } } log.Printf("[INFO] cleaning up cluster with prefix [%v]", c.conf.prefix) @@ -489,7 +442,7 @@ func (c *LocalCluster) StartAlpha(id int) error { func (c *LocalCluster) startContainer(dc dnode) error { ctx, cancel := context.WithTimeout(context.Background(), requestTimeout) defer cancel() - if err := c.dcli.ContainerStart(ctx, dc.cid(), types.ContainerStartOptions{}); err != nil { + if err := c.dcli.ContainerStart(ctx, dc.cid(), container.StartOptions{}); err != nil { return errors.Wrapf(err, "error starting container [%v]", dc.cname()) } dc.changeStatus(true) @@ -641,7 +594,6 @@ func (c *LocalCluster) containerHealthCheck(url func(c *LocalCluster) (string, e return nil } - c.printNetworkStuff() return fmt.Errorf("health failed, cluster took too long to come up [%v]", endpoint) } @@ -1044,7 +996,7 @@ func (c *LocalCluster) getLogs(containerID string) (string, error) { ctx, cancel := context.WithTimeout(context.Background(), requestTimeout) defer cancel() - opts := types.ContainerLogsOptions{ + opts := container.LogsOptions{ ShowStdout: true, ShowStderr: true, Details: true, diff --git a/dql/bench_test.go b/dql/bench_test.go index 88d7db3de32..b5da55ab8c8 100644 --- a/dql/bench_test.go +++ b/dql/bench_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/schema" + "github.com/dgraph-io/dgraph/v24/schema" ) var sc = `type.object.name.en: string @index . diff --git a/dql/math.go b/dql/math.go index b904b1074bf..8cc7089c482 100644 --- a/dql/math.go +++ b/dql/math.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) type mathTreeStack struct{ a []*MathTree } diff --git a/dql/mutation.go b/dql/mutation.go index da3e862b322..06facb040a2 100644 --- a/dql/mutation.go +++ b/dql/mutation.go @@ -21,10 +21,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/dql/parser.go b/dql/parser.go index 006832dc49b..7ad4f9fc500 100644 --- a/dql/parser.go +++ b/dql/parser.go @@ -26,10 +26,10 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) const ( @@ -2948,6 +2948,17 @@ loop: } } if isSortkey(key) { + + // we dont support variable + predicate sorting + for _, order := range gq.Order { + for _, needVar := range gq.NeedsVar { + if needVar.Name == order.Attr { + return nil, it.Errorf("Val() is not allowed in multiple sorting."+ + " Got: [%v]", needVar.Name) + } + } + } + if order[val] { return nil, it.Errorf("Sorting by an attribute: [%s] can only be done once", val) } diff --git a/dql/parser_mutation.go b/dql/parser_mutation.go index 2955fc8d870..514c805cfd9 100644 --- a/dql/parser_mutation.go +++ b/dql/parser_mutation.go @@ -17,8 +17,8 @@ package dql import ( - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/lex" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/lex" ) // ParseMutation parses a block into a mutation. Returns an object with a mutation or diff --git a/dql/parser_test.go b/dql/parser_test.go index f54e7b8e293..49654abf478 100644 --- a/dql/parser_test.go +++ b/dql/parser_test.go @@ -25,10 +25,10 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/types" ) func childAttrs(g *GraphQuery) []string { diff --git a/dql/state.go b/dql/state.go index 32befa72d7c..4fa0b6e6897 100644 --- a/dql/state.go +++ b/dql/state.go @@ -18,7 +18,7 @@ package dql import ( - "github.com/dgraph-io/dgraph/lex" + "github.com/dgraph-io/dgraph/v24/lex" ) const ( diff --git a/dql/state_test.go b/dql/state_test.go index 6f9368d0551..5814e750dce 100644 --- a/dql/state_test.go +++ b/dql/state_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/lex" + "github.com/dgraph-io/dgraph/v24/lex" ) func TestQueryLexing(t *testing.T) { diff --git a/edgraph/access.go b/edgraph/access.go index 99d1fe486cd..97b78d1402b 100644 --- a/edgraph/access.go +++ b/edgraph/access.go @@ -24,10 +24,10 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/edgraph/access_ee.go b/edgraph/access_ee.go index 52868914b8e..0cec209f939 100644 --- a/edgraph/access_ee.go +++ b/edgraph/access_ee.go @@ -29,14 +29,14 @@ import ( "google.golang.org/grpc/status" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/ee/acl" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/ee/acl" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/edgraph/access_ee_test.go b/edgraph/access_ee_test.go index 61cc40daf2e..370520deeee 100644 --- a/edgraph/access_ee_test.go +++ b/edgraph/access_ee_test.go @@ -20,9 +20,9 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/ee/acl" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee/acl" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) func generateJWT(namespace uint64, userId string, groupIds []string, expiry int64) string { @@ -115,10 +115,11 @@ func TestGetRefreshJwt(t *testing.T) { } func TestMain(m *testing.M) { + worker.Config.AclJwtAlg = jwt.SigningMethodHS256 x.WorkerConfig.AclJwtAlg = jwt.SigningMethodHS256 x.WorkerConfig.AclPublicKey = x.Sensitive("6ABBAA2014CFF00289D20D20DA296F67") - worker.Config.AccessJwtTtl = 20 * time.Second worker.Config.RefreshJwtTtl = 20 * time.Second worker.Config.AclSecretKey = x.Sensitive("6ABBAA2014CFF00289D20D20DA296F67") + m.Run() } diff --git a/edgraph/config_mem.go b/edgraph/config_mem.go index 4552e77d357..5a121cc0975 100644 --- a/edgraph/config_mem.go +++ b/edgraph/config_mem.go @@ -7,7 +7,7 @@ package edgraph import ( - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/worker" ) // #include diff --git a/edgraph/graphql.go b/edgraph/graphql.go index d39d35055e8..dc865d531ad 100644 --- a/edgraph/graphql.go +++ b/edgraph/graphql.go @@ -26,9 +26,9 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) // ProcessPersistedQuery stores and retrieves persisted queries by following waterfall logic: diff --git a/edgraph/multi_tenancy_ee.go b/edgraph/multi_tenancy_ee.go index d212df0b688..9a63d2470a9 100644 --- a/edgraph/multi_tenancy_ee.go +++ b/edgraph/multi_tenancy_ee.go @@ -22,12 +22,12 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) type ResetPasswordInput struct { diff --git a/edgraph/server.go b/edgraph/server.go index f59d65c7ff3..04cc8cae103 100644 --- a/edgraph/server.go +++ b/edgraph/server.go @@ -43,22 +43,22 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/dql" - gqlSchema "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/telemetry" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/dql" + gqlSchema "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/telemetry" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) const ( @@ -246,6 +246,7 @@ func validateAlterOperation(ctx context.Context, op *api.Operation) error { if !isMutationAllowed(ctx) { return errors.Errorf("No mutations allowed by server.") } + if _, err := hasAdminAuth(ctx, "Alter"); err != nil { glog.Warningf("Alter denied with error: %v\n", err) return err @@ -458,8 +459,9 @@ func (s *Server) Alter(ctx context.Context, op *api.Operation) (*api.Payload, er // just reinsert the GraphQL schema, no need to alter dgraph schema as this was drop_data _, err = UpdateGQLSchema(ctx, graphQLSchema, "") - // recreate the admin account after a drop data operation - InitializeAcl(nil) + + // Since all data has been dropped, we need to recreate the admin account in the respective namespace. + upsertGuardianAndGroot(nil, namespace) return empty, err } @@ -1577,7 +1579,7 @@ func parseRequest(ctx context.Context, qc *queryContext) error { // parsing mutations qc.gmuList = make([]*dql.Mutation, 0, len(qc.req.Mutations)) for _, mu := range qc.req.Mutations { - gmu, err := parseMutationObject(mu, qc) + gmu, err := ParseMutationObject(mu, qc.graphql) if err != nil { return err } @@ -1928,12 +1930,12 @@ func hasPoormansAuth(ctx context.Context) error { return nil } -// parseMutationObject tries to consolidate fields of the api.Mutation into the +// ParseMutationObject tries to consolidate fields of the api.Mutation into the // corresponding field of the returned dql.Mutation. For example, the 3 fields, // api.Mutation#SetJson, api.Mutation#SetNquads and api.Mutation#Set are consolidated into the // dql.Mutation.Set field. Similarly the 3 fields api.Mutation#DeleteJson, api.Mutation#DelNquads // and api.Mutation#Del are merged into the dql.Mutation#Del field. -func parseMutationObject(mu *api.Mutation, qc *queryContext) (*dql.Mutation, error) { +func ParseMutationObject(mu *api.Mutation, isGraphql bool) (*dql.Mutation, error) { res := &dql.Mutation{Cond: mu.Cond} if len(mu.SetJson) > 0 { @@ -1977,7 +1979,7 @@ func parseMutationObject(mu *api.Mutation, qc *queryContext) (*dql.Mutation, err return nil, err } - if err := validateNQuads(res.Set, res.Del, qc); err != nil { + if err := validateNQuads(res.Set, res.Del, isGraphql); err != nil { return nil, err } return res, nil @@ -2013,8 +2015,7 @@ func validateForGraphql(nq *api.NQuad, isGraphql bool) error { return nil } -func validateNQuads(set, del []*api.NQuad, qc *queryContext) error { - +func validateNQuads(set, del []*api.NQuad, isGraphql bool) error { for _, nq := range set { if err := validatePredName(nq.Predicate); err != nil { return err @@ -2029,7 +2030,7 @@ func validateNQuads(set, del []*api.NQuad, qc *queryContext) error { if err := validateKeys(nq); err != nil { return errors.Wrapf(err, "key error: %+v", nq) } - if err := validateForGraphql(nq, qc.graphql); err != nil { + if err := validateForGraphql(nq, isGraphql); err != nil { return err } } @@ -2044,7 +2045,7 @@ func validateNQuads(set, del []*api.NQuad, qc *queryContext) error { if nq.Subject == x.Star || (nq.Predicate == x.Star && !ostar) { return errors.Errorf("Only valid wildcard delete patterns are 'S * *' and 'S P *': %v", nq) } - if err := validateForGraphql(nq, qc.graphql); err != nil { + if err := validateForGraphql(nq, isGraphql); err != nil { return err } // NOTE: we dont validateKeys() with delete to let users fix existing mistakes diff --git a/edgraph/server_test.go b/edgraph/server_test.go index 8e5b1616593..0e7772cda59 100644 --- a/edgraph/server_test.go +++ b/edgraph/server_test.go @@ -26,11 +26,11 @@ import ( "google.golang.org/grpc/metadata" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) func makeNquad(sub, pred string, val *api.Value) *api.NQuad { diff --git a/ee/acl/acl.go b/ee/acl/acl.go index 77384ba125c..b39a75c74a6 100644 --- a/ee/acl/acl.go +++ b/ee/acl/acl.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/viper" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/x" ) func getUserAndGroup(conf *viper.Viper) (userId string, groupId string, err error) { diff --git a/ee/acl/acl_curl_test.go b/ee/acl/acl_curl_test.go index 75075e05fe6..175556f4ae8 100644 --- a/ee/acl/acl_curl_test.go +++ b/ee/acl/acl_curl_test.go @@ -22,9 +22,9 @@ import ( "github.com/golang/glog" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func (asuite *AclTestSuite) TestCurlAuthorization() { diff --git a/ee/acl/acl_integration_test.go b/ee/acl/acl_integration_test.go index eaf360cf218..42999795203 100644 --- a/ee/acl/acl_integration_test.go +++ b/ee/acl/acl_integration_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/x" ) func (asuite *AclTestSuite) TestInvalidGetUser() { diff --git a/ee/acl/acl_test.go b/ee/acl/acl_test.go index 6f7281c5e80..1b0c28c3399 100644 --- a/ee/acl/acl_test.go +++ b/ee/acl/acl_test.go @@ -24,11 +24,11 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) var ( @@ -1394,7 +1394,7 @@ func (asuite *AclTestSuite) TestValQueryWithACLPermissions() { n as name a as age } - q2(func: eq(val(n), "RandomGuy")) { + q2(func: eq(val(n), "RandomGuy"), orderasc: val(n)) { val(n) val(a) } @@ -1433,7 +1433,7 @@ func (asuite *AclTestSuite) TestValQueryWithACLPermissions() { n as name a as age } - q2(func: uid(f), orderdesc: val(a), orderasc: name) { + q2(func: uid(f), orderasc: val(n)) { name val(n) val(a) diff --git a/ee/acl/integration_test.go b/ee/acl/integration_test.go index 51eabf5466f..8ab0ab8f42d 100644 --- a/ee/acl/integration_test.go +++ b/ee/acl/integration_test.go @@ -17,8 +17,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" ) type AclTestSuite struct { diff --git a/ee/acl/jwt_algo_test.go b/ee/acl/jwt_algo_test.go index f67ab398f87..01683ba38fb 100644 --- a/ee/acl/jwt_algo_test.go +++ b/ee/acl/jwt_algo_test.go @@ -26,9 +26,9 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) func TestACLJwtAlgo(t *testing.T) { diff --git a/ee/acl/run.go b/ee/acl/run.go index 19109ee866d..8590accf54c 100644 --- a/ee/acl/run.go +++ b/ee/acl/run.go @@ -22,8 +22,8 @@ package acl import ( "github.com/spf13/cobra" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/x" ) var CmdAcl x.SubCommand diff --git a/ee/acl/run_ee.go b/ee/acl/run_ee.go index f746ed1c740..6b24f8ee508 100644 --- a/ee/acl/run_ee.go +++ b/ee/acl/run_ee.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/ee/acl/upgrade_test.go b/ee/acl/upgrade_test.go index 9230445c460..b19e3b3cd84 100644 --- a/ee/acl/upgrade_test.go +++ b/ee/acl/upgrade_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) type AclTestSuite struct { diff --git a/ee/acl/utils.go b/ee/acl/utils.go index 53a8f2db8f3..7b9abbef438 100644 --- a/ee/acl/utils.go +++ b/ee/acl/utils.go @@ -20,9 +20,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/viper" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/ee/audit/audit.go b/ee/audit/audit.go index 9e35eb7cf2b..a86281fa611 100644 --- a/ee/audit/audit.go +++ b/ee/audit/audit.go @@ -19,7 +19,7 @@ package audit -import "github.com/dgraph-io/dgraph/x" +import "github.com/dgraph-io/dgraph/v24/x" type AuditConf struct { Dir string diff --git a/ee/audit/audit_ee.go b/ee/audit/audit_ee.go index 694d4e58aeb..f72df5ef5d9 100644 --- a/ee/audit/audit_ee.go +++ b/ee/audit/audit_ee.go @@ -22,8 +22,8 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/ee/audit/interceptor.go b/ee/audit/interceptor.go index 1b99a108c29..3228ef0a778 100644 --- a/ee/audit/interceptor.go +++ b/ee/audit/interceptor.go @@ -23,7 +23,7 @@ import ( "context" "net/http" - "github.com/dgraph-io/dgraph/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/schema" "google.golang.org/grpc" ) diff --git a/ee/audit/interceptor_ee.go b/ee/audit/interceptor_ee.go index 9a972c821be..22a17ac1252 100644 --- a/ee/audit/interceptor_ee.go +++ b/ee/audit/interceptor_ee.go @@ -26,8 +26,8 @@ import ( "strings" "sync/atomic" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/parser" diff --git a/ee/audit/run.go b/ee/audit/run.go index 3efa35efa93..41020e62251 100644 --- a/ee/audit/run.go +++ b/ee/audit/run.go @@ -22,7 +22,7 @@ package audit import ( "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) var CmdAudit x.SubCommand diff --git a/ee/audit/run_ee.go b/ee/audit/run_ee.go index b5d261f0a74..4846228be30 100644 --- a/ee/audit/run_ee.go +++ b/ee/audit/run_ee.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) var CmdAudit x.SubCommand diff --git a/ee/audit/run_ee_test.go b/ee/audit/run_ee_test.go index 723cdf1c260..c9511f834fb 100644 --- a/ee/audit/run_ee_test.go +++ b/ee/audit/run_ee_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil/testaudit" + "github.com/dgraph-io/dgraph/v24/testutil/testaudit" ) // we will truncate copy of encrypted audit log file diff --git a/ee/backup/run.go b/ee/backup/run.go index eb5b666fe71..c70be926fdf 100644 --- a/ee/backup/run.go +++ b/ee/backup/run.go @@ -30,11 +30,11 @@ import ( "google.golang.org/grpc/credentials/insecure" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/ee/enc/util_ee.go b/ee/enc/util_ee.go index 27852eda71b..77fdb9aa6bc 100644 --- a/ee/enc/util_ee.go +++ b/ee/enc/util_ee.go @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // EeBuild indicates if this is a Enterprise build. diff --git a/ee/flags.go b/ee/flags.go index db62a9274d0..dd025034630 100644 --- a/ee/flags.go +++ b/ee/flags.go @@ -24,7 +24,7 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/spf13/pflag" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/ee/keys_ee.go b/ee/keys_ee.go index 17c6248a3a5..6fbb5290d94 100644 --- a/ee/keys_ee.go +++ b/ee/keys_ee.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/viper" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/ee/vault/vault.go b/ee/vault/vault.go index de4de8cf773..d03ec5d81fc 100644 --- a/ee/vault/vault.go +++ b/ee/vault/vault.go @@ -23,7 +23,7 @@ import ( "github.com/golang/glog" "github.com/spf13/viper" - "github.com/dgraph-io/dgraph/ee" + "github.com/dgraph-io/dgraph/v24/ee" ) func GetKeys(config *viper.Viper) (*ee.Keys, error) { diff --git a/ee/vault_ee.go b/ee/vault_ee.go index 00bf1d1d8e2..603ca0c7cfc 100644 --- a/ee/vault_ee.go +++ b/ee/vault_ee.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/vault/api" "github.com/spf13/viper" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/filestore/filestore.go b/filestore/filestore.go index b0ac6dd6fba..ceb99cdcd71 100644 --- a/filestore/filestore.go +++ b/filestore/filestore.go @@ -21,7 +21,7 @@ import ( "io" "net/url" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // FileStore represents a file or directory of files that are either stored diff --git a/filestore/local_files.go b/filestore/local_files.go index 7194294a4d5..962bc08e7d2 100644 --- a/filestore/local_files.go +++ b/filestore/local_files.go @@ -21,8 +21,8 @@ import ( "io" "os" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/x" ) type localFiles struct { diff --git a/filestore/remote_files.go b/filestore/remote_files.go index e362bf7803f..9f5104fcac9 100644 --- a/filestore/remote_files.go +++ b/filestore/remote_files.go @@ -24,8 +24,8 @@ import ( "github.com/minio/minio-go/v6" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/x" ) type remoteFiles struct { diff --git a/go.mod b/go.mod index 6b41e41fbe6..782165c17a9 100644 --- a/go.mod +++ b/go.mod @@ -1,111 +1,115 @@ -module github.com/dgraph-io/dgraph +module github.com/dgraph-io/dgraph/v24 -go 1.22 - -replace sourcegraph.com/sourcegraph/appdash => github.com/sourcegraph/appdash v0.0.0-20180110180208-2cc67fd64755 - -replace sourcegraph.com/sourcegraph/appdash-data => github.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67 +go 1.22.6 require ( - contrib.go.opencensus.io/exporter/jaeger v0.1.0 - contrib.go.opencensus.io/exporter/prometheus v0.1.0 - github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20190503082300-0f32ad59ab08 + contrib.go.opencensus.io/exporter/jaeger v0.2.1 + contrib.go.opencensus.io/exporter/prometheus v0.4.2 + github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20220622145613-731d59e8b567 github.com/HdrHistogram/hdrhistogram-go v1.1.2 - github.com/IBM/sarama v1.41.0 - github.com/Masterminds/semver/v3 v3.1.0 - github.com/bits-and-blooms/bitset v1.2.0 - github.com/blevesearch/bleve/v2 v2.3.10 - github.com/dgraph-io/badger/v4 v4.2.0 - github.com/dgraph-io/dgo/v230 v230.0.2-0.20240314155021-7b8d289e37f3 + github.com/IBM/sarama v1.43.3 + github.com/Masterminds/semver/v3 v3.3.0 + github.com/bits-and-blooms/bitset v1.14.3 + github.com/blevesearch/bleve/v2 v2.4.2 + github.com/dgraph-io/badger/v4 v4.3.0 + github.com/dgraph-io/dgo/v240 v240.0.0 github.com/dgraph-io/gqlgen v0.13.2 - github.com/dgraph-io/gqlparser/v2 v2.2.1 + github.com/dgraph-io/gqlparser/v2 v2.2.2 github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15 - github.com/dgraph-io/ristretto v0.1.1 + github.com/dgraph-io/ristretto v0.1.2-0.20240116140435-c67e07994f91 github.com/dgraph-io/simdjson-go v0.3.0 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 - github.com/dgryski/go-groupvarint v0.0.0-20190318181831-5ce5df8ca4e1 - github.com/docker/docker v24.0.5+incompatible - github.com/docker/go-connections v0.4.0 - github.com/dustin/go-humanize v1.0.0 - github.com/getsentry/sentry-go v0.6.0 - github.com/go-sql-driver/mysql v0.0.0-20190330032241-c0f6b444ad8f + github.com/dgryski/go-groupvarint v0.0.0-20230630160417-2bfb7969fb3c + github.com/docker/docker v27.3.1+incompatible + github.com/docker/go-connections v0.5.0 + github.com/dustin/go-humanize v1.0.1 + github.com/getsentry/sentry-go v0.29.0 + github.com/go-jose/go-jose/v4 v4.0.4 + github.com/go-sql-driver/mysql v1.8.1 github.com/gogo/protobuf v1.3.2 - github.com/golang-jwt/jwt/v5 v5.0.0 - github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 - github.com/golang/glog v1.2.0 + github.com/golang-jwt/jwt/v5 v5.2.1 + github.com/golang/geo v0.0.0-20230421003525-6adc56603217 + github.com/golang/glog v1.2.2 github.com/golang/protobuf v1.5.4 github.com/golang/snappy v0.0.4 - github.com/google/codesearch v1.0.0 + github.com/google/codesearch v1.2.0 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 - github.com/gorilla/websocket v1.4.2 - github.com/graph-gophers/graphql-go v1.3.0 - github.com/hashicorp/vault/api v1.0.4 - github.com/minio/minio-go/v6 v6.0.55 + github.com/gorilla/websocket v1.5.3 + github.com/graph-gophers/graphql-go v1.5.0 + github.com/hashicorp/vault/api v1.15.0 + github.com/minio/minio-go/v6 v6.0.57 github.com/mitchellh/panicwrap v1.0.0 - github.com/paulmach/go.geojson v0.0.0-20170327170536-40612a87147b + github.com/paulmach/go.geojson v1.5.0 github.com/pkg/errors v0.9.1 - github.com/pkg/profile v1.2.1 - github.com/prometheus/client_golang v1.14.0 - github.com/soheilhy/cmux v0.1.4 - github.com/spf13/cast v1.3.0 - github.com/spf13/cobra v1.7.0 + github.com/pkg/profile v1.7.0 + github.com/prometheus/client_golang v1.20.4 + github.com/soheilhy/cmux v0.1.5 + github.com/spf13/cast v1.3.1 + github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.9.0 - github.com/twpayne/go-geom v1.0.5 + github.com/twpayne/go-geom v1.5.7 github.com/viterin/vek v0.4.2 - github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c - go.etcd.io/etcd/raft/v3 v3.5.9 + github.com/xdg/scram v1.0.5 + go.etcd.io/etcd/raft/v3 v3.5.16 go.opencensus.io v0.24.0 - go.uber.org/zap v1.16.0 - golang.org/x/crypto v0.24.0 - golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 - golang.org/x/mod v0.18.0 - golang.org/x/net v0.26.0 - golang.org/x/sync v0.7.0 - golang.org/x/sys v0.22.0 - golang.org/x/term v0.21.0 - golang.org/x/text v0.16.0 - golang.org/x/tools v0.22.0 - google.golang.org/grpc v1.62.1 - gopkg.in/square/go-jose.v2 v2.3.1 + go.uber.org/zap v1.27.0 + golang.org/x/crypto v0.27.0 + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 + golang.org/x/mod v0.21.0 + golang.org/x/net v0.29.0 + golang.org/x/sync v0.8.0 + golang.org/x/sys v0.25.0 + golang.org/x/term v0.24.0 + golang.org/x/text v0.18.0 + golang.org/x/tools v0.25.0 + google.golang.org/grpc v1.66.2 gopkg.in/yaml.v2 v2.4.0 ) require ( - github.com/DataDog/datadog-go v3.5.0+incompatible // indirect - github.com/Microsoft/go-winio v0.5.2 // indirect - github.com/agnivade/levenshtein v1.0.3 // indirect - github.com/apache/thrift v0.13.0 // indirect + filippo.io/edwards25519 v1.1.0 // indirect + github.com/DataDog/datadog-go v4.8.3+incompatible // indirect + github.com/Microsoft/go-winio v0.6.2 // indirect + github.com/agnivade/levenshtein v1.1.1 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/blevesearch/bleve_index_api v1.0.6 // indirect - github.com/blevesearch/geo v0.1.18 // indirect + github.com/blevesearch/bleve_index_api v1.1.12 // indirect + github.com/blevesearch/geo v0.1.20 // indirect github.com/blevesearch/go-porterstemmer v1.0.3 // indirect github.com/blevesearch/segment v0.9.1 // indirect github.com/blevesearch/snowballstem v0.9.0 // indirect github.com/blevesearch/upsidedown_store_api v1.0.2 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/chewxy/math32 v1.10.1 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/docker/distribution v2.8.2+incompatible // indirect - github.com/docker/go-units v0.4.0 // indirect - github.com/eapache/go-resiliency v1.4.0 // indirect + github.com/cenkalti/backoff/v4 v4.3.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/chewxy/math32 v1.11.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/distribution/reference v0.6.0 // indirect + github.com/docker/go-units v0.5.0 // indirect + github.com/eapache/go-resiliency v1.7.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect - github.com/frankban/quicktest v1.10.2 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/felixge/fgprof v0.9.5 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/go-kit/log v0.2.1 // indirect + github.com/go-logfmt/logfmt v0.6.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/google/flatbuffers v1.12.1 // indirect + github.com/google/flatbuffers v24.3.25+incompatible // indirect + github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/go-retryablehttp v0.6.6 // indirect + github.com/hashicorp/go-retryablehttp v0.7.7 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect - github.com/hashicorp/go-sockaddr v1.0.2 // indirect + github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect + github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect + github.com/hashicorp/go-sockaddr v1.0.6 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect - github.com/hashicorp/hcl v1.0.0 // indirect - github.com/hashicorp/vault/sdk v0.1.13 // indirect + github.com/hashicorp/hcl v1.0.1-vault-5 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect @@ -113,46 +117,51 @@ require ( github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.16.7 // indirect - github.com/klauspost/cpuid/v2 v2.0.3 // indirect + github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/magiconair/properties v1.8.7 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect - github.com/minio/sha256-simd v0.1.1 // indirect + github.com/minio/md5-simd v1.1.2 // indirect + github.com/minio/sha256-simd v1.0.1 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/moby/term v0.5.0 // indirect + github.com/moby/docker-image-spec v1.3.1 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/morikuni/aec v1.0.0 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.0.2 // indirect - github.com/pelletier/go-toml v1.2.0 // indirect - github.com/philhofer/fwd v1.0.0 // indirect - github.com/pierrec/lz4 v2.5.2+incompatible // indirect - github.com/pierrec/lz4/v4 v4.1.18 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.10.1 // indirect + github.com/opencontainers/image-spec v1.1.0 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.59.1 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/prometheus/statsd_exporter v0.27.1 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/rogpeppe/go-internal v1.6.1 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect - github.com/spf13/afero v1.9.5 // indirect + github.com/spf13/afero v1.11.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/subosito/gotenv v1.4.2 // indirect - github.com/tinylib/msgp v1.1.2 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + github.com/tinylib/msgp v1.2.1 // indirect + github.com/uber/jaeger-client-go v2.28.0+incompatible // indirect github.com/viterin/partial v1.1.0 // indirect github.com/xdg/stringprep v1.0.3 // indirect - go.uber.org/atomic v1.9.0 // indirect - go.uber.org/multierr v1.10.0 // indirect - golang.org/x/time v0.3.0 // indirect - google.golang.org/api v0.122.0 // indirect - google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect - google.golang.org/grpc/examples v0.0.0-20230821201920-d51b3f41716d // indirect - google.golang.org/protobuf v1.33.0 // indirect - gopkg.in/DataDog/dd-trace-go.v1 v1.22.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect + go.opentelemetry.io/otel v1.29.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 // indirect + go.opentelemetry.io/otel/metric v1.29.0 // indirect + go.opentelemetry.io/otel/sdk v1.29.0 // indirect + go.opentelemetry.io/otel/trace v1.29.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/time v0.6.0 // indirect + google.golang.org/api v0.196.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/DataDog/dd-trace-go.v1 v1.67.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - gotest.tools/v3 v3.5.0 // indirect + gotest.tools/v3 v3.5.1 // indirect ) diff --git a/go.sum b/go.sum index 3b68aebc34a..ae45a5043af 100644 --- a/go.sum +++ b/go.sum @@ -3,7 +3,6 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -14,9 +13,6 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -35,75 +31,70 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -contrib.go.opencensus.io/exporter/jaeger v0.1.0 h1:WNc9HbA38xEQmsI40Tjd/MNU/g8byN2Of7lwIjv0Jdc= -contrib.go.opencensus.io/exporter/jaeger v0.1.0/go.mod h1:VYianECmuFPwU37O699Vc1GOcy+y8kOsfaxHRImmjbA= -contrib.go.opencensus.io/exporter/prometheus v0.1.0 h1:SByaIoWwNgMdPSgl5sMqM2KDE5H/ukPWBRo314xiDvg= -contrib.go.opencensus.io/exporter/prometheus v0.1.0/go.mod h1:cGFniUXGZlKRjzOyuZJ6mgB+PgBcCIa79kEKR8YCW+A= +contrib.go.opencensus.io/exporter/jaeger v0.2.1 h1:yGBYzYMewVL0yO9qqJv3Z5+IRhPdU7e9o/2oKpX4YvI= +contrib.go.opencensus.io/exporter/jaeger v0.2.1/go.mod h1:Y8IsLgdxqh1QxYxPC5IgXVmBaeLUeQFfBeBi9PbeZd0= +contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= +contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/99designs/gqlgen v0.13.0/go.mod h1:NV130r6f4tpRWuAI+zsrSdooO/eWUv+Gyyoi3rEfXIk= -github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw= -github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= -github.com/DATA-DOG/go-sqlmock v1.3.2 h1:2L2f5t3kKnCLxnClDD/PrDfExFFa1wjESgxHG/B1ibo= -github.com/DATA-DOG/go-sqlmock v1.3.2/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/DataDog/datadog-go v3.5.0+incompatible h1:AShr9cqkF+taHjyQgcBcQUt/ZNK+iPq4ROaZwSX5c/U= +github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= +github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/DataDog/datadog-go v3.5.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20190503082300-0f32ad59ab08 h1:5btKvK+N+FpW0EEgvxq7LWcUEwIRLsL4IwIo0u+Qlhs= -github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20190503082300-0f32ad59ab08/go.mod h1:gMGUEe16aZh0QN941HgDjwrdjU4iTthPoz2/AtDRADE= +github.com/DataDog/datadog-go v4.8.3+incompatible h1:fNGaYSuObuQb5nzeTQqowRAd9bpDIRRV4/gUtIBjh8Q= +github.com/DataDog/datadog-go v4.8.3+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20220622145613-731d59e8b567 h1:Z7zdcyzme2egv0lC43X1Q/+DxHjZflQCnJXX0mDp7+I= +github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20220622145613-731d59e8b567/go.mod h1:/VV3EFO/hTNQZHAqaj+CPGy2+ioFrP4EX3iRwozubhQ= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= -github.com/IBM/sarama v1.41.0 h1:c+fV23/HDO+M88dTYFg7TFRlxU0scgfdcFrQh/8s5Z8= -github.com/IBM/sarama v1.41.0/go.mod h1:JFCPURVskaipJdKRFkiE/OZqQHw7jqliaJmRwXCmSSw= -github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= -github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= -github.com/Masterminds/semver/v3 v3.1.0 h1:Y2lUDsFKVRSYGojLJ1yLxSXdMmMYTYls0rCvoqmMUQk= -github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= -github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= -github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= +github.com/IBM/sarama v1.43.3 h1:Yj6L2IaNvb2mRBop39N7mmJAHBVY3dTPncr3qGVkxPA= +github.com/IBM/sarama v1.43.3/go.mod h1:FVIRaLrhK3Cla/9FfRF5X9Zua2KpS3SYIXxhac1H+FQ= +github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0= +github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= -github.com/agnivade/levenshtein v1.0.3 h1:M5ZnqLOoZR8ygVq0FfkXsNOKzMCk0xRiow0R5+5VkQ0= github.com/agnivade/levenshtein v1.0.3/go.mod h1:4SFRZbbXWLF4MU1T9Qg0pGgH3Pjs+t6ie5efyrwRJXs= -github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8= +github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= +github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY= +github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= +github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= +github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.13.0 h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI= -github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q= github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA= -github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= +github.com/bits-and-blooms/bitset v1.14.3 h1:Gd2c8lSNf9pKXom5JtD7AaKO8o7fGQ2LtFj1436qilA= +github.com/bits-and-blooms/bitset v1.14.3/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/blevesearch/bleve/v2 v2.3.10 h1:z8V0wwGoL4rp7nG/O3qVVLYxUqCbEwskMt4iRJsPLgg= -github.com/blevesearch/bleve/v2 v2.3.10/go.mod h1:RJzeoeHC+vNHsoLR54+crS1HmOWpnH87fL70HAUCzIA= -github.com/blevesearch/bleve_index_api v1.0.6 h1:gyUUxdsrvmW3jVhhYdCVL6h9dCjNT/geNU7PxGn37p8= -github.com/blevesearch/bleve_index_api v1.0.6/go.mod h1:YXMDwaXFFXwncRS8UobWs7nvo0DmusriM1nztTlj1ms= -github.com/blevesearch/geo v0.1.18 h1:Np8jycHTZ5scFe7VEPLrDoHnnb9C4j636ue/CGrhtDw= -github.com/blevesearch/geo v0.1.18/go.mod h1:uRMGWG0HJYfWfFJpK3zTdnnr1K+ksZTuWKhXeSokfnM= +github.com/blevesearch/bleve/v2 v2.4.2 h1:NooYP1mb3c0StkiY9/xviiq2LGSaE8BQBCc/pirMx0U= +github.com/blevesearch/bleve/v2 v2.4.2/go.mod h1:ATNKj7Yl2oJv/lGuF4kx39bST2dveX6w0th2FFYLkc8= +github.com/blevesearch/bleve_index_api v1.1.12 h1:P4bw9/G/5rulOF7SJ9l4FsDoo7UFJ+5kexNy1RXfegY= +github.com/blevesearch/bleve_index_api v1.1.12/go.mod h1:PbcwjIcRmjhGbkS/lJCpfgVSMROV6TRubGGAODaK1W8= +github.com/blevesearch/geo v0.1.20 h1:paaSpu2Ewh/tn5DKn/FB5SzvH0EWupxHEIwbCk/QPqM= +github.com/blevesearch/geo v0.1.20/go.mod h1:DVG2QjwHNMFmjo+ZgzrIq2sfCh6rIHzy9d9d0B59I6w= github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo= github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M= github.com/blevesearch/segment v0.9.1 h1:+dThDy+Lvgj5JMxhmOVlgFfkUtZV2kw49xax4+jTfSU= @@ -112,146 +103,153 @@ github.com/blevesearch/snowballstem v0.9.0 h1:lMQ189YspGP6sXvZQ4WZ+MLawfV8wOmPoD github.com/blevesearch/snowballstem v0.9.0/go.mod h1:PivSj3JMc8WuaFkTSRDW2SlrulNWPl4ABg1tC/hlgLs= github.com/blevesearch/upsidedown_store_api v1.0.2 h1:U53Q6YoWEARVLd1OYNc9kvhBMGZzVrdmaozG2MfoB+A= github.com/blevesearch/upsidedown_store_api v1.0.2/go.mod h1:M01mh3Gpfy56Ps/UXHjEO/knbqyQ1Oamg8If49gRwrQ= -github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chewxy/math32 v1.10.1 h1:LFpeY0SLJXeaiej/eIp2L40VYfscTvKh/FSEZ68uMkU= -github.com/chewxy/math32 v1.10.1/go.mod h1:dOB2rcuFrCn6UHrze36WSLVPKtzPMRAQvBvUwkSsLqs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chewxy/math32 v1.11.0 h1:8sek2JWqeaKkVnHa7bPVqCEOUPbARo4SGxs6toKyAOo= +github.com/chewxy/math32 v1.11.0/go.mod h1:dOB2rcuFrCn6UHrze36WSLVPKtzPMRAQvBvUwkSsLqs= +github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs= +github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmtGzzhLsnLs= +github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA= github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= -github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= +github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/d4l3k/messagediff v1.2.1 h1:ZcAIMYsUg0EAp9X+tt8/enBE/Q8Yd5kzPynLyKptt9U= -github.com/d4l3k/messagediff v1.2.1/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkEQxENCrlLo= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= -github.com/dgraph-io/badger/v4 v4.2.0 h1:kJrlajbXXL9DFTNuhhu9yCx7JJa4qpYWxtE8BzuWsEs= -github.com/dgraph-io/badger/v4 v4.2.0/go.mod h1:qfCqhPoWDFJRx1gp5QwwyGo8xk1lbHUxvK9nK0OGAak= -github.com/dgraph-io/dgo/v230 v230.0.2-0.20240314155021-7b8d289e37f3 h1:SmlpAiFh38JkDUzMe2W/AIqel9HysM+4FIBNfxrsAO4= -github.com/dgraph-io/dgo/v230 v230.0.2-0.20240314155021-7b8d289e37f3/go.mod h1:N63npbH9PPVitTNUW4xlT66LNsMhqjuz57ZvgUmgATI= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgraph-io/badger/v4 v4.3.0 h1:lcsCE1/1qrRhqP+zYx6xDZb8n7U+QlwNicpc676Ub40= +github.com/dgraph-io/badger/v4 v4.3.0/go.mod h1:Sc0T595g8zqAQRDf44n+z3wG4BOqLwceaFntt8KPxUM= +github.com/dgraph-io/dgo/v240 v240.0.0 h1:LgpaQoQuM8YD3/oHjjqzCfORPlw34OnIcA/jMiKuDJc= +github.com/dgraph-io/dgo/v240 v240.0.0/go.mod h1:YrKW6k5cJpG6qP+MtNlXBogNMTupDmnnmiF6heC0Uao= github.com/dgraph-io/gqlgen v0.13.2 h1:TNhndk+eHKj5qE7BenKKSYdSIdOGhLqxR1rCiMso9KM= github.com/dgraph-io/gqlgen v0.13.2/go.mod h1:iCOrOv9lngN7KAo+jMgvUPVDlYHdf7qDwsTkQby2Sis= github.com/dgraph-io/gqlparser/v2 v2.1.1/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU= -github.com/dgraph-io/gqlparser/v2 v2.2.1 h1:15msK9XEHOSrRqQO48UU+2ZTf1R1U8+tfL9H5D5/eQQ= -github.com/dgraph-io/gqlparser/v2 v2.2.1/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU= +github.com/dgraph-io/gqlparser/v2 v2.2.2 h1:CnxXOKL4EPguKqcGV/z4u4VoW5izUkOTIsNM6xF+0f4= +github.com/dgraph-io/gqlparser/v2 v2.2.2/go.mod h1:MYS4jppjyx8b9tuUtjV7jU1UFZK6P9fvO8TsIsQtRKU= github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15 h1:X2NRsgAtVUAp2nmTPCq+x+wTcRRrj74CEpy7E0Unsl4= github.com/dgraph-io/graphql-transport-ws v0.0.0-20210511143556-2cef522f1f15/go.mod h1:7z3c/5w0sMYYZF5bHsrh8IH4fKwG5O5Y70cPH1ZLLRQ= -github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= -github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= +github.com/dgraph-io/ristretto v0.1.2-0.20240116140435-c67e07994f91 h1:Pux6+xANi0I7RRo5E1gflI4EZ2yx3BGZ75JkAIvGEOA= +github.com/dgraph-io/ristretto v0.1.2-0.20240116140435-c67e07994f91/go.mod h1:swkazRqnUf1N62d0Nutz7KIj2UKqsm/H8tD0nBJAXqM= github.com/dgraph-io/simdjson-go v0.3.0 h1:h71LO7vR4LHMPUhuoGN8bqGm1VNfGOlAG8BI6iDUKw0= github.com/dgraph-io/simdjson-go v0.3.0/go.mod h1:Otpysdjaxj9OGaJusn4pgQV7OFh2bELuHANq0I78uvY= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/dgryski/go-groupvarint v0.0.0-20190318181831-5ce5df8ca4e1 h1:RSnSk6/ViWmqng/mNcPztSPgr6/4EVDxMmBH/a0w/6I= -github.com/dgryski/go-groupvarint v0.0.0-20190318181831-5ce5df8ca4e1/go.mod h1:MlkUQveSLEDbIgq2r1e++tSf0zfzU9mQpa9Qkczl+9Y= +github.com/dgryski/go-groupvarint v0.0.0-20230630160417-2bfb7969fb3c h1:cHaw4wmusVzAZLEPWOCCGCfu6UvFXx9UboCHQCnjvxY= +github.com/dgryski/go-groupvarint v0.0.0-20230630160417-2bfb7969fb3c/go.mod h1:MlkUQveSLEDbIgq2r1e++tSf0zfzU9mQpa9Qkczl+9Y= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dgryski/trifles v0.0.0-20190318185328-a8d75aae118c h1:TUuUh0Xgj97tLMNtWtNvI9mIV6isjEb9lBMNv+77IGM= github.com/dgryski/trifles v0.0.0-20190318185328-a8d75aae118c/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA= -github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= -github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY= -github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= +github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48 h1:fRzb/w+pyskVMQ+UbP35JkH8yB7MYb4q/qhBarqZE6g= +github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI= +github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= +github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-resiliency v1.4.0 h1:3OK9bWpPk5q6pbFAaYSEwD9CLUSHG8bnZuqX2yMt3B0= -github.com/eapache/go-resiliency v1.4.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/eapache/go-resiliency v1.7.0 h1:n3NRTnBn5N0Cbi/IeOHuQn9s2UwVUH7Ga0ZWcP+9JTA= +github.com/eapache/go-resiliency v1.7.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= -github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= -github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= +github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw= +github.com/felixge/fgprof v0.9.5 h1:8+vR6yu2vvSKn08urWyEuxx75NWPEvybbkBirEpsbVY= +github.com/felixge/fgprof v0.9.5/go.mod h1:yKl+ERSa++RYOs32d8K6WEXCB4uXdLls4ZaZPpayhMM= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= -github.com/frankban/quicktest v1.10.2 h1:19ARM85nVi4xH7xPXuc5eM/udya5ieh7b/Sv+d844Tk= -github.com/frankban/quicktest v1.10.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= -github.com/getsentry/sentry-go v0.6.0 h1:kPd+nr+dlXmaarUBg7xlC/qn+7wyMJL6PMsSn5fA+RM= -github.com/getsentry/sentry-go v0.6.0/go.mod h1:0yZBuzSvbZwBnvaF9VwZIMen3kXscY8/uasKtAX1qG8= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/getsentry/sentry-go v0.29.0 h1:YtWluuCFg9OfcqnaujpY918N/AhCCwarIDWOYSBAjCA= +github.com/getsentry/sentry-go v0.29.0/go.mod h1:jhPesDAL0Q0W2+2YEuVOvdWmVtdsr1+jtBrlDEVWwLY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= -github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= -github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= github.com/go-chi/chi v3.3.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= -github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= -github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= +github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E= +github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= -github.com/go-sql-driver/mysql v0.0.0-20190330032241-c0f6b444ad8f h1:yooNaEJy76Nvbcy/J0moVJfoNK4fDmSAO31V5iBM47c= -github.com/go-sql-driver/mysql v0.0.0-20190330032241-c0f6b444ad8f/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= +github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= +github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= -github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= -github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw= +github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= +github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY= github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE= -github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= +github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 h1:gtexQ/VGyN+VVFRXSFiguSNcXmS6rkKT+X7FdIrTtfo= -github.com/golang/geo v0.0.0-20210211234256-740aa86cb551/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= +github.com/golang/geo v0.0.0-20230421003525-6adc56603217 h1:HKlyj6in2JV6wVkmQ4XmG/EIm+SCYlPZ+V4GWit7Z+I= +github.com/golang/geo v0.0.0-20230421003525-6adc56603217/go.mod h1:8wI0hitZ3a1IxZfeH3/5I97CI8i5cLGsYe7xNhQGs9U= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68= -github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= +github.com/golang/glog v1.2.2 h1:1+mZ9upx1Dh6FmUTFR1naJ77miKiXgALjWOZ3NVFPmY= +github.com/golang/glog v1.2.2/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -283,17 +281,14 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/codesearch v1.0.0 h1:z4h5JoHkUS+GqxqPDrldC3Y0Qq0vHAGgaDEW5pWU/ys= -github.com/google/codesearch v1.0.0/go.mod h1:qCnXDFnak/trCmLaE50kgPte3AX9jSeruZexWEOivi0= -github.com/google/flatbuffers v1.12.1 h1:MVlul7pQNoDzWRLTw5imwYsl+usrS1TXG2H4jg6ImGw= -github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/codesearch v1.2.0 h1:VlyAH+AntnIbGGArOUs6sEBdPVwYvf1e8Uw3/TC77cA= +github.com/google/codesearch v1.2.0/go.mod h1:9wQjQDVAP7Mvt96tw1KqVeXncdBLOWUYdxRiHlsG6Xc= +github.com/google/flatbuffers v24.3.25+incompatible h1:CX395cjN9Kke9mmalRoL3d81AtFUxJM+yDthflgJGkI= +github.com/google/flatbuffers v24.3.25+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -301,17 +296,16 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -319,95 +313,85 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= +github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 h1:c5FlPPgxOn7kJz3VoPLkQYQXGBS3EklQ4Zfi57uOuqQ= +github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/graph-gophers/graphql-go v1.3.0 h1:Eb9x/q6MFpCLz7jBCiP/WTxjSDrYLR1QY41SORZyNJ0= -github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/graph-gophers/graphql-go v1.5.0 h1:fDqblo50TEpD0LY7RXk/LFVYEVqo3+tXMNMPSVXA1yc= +github.com/graph-gophers/graphql-go v1.5.0/go.mod h1:YtmJZDLbF1YYNrlNAuiO5zAStUWc3XZT07iGsVqe1Os= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0 h1:bM6ZAFZmc/wPFaRDi0d5L7hGEZEx/2u+Tmr2evNHDiI= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjwqUPTYmYuemVOx+Ys= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0/go.mod h1:ggCgvZ2r7uOoQjOyu2Y1NhHmEPPzzuhWgcza5M1Ji1I= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= -github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= -github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= -github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM= -github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= +github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= +github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 h1:iBt4Ew4XEGLfh6/bPk4rSYmuZJGizr6/x/AEizP0CQc= +github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8/go.mod h1:aiJI+PIApBRQG7FZTEBx5GiiX+HbOHilUdNxUZi4eV0= +github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts= +github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= -github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= +github.com/hashicorp/go-sockaddr v1.0.6 h1:RSG8rKU28VTUTvEKghe5gIhIQpv8evvNpnDEyqO4u9I= +github.com/hashicorp/go-sockaddr v1.0.6/go.mod h1:uoUUmtwU7n9Dv3O4SNLeFvg0SxQ3lyjsj6+CCykpaxI= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/hcl v1.0.1-vault-5 h1:kI3hhbbyzr4dldA8UdTb7ZlVVlI2DACdCfz31RPDgJM= +github.com/hashicorp/hcl v1.0.1-vault-5/go.mod h1:XYhtn6ijBSAj6n4YqAaf7RBPS4I06AItNorpy+MoQNM= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/vault/api v1.0.4 h1:j08Or/wryXT4AcHj1oCbMd7IijXcKzYUGw59LGu9onU= -github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q= -github.com/hashicorp/vault/sdk v0.1.13 h1:mOEPeOhT7jl0J4AMl1E705+BcmeRs1VmKNb9F0sMLy8= -github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= -github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/hashicorp/vault/api v1.15.0 h1:O24FYQCWwhwKnF7CuSqP30S51rTV7vz1iACXE/pj5DA= +github.com/hashicorp/vault/api v1.15.0/go.mod h1:+5YTO09JGn0u+b6ySD/LLVf8WkJCPLAL2Vkmrn2+CM8= +github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= +github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= -github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= -github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= -github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= @@ -421,83 +405,75 @@ github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= -github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= -github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= -github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= -github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U= -github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw= -github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid/v2 v2.0.3 h1:DNljyrHyxlkk8139OXIAAauCwV8eQGDD6Z8YqnDXdZw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.3/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= +github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= -github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= -github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs= github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= -github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/matryer/moq v0.0.0-20200106131100-75d0ddfc0007/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= -github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= -github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/minio/minio-go/v6 v6.0.55 h1:Hqm41952DdRNKXM+6hCnPXCsHCYSgLf03iuYoxJG2Wk= -github.com/minio/minio-go/v6 v6.0.55/go.mod h1:KQMM+/44DSlSGSQWSfRrAZ12FVMmpWNuX37i2AX0jfI= -github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU= +github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw= +github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= +github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= +github.com/minio/minio-go/v6 v6.0.57 h1:ixPkbKkyD7IhnluRgQpGSpHdpvNVaW6OD5R9IAO/9Tw= +github.com/minio/minio-go/v6 v6.0.57/go.mod h1:5+R/nM9Pwrh0vqF+HbYYDQ84wdUFPyXHkrdT4AIkifM= github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= +github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM= +github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -507,7 +483,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/panicwrap v1.0.0 h1:67zIyVakCIvcs69A0FGfZjBdPleaonSgGlXRSRlb6fE= github.com/mitchellh/panicwrap v1.0.0/go.mod h1:pKvZHwWrZowLUzftuFq7coarnxbBXU4aQh3N0BJOeeA= -github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= +github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -519,131 +496,129 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= -github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= -github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= +github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/basictracer-go v1.1.0/go.mod h1:V2HZueSJEp879yv285Aap1BS69fQMD+MNP1mRs6mBQc= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/ory/dockertest v3.3.4+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= +github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/paulmach/go.geojson v0.0.0-20170327170536-40612a87147b h1:rY7xFF9ktAzkr2OXol6GU9lrEw5PAMd5VV/5/T0A+FU= -github.com/paulmach/go.geojson v0.0.0-20170327170536-40612a87147b/go.mod h1:YaKx1hKpWF+T2oj2lFJPsW/t1Q5e1jQI61eoQSTwpIs= -github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= +github.com/paulmach/go.geojson v1.5.0 h1:7mhpMK89SQdHFcEGomT7/LuJhwhEgfmpWYVlVmLEdQw= +github.com/paulmach/go.geojson v1.5.0/go.mod h1:DgdUy2rRVDDVgKqrjMe2vZAHMfhDTrjVKt3LmHIXGbU= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI= -github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= -github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 h1:jYi87L8j62qkXzaYHAQAhEapgukhenIMZRBKTNRLHJ4= +github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1 h1:F++O52m40owAmADcojzM+9gyjmMOY/T4oYJkgFDH8RE= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA= +github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= +github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= -github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0= +github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= -github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI= +github.com/prometheus/statsd_exporter v0.27.1 h1:tcRJOmwlA83HPfWzosAgr2+zEN5XDFv+M2mn/uYkn5Y= +github.com/prometheus/statsd_exporter v0.27.1/go.mod h1:vA6ryDfsN7py/3JApEst6nLTJboq66XsNcJGNmC88NQ= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/vfsgen v0.0.0-20180121065927-ffb13db8def0/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/sourcegraph/appdash v0.0.0-20180110180208-2cc67fd64755/go.mod h1:V952P4GGl1v/MMynLwxVdWEbSZJx+n0oOO3ljnez+WU= -github.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67/go.mod h1:tNZjgbYncKL5HxvDULAr/mWDmFz4B7H8yrXEDlnoIiw= +github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= +github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= -github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= -github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -657,98 +632,95 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= -github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/tinylib/msgp v1.1.2 h1:gWmO7n0Ys2RBEb7GPYB9Ujq8Mk5p2U08lRnmMcGy6BQ= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= +github.com/tinylib/msgp v1.2.1 h1:6ypy2qcCznxpP4hpORzhtXyTqrBs7cfM9MCCWY8zsmU= +github.com/tinylib/msgp v1.2.1/go.mod h1:2vIGs3lcUo8izAATNobrCHevYZC/LMsJtw4JPiYPHro= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/twpayne/go-geom v1.0.5 h1:XZBfc3Wx0dj4p17ZfmzqxnU9fTTa3pY4YG5RngKsVNI= -github.com/twpayne/go-geom v1.0.5/go.mod h1:gO3i8BeAvZuihwwXcw8dIOWXebCzTmy3uvXj9dZG2RA= -github.com/twpayne/go-kml v1.0.0/go.mod h1:LlvLIQSfMqYk2O7Nx8vYAbSLv4K9rjMvLlEdUKWdjq0= -github.com/twpayne/go-polyline v1.0.0/go.mod h1:ICh24bcLYBX8CknfvNPKqoTbe+eg+MX1NPyJmSBo7pU= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/twpayne/go-geom v1.5.7 h1:7fdceDUr03/MP7rAKOaTV6x9njMiQdxB/D0PDzMTCDc= +github.com/twpayne/go-geom v1.5.7/go.mod h1:y4fTAQtLedXW8eG2Yo4tYrIGN1yIwwKkmA+K3iSHKBA= +github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= +github.com/uber/jaeger-client-go v2.28.0+incompatible h1:G4QSBfvPKvg5ZM2j9MrJFdfI5iSljY/WnJqOGFao6HI= +github.com/uber/jaeger-client-go v2.28.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= -github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= -github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= -github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/vektah/dataloaden v0.2.1-0.20190515034641-a19b9a6e7c9e/go.mod h1:/HUdMve7rvxZma+2ZELQeNh88+003LL7Pf/CZ089j8U= github.com/vektah/gqlparser/v2 v2.1.0/go.mod h1:SyUiHgLATUR8BiYURfTirrTcGpcE+4XkV2se04Px1Ms= github.com/viterin/partial v1.1.0 h1:iH1l1xqBlapXsYzADS1dcbizg3iQUKTU1rbwkHv/80E= github.com/viterin/partial v1.1.0/go.mod h1:oKGAo7/wylWkJTLrWX8n+f4aDPtQMQ6VG4dd2qur5QA= github.com/viterin/vek v0.4.2 h1:Vyv04UjQT6gcjEFX82AS9ocgNbAJqsHviheIBdPlv5U= github.com/viterin/vek v0.4.2/go.mod h1:A4JRAe8OvbhdzBL5ofzjBS0J29FyUrf95tQogvtHHUc= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= +github.com/xdg/scram v1.0.5 h1:TuS0RFmt5Is5qm9Tm2SoD89OPqe4IRiFtyFY4iwWXsw= +github.com/xdg/scram v1.0.5/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v1.0.3 h1:cmL5Enob4W83ti/ZHuZLuKD/xqJfus4fVPwE+/BDm+4= github.com/xdg/stringprep v1.0.3/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= -github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= -github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= -github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/etcd/client/pkg/v3 v3.5.9 h1:oidDC4+YEuSIQbsR94rY9gur91UPL6DnxDCIYd2IGsE= -go.etcd.io/etcd/client/pkg/v3 v3.5.9/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4= -go.etcd.io/etcd/raft/v3 v3.5.9 h1:ZZ1GIHoUlHsn0QVqiRysAm3/81Xx7+i2d7nSdWxlOiI= -go.etcd.io/etcd/raft/v3 v3.5.9/go.mod h1:WnFkqzFdZua4LVlVXQEGhmooLeyS7mqzS4Pf4BCVqXg= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.etcd.io/etcd/client/pkg/v3 v3.5.16 h1:ZgY48uH6UvB+/7R9Yf4x574uCO3jIx0TRDyetSfId3Q= +go.etcd.io/etcd/client/pkg/v3 v3.5.16/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E= +go.etcd.io/etcd/raft/v3 v3.5.16 h1:zBXA3ZUpYs1AwiLGPafYAKKl/CORn/uaxYDwlNwndAk= +go.etcd.io/etcd/raft/v3 v3.5.16/go.mod h1:P4UP14AxofMJ/54boWilabqqWoW9eLodl6I5GdGzazI= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= +go.opentelemetry.io/otel v1.6.3/go.mod h1:7BgNga5fNlF/iZjG06hM3yofffp0ofKCDwSXx1GC4dI= +go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw= +go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 h1:dIIDULZJpgdiHz5tXrTgKIMLkus6jEFa7x5SOKcyR7E= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0/go.mod h1:jlRVBe7+Z1wyxFSUs48L6OBQZ5JwH2Hg/Vbl+t9rAgI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 h1:JAv0Jwtl01UFiyWZEMiJZBiTlv5A50zNs8lsthXqIio= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0/go.mod h1:QNKLmUEAq2QUbPQUfvw4fmv0bgbK7UlOSFCnXyfvSNc= +go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc= +go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= +go.opentelemetry.io/otel/sdk v1.29.0 h1:vkqKjk7gwhS8VaWb0POZKmIEDimRCMsopNYnriHyryo= +go.opentelemetry.io/otel/sdk v1.29.0/go.mod h1:pM8Dx5WKnvxLCb+8lG1PRNIDxu9g9b9g59Qr7hfAAok= +go.opentelemetry.io/otel/trace v1.6.3/go.mod h1:GNJQusJlUgZl9/TQBPKU/Y/ty+0iVB5fjhKeJGZPGFs= +go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4= +go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= -go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= -go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -762,8 +734,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= -golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= +golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= +golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -777,8 +749,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -787,32 +757,27 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= -golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -829,26 +794,24 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= 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.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= 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= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -859,37 +822,30 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -903,54 +859,50 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= -golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -958,7 +910,6 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -970,8 +921,6 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1000,17 +949,10 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= -golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= +golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= +golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1020,8 +962,6 @@ gonum.org/v1/gonum v0.8.2 h1:CCXrcPKiGGotvnN6jfUsKk4rRqm7q09/YbKb5xCEvtM= gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= -google.golang.org/api v0.3.2/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -1038,23 +978,16 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.122.0 h1:zDobeejm3E7pEG1mNHvdxvjs5XJoCMzyNH+CmwL94Es= -google.golang.org/api v0.122.0/go.mod h1:gcitW0lvnyWjSp9nKxAbdHKIZ6vF4aajGueeslZOyms= +google.golang.org/api v0.196.0 h1:k/RafYqebaIJBO3+SMnfEGtFVlvp5vSgqTUF54UN/zg= +google.golang.org/api v0.196.0/go.mod h1:g9IL21uGkYgvQ5BZg6BAtoGJQIm8r6EgaAbpNey5wBE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -1082,21 +1015,13 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 h1:8EeVk1VKMD+GD/neyEHGmz7pFblqPjHoi+PGQIlLx2s= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc= +google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -1106,14 +1031,9 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= -google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= -google.golang.org/grpc/examples v0.0.0-20230821201920-d51b3f41716d h1:E5qrHVmwghJoWs1NhlVvlzx/TL4WgUnnxm1IpOAfhvo= -google.golang.org/grpc/examples v0.0.0-20230821201920-d51b3f41716d/go.mod h1:Tv7vK6WISirChRuVsnMR6m9Quxyd9k2vPozP/nyYv/0= +google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= +google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1126,12 +1046,14 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= -gopkg.in/DataDog/dd-trace-go.v1 v1.22.0 h1:gpWsqqkwUldNZXGJqT69NU9MdEDhLboK1C4nMgR0MWw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/DataDog/dd-trace-go.v1 v1.22.0/go.mod h1:DVp8HmDh8PuTu2Z0fVVlBsyWaC++fzwVCaGWylTe3tg= +gopkg.in/DataDog/dd-trace-go.v1 v1.67.1 h1:frgcpZ18wmpj+/TwyDJM8057M65aOdgaxLiZ8pb1PFU= +gopkg.in/DataDog/dd-trace-go.v1 v1.67.1/go.mod h1:6DdiJPKOeJfZyd/IUGCAd5elY8qPGkztK6wbYYsMjag= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= -gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1139,39 +1061,34 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= -gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/square/go-jose.v2 v2.3.1 h1:SK5KegNXmKmqE342YYN2qPHEnUYeoMiXXl1poUlI+o4= -gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= -gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= +gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sourcegraph.com/sourcegraph/appdash v0.0.0-20180110180208-2cc67fd64755/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= +sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67/go.mod h1:L5q+DGLGOQFpo1snNEkLOJT2d1YTW66rWNzatr3He1k= diff --git a/graphql/admin/add_group.go b/graphql/admin/add_group.go index 1e7a150af07..ea5a7aeb4fe 100644 --- a/graphql/admin/add_group.go +++ b/graphql/admin/add_group.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) type addGroupRewriter resolve.AddRewriter diff --git a/graphql/admin/admin.go b/graphql/admin/admin.go index 5143e72f385..95fc7b1459f 100644 --- a/graphql/admin/admin.go +++ b/graphql/admin/admin.go @@ -27,13 +27,13 @@ import ( "github.com/pkg/errors" badgerpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/graphql/admin/assign.go b/graphql/admin/assign.go index 0693d108207..6eec6b08b00 100644 --- a/graphql/admin/assign.go +++ b/graphql/admin/assign.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" ) const ( diff --git a/graphql/admin/backup.go b/graphql/admin/backup.go index 7598195ef3b..7c6d95891f0 100644 --- a/graphql/admin/backup.go +++ b/graphql/admin/backup.go @@ -23,10 +23,10 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" ) type backupInput struct { diff --git a/graphql/admin/config.go b/graphql/admin/config.go index 88fa6fece4d..88d0350ebba 100644 --- a/graphql/admin/config.go +++ b/graphql/admin/config.go @@ -23,9 +23,9 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/worker" ) type configInput struct { diff --git a/graphql/admin/current_user.go b/graphql/admin/current_user.go index 6b119b4cd6b..733e628d55e 100644 --- a/graphql/admin/current_user.go +++ b/graphql/admin/current_user.go @@ -19,10 +19,10 @@ package admin import ( "context" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) type currentUserResolver struct { diff --git a/graphql/admin/draining.go b/graphql/admin/draining.go index bfe68753ee1..bfa49cc7ead 100644 --- a/graphql/admin/draining.go +++ b/graphql/admin/draining.go @@ -22,9 +22,9 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) func resolveDraining(ctx context.Context, m schema.Mutation) (*resolve.Resolved, bool) { diff --git a/graphql/admin/enterpriseLicense.go b/graphql/admin/enterpriseLicense.go index 6b8f154e673..5862f9ffb0b 100644 --- a/graphql/admin/enterpriseLicense.go +++ b/graphql/admin/enterpriseLicense.go @@ -20,10 +20,10 @@ import ( "context" "encoding/json" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" ) type enterpriseLicenseInput struct { diff --git a/graphql/admin/export.go b/graphql/admin/export.go index 06cd734c892..9d632f6a91a 100644 --- a/graphql/admin/export.go +++ b/graphql/admin/export.go @@ -25,11 +25,11 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) const notSet = math.MaxInt64 diff --git a/graphql/admin/health.go b/graphql/admin/health.go index e11357060d1..a45815a93d1 100644 --- a/graphql/admin/health.go +++ b/graphql/admin/health.go @@ -22,10 +22,10 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) func resolveHealth(ctx context.Context, q schema.Query) *resolve.Resolved { diff --git a/graphql/admin/http.go b/graphql/admin/http.go index 0715a9148b4..f0739d5fbd9 100644 --- a/graphql/admin/http.go +++ b/graphql/admin/http.go @@ -31,13 +31,13 @@ import ( "github.com/pkg/errors" "go.opencensus.io/trace" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/ee/audit" - "github.com/dgraph-io/dgraph/graphql/api" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/graphql/subscription" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/ee/audit" + "github.com/dgraph-io/dgraph/v24/graphql/api" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/subscription" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/graphql-transport-ws/graphqlws" ) diff --git a/graphql/admin/list_backups.go b/graphql/admin/list_backups.go index ba0be0c04ea..76fb9f7c325 100644 --- a/graphql/admin/list_backups.go +++ b/graphql/admin/list_backups.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) type lsBackupInput struct { diff --git a/graphql/admin/login.go b/graphql/admin/login.go index 63b312fe997..6d4bead51e5 100644 --- a/graphql/admin/login.go +++ b/graphql/admin/login.go @@ -22,10 +22,10 @@ import ( "github.com/golang/glog" - dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" + dgoapi "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" ) type loginInput struct { diff --git a/graphql/admin/moveTablet.go b/graphql/admin/moveTablet.go index c0ab45fe043..d044f63ac87 100644 --- a/graphql/admin/moveTablet.go +++ b/graphql/admin/moveTablet.go @@ -21,11 +21,11 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) type moveTabletInput struct { diff --git a/graphql/admin/namespace.go b/graphql/admin/namespace.go index 7263e24ce54..7822bf239bd 100644 --- a/graphql/admin/namespace.go +++ b/graphql/admin/namespace.go @@ -23,10 +23,10 @@ import ( "fmt" "strconv" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) type addNamespaceInput struct { diff --git a/graphql/admin/removeNode.go b/graphql/admin/removeNode.go index 30ec246fb45..72de2cf8337 100644 --- a/graphql/admin/removeNode.go +++ b/graphql/admin/removeNode.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" ) type removeNodeInput struct { diff --git a/graphql/admin/reset_password.go b/graphql/admin/reset_password.go index 221aaff8e92..6250e8d3f6e 100644 --- a/graphql/admin/reset_password.go +++ b/graphql/admin/reset_password.go @@ -23,9 +23,9 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" ) func resolveResetPassword(ctx context.Context, m schema.Mutation) (*resolve.Resolved, bool) { diff --git a/graphql/admin/restore.go b/graphql/admin/restore.go index da664cca2d2..b20add7dde1 100644 --- a/graphql/admin/restore.go +++ b/graphql/admin/restore.go @@ -24,11 +24,11 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" ) type restoreInput struct { diff --git a/graphql/admin/schema.go b/graphql/admin/schema.go index 1e8e74d2034..0388202295e 100644 --- a/graphql/admin/schema.go +++ b/graphql/admin/schema.go @@ -22,12 +22,12 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/query" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/query" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) type getSchemaResolver struct { diff --git a/graphql/admin/shutdown.go b/graphql/admin/shutdown.go index 10e602dab81..7ccf5424ff1 100644 --- a/graphql/admin/shutdown.go +++ b/graphql/admin/shutdown.go @@ -21,9 +21,9 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) func resolveShutdown(ctx context.Context, m schema.Mutation) (*resolve.Resolved, bool) { diff --git a/graphql/admin/state.go b/graphql/admin/state.go index 4240eb64983..461fb4ed266 100644 --- a/graphql/admin/state.go +++ b/graphql/admin/state.go @@ -8,11 +8,11 @@ import ( "github.com/gogo/protobuf/jsonpb" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) type membershipState struct { diff --git a/graphql/admin/task.go b/graphql/admin/task.go index d2131332c16..e30a08a8aa6 100644 --- a/graphql/admin/task.go +++ b/graphql/admin/task.go @@ -25,10 +25,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" ) type taskInput struct { diff --git a/graphql/admin/update_group.go b/graphql/admin/update_group.go index b58bcb4567d..77b92046483 100644 --- a/graphql/admin/update_group.go +++ b/graphql/admin/update_group.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + dgoapi "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) type updateGroupRewriter resolve.UpdateRewriter diff --git a/graphql/authorization/auth.go b/graphql/authorization/auth.go index d56344ede05..7ba67e9cb12 100644 --- a/graphql/authorization/auth.go +++ b/graphql/authorization/auth.go @@ -29,11 +29,11 @@ import ( "strings" "time" + "github.com/go-jose/go-jose/v4" "github.com/golang-jwt/jwt/v5" "github.com/golang/glog" "github.com/pkg/errors" "google.golang.org/grpc/metadata" - "gopkg.in/square/go-jose.v2" "github.com/dgraph-io/gqlparser/v2/gqlerror" ) diff --git a/graphql/bench/auth_test.go b/graphql/bench/auth_test.go index ac99266f410..2b0ed8259a3 100644 --- a/graphql/bench/auth_test.go +++ b/graphql/bench/auth_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) const ( @@ -119,7 +119,7 @@ func clearAll(b require.TestingT, metaInfo *testutil.AuthMeta) { // go test -bench=. -benchtime=60s // goos: linux // goarch: amd64 -// pkg: github.com/dgraph-io/dgraph/graphql/e2e/auth/bench +// pkg: github.com/dgraph-io/dgraph/v24/graphql/e2e/auth/bench // Auth // BenchmarkNestedQuery-8 88 815315761 ns/op // BenchmarkOneLevelQuery-8 4357 15626384 ns/op diff --git a/graphql/dgraph/execute.go b/graphql/dgraph/execute.go index 561647da6fd..da6fe80900c 100644 --- a/graphql/dgraph/execute.go +++ b/graphql/dgraph/execute.go @@ -23,10 +23,10 @@ import ( "github.com/golang/glog" "go.opencensus.io/trace" - dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + dgoapi "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) type DgraphEx struct{} diff --git a/graphql/dgraph/graphquery.go b/graphql/dgraph/graphquery.go index 23519f45a78..5e965e9c23a 100644 --- a/graphql/dgraph/graphquery.go +++ b/graphql/dgraph/graphquery.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/x" ) // AsString writes query as an indented dql query string. AsString doesn't diff --git a/graphql/e2e/admin_auth/poorman_auth/admin_auth_test.go b/graphql/e2e/admin_auth/poorman_auth/admin_auth_test.go index d25f963864a..576fcad777d 100644 --- a/graphql/e2e/admin_auth/poorman_auth/admin_auth_test.go +++ b/graphql/e2e/admin_auth/poorman_auth/admin_auth_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/graphql/e2e/admin_auth/poorman_auth_with_acl/admin_auth_test.go b/graphql/e2e/admin_auth/poorman_auth_with_acl/admin_auth_test.go index 792f422d4d1..a68481d706f 100644 --- a/graphql/e2e/admin_auth/poorman_auth_with_acl/admin_auth_test.go +++ b/graphql/e2e/admin_auth/poorman_auth_with_acl/admin_auth_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/graphql/e2e/auth/add_mutation_test.go b/graphql/e2e/auth/add_mutation_test.go index 285c6a2928e..57cf4fe3260 100644 --- a/graphql/e2e/auth/add_mutation_test.go +++ b/graphql/e2e/auth/add_mutation_test.go @@ -27,7 +27,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" ) func (p *Project) delete(t *testing.T, user, role string) { diff --git a/graphql/e2e/auth/auth_test.go b/graphql/e2e/auth/auth_test.go index 4b19e8a90c7..8a1b4976ebf 100644 --- a/graphql/e2e/auth/auth_test.go +++ b/graphql/e2e/auth/auth_test.go @@ -33,10 +33,10 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/graphql/e2e/auth/debug_off/debugoff_test.go b/graphql/e2e/auth/debug_off/debugoff_test.go index 155dbce2da2..d8859e9b791 100644 --- a/graphql/e2e/auth/debug_off/debugoff_test.go +++ b/graphql/e2e/auth/debug_off/debugoff_test.go @@ -13,10 +13,10 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/graphql/e2e/auth/delete_mutation_test.go b/graphql/e2e/auth/delete_mutation_test.go index a34da1d701c..389632163be 100644 --- a/graphql/e2e/auth/delete_mutation_test.go +++ b/graphql/e2e/auth/delete_mutation_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" ) func (c *Column) add(t *testing.T, user, role string) { diff --git a/graphql/e2e/auth/update_mutation_test.go b/graphql/e2e/auth/update_mutation_test.go index 3d7dcea0807..1daddfbc7ed 100644 --- a/graphql/e2e/auth/update_mutation_test.go +++ b/graphql/e2e/auth/update_mutation_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" ) func getAllProjects(t *testing.T, users, roles []string) []string { diff --git a/graphql/e2e/auth_closed_by_default/auth_closed_by_default_test.go b/graphql/e2e/auth_closed_by_default/auth_closed_by_default_test.go index 813c38f75c9..5483a99dc56 100644 --- a/graphql/e2e/auth_closed_by_default/auth_closed_by_default_test.go +++ b/graphql/e2e/auth_closed_by_default/auth_closed_by_default_test.go @@ -24,9 +24,9 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type TestCase struct { diff --git a/graphql/e2e/common/admin.go b/graphql/e2e/common/admin.go index 2113b7bba5e..c81d72e323d 100644 --- a/graphql/e2e/common/admin.go +++ b/graphql/e2e/common/admin.go @@ -34,11 +34,11 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/graphql/e2e/common/common.go b/graphql/e2e/common/common.go index 400049980aa..5c4a018cb22 100644 --- a/graphql/e2e/common/common.go +++ b/graphql/e2e/common/common.go @@ -36,11 +36,11 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/graphql/e2e/common/error.go b/graphql/e2e/common/error.go index 6fd5928cbc8..279bed2182a 100644 --- a/graphql/e2e/common/error.go +++ b/graphql/e2e/common/error.go @@ -34,13 +34,13 @@ import ( "google.golang.org/grpc/peer" "gopkg.in/yaml.v2" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - admin2 "github.com/dgraph-io/dgraph/graphql/admin" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/graphql/test" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + admin2 "github.com/dgraph-io/dgraph/v24/graphql/admin" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/test" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/graphql/e2e/common/fragment.go b/graphql/e2e/common/fragment.go index 855de10b2c6..d735bc10950 100644 --- a/graphql/e2e/common/fragment.go +++ b/graphql/e2e/common/fragment.go @@ -25,7 +25,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) func fragmentInMutation(t *testing.T) { diff --git a/graphql/e2e/common/lambda.go b/graphql/e2e/common/lambda.go index 2791ff4ad3e..ac52d351b78 100644 --- a/graphql/e2e/common/lambda.go +++ b/graphql/e2e/common/lambda.go @@ -29,7 +29,7 @@ import ( "github.com/golang/glog" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) func lambdaOnTypeField(t *testing.T) { diff --git a/graphql/e2e/common/mutation.go b/graphql/e2e/common/mutation.go index 96c3c365dc9..04ba9ef4c37 100644 --- a/graphql/e2e/common/mutation.go +++ b/graphql/e2e/common/mutation.go @@ -35,10 +35,10 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) // TestAddMutation tests that add mutations work as expected. There's a few angles diff --git a/graphql/e2e/common/query.go b/graphql/e2e/common/query.go index 4c26375132a..4dd8094e800 100644 --- a/graphql/e2e/common/query.go +++ b/graphql/e2e/common/query.go @@ -37,11 +37,11 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func queryCountryByRegExp(t *testing.T, regexp string, expectedCountries []*country) { diff --git a/graphql/e2e/common/schema.go b/graphql/e2e/common/schema.go index 83f42a656c8..e380bce0e1b 100644 --- a/graphql/e2e/common/schema.go +++ b/graphql/e2e/common/schema.go @@ -24,9 +24,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" ) const ( diff --git a/graphql/e2e/common/subscription.go b/graphql/e2e/common/subscription.go index 81da432ba9e..a2f0a4cfd0d 100644 --- a/graphql/e2e/common/subscription.go +++ b/graphql/e2e/common/subscription.go @@ -25,7 +25,7 @@ import ( "github.com/gorilla/websocket" - "github.com/dgraph-io/dgraph/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/schema" ) // Reference: https://github.com/apollographql/subscriptions-transport-ws/blob/master/PROTOCOL.md diff --git a/graphql/e2e/custom_logic/custom_logic_test.go b/graphql/e2e/custom_logic/custom_logic_test.go index 8601228c01a..6509ffc7938 100644 --- a/graphql/e2e/custom_logic/custom_logic_test.go +++ b/graphql/e2e/custom_logic/custom_logic_test.go @@ -31,10 +31,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/graphql/e2e/directives/dgraph_directives_test.go b/graphql/e2e/directives/dgraph_directives_test.go index cc8571b2468..00f357de008 100644 --- a/graphql/e2e/directives/dgraph_directives_test.go +++ b/graphql/e2e/directives/dgraph_directives_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/graphql/e2e/multi_tenancy/multi_tenancy_test.go b/graphql/e2e/multi_tenancy/multi_tenancy_test.go index b4f22530fa5..2f2c6a21623 100644 --- a/graphql/e2e/multi_tenancy/multi_tenancy_test.go +++ b/graphql/e2e/multi_tenancy/multi_tenancy_test.go @@ -30,9 +30,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/graphql/e2e/normal/normal_test.go b/graphql/e2e/normal/normal_test.go index 293cd94885e..f2b945d5f30 100644 --- a/graphql/e2e/normal/normal_test.go +++ b/graphql/e2e/normal/normal_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/graphql/e2e/schema/apollo_service_response.graphql b/graphql/e2e/schema/apollo_service_response.graphql index 14f6efa1e0b..211ca562dcc 100644 --- a/graphql/e2e/schema/apollo_service_response.graphql +++ b/graphql/e2e/schema/apollo_service_response.graphql @@ -118,6 +118,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -201,6 +205,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @remote on OBJECT | INTERFACE | UNION | INPUT_OBJECT | ENUM diff --git a/graphql/e2e/schema/generatedSchema.graphql b/graphql/e2e/schema/generatedSchema.graphql index 70cc4f3f19c..658eabf2608 100644 --- a/graphql/e2e/schema/generatedSchema.graphql +++ b/graphql/e2e/schema/generatedSchema.graphql @@ -99,6 +99,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -182,6 +186,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/e2e/schema/schema_test.go b/graphql/e2e/schema/schema_test.go index 671f93def11..9b07edec38b 100644 --- a/graphql/e2e/schema/schema_test.go +++ b/graphql/e2e/schema/schema_test.go @@ -34,11 +34,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/graphql/e2e/subscription/subscription_test.go b/graphql/e2e/subscription/subscription_test.go index f546ed81ec5..f32a9e1cc4e 100644 --- a/graphql/e2e/subscription/subscription_test.go +++ b/graphql/e2e/subscription/subscription_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/graphql/resolve/add_mutation_test.yaml b/graphql/resolve/add_mutation_test.yaml index 8449467e9b9..7c5202db9a6 100644 --- a/graphql/resolve/add_mutation_test.yaml +++ b/graphql/resolve/add_mutation_test.yaml @@ -5499,4 +5499,163 @@ error2: { "message": "failed to rewrite mutation payload because field id cannot be empty" - } \ No newline at end of file + } + +- + name: "Add mutation with @default directive" + gqlmutation: | + mutation($input: [AddBookingInput!]!) { + addBooking(input: $input) { + booking { + name + created + updated + } + } + } + gqlvariables: | + { + "input": [ + { + "name": "Holiday to Bermuda" + } + ] + } + explanation: "As booking has @default fields and is being added, these should be set to the default add value" + dgmutations: + - setjson: | + { + "Booking.created": "2000-01-01T00:00:00.00Z", + "Booking.active": "false", + "Booking.count": "1", + "Booking.hotel": "add", + "Booking.length": "1.1", + "Booking.status": "ACTIVE", + "Booking.name": "Holiday to Bermuda", + "Booking.updated": "2000-01-01T00:00:00.00Z", + "dgraph.type": [ + "Booking" + ], + "uid":"_:Booking_1" + } + +- + name: "Add mutation with @default directive uses provided values" + gqlmutation: | + mutation($input: [AddBookingInput!]!) { + addBooking(input: $input) { + booking { + name + created + updated + } + } + } + gqlvariables: | + { + "input": [ + { + "name": "Holiday to Bermuda", + "created": "2022-10-12T07:20:50.52Z", + "updated": "2023-10-12T07:20:50.52Z", + "active": false, + "length": 12.3, + "status": "INACTIVE", + "hotel": "provided" + } + ] + } + explanation: "Fields with @default(add) should use input values if provided (note that count is still using default)" + dgmutations: + - setjson: | + { + "Booking.name": "Holiday to Bermuda", + "Booking.created": "2022-10-12T07:20:50.52Z", + "Booking.updated": "2023-10-12T07:20:50.52Z", + "Booking.active": false, + "Booking.count": "1", + "Booking.hotel": "provided", + "Booking.length": 12.3, + "Booking.status": "INACTIVE", + "dgraph.type": [ + "Booking" + ], + "uid":"_:Booking_1" + } + +- + name: "Upsert mutation with @default directives where only one of the nodes exists" + explanation: "Booking1 should only have updated timestamp as it exists, Booking2 should have created and updated timestamps" + gqlmutation: | + mutation addBookingXID($input: [AddBookingXIDInput!]!) { + addBookingXID(input: $input, upsert: true) { + bookingXID { + name + } + } + } + gqlvariables: | + { "input": + [ + { + "id": "Booking1", + "name": "Trip to Bermuda" + }, + { + "id": "Booking2", + "name": "Trip to Antigua" + } + ] + } + dgquery: |- + query { + BookingXID_1(func: eq(BookingXID.id, "Booking1")) { + uid + dgraph.type + } + BookingXID_2(func: eq(BookingXID.id, "Booking2")) { + uid + dgraph.type + } + } + qnametouid: |- + { + "BookingXID_1": "0x11" + } + dgquerysec: |- + query { + BookingXID_1 as BookingXID_1(func: uid(0x11)) @filter(type(BookingXID)) { + uid + } + } + dgmutations: + - setjson: | + { + "uid" : "uid(BookingXID_1)", + "BookingXID.id": "Booking1", + "BookingXID.name": "Trip to Bermuda", + "BookingXID.updated": "2000-01-01T00:00:00.00Z", + "BookingXID.active": "true", + "BookingXID.count": "2", + "BookingXID.length": "1.2", + "BookingXID.status": "INACTIVE", + "BookingXID.hotel": "update" + } + cond: "@if(gt(len(BookingXID_1), 0))" + - setjson: | + { + "uid": "_:BookingXID_2", + "BookingXID.id": "Booking2", + "BookingXID.name": "Trip to Antigua", + "BookingXID.created": "2000-01-01T00:00:00.00Z", + "BookingXID.updated": "2000-01-01T00:00:00.00Z", + "BookingXID.active": "false", + "BookingXID.count": "1", + "BookingXID.length": "1.1", + "BookingXID.status": "ACTIVE", + "BookingXID.hotel": "add", + "dgraph.type": [ + "BookingXID" + ] + } + diff --git a/graphql/resolve/auth_test.go b/graphql/resolve/auth_test.go index 2f3e5c46705..6595243ae85 100644 --- a/graphql/resolve/auth_test.go +++ b/graphql/resolve/auth_test.go @@ -30,14 +30,14 @@ import ( "google.golang.org/grpc/metadata" "gopkg.in/yaml.v2" - dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/graphql/dgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/graphql/test" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + dgoapi "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/graphql/dgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/test" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" _ "github.com/dgraph-io/gqlparser/v2/validator/rules" // make gql validator init() all rules ) diff --git a/graphql/resolve/extensions_test.go b/graphql/resolve/extensions_test.go index 89b9f600cf2..ca81ef3a272 100644 --- a/graphql/resolve/extensions_test.go +++ b/graphql/resolve/extensions_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/test" + "github.com/dgraph-io/dgraph/v24/graphql/test" ) func TestQueriesPropagateExtensions(t *testing.T) { diff --git a/graphql/resolve/middlewares.go b/graphql/resolve/middlewares.go index b4473bf4d92..4b66ca5694e 100644 --- a/graphql/resolve/middlewares.go +++ b/graphql/resolve/middlewares.go @@ -22,9 +22,9 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) // QueryMiddleware represents a middleware for queries diff --git a/graphql/resolve/middlewares_test.go b/graphql/resolve/middlewares_test.go index 9aa9471c572..9b6ace3fedf 100644 --- a/graphql/resolve/middlewares_test.go +++ b/graphql/resolve/middlewares_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/schema" ) func TestQueryMiddlewares_Then_ExecutesMiddlewaresInOrder(t *testing.T) { diff --git a/graphql/resolve/mutation.go b/graphql/resolve/mutation.go index a7cb2bd8b0c..de6d96caf7c 100644 --- a/graphql/resolve/mutation.go +++ b/graphql/resolve/mutation.go @@ -28,11 +28,11 @@ import ( "github.com/pkg/errors" otrace "go.opencensus.io/trace" - dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/dgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + dgoapi "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/dgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) const touchedUidsKey = "_total" diff --git a/graphql/resolve/mutation_rewriter.go b/graphql/resolve/mutation_rewriter.go index a5914347b76..d78ad8bf433 100644 --- a/graphql/resolve/mutation_rewriter.go +++ b/graphql/resolve/mutation_rewriter.go @@ -27,16 +27,18 @@ import ( "github.com/pkg/errors" - dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + dgoapi "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) const ( - MutationQueryVar = "x" - MutationQueryVarUID = "uid(x)" - updateMutationCondition = `gt(len(x), 0)` + MutationQueryVar = "x" + MutationQueryVarUID = "uid(x)" + updateMutationCondition = `gt(len(x), 0)` + defaultDirectiveUpdateAct = "update" + defaultDirectiveAddAct = "add" ) // Enum passed on to rewriteObject function. @@ -1587,6 +1589,8 @@ func rewriteObject( } } + action := defaultDirectiveUpdateAct + // This is not an XID reference. This is also not a UID reference. // This is definitely a new node. // Create new node @@ -1635,6 +1639,19 @@ func rewriteObject( // "_:Project2" . myUID will store the variable generated to reference this node. newObj["dgraph.type"] = dgraphTypes newObj["uid"] = myUID + action = defaultDirectiveAddAct + } + + // Now we know whether this is a new node or not, we can set @default(add/update) fields + for _, field := range typ.Fields() { + var pred = field.DgraphPredicate() + if newObj[pred] != nil { + continue + } + var value = field.GetDefaultValue(action) + if value != nil { + newObj[pred] = value + } } // Add Inverse Link if necessary diff --git a/graphql/resolve/mutation_test.go b/graphql/resolve/mutation_test.go index 72faab552dd..b420a86180b 100644 --- a/graphql/resolve/mutation_test.go +++ b/graphql/resolve/mutation_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/dgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/graphql/test" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + dgoapi "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/graphql/dgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/test" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) // Tests showing that GraphQL mutations -> Dgraph mutations diff --git a/graphql/resolve/query.go b/graphql/resolve/query.go index 07ffce52c44..f657663c30c 100644 --- a/graphql/resolve/query.go +++ b/graphql/resolve/query.go @@ -25,11 +25,11 @@ import ( "github.com/golang/glog" otrace "go.opencensus.io/trace" - dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/dgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + dgoapi "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/dgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) var errNotScalar = errors.New("provided value is not a scalar, can't convert it to string") diff --git a/graphql/resolve/query_rewriter.go b/graphql/resolve/query_rewriter.go index 509e593a772..975ae69f47c 100644 --- a/graphql/resolve/query_rewriter.go +++ b/graphql/resolve/query_rewriter.go @@ -27,10 +27,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) type queryRewriter struct{} @@ -659,7 +659,7 @@ func rewriteAsSimilarByIdQuery( topK := query.ArgValue(schema.SimilarTopKArgName) similarByField := typ.Field(similarBy) metric := similarByField.EmbeddingSearchMetric() - distanceFormula := "math(sqrt((v2 - v1) dot (v2 - v1)))" // default - euclidian + distanceFormula := "math(sqrt((v2 - v1) dot (v2 - v1)))" // default - euclidean if metric == schema.SimilarSearchMetricDotProduct { distanceFormula = "math((1.0 - (v1 dot v2)) /2.0)" @@ -755,7 +755,7 @@ func rewriteAsSimilarByIdQuery( result = append(result, distance) } - // order the result by euclidian distance, For example, + // order the result by euclidean distance, For example, // querySimilarProductById(func: uid(distance), orderasc: val(distance)) { // Product.id : Product.id // Product.description : Product.description @@ -819,7 +819,7 @@ func rewriteAsSimilarByEmbeddingQuery( similarByField := typ.Field(similarBy) metric := similarByField.EmbeddingSearchMetric() - distanceFormula := "math(sqrt((v2 - $search_vector) dot (v2 - $search_vector)))" // default = euclidian + distanceFormula := "math(sqrt((v2 - $search_vector) dot (v2 - $search_vector)))" // default = euclidean if metric == schema.SimilarSearchMetricDotProduct { distanceFormula = "math(( 1.0 - (($search_vector) dot v2)) /2.0)" @@ -860,7 +860,7 @@ func rewriteAsSimilarByEmbeddingQuery( }, } - // Compute the euclidian distance between the neighbor + // Compute the euclidean distance between the neighbor // and the search vector dgQuery[0].Children = []*dql.GraphQuery{ { diff --git a/graphql/resolve/query_test.go b/graphql/resolve/query_test.go index ddbdb73de26..9cba41a6d3f 100644 --- a/graphql/resolve/query_test.go +++ b/graphql/resolve/query_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/dgraph-io/dgraph/graphql/dgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/graphql/test" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/graphql/dgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/test" + "github.com/dgraph-io/dgraph/v24/testutil" _ "github.com/dgraph-io/gqlparser/v2/validator/rules" // make gql validator init() all rules ) diff --git a/graphql/resolve/resolver.go b/graphql/resolve/resolver.go index 79dd12b16ab..897b5f17d55 100644 --- a/graphql/resolve/resolver.go +++ b/graphql/resolve/resolver.go @@ -29,12 +29,12 @@ import ( "github.com/pkg/errors" otrace "go.opencensus.io/trace" - dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/edgraph" - "github.com/dgraph-io/dgraph/graphql/api" - "github.com/dgraph-io/dgraph/graphql/dgraph" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + dgoapi "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/edgraph" + "github.com/dgraph-io/dgraph/v24/graphql/api" + "github.com/dgraph-io/dgraph/v24/graphql/dgraph" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) type resolveCtxKey string diff --git a/graphql/resolve/resolver_error_test.go b/graphql/resolve/resolver_error_test.go index be298e67765..c544be60c27 100644 --- a/graphql/resolve/resolver_error_test.go +++ b/graphql/resolve/resolver_error_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - dgoapi "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/graphql/test" - "github.com/dgraph-io/dgraph/x" + dgoapi "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/test" + "github.com/dgraph-io/dgraph/v24/x" ) // Tests that result completion and GraphQL error propagation are working properly. diff --git a/graphql/resolve/resolver_test.go b/graphql/resolve/resolver_test.go index 4616a26a576..2b33811fbcc 100644 --- a/graphql/resolve/resolver_test.go +++ b/graphql/resolve/resolver_test.go @@ -22,9 +22,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/graphql/test" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/graphql/test" + "github.com/dgraph-io/dgraph/v24/x" ) func TestErrorOnIncorrectValueType(t *testing.T) { diff --git a/graphql/resolve/schema.graphql b/graphql/resolve/schema.graphql index 6b469284860..93b928dbd01 100644 --- a/graphql/resolve/schema.graphql +++ b/graphql/resolve/schema.graphql @@ -175,6 +175,32 @@ type Student implements People { taughtBy: [Teacher] @hasInverse(field: "teaches") } +# For testing default values +type Booking { + id: ID! + name: String! + created: DateTime! @default(add: {value: "$now"}) + updated: DateTime! @default(add: {value: "$now"}, update: {value: "$now"}) + count: Int! @default(add: {value: "1"}, update: {value: "2"}) + length: Float! @default(add: {value: "1.1"}, update: {value: "1.2"}) + hotel: String! @default(add: {value: "add"}, update: {value: "update"}) + active: Boolean! @default(add: {value: "false"}, update: {value: "true"}) + status: Status! @default(add: {value: "ACTIVE"}, update: {value: "INACTIVE"}) +} + +# For testing default values with upserts +type BookingXID { + id: String! @id + name: String! + created: DateTime! @default(add: {value: "$now"}) + updated: DateTime! @default(add: {value: "$now"}, update: {value: "$now"}) + count: Int! @default(add: {value: "1"}, update: {value: "2"}) + length: Float! @default(add: {value: "1.1"}, update: {value: "1.2"}) + hotel: String! @default(add: {value: "add"}, update: {value: "update"}) + active: Boolean! @default(add: {value: "false"}, update: {value: "true"}) + status: Status! @default(add: {value: "ACTIVE"}, update: {value: "INACTIVE"}) +} + type Comment { id: ID! author: String! diff --git a/graphql/resolve/update_mutation_test.yaml b/graphql/resolve/update_mutation_test.yaml index c38cefe1453..bf434c04f7f 100644 --- a/graphql/resolve/update_mutation_test.yaml +++ b/graphql/resolve/update_mutation_test.yaml @@ -2331,7 +2331,7 @@ explaination: "If nested object have inherited @id field which have interface argument set, and that field already exist in some other implementing type than we returns error.In below mutation manages is of type LibraryMember but node with given refID already exist in some other - type than LibraryMember" + type than than LibraryMember" gqlmutation: | mutation update($patch: UpdateLibraryManagerInput!) { updateLibraryManager(input: $patch) { @@ -2447,3 +2447,88 @@ "uid": "uid(x)" } cond: "@if(gt(len(x), 0))" + +- + name: "Update with @default directive" + gqlmutation: | + mutation updateBooking($patch: UpdateBookingInput!) { + updateBooking(input: $patch) { + booking { + id + } + } + } + gqlvariables: | + { "patch": + { "filter": { + "id": ["0x123", "0x124"] + }, + "set": { + "name": "Flight to Antigua" + } + } + } + explanation: "The update patch should include default values on the fields with the @default(update:) directive" + dgquerysec: |- + query { + x as updateBooking(func: uid(0x123, 0x124)) @filter(type(Booking)) { + uid + } + } + dgmutations: + - setjson: | + { "uid" : "uid(x)", + "Booking.name": "Flight to Antigua", + "Booking.updated": "2000-01-01T00:00:00.00Z", + "Booking.active": "true", + "Booking.count": "2", + "Booking.length": "1.2", + "Booking.status": "INACTIVE", + "Booking.hotel": "update" + } + cond: "@if(gt(len(x), 0))" + +- + name: "Update with @default directive uses provided values" + gqlmutation: | + mutation updateBooking($patch: UpdateBookingInput!) { + updateBooking(input: $patch) { + booking { + id + } + } + } + gqlvariables: | + { "patch": + { "filter": { + "id": ["0x123", "0x124"] + }, + "set": { + "name": "Flight to Antigua", + "updated": "2022-10-12T07:20:50.52Z", + "active": false, + "length": 12.3, + "status": "ACTIVE", + "hotel": "provided" + } + } + } + explanation: "Fields with @default(update) should use input values if provided (note that count is still using default)" + dgquerysec: |- + query { + x as updateBooking(func: uid(0x123, 0x124)) @filter(type(Booking)) { + uid + } + } + dgmutations: + - setjson: | + { "uid" : "uid(x)", + "Booking.name": "Flight to Antigua", + "Booking.updated": "2022-10-12T07:20:50.52Z", + "Booking.active": false, + "Booking.count": "2", + "Booking.length": 12.3, + "Booking.status": "ACTIVE", + "Booking.hotel": "provided" + } + cond: "@if(gt(len(x), 0))" diff --git a/graphql/resolve/webhook.go b/graphql/resolve/webhook.go index 8b0a4fb66fb..2f74a194a7f 100644 --- a/graphql/resolve/webhook.go +++ b/graphql/resolve/webhook.go @@ -24,9 +24,9 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) type webhookPayload struct { diff --git a/graphql/schema/auth.go b/graphql/schema/auth.go index ff116df9e84..513ff7ccd80 100644 --- a/graphql/schema/auth.go +++ b/graphql/schema/auth.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/cast" - "github.com/dgraph-io/dgraph/dql" + "github.com/dgraph-io/dgraph/v24/dql" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/gqlerror" "github.com/dgraph-io/gqlparser/v2/parser" diff --git a/graphql/schema/completion.go b/graphql/schema/completion.go index 7d4f8e1a169..ca1cbed5e2c 100644 --- a/graphql/schema/completion.go +++ b/graphql/schema/completion.go @@ -25,8 +25,8 @@ import ( "github.com/golang/glog" - dgTypes "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + dgTypes "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/graphql/schema/custom_http.go b/graphql/schema/custom_http.go index c76aa59411c..1e2be914d5e 100644 --- a/graphql/schema/custom_http.go +++ b/graphql/schema/custom_http.go @@ -25,8 +25,8 @@ import ( "net/http" "time" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/x" "github.com/golang/glog" ) diff --git a/graphql/schema/dgraph_schemagen_test.yml b/graphql/schema/dgraph_schemagen_test.yml index ba066df38da..408171ce7d3 100644 --- a/graphql/schema/dgraph_schemagen_test.yml +++ b/graphql/schema/dgraph_schemagen_test.yml @@ -148,7 +148,7 @@ schemas: dt4: DateTime @search(by: [day]) dt5: DateTime @search(by: [hour]) vf1: [Float!] @embedding @search(by: ["hnsw"]) - vf2: [Float!] @embedding @search(by: ["hnsw(exponent: 4, metric: euclidian)"]) + vf2: [Float!] @embedding @search(by: ["hnsw(exponent: 4, metric: euclidean)"]) vf3: [Float!] @embedding @search(by: ["hnsw(metric: cosine)"]) vf4: [Float!] @embedding @search(by: ["hnsw(metric: dotproduct, exponent: 4)"]) e: E @search @@ -219,7 +219,7 @@ schemas: X.dt4: dateTime @index(day) . X.dt5: dateTime @index(hour) . X.vf1: float32vector @index(hnsw) . - X.vf2: float32vector @index(hnsw(exponent: "4", metric: "euclidian")) . + X.vf2: float32vector @index(hnsw(exponent: "4", metric: "euclidean")) . X.vf3: float32vector @index(hnsw(metric: "cosine")) . X.vf4: float32vector @index(hnsw(exponent: "4", metric: "dotproduct")) . X.e: string @index(hash) . diff --git a/graphql/schema/errors.go b/graphql/schema/errors.go index c7c18455cb7..2ca14d19341 100644 --- a/graphql/schema/errors.go +++ b/graphql/schema/errors.go @@ -19,7 +19,7 @@ package schema import ( "fmt" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/gqlerror" ) diff --git a/graphql/schema/errors_test.go b/graphql/schema/errors_test.go index c76573cb04d..979ccdaee68 100644 --- a/graphql/schema/errors_test.go +++ b/graphql/schema/errors_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/gqlerror" ) diff --git a/graphql/schema/gqlschema.go b/graphql/schema/gqlschema.go index 3fff2a7bae2..d6d32ed5c81 100644 --- a/graphql/schema/gqlschema.go +++ b/graphql/schema/gqlschema.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/gqlerror" "github.com/dgraph-io/gqlparser/v2/parser" @@ -49,6 +49,7 @@ const ( remoteResponseDirective = "remoteResponse" lambdaDirective = "lambda" lambdaOnMutateDirective = "lambdaOnMutate" + defaultDirective = "default" generateDirective = "generate" generateQueryArg = "query" @@ -197,6 +198,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -281,6 +286,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( @@ -313,6 +319,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @remote on OBJECT | INTERFACE | UNION | INPUT_OBJECT | ENUM @@ -577,6 +584,7 @@ var directiveValidators = map[string]directiveValidator{ remoteDirective: ValidatorNoOp, deprecatedDirective: ValidatorNoOp, lambdaDirective: lambdaDirectiveValidation, + defaultDirective: defaultDirectiveValidation, lambdaOnMutateDirective: ValidatorNoOp, generateDirective: ValidatorNoOp, apolloKeyDirective: ValidatorNoOp, @@ -1296,7 +1304,7 @@ func addPatchType(schema *ast.Schema, defn *ast.Definition, providesTypeMap map[ return } - nonIDFields := getNonIDFields(schema, defn, providesTypeMap) + nonIDFields := getPatchFields(schema, defn, providesTypeMap) if len(nonIDFields) == 0 { // The user might just have an predicate with reverse edge id field and nothing else. // We don't generate patch type in that case. @@ -2427,7 +2435,7 @@ func createField(schema *ast.Schema, fld *ast.FieldDefinition) *ast.FieldDefinit return &newFld } -func getNonIDFields(schema *ast.Schema, defn *ast.Definition, providesTypeMap map[string]bool) ast.FieldList { +func getPatchFields(schema *ast.Schema, defn *ast.Definition, providesTypeMap map[string]bool) ast.FieldList { fldList := make([]*ast.FieldDefinition, 0) for _, fld := range defn.Fields { if isIDField(defn, fld) { @@ -2509,12 +2517,19 @@ func getFieldsWithoutIDType(schema *ast.Schema, defn *ast.Definition, continue } - // see also comment in getNonIDFields + // see also comment in getPatchFields if schema.Types[fld.Type.Name()].Kind == ast.Interface && (!hasID(schema.Types[fld.Type.Name()]) && !hasXID(schema.Types[fld.Type.Name()])) { continue } - fldList = append(fldList, createField(schema, fld)) + + // if the field has a @default(add) value it is optional in add input + var field = createField(schema, fld) + if getDefaultValue(fld, "add") != nil { + field.Type.NonNull = false + } + + fldList = append(fldList, field) } pd := getPasswordField(defn) diff --git a/graphql/schema/gqlschema_test.yml b/graphql/schema/gqlschema_test.yml index eb206de22fa..a82500b4426 100644 --- a/graphql/schema/gqlschema_test.yml +++ b/graphql/schema/gqlschema_test.yml @@ -2743,7 +2743,7 @@ invalid_schemas: review: String! } errlist: [ - {"message": "Type Product; @remote directive cannot be defined with @key directive", "locations": [ { "line": 176, "column": 12} ] }, + {"message": "Type Product; @remote directive cannot be defined with @key directive", "locations": [ { "line": 181, "column": 12} ] }, ] - name: "directives defined on @external fields that are not @key." @@ -2967,6 +2967,7 @@ invalid_schemas: { "message": "Type Person; Field nameHi: `*` language tag not supported in GraphQL", "locations": [ { "line": 3, "column": 19 } ] }, ] + - name: "@id field can't have interface argument when it's defined inside a type" input: | type Person { @@ -2979,6 +2980,125 @@ invalid_schemas: "locations": [ { "line": 2, "column": 18 } ] }, ] + - name: "@default validates field type for value $now" + input: | + type X { + field: String @default(add:{value:"$now"}) + } + errlist: [ + {"message": "Type X; Field field: @default directive provides value \"$now\" which cannot be used with String", + "locations":[{"line":2, "column":18}]} + ] + + - name: "@default validates value for Int" + input: | + type X { + field: Int @default(add:{value:"apple"}) + } + errlist: [ + {"message": "Type X; Field field: @default directive provides value \"apple\" which cannot be used with Int", + "locations":[{"line":2, "column":15}]} + ] + + - name: "@default validates value for Float" + input: | + type X { + field: Float @default(add:{value:"apple"}) + } + errlist: [ + {"message": "Type X; Field field: @default directive provides value \"apple\" which cannot be used with Float", + "locations":[{"line":2, "column":17}]} + ] + + - name: "@default validates value for Boolean" + input: | + type X { + field: Boolean @default(add:{value:"apple"}) + } + errlist: [ + {"message": "Type X; Field field: @default directive provides value \"apple\" which cannot be used with Boolean", + "locations":[{"line":2, "column":19}]} + ] + + - name: "@default validates type is not @remote" + input: | + type X @remote { + field: Int @default(add:{value:"1"}) + } + errlist: [ + {"message": "Type X; Field field: cannot use @default directive on a @remote type", + "locations":[{"line":2, "column":15}]} + ] + + - name: "@default validates field type is scalar" + input: | + type X { + field: Y @default(add:{value:"1"}) + } + type Y { + field: String + } + errlist: [ + {"message": "Type X; Field field: cannot use @default directive on field with non-scalar type Y", + "locations":[{"line":2, "column":13}]} + ] + + - name: "@default validates field type is not list" + input: | + type X { + field: [String] @default(add:{value:"1"}) + } + errlist: [ + {"message": "Type X; Field field: cannot use @default directive on field with list type [String]", + "locations":[{"line":2, "column":20}]} + ] + + - name: "@default validates field type is not @id" + input: | + type X { + field: String! @id @default(add:{value:"foo"}) + } + errlist: [ + {"message": "Type X; Field field: cannot use @default directive on field with @id directive", + "locations":[{"line":2, "column":23}]} + ] + + - name: "@default validates field type is not ID" + input: | + type X { + id: ID! @default(add:{value:"foo"}) + field: String + } + errlist: [ + {"message": "Type X; Field id: cannot use @default directive on field with type ID", + "locations":[{"line":2, "column":12}]} + ] + + - name: "@default validates field type is not @custom" + input: | + type X { + id: String! @id + field: String! @default(add:{value:"foo"}) @custom(http: { + url: "http://blah.com", + method: "GET" + }) + } + errlist: [ + {"message": "Type X; Field field: cannot use @default directive on field with @custom directive", + "locations":[{"line":3, "column":19}]} + ] + + - name: "@default validates field type is not @lambda" + input: | + type X { + id: String! @id + field: String! @default(add:{value:"foo"}) @lambda + } + errlist: [ + {"message": "Type X; Field field: cannot use @default directive on field with @lambda directive", + "locations":[{"line":3, "column":19}]} + ] + valid_schemas: - name: "Multiple fields with @id directive should be allowed" input: | diff --git a/graphql/schema/introspection.go b/graphql/schema/introspection.go index 620b89013dc..72a1d2ed379 100644 --- a/graphql/schema/introspection.go +++ b/graphql/schema/introspection.go @@ -6,7 +6,7 @@ import ( "errors" "strconv" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlgen/graphql" "github.com/dgraph-io/gqlgen/graphql/introspection" "github.com/dgraph-io/gqlparser/v2/ast" diff --git a/graphql/schema/response.go b/graphql/schema/response.go index 7beefdcaae7..d39ac614511 100644 --- a/graphql/schema/response.go +++ b/graphql/schema/response.go @@ -28,7 +28,7 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // GraphQL spec on response is here: diff --git a/graphql/schema/response_test.go b/graphql/schema/response_test.go index e7c175dd70f..bd06000e469 100644 --- a/graphql/schema/response_test.go +++ b/graphql/schema/response_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/gqlerror" ) diff --git a/graphql/schema/rules.go b/graphql/schema/rules.go index c5799bddd0b..c0774dce714 100644 --- a/graphql/schema/rules.go +++ b/graphql/schema/rules.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/gqlerror" "github.com/dgraph-io/gqlparser/v2/parser" @@ -1154,7 +1154,7 @@ func searchValidation( // // := [ ] // -// hnsw(metric: euclidian, exponent: 6) +// hnsw(metric: euclidean, exponent: 6) // hnsw // hnsw(exponent: 3) func parseSearchType(searchArg string) string { @@ -1175,7 +1175,7 @@ func parseSearchType(searchArg string) string { // := // Examples: // -// hnsw(metric: euclidian, exponent: 6) +// hnsw(metric: euclidean, exponent: 6) // hnsw // hnsw(exponent: 3) func parseSearchOptions(searchArg string) (map[string]string, bool) { @@ -1453,6 +1453,94 @@ func lambdaDirectiveValidation(sch *ast.Schema, return errs } +// defaultDirectiveValidation will prevents use of @default on: +// Types with @remote directive +// Fields of type ID +// Fields that are not scalar types (Int, Float, String, Boolean, DateTime) or an enum +// Fields that are list types (ie `[String]) +// Fields with @id, @custom, @lambda +func defaultDirectiveValidation(sch *ast.Schema, + typ *ast.Definition, + field *ast.FieldDefinition, + dir *ast.Directive, + secrets map[string]x.Sensitive) gqlerror.List { + if typ.Directives.ForName(remoteDirective) != nil { + return []*gqlerror.Error{gqlerror.ErrorPosf( + dir.Position, + "Type %s; Field %s: cannot use @default directive on a @remote type", + typ.Name, field.Name)} + } + if !isScalar(field.Type.Name()) && sch.Types[field.Type.Name()].Kind != ast.Enum { + return []*gqlerror.Error{gqlerror.ErrorPosf( + dir.Position, + "Type %s; Field %s: cannot use @default directive on field with non-scalar type %s", + typ.Name, field.Name, field.Type.Name())} + } + if field.Type.Elem != nil { + return []*gqlerror.Error{gqlerror.ErrorPosf( + dir.Position, + "Type %s; Field %s: cannot use @default directive on field with list type [%s]", + typ.Name, field.Name, field.Type.Name())} + } + if field.Directives.ForName(idDirective) != nil { + return []*gqlerror.Error{gqlerror.ErrorPosf( + dir.Position, + "Type %s; Field %s: cannot use @default directive on field with @id directive", + typ.Name, field.Name)} + } + if isID(field) { + return []*gqlerror.Error{gqlerror.ErrorPosf( + dir.Position, + "Type %s; Field %s: cannot use @default directive on field with type ID", + typ.Name, field.Name)} + } + if field.Directives.ForName(customDirective) != nil { + return []*gqlerror.Error{gqlerror.ErrorPosf( + dir.Position, + "Type %s; Field %s: cannot use @default directive on field with @custom directive", + typ.Name, field.Name)} + } + if field.Directives.ForName(lambdaDirective) != nil { + return []*gqlerror.Error{gqlerror.ErrorPosf( + dir.Position, + "Type %s; Field %s: cannot use @default directive on field with @lambda directive", + typ.Name, field.Name)} + } + for _, arg := range dir.Arguments { + fieldType := field.Type.Name() + value := arg.Value.Children.ForName("value").Raw + if value == "$now" && fieldType != "DateTime" { + return []*gqlerror.Error{gqlerror.ErrorPosf( + dir.Position, + "Type %s; Field %s: @default directive provides value \"%s\" which cannot be used with %s", + typ.Name, field.Name, value, fieldType)} + } + if fieldType == "Int" { + if _, err := strconv.ParseInt(value, 10, 64); err != nil { + return []*gqlerror.Error{gqlerror.ErrorPosf( + dir.Position, + "Type %s; Field %s: @default directive provides value \"%s\" which cannot be used with %s", + typ.Name, field.Name, value, fieldType)} + } + } + if fieldType == "Float" { + if _, err := strconv.ParseFloat(value, 64); err != nil { + return []*gqlerror.Error{gqlerror.ErrorPosf( + dir.Position, + "Type %s; Field %s: @default directive provides value \"%s\" which cannot be used with %s", + typ.Name, field.Name, value, fieldType)} + } + } + if fieldType == "Boolean" && value != "true" && value != "false" { + return []*gqlerror.Error{gqlerror.ErrorPosf( + dir.Position, + "Type %s; Field %s: @default directive provides value \"%s\" which cannot be used with %s", + typ.Name, field.Name, value, fieldType)} + } + } + return nil +} + func lambdaOnMutateValidation(sch *ast.Schema, typ *ast.Definition) gqlerror.List { dir := typ.Directives.ForName(lambdaOnMutateDirective) if dir == nil { diff --git a/graphql/schema/schemagen.go b/graphql/schema/schemagen.go index 068e808db27..b7c48073b6d 100644 --- a/graphql/schema/schemagen.go +++ b/graphql/schema/schemagen.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/gqlerror" "github.com/dgraph-io/gqlparser/v2/parser" diff --git a/graphql/schema/schemagen_test.go b/graphql/schema/schemagen_test.go index 6c852eb400b..981f922e28e 100644 --- a/graphql/schema/schemagen_test.go +++ b/graphql/schema/schemagen_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - dschema "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + dschema "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/gqlerror" _ "github.com/dgraph-io/gqlparser/v2/validator/rules" "github.com/dgraph-io/ristretto/z" diff --git a/graphql/schema/testdata/apolloservice/output/auth-directive.graphql b/graphql/schema/testdata/apolloservice/output/auth-directive.graphql index 4c7c8697b62..c0691c4c405 100644 --- a/graphql/schema/testdata/apolloservice/output/auth-directive.graphql +++ b/graphql/schema/testdata/apolloservice/output/auth-directive.graphql @@ -112,6 +112,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -195,6 +199,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @remote on OBJECT | INTERFACE | UNION | INPUT_OBJECT | ENUM diff --git a/graphql/schema/testdata/apolloservice/output/custom-directive.graphql b/graphql/schema/testdata/apolloservice/output/custom-directive.graphql index 2895f84b1a9..2b45898ccf6 100644 --- a/graphql/schema/testdata/apolloservice/output/custom-directive.graphql +++ b/graphql/schema/testdata/apolloservice/output/custom-directive.graphql @@ -104,6 +104,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -187,6 +191,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @remote on OBJECT | INTERFACE | UNION | INPUT_OBJECT | ENUM diff --git a/graphql/schema/testdata/apolloservice/output/extended-types.graphql b/graphql/schema/testdata/apolloservice/output/extended-types.graphql index 5cfe4020f15..6c841cb5359 100644 --- a/graphql/schema/testdata/apolloservice/output/extended-types.graphql +++ b/graphql/schema/testdata/apolloservice/output/extended-types.graphql @@ -118,6 +118,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -201,6 +205,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @remote on OBJECT | INTERFACE | UNION | INPUT_OBJECT | ENUM diff --git a/graphql/schema/testdata/apolloservice/output/generate-directive.graphql b/graphql/schema/testdata/apolloservice/output/generate-directive.graphql index e3acf38139c..fa52c6cff2d 100644 --- a/graphql/schema/testdata/apolloservice/output/generate-directive.graphql +++ b/graphql/schema/testdata/apolloservice/output/generate-directive.graphql @@ -114,6 +114,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -197,6 +201,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @remote on OBJECT | INTERFACE | UNION | INPUT_OBJECT | ENUM diff --git a/graphql/schema/testdata/apolloservice/output/single-extended-type.graphql b/graphql/schema/testdata/apolloservice/output/single-extended-type.graphql index 3a375fac52e..26449632304 100644 --- a/graphql/schema/testdata/apolloservice/output/single-extended-type.graphql +++ b/graphql/schema/testdata/apolloservice/output/single-extended-type.graphql @@ -99,6 +99,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -182,6 +186,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @remote on OBJECT | INTERFACE | UNION | INPUT_OBJECT | ENUM diff --git a/graphql/schema/testdata/schemagen/input/created-updated-directives.graphql b/graphql/schema/testdata/schemagen/input/created-updated-directives.graphql new file mode 100644 index 00000000000..a25ed3a9228 --- /dev/null +++ b/graphql/schema/testdata/schemagen/input/created-updated-directives.graphql @@ -0,0 +1,13 @@ +type Booking { + id: ID! + name: String! + created: DateTime! @default(add: {value:"$now"}) + updated: DateTime! @default(add: {value:"$now"}, update: {value:"$now"}) +} + +type BookingXID { + id: String! @id + name: String! + created: DateTime! @default(add: {value:"$now"}) + updated: DateTime! @default(add: {value:"$now"}, update: {value:"$now"}) +} diff --git a/graphql/schema/testdata/schemagen/input/embedding-directive-with-similar-queries.graphql b/graphql/schema/testdata/schemagen/input/embedding-directive-with-similar-queries.graphql index c3c7f33cd9c..880173cea36 100644 --- a/graphql/schema/testdata/schemagen/input/embedding-directive-with-similar-queries.graphql +++ b/graphql/schema/testdata/schemagen/input/embedding-directive-with-similar-queries.graphql @@ -5,7 +5,7 @@ type Product { description: String title: String imageUrl: String - product_vector: [Float!] @embedding @search(by: ["hnsw(metric: euclidian, exponent: 4)"]) + product_vector: [Float!] @embedding @search(by: ["hnsw(metric: euclidean, exponent: 4)"]) } type Purchase @lambdaOnMutate(add: true){ diff --git a/graphql/schema/testdata/schemagen/output/apollo-federation.graphql b/graphql/schema/testdata/schemagen/output/apollo-federation.graphql index 58e3caa0114..ff44a7b8041 100644 --- a/graphql/schema/testdata/schemagen/output/apollo-federation.graphql +++ b/graphql/schema/testdata/schemagen/output/apollo-federation.graphql @@ -134,6 +134,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -217,6 +221,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/auth-on-interfaces.graphql b/graphql/schema/testdata/schemagen/output/auth-on-interfaces.graphql index 25fe5454258..79edc9a60e5 100644 --- a/graphql/schema/testdata/schemagen/output/auth-on-interfaces.graphql +++ b/graphql/schema/testdata/schemagen/output/auth-on-interfaces.graphql @@ -116,6 +116,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -199,6 +203,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/authorization.graphql b/graphql/schema/testdata/schemagen/output/authorization.graphql index 4154417f6bf..2dc4bf64f59 100644 --- a/graphql/schema/testdata/schemagen/output/authorization.graphql +++ b/graphql/schema/testdata/schemagen/output/authorization.graphql @@ -112,6 +112,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -195,6 +199,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/comments-and-descriptions.graphql b/graphql/schema/testdata/schemagen/output/comments-and-descriptions.graphql index 5cfbc133bff..be37be2b30e 100644 --- a/graphql/schema/testdata/schemagen/output/comments-and-descriptions.graphql +++ b/graphql/schema/testdata/schemagen/output/comments-and-descriptions.graphql @@ -125,6 +125,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -208,6 +212,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/created-updated-directives.graphql b/graphql/schema/testdata/schemagen/output/created-updated-directives.graphql new file mode 100644 index 00000000000..d7547094db3 --- /dev/null +++ b/graphql/schema/testdata/schemagen/output/created-updated-directives.graphql @@ -0,0 +1,485 @@ +####################### +# Input Schema +####################### + +type Booking { + id: ID! + name: String! + created: DateTime! @default(add: {value:"$now"}) + updated: DateTime! @default(add: {value:"$now"}, update: {value:"$now"}) +} + +type BookingXID { + id: String! @id + name: String! + created: DateTime! @default(add: {value:"$now"}) + updated: DateTime! @default(add: {value:"$now"}, update: {value:"$now"}) +} + +####################### +# Extended Definitions +####################### + +""" +The Int64 scalar type represents a signed 64‐bit numeric non‐fractional value. +Int64 can represent values in range [-(2^63),(2^63 - 1)]. +""" +scalar Int64 + +""" +The DateTime scalar type represents date and time as a string in RFC3339 format. +For example: "1985-04-12T23:20:50.52Z" represents 20 mins 50.52 secs after the 23rd hour of Apr 12th 1985 in UTC. +""" +scalar DateTime + +input IntRange{ + min: Int! + max: Int! +} + +input FloatRange{ + min: Float! + max: Float! +} + +input Int64Range{ + min: Int64! + max: Int64! +} + +input DateTimeRange{ + min: DateTime! + max: DateTime! +} + +input StringRange{ + min: String! + max: String! +} + +enum DgraphIndex { + int + int64 + float + bool + hash + exact + term + fulltext + trigram + regexp + year + month + day + hour + geo + hnsw +} + +input AuthRule { + and: [AuthRule] + or: [AuthRule] + not: AuthRule + rule: String +} + +enum HTTPMethod { + GET + POST + PUT + PATCH + DELETE +} + +enum Mode { + BATCH + SINGLE +} + +input CustomHTTP { + url: String! + method: HTTPMethod! + body: String + graphql: String + mode: Mode + forwardHeaders: [String!] + secretHeaders: [String!] + introspectionHeaders: [String!] + skipIntrospection: Boolean +} + +input DgraphDefault { + value: String +} + +type Point { + longitude: Float! + latitude: Float! +} + +input PointRef { + longitude: Float! + latitude: Float! +} + +input NearFilter { + distance: Float! + coordinate: PointRef! +} + +input PointGeoFilter { + near: NearFilter + within: WithinFilter +} + +type PointList { + points: [Point!]! +} + +input PointListRef { + points: [PointRef!]! +} + +type Polygon { + coordinates: [PointList!]! +} + +input PolygonRef { + coordinates: [PointListRef!]! +} + +type MultiPolygon { + polygons: [Polygon!]! +} + +input MultiPolygonRef { + polygons: [PolygonRef!]! +} + +input WithinFilter { + polygon: PolygonRef! +} + +input ContainsFilter { + point: PointRef + polygon: PolygonRef +} + +input IntersectsFilter { + polygon: PolygonRef + multiPolygon: MultiPolygonRef +} + +input PolygonGeoFilter { + near: NearFilter + within: WithinFilter + contains: ContainsFilter + intersects: IntersectsFilter +} + +input GenerateQueryParams { + get: Boolean + query: Boolean + password: Boolean + aggregate: Boolean +} + +input GenerateMutationParams { + add: Boolean + update: Boolean + delete: Boolean +} + +directive @hasInverse(field: String!) on FIELD_DEFINITION +directive @search(by: [String!]) on FIELD_DEFINITION +directive @embedding on FIELD_DEFINITION +directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION +directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION +directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION +directive @secret(field: String!, pred: String) on OBJECT | INTERFACE +directive @auth( + password: AuthRule + query: AuthRule, + add: AuthRule, + update: AuthRule, + delete: AuthRule) on OBJECT | INTERFACE +directive @custom(http: CustomHTTP, dql: String) on FIELD_DEFINITION +directive @remote on OBJECT | INTERFACE | UNION | INPUT_OBJECT | ENUM +directive @remoteResponse(name: String) on FIELD_DEFINITION +directive @cascade(fields: [String]) on FIELD +directive @lambda on FIELD_DEFINITION +directive @lambdaOnMutate(add: Boolean, update: Boolean, delete: Boolean) on OBJECT | INTERFACE +directive @cacheControl(maxAge: Int!) on QUERY +directive @generate( + query: GenerateQueryParams, + mutation: GenerateMutationParams, + subscription: Boolean) on OBJECT | INTERFACE + +input IntFilter { + eq: Int + in: [Int] + le: Int + lt: Int + ge: Int + gt: Int + between: IntRange +} + +input Int64Filter { + eq: Int64 + in: [Int64] + le: Int64 + lt: Int64 + ge: Int64 + gt: Int64 + between: Int64Range +} + +input FloatFilter { + eq: Float + in: [Float] + le: Float + lt: Float + ge: Float + gt: Float + between: FloatRange +} + +input DateTimeFilter { + eq: DateTime + in: [DateTime] + le: DateTime + lt: DateTime + ge: DateTime + gt: DateTime + between: DateTimeRange +} + +input StringTermFilter { + allofterms: String + anyofterms: String +} + +input StringRegExpFilter { + regexp: String +} + +input StringFullTextFilter { + alloftext: String + anyoftext: String +} + +input StringExactFilter { + eq: String + in: [String] + le: String + lt: String + ge: String + gt: String + between: StringRange +} + +input StringHashFilter { + eq: String + in: [String] +} + +####################### +# Generated Types +####################### + +type AddBookingPayload { + booking(filter: BookingFilter, order: BookingOrder, first: Int, offset: Int): [Booking] + numUids: Int +} + +type AddBookingXIDPayload { + bookingXID(filter: BookingXIDFilter, order: BookingXIDOrder, first: Int, offset: Int): [BookingXID] + numUids: Int +} + +type BookingAggregateResult { + count: Int + nameMin: String + nameMax: String + createdMin: DateTime + createdMax: DateTime + updatedMin: DateTime + updatedMax: DateTime +} + +type BookingXIDAggregateResult { + count: Int + idMin: String + idMax: String + nameMin: String + nameMax: String + createdMin: DateTime + createdMax: DateTime + updatedMin: DateTime + updatedMax: DateTime +} + +type DeleteBookingPayload { + booking(filter: BookingFilter, order: BookingOrder, first: Int, offset: Int): [Booking] + msg: String + numUids: Int +} + +type DeleteBookingXIDPayload { + bookingXID(filter: BookingXIDFilter, order: BookingXIDOrder, first: Int, offset: Int): [BookingXID] + msg: String + numUids: Int +} + +type UpdateBookingPayload { + booking(filter: BookingFilter, order: BookingOrder, first: Int, offset: Int): [Booking] + numUids: Int +} + +type UpdateBookingXIDPayload { + bookingXID(filter: BookingXIDFilter, order: BookingXIDOrder, first: Int, offset: Int): [BookingXID] + numUids: Int +} + +####################### +# Generated Enums +####################### + +enum BookingHasFilter { + name + created + updated +} + +enum BookingOrderable { + name + created + updated +} + +enum BookingXIDHasFilter { + id + name + created + updated +} + +enum BookingXIDOrderable { + id + name + created + updated +} + +####################### +# Generated Inputs +####################### + +input AddBookingInput { + name: String! + created: DateTime + updated: DateTime +} + +input AddBookingXIDInput { + id: String! + name: String! + created: DateTime + updated: DateTime +} + +input BookingFilter { + id: [ID!] + has: [BookingHasFilter] + and: [BookingFilter] + or: [BookingFilter] + not: BookingFilter +} + +input BookingOrder { + asc: BookingOrderable + desc: BookingOrderable + then: BookingOrder +} + +input BookingPatch { + name: String + created: DateTime + updated: DateTime +} + +input BookingRef { + id: ID + name: String + created: DateTime + updated: DateTime +} + +input BookingXIDFilter { + id: StringHashFilter + has: [BookingXIDHasFilter] + and: [BookingXIDFilter] + or: [BookingXIDFilter] + not: BookingXIDFilter +} + +input BookingXIDOrder { + asc: BookingXIDOrderable + desc: BookingXIDOrderable + then: BookingXIDOrder +} + +input BookingXIDPatch { + id: String + name: String + created: DateTime + updated: DateTime +} + +input BookingXIDRef { + id: String + name: String + created: DateTime + updated: DateTime +} + +input UpdateBookingInput { + filter: BookingFilter! + set: BookingPatch + remove: BookingPatch +} + +input UpdateBookingXIDInput { + filter: BookingXIDFilter! + set: BookingXIDPatch + remove: BookingXIDPatch +} + +####################### +# Generated Query +####################### + +type Query { + getBooking(id: ID!): Booking + queryBooking(filter: BookingFilter, order: BookingOrder, first: Int, offset: Int): [Booking] + aggregateBooking(filter: BookingFilter): BookingAggregateResult + getBookingXID(id: String!): BookingXID + queryBookingXID(filter: BookingXIDFilter, order: BookingXIDOrder, first: Int, offset: Int): [BookingXID] + aggregateBookingXID(filter: BookingXIDFilter): BookingXIDAggregateResult +} + +####################### +# Generated Mutations +####################### + +type Mutation { + addBooking(input: [AddBookingInput!]!): AddBookingPayload + updateBooking(input: UpdateBookingInput!): UpdateBookingPayload + deleteBooking(filter: BookingFilter!): DeleteBookingPayload + addBookingXID(input: [AddBookingXIDInput!]!, upsert: Boolean): AddBookingXIDPayload + updateBookingXID(input: UpdateBookingXIDInput!): UpdateBookingXIDPayload + deleteBookingXID(filter: BookingXIDFilter!): DeleteBookingXIDPayload +} + diff --git a/graphql/schema/testdata/schemagen/output/custom-dql-query-with-subscription.graphql b/graphql/schema/testdata/schemagen/output/custom-dql-query-with-subscription.graphql index 42d1b5e8735..881b4d5ab04 100644 --- a/graphql/schema/testdata/schemagen/output/custom-dql-query-with-subscription.graphql +++ b/graphql/schema/testdata/schemagen/output/custom-dql-query-with-subscription.graphql @@ -113,6 +113,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -196,6 +200,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/custom-mutation.graphql b/graphql/schema/testdata/schemagen/output/custom-mutation.graphql index b06c8052f6d..cd06b5dde7f 100644 --- a/graphql/schema/testdata/schemagen/output/custom-mutation.graphql +++ b/graphql/schema/testdata/schemagen/output/custom-mutation.graphql @@ -103,6 +103,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -186,6 +190,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/custom-nested-types.graphql b/graphql/schema/testdata/schemagen/output/custom-nested-types.graphql index ba46ead1487..7f6026fba36 100644 --- a/graphql/schema/testdata/schemagen/output/custom-nested-types.graphql +++ b/graphql/schema/testdata/schemagen/output/custom-nested-types.graphql @@ -120,6 +120,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -203,6 +207,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/custom-query-mixed-types.graphql b/graphql/schema/testdata/schemagen/output/custom-query-mixed-types.graphql index 689f77789a8..df50f1e6ef5 100644 --- a/graphql/schema/testdata/schemagen/output/custom-query-mixed-types.graphql +++ b/graphql/schema/testdata/schemagen/output/custom-query-mixed-types.graphql @@ -104,6 +104,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -187,6 +191,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/custom-query-not-dgraph-type.graphql b/graphql/schema/testdata/schemagen/output/custom-query-not-dgraph-type.graphql index 69eff1c9bc2..6093f603aaa 100644 --- a/graphql/schema/testdata/schemagen/output/custom-query-not-dgraph-type.graphql +++ b/graphql/schema/testdata/schemagen/output/custom-query-not-dgraph-type.graphql @@ -103,6 +103,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -186,6 +190,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/custom-query-with-dgraph-type.graphql b/graphql/schema/testdata/schemagen/output/custom-query-with-dgraph-type.graphql index 34959d52171..06213dddd25 100644 --- a/graphql/schema/testdata/schemagen/output/custom-query-with-dgraph-type.graphql +++ b/graphql/schema/testdata/schemagen/output/custom-query-with-dgraph-type.graphql @@ -99,6 +99,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -182,6 +186,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/deprecated.graphql b/graphql/schema/testdata/schemagen/output/deprecated.graphql index a44e32bd30d..cd3a425cc03 100644 --- a/graphql/schema/testdata/schemagen/output/deprecated.graphql +++ b/graphql/schema/testdata/schemagen/output/deprecated.graphql @@ -99,6 +99,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -182,6 +186,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/dgraph-reverse-directive-on-concrete-type-with-interfaces.graphql b/graphql/schema/testdata/schemagen/output/dgraph-reverse-directive-on-concrete-type-with-interfaces.graphql index 43cb363af0e..395ddae515b 100644 --- a/graphql/schema/testdata/schemagen/output/dgraph-reverse-directive-on-concrete-type-with-interfaces.graphql +++ b/graphql/schema/testdata/schemagen/output/dgraph-reverse-directive-on-concrete-type-with-interfaces.graphql @@ -116,6 +116,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -199,6 +203,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/dgraph-reverse-directive-with-interfaces.graphql b/graphql/schema/testdata/schemagen/output/dgraph-reverse-directive-with-interfaces.graphql index 40219cc45be..6cfe972414e 100644 --- a/graphql/schema/testdata/schemagen/output/dgraph-reverse-directive-with-interfaces.graphql +++ b/graphql/schema/testdata/schemagen/output/dgraph-reverse-directive-with-interfaces.graphql @@ -116,6 +116,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -199,6 +203,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/embedding-directive-with-similar-queries.graphql b/graphql/schema/testdata/schemagen/output/embedding-directive-with-similar-queries.graphql index 77d52a9e96a..f0ecf0a1e0d 100644 --- a/graphql/schema/testdata/schemagen/output/embedding-directive-with-similar-queries.graphql +++ b/graphql/schema/testdata/schemagen/output/embedding-directive-with-similar-queries.graphql @@ -7,7 +7,7 @@ type Product { description: String title: String imageUrl: String - product_vector: [Float!] @embedding @search(by: ["hnsw(metric: euclidian, exponent: 4)"]) + product_vector: [Float!] @embedding @search(by: ["hnsw(metric: euclidean, exponent: 4)"]) vector_distance: Float } @@ -117,6 +117,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -200,6 +204,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/field-with-id-directive.graphql b/graphql/schema/testdata/schemagen/output/field-with-id-directive.graphql index c570fe404b0..6a0a246aa85 100644 --- a/graphql/schema/testdata/schemagen/output/field-with-id-directive.graphql +++ b/graphql/schema/testdata/schemagen/output/field-with-id-directive.graphql @@ -113,6 +113,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -196,6 +200,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/field-with-multiple-@id-fields.graphql b/graphql/schema/testdata/schemagen/output/field-with-multiple-@id-fields.graphql index 4742f69f583..71548212021 100644 --- a/graphql/schema/testdata/schemagen/output/field-with-multiple-@id-fields.graphql +++ b/graphql/schema/testdata/schemagen/output/field-with-multiple-@id-fields.graphql @@ -113,6 +113,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -196,6 +200,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/field-with-reverse-predicate-in-dgraph-directive.graphql b/graphql/schema/testdata/schemagen/output/field-with-reverse-predicate-in-dgraph-directive.graphql index b323d5c0af3..31b594c2a7e 100644 --- a/graphql/schema/testdata/schemagen/output/field-with-reverse-predicate-in-dgraph-directive.graphql +++ b/graphql/schema/testdata/schemagen/output/field-with-reverse-predicate-in-dgraph-directive.graphql @@ -108,6 +108,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -191,6 +195,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/filter-cleanSchema-all-empty.graphql b/graphql/schema/testdata/schemagen/output/filter-cleanSchema-all-empty.graphql index 98a287265a8..2cf10c23814 100644 --- a/graphql/schema/testdata/schemagen/output/filter-cleanSchema-all-empty.graphql +++ b/graphql/schema/testdata/schemagen/output/filter-cleanSchema-all-empty.graphql @@ -111,6 +111,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -194,6 +198,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/filter-cleanSchema-circular.graphql b/graphql/schema/testdata/schemagen/output/filter-cleanSchema-circular.graphql index e8a0a4e3262..78e536d76ed 100644 --- a/graphql/schema/testdata/schemagen/output/filter-cleanSchema-circular.graphql +++ b/graphql/schema/testdata/schemagen/output/filter-cleanSchema-circular.graphql @@ -115,6 +115,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -198,6 +202,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/filter-cleanSchema-custom-mutation.graphql b/graphql/schema/testdata/schemagen/output/filter-cleanSchema-custom-mutation.graphql index b49eccb0dda..e94e759d18b 100644 --- a/graphql/schema/testdata/schemagen/output/filter-cleanSchema-custom-mutation.graphql +++ b/graphql/schema/testdata/schemagen/output/filter-cleanSchema-custom-mutation.graphql @@ -103,6 +103,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -186,6 +190,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/filter-cleanSchema-directLink.graphql b/graphql/schema/testdata/schemagen/output/filter-cleanSchema-directLink.graphql index 12d3fc8f1a8..e26f5cc4672 100644 --- a/graphql/schema/testdata/schemagen/output/filter-cleanSchema-directLink.graphql +++ b/graphql/schema/testdata/schemagen/output/filter-cleanSchema-directLink.graphql @@ -113,6 +113,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -196,6 +200,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/generate-directive.graphql b/graphql/schema/testdata/schemagen/output/generate-directive.graphql index 2218601efb5..b5cda816303 100644 --- a/graphql/schema/testdata/schemagen/output/generate-directive.graphql +++ b/graphql/schema/testdata/schemagen/output/generate-directive.graphql @@ -114,6 +114,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -197,6 +201,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/geo-type.graphql b/graphql/schema/testdata/schemagen/output/geo-type.graphql index 229ca9e0bf6..290522facbb 100644 --- a/graphql/schema/testdata/schemagen/output/geo-type.graphql +++ b/graphql/schema/testdata/schemagen/output/geo-type.graphql @@ -105,6 +105,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -188,6 +192,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/hasInverse-with-interface-having-directive.graphql b/graphql/schema/testdata/schemagen/output/hasInverse-with-interface-having-directive.graphql index 18d386066e0..4a92ac3aa88 100644 --- a/graphql/schema/testdata/schemagen/output/hasInverse-with-interface-having-directive.graphql +++ b/graphql/schema/testdata/schemagen/output/hasInverse-with-interface-having-directive.graphql @@ -124,6 +124,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -207,6 +211,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/hasInverse-with-interface.graphql b/graphql/schema/testdata/schemagen/output/hasInverse-with-interface.graphql index 6f2de5a2e5d..6a0e7001198 100644 --- a/graphql/schema/testdata/schemagen/output/hasInverse-with-interface.graphql +++ b/graphql/schema/testdata/schemagen/output/hasInverse-with-interface.graphql @@ -126,6 +126,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -209,6 +213,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/hasInverse-with-type-having-directive.graphql b/graphql/schema/testdata/schemagen/output/hasInverse-with-type-having-directive.graphql index 18d386066e0..4a92ac3aa88 100644 --- a/graphql/schema/testdata/schemagen/output/hasInverse-with-type-having-directive.graphql +++ b/graphql/schema/testdata/schemagen/output/hasInverse-with-type-having-directive.graphql @@ -124,6 +124,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -207,6 +211,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/hasInverse.graphql b/graphql/schema/testdata/schemagen/output/hasInverse.graphql index 2c5c948720f..c9e38071c69 100644 --- a/graphql/schema/testdata/schemagen/output/hasInverse.graphql +++ b/graphql/schema/testdata/schemagen/output/hasInverse.graphql @@ -105,6 +105,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -188,6 +192,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/hasInverse_withSubscription.graphql b/graphql/schema/testdata/schemagen/output/hasInverse_withSubscription.graphql index 67d0ebb7360..36b180d322c 100644 --- a/graphql/schema/testdata/schemagen/output/hasInverse_withSubscription.graphql +++ b/graphql/schema/testdata/schemagen/output/hasInverse_withSubscription.graphql @@ -105,6 +105,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -188,6 +192,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/hasfilter.graphql b/graphql/schema/testdata/schemagen/output/hasfilter.graphql index 3fd950ad953..41964b18b97 100644 --- a/graphql/schema/testdata/schemagen/output/hasfilter.graphql +++ b/graphql/schema/testdata/schemagen/output/hasfilter.graphql @@ -107,6 +107,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -190,6 +194,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/ignore-unsupported-directive.graphql b/graphql/schema/testdata/schemagen/output/ignore-unsupported-directive.graphql index 11a0c470f28..517bca9bbe4 100644 --- a/graphql/schema/testdata/schemagen/output/ignore-unsupported-directive.graphql +++ b/graphql/schema/testdata/schemagen/output/ignore-unsupported-directive.graphql @@ -106,6 +106,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -189,6 +193,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/interface-with-dgraph-pred.graphql b/graphql/schema/testdata/schemagen/output/interface-with-dgraph-pred.graphql index 315a044ef03..ecd7d1905e0 100644 --- a/graphql/schema/testdata/schemagen/output/interface-with-dgraph-pred.graphql +++ b/graphql/schema/testdata/schemagen/output/interface-with-dgraph-pred.graphql @@ -115,6 +115,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -198,6 +202,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/interface-with-id-directive.graphql b/graphql/schema/testdata/schemagen/output/interface-with-id-directive.graphql index 45286f85154..5230262e99f 100644 --- a/graphql/schema/testdata/schemagen/output/interface-with-id-directive.graphql +++ b/graphql/schema/testdata/schemagen/output/interface-with-id-directive.graphql @@ -111,6 +111,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -194,6 +198,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/interface-with-no-ids.graphql b/graphql/schema/testdata/schemagen/output/interface-with-no-ids.graphql index 15d9aa8534d..229a55e6141 100644 --- a/graphql/schema/testdata/schemagen/output/interface-with-no-ids.graphql +++ b/graphql/schema/testdata/schemagen/output/interface-with-no-ids.graphql @@ -109,6 +109,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -192,6 +196,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/interfaces-with-types-and-password.graphql b/graphql/schema/testdata/schemagen/output/interfaces-with-types-and-password.graphql index d1f7645b71b..d274d2470db 100644 --- a/graphql/schema/testdata/schemagen/output/interfaces-with-types-and-password.graphql +++ b/graphql/schema/testdata/schemagen/output/interfaces-with-types-and-password.graphql @@ -134,6 +134,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -217,6 +221,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/interfaces-with-types.graphql b/graphql/schema/testdata/schemagen/output/interfaces-with-types.graphql index 667dc065979..5557ee1e3df 100644 --- a/graphql/schema/testdata/schemagen/output/interfaces-with-types.graphql +++ b/graphql/schema/testdata/schemagen/output/interfaces-with-types.graphql @@ -134,6 +134,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -217,6 +221,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/lambda-directive.graphql b/graphql/schema/testdata/schemagen/output/lambda-directive.graphql index c083d55a1a4..2b81f7d964e 100644 --- a/graphql/schema/testdata/schemagen/output/lambda-directive.graphql +++ b/graphql/schema/testdata/schemagen/output/lambda-directive.graphql @@ -101,6 +101,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -184,6 +188,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/language-tags.graphql b/graphql/schema/testdata/schemagen/output/language-tags.graphql index 03c3a4b89cf..174a6cde433 100644 --- a/graphql/schema/testdata/schemagen/output/language-tags.graphql +++ b/graphql/schema/testdata/schemagen/output/language-tags.graphql @@ -114,6 +114,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -197,6 +201,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/no-id-field-with-searchables.graphql b/graphql/schema/testdata/schemagen/output/no-id-field-with-searchables.graphql index fafc7d3ac19..66f3178e52c 100644 --- a/graphql/schema/testdata/schemagen/output/no-id-field-with-searchables.graphql +++ b/graphql/schema/testdata/schemagen/output/no-id-field-with-searchables.graphql @@ -98,6 +98,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -181,6 +185,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/no-id-field.graphql b/graphql/schema/testdata/schemagen/output/no-id-field.graphql index 929f96e399b..1b45c328a3a 100644 --- a/graphql/schema/testdata/schemagen/output/no-id-field.graphql +++ b/graphql/schema/testdata/schemagen/output/no-id-field.graphql @@ -111,6 +111,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -194,6 +198,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/password-type.graphql b/graphql/schema/testdata/schemagen/output/password-type.graphql index cb13e7d52fc..9b637e1796e 100644 --- a/graphql/schema/testdata/schemagen/output/password-type.graphql +++ b/graphql/schema/testdata/schemagen/output/password-type.graphql @@ -99,6 +99,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -182,6 +186,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/random.graphql b/graphql/schema/testdata/schemagen/output/random.graphql index 196c54e6e2f..3d0c9112385 100644 --- a/graphql/schema/testdata/schemagen/output/random.graphql +++ b/graphql/schema/testdata/schemagen/output/random.graphql @@ -117,6 +117,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -200,6 +204,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @remote on OBJECT | INTERFACE | UNION | INPUT_OBJECT | ENUM diff --git a/graphql/schema/testdata/schemagen/output/searchables-references.graphql b/graphql/schema/testdata/schemagen/output/searchables-references.graphql index e2ef7e884ad..783620de915 100644 --- a/graphql/schema/testdata/schemagen/output/searchables-references.graphql +++ b/graphql/schema/testdata/schemagen/output/searchables-references.graphql @@ -109,6 +109,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -192,6 +196,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/searchables.graphql b/graphql/schema/testdata/schemagen/output/searchables.graphql index 822434df817..ac2387bae25 100644 --- a/graphql/schema/testdata/schemagen/output/searchables.graphql +++ b/graphql/schema/testdata/schemagen/output/searchables.graphql @@ -129,6 +129,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -212,6 +216,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/single-type-with-enum.graphql b/graphql/schema/testdata/schemagen/output/single-type-with-enum.graphql index 9e618990057..0645d3f34ae 100644 --- a/graphql/schema/testdata/schemagen/output/single-type-with-enum.graphql +++ b/graphql/schema/testdata/schemagen/output/single-type-with-enum.graphql @@ -107,6 +107,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -190,6 +194,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/single-type.graphql b/graphql/schema/testdata/schemagen/output/single-type.graphql index dfd68e48be5..cd8dcc92926 100644 --- a/graphql/schema/testdata/schemagen/output/single-type.graphql +++ b/graphql/schema/testdata/schemagen/output/single-type.graphql @@ -102,6 +102,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -185,6 +189,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/type-implements-multiple-interfaces.graphql b/graphql/schema/testdata/schemagen/output/type-implements-multiple-interfaces.graphql index 1307a08b8cf..fb367928dd7 100644 --- a/graphql/schema/testdata/schemagen/output/type-implements-multiple-interfaces.graphql +++ b/graphql/schema/testdata/schemagen/output/type-implements-multiple-interfaces.graphql @@ -116,6 +116,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -199,6 +203,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/type-reference.graphql b/graphql/schema/testdata/schemagen/output/type-reference.graphql index 30e7ab07d77..6cd97099546 100644 --- a/graphql/schema/testdata/schemagen/output/type-reference.graphql +++ b/graphql/schema/testdata/schemagen/output/type-reference.graphql @@ -106,6 +106,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -189,6 +193,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/type-with-arguments-on-field.graphql b/graphql/schema/testdata/schemagen/output/type-with-arguments-on-field.graphql index dc5a5938e70..8e1aebb77bc 100644 --- a/graphql/schema/testdata/schemagen/output/type-with-arguments-on-field.graphql +++ b/graphql/schema/testdata/schemagen/output/type-with-arguments-on-field.graphql @@ -107,6 +107,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -190,6 +194,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/type-with-custom-field-on-dgraph-type.graphql b/graphql/schema/testdata/schemagen/output/type-with-custom-field-on-dgraph-type.graphql index 2ab2f58c4fa..b530551a062 100644 --- a/graphql/schema/testdata/schemagen/output/type-with-custom-field-on-dgraph-type.graphql +++ b/graphql/schema/testdata/schemagen/output/type-with-custom-field-on-dgraph-type.graphql @@ -106,6 +106,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -189,6 +193,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/type-with-custom-fields-on-remote-type.graphql b/graphql/schema/testdata/schemagen/output/type-with-custom-fields-on-remote-type.graphql index e425637fb7c..e2f05334889 100644 --- a/graphql/schema/testdata/schemagen/output/type-with-custom-fields-on-remote-type.graphql +++ b/graphql/schema/testdata/schemagen/output/type-with-custom-fields-on-remote-type.graphql @@ -106,6 +106,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -189,6 +193,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/type-without-orderables.graphql b/graphql/schema/testdata/schemagen/output/type-without-orderables.graphql index 7196b507ad5..7dc66b26104 100644 --- a/graphql/schema/testdata/schemagen/output/type-without-orderables.graphql +++ b/graphql/schema/testdata/schemagen/output/type-without-orderables.graphql @@ -101,6 +101,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -184,6 +188,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/testdata/schemagen/output/union.graphql b/graphql/schema/testdata/schemagen/output/union.graphql index c6ea004e33f..a9fcb67dcae 100644 --- a/graphql/schema/testdata/schemagen/output/union.graphql +++ b/graphql/schema/testdata/schemagen/output/union.graphql @@ -148,6 +148,10 @@ input CustomHTTP { skipIntrospection: Boolean } +input DgraphDefault { + value: String +} + type Point { longitude: Float! latitude: Float! @@ -231,6 +235,7 @@ directive @search(by: [String!]) on FIELD_DEFINITION directive @embedding on FIELD_DEFINITION directive @dgraph(type: String, pred: String) on OBJECT | INTERFACE | FIELD_DEFINITION directive @id(interface: Boolean) on FIELD_DEFINITION +directive @default(add: DgraphDefault, update: DgraphDefault) on FIELD_DEFINITION directive @withSubscription on OBJECT | INTERFACE | FIELD_DEFINITION directive @secret(field: String!, pred: String) on OBJECT | INTERFACE directive @auth( diff --git a/graphql/schema/validation_rules.go b/graphql/schema/validation_rules.go index 8e8998bce70..148a7870358 100644 --- a/graphql/schema/validation_rules.go +++ b/graphql/schema/validation_rules.go @@ -21,7 +21,7 @@ import ( "fmt" "strconv" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/gqlerror" "github.com/dgraph-io/gqlparser/v2/validator" diff --git a/graphql/schema/wrappers.go b/graphql/schema/wrappers.go index e756d681a36..0d8d6362756 100644 --- a/graphql/schema/wrappers.go +++ b/graphql/schema/wrappers.go @@ -19,17 +19,19 @@ package schema import ( "bytes" "encoding/json" + "flag" "fmt" "net/http" "net/url" "sort" "strconv" "strings" + "time" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/graphql/authorization" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/authorization" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/parser" ) @@ -114,7 +116,7 @@ const ( SimilarByEmbeddingQuerySuffix = "ByEmbedding" SimilarQueryResultTypeSuffix = "WithDistance" SimilarQueryDistanceFieldName = "vector_distance" - SimilarSearchMetricEuclidian = "euclidian" + SimilarSearchMetricEuclidean = "euclidean" SimilarSearchMetricDotProduct = "dotproduct" SimilarSearchMetricCosine = "cosine" ) @@ -286,6 +288,7 @@ type FieldDefinition interface { HasEmbeddingDirective() bool EmbeddingSearchMetric() string HasInterfaceArg() bool + GetDefaultValue(action string) interface{} Inverse() FieldDefinition WithMemberType(string) FieldDefinition // TODO - It might be possible to get rid of ForwardEdge and just use Inverse() always. @@ -2336,6 +2339,36 @@ func (fd *fieldDefinition) IsID() bool { return isID(fd.fieldDef) } +func (fd *fieldDefinition) GetDefaultValue(action string) interface{} { + if fd.fieldDef == nil { + return nil + } + return getDefaultValue(fd.fieldDef, action) +} + +func getDefaultValue(fd *ast.FieldDefinition, action string) interface{} { + dir := fd.Directives.ForName(defaultDirective) + if dir == nil { + return nil + } + arg := dir.Arguments.ForName(action) + if arg == nil { + return nil + } + value := arg.Value.Children.ForName("value") + if value == nil { + return nil + } + if value.Raw == "$now" { + if flag.Lookup("test.v") == nil { + return time.Now().Format(time.RFC3339) + } else { + return "2000-01-01T00:00:00.00Z" + } + } + return value.Raw +} + func (fd *fieldDefinition) HasIDDirective() bool { if fd.fieldDef == nil { return false @@ -2400,6 +2433,10 @@ func isID(fd *ast.FieldDefinition) bool { return fd.Type.Name() == "ID" } +func hasDefault(fd *ast.FieldDefinition) bool { + return fd.Directives.ForName(defaultDirective) != nil +} + func (fd *fieldDefinition) Type() Type { return &astType{ typ: fd.fieldDef.Type, @@ -2764,7 +2801,7 @@ func (t *astType) ImplementingTypes() []Type { // satisfy a valid post. func (t *astType) EnsureNonNulls(obj map[string]interface{}, exclusion string) error { for _, fld := range t.inSchema.schema.Types[t.Name()].Fields { - if fld.Type.NonNull && !isID(fld) && fld.Name != exclusion && + if fld.Type.NonNull && !isID(fld) && !hasDefault(fld) && fld.Name != exclusion && t.inSchema.customDirectives[t.Name()][fld.Name] == nil { if val, ok := obj[fld.Name]; !ok || val == nil { return errors.Errorf( diff --git a/graphql/schema/wrappers_test.go b/graphql/schema/wrappers_test.go index 9867020bd13..2927050f4f0 100644 --- a/graphql/schema/wrappers_test.go +++ b/graphql/schema/wrappers_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" ) diff --git a/graphql/subscription/poller.go b/graphql/subscription/poller.go index b80e0e1865e..73631f58e74 100644 --- a/graphql/subscription/poller.go +++ b/graphql/subscription/poller.go @@ -29,9 +29,9 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/golang/glog" - "github.com/dgraph-io/dgraph/graphql/resolve" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/resolve" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) // Poller is used to poll user subscription query. diff --git a/graphql/test/test.go b/graphql/test/test.go index 3d505960abb..63f0444c3fc 100644 --- a/graphql/test/test.go +++ b/graphql/test/test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/gqlparser/v2/ast" "github.com/dgraph-io/gqlparser/v2/parser" "github.com/dgraph-io/gqlparser/v2/validator" diff --git a/graphql/testdata/datagen/main.go b/graphql/testdata/datagen/main.go index 0a46a35de35..b5ddabe993e 100644 --- a/graphql/testdata/datagen/main.go +++ b/graphql/testdata/datagen/main.go @@ -15,7 +15,7 @@ limitations under the License. */ package main -import "github.com/dgraph-io/dgraph/graphql/testdata/datagen/cmd" +import "github.com/dgraph-io/dgraph/v24/graphql/testdata/datagen/cmd" func main() { cmd.Execute() diff --git a/lex/lexer.go b/lex/lexer.go index 5b5e3652584..7ebd00ed6fd 100644 --- a/lex/lexer.go +++ b/lex/lexer.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // EOF indicates the end of the an input. diff --git a/posting/index.go b/posting/index.go index a2e6cddbb0c..123be08e66e 100644 --- a/posting/index.go +++ b/posting/index.go @@ -38,12 +38,12 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4/options" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/tok/hnsw" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/tok/hnsw" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) @@ -243,7 +243,7 @@ func (txn *Txn) addReverseMutationHelper(ctx context.Context, plist *List, if hasCountIndex { countBefore, found, _ = plist.getPostingAndLengthNoSort(txn.StartTs, 0, edge.ValueId) if countBefore == -1 { - return emptyCountParams, ErrTsTooOld + return emptyCountParams, errors.Wrapf(ErrTsTooOld, "Adding reverse mutation helper count") } } if err := plist.addMutationInternal(ctx, txn, edge); err != nil { @@ -505,7 +505,7 @@ func (txn *Txn) addMutationHelper(ctx context.Context, l *List, doUpdateIndex bo case hasCountIndex: countBefore, found, currPost = l.getPostingAndLength(txn.StartTs, 0, getUID(t)) if countBefore == -1 { - return val, false, emptyCountParams, ErrTsTooOld + return val, false, emptyCountParams, errors.Wrapf(ErrTsTooOld, "Add mutation count index") } case doUpdateIndex || delNonListPredicate: found, currPost, err = l.findPosting(txn.StartTs, fingerprintEdge(t)) @@ -1218,14 +1218,22 @@ func (rb *IndexRebuild) needsTokIndexRebuild() *indexRebuildInfo { prevFactoryNames := make(map[string]struct{}) prevFactories := make(map[string]*pb.VectorIndexSpec) for _, t := range old.IndexSpecs { - prevFactoryNames[t.Name] = struct{}{} - prevFactories[t.Name] = t + spec, err := tok.GetFactoryCreateSpecFromSpec(t) + x.AssertTruef(err == nil, "Error while building index spec %s", err) + name := spec.Name() + + prevFactoryNames[name] = struct{}{} + prevFactories[name] = t } currFactoryNames := make(map[string]struct{}) currFactories := make(map[string]*pb.VectorIndexSpec) for _, t := range rb.CurrentSchema.IndexSpecs { - currFactoryNames[t.Name] = struct{}{} - currFactories[t.Name] = t + spec, err := tok.GetFactoryCreateSpecFromSpec(t) + x.AssertTruef(err == nil, "Error while building index spec %s", err) + name := spec.Name() + + currFactoryNames[name] = struct{}{} + currFactories[name] = t } newFactoryNames, deletedFactoryNames := x.Diff(currFactoryNames, prevFactoryNames) @@ -1532,13 +1540,37 @@ func (rb *IndexRebuild) needsVectorIndexEdgesRebuild() indexOp { prevIndex := old.Directive == pb.SchemaUpdate_INDEX && old.ValueType == pb.Posting_VFLOAT + prevFactoryNames := make(map[string]struct{}) + prevFactories := make(map[string]*pb.VectorIndexSpec) + for _, t := range old.IndexSpecs { + spec, err := tok.GetFactoryCreateSpecFromSpec(t) + x.AssertTruef(err == nil, "Error while building index spec %s", err) + name := spec.Name() + + prevFactoryNames[name] = struct{}{} + prevFactories[name] = t + } + + currFactoryNames := make(map[string]struct{}) + currFactories := make(map[string]*pb.VectorIndexSpec) + for _, t := range rb.CurrentSchema.IndexSpecs { + spec, err := tok.GetFactoryCreateSpecFromSpec(t) + x.AssertTruef(err == nil, "Error while building index spec %s", err) + name := spec.Name() + + currFactoryNames[name] = struct{}{} + currFactories[name] = t + } + + newFactoryNames, deletedFactoryNames := x.Diff(currFactoryNames, prevFactoryNames) + // If the schema directive did not change, return indexNoop. - if currIndex == prevIndex { + if currIndex == prevIndex && len(newFactoryNames) == 0 && len(deletedFactoryNames) == 0 { return indexNoop } // If the current schema requires an index, index should be rebuilt. - if currIndex { + if currIndex || len(newFactoryNames) != 0 { return indexRebuild } // Otherwise, index should only be deleted. diff --git a/posting/index_test.go b/posting/index_test.go index 03f2f74cc0e..249b14e4c21 100644 --- a/posting/index_test.go +++ b/posting/index_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) func uids(l *List, readTs uint64) []uint64 { diff --git a/posting/list.go b/posting/list.go index 020bb17c362..d6b873112e4 100644 --- a/posting/list.go +++ b/posting/list.go @@ -31,14 +31,14 @@ import ( bpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/tok/index" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/tok/index" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) @@ -1278,7 +1278,7 @@ func (l *List) Uids(opt ListOptions) (*pb.List, error) { if len(l.mutationMap) == 0 && opt.Intersect != nil && len(l.plist.Splits) == 0 { if opt.ReadTs < l.minTs { l.RUnlock() - return out, ErrTsTooOld + return out, errors.Wrapf(ErrTsTooOld, "While reading UIDs") } algo.IntersectCompressedWith(l.plist.Pack, opt.AfterUid, opt.Intersect, out) l.RUnlock() diff --git a/posting/list_test.go b/posting/list_test.go index 233e63455cf..e35632e47c6 100644 --- a/posting/list_test.go +++ b/posting/list_test.go @@ -30,11 +30,11 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/posting/lists.go b/posting/lists.go index c8134b77440..9a20a917900 100644 --- a/posting/lists.go +++ b/posting/lists.go @@ -23,15 +23,14 @@ import ( "sync" "time" - ostats "go.opencensus.io/stats" - "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok/index" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok/index" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto" "github.com/dgraph-io/ristretto/z" + ostats "go.opencensus.io/stats" ) const ( @@ -41,7 +40,7 @@ const ( var ( pstore *badger.DB closer *z.Closer - lCache *ristretto.Cache + lCache *ristretto.Cache[[]byte, *List] ) // Init initializes the posting lists package, the in memory and dirty list hash. @@ -56,13 +55,13 @@ func Init(ps *badger.DB, cacheSize int64) { } var err error - lCache, err = ristretto.NewCache(&ristretto.Config{ + lCache, err = ristretto.NewCache[[]byte, *List](&ristretto.Config[[]byte, *List]{ // Use 5% of cache memory for storing counters. NumCounters: int64(float64(cacheSize) * 0.05 * 2), MaxCost: int64(float64(cacheSize) * 0.95), BufferItems: 64, Metrics: true, - Cost: func(val interface{}) int64 { + Cost: func(val *List) int64 { return 0 }, }) @@ -79,7 +78,6 @@ func Init(ps *badger.DB, cacheSize int64) { } func UpdateMaxCost(maxCost int64) { - lCache.UpdateMaxCost(maxCost) } // Cleanup waits until the closer has finished processing. diff --git a/posting/mvcc.go b/posting/mvcc.go index 27cdc6fe7a9..4790753addb 100644 --- a/posting/mvcc.go +++ b/posting/mvcc.go @@ -31,9 +31,9 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) @@ -133,6 +133,8 @@ func (ir *incrRollupi) rollUpKey(writer *TxnWriter, key []byte) error { return err } + RemoveCacheFor(key) + globalCache.Lock() val, ok := globalCache.items[string(key)] if ok { @@ -195,7 +197,7 @@ func (ir *incrRollupi) Process(closer *z.Closer, getNewTs func(bool) uint64) { currTs := time.Now().Unix() for _, key := range *batch { hash := z.MemHash(key) - if elem := m[hash]; currTs-elem >= 2 { + if elem := m[hash]; currTs-elem >= 10 { // Key not present or Key present but last roll up was more than 2 sec ago. // Add/Update map and rollup. m[hash] = currTs @@ -344,10 +346,20 @@ func (txn *Txn) CommitToDisk(writer *TxnWriter, commitTs uint64) error { } func ResetCache() { + if lCache != nil { + lCache.Clear() + } globalCache.Lock() globalCache.items = make(map[string]*CachePL) globalCache.Unlock() - lCache.Clear() +} + +// RemoveCacheFor will delete the list corresponding to the given key. +func RemoveCacheFor(key []byte) { + // TODO: investigate if this can be done by calling Set with a nil value. + if lCache != nil { + lCache.Del(key) + } } func NewCachePL() *CachePL { @@ -365,6 +377,7 @@ func (txn *Txn) UpdateCachedKeys(commitTs uint64) { } for key, delta := range txn.cache.deltas { + RemoveCacheFor([]byte(key)) pk, _ := x.Parse([]byte(key)) if !ShouldGoInCache(pk) { continue @@ -538,7 +551,33 @@ func ShouldGoInCache(pk x.ParsedKey) bool { return (!pk.IsData() && strings.HasSuffix(pk.Attr, "dgraph.type")) } +func PostingListCacheEnabled() bool { + return lCache != nil +} + func getNew(key []byte, pstore *badger.DB, readTs uint64) (*List, error) { + if PostingListCacheEnabled() { + l, ok := lCache.Get(key) + if ok && l != nil { + // No need to clone the immutable layer or the key since mutations will not modify it. + lCopy := &List{ + minTs: l.minTs, + maxTs: l.maxTs, + key: key, + plist: l.plist, + } + l.RLock() + if l.mutationMap != nil { + lCopy.mutationMap = make(map[uint64]*pb.PostingList, len(l.mutationMap)) + for ts, pl := range l.mutationMap { + lCopy.mutationMap[ts] = proto.Clone(pl).(*pb.PostingList) + } + } + l.RUnlock() + return lCopy, nil + } + } + if pstore.IsClosed() { return nil, badger.ErrDBClosed } @@ -605,5 +644,9 @@ func getNew(key []byte, pstore *badger.DB, readTs uint64) (*List, error) { globalCache.Unlock() } + if PostingListCacheEnabled() { + lCache.Set(key, l, 0) + } + return l, nil } diff --git a/posting/mvcc_test.go b/posting/mvcc_test.go index 9061d61d359..f68393ec706 100644 --- a/posting/mvcc_test.go +++ b/posting/mvcc_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/posting/oracle.go b/posting/oracle.go index 81ab8b80325..bc03dc9a861 100644 --- a/posting/oracle.go +++ b/posting/oracle.go @@ -27,9 +27,9 @@ import ( "github.com/golang/glog" ostats "go.opencensus.io/stats" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok/index" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok/index" + "github.com/dgraph-io/dgraph/v24/x" ) var o *oracle diff --git a/posting/size.go b/posting/size.go index fd7cf7ca3d6..2b406cda79f 100644 --- a/posting/size.go +++ b/posting/size.go @@ -21,8 +21,8 @@ import ( "reflect" "unsafe" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) const sizeOfBucket = 144 diff --git a/posting/size_test.go b/posting/size_test.go index 01528446966..078af85fb34 100644 --- a/posting/size_test.go +++ b/posting/size_test.go @@ -36,8 +36,8 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) var manual = flag.Bool("manual", false, "Set when manually running some tests.") diff --git a/protos/Makefile b/protos/Makefile index 3e47ba5c596..00aadbe2005 100644 --- a/protos/Makefile +++ b/protos/Makefile @@ -17,7 +17,7 @@ # Update BADGER_PB_VERSION when upgrading Badger major versions BADGER_PB_VERSION = 4 -DGO_PATH := github.com/dgraph-io/dgo/v230 +DGO_PATH := github.com/dgraph-io/dgo/v240 BADGER_PATH := github.com/dgraph-io/badger/v${BADGER_PB_VERSION} GOGO_PATH := github.com/gogo/protobuf diff --git a/protos/pb/pb.pb.go b/protos/pb/pb.pb.go index da938b36014..5f233d6c69e 100644 --- a/protos/pb/pb.pb.go +++ b/protos/pb/pb.pb.go @@ -8,7 +8,7 @@ import ( encoding_binary "encoding/binary" fmt "fmt" pb "github.com/dgraph-io/badger/v4/pb" - api "github.com/dgraph-io/dgo/v230/protos/api" + api "github.com/dgraph-io/dgo/v240/protos/api" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" diff --git a/protos/protos_test.go b/protos/protos_test.go index efcce96694e..e44ea6ef11d 100644 --- a/protos/protos_test.go +++ b/protos/protos_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestProtosRegenerate(t *testing.T) { diff --git a/query/aggregator.go b/query/aggregator.go index 6c2065f591a..92773502cbf 100644 --- a/query/aggregator.go +++ b/query/aggregator.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) type aggregator struct { diff --git a/query/cloud_test.go b/query/cloud_test.go index b542f83a448..a122a0009f6 100644 --- a/query/cloud_test.go +++ b/query/cloud_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) func TestMain(m *testing.M) { diff --git a/query/common_test.go b/query/common_test.go index f5b6dec787a..cdb8b7e668b 100644 --- a/query/common_test.go +++ b/query/common_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/x" ) func setSchema(schema string) { @@ -380,7 +380,7 @@ func populateCluster(dc dgraphapi.Cluster) { // alive // user_profile // } - // user_profile : float32vector @index(hnsw(metric:"euclidian")) .` + // user_profile : float32vector @index(hnsw(metric:"euclidean")) .` // } else { // ts = testSchema + `type User { // name diff --git a/query/fastjson_test.go b/query/fastjson_test.go index 22008ac285f..ecf3c5c41cd 100644 --- a/query/fastjson_test.go +++ b/query/fastjson_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/task" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/task" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/types" ) func subgraphWithSingleResultAndSingleValue(val *pb.TaskValue) *SubGraph { diff --git a/query/groupby.go b/query/groupby.go index 3056f88456e..ea6cbea98dd 100644 --- a/query/groupby.go +++ b/query/groupby.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" ) type groupPair struct { diff --git a/query/integration_test.go b/query/integration_test.go index 26a550dd842..dd142e008fc 100644 --- a/query/integration_test.go +++ b/query/integration_test.go @@ -22,9 +22,9 @@ import ( "context" "testing" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) func TestMain(m *testing.M) { diff --git a/query/math.go b/query/math.go index f4e45b2d608..9c029944b84 100644 --- a/query/math.go +++ b/query/math.go @@ -20,7 +20,7 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/types" ) type mathTree struct { diff --git a/query/math_test.go b/query/math_test.go index 5b41569cc7d..4ce48dad801 100644 --- a/query/math_test.go +++ b/query/math_test.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/types" ) func TestVector(t *testing.T) { diff --git a/query/mutation.go b/query/mutation.go index fa35c08ef22..7fe7d54145a 100644 --- a/query/mutation.go +++ b/query/mutation.go @@ -25,12 +25,12 @@ import ( "github.com/pkg/errors" otrace "go.opencensus.io/trace" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) // ApplyMutations performs the required edge expansions and forwards the results to the @@ -151,12 +151,8 @@ func verifyUid(ctx context.Context, uid uint64) error { } } -// AssignUids tries to assign unique ids to each identity in the subjects and objects in the -// format of _:xxx. An identity, e.g. _:a, will only be assigned one uid regardless how many times -// it shows up in the subjects or objects -func AssignUids(ctx context.Context, gmuList []*dql.Mutation) (map[string]uint64, error) { +func ExtractBlankUIDs(ctx context.Context, gmuList []*dql.Mutation) (map[string]uint64, error) { newUids := make(map[string]uint64) - num := &pb.Num{} var err error for _, gmu := range gmuList { for _, nq := range gmu.Set { @@ -192,8 +188,19 @@ func AssignUids(ctx context.Context, gmuList []*dql.Mutation) (map[string]uint64 } } - num.Val = uint64(len(newUids)) - num.Type = pb.Num_UID + return newUids, nil +} + +// AssignUids tries to assign unique ids to each identity in the subjects and objects in the +// format of _:xxx. An identity, e.g. _:a, will only be assigned one uid regardless how many times +// it shows up in the subjects or objects +func AssignUids(ctx context.Context, gmuList []*dql.Mutation) (map[string]uint64, error) { + newUids, err := ExtractBlankUIDs(ctx, gmuList) + if err != nil { + return newUids, err + } + + num := &pb.Num{Val: uint64(len(newUids)), Type: pb.Num_UID} if int(num.Val) > 0 { var res *pb.AssignedIds // TODO: Optimize later by prefetching. Also consolidate all the UID requests into a single diff --git a/query/mutation_test.go b/query/mutation_test.go index d6a45599955..374f37665fa 100644 --- a/query/mutation_test.go +++ b/query/mutation_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphtest" ) func TestReservedPredicateForMutation(t *testing.T) { diff --git a/query/normalize_feature_flag_test.go b/query/normalize_feature_flag_test.go index 7a1d6d3fcdc..727fa13762b 100644 --- a/query/normalize_feature_flag_test.go +++ b/query/normalize_feature_flag_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphtest" ) func TestNormalizeDirectiveWithNoListResponse(t *testing.T) { diff --git a/query/outputnode.go b/query/outputnode.go index d97aafc2674..9172fcbb7fb 100644 --- a/query/outputnode.go +++ b/query/outputnode.go @@ -35,14 +35,14 @@ import ( "github.com/twpayne/go-geom" "github.com/twpayne/go-geom/encoding/geojson" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/algo" - gqlSchema "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/task" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/algo" + gqlSchema "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/task" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/query/outputnode_graphql.go b/query/outputnode_graphql.go index d8ae77aedb5..8690a9c03cb 100644 --- a/query/outputnode_graphql.go +++ b/query/outputnode_graphql.go @@ -26,8 +26,8 @@ import ( "strings" "sync" - gqlSchema "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + gqlSchema "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) // graphQLEncoder is used to encode JSON response for GraphQL queries. diff --git a/query/outputnode_test.go b/query/outputnode_test.go index 771433041a3..331013dbac2 100644 --- a/query/outputnode_test.go +++ b/query/outputnode_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/query/outputrdf.go b/query/outputrdf.go index 866ed46c031..13722f336ee 100644 --- a/query/outputrdf.go +++ b/query/outputrdf.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) // rdfBuilder is used to generate RDF from subgraph. diff --git a/query/query.go b/query/query.go index 7db07ba4c07..3ebd2bac7bf 100644 --- a/query/query.go +++ b/query/query.go @@ -30,14 +30,14 @@ import ( otrace "go.opencensus.io/trace" "google.golang.org/grpc/metadata" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) /* diff --git a/query/query0_test.go b/query/query0_test.go index 5dce626da17..c28b5be5f08 100644 --- a/query/query0_test.go +++ b/query/query0_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/dql" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dql" ) func TestGetUID(t *testing.T) { diff --git a/query/query1_test.go b/query/query1_test.go index 67ddf3195fe..a22b736eb10 100644 --- a/query/query1_test.go +++ b/query/query1_test.go @@ -32,7 +32,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/metadata" - "github.com/dgraph-io/dgo/v230/protos/api" + "github.com/dgraph-io/dgo/v240/protos/api" ) func TestSchemaBlock2(t *testing.T) { diff --git a/query/query3_test.go b/query/query3_test.go index 0f60f1cfcda..bf4d50a4e60 100644 --- a/query/query3_test.go +++ b/query/query3_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/metadata" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestRecurseError(t *testing.T) { diff --git a/query/query4_test.go b/query/query4_test.go index 5fa63608453..88170d240c4 100644 --- a/query/query4_test.go +++ b/query/query4_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/x" ) func TestBigMathValue(t *testing.T) { @@ -1571,3 +1571,64 @@ func TestNumUids(t *testing.T) { require.Equal(t, metrics.NumUids["name"], uint64(16)) require.Equal(t, metrics.NumUids["_total"], uint64(26)) } + +func TestMultiplesSortingOrderWithVarAndPredicate(t *testing.T) { + s1 := testSchema + "\n" + `type Hostel { + hosteslName: String! + sections + } + + type Section { + section_id + hostel + } + hosteslName: string @index(exact) . + section_id: string @index(exact) . + sections: [uid] @count . + hostel:uid .` + "\n" + + setSchema(s1) + triples := ` + _:hostel1 "Hostel Alpha" . + _:hostel1 _:section1 . + _:hostel1 _:section2 . + + _:section1 "S1" . + _:section2 "S2" . + + _:hostel2 "Hostel Beta" . + _:hostel2 _:section3 . + + _:section3 "S3" . + + _:hostel3 "Hostel Gamma" . + _:hostel3 _:section4 . + _:hostel3 _:section5 . + _:hostel3 _:section6 . + + _:section4 "S4" . + _:section5 "S5" . + _:section6 "S6" . + ` + addTriplesToCluster(triples) + + query := `{ + var(func: has(name)) { + SECTIONS_COUNT as count(sections) + } + + allHostels(func: has(name), orderdesc: + val(SECTIONS_COUNT), orderasc: name) { + uid + name + sections { + section_id + } + totalSections: val(SECTIONS_COUNT) + } + }` + + // should return error + _, err := processQuery(context.Background(), t, query) + require.ErrorContains(t, err, "Val() is not allowed in multiple sorting. Got: [SECTIONS_COUNT]") +} diff --git a/query/recurse.go b/query/recurse.go index b26853f017f..6a308d5c07d 100644 --- a/query/recurse.go +++ b/query/recurse.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/x" ) func (start *SubGraph) expandRecurse(ctx context.Context, maxDepth uint64) error { diff --git a/query/shortest.go b/query/shortest.go index 262332e5676..8295ccf231a 100644 --- a/query/shortest.go +++ b/query/shortest.go @@ -24,11 +24,11 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" ) type pathInfo struct { diff --git a/query/upgrade_test.go b/query/upgrade_test.go index 996a9f6332b..64423d72828 100644 --- a/query/upgrade_test.go +++ b/query/upgrade_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) func TestMain(m *testing.M) { diff --git a/query/vector/integration_test.go b/query/vector/integration_test.go index 7cb11b1b231..82790f7ae86 100644 --- a/query/vector/integration_test.go +++ b/query/vector/integration_test.go @@ -22,9 +22,9 @@ import ( "context" "testing" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) func TestMain(m *testing.M) { diff --git a/query/vector/vector_graphql_test.go b/query/vector/vector_graphql_test.go index ca061a9c781..4f496ea1db1 100644 --- a/query/vector/vector_graphql_test.go +++ b/query/vector/vector_graphql_test.go @@ -24,7 +24,7 @@ import ( "math/rand" "testing" - "github.com/dgraph-io/dgraph/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphapi" "github.com/stretchr/testify/require" ) @@ -191,7 +191,7 @@ func TestVectorSchema(t *testing.T) { require.Error(t, hc.UpdateGQLSchema(fmt.Sprintf(graphQLVectorSchema, "euclidean"))) } -func TestVectorGraphQlEuclidianIndexMutationAndQuery(t *testing.T) { +func TestVectorGraphQlEuclideanIndexMutationAndQuery(t *testing.T) { require.NoError(t, client.DropAll()) hc, err := dc.HTTPClient() require.NoError(t, err) diff --git a/query/vector/vector_test.go b/query/vector/vector_test.go index c19a8bfc4b1..ea08549d444 100644 --- a/query/vector/vector_test.go +++ b/query/vector/vector_test.go @@ -27,10 +27,10 @@ import ( "testing" "time" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) @@ -393,9 +393,44 @@ func testVectorMutationDiffrentLength(t *testing.T, err string) { require.ErrorContains(t, addTriplesToCluster(rdf), err) } +func TestInvalidVectorIndex(t *testing.T) { + dropPredicate("vtest") + schema := fmt.Sprintf(vectorSchemaWithIndex, "vtest", "4", "euclidan") + var err error + for retry := 0; retry < 10; retry++ { + err = client.Alter(context.Background(), &api.Operation{Schema: schema}) + if err == nil { + require.Error(t, err) + } + if strings.Contains(err.Error(), "Can't create a vector index for euclidan") { + return + } + time.Sleep(time.Second) + } + require.Error(t, nil) +} + +func TestVectorIndexRebuildWhenChange(t *testing.T) { + dropPredicate("vtest") + setSchema(fmt.Sprintf(vectorSchemaWithIndex, "vtest", "4", "euclidean")) + + numVectors := 9000 + vectorSize := 100 + + randomVectors, _ := generateRandomVectors(numVectors, vectorSize, "vtest") + require.NoError(t, addTriplesToCluster(randomVectors)) + + startTime := time.Now() + setSchema(fmt.Sprintf(vectorSchemaWithIndex, "vtest", "6", "euclidean")) + + dur := time.Since(startTime) + // Easy way to check that the index was actually rebuilt + require.Greater(t, dur, time.Second*4) +} + func TestVectorInQueryArgument(t *testing.T) { dropPredicate("vtest") - setSchema(fmt.Sprintf(vectorSchemaWithIndex, "vtest", "4", "euclidian")) + setSchema(fmt.Sprintf(vectorSchemaWithIndex, "vtest", "4", "euclidean")) numVectors := 100 vectorSize := 4 @@ -421,7 +456,7 @@ func TestVectorInQueryArgument(t *testing.T) { func TestVectorsMutateFixedLengthWithDiffrentIndexes(t *testing.T) { dropPredicate("vtest") - setSchema(fmt.Sprintf(vectorSchemaWithIndex, "vtest", "4", "euclidian")) + setSchema(fmt.Sprintf(vectorSchemaWithIndex, "vtest", "4", "euclidean")) testVectorMutationSameLength(t) dropPredicate("vtest") @@ -454,7 +489,7 @@ func TestVectorDeadlockwithTimeout(t *testing.T) { DropAttr: pred, }) dropPredicate(pred) - setSchema(fmt.Sprintf(vectorSchemaWithIndex, pred, "4", "euclidian")) + setSchema(fmt.Sprintf(vectorSchemaWithIndex, pred, "4", "euclidean")) numVectors := 10000 vectorSize := 1000 @@ -479,8 +514,8 @@ func TestVectorDeadlockwithTimeout(t *testing.T) { func TestVectorMutateDiffrentLengthWithDiffrentIndexes(t *testing.T) { dropPredicate("vtest") - setSchema(fmt.Sprintf(vectorSchemaWithIndex, "vtest", "4", "euclidian")) - testVectorMutationDiffrentLength(t, "can not compute euclidian distance on vectors of different lengths") + setSchema(fmt.Sprintf(vectorSchemaWithIndex, "vtest", "4", "euclidean")) + testVectorMutationDiffrentLength(t, "can not compute euclidean distance on vectors of different lengths") dropPredicate("vtest") setSchema(fmt.Sprintf(vectorSchemaWithIndex, "vtest", "4", "cosine")) @@ -497,7 +532,7 @@ func TestVectorReindex(t *testing.T) { pred := "vtest" - setSchema(fmt.Sprintf(vectorSchemaWithIndex, pred, "4", "euclidian")) + setSchema(fmt.Sprintf(vectorSchemaWithIndex, pred, "4", "euclidean")) numVectors := 100 vectorSize := 4 @@ -520,7 +555,7 @@ func TestVectorReindex(t *testing.T) { _, err := querySingleVectorError(t, strings.Split(triple, `"`)[1], "vtest", false) require.NotNil(t, err) - setSchema(fmt.Sprintf(vectorSchemaWithIndex, pred, "4", "euclidian")) + setSchema(fmt.Sprintf(vectorSchemaWithIndex, pred, "4", "euclidean")) vector, err := querySingleVector(t, strings.Split(triple, `"`)[1], "vtest") require.NoError(t, err) require.Contains(t, allVectors, vector) @@ -570,7 +605,7 @@ func TestVectorDelete(t *testing.T) { pred := "vtest" dropPredicate(pred) - setSchema(fmt.Sprintf(vectorSchemaWithIndex, pred, "4", "euclidian")) + setSchema(fmt.Sprintf(vectorSchemaWithIndex, pred, "4", "euclidean")) numVectors := 1000 rdf, vectors := generateRandomVectors(numVectors, 10, "vtest") @@ -626,7 +661,7 @@ func TestVectorUpdate(t *testing.T) { pred := "vtest" dropPredicate(pred) - setSchema(fmt.Sprintf(vectorSchemaWithIndex, pred, "4", "euclidian")) + setSchema(fmt.Sprintf(vectorSchemaWithIndex, pred, "4", "euclidean")) numVectors := 1000 rdf, vectors := generateRandomVectors(1000, 10, "vtest") @@ -659,7 +694,7 @@ func TestVectorUpdate(t *testing.T) { func TestVectorWithoutQuote(t *testing.T) { pred := "test-ve" dropPredicate(pred) - setSchema(fmt.Sprintf(vectorSchemaWithIndex, pred, "4", "euclidian")) + setSchema(fmt.Sprintf(vectorSchemaWithIndex, pred, "4", "euclidean")) setJson := ` { @@ -703,7 +738,7 @@ func TestVectorTwoTxnWithoutCommit(t *testing.T) { pred := "vtest" dropPredicate(pred) - setSchema(fmt.Sprintf(vectorSchemaWithIndex, pred, "4", "euclidian")) + setSchema(fmt.Sprintf(vectorSchemaWithIndex, pred, "4", "euclidean")) rdf, vectors := generateRandomVectors(5, 5, "vtest") txn1 := client.NewTxn() diff --git a/raftwal/log.go b/raftwal/log.go index 67c97a5f03c..902ea110cf9 100644 --- a/raftwal/log.go +++ b/raftwal/log.go @@ -35,7 +35,7 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/raftwal/meta.go b/raftwal/meta.go index d980eeaaed2..352af89b769 100644 --- a/raftwal/meta.go +++ b/raftwal/meta.go @@ -27,7 +27,7 @@ import ( "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/raftwal/storage.go b/raftwal/storage.go index 3a282776f66..58ee55e5bb4 100644 --- a/raftwal/storage.go +++ b/raftwal/storage.go @@ -26,7 +26,7 @@ import ( "go.etcd.io/etcd/raft/v3/raftpb" "golang.org/x/net/trace" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // DiskStorage handles disk access and writing for the RAFT write-ahead log. diff --git a/raftwal/storage_test.go b/raftwal/storage_test.go index d0f81f208f4..70e0bd6504a 100644 --- a/raftwal/storage_test.go +++ b/raftwal/storage_test.go @@ -44,7 +44,7 @@ import ( "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) func TestStorageTerm(t *testing.T) { diff --git a/raftwal/wal.go b/raftwal/wal.go index b8c0f050cb4..d57edef75aa 100644 --- a/raftwal/wal.go +++ b/raftwal/wal.go @@ -26,7 +26,7 @@ import ( "go.etcd.io/etcd/raft/v3/raftpb" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/schema/parse.go b/schema/parse.go index 713b2689a3b..f87649a1c6a 100644 --- a/schema/parse.go +++ b/schema/parse.go @@ -24,11 +24,11 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) // ParseBytes parses the byte array which holds the schema. We will reset diff --git a/schema/parse_test.go b/schema/parse_test.go index 08a7441781b..7237682d8cb 100644 --- a/schema/parse_test.go +++ b/schema/parse_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) type nameType struct { @@ -53,7 +53,7 @@ name: string . address: string . : string . coordinates: float32vector . -indexvector: float32vector @index(hnsw(metric:"euclidian")) . +indexvector: float32vector @index(hnsw(metric:"euclidean")) . ` func TestSchema(t *testing.T) { @@ -90,7 +90,7 @@ func TestSchema(t *testing.T) { Options: []*pb.OptionPair{ { Key: "metric", - Value: "euclidian", + Value: "euclidean", }, }, }, diff --git a/schema/schema.go b/schema/schema.go index f3275286082..5c29fb9b26d 100644 --- a/schema/schema.go +++ b/schema/schema.go @@ -31,11 +31,11 @@ import ( "github.com/dgraph-io/badger/v4" badgerpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/tok/hnsw" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/tok/hnsw" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/schema/state.go b/schema/state.go index fe525e5a37c..0d5c57b56b9 100644 --- a/schema/state.go +++ b/schema/state.go @@ -17,7 +17,7 @@ package schema import ( - "github.com/dgraph-io/dgraph/lex" + "github.com/dgraph-io/dgraph/v24/lex" ) // Constants representing type of different graphql lexed items. diff --git a/systest/1million/1million_test.go b/systest/1million/1million_test.go index 0015893519e..38eec0ef984 100644 --- a/systest/1million/1million_test.go +++ b/systest/1million/1million_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" ) var tc = []struct { diff --git a/systest/21million/bulk/run_test.go b/systest/21million/bulk/run_test.go index 7d7a12f6e61..425aa3a7a74 100644 --- a/systest/21million/bulk/run_test.go +++ b/systest/21million/bulk/run_test.go @@ -23,8 +23,8 @@ import ( "path/filepath" "testing" - "github.com/dgraph-io/dgraph/systest/21million/common" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/systest/21million/common" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestQueries(t *testing.T) { diff --git a/systest/21million/common/run_queries.go b/systest/21million/common/run_queries.go index 23b146a3b38..6f1ff62e760 100644 --- a/systest/21million/common/run_queries.go +++ b/systest/21million/common/run_queries.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/testutil" ) // JSON output can be hundreds of lines and diffs can scroll off the terminal before you diff --git a/systest/21million/live/run_test.go b/systest/21million/live/run_test.go index 0d32b99dcc2..2119300456a 100644 --- a/systest/21million/live/run_test.go +++ b/systest/21million/live/run_test.go @@ -23,8 +23,8 @@ import ( "path/filepath" "testing" - "github.com/dgraph-io/dgraph/systest/21million/common" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/systest/21million/common" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestQueries(t *testing.T) { diff --git a/systest/acl/restore/acl_restore_test.go b/systest/acl/restore/acl_restore_test.go index f957a1acc3a..c32e44ae886 100644 --- a/systest/acl/restore/acl_restore_test.go +++ b/systest/acl/restore/acl_restore_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" ) // disableDraining disables draining mode before each test for increased reliability. diff --git a/systest/audit/audit_test.go b/systest/audit/audit_test.go index 6a4ed9a16af..5bb36157bb7 100644 --- a/systest/audit/audit_test.go +++ b/systest/audit/audit_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/testutil/testaudit" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/testutil/testaudit" ) func TestZeroAudit(t *testing.T) { diff --git a/systest/audit_encrypted/audit_test.go b/systest/audit_encrypted/audit_test.go index 6faff24dad0..9c009e92fbb 100644 --- a/systest/audit_encrypted/audit_test.go +++ b/systest/audit_encrypted/audit_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/testutil/testaudit" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/testutil/testaudit" ) func TestZeroAuditEncrypted(t *testing.T) { diff --git a/systest/backup/advanced-scenarios/127-Namespace/backup_test.go b/systest/backup/advanced-scenarios/127-Namespace/backup_test.go index 5841c9afaea..d6045fbacbd 100755 --- a/systest/backup/advanced-scenarios/127-Namespace/backup_test.go +++ b/systest/backup/advanced-scenarios/127-Namespace/backup_test.go @@ -20,10 +20,10 @@ package main import ( "testing" - e2eCommon "github.com/dgraph-io/dgraph/graphql/e2e/common" - utilsCommon "github.com/dgraph-io/dgraph/systest/backup/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + e2eCommon "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + utilsCommon "github.com/dgraph-io/dgraph/v24/systest/backup/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/systest/backup/advanced-scenarios/acl-nonAcl/backup_test.go b/systest/backup/advanced-scenarios/acl-nonAcl/backup_test.go index 4c72963d16e..681e4c7bc73 100755 --- a/systest/backup/advanced-scenarios/acl-nonAcl/backup_test.go +++ b/systest/backup/advanced-scenarios/acl-nonAcl/backup_test.go @@ -21,10 +21,10 @@ import ( "net/http" "testing" - e2eCommon "github.com/dgraph-io/dgraph/graphql/e2e/common" - utilsCommon "github.com/dgraph-io/dgraph/systest/backup/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + e2eCommon "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + utilsCommon "github.com/dgraph-io/dgraph/v24/systest/backup/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/systest/backup/advanced-scenarios/deleted-namespace/backup_test.go b/systest/backup/advanced-scenarios/deleted-namespace/backup_test.go index ca1b0e3df3e..6c010108d03 100755 --- a/systest/backup/advanced-scenarios/deleted-namespace/backup_test.go +++ b/systest/backup/advanced-scenarios/deleted-namespace/backup_test.go @@ -20,10 +20,10 @@ package main import ( "testing" - e2eCommon "github.com/dgraph-io/dgraph/graphql/e2e/common" - utilsCommon "github.com/dgraph-io/dgraph/systest/backup/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + e2eCommon "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + utilsCommon "github.com/dgraph-io/dgraph/v24/systest/backup/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/systest/backup/common/utils.go b/systest/backup/common/utils.go index dc60fd2b81f..69fb6186823 100644 --- a/systest/backup/common/utils.go +++ b/systest/backup/common/utils.go @@ -31,9 +31,9 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/badger/v4/options" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/worker" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/worker" ) var ( diff --git a/systest/backup/encryption/backup_test.go b/systest/backup/encryption/backup_test.go index 85136bd62fa..a1e3006782a 100644 --- a/systest/backup/encryption/backup_test.go +++ b/systest/backup/encryption/backup_test.go @@ -34,10 +34,10 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/badger/v4/options" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/systest/backup/filesystem/backup_test.go b/systest/backup/filesystem/backup_test.go index 97a24e9394f..5a5d615325c 100644 --- a/systest/backup/filesystem/backup_test.go +++ b/systest/backup/filesystem/backup_test.go @@ -34,12 +34,12 @@ import ( "google.golang.org/grpc/credentials" "github.com/dgraph-io/badger/v4/options" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/systest/backup/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/systest/backup/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/systest/backup/minio-large/backup_test.go b/systest/backup/minio-large/backup_test.go index 26438a30c49..5cecf149a6f 100644 --- a/systest/backup/minio-large/backup_test.go +++ b/systest/backup/minio-large/backup_test.go @@ -34,11 +34,11 @@ import ( "google.golang.org/grpc/credentials" "github.com/dgraph-io/badger/v4/options" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/systest/backup/minio/backup_test.go b/systest/backup/minio/backup_test.go index 095d8304f25..06ebed75798 100644 --- a/systest/backup/minio/backup_test.go +++ b/systest/backup/minio/backup_test.go @@ -35,11 +35,11 @@ import ( "google.golang.org/grpc/credentials" "github.com/dgraph-io/badger/v4/options" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/systest/backup/multi-tenancy/backup_test.go b/systest/backup/multi-tenancy/backup_test.go index ff296a1e32c..a6b025cf94d 100644 --- a/systest/backup/multi-tenancy/backup_test.go +++ b/systest/backup/multi-tenancy/backup_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/systest/backup/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/systest/backup/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/systest/backup/nfs-backup/backup_test.go b/systest/backup/nfs-backup/backup_test.go index bf54f9d2133..9a711a3c6ed 100644 --- a/systest/backup/nfs-backup/backup_test.go +++ b/systest/backup/nfs-backup/backup_test.go @@ -33,12 +33,12 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/systest/backup/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/systest/backup/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/systest/bgindex/common_test.go b/systest/bgindex/common_test.go index 1257a2a83fe..0d6f6059639 100644 --- a/systest/bgindex/common_test.go +++ b/systest/bgindex/common_test.go @@ -25,7 +25,7 @@ import ( "sync/atomic" "time" - "github.com/dgraph-io/dgo/v230" + "github.com/dgraph-io/dgo/v240" ) func printStats(counter *uint64, quit <-chan struct{}, wg *sync.WaitGroup) { diff --git a/systest/bgindex/count_test.go b/systest/bgindex/count_test.go index 6f259affe84..0197dba37e2 100644 --- a/systest/bgindex/count_test.go +++ b/systest/bgindex/count_test.go @@ -36,10 +36,10 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func TestCountIndex(t *testing.T) { diff --git a/systest/bgindex/parallel_test.go b/systest/bgindex/parallel_test.go index d9ec450c80a..a0bf0ea6ee1 100644 --- a/systest/bgindex/parallel_test.go +++ b/systest/bgindex/parallel_test.go @@ -32,10 +32,10 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/systest/bgindex/reverse_test.go b/systest/bgindex/reverse_test.go index 31aec15738a..7a6a2f947f5 100644 --- a/systest/bgindex/reverse_test.go +++ b/systest/bgindex/reverse_test.go @@ -34,10 +34,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func TestReverseIndex(t *testing.T) { diff --git a/systest/bgindex/string_test.go b/systest/bgindex/string_test.go index c387c6a6bc2..d5e5a24d149 100644 --- a/systest/bgindex/string_test.go +++ b/systest/bgindex/string_test.go @@ -35,10 +35,10 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func TestStringIndex(t *testing.T) { diff --git a/systest/bulk_live/bulk/bulk_test.go b/systest/bulk_live/bulk/bulk_test.go index 7e245ddc344..42fde68efa0 100644 --- a/systest/bulk_live/bulk/bulk_test.go +++ b/systest/bulk_live/bulk/bulk_test.go @@ -21,7 +21,7 @@ package main import ( "testing" - "github.com/dgraph-io/dgraph/systest/bulk_live/common" + "github.com/dgraph-io/dgraph/v24/systest/bulk_live/common" ) func TestBulkCases(t *testing.T) { diff --git a/systest/bulk_live/common/bulk_live_cases.go b/systest/bulk_live/common/bulk_live_cases.go index 075ac22ffcd..dc80eae99cb 100644 --- a/systest/bulk_live/common/bulk_live_cases.go +++ b/systest/bulk_live/common/bulk_live_cases.go @@ -35,8 +35,8 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" ) // TODO: This test was used just to make sure some really basic examples work. @@ -733,8 +733,8 @@ func TestGoldenData(t *testing.T) { } s := newSuiteFromFile(t, - os.ExpandEnv("$GOPATH/src/github.com/dgraph-io/dgraph/systest/data/goldendata.schema"), - os.ExpandEnv("$GOPATH/src/github.com/dgraph-io/dgraph/systest/data/goldendata.rdf.gz"), + os.ExpandEnv("$GOPATH/src/github.com/dgraph-io/dgraph/v24/systest/data/goldendata.schema"), + os.ExpandEnv("$GOPATH/src/github.com/dgraph-io/dgraph/v24/systest/data/goldendata.rdf.gz"), "", ) defer s.cleanup(t) diff --git a/systest/bulk_live/common/bulk_live_fixture.go b/systest/bulk_live/common/bulk_live_fixture.go index 93db655dd03..91a7f5b6fb1 100644 --- a/systest/bulk_live/common/bulk_live_fixture.go +++ b/systest/bulk_live/common/bulk_live_fixture.go @@ -27,8 +27,8 @@ import ( "github.com/minio/minio-go/v6" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" ) var rootDir = "./data" diff --git a/systest/bulk_live/live/live_test.go b/systest/bulk_live/live/live_test.go index f05d1c5a643..ea33b557336 100644 --- a/systest/bulk_live/live/live_test.go +++ b/systest/bulk_live/live/live_test.go @@ -21,7 +21,7 @@ package live import ( "testing" - "github.com/dgraph-io/dgraph/systest/bulk_live/common" + "github.com/dgraph-io/dgraph/v24/systest/bulk_live/common" ) func TestLiveCases(t *testing.T) { diff --git a/systest/cdc/cdc_test.go b/systest/cdc/cdc_test.go index 6a77056d42b..59c401dfbd9 100644 --- a/systest/cdc/cdc_test.go +++ b/systest/cdc/cdc_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestCDC(t *testing.T) { diff --git a/systest/cloud/cloud_test.go b/systest/cloud/cloud_test.go index c0478584e12..a80a54b3146 100644 --- a/systest/cloud/cloud_test.go +++ b/systest/cloud/cloud_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/e2e/common" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/graphql/e2e/common" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func setup(t *testing.T) { diff --git a/systest/export/export_test.go b/systest/export/export_test.go index 662735018da..0c98fce9dab 100644 --- a/systest/export/export_test.go +++ b/systest/export/export_test.go @@ -34,9 +34,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" ) var ( diff --git a/systest/group-delete/group_delete_test.go b/systest/group-delete/group_delete_test.go index 9651ae93da0..a348068bc7e 100644 --- a/systest/group-delete/group_delete_test.go +++ b/systest/group-delete/group_delete_test.go @@ -35,9 +35,9 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" ) func NodesSetup(t *testing.T, c *dgo.Dgraph) { diff --git a/systest/integration2/acl_test.go b/systest/integration2/acl_test.go index 3a149fe93f8..e59c7bfd88d 100644 --- a/systest/integration2/acl_test.go +++ b/systest/integration2/acl_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/systest/integration2/bulk_loader_test.go b/systest/integration2/bulk_loader_test.go index 8257a3d38fc..b2ff1b43754 100644 --- a/systest/integration2/bulk_loader_test.go +++ b/systest/integration2/bulk_loader_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/systest/integration2/graphql_schema_auth_test.go b/systest/integration2/graphql_schema_auth_test.go index 497acde6691..0490d81534f 100644 --- a/systest/integration2/graphql_schema_auth_test.go +++ b/systest/integration2/graphql_schema_auth_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/systest/integration2/incremental_restore_test.go b/systest/integration2/incremental_restore_test.go index 4078809f6e0..cc34ca2cd82 100644 --- a/systest/integration2/incremental_restore_test.go +++ b/systest/integration2/incremental_restore_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) func TestIncrementalRestore(t *testing.T) { diff --git a/systest/integration2/snapshot_test.go b/systest/integration2/snapshot_test.go index 2831adad9bc..e66da686658 100644 --- a/systest/integration2/snapshot_test.go +++ b/systest/integration2/snapshot_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/systest/ldbc/ldbc_test.go b/systest/ldbc/ldbc_test.go index 01167db78b4..4a1934e5c83 100644 --- a/systest/ldbc/ldbc_test.go +++ b/systest/ldbc/ldbc_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) type TestCases struct { diff --git a/systest/license/integration_test.go b/systest/license/integration_test.go index 78c89093fc0..9ff3300a4cb 100644 --- a/systest/license/integration_test.go +++ b/systest/license/integration_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" ) type LicenseTestSuite struct { diff --git a/systest/license/license_test.go b/systest/license/license_test.go index 950282590c7..ec7e59e701f 100644 --- a/systest/license/license_test.go +++ b/systest/license/license_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphapi" ) var expiredKey = []byte(`-----BEGIN PGP MESSAGE----- diff --git a/systest/license/upgrade_test.go b/systest/license/upgrade_test.go index d44b455697e..f092e21332b 100644 --- a/systest/license/upgrade_test.go +++ b/systest/license/upgrade_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) type LicenseTestSuite struct { diff --git a/systest/live_pw_test.go b/systest/live_pw_test.go index b9896317d14..74ee6c557ab 100644 --- a/systest/live_pw_test.go +++ b/systest/live_pw_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestLivePassword(t *testing.T) { diff --git a/systest/loader/loader_test.go b/systest/loader/loader_test.go index 4cc30ef0dd2..6ff5736a891 100644 --- a/systest/loader/loader_test.go +++ b/systest/loader/loader_test.go @@ -27,9 +27,9 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) // TestLoaderXidmap checks that live loader re-uses xidmap on loading data from two different files diff --git a/systest/multi-tenancy/basic_test.go b/systest/multi-tenancy/basic_test.go index d51a025adb0..08f9595ecc6 100644 --- a/systest/multi-tenancy/basic_test.go +++ b/systest/multi-tenancy/basic_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/ee/acl" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/ee/acl" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/systest/multi-tenancy/integration_basic_helper_test.go b/systest/multi-tenancy/integration_basic_helper_test.go index d93353c1cc0..81767ecb5e0 100644 --- a/systest/multi-tenancy/integration_basic_helper_test.go +++ b/systest/multi-tenancy/integration_basic_helper_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type liveOpts struct { diff --git a/systest/multi-tenancy/integration_test.go b/systest/multi-tenancy/integration_test.go index 327bca87c14..37bac87f689 100644 --- a/systest/multi-tenancy/integration_test.go +++ b/systest/multi-tenancy/integration_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) type MultitenancyTestSuite struct { diff --git a/systest/multi-tenancy/login_test.go b/systest/multi-tenancy/login_test.go new file mode 100644 index 00000000000..3c7e4cc3ad9 --- /dev/null +++ b/systest/multi-tenancy/login_test.go @@ -0,0 +1,123 @@ +//go:build integration +// +build integration + +/* + * Copyright 2024 Dgraph Labs, Inc. and Contributors + * + * 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. + */ + +package main + +import ( + "context" + "testing" + + "github.com/stretchr/testify/require" + + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/x" +) + +func addData(t *testing.T, gc *dgraphapi.GrpcClient) { + require.NoError(t, gc.SetupSchema(`name: string .`)) + + rdfs := ` + _:a "alice" . + _:b "bob" . + _:c "sagar" . + _:d "ajay" .` + _, err := gc.Mutate(&api.Mutation{SetNquads: []byte(rdfs), CommitNow: true}) + require.NoError(t, err) +} + +func (msuite *MultitenancyTestSuite) TestLoggingIntoTheNSAfterDropDataFromTheNS() { + t := msuite.T() + gc, cleanup, err := msuite.dc.Client() + require.NoError(t, err) + defer cleanup() + + hc, err := msuite.dc.HTTPClient() + require.NoError(t, err) + + require.NoError(t, gc.LoginIntoNamespace(context.Background(), + dgraphapi.DefaultUser, dgraphapi.DefaultPassword, x.GalaxyNamespace)) + require.NoError(t, gc.DropAll()) + + require.NoError(t, hc.LoginIntoNamespace(dgraphapi.DefaultUser, dgraphapi.DefaultPassword, x.GalaxyNamespace)) + for i := 1; i < 5; i++ { + ns, err := hc.AddNamespace() + require.NoError(t, err) + require.NoError(t, gc.LoginIntoNamespace(context.Background(), dgraphapi.DefaultUser, dgraphapi.DefaultPassword, ns)) + + addData(t, gc) + + // Drop data from the namespace + require.NoError(t, gc.Alter(context.Background(), &api.Operation{DropOp: api.Operation_DATA})) + + // Login into the namespace + require.NoError(t, gc.LoginIntoNamespace(context.Background(), + dgraphapi.DefaultUser, dgraphapi.DefaultPassword, ns)) + } +} + +func (msuite *MultitenancyTestSuite) TestLoggingIntoAllNamespacesAfterDropDataOperationFromDefaultNs() { + t := msuite.T() + gc, cleanup, err := msuite.dc.Client() + require.NoError(t, err) + defer cleanup() + + hc, err := msuite.dc.HTTPClient() + require.NoError(t, err) + + require.NoError(t, gc.LoginIntoNamespace(context.Background(), + dgraphapi.DefaultUser, dgraphapi.DefaultPassword, x.GalaxyNamespace)) + + require.NoError(t, gc.DropAll()) + require.NoError(t, hc.LoginIntoNamespace(dgraphapi.DefaultUser, dgraphapi.DefaultPassword, x.GalaxyNamespace)) + + nss := []uint64{} + for i := 1; i <= 2; i++ { + ns, err := hc.AddNamespace() + require.NoError(t, err) + nss = append(nss, ns) + require.NoError(t, gc.LoginIntoNamespace(context.Background(), + dgraphapi.DefaultUser, dgraphapi.DefaultPassword, ns)) + + addData(t, gc) + } + + // Drop data from default namespace + require.NoError(t, gc.LoginIntoNamespace(context.Background(), + dgraphapi.DefaultUser, dgraphapi.DefaultPassword, x.GalaxyNamespace)) + + require.NoError(t, gc.Alter(context.Background(), &api.Operation{DropOp: api.Operation_DATA})) + + // verify here that login into the namespace should not fail + require.NoError(t, gc.LoginIntoNamespace(context.Background(), + dgraphapi.DefaultUser, dgraphapi.DefaultPassword, x.GalaxyNamespace)) + + for _, ns := range nss { + require.NoError(t, gc.LoginIntoNamespace(context.Background(), + dgraphapi.DefaultUser, dgraphapi.DefaultPassword, ns)) + query := `{ + q(func: has(name)) { + count(uid) + } + }` + resp, err := gc.Query(query) + require.NoError(t, err) + require.Contains(t, string(resp.Json), `"count":4`) + } +} diff --git a/systest/multi-tenancy/upgrade_test.go b/systest/multi-tenancy/upgrade_test.go index 1b73247bc4b..c668c62273f 100644 --- a/systest/multi-tenancy/upgrade_test.go +++ b/systest/multi-tenancy/upgrade_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) type MultitenancyTestSuite struct { diff --git a/systest/mutations-and-queries/integration_test.go b/systest/mutations-and-queries/integration_test.go index 89e78e6f7f6..54bc01bf05e 100644 --- a/systest/mutations-and-queries/integration_test.go +++ b/systest/mutations-and-queries/integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" ) type SystestTestSuite struct { diff --git a/systest/mutations-and-queries/mutations_test.go b/systest/mutations-and-queries/mutations_test.go index 59f92c5edf0..cb9e9ac4245 100644 --- a/systest/mutations-and-queries/mutations_test.go +++ b/systest/mutations-and-queries/mutations_test.go @@ -34,11 +34,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/testutil" ) // TestSystem uses the externally run Dgraph cluster for testing. Most other diff --git a/systest/mutations-and-queries/queries_test.go b/systest/mutations-and-queries/queries_test.go index 0f1f4cb7554..0316f9c81f4 100644 --- a/systest/mutations-and-queries/queries_test.go +++ b/systest/mutations-and-queries/queries_test.go @@ -26,10 +26,10 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func (ssuite *SystestTestSuite) TestQuery() { diff --git a/systest/mutations-and-queries/upgrade_test.go b/systest/mutations-and-queries/upgrade_test.go index 66847fac3dd..b670c30adae 100644 --- a/systest/mutations-and-queries/upgrade_test.go +++ b/systest/mutations-and-queries/upgrade_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) type SystestTestSuite struct { diff --git a/systest/online-restore/namespace-aware/restore_test.go b/systest/online-restore/namespace-aware/restore_test.go index 76ef1738b1a..7cfefee1ec5 100644 --- a/systest/online-restore/namespace-aware/restore_test.go +++ b/systest/online-restore/namespace-aware/restore_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) // func addData(gc *dgraphapi.GrpcClient, pred string, start, end int) error { diff --git a/systest/online-restore/online_restore_test.go b/systest/online-restore/online_restore_test.go index 11e35c3a885..ae82cec3074 100644 --- a/systest/online-restore/online_restore_test.go +++ b/systest/online-restore/online_restore_test.go @@ -35,11 +35,11 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type restoreReq struct { diff --git a/systest/plugin/integration_test.go b/systest/plugin/integration_test.go index c8bda8a98e3..60fd17fb22e 100644 --- a/systest/plugin/integration_test.go +++ b/systest/plugin/integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" ) type PluginTestSuite struct { diff --git a/systest/plugin/plugin_test.go b/systest/plugin/plugin_test.go index 82e5a61d3f5..3b809df8c7c 100644 --- a/systest/plugin/plugin_test.go +++ b/systest/plugin/plugin_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" ) type testCase struct { diff --git a/systest/plugin/upgrade_test.go b/systest/plugin/upgrade_test.go index effeeb2ea2c..74d8f626521 100644 --- a/systest/plugin/upgrade_test.go +++ b/systest/plugin/upgrade_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" ) type PluginTestSuite struct { diff --git a/systest/posting-list-benchmark/main.go b/systest/posting-list-benchmark/main.go index 764c0ba676a..73a5f222d2a 100644 --- a/systest/posting-list-benchmark/main.go +++ b/systest/posting-list-benchmark/main.go @@ -26,10 +26,10 @@ import ( "github.com/spf13/cobra" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) type flagOptions struct { diff --git a/systest/unique_test.go b/systest/unique_test.go index 4f9614ba8ce..e08c9c80d67 100644 --- a/systest/unique_test.go +++ b/systest/unique_test.go @@ -31,10 +31,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraph/cmd/live" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraph/cmd/live" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" ) const emailQuery = `{ diff --git a/systest/vector/backup_test.go b/systest/vector/backup_test.go index db0900a7636..ff401a5f52e 100644 --- a/systest/vector/backup_test.go +++ b/systest/vector/backup_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/systest/vector/load_test.go b/systest/vector/load_test.go index 7154fba81da..9f8eed39123 100644 --- a/systest/vector/load_test.go +++ b/systest/vector/load_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) diff --git a/systest/vector/vector_test.go b/systest/vector/vector_test.go index af786f8cc27..87e7b661a87 100644 --- a/systest/vector/vector_test.go +++ b/systest/vector/vector_test.go @@ -25,16 +25,16 @@ import ( "testing" "time" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dgraphapi" - "github.com/dgraph-io/dgraph/dgraphtest" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dgraphapi" + "github.com/dgraph-io/dgraph/v24/dgraphtest" + "github.com/dgraph-io/dgraph/v24/x" "github.com/stretchr/testify/require" ) const ( testSchema = ` - project_discription_v: float32vector @index(hnsw(exponent: "5", metric: "euclidian")) .` + project_discription_v: float32vector @index(hnsw(exponent: "5", metric: "euclidean")) .` testSchemaWithoutIndex = `project_discription_v: float32vector .` ) diff --git a/t/t.go b/t/t.go index 8a5e90c4a6e..cecde3a6257 100644 --- a/t/t.go +++ b/t/t.go @@ -39,14 +39,15 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" + "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/volume" "github.com/docker/docker/client" "github.com/golang/glog" "github.com/spf13/pflag" "golang.org/x/tools/go/packages" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) @@ -326,7 +327,7 @@ func runTestsFor(ctx context.Context, pkg, prefix string) error { } func hasTestFiles(pkg string) bool { - dir := strings.Replace(pkg, "github.com/dgraph-io/dgraph/", "", 1) + dir := strings.Replace(pkg, "github.com/dgraph-io/dgraph/v24/", "", 1) dir = filepath.Join(*baseDir, dir) hasTests := false @@ -529,7 +530,7 @@ func (o *outputCatcher) Print() { if dur.dur < time.Second { continue } - pkg := strings.Replace(dur.pkg, "github.com/dgraph-io/dgraph/", "", 1) + pkg := strings.Replace(dur.pkg, "github.com/dgraph-io/dgraph/v24/", "", 1) fmt.Printf("[%6s]%s[%d] %s took: %s\n", dur.ts.Sub(baseTs).Round(time.Second), strings.Repeat(" ", int(dur.threadId)), dur.threadId, pkg, dur.dur.Round(time.Second)) @@ -547,14 +548,14 @@ type task struct { // for custom cluster tests (i.e. those not using default docker-compose.yml) func composeFileFor(pkg string) string { - dir := strings.Replace(pkg, "github.com/dgraph-io/dgraph/", "", 1) + dir := strings.Replace(pkg, "github.com/dgraph-io/dgraph/v24/", "", 1) return filepath.Join(*baseDir, dir, "docker-compose.yml") } func getPackages() []task { has := func(list []string, in string) bool { for _, l := range list { - if len(l) > 0 && strings.Contains(in+"/", "github.com/dgraph-io/dgraph/"+l+"/") { + if len(l) > 0 && strings.Contains(in+"/", "github.com/dgraph-io/dgraph/v24/"+l+"/") { return true } } @@ -664,13 +665,13 @@ func removeAllTestContainers() { err := cli.ContainerStop(ctxb, c.ID, o) fmt.Printf("Stopped container %s with error: %v\n", c.Names[0], err) - err = cli.ContainerRemove(ctxb, c.ID, types.ContainerRemoveOptions{}) + err = cli.ContainerRemove(ctxb, c.ID, container.RemoveOptions{}) fmt.Printf("Removed container %s with error: %v\n", c.Names[0], err) }(c) } wg.Wait() - networks, err := cli.NetworkList(ctxb, types.NetworkListOptions{}) + networks, err := cli.NetworkList(ctxb, network.ListOptions{}) x.Check(err) for _, n := range networks { if strings.HasPrefix(n.Name, getGlobalPrefix()) { @@ -994,7 +995,7 @@ func run() error { }() signal.Notify(sdCh, os.Interrupt, syscall.SIGINT, syscall.SIGTERM) - // pkgs, err := packages.Load(nil, "github.com/dgraph-io/dgraph/...") + // pkgs, err := packages.Load(nil, "github.com/dgraph-io/dgraph/v24/...") go func() { defer close(testCh) valid := getPackages() diff --git a/task/conversion.go b/task/conversion.go index ea97cd24a85..dcbd73cb221 100644 --- a/task/conversion.go +++ b/task/conversion.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "math" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) var ( diff --git a/telemetry/telemetry.go b/telemetry/telemetry.go index 35e37f84e40..dc50aef26b5 100644 --- a/telemetry/telemetry.go +++ b/telemetry/telemetry.go @@ -27,9 +27,9 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/worker" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/worker" + "github.com/dgraph-io/dgraph/v24/x" ) // Telemetry holds information about the state of the zero and alpha server. diff --git a/testutil/backup.go b/testutil/backup.go index ac8bed1a752..47f5d612390 100644 --- a/testutil/backup.go +++ b/testutil/backup.go @@ -31,12 +31,12 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) // KeyFile is set to the path of the file containing the key. Used for testing purposes only. diff --git a/testutil/bulk.go b/testutil/bulk.go index 80802991c1d..51a02960354 100644 --- a/testutil/bulk.go +++ b/testutil/bulk.go @@ -28,7 +28,7 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) type LiveOpts struct { diff --git a/testutil/client.go b/testutil/client.go index 61f0e711d92..a6f04c14ab4 100644 --- a/testutil/client.go +++ b/testutil/client.go @@ -40,10 +40,10 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/x" ) // socket addr = IP address and port number diff --git a/testutil/docker.go b/testutil/docker.go index 95c17321ac5..96f8b186860 100644 --- a/testutil/docker.go +++ b/testutil/docker.go @@ -35,7 +35,7 @@ import ( "github.com/pkg/errors" "golang.org/x/net/context" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) const ( @@ -185,7 +185,7 @@ func getContainer(name string) types.Container { cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation()) x.Check(err) - containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{All: true}) + containers, err := cli.ContainerList(context.Background(), container.ListOptions{All: true}) if err != nil { log.Fatalf("While listing container: %v\n", err) } @@ -206,7 +206,7 @@ func AllContainers(prefix string) []types.Container { cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation()) x.Check(err) - containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{All: true}) + containers, err := cli.ContainerList(context.Background(), container.ListOptions{All: true}) if err != nil { log.Fatalf("While listing container: %v\n", err) } @@ -253,8 +253,7 @@ func DockerRun(instance string, op int) error { switch op { case Start: - if err := cli.ContainerStart(context.Background(), c.ID, - types.ContainerStartOptions{}); err != nil { + if err := cli.ContainerStart(context.Background(), c.ID, container.StartOptions{}); err != nil { return err } case Stop: diff --git a/testutil/exec.go b/testutil/exec.go index b6e2355c059..75670a942b3 100644 --- a/testutil/exec.go +++ b/testutil/exec.go @@ -25,7 +25,7 @@ import ( "os/exec" "strconv" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) // These are exported so they can also be set directly from outside this package. diff --git a/testutil/graphql.go b/testutil/graphql.go index 34111b5b910..3d43f81a1fb 100644 --- a/testutil/graphql.go +++ b/testutil/graphql.go @@ -35,7 +35,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/metadata" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) const ExportRequest = `mutation { diff --git a/testutil/multi_tenancy.go b/testutil/multi_tenancy.go index fa10a5c2c72..059cf160bcc 100644 --- a/testutil/multi_tenancy.go +++ b/testutil/multi_tenancy.go @@ -28,9 +28,9 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/x" ) type Rule struct { diff --git a/testutil/schema.go b/testutil/schema.go index e5e0e96ee0f..b6752100a0d 100644 --- a/testutil/schema.go +++ b/testutil/schema.go @@ -27,7 +27,7 @@ import ( "github.com/golang/glog" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230" + "github.com/dgraph-io/dgo/v240" ) const ( diff --git a/testutil/testaudit/audit.go b/testutil/testaudit/audit.go index aa4e067f57e..1a7f06ff59b 100644 --- a/testutil/testaudit/audit.go +++ b/testutil/testaudit/audit.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" "github.com/stretchr/testify/require" ) diff --git a/testutil/utils.go b/testutil/utils.go index 3baedf0c2b2..50ca8829a95 100644 --- a/testutil/utils.go +++ b/testutil/utils.go @@ -28,8 +28,8 @@ import ( "github.com/golang/glog" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgraph/v24/x" ) func GalaxySchemaKey(attr string) []byte { diff --git a/testutil/zero.go b/testutil/zero.go index 029b9163030..7f710e87666 100644 --- a/testutil/zero.go +++ b/testutil/zero.go @@ -29,8 +29,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" ) type Member struct { diff --git a/tlstest/acl/acl_over_tls_test.go b/tlstest/acl/acl_over_tls_test.go index e6051f9c737..937c673ddec 100644 --- a/tlstest/acl/acl_over_tls_test.go +++ b/tlstest/acl/acl_over_tls_test.go @@ -11,8 +11,8 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func TestLoginOverTLS(t *testing.T) { diff --git a/tlstest/certrequest/certrequest_test.go b/tlstest/certrequest/certrequest_test.go index 0d1ce2ded5c..a72fb8daeaf 100644 --- a/tlstest/certrequest/certrequest_test.go +++ b/tlstest/certrequest/certrequest_test.go @@ -12,8 +12,8 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestAccessOverPlaintext(t *testing.T) { diff --git a/tlstest/certrequireandverify/certrequireandverify_test.go b/tlstest/certrequireandverify/certrequireandverify_test.go index 11924935afb..d169f07e4c5 100644 --- a/tlstest/certrequireandverify/certrequireandverify_test.go +++ b/tlstest/certrequireandverify/certrequireandverify_test.go @@ -17,8 +17,8 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestAccessWithoutClientCert(t *testing.T) { diff --git a/tlstest/certverifyifgiven/certverifyifgiven_test.go b/tlstest/certverifyifgiven/certverifyifgiven_test.go index b59483de7a7..fb1a38b6b03 100644 --- a/tlstest/certverifyifgiven/certverifyifgiven_test.go +++ b/tlstest/certverifyifgiven/certverifyifgiven_test.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestAccessWithoutClientCert(t *testing.T) { diff --git a/tlstest/mtls_internal/ha_6_node/ha_test.go b/tlstest/mtls_internal/ha_6_node/ha_test.go index 00c473b5c0e..b8db3b8a99a 100644 --- a/tlstest/mtls_internal/ha_6_node/ha_test.go +++ b/tlstest/mtls_internal/ha_6_node/ha_test.go @@ -11,10 +11,10 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func runTests(t *testing.T, client *dgo.Dgraph) { diff --git a/tlstest/mtls_internal/multi_group/multi_group_test.go b/tlstest/mtls_internal/multi_group/multi_group_test.go index 32f4927cc36..e04f2fe40ab 100644 --- a/tlstest/mtls_internal/multi_group/multi_group_test.go +++ b/tlstest/mtls_internal/multi_group/multi_group_test.go @@ -11,10 +11,10 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func runTests(t *testing.T, client *dgo.Dgraph) { diff --git a/tlstest/mtls_internal/single_node/single_node_test.go b/tlstest/mtls_internal/single_node/single_node_test.go index 494e67340ab..7bc22f35c29 100644 --- a/tlstest/mtls_internal/single_node/single_node_test.go +++ b/tlstest/mtls_internal/single_node/single_node_test.go @@ -11,10 +11,10 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) func runTests(t *testing.T, client *dgo.Dgraph) { diff --git a/tlstest/mtls_internal/tls/alpha1/client.alpha1.crt b/tlstest/mtls_internal/tls/alpha1/client.alpha1.crt index 588e4321bcf..53e7390bca9 100644 --- a/tlstest/mtls_internal/tls/alpha1/client.alpha1.crt +++ b/tlstest/mtls_internal/tls/alpha1/client.alpha1.crt @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDLTCCAhWgAwIBAgIISKhf4mg1jUIwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDLTCCAhWgAwIBAgIIUiCm9kmX3a0wDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTUyNzA0WhcNMjQwOTI0MTUyNzA0WjA+ +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM0WhcNMzAwMzE4MjA1ODM0WjA+ MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEPMA0GA1UEAxMGYWxwaGExMQ8w -DQYDVQQFEwY0OGE4NWYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDM -2a7UimfMOA11ycma20Sn3rmKnyqUBvmz9cofLXbhdNJ0xxVJ+Z4BZrNpAzTDMwYK -UlnBwL34gxG2XulJZwhqYhehB4h8YehPLLBw87ytebJnj72mWP50YBawf5LL3X24 -DOdXVEsK/8D3RCojvCNSkH6QcrKZ0jTNffFQhdpccq0EofcwEdXRiluepCxLZQfa -a4EiaGsOdizZTK7NP1VZoFKphVSO3h0S2ohmr4hLm0ft79TyaE/CGfpsvlIp/luE -Usha43KP6PRohrqJEb2ly2CW7QI2deQc1iRw9ozZDPYu+YLVw7O7T4IeUUO4BPwU -ad68YF3d5cizryQPJ9o5AgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUE -DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEACE3yD6+Yy/Pr+3+8hE6Z -V8V8DIUXE+RV/yEUQNyMaS+Dv9UFZjqk9Su0Diax7Vace0Y3vO15MPk6TSIhJzoF -fxu2/wRnpK4ddJVpWrast2KAFJDnOeaFG3WG6dk22C7ESlZLv49ZwIm+SzWrZ/i3 -NLqylhy0U/ciMyKDUAn2wEYpYjZjkap74UgwAcl1lVYdc5oUBRkj1KCMTZBipQBV -FJVcYXfFHZbqxB+MIhABummpQIfI9Vvf5AiwBWwpv5VelRALtk9RcQCRlwWi6euM -P47ddD9C626UfhY/s1vwSUq11YjX+MpE67I1bfDLwkBH1y/uLStK0kY13KOCtgty -cw== +DQYDVQQFEwY1MjIwYTYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6 +JlYF9U3lAAF97lhec8gL0KOdoMr207en1Kg+Avo7zeNKQA7qc6PillHqgIB7ovFW +nGuB94BIeFzkNydbTvywcxWv3SR7jZ4YVnJ9deUX/4LBgiCsvPoJTzrj07/YHGLW +casFo9I+oLL+tDzLHLqeP2QFUvlnPZkB9UkIFvMzkAvDVV0CAkpHFS2W9IUt0n/S +f9tDnT+l1NDcWRUyMkfLyQjaHgz09nB4IwTwFzp/vfS39rAayqS0aOyt0yG5tb/x +EqcEOz40BYUr4Lavw9erPM3FIxvf2bE5PUs5NrZkyydgjhlINzvMdoqskIrkZovW +/pQKnOmj8rJV5dW2yCdTAgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUE +DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAj++6eYS/0QCECIF3op/B +9mj1KAmiwwfmXm2jaZhe2E2K3jnOteQHNUytLbBua31YaHw75CaYcayDkY70hfi3 +WAOpknRyIPDxizHlw7lwsww0E+IAPRYQ+nRCiOwbOo9+XaqiKuZa0m0jHkD9Br6q +xWPk66t7z4O/9o4NouC0UJEUA0dycjC6dEao2+c36ruCFrgYuGRSsSgpkAC+C3Yl +Dt8nFfr6MjJaKA6jqgg6YJnCDcGa+JEQ4kbbmJ/BYFCUKApqLfWOsXAXKEd8zVkN +KWN4eKPdmBU60meK40oZYBEFPb8/q7t5/I4JR+iaM+sfrP/byKhwB9C/ldTZ4E9Q +TA== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/alpha1/client.alpha1.key b/tlstest/mtls_internal/tls/alpha1/client.alpha1.key index 171d100d19f..cb8a512b959 100644 --- a/tlstest/mtls_internal/tls/alpha1/client.alpha1.key +++ b/tlstest/mtls_internal/tls/alpha1/client.alpha1.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/alpha1/node.crt b/tlstest/mtls_internal/tls/alpha1/node.crt index 1f589c548c8..14cf2bb1738 100644 --- a/tlstest/mtls_internal/tls/alpha1/node.crt +++ b/tlstest/mtls_internal/tls/alpha1/node.crt @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDmTCCAoGgAwIBAgIIRGBC6MYTykcwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDmTCCAoGgAwIBAgIIPqqxDmA5vyIwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTUyMzQ4WhcNMjQwOTI0MTUyMzQ4WjBD +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM0WhcNMzAwMzE4MjA1ODM0WjBD MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEUMBIGA1UEAxMLRGdyYXBoIE5v -ZGUxDzANBgNVBAUTBjQ0NjA0MjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAMF+cb0tLw1tLNXno1d7Jdj/GuOwS8P3VnP/0VzgzcFUCBB7ERFEFSZWWTtr -3H1k3dtbn2GCzM0291ns9LEEufSn3o3+NKVhie/86bqHd1gZtqMd6/Yk0kGJEARm -m/WHW/92/J7mcjpyeVMh5COr0dfsJS6/9xSo0ZNcCXipf7hW1YhA8u9akpqffFZo -GcxTqBiJ/NUynN+0II4EDWf/JXKTJfUJCHXWYnGc8HCPxF0S4gR5X2QIt5L5WKhU -oCU9aMGff3iNMSawPbXEuAp5MX6DNuTRJCpRPsWkzvFG8Zlt4sFyfhue/1Ma+uyX -Pgo/jCrK8NkylR13wlgZynKbjPECAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw +ZGUxDzANBgNVBAUTBjNlYWFiMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBALIA+wih3ZAlMlYXJSB5m+gv/c1AJdBugVsy2+swL85xlZA3qIkn6YyAuvq4 +lyNK++BM4SmSSOtvyybSxDqawsORFylJ2XbDJxOsGEjhC+wSD6ZgF23ZJRvgcd4u +pLg6K4PfRTmNgFb+rDf5SRbLVQdPNgfy3l1Se/zJuk5NTu790o29QM/1kaKmLjQ/ +JGD1ev7rRgfmXob0LuFiFS2srYFiouh7DgHFKmu2IN14m+D5QqvdOV+ex/NehcVn +4p9w6nOMfvzUIP31Th5qy6xHiWuM1KXAJ/5dgB81SckD7dUd6G7nbPWBoYv+s3MZ +anWJKiCowH1t94jTszfSbyxTZEkCAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFkGA1UdEQRSMFCCBmFscGhh MYIGYWxwaGEyggZhbHBoYTOCBmFscGhhNIIGYWxwaGE1ggZhbHBoYTaCBXplcm8x -ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAb2gP -NX+t2jFn3ZLqGH3oFl6yqAu2CU0zkuaPR9c22+qU9fdumbLYQLL6ouBIevWT8tMp -4nfYRLulKyvNP8EgtLUGxwjtwJIydjYtlfMpYHQOlA8wTF4b4EhCSFJbuYkwfvVw -T0kPBfJU9+XrOUZfOkZe8iqtQFJOhSa52IYVEHjRxvyn9cZwAQ8EvimDPpQ+FY58 -gavYJmZl1O9t+gjC3zF1NG4JC2y5ao0IYgGk+HbhsJLFA9GhpU0ZJqt+gncofJQK -gG0LcA1R87J/bID7zt4LFRvetseHwJgj/iatUUdG/fTTaLVLPmDWnsXMIrmzbqB5 -KTC0Wq3e0j+6AA1x8w== +ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAUrAp +AYh8Dac54sdhRkJB4pa3+kZ4DSyQgC4MQMieIbbdyc1lxcFM9NI5c6xK99/PNp1V +p73nO/w7kU4MyTO+k7fnu2+jGd9ERmCow7tijrnBm8rsbGCS5qJBCzinnLUVC8o+ +uD2Ur82rQduNzXPfJ0IlJik3vYpxYXOFz75DZUJYPFiSWywIv0eDUR/60j5FpWS7 +zgeQsh+KAUNj1j8U1RDXPQRwdienhCQzGcKe/5B0YLtprjWhGN9wBIv7zRZot93t +QpaZODktzGeIZeF1JEgEbxgFYnFWlLbGzWoR/hY0CClgPUTMKN1UdLJt9F07DINj +TKxcfIdWnoWmX4QJ9A== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/alpha1/node.key b/tlstest/mtls_internal/tls/alpha1/node.key index 3af210ed7fc..4ae0df0d73a 100644 --- a/tlstest/mtls_internal/tls/alpha1/node.key +++ b/tlstest/mtls_internal/tls/alpha1/node.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/alpha2/client.alpha2.crt b/tlstest/mtls_internal/tls/alpha2/client.alpha2.crt index 309bbfa1b31..289c84a454b 100644 --- a/tlstest/mtls_internal/tls/alpha2/client.alpha2.crt +++ b/tlstest/mtls_internal/tls/alpha2/client.alpha2.crt @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDLTCCAhWgAwIBAgIIFdWxwzBsazgwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDLTCCAhWgAwIBAgIINB3HUc0HvfEwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0NzA4WhcNMjQwOTI0MTU0NzA4WjA+ +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM1WhcNMzAwMzE4MjA1ODM1WjA+ MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEPMA0GA1UEAxMGYWxwaGEyMQ8w -DQYDVQQFEwYxNWQ1YjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJ -o/dnozoK/owNVqejTniD2jl4keKF5wFQ5pE13XzDh5Mfv4iQBnrljU7+WjJ20IGz -xajaOisvK9bQv2ulkCNb4OfEgyOnjZY8KJgWyyUId5EE03lqPxWiRKuwflNjpvvu -KkFxIkaph/Jv1LSRweHzuSMYZ32GGANOVajPOUT/vNO49jr9TBjHcPDDflbaeq/w -WA0wZybhZkRC8qzJg/xUhL4LLrU2hZtak4+BrdPHe6nIRGJmNgX4DaDqYTiqdRJz -M5a+g8FN+WWyooU68NkrQFEJ/mh3yP9Tqjk3H8T7/348eHUcvBGED0Pfafcya4K+ -sfIaKdi3EuKSgF8vHZVzAgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUE -DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAly8iDSzlhl5+58rznY6/ -YSmAJJ5e4QbQQ599vGaVr0pF+0j2yoTC+bSYQIWUyY4Qk6KepnOoVPCr1Pzwh23x -dYPPCeFfoawb/ysJ5oqCc22exMNFGYyvy7eeLcSx2wXatOyCHNbPNHseVx+P6+pk -9OTwokVVC9MQtX6oldmbdiC2vngaK1mrHa4ZQNUA9sH9Ty9FL/iHK7ejRkJtS/ym -QpqUrEp/baCDMCb53lTxTeojCfqJK5ZUGdYNf4UxkxZNP+dp7kJgE6Oi4KYdUhg4 -w+XuFO0Nf+lmfA1IuFUIn04EtHbp2orq3HT0dfSsS1WCTiK2455hZGVaO9phGF5A -wg== +DQYDVQQFEwYzNDFkYzcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCq +7blUnjE+PSo1UaaoBNXfGy9BIZT3zLHLUg2w5KcpxxxJTlPR6zk1FOE+yF8fP+bS +Ps5cv/N1Jd2QsKXvufdsEEJWUV5vNaa+GCzBuNxMC96qVd+ehSRdx6lSU6ynAEMb +xrLetSXzJ7Ai/wk7yzIcZWnRWydiHzuwda/3J1T1+pnEdqZtnDmgqH2d+n+jXqpa +QU+Iva5779n0wxoDAnUyzmIlJBP1HuBlQQ3n0LASYbAJdF+pzr3IChaOqb8PoFLO +wqzeSLFmR76YFcg33Alh3wKkc1+8+1goM8BhIswjhwC4JrH0WzSKGtwPUfVjF1hC +RNnfxDdoMEQnWiOkMEBlAgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUE +DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAp8oPq3lv9de7dGrUKn03 +DkJE4mBlkKTJu0mEMqTp7FNi37uWfQWkbI/qakeJ/Rv0BBtX/s3aTdp2OYE+y1ZL +4KSSNLRWAIS6Iw47Q1TA6a74Gn8/kQsY58+WRvnkGS1XO+GLJ4spZRaWn/LZDOsd +zRNX5sI50alt2avbPfVJ8IfOwPPCLW3Bnp5JGpeK7WuZ2F2ofknkMXRA9awsgdGZ +5B5yK0mJzfrfZv6m2mN0YR/kgn+bz1Lvb6C26DVfgtbVSZRJD45KQOFJYgy8tXow +yrHZ3RpcJyNRX3kiIi2ngofxQhKZq1T/+jpZvzvNK9f9mQrqOwPvGLIcqX+WwD+A ++Q== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/alpha2/client.alpha2.key b/tlstest/mtls_internal/tls/alpha2/client.alpha2.key index 9de4706bf0d..0bdec570fa9 100644 --- a/tlstest/mtls_internal/tls/alpha2/client.alpha2.key +++ b/tlstest/mtls_internal/tls/alpha2/client.alpha2.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/alpha2/node.crt b/tlstest/mtls_internal/tls/alpha2/node.crt index f9922a238fc..2f21a1d6ccb 100644 --- a/tlstest/mtls_internal/tls/alpha2/node.crt +++ b/tlstest/mtls_internal/tls/alpha2/node.crt @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDmTCCAoGgAwIBAgIIBIHlAz/ZepIwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDmTCCAoGgAwIBAgIIePJrCbf8P9IwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0NzA4WhcNMjQwOTI0MTU0NzA4WjBD +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM1WhcNMzAwMzE4MjA1ODM1WjBD MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEUMBIGA1UEAxMLRGdyYXBoIE5v -ZGUxDzANBgNVBAUTBjA0ODFlNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBANu7XCuOrGion4oL1kY3ytWiPqcM32Son60/dEwFVKjb0FJsj74iz9yTFbUu -a/MtTW8Jl2QROgoGdrfK/xXxO7YYb5uzEyXLl4Y1zbHhdugFE3v67PVvhOG7RUZz -4tJicQsabFxenIGijfDYmeEZ6BcsySix5hI0rHxQwCTEI+AQUJka3ISY4nnmzRYf -UvYaJnGGZrqmJz+HK7fU6QUTMf1hqy7SDOZynlpVoru/2RxfpK+Xy4ip4kFHzdsB -tdz19tRBEIry/W2k7KuQ6Ie1bUWFnVPVNZ8HjYEB441iN9oUcx8VJPOOGMF5KBsl -z97lYvwS2gRPZNu5RCN6azi160MCAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw +ZGUxDzANBgNVBAUTBjc4ZjI2YjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAL0pK/eCkr1J2f6VGnGOLm+MhLtPIn0wzTquzpya8tyIhFR+er6vF0zbHqG5 ++fand2BIdqlgE11iY4FrrKNoeqjFNWeRdNSKYKR/cG72DPQfON9xOzT/H16XAvL0 +w/ulXocsOAZItvMKjzgN+mrXtRddEqvM0bdvze0mUa04YlIFq79xAM62jHsGNfjQ +48UhRUff2ST/IXCKcKKDX/qBueUsiRIZGXKXMoF8/sPpDQ4w4J0O8pOCVBpfBNgP +/qRi0bu7uQRn3H2vULqmba39LctBGxIhav2s8SPcpjsw2Icz9NftS0Y4qOq9n0Oj +rCQmVeVQFfRA77g3T6bn1m34uNECAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFkGA1UdEQRSMFCCBmFscGhh MYIGYWxwaGEyggZhbHBoYTOCBmFscGhhNIIGYWxwaGE1ggZhbHBoYTaCBXplcm8x -ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAVDOy -QrXr5knFaT7Z3MmAXhVagbDplEypDKHZYFazfWVzB82eM+zk7IprcLZ2ALXVj2U9 -36MTxZDeRQG1BO6I8a12396+UmQsdzti+dNDjWOIdmlYilYGSvBJynHuIPuVE6QW -dMvgjGXs3sseHAm9S1ftAbAf8A1ciY0xC1E7mTFAgIpr4G6f+piroLmCAKIs4xjX -CHAMukBZLq59rH/uCLnG37WGfZCas26kdNSPehJQVEAqFATDDzEu42TIgpxnebJ3 -+MibXsmWa2oJNSd3LniSfpXopTWk3O7YoD1YyGClFZYFPi+YNqLHK7wtYG4pEDcP -/dthRBpn0NpCZgRsLg== +ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAeNFX +1gBKEmMm9wCsIeOO2mLhx6V3wDxzkyMH9kTtGHLomA/zNIsdgOHZrXtfyV7NJTzt +hMx6avuf2ywUtKk7UUlTeoocHt7VmTtLw7W7YuxlGIFv1BxFuW+ECHsEqrX8Z5Dr +E/A9ZMYU2v+/xO+ePAFroIlItIMu3CSBPHqV4U8HB5ZPXpRzh6t26yiOhUCyF6+G +bG3k62z1cMIq5CVZloOH4rCopszS1+59jEWxKLlroqM4M2BTBUBaS6jz3Ig6XHk4 +2jPxev+F8VTbpBNRf60T5fhMJ0q+I8PAXnOh52TJsSzyNYS9siiepQdOSK9qxAqe +dvzOl+QV2NvBGzEaEA== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/alpha2/node.key b/tlstest/mtls_internal/tls/alpha2/node.key index ef93f4a462b..685cf5e4d93 100644 --- a/tlstest/mtls_internal/tls/alpha2/node.key +++ b/tlstest/mtls_internal/tls/alpha2/node.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/alpha3/client.alpha3.crt b/tlstest/mtls_internal/tls/alpha3/client.alpha3.crt index 8c0dbf12e0a..5bd1c429a85 100644 --- a/tlstest/mtls_internal/tls/alpha3/client.alpha3.crt +++ b/tlstest/mtls_internal/tls/alpha3/client.alpha3.crt @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDLTCCAhWgAwIBAgIIN/zhSpAdgBwwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDLTCCAhWgAwIBAgIIJIICozVDML0wDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0NzM1WhcNMjQwOTI0MTU0NzM1WjA+ +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM1WhcNMzAwMzE4MjA1ODM1WjA+ MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEPMA0GA1UEAxMGYWxwaGEzMQ8w -DQYDVQQFEwYzN2ZjZTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3 -y14cy+t9EGhjX3o/pmcH5aDr+1oT6JY8l8Fv+2PHC4MyLMRDzxbDbPM4C2CTiSih -wKwtFBp6XtRRh7Hmw2ZP/cXpnTWGeuiWGF7rE8DF3JOKfvcY9EKVQtY7W1sfOzZN -cT1487vjOb0Xy4W7HwsMPrzRXH8ZnEre8w7C/FCpN98gqmD3PRvL46zW3VEKSEC3 -RyiSDkmifnNsGYsQ8aeA2O+fZlRYi8ZT5Sjw1F0xWktkw4JYXswe+Yzh7glff4RT -W+I3/5Xr1c4Wgyk4LAH+krM8ECCPZtoN9XC3tE9vDumnmu6w9EUBa1Wia6GztLyA -hY058x65FwWbASUqZgSTAgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUE -DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAEuYry5pMYwf71ymL8dPq -rj1pvIIRTXbKGIxhMNOxYgeMLVkbORah4U+eRJLWnIogRrYhBOOsL3FOJNZuNLw5 -OyU57r5qMGSbVRQevuG98soJJzycT9GmkeCMnoiWaehv5Q6c261HYx0qygIqDCG5 -HQJOuu4q41b9yshQk5MvoSSNOU9OlWkw91pQz5Ia9KD8U4avfSwrxW/AFYyP83EP -pxq0LZOxbx+LgVCqEcaTVNhnudKsJO5AHbVtI2XdEgEd4/tedIO7x8xhNgR76DmJ -/Q4EqGCkJNgL0VByozfIFPnOqryL77DogUoNOkkqTwcAKwksIqwqADaQHs1qTGmk -rQ== +DQYDVQQFEwYyNDgyMDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDL +eT7HOgM+6PjGdtDwuRnKkip6JiR1KLN+4sIeUlCAPFULIiwziqBdYlMSQOdNin/F +bT9WnfpXwhlS7L+JQr57SGL5cKD45LmpwXWQ3savLig92vA9A6sLxJeRpOZeR8Z2 +bldbl0jR8Q/4onwjoAcV7w84JdxdoKGeMaSPtQQri0rBPGKw5Qtm8x2yZfGge+mw +u4i1xYsDyUoVe4iUwVP+OUrAB9O/D2T0gWVwfMIMu33AOmm3yjLo/CR7VDreQpN+ +fX/ceUQuMI8lbS+t4OwLhGj0jHiwtrNmgpqIAQaDvKc7d9TEVdWBq0uvttCqVhuD +JvnqA1YLsquB7hkmHblTAgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUE +DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAFBocbwiUMl/WDbKC0HvH +xswCpIFbpxk2TOPQBOA+mnw99J0+SJkCd7BzZeuwmGTdLoPj4mhi57/DV170izbi +WnOIrg3+Acv4uDauucJhaEDobY1NhuT3/V9lHeSOfAlku/EaCFsOnDgsRRGVSqvc +dhQPXD1La5DkHT3R0nMcPo27meCYFuGDVrtdAWYDTmvoqaxD24W0WGyQCsQ4xk7p +ad+5yEUVGaBxbrtdYqwcnuqRnTGm2mKSHf8ReWxIssd8VtDpylaUWpSAY3iAqpE+ +ni+qfHUbTReK70DZNw0EJADJwwJqmXKXqNrf/u1ixiFIyDa/gXjW6Sfi4zEGbHhA +Pw== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/alpha3/client.alpha3.key b/tlstest/mtls_internal/tls/alpha3/client.alpha3.key index fb5c2796425..f7988791d6c 100644 --- a/tlstest/mtls_internal/tls/alpha3/client.alpha3.key +++ b/tlstest/mtls_internal/tls/alpha3/client.alpha3.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAt8teHMvrfRBoY196P6ZnB+Wg6/taE+iWPJfBb/tjxwuDMizE -Q88Ww2zzOAtgk4koocCsLRQael7UUYex5sNmT/3F6Z01hnrolhhe6xPAxdyTin73 -GPRClULWO1tbHzs2TXE9ePO74zm9F8uFux8LDD680Vx/GZxK3vMOwvxQqTffIKpg -9z0by+Os1t1RCkhAt0cokg5Jon5zbBmLEPGngNjvn2ZUWIvGU+Uo8NRdMVpLZMOC -WF7MHvmM4e4JX3+EU1viN/+V69XOFoMpOCwB/pKzPBAgj2baDfVwt7RPbw7pp5ru -sPRFAWtVomuhs7S8gIWNOfMeuRcFmwElKmYEkwIDAQABAoIBAGV3o+R3+/EWntrF -ukLrhhQJBNdi867sCA05prRA8CvSQkLwDgZ1jNalDn2RYmbxIPpz2VolsByAv+ym -4mNI2vIsYxf/D67HqiI7ICPdyt4xUU7zm00uhJfMx2MLo3nRgcAtVUeyH7dph+hc -Ft9gWwQOmsVmsFCeRYNiYnLpQ0q3uf7Etmw8CH/mgJ2aPTWkYeT4qJrY8ISLEAOx -nTpSEOPw91sonK24kkw/hC88VwEa4NxJKk1Xu1nGlYUJcNfALPmtDNBLTNoGUdbg -VncqUZjkYcbOUc/Pw4kSbdAlYqqMTQsL97LrY9BQyZfT5LEw2xgSwJki8LeLjlH2 -1XHeUakCgYEA8AE1LhsnerS/WhhowfSkDZWS36ifrfwNpPuYUholF8jUD9i7kXC8 -p8L4Lo4ODW9IlHDkbn0HZ5UdJSEsxojfIH6bDcIjjJTHyR4vwpHaqcUrM278kZxd -JXh6uWQuvJoKmv1VXTIT3LJ4ItQ3l9zaToyt6OArhvhWqqhwXktDs+8CgYEAxAsj -kR0Bort+ENA5FyJAvgAu+kVPpmMtLno6rEKpMHX4TH2kAV+BD9t7YJRe1lMXGXFk -KDzibd/oMren8+b/ypcTWwNwsUaPe0Ho/VOmEZvf642YEI7hLm0B7jFm8eR0tIA4 -xT80BV29nbZl0XfGfuYfvKm8irWTwlTi19VzBZ0CgYEAnVfdWnW44yweCt3Xx9gv -uSwnFvQAg1qsQ04iZSj4ymgCBsWK6mWjeMRMWpEMy2f6iD6es4TKVvEeI1pldV8E -ENSPqGxvS9m6RLLCkud2GDjIArcvY/LD6i3bHzF7pm/CpiuRTEDpXpWuRv8j1y6V -/EskNHjKcHjcsJMu39Kt9wcCgYEAoTHDgetG0Aa4Zpy/hI0OjOvbtL9O+bHskZ3B -Jqj9MrKdgk+Ajfx4Q5ClhskYncPeZ3Y783X0fIGyDBnEyKC0zGCicqCGhc1N5vxP -1hR0pV/0o1teoKbK8wCAqNkIG3dMmqofg9gvLwZgBhDW8YA5v1f62ob6V1dr8ksX -5n5EwGUCgYAEY906AHmRv8keOxhjxhru/ac3oOAB4HajUv229vllQo8zcmlkGcIU -pPXSIqP4CaSbjfm8WmN7O6kpZQA+Y49pkkNoRSb+o5eiry7t6HJ6s9zPietd+h7a -aAG6aWoT/Cy+HlmrPLNUbSvbVx8hn7EDzxUyYKHbJIJkkK/Yz14t7A== +MIIEowIBAAKCAQEAy3k+xzoDPuj4xnbQ8LkZypIqeiYkdSizfuLCHlJQgDxVCyIs +M4qgXWJTEkDnTYp/xW0/Vp36V8IZUuy/iUK+e0hi+XCg+OS5qcF1kN7Gry4oPdrw +PQOrC8SXkaTmXkfGdm5XW5dI0fEP+KJ8I6AHFe8POCXcXaChnjGkj7UEK4tKwTxi +sOULZvMdsmXxoHvpsLuItcWLA8lKFXuIlMFT/jlKwAfTvw9k9IFlcHzCDLt9wDpp +t8oy6Pwke1Q63kKTfn1/3HlELjCPJW0vreDsC4Ro9Ix4sLazZoKaiAEGg7ynO3fU +xFXVgatLr7bQqlYbgyb56gNWC7Krge4ZJh25UwIDAQABAoIBAQDB0vxvUZ7X5Ztd +ir9cICcmZXgbJYxjImNiAmYB9k2C6nXkhifu7SX37vrND5CGt+Eg0wGb5B8eS+JN +sQJ/oVnMHFdT3+snTNJjl8sDNoOzSlfBHHbu2DiunBX6AkgEFYFDPbbvo7wVaPna +0gVI9l7pkPFBfidd9O8fv5BP6JJRWsjTYe8PTjugrNvlWS+O9rqfIukoi5PMyRPJ +O/0Nhp92GRKTu7Ugd2JffMyXkDhVoGyw1O464siosLiiytST1hiqVZ/SQLiH2il7 +lQDnLtJE3ISkex92h2OjlZAE71P98b9uwu76A1ndWxWTfIoW1MEWP7XaErUMXwZI +5qlX+hLJAoGBAPxnsg06kD7UnCBFTXd6vLRBusUZr9OwqZG5VdZozvU2lr3jamBX +aPqMnWLxZq8cw7cgYjUmI6zNBTU528/32XeaHiyYilXHYbMQFqkd8LAeyhlbqxWH +P3qhSoCMrl0QvgziLfK3htn4tWfwpvNl+bfXe2VGZCbLHTx50qJ4DkxfAoGBAM5f +I4UzfDcEU/Hl+oSi5de8+6dJ55UQ+ghjGlcPpkIKGbAg1A04SQ1xxcVrc/q+fpJI +VHFXabJSEjs48XWUW5U6kjShPdhf5lKB30nu6jZj348qZKuPfqr5TQAEt1Ek/i3T +rfCtY5MTduziZZk5KaLFgVXRZSnzJpPzQGWwMveNAoGAUVMn71M7PsNKOquZtjF5 +s6qp/u+z00VMnYNVwOusIx4fm7c2gywmyvObklGtgCaIeOyaN/296ON2Fhw6UtvM +2dhyeHP9vn2rYQKCCqN29Yg2Hc2HZjxZm610T88EL0BBu+z0WQwBCyIzcPX9FNd6 +il2HiK4Rft5a4S1vTKHaGYkCgYBl/nNJs8ZiUotCdI053GCIHWiqp0YDUF6ioog0 +GxHqdZ94guEKn5TLRj2ecprhhCB+H61MTw14CkPkbSI5IFebC1WTGVW9iLgGcxVu +LtwmgXnOAf+7IrJRweCib7JCMmxFLec7mhYqbGZMcSAReETxo3dmeJTtBLU+Tey3 +1Tt7SQKBgHoc7NkQnhWkJ3h49z74mV1uS9D/9X732O/eh6WjpoGjDvvjUkI/PUAI +uLYypD1D1TpEaNUXCGqSjhDszAkIDO94vXVrOmgdJHAQTEWtK7PDAFuvVJfVhSlg +kIAeZEcbGlL+4FHIn2d8EWMgqJ5S8TVsflmg5uDShTxO4NfiVf/8 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/alpha3/node.crt b/tlstest/mtls_internal/tls/alpha3/node.crt index a8d0113e7fe..a1b365f1058 100644 --- a/tlstest/mtls_internal/tls/alpha3/node.crt +++ b/tlstest/mtls_internal/tls/alpha3/node.crt @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDmTCCAoGgAwIBAgIIH68uSMfWIrcwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDmTCCAoGgAwIBAgIIesvGFwchRqIwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0NzM0WhcNMjQwOTI0MTU0NzM0WjBD +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM1WhcNMzAwMzE4MjA1ODM1WjBD MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEUMBIGA1UEAxMLRGdyYXBoIE5v -ZGUxDzANBgNVBAUTBjFmYWYyZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAOhsDVr5lbFX7oAXwtglxvNwAsS6JR1U3hvfkScLe4EpHDYlF5IRX44Rm/Xe -V4eCUMA1rHwv6JGrAPPE9tIEyAOBFAGml35gE+TjkhLWirdMZrEtD6WeDdSplO7S -nteOOFB8VKj3RovyJTX9DqPV+CgIdphAnAAKt9NPyQOrZE14eY6r8GQj+iY6mhjb -oMyrhybpxdxA8toZGYBU3mNllDqG4KgqrXHFNDXFjR8YRbhHkhVf4yoojxCvA+Og -crjTeU9bX5U9k+fuEW6WQYi8OM7a/z5mzbnFqyGy1sz1rm0dHzLwOPGWYWrZxTEH -QEozC88vT5LwwZV6XprrsjIFkcsCAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw +ZGUxDzANBgNVBAUTBjdhY2JjNjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAN/+VCYdiuxHeuo9iAV8HIankSjRRnjV+fkQEFnNjzPHkKpfo+bA0FThgCb8 +eSZuv32VHlWskSx97Y+sHTdII7U8ZFsFBcN/ai3yGNK1IIfccrWBL3yLAzsidFnX +8PYwgjAAzdYWSnA3m5Ze0kJXoxUkf+5yuIg6fNFXvjwRkIOCL4lQOEAyxuPq4T73 +7wH/pJlBVi/RguVC9VJ7syjIuEQ29zaIGAmVVJlZA/NU69qv0PecGY1th756SOnR +n4paED0O4fl5yBICL+ZNlS7DfCGiLDIn2gzZAfREySGhLRiBbzDC89SsMeJj1sAF +Tw9DECB8Y2jXvjzVgwG9lFcjBesCAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFkGA1UdEQRSMFCCBmFscGhh MYIGYWxwaGEyggZhbHBoYTOCBmFscGhhNIIGYWxwaGE1ggZhbHBoYTaCBXplcm8x -ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAjZ/4 -3xSV5LEnKbtpS2P2O5PfMuWhUIgcNrb/uoeNlAo/xl+q0QI7F1N7UWjRnLuCy8lt -UPVROBu0caXfXp2OPNcKIP+yXsWvyUJ6fogfX2gQUuponMV+P1hggfT/JOh5EvO0 -C1Fn3FfOI+29tTkjfs3+4o3dnnQT800tVyKOjlxjipvTUMVfommH6fOZJhfN5iTI -B+ANdcbkyPqp0py2DO7SRaurJzTHiAdUzJoZ8af8mx/5zJazl048ODbDE4Nj6Yp/ -HOZEkqIAkokGs68Ug+/ajolt45yfrIWLOvDYdBYaS513xQMxQg/I4plD6xU3Eya0 -XgA6I58zfQ8CsYHhkg== +ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAj+Z1 +kay0vwl322P7r36sD+8/1G/kF06YWhNqOp6P228ZYGOC4+5cs50AQoPKHFvB6SZ3 +3Y3cx1j58HFLAkmAZBL1vnOGfn36Kh3nE6c68FsXqDpCZa32rhS2FhIzerYUUYUf +uo92Luy2oswrnh3+hSMLJas1fqXijg9KSq74+SHmTrlmUPmJZ3GFhXGCNqcZsu+w +ags1237PZhqpMmzAo9qaUAOs9hkJoNQed0WY8elX1QvDmPo07SPXU41JLZVsTumi +AaN+GAFTugazc4EaY7D/T254PCVP1vF4nPsZRmj9yMLdk6KEzVi7jJXdC1W5AGwY +6DeTvuOM/QhzHtPO5g== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/alpha3/node.key b/tlstest/mtls_internal/tls/alpha3/node.key index 7b723846dd0..67c6e10600c 100644 --- a/tlstest/mtls_internal/tls/alpha3/node.key +++ b/tlstest/mtls_internal/tls/alpha3/node.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/alpha4/client.alpha4.crt b/tlstest/mtls_internal/tls/alpha4/client.alpha4.crt index 99b536a2ab1..9b2f4199b81 100644 --- a/tlstest/mtls_internal/tls/alpha4/client.alpha4.crt +++ b/tlstest/mtls_internal/tls/alpha4/client.alpha4.crt @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDLTCCAhWgAwIBAgIIdzUf11+39wMwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDLTCCAhWgAwIBAgIIEvQu+UVzoDUwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0NzM5WhcNMjQwOTI0MTU0NzM5WjA+ +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM2WhcNMzAwMzE4MjA1ODM2WjA+ MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEPMA0GA1UEAxMGYWxwaGE0MQ8w -DQYDVQQFEwY3NzM1MWYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj -pMrnvTgnNuPTQM9zRBZKmRTyH5qNDUA2nufcCJMZD0AXoXPJTSOZdMSRO2BhvXJ2 -wy66vJqxJfCFt6pzjpgyOxIOT//QM7z4DlIz3MbqekrcxJvgzEX05/fLKQ6Sj/RF -d2dlr2fH3sZrmSSbKmV5gBeE/D54TeZ7yalNU/ftVZr+vCYZMOxfJZG23u4CaIh/ -cbknYae6TGmYRGwVk2W5PcGWr4VWRC75F6gn+wQzfNlWjRw6Ul7XMs2IErbh5sXK -qZ761df6bmETxn9BhBe3h856HiW5WnSDzmlOff3G7AGhokeb+13HPr/TsxeCqy1x -77MPTTWMtQouXtZm/urXAgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUE -DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAIeMAy9Fx1zbRuDNptf1M -8us7Hz+9jGVkzfvba8vqGlUc/WIXajDdIzWObPiVHNpRBjwncGXUW+/AYIEtgbBe -OE7Ta9DY5YZuorc7ShLumvDCJeAV3Bpz59WqIVIdlIx1pZ3FgHH0zyChFP2QTHf1 -RcvfaYOzVZZ3yH4Ywb/G+pHcAC2ZvPNPGIJ8IvjtlRI+ICcuILt1KP1J8cGMv/ka -BvtuXm8OKPw7N3jqhxmr4pXeabyPJ2BEF4lcgrhSEjS1+zweuVHbbrB+yvGtechu -GdQa082/0c8lu8U8ifNYRDqfhyIdwuSO8oR3oFCDOgsjJxov1VmFz3CssLZEuyL1 -wQ== +DQYDVQQFEwYxMmY0MmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/ +/nhqtWAJ4HWDgepWW7VbQjcGPmxm82RoH4/oHiVmkadhRgaMOhZ+Yi98GT1tAC+u +qm9u3sLEq9pnE5QfD9AwSIIMzmPckh+P32y4slw5BdHXrnzBSIBduRxbK8Z3bHKC +Wr4uAcoSb15vkDT/176/4cmlYfjMQFog73802Cv+3VsRjh2j2j+WPSDqaKveYK10 ++rrZ1a1zCbCO5XsZSsY27DeP6MDFiecHfM7s0idgT/bAcJ0w2KgjfUzSjjeboVhW +q+BQZDW2nR3QM4FVZok7tW7Z7Mw5M/IHBS1cIzRJX7CjALjlcBPiG5z1O/2I3vBz +jn90nCfuxRpaz37yQG5JAgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUE +DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAhTAntC2Ad+GawdOrrLxI +fYerIo6Un0HhcIHmX9Z3q96YbqqO8GXO4gd7NSODN6uSTQpISxSY66AHcYOUhynn +gUrLnhZm82sB09XMEA1oMYFagGTIv8aE1aQIh/O0wYj/VmXgc5zxF774n47Nq1K+ +05s6lsJioBOdmEswgEimomfJffIHo9c/PpIgFgwjr0DcyfSBnVm6pUbXE9/RQ2Xu +Ki2iEvaJ+crnm++FUmeg6a+WokMDrzyk4aG7eEtVOkp+YIvfrb3V6+apGWXCAkzM +AKPOoAsaiAvLDIXk77HJYPcV+eeTFnLLlSrCg/SYLOtrn07Zrj0Gtr3Vk/7O50Db +PA== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/alpha4/client.alpha4.key b/tlstest/mtls_internal/tls/alpha4/client.alpha4.key index 60d31075280..221852d1e92 100644 --- a/tlstest/mtls_internal/tls/alpha4/client.alpha4.key +++ b/tlstest/mtls_internal/tls/alpha4/client.alpha4.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/alpha4/node.crt b/tlstest/mtls_internal/tls/alpha4/node.crt index fe3a118bc89..4333842423d 100644 --- a/tlstest/mtls_internal/tls/alpha4/node.crt +++ b/tlstest/mtls_internal/tls/alpha4/node.crt @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDmTCCAoGgAwIBAgIINIiWMq2SisgwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDmTCCAoGgAwIBAgIIDr9TweVXvm8wDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0NzM5WhcNMjQwOTI0MTU0NzM5WjBD +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM2WhcNMzAwMzE4MjA1ODM2WjBD MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEUMBIGA1UEAxMLRGdyYXBoIE5v -ZGUxDzANBgNVBAUTBjM0ODg5NjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAL43ya19thFD7+ojIwchSvKrDLq6fY/ISXIQxpJOsRTdb+podlLFjVzGVuF8 -Om+Tk1Se0RWHtbl1Hsya4OEisUCWo4L+nblCHaMgK4XKr4adtgimKcLF9277kqGg -BaV3GfRWemj3KKZPWnEfL8psDPFsKMqoM3ZQrOQB35HKSJ4u0fUgpPYmfl0E8/tz -2+YyaS+8541xqO7ginhOHymGzo82PjW+revdvJYMOYvfz6zjelu83VIz48NPycw8 -NteF6U2UraCntW9LIyssQ4MIIgU4OVFjYBMP3MUrDVs4JcCT0SF975vCJEoadf0v -Fx7ZbXkGaqceJj8/SNR9YfsxIyMCAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw +ZGUxDzANBgNVBAUTBjBlYmY1MzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAL3xyBYagRoNKpwrYOvGxifKBfdj3jpSIrHv6CzXJBE/KD+gzHbmLCrNm4xs +KxMsQ9XJEvZlXg+sZ77wznCr1X5JKt6uyTCOjzKRV+sW2BCQsLIyh1Kg7UJcls6i +a/dckK6uKSyJ/5U6AsdSrPz5WKNpVzsYdOcQfiDWgASgd2pD9Aj01kl16y2/OM/B +fsU/8AI5LucMJu4Sqycy/CFS66nKZgoDHIUMO68VxDbCgIkKoWeYNy+NNpXQzVNI +N9FZBO+RWvQurEn6vunCx++h8M85624nwc3jnRe3c+ChlQe2fbHVSHDoq7UesY8k +oWe9EzCdeIJSQVAMFsP0YEvbA0MCAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFkGA1UdEQRSMFCCBmFscGhh MYIGYWxwaGEyggZhbHBoYTOCBmFscGhhNIIGYWxwaGE1ggZhbHBoYTaCBXplcm8x -ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEASM1r -WouglU+h6I7aQYB44uzY2NXqMuCtmAZNmBBrR3Yfc0vflVz825zg0fwjKn8/R66w -/pv3u6gjPSuywHAHFvahXoQCC0Uv7NhcRt7OBuO+dYFbvEPZTJfin8ts80sd6AyP -j1kji6tw85rXoKhApPYjIOCyeobPCWoKc5H6rU4XW2vShZFngWAmialRUR1b6zFd -iaBz3DYpzbg/5uJUp2J7LPBRCoC6osNUnlhSkfgo8s7crgBAhtqBL8vIDXBj8uzN -xeV4n9tFLgdg809vfkH9W2ZIq5cxDEvOTF4RjZsT0qyhqcJNUpocgBcY4fKlbCg2 -PUlmUMDTjvnuNT7MAg== +ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAQi0r +aiwFltDJF7t5PJS4kPneYdsc7LnwgeMH2orbMHIiR/pXK0RIaAi07KQUFWNZ4rn6 +92wKQXhxBbtg9DsZP2cdMHK/pquOj1nq+/m1BfL8ukmPp7Lwjvpt73uNfuSbjfV9 +NTQ25E413DiiBAkbu51dClSG19WfjzlS2ZfTjFZ5dZ0KIJeG8pMyrnQFHMcJOACe +qs9Zlez0iGC3wXwaSQjbygDY1FMab9Npa23ZZjkHcVjv/oFjn6TZruxnKbYnyAzW +P+dGSafL6mloiemd1T60zRyhnQFZNl4QiRxMHUmxraPVmuedQW8vSijTT4QmFWyJ +Y9adDh5mqqNzNhjhOg== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/alpha4/node.key b/tlstest/mtls_internal/tls/alpha4/node.key index 33dfcf8bba5..a6a7d28ed83 100644 --- a/tlstest/mtls_internal/tls/alpha4/node.key +++ b/tlstest/mtls_internal/tls/alpha4/node.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/alpha5/client.alpha5.crt b/tlstest/mtls_internal/tls/alpha5/client.alpha5.crt index 0968f060009..24d7c83c5a7 100644 --- a/tlstest/mtls_internal/tls/alpha5/client.alpha5.crt +++ b/tlstest/mtls_internal/tls/alpha5/client.alpha5.crt @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDLTCCAhWgAwIBAgIIa7nL413KW+AwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDLTCCAhWgAwIBAgIIexv813ki7q8wDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0NzQ1WhcNMjQwOTI0MTU0NzQ1WjA+ +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM2WhcNMzAwMzE4MjA1ODM2WjA+ MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEPMA0GA1UEAxMGYWxwaGE1MQ8w -DQYDVQQFEwY2YmI5Y2IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI -533nus+vaqvZdx9RwQjXt4zTNMA5bX78WSRqrUKiFZsM1PGrnbOZx4N+SRRCYt59 -u4CkMU+GjlO9bZqQK5QBbExsMdBWWs86svM66hyZZ4xQFaP9gcNRNPBU9KU/DFhT -LP34Zp/CuLuPtKmwPMY1un+PPVe+65pkyZpOW6BUP8/eV+4flFp6T/AkLdReY9EK -9/IluHvAuq82N2cP9DVNbEfkSCf+vfnrKoSta2B7ZpAPFNk7a6CttgN3hTj4U0yp -E2nhtQFpbwCUFHhT/2U1sDehZqBr37F8t6oI24ie/FvFDP1oSF/BlMk3GigS/Xeb -+JN9Efbtow2INmY7xVmLAgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUE -DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAm3UipbdOAra10p5nwJka -XkrLKbpptcvwnHc6hDLAZ66vXtt5/doRYZ2MKur5yQ/M8eWyvlwqwEqg9hWYuicH -cmTZurXJ38QDPGJ5Lo17lLWYZjQufwMG2AgN6nH8UHq9bzxkKySGTmkFch3DIqA+ -uCs7cUnW4sj2lRlH1jobtPcISe9Q5V+VC74bzSpPYnldnaSUCeUnKK7AZrSKUK1R -O/FOoEdgRHIykWzLmlEB8q6BpPzRI6iG3b4tbO+KxRy7wjmiFCuV4I49DJxG7AIH -t2FG3d/CQ85Pq3JMm08yqavZ5RogNirz0NOmOKH/jQChvN4BCOgs6uVEMa9/nlLx -Iw== +DQYDVQQFEwY3YjFiZmMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH +4xMTe5TgYTG15NjJ6jbgFgpZprLTIlAm6AQpu7ti9FuPJg1y7RMcYKMWKbp6myQz +irfm+kho7csAuwjEgPwK8dTu1DAMNhQ2bDWj+EOnbTs+4K2zmfFEX5k4ZEU6H5qK +6vAlcSvC08mIlviBUNT9C6Mb14knsWHp4vuLAftC4i/AfvjWPq/WFsyqquPKbVEc +HXYWtn4UKDndmTCn8a0Rdw+uJuSvbK7edZYlpzWIgJSMIKp01n+l8CnIMHmGVy2E +qVjro11No/S1Q4SjAtRCT5VYGhgOV0rEkGCq0WUURrTxGt8czg0U+TQeQw5D9d1O +Qmp7Bs8sA0xq/kXP6z1lAgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUE +DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAIQWRqqYvZ4Me/K3anXKv +zD9Zb9QkZeHqVYHU3T4CWr2nTSAJ+TfoNVayB9u228BqNIF9l5NXpvpkVgmi5DUw +gXV7WuHsHMX7Gl2ddDmnalkTGY+Snf4x9OUnWYRl+hN7zIbifnhZTedRF2l8mCEO +POIAh7S9787nIrVixFfy3TXusxoou0FtN8jBhdvCUhGSJwIgWba1WnTjaxk++VWe +YX57eqY9KAr6Zkx2WCP7Tz4Ouo5E10HQ6RrG9oKMBojzT+pAfil9Lb+ew7fg0KAP +vrclO6NakhClv7kr+PmO9ibBEesmBBJGsl+Wajy1zyjXu8+0FRuhT31Vwju4L5IO +IQ== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/alpha5/client.alpha5.key b/tlstest/mtls_internal/tls/alpha5/client.alpha5.key index 4179b3cd907..13643864c72 100644 --- a/tlstest/mtls_internal/tls/alpha5/client.alpha5.key +++ b/tlstest/mtls_internal/tls/alpha5/client.alpha5.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/alpha5/node.crt b/tlstest/mtls_internal/tls/alpha5/node.crt index 3abfabf5365..264bc0747c0 100644 --- a/tlstest/mtls_internal/tls/alpha5/node.crt +++ b/tlstest/mtls_internal/tls/alpha5/node.crt @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDmTCCAoGgAwIBAgIIKnIFn2uISAUwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDmTCCAoGgAwIBAgIIYl04EASqHWYwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0NzQ1WhcNMjQwOTI0MTU0NzQ1WjBD +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM2WhcNMzAwMzE4MjA1ODM2WjBD MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEUMBIGA1UEAxMLRGdyYXBoIE5v -ZGUxDzANBgNVBAUTBjJhNzIwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAMjiXfjApnnJu6CKa45O6dB7o7k/rSF4KIyGcGFMWOcpF0b+OyVIcOldhfeS -TPLbuJQoXUuRKmjwCmlUK6Z/Z1C6ihrdzMwN9XYKFo1gs6SQ8o9UGc9SGzS+Y8vS -rpXXMMqXDJqfo3ORGyo2DcyeyrlDcWbqrENSJY6BM6Y+hPjGrTUa4H8dQZi1VDXf -ZgX33kQfV+JQydUnlaXwtDmhuyS82ZGK57FQTkBmJN3UlaJPeYzSe7+Ny99y2UdO -H6PaSK7GvhpE4bPo4QxgOXtCqirq/lAB1wmLPxhMLcDYZnkqgzZDBP5Rs82JD8Vo -aR01xlq9wJvWKL/Uxl4hCEptY60CAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw +ZGUxDzANBgNVBAUTBjYyNWQzODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAOlYu2O5YlT57HEti4SeiJ4HvWXCre6hiSGTSed+TQZ0Emg2vHhJyZEeR7Hs +L2dXrxkvQgUi/VLNhxxISTDUCHd4kFXyyvNppwHIQdi3rKdIUo1+Nal5Lc7HU6Hl +5K+YNvFZsTcDpo0fW4EOITdejZUw2Hlz2mu02XsjfuIdqhsh/sQxORLbm30lAArJ +LROf6xyR1jYIcsBVqgeTs9W3cPEL55Nk4bV2CnZfNupiqI8561ZOQhtKFtilgbaK +fPmbqeEWsssiJ0exVhLusSGVqYamRODa3n4IV0acY4MPP9/uT5hCVz/KEffZhuoX +xg0ouR/fB/tVdQtNt5rW7AlHPFkCAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFkGA1UdEQRSMFCCBmFscGhh MYIGYWxwaGEyggZhbHBoYTOCBmFscGhhNIIGYWxwaGE1ggZhbHBoYTaCBXplcm8x -ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAIeuk -Z/tG/yxhnAVX1SjVekqZn3hgRYc57X77IMPxJyG95fDyriHdWa5g+E6wp8CGMdQm -GCwMMBUO8PfXWNL0Y1hvqBDgnjp677Eww0ii781QPgNVsm6csJ0dqD7gQQbAjOJW -IdIuHlEmBlxKp40U4yUx4QWkhSL9luelIPdaIvbV8LP/98VDpakSqc14fopI8NXk -8zEjmR9ktq8Vc6pV0FBHOZEjX0Sy2SPvKHycaO2YB8hTRFtFoHWR4iJ3nqs4Mr19 -o65U6pycikuRdz2hWZVjukKUwZaczvV73xTAKPf1fdtdLbEjmp9qTPPyXH4syYPv -Uc6sf6CBzFjCcpurSA== +ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAmN/I +2rZjOEGVkG/DQ/V4CAATAjR6yr+c3FKle2qTiDzjA0XfmAj7/c2NnWqNe70+ncDd +K2TXzm1Z+ZPNxeg/adaGSu27sNFySLyvtveTHd9a2tq7vQdI1R+zMz8ygSB18vj4 +SOk9K9nmMWERhfaZW1uG4jDF0MuKS355c3M4jQCr70g+I/jisUp6ReRZAHd5v5VG +xi7bYL/CdC/1P+LJk3xguowoGhedBEHYlgczBlVn32CRYMWvOiYEwRC6UXcEgtpn +z4MYlFJM9nQ6dxzrbKwnsTqNKy1gFT5/RlkqceDIbjBeSAucMBvwLR9z6K1Oh2pP +rCHo9DQYuLJV7douPg== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/alpha5/node.key b/tlstest/mtls_internal/tls/alpha5/node.key index f758ce7f84c..7d2dd2c35a8 100644 --- a/tlstest/mtls_internal/tls/alpha5/node.key +++ b/tlstest/mtls_internal/tls/alpha5/node.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/alpha6/client.alpha6.crt b/tlstest/mtls_internal/tls/alpha6/client.alpha6.crt index bb72a77a4e1..6aa9ea0ad16 100644 --- a/tlstest/mtls_internal/tls/alpha6/client.alpha6.crt +++ b/tlstest/mtls_internal/tls/alpha6/client.alpha6.crt @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDLTCCAhWgAwIBAgIIKFPFhMeWsi8wDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDLTCCAhWgAwIBAgIIaOGLKfdyttgwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0NzQ5WhcNMjQwOTI0MTU0NzQ5WjA+ +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM3WhcNMzAwMzE4MjA1ODM3WjA+ MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEPMA0GA1UEAxMGYWxwaGE2MQ8w -DQYDVQQFEwYyODUzYzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs -/6TvbCoKz+Qd8f/YmjQo9Xj0/tTMXvXy4/t+V0QAXa5Pq/JHRQFBaCZbi3BaJXLO -2UpSQcUt9kyKiSuncGQ+yH2BBgrRmpnKn2ryd1BrP9l+t4PqEqNIfgJbiSjJ9jcN -NBia5wrreci4QqOOWA+xcVC6e+eTOm/sc9RtRkRYp/2HCgpWX48Srr638WAMqKze -l2kCUyG+NlZ+1w9k/GNTG5RUVqn+NkmitiX7girwgJKFP1cRvddGvrsxhuUqoMCw -3xwmAyIfztYRxPUOoZ667dxfvkNKJLtFHevTejQz7lwBX3KHDGAxgU8SAi1L+SkY -akyToXlSOyu0Zi323ujVAgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUE -DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAuDhr+wdxebwsq4EvICKo -lfuPYGJU4t5z5wBn31WK9IJgn0Jc8Zu/y2/mLXVWwMcnQjyTxg/rqyhjTiHzTLAz -sf4I0V1zLs8IJGUmEOWfRA5MFuoMH8tWqJX7jQwwZ5n/TiL44kz0S59FlwSm63L6 -/IwKctAgIBjUaPkPxIyVk/vzdelHm8vnj4M+1Ijb41HTkCf7ShYunqUjIEdqdF63 -qG/djm9Usjih+aB8JOVIIbNrVM9gPoiBVK5JmUnExZHcrnzvDlI2nSvRIdJejSQh -QNKqPJqo/VRUE1141yVbVMiyaTGATsCO7CEKa/8H7YtQeUu1XoLhOdInI0ivfvYB -bw== +DQYDVQQFEwY2OGUxOGIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDN +8YMxY0lpWBVycOaLaI7RZG1BFPj/o5FZUUhz8izMhJhQcrHO1wujUED1HPIey1/p +gO5O+lc8GkxrfVhjW2MRg2HZfkwV7I0ByvU+3n91N5hhSkj/gExiKPXu2VwRSIQU +QZ+o6SbZHt8cN4jMzBxyk9HPSxwLzBMAmMkBu2wb+FiVi/nyMlL1C6jRXg0GYRgz +jpFwtX76CD7fxNre6BPwv43LvuzQ/bw08HuVQeZWCvLMSU/iPpARKn1QP+b27qar +VL+7nU1WPOcZAUcr2ITvUOFxHF+J2kRcjQyUowEqJ1ZwztGIvuKtvirljYMOcjzV +K3iINS5icttasZNvcxVTAgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUE +DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAbQz4zjzhB8oTId92/oi7 +wcwJvvO3gzyF3rlYIKhT89vM1M3/WaaPkskVkJWtxSjmLHcDKnzpu9aIQeUYk57F +IX2pt+VLumAMMaUCteU9TSTkvfEuUEK0wQ49nnsIDz/VrMJPcOR+LTFP7eYX20+W +v+Y/JFC6FUwMKhyAM3OSnqj9MXq069cEdTBW/phggyYSi7VbKjkjXCxOxHTogIQH +Mh1GzBkX8Q/C5nqQFMkloCIS6T0ndzZNkDdIMszWLN5lcWL9zexDvnHRbhcdhYI3 +EiUGDTgTOwuGXirW+ytbVVr5keB+UcMrwUo1uL49W2t4d80EY+OInpqFIf9DVG7T +EQ== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/alpha6/client.alpha6.key b/tlstest/mtls_internal/tls/alpha6/client.alpha6.key index 83cee540480..aa48c719a68 100644 --- a/tlstest/mtls_internal/tls/alpha6/client.alpha6.key +++ b/tlstest/mtls_internal/tls/alpha6/client.alpha6.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/alpha6/node.crt b/tlstest/mtls_internal/tls/alpha6/node.crt index 691060d5e2e..247b04945da 100644 --- a/tlstest/mtls_internal/tls/alpha6/node.crt +++ b/tlstest/mtls_internal/tls/alpha6/node.crt @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDmTCCAoGgAwIBAgIIYNHyfIGFNG4wDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDmTCCAoGgAwIBAgIIezNfIvoTAI8wDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0NzQ5WhcNMjQwOTI0MTU0NzQ5WjBD +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM3WhcNMzAwMzE4MjA1ODM3WjBD MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEUMBIGA1UEAxMLRGdyYXBoIE5v -ZGUxDzANBgNVBAUTBjYwZDFmMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAM2Z74FrlCoHaACLPL/Z0Y+B4tJGuYtOVRVtMKioJ505rEErhnge8BKPc8Ct -l59aHKzv1X1PhqWjbYCL51ytcAlxp3LMcNpSzuVjE0mdSqCRA/2FtthPpwew1uU+ -3gxPCJjmDP9REReBx/YLBp3/HdIdZRpqRW4EiWuxu60yCpkXUcHdCMT6gPkkURTO -6bx73qjuamCY9MSpfnoU732PqvzX6H4YSs0vvQCBQrboiVDygA/8c28dlu9qqCot -onkFxbCrrd7KAVPpFYqLSAJc0o1KLUn6qGxhyv6NgOEpo6mIrvMwGHic4lqZIrFb -uRa06I5UnKP3+ClyJN455zuQ0OMCAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw +ZGUxDzANBgNVBAUTBjdiMzM1ZjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAM3uQWVMnS0xxubAdjH0VRbHlCIFErwLvWoJozquk8yZHELaXXnah8uvQzC3 +ljjPqPKk5uXE56vZ80B5ln6YGCH7rqtttcoH5mgALDW7bQ7Zuk/GTIZn3OyYk7xA +G+EgYjUeB1V6Ug4dKTw3BhORaS/8oWMAg3LIM9FE1gIkLS5CIQ8WngQyEHnThDEY +fdZjy0bgx/urOf5ojCvkVkNGBW6x38T0d0QcLcdeE+d8bAbOgBrRJZ66TyU4MNGK +USWIjIgporW7qIOgcY5AUxhPXMFI+9Nv0o17ZFLVxt/0LOrBBYBuzjD9EJtJT51F +BAsp5jkSHtqZOoD5bvkQzsalfZsCAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFkGA1UdEQRSMFCCBmFscGhh MYIGYWxwaGEyggZhbHBoYTOCBmFscGhhNIIGYWxwaGE1ggZhbHBoYTaCBXplcm8x -ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAnd35 -KBBsMjAk1xzLy//fzdSWhSZP1ZIyCl0XhLa07e8Z+aKJPkqvFeIq+koOwgTnbaZC -56DsTGwLdcZhjquL6crs6fY48gRbR+A2j2U0P5prL9MnJCv1HWcs0FwKdp6ef5aO -VLC1Gg/lc3hyfrX52W0gDyscQ84KRF5CdjudPPsY0xYbfAbqNQxCcdeUd8jlEMYx -1j5exqYXjQ2158FfVStIaNV9KNSyJMkvo91FqvHdH+yZ+3D5pucQaUwiWgoFPObM -8OZsn4U7Z5zl0NRJpgittZdqBZ88H/48rBjiELH2Bd+mhLSIDwB0Uy/MlFclpB7o -XLsiImItA2qLL7RhjA== +ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAGLPB +sqQrx6Mg+e+HgtoAPzxQrv9wt3EdjcHGmkR46hZXhZI6DkNwZryf3sbXqECR6QWz +lfqC3rzjW4nzNwe+J7BpEa5WhUwpFF3vTjKvQIV9x8Foip8pJSh8msWlEZd1DxKF +Ac7x/0EZoz0cNZaeQRAaY63dFnVO1xGw48NXrpZtqeR5z3rVl1+e98kDXG89ssoQ +msUpsEFHfonuh09Za/cHAs77vj8xq0Q8/Yv9DRftiviG5jk7hU5lBp8qHhvSBWnk +yWjRLZBXGXNkydLYblMLsDgqaogxL36ZU0hErmfAMR8iwG+bUI0EJGze4mI2Hb1g +HORMyFyXcqRap3MQFg== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/alpha6/node.key b/tlstest/mtls_internal/tls/alpha6/node.key index 2d86375384e..a6f1844a75e 100644 --- a/tlstest/mtls_internal/tls/alpha6/node.key +++ b/tlstest/mtls_internal/tls/alpha6/node.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/live/client.liveclient.crt b/tlstest/mtls_internal/tls/live/client.liveclient.crt index dda42e8ffc4..db74c210aeb 100644 --- a/tlstest/mtls_internal/tls/live/client.liveclient.crt +++ b/tlstest/mtls_internal/tls/live/client.liveclient.crt @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDMTCCAhmgAwIBAgIISGzzV3Uv5nUwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDMTCCAhmgAwIBAgIIPmbjH+TIwBMwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0ODQzWhcNMjQwOTI0MTU0ODQzWjBC +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjEwMDQ1WhcNMzAwMzE4MjEwMDQ1WjBC MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjETMBEGA1UEAxMKbGl2ZWNsaWVu -dDEPMA0GA1UEBRMGNDg2Y2YzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEAtH+0kIh+rUlL3E2z0V1bPr1LS6BluYMBy86Fe7SRJJ7Gc3XeFDPat+qnAY6Q -LDAuWdCkDcyV9Ppbl5Z4ijaeiPyhDmlMJuNt1GG2jdAe/J/VLrUkIGhjbMgfjNDJ -lj+cBq27dM3h6yVlj5yhOFOryEuNDrxxJrA+hfE+woXENkUO8UlmE9gKZdO9/Kii -FIuwpJUEk9Esg6u6+dh9isonH/+kRX++ZmDmMu2TZqp+jj6Tz1uWo5co01yi25yD -QEn6uPIQAfOlpwAR8ZortToyVvP5e6kcviIr/PO/truTP0so+xhawUB9wtQ8GJZQ -vu0Uv8MdWGYEVLIg7y89LYOtywIDAQABoycwJTAOBgNVHQ8BAf8EBAMCB4AwEwYD -VR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAAhvE5GDJdqQyk52 -Ocb9sFaZZVWn27MRAyG1050VfwL6nw7FalO3vwgtASIhNaUcyjIKB6jdbX9RjOfM -sIaQXKTe++etoiN6xADGNzqdMY6HNAJ3ECQHfrH/+wZE2sGzRROHKSNXw+XzEQRT -Qi1anUoz4FbONc1LnqvvfJSGzdjYQJwdqnlLC9wmIe4kc5j+L2K60zZ620UY5J6e -Vqb8ceKUtEgbHgwNhQ7LzipX5Yh0DdJ9UGKbwBDHF8qmJNg5noNbufDM4VWmp/ui -ipwox7334cVoUgAIEmhbPCFgfldlb34El2I4q3P2dm1KwNwocY+GUhNgxCGxe1Gd -n1Nyc/g= +dDEPMA0GA1UEBRMGM2U2NmUzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAyfuZhpJ/HPBGeZI/07r33+O/WSh9khGHeDuXJqQO8N6ryDaVw1mf07nIiaUY +1Bb2I62jFD8FF7P4GzGp+R4aEBmyb/TJ3vqTiUs3qES3N4ETBW/sGSFj6Zjx3+mP +xNE3DwaeGIRdpeG5GYyFV+aFo+fUgRM8fOKHdbO4sX5t/ut0/HPwUKAHKPBBnG5K +JbsNUoygucFw9zLHkFgqi3BPqMGH9YbpZarBrImNIWeuLEZg6vxxwrHrr8VkE10I +gAO5sWk6B/1ZGwIhEj1SLz3xg0RxKCGPmlYiurMACPcYJU8GogOORWg5y7l5j8aC +0q8IzXiAf/KXNq/qg6mdeEKQ1wIDAQABoycwJTAOBgNVHQ8BAf8EBAMCB4AwEwYD +VR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAB+BD3MblrTVafzE +4G+HkVMeHc8YKrDhTtuRzBrODGKQj7kvLunc5cWq7Ur02VHp1soNsdgHzaIq1sXy +5W0mteyRgSR+XD1Ig785u+ZUCeW3snWIVEb5NxB2QE8jnpDM+jvU/ZPTSxUP0xat +cC62tUqRGx/QVjawd7HiA+HggJ8ckr6TuBBrfJX+5TKPfbfRaXJpC7dmG8EsGxca +xvz2t+PDp15+de2v6W1OLTV8QejKJbf2zQyTfmFu9B4sqg18ID7Cme92GNdhwBn6 ++fpIaTMivBt8QKi+IuKRgDoSv1ob7BpzN8FKtwRoPRK06KA1bcgf8SqAJKfR81rf +a+VGdxw= -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/live/client.liveclient.key b/tlstest/mtls_internal/tls/live/client.liveclient.key index ce5f299ae28..d14c4cd7ba6 100644 --- a/tlstest/mtls_internal/tls/live/client.liveclient.key +++ b/tlstest/mtls_internal/tls/live/client.liveclient.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/zero1/client.zero1.crt b/tlstest/mtls_internal/tls/zero1/client.zero1.crt index 60cd01fce16..3a9460f8faa 100644 --- a/tlstest/mtls_internal/tls/zero1/client.zero1.crt +++ b/tlstest/mtls_internal/tls/zero1/client.zero1.crt @@ -1,19 +1,19 @@ -----BEGIN CERTIFICATE----- -MIIDLDCCAhSgAwIBAgIILqmoVd3LZ0QwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDLDCCAhSgAwIBAgIIQQBzu00MFyAwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0NzU4WhcNMjQwOTI0MTU0NzU4WjA9 +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM3WhcNMzAwMzE4MjA1ODM3WjA9 MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEOMAwGA1UEAxMFemVybzExDzAN -BgNVBAUTBjJlYTlhODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJWh -CA5Mqjv5mLX+gDwnBG7ov/9Y8MiWQQXTrDjrvScHj8iG+0s7eNeZgs5I4V9Xwjek -Tn9GUospAZZ3u9f9Y2TSMuzilbofmAigmfievXHgjq51gm6Iy3lAFgrjfocCPxrm -tdrGn/LHJRwWSyhca15mKoV/Xjq+RoXaCUWv64VtkUuT11TlOMsFlumNbKHHhIWb -ErOG8qVD5IJOnIv0ry/LhVukcHFozvseo2rweVULVdJj0aW/AsHGW4vYnf1DYrWA -uzyC2i+aB6vnfSRgpOUgzlHOsrcPsqQqfAKViIEVKcZqAXqx+DHNrT5arpX7Csh1 -hqxqJYr0EoLF9xnPVacCAwEAAaMnMCUwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQM -MAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQBflmXhsr4gClJwbMROnL1j -R6QOii8bzL4p0b26oj8FaC9YiorRHvaNvXkXEBim3upbiSuLVO148zoxQLYO0fLi -GeTTkOKqtgzVYA9WULsrbq99ZsoenFrfeC65cB1SqkLFMEznNwscIqk338ECdVD3 -ZB/3hlb2tqO75JxZcNJneZfbOdzQvLRUOujxdhvnEPDDueF3wJgDTebme8kV4OpF -+WU+eq1t8oNWufNhQZ7VEg/5BXijurSTO+F2cv1JAsdBTp3wfDGv9wlmFSZt8nra -8wOyTcvEi5jckopv5Yjo3Op34u94c5eO7iEMJ4J6Jwigeegj94fnwnBeEy4Fgwuv +BgNVBAUTBjQxMDA3MzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKTP +CR/02bd6DxK2VZAbzWO87J91lAs1e01kwFBcPJ8RMppzC8j76WfWcelrQ9eletyI +n6GtGZE8UrytPxMfLqCXy/f+Cf0QOihhlzGIr3xyPfwPxltS3s+wJxN8ZqTYkYgA +hl2Ol7o7/q2ejDguBw3NG8XY19s1uigJuJR79r6SO49Eb7nBVSOrc85x0GCWCF6V +CUKqE8MLM3KiPaeFHkajFJ/eH6zYom3twOUX3sK6jW/nsudevj1YoEYtH0kU5FYf +geRk/0zlFjUVZgnHET3SoNY/X2IY+JY/Xgh0al8jBQfqoT5gZRqwl2uVOnDFtzos +XOQgrQ7kwIdIItjR+u0CAwEAAaMnMCUwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQM +MAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQALDUCJz68GYcqMsM0vBhIF +j1z7zb7lBXIRn2kQ+HQIlUMVLZyarYdD4VqxhyEYVpl6dxdMx3jM5kr4p7J4e20w +FhB/dEnfAcs5BDrYgyH6C2uTuMFZWphBHT+bzFzRedhdFPoeDH9sXjEBbDW0/7Qk +aLI9mmqs5NvghotBjC/4v28lWzJ4v/u8DZ6whiuPj2w5zWH/e+TQ8SRJM/6JgkqF ++n2fknPjXJoYWmHSdfdXbPpb6WeRjfBHL0mVhZ2PuPnnMDf4Tk3YfTReH3jW31YS +fYi2BUNauMMRU8bpY3GGaJNfPR5EEV6XraUykT6HCVUfomxPuTy2g67z8x0fMONP -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/zero1/client.zero1.key b/tlstest/mtls_internal/tls/zero1/client.zero1.key index b69e1ce5916..f441ff0cadf 100644 --- a/tlstest/mtls_internal/tls/zero1/client.zero1.key +++ b/tlstest/mtls_internal/tls/zero1/client.zero1.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/zero1/node.crt b/tlstest/mtls_internal/tls/zero1/node.crt index b7061b5addf..c86433f5bc3 100644 --- a/tlstest/mtls_internal/tls/zero1/node.crt +++ b/tlstest/mtls_internal/tls/zero1/node.crt @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDmTCCAoGgAwIBAgIINYsAM9XRaQ0wDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDmTCCAoGgAwIBAgIIEMEUj7EHY5MwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0NzU4WhcNMjQwOTI0MTU0NzU4WjBD +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM4WhcNMzAwMzE4MjA1ODM4WjBD MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEUMBIGA1UEAxMLRGdyYXBoIE5v -ZGUxDzANBgNVBAUTBjM1OGIwMDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBANCEgxgR/bnnproj54JHLsBOIZbTzmVYxYOVD0yp7TgomIxgMTZXDm8BgZDA -ao5Surv4hhcVpXxfBFYCBpzT1dQDAANQVLI3CUVC019uCqxzDXTnimeKyuK4ilia -C7gle9f48Hg9mcIrorNNM0u3YYOk4tp65/YAgRVWBdLak8FGrS4bDsDeG74lfo0B -xkcmWeyAmzvNUWUeiG0PoKjrHGsfQxsHslJCuRkhEiZR+4VB5vBaO32K4pQPwYyR -fpQkd3fszBgS0zQYEe4ie/yr0MuVc4unG5UKDr8lVGUSFFM7rzE5skUjlRtivQK9 -oGCBcxnDQuY649ZGSzJDgQqxtwMCAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw +ZGUxDzANBgNVBAUTBjEwYzExNDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBALyCY2/YCLpPW8oDX7qZ5zCovCorlg9OGPyQXkdPrIvSUT6Zuhvdqz861avP +xc9m/KBPGxpt+LUl9HZuyKHrrI0C52iM9KKfSgCEP6FPKdD31fWB6kNRVpAkzPme +j9pKg5u4z/sjnnw9IsxH7Hj8vApEAFSGXCrzl4oax4AB52I1fQraNvp3fFzgLAuS +9bsEH2Ct9VGrWcU/lY4m+61dhZTwikz0xigvhmxArokimwirLBBr9xHCTO4vsAVh +4GVyq3LVc6gdJad+jsEVjTWr9mWaSshkaYEesGkCwh5kCNiFSBYyuXQlsOvbCz2F +bKlicjvfi/OghYg4OTpfOizhS8MCAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFkGA1UdEQRSMFCCBmFscGhh MYIGYWxwaGEyggZhbHBoYTOCBmFscGhhNIIGYWxwaGE1ggZhbHBoYTaCBXplcm8x -ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAUobg -xipGgIG1WTMWnOpcw6BsjVgMJOaOuy2xiRyhuM5G5UztI9Bq5x8jKJ5PTg6dEJ/t -ZcVBQrkCZnSKp7DIp0nYl4s+vTIXmZJAFBSUw89/GJ0/8SkYiKFiM04TOIAKLSgT -hDeRZyWsC0BM4Wy59mQYb6w+DdYqZq5PbTALbYWuxSo7/x0de2NNsv1uXaOZKoQB -Vk1tCBSoMrrkZ39Kd9NQmheugVJYJpusS/l7HFOz+/p/RHOjFgCbXOjIo3sGzzG+ -e2Xi8VzBMlqbsbQxZ6TpxcLKywMtadVtXN4KM+V5y2vlYXklczfjM0GN6MkE9K7g -Qfhv/e88MeFO+zmAbw== +ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAmNP9 +OuFO61aawrWMJTbmlweupNRDAFLIwrYZyyWR4iReUIctPf7hgEE0MwA7rlQD3ZQn +4mTKz2/wabNRzbM9RM/KSenqzggYRAxdxLJqEF2kkRUhmYuyGTQ4n3fGFyMWiCyd +h6Mj3vKKYWAbttpBQFAarWepeSNtzbCayVqmV86i0qEM8bhr9nfJ204TQhdO/VnB +unzQxPyqM7R4GKmBiEnq7rHRxrUFHa0650EiCAcPHDIoCe9uZPhhS3w+8o/z6O+s +HId6k/J7rfrfAlAvS071dOGkWQRVAzqeXaxAATT2id8RG0954t9u9G8RNCtpxyg4 +fVMZpF3ntbbn3tN8og== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/zero1/node.key b/tlstest/mtls_internal/tls/zero1/node.key index f7cb79193a9..7881caf263b 100644 --- a/tlstest/mtls_internal/tls/zero1/node.key +++ b/tlstest/mtls_internal/tls/zero1/node.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/zero2/client.zero2.crt b/tlstest/mtls_internal/tls/zero2/client.zero2.crt index e6b9404f02d..675491c6e37 100644 --- a/tlstest/mtls_internal/tls/zero2/client.zero2.crt +++ b/tlstest/mtls_internal/tls/zero2/client.zero2.crt @@ -1,19 +1,19 @@ -----BEGIN CERTIFICATE----- -MIIDLDCCAhSgAwIBAgIIU6DoorBpwLowDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDLDCCAhSgAwIBAgIIcn1E6r1fQakwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0ODAyWhcNMjQwOTI0MTU0ODAyWjA9 +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM4WhcNMzAwMzE4MjA1ODM4WjA9 MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEOMAwGA1UEAxMFemVybzIxDzAN -BgNVBAUTBjUzYTBlODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOgL -cGLSko7AXdpXUpQt8SCH0OkgIWJMZS2KrUmwfk6RblYrwhP+jwKfmW9ymx57xrjp -cv0kLXZQCkTVoSFvSdTs8+zbxv4yTd8R/a9hwuZBQDFEOvFu0BzXwvWVydSwSYom -fCun66F+/g6f8KQj03KuahcF6BngCi3waWnD2WXSgMoN61lzP7FCtEyAHikTF1lu -csJ16U540223daF6vSBTLLdV7bmpZSSydtPnbnmg2BehHCTGUyFD/aBxWJM5z/83 -C602/+0sWMobWG5TWkFwMVcXXfyoETqYQTecvIN3IYkbigu52+WUG9BXLuU7PZDL -NvvgXoCBpkcSaBGyAqkCAwEAAaMnMCUwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQM -MAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQBVzQSoHEM+fUoUesPQZjMG -5biqMCRPwlfrn+qzEitittOhi/Xz3o0M+9S4FUjhZw6oHwXlgtvC+XtbH3geteJc -3fR7R7T9T+qanxaVSsJzb31LNM4Je8KT6K8aqOsO3IbFjEx7qwk/FZsDEWeVMjs7 -Bi7nInTcf17y6B6Rx5UZukWiS5tlvfG1fuarEiaDNZV3+dDYlw6qOUcAicruiUl1 -62WQXN1ZLcfNZcaz5qZxs2F/WVQDnna/gbbUJSMfmOFtmgaFgQud5SmZiLWhXgEW -V3B6H2OVivR242cz8iwI4cV5Pw2FD2hYzqfXyTTEMEZhRGwxSs0G5bDRz5yJkHbQ +BgNVBAUTBjcyN2Q0NDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkv +sCsuSuoXs9zsze+zO6qP+ViF/7POCG7MkfDAZAew6gGV7E/6tQgEKDJC4gltTn6H +W6oPjj5mSCGF4S/TC8btU+KQXZJeAlzUfPCo10bfndfNUxWimm77cQYNW/Wp+PKx +sovRXTpJitmTK0gwM/MNGB+WWctYeOQlfFfNH1p/2flmf1CZ6OraJNmLSlLKgqFM +O6zN0a89B4nqGte10L+AoxhhIlOdXsHMlrxMn+F3L3BtXmEchPDL/aw2PwPvXSTA +BmaTkIUOk0dBcJVRu7c3yJaULizPDYIKvremH6Uog4dK392YQs1k8pCZ7kRD4foD +N1ekJxvOZ1/2DKbG5RECAwEAAaMnMCUwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQM +MAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQChr021BbkgYGiTlt3RkGSD +m3NP61d8vy6eVQ0Rp0xV0UWmio1/Yys8pXmHsyJlSs0FR9ZUZSWppD7JutQW3um3 +5ftGzmOKmYOPG4AQOZnm/Fg/Kh8pEMUyewtKtMLrgF1o+6+p5SFiDIWwrWyxb5kB +j1WxivvssqJhyA4jH7rq0e1wgnrEcm6eVDSfhwppI3rdk2qKBlRLxT1DfLHKthN1 +Joy0cQC5wNPJhXqw2UO8W3zY47ppy1qKMDho9gNiBsk0mBeWLMtdj1FB5scliVR9 +xjWtJ9R0nM/Bp7vsyOIrqluM/3+x7bCM007dZz+uI10DF0DwD+K+7DE76KtUvjK9 -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/zero2/client.zero2.key b/tlstest/mtls_internal/tls/zero2/client.zero2.key index 93082fc6495..689c0ee0da1 100644 --- a/tlstest/mtls_internal/tls/zero2/client.zero2.key +++ b/tlstest/mtls_internal/tls/zero2/client.zero2.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/zero2/node.crt b/tlstest/mtls_internal/tls/zero2/node.crt index 57588a6da9c..231805061b1 100644 --- a/tlstest/mtls_internal/tls/zero2/node.crt +++ b/tlstest/mtls_internal/tls/zero2/node.crt @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDmTCCAoGgAwIBAgIICl2T1M9dEzgwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDmTCCAoGgAwIBAgIIa5d33/QWlrgwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0ODAyWhcNMjQwOTI0MTU0ODAyWjBD +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM4WhcNMzAwMzE4MjA1ODM4WjBD MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEUMBIGA1UEAxMLRGdyYXBoIE5v -ZGUxDzANBgNVBAUTBjBhNWQ5MzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAMoJe4dOwu+zXFhHZVmv0EgpoksfUwDuGSlHpUGwRv5Q8h+OC/PdtQN6uxNZ -bLMLcO2MUZVwHtLVzWsbxgo22f3rCJhJoL+VzQ5LtPmSI8+a16FwoyqPFE5LSvy5 -ZLvKTpdG8SOrJIPQ9QQEsCBbQRULQyOjMDgWgrKop9EX2rmc4h+W1uBOg1PVzxPx -CLNpbfkSu/PQI5bW/0cTNBh3SjsD+UmBip6OSB1d6PQwXRoXxXr+QjqjoWXJSxB/ -Mwfo4aQfgUnd58WvHfTYxt0JLRsgFuLMV4/pQ9xByH4jDi67abkeApKFfBDshjYv -EIO227dY5awNxwK3+v7w4fK9NwECAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw +ZGUxDzANBgNVBAUTBjZiOTc3NzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAMFX8WOdYqqi2iG2gD+/UzAhKk1DD1kt3oPmI2+D0YsogmOfDx+F53RWbxW8 +xF83Sy6eGhWYktB3mjgBdXaASXOGrTr9fzUF+GFzew8g+Ol9gWAZydQwu+JdHkm3 +mTOGDa7Hb185W+pzYfc0/8xV0oPtpYr45yYSZXjUvr7Vjql593oGhEUf4WsAbjge +A133dL1fWbfb62XrRpU2uSf+krd4fJpR6AgdU6ZMmxQn6lTIVpaAky1RbqVrpdKt +ixZMqaZ8fT9Nxkb7nqwmuUpMTaSNAbKDze9R5NREN9m4mbTEpo3O1NzNPM8BhpGg +ioKpRXf9dj7KTtYWnrp0WaNpCGsCAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFkGA1UdEQRSMFCCBmFscGhh MYIGYWxwaGEyggZhbHBoYTOCBmFscGhhNIIGYWxwaGE1ggZhbHBoYTaCBXplcm8x -ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAVGS3 -P+Jq03vpsCkzaYgBoEXCzr8B6i4wpnD1FPsHOsNbvAx3Y05waCiNs9AigblQCVag -/EOj2psXQrULJPQt/9u5h7odO26Rl0GnChlK1g7s8GS7fLwuUGpKV6x49yAgEaYO -o1bAklvci1w/cT/druDG/Adr2J6eR2rZCp6XrfQcaNOrwWNKqSkRW5jDuOsfOnyM -XWhquNDtvmopVlu5Scx1eNNh5/NJRy6miDgIhJxoZZDSoay4X3doZy8YKNb7sFqF -JeJBlMY1EQG891lZoU/aJvKsVLvXpEiJMEUYMK9DbzjJO84ziyWcYStJCz+qEuLK -7Pf0d/5AWJPm8O2QVw== +ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAZUdK +4+YNGIyGVo1fxxBjYhtA2AEAWFD5Uhi4clJoJvK5gF1DdbpgpWET7YnAAhITPhC8 +2S3eHH0dF4qUewgsIkjOsr1tXsZ4+NGVkP7aYObw8yc06emPHwEJjGRdo35zpHbl +cLiJ9vOokKocIb3OXhvhuCDIQBXS4BnrLPZZUU2AVHnDwLAygj1DrDvnoIcMcEvZ +E6dvZCMQF2gMLBhCGYaE2KKrtpfNVqm0EPvrO6QEIa2g3idvFHKJrh1qWr/x0x72 +0Em+yyGFchAx4BVmrRNYp043NXFkM7EMUUdV9ordJAXGitZOVU3o1Ci/dmqC7Nus +MHIFb8Snb5FVG1tO/Q== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/zero2/node.key b/tlstest/mtls_internal/tls/zero2/node.key index b22fa12c46c..4a2c5f01891 100644 --- a/tlstest/mtls_internal/tls/zero2/node.key +++ b/tlstest/mtls_internal/tls/zero2/node.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/zero3/client.zero3.crt b/tlstest/mtls_internal/tls/zero3/client.zero3.crt index 313a9239f96..dcef0562fb1 100644 --- a/tlstest/mtls_internal/tls/zero3/client.zero3.crt +++ b/tlstest/mtls_internal/tls/zero3/client.zero3.crt @@ -1,19 +1,19 @@ -----BEGIN CERTIFICATE----- -MIIDLDCCAhSgAwIBAgIIH4aZspCzh2MwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDLDCCAhSgAwIBAgIIWNDtdN003+wwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0ODA2WhcNMjQwOTI0MTU0ODA2WjA9 +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM4WhcNMzAwMzE4MjA1ODM4WjA9 MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEOMAwGA1UEAxMFemVybzMxDzAN -BgNVBAUTBjFmODY5OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcH -FNRGrDFNRqObPRAcZ/ebETwvMk3h+l65KLIMfJogs9oZ9ot8hs35vTfi576hxeqm -kP9E5PZWe7Z9RQ64ox30cYtNiQbyzCDROGdmJERj9BooAquIemgciEUwiiyClPIO -6EclGI4IUjeegt82icQNfxMIMGV0mktQMwhwBqzir0pR7Jt7w60v9yPt5DxpJ25s -pXo03/Tx9AxoiHH9ligs41cKNII+BlfOOSGPFxV9Ox2uY85A3ArJFeIveVmg7OVD -5DQ9ZCo1F0q2eIZVUOo41HPeXLPJFGjgNVw8Oce1e/8Grkd1mNL2G7FPM+iAZur9 -+LgXN+HLuIrobAKq5ZUCAwEAAaMnMCUwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQM -MAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQAR4Z6655l6dvD5o32OGgnH -fZG6XtHT2mTt1LFr5ANpyPssyqXRdL1ul8G45LWUM/2RVZgr04LLgqPhC135W5Rn -KZz5vbtdHT6IMgQWWmz0BF8/tMbXX9fWEMMQYZUJveeLflbiMGZRVbyIrwhoIP7W -KAUMS8W4nAWi132jtbo8BguL0K+eG7rKq7x7wwaByCbCQ/sE7EYx5t4dEslJ2g2P -ujlb2c2EeV4Il5OoiORqEpTwycEQYzbmA0En5GTNDZvDoka3/ifh9NgaelkgrAWp -RjlZfHV6SeZFIXetTEV2seD8Y0eOUNANyN+EzSGn5VcWlmZgmrKQ+S6VuREBJp0J +BgNVBAUTBjU4ZDBlZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM3r +VLFHgfgI0kvmyQpzlUtSQgxJ4+hNWKnMmTPYqKAG3DBlAqGkFrJ/LaZ9NW4dOzIZ +NFXCH+7XVD3ZOVfSWbVzSJRNWKx9j+WjGRd0E6rnO2acl0RiFYwfTbpKVtstK+cS +GgTGiLJ2qhOrj3vjxhCrKlwve4IhB92vezTX2bOMzzfoeViz/qIFmfI5OV+tRV2m +0cZ8sgkE5dfhDNWIj9Y7AgBiqWTtdX4Sb5fDsU+xAwJoiMrKQjx6ZHFOEzZo5DqH +xRJxJbctbE+saMeu0HxWjMSE2YyrIjWA4to0CgLzQ0BZsj8kRJfByqjlk+0GIQki +TJ5szroy0D34mL4fQeUCAwEAAaMnMCUwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQM +MAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQCVFL+r7dF53wGfMu6tpCs/ +I8sgsUY3qjLtezRshlZscDOrHLIdQOsLGBVoOBsVU5d9dX2x/3c2kOD7DOcxTDd9 +voa3pp2TAwLP6QkcINNKyrSY3Y+G0XG0EsxL1ItSwaBTKpy3TOBg7B1XSdTDPTgC +U+rVa0Q6yPSkHj3+2bzfrGBf7bfikFOgkztnkbryRh6Ef3J/5JmUf8w4ILSKChW1 +3z/04ytsUv3zJpVMAl2HAwj6CATDsI+y9FHGwzb+4TL7GtVhg1iKW06ToCAqHET7 +lXXBD6DdYnitqV/lYU8/DU+Cj96Xma/O38SmdN/e4Jvay3UZyrOt4VKPmKUtH9z7 -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/zero3/client.zero3.key b/tlstest/mtls_internal/tls/zero3/client.zero3.key index 7621ee2de43..04a7cf6a996 100644 --- a/tlstest/mtls_internal/tls/zero3/client.zero3.key +++ b/tlstest/mtls_internal/tls/zero3/client.zero3.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/mtls_internal/tls/zero3/node.crt b/tlstest/mtls_internal/tls/zero3/node.crt index 786ce89848c..30895db569b 100644 --- a/tlstest/mtls_internal/tls/zero3/node.crt +++ b/tlstest/mtls_internal/tls/zero3/node.crt @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDmTCCAoGgAwIBAgIIUReNdZLwU7cwDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE +MIIDmTCCAoGgAwIBAgIIILmDs7f/QN4wDQYJKoZIhvcNAQELBQAwRjEaMBgGA1UE ChMRRGdyYXBoIExhYnMsIEluYy4xFzAVBgNVBAMTDkRncmFwaCBSb290IENBMQ8w -DQYDVQQFEwY2OGI2M2YwHhcNMjMwOTI0MTU0ODA2WhcNMjQwOTI0MTU0ODA2WjBD +DQYDVQQFEwY2OGI2M2YwHhcNMjQwOTI0MjA1ODM4WhcNMzAwMzE4MjA1ODM4WjBD MRowGAYDVQQKExFEZ3JhcGggTGFicywgSW5jLjEUMBIGA1UEAxMLRGdyYXBoIE5v -ZGUxDzANBgNVBAUTBjUxMTc4ZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAKYIvSOGJKTSb/jRvSlItFqhcSFYJQaDVGY6YJ8dhff+ifwrWJwjdoN0hwza -SD0bUFWdfjoLkBo9Mhf+/UIHs0p2ZF4NfLLgDNf0SXA90aHSwn4dTvcCaPlttxzr -N2ea4CWK4POYzCb8vzr/Usaq/DVORaWlfh653bxIaoe/RBiqRVXNw2eLxJdc/Ja1 -An3TCjba/J5u/hbqtJfbUOpTvtJFUHgWkpzrqfpJmQz0CwvlmSXVc016oZ7KClXD -1t8hTTu0M0KjTvWidl1xZxskSohlcDuZaRsHkRUMogKAwcVCjna5bwE+9yoS6Y58 -3/fVWgAO2MoNuB9puTZgJ3lNIHUCAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw +ZGUxDzANBgNVBAUTBjIwYjk4MzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBANEnVkN7QVAyAiWItA+SZaJEBd2gv1wIPjQ5+KrE0pK+icVlmnYnT9yzYmDQ +T2QdzT74WLKsYIXe1TwPvsTOcWu9hv4xNK+qucq62RBY37Cd4WApGB2opWqJl/AX +xLVyqzzxiTIQwWLOFg7qEwUBS5TBbky7VbnG+q8LaWomTczMI6mLQzIrZ3PYfd8s +RmW8S09RhKnwnXFNvCu45TDMLOWkN1Yp8RVbI0NCKfBE9k4ejQ1RzvmSXAG/attw +6aRcDrlIG7/EaOOEVQXh9UXHzeLWC5mWMRCAwiRqaa7VlUapjBdXHhWo/rJ+bHrz +7qf5ICPZsSNt7hF4RRwCzRMtgOcCAwEAAaOBjTCBijAOBgNVHQ8BAf8EBAMCBaAw HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFkGA1UdEQRSMFCCBmFscGhh MYIGYWxwaGEyggZhbHBoYTOCBmFscGhhNIIGYWxwaGE1ggZhbHBoYTaCBXplcm8x -ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAI13k -ZDbJ3HGjEY7EdN7MsfH/FzUMvyKHndPVYGnK1WgB4krN1pFNxbMdU50Ct1ZcG60z -dLAzSG3XIJe/+rAyq3gMXrIcsWxCSFKp0N/8iqZk6I6bnSbuYPo9phxk8Y8wl49i -vvaxn/mtR4BG2+y0IukzBFQPz341coWruh8Ppsh12wI9wtwCbeOorJKosJWzvYRe -r5b+e8SgWX5b1I+H+rGnUkmlqZrzId3U0YDqvKM+dZblIaDAQll428ctwZfVvC5f -/IKMzm7jpK65m+MFSqGc390hkAhr2mJ1C9cDQwMhBOVbEL1Zyh1ArCZ/7ww8NIBt -PSBLHPNem9+BBHUmqg== +ggV6ZXJvMoIFemVybzOCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEAV7Le +Z+ymrkVLIR0rrCgpaFHSJNvQ7xiWLhfeZOlOenqnmrNkJ00Iwerk0V9p8cFceQRC +QcOOTY1JSMDvUr3b/+jbRzD/LzEebx8wLF16OzCTt6xveinUsiQgNyZBP9Hq+aYv +Gy1LERrnPKvuL1+dAy9zqsRUyVei6UZ4hpuLPy1vRDfqD40S+sKFXDClReS9T1HF +R6DpTfE6OsIN9nI00GXhsIzJocuAAKZa32z2Enh11mHlrnmfJBRlpLBjtmIl6XsU +YWcIPRLS0Cz4tgL21YaWUEakFtFwR7YU2n5C5F7HVc0eCcfg5qYoqICzupnHFEhF +8VqMxU4jOQ+Jw+CkZQ== -----END CERTIFICATE----- diff --git a/tlstest/mtls_internal/tls/zero3/node.key b/tlstest/mtls_internal/tls/zero3/node.key index 7b690f77826..fab44bb6aef 100644 --- a/tlstest/mtls_internal/tls/zero3/node.key +++ b/tlstest/mtls_internal/tls/zero3/node.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tlstest/zero_https/all_routes_tls/all_routes_tls_test.go b/tlstest/zero_https/all_routes_tls/all_routes_tls_test.go index acc0a91791d..2203baeb2aa 100644 --- a/tlstest/zero_https/all_routes_tls/all_routes_tls_test.go +++ b/tlstest/zero_https/all_routes_tls/all_routes_tls_test.go @@ -15,7 +15,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) type testCase struct { diff --git a/tlstest/zero_https/no_tls/no_tls_test.go b/tlstest/zero_https/no_tls/no_tls_test.go index f85c53080bf..c4b23398a7b 100644 --- a/tlstest/zero_https/no_tls/no_tls_test.go +++ b/tlstest/zero_https/no_tls/no_tls_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgraph/v24/testutil" ) type testCase struct { diff --git a/tok/bleve.go b/tok/bleve.go index 006a37d5ea5..d4bb1ec9670 100644 --- a/tok/bleve.go +++ b/tok/bleve.go @@ -24,7 +24,7 @@ import ( "github.com/blevesearch/bleve/v2/analysis/tokenizer/unicode" "github.com/blevesearch/bleve/v2/registry" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) const unicodenormName = "unicodenorm_nfkc" diff --git a/tok/hnsw/heap.go b/tok/hnsw/heap.go index fee786dd607..78b61d9fd58 100644 --- a/tok/hnsw/heap.go +++ b/tok/hnsw/heap.go @@ -21,7 +21,7 @@ package hnsw import ( "container/heap" - c "github.com/dgraph-io/dgraph/tok/constraints" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" ) const notAUid uint64 = 0 diff --git a/tok/hnsw/helper.go b/tok/hnsw/helper.go index 6111e05f355..b3415459216 100644 --- a/tok/hnsw/helper.go +++ b/tok/hnsw/helper.go @@ -31,8 +31,8 @@ import ( "strings" "unsafe" - c "github.com/dgraph-io/dgraph/tok/constraints" - "github.com/dgraph-io/dgraph/tok/index" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" + "github.com/dgraph-io/dgraph/v24/tok/index" "github.com/getsentry/sentry-go" "github.com/pkg/errors" "github.com/viterin/vek" @@ -40,7 +40,7 @@ import ( ) const ( - Euclidian = "euclidian" + Euclidean = "euclidean" Cosine = "cosine" DotProd = "dotproduct" plError = "\nerror fetching posting list for data key: " @@ -121,8 +121,8 @@ func cosineSimilarity[T c.Float](a, b []T, floatBits int) (T, error) { // This needs to implement signature of SimilarityType[T].distanceScore // function, hence it takes in a floatBits parameter, // but doesn't actually use it. -func euclidianDistanceSq[T c.Float](a, b []T, floatBits int) (T, error) { - return applyDistanceFunction(a, b, floatBits, "euclidian distance", vek32.Distance, vek.Distance) +func euclideanDistanceSq[T c.Float](a, b []T, floatBits int) (T, error) { + return applyDistanceFunction(a, b, floatBits, "euclidean distance", vek32.Distance, vek.Distance) } // Used for distance, since shorter distance is better @@ -225,8 +225,8 @@ type SimilarityType[T c.Float] struct { func GetSimType[T c.Float](indexType string, floatBits int) SimilarityType[T] { switch { - case indexType == Euclidian: - return SimilarityType[T]{indexType: Euclidian, distanceScore: euclidianDistanceSq[T], + case indexType == Euclidean: + return SimilarityType[T]{indexType: Euclidean, distanceScore: euclideanDistanceSq[T], insortHeap: insortPersistentHeapAscending[T], isBetterScore: isBetterScoreForDistance[T]} case indexType == Cosine: return SimilarityType[T]{indexType: Cosine, distanceScore: cosineSimilarity[T], @@ -235,7 +235,7 @@ func GetSimType[T c.Float](indexType string, floatBits int) SimilarityType[T] { return SimilarityType[T]{indexType: DotProd, distanceScore: dotProduct[T], insortHeap: insortPersistentHeapDescending[T], isBetterScore: isBetterScoreForSimilarity[T]} default: - return SimilarityType[T]{indexType: Euclidian, distanceScore: euclidianDistanceSq[T], + return SimilarityType[T]{indexType: Euclidean, distanceScore: euclideanDistanceSq[T], insortHeap: insortPersistentHeapAscending[T], isBetterScore: isBetterScoreForDistance[T]} } } diff --git a/tok/hnsw/persistent_factory.go b/tok/hnsw/persistent_factory.go index 2b353e1a25b..e5a7419776d 100644 --- a/tok/hnsw/persistent_factory.go +++ b/tok/hnsw/persistent_factory.go @@ -19,11 +19,12 @@ package hnsw import ( + "fmt" "sync" - c "github.com/dgraph-io/dgraph/tok/constraints" - "github.com/dgraph-io/dgraph/tok/index" - opt "github.com/dgraph-io/dgraph/tok/options" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" + "github.com/dgraph-io/dgraph/v24/tok/index" + opt "github.com/dgraph-io/dgraph/v24/tok/options" "github.com/pkg/errors" ) @@ -80,6 +81,9 @@ func (hf *persistentIndexFactory[T]) AllowedOptions() opt.AllowedOptions { AddIntOption(EfConstructionOpt). AddIntOption(EfSearchOpt) getSimFunc := func(optValue string) (any, error) { + if optValue != Euclidean && optValue != Cosine && optValue != DotProd { + return nil, errors.New(fmt.Sprintf("Can't create a vector index for %s", optValue)) + } return GetSimType[T](optValue, hf.floatBits), nil } diff --git a/tok/hnsw/persistent_hnsw.go b/tok/hnsw/persistent_hnsw.go index f6a33585bd4..c70842df41a 100644 --- a/tok/hnsw/persistent_hnsw.go +++ b/tok/hnsw/persistent_hnsw.go @@ -25,9 +25,9 @@ import ( "time" "github.com/bits-and-blooms/bitset" - c "github.com/dgraph-io/dgraph/tok/constraints" - "github.com/dgraph-io/dgraph/tok/index" - opt "github.com/dgraph-io/dgraph/tok/options" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" + "github.com/dgraph-io/dgraph/v24/tok/index" + opt "github.com/dgraph-io/dgraph/v24/tok/options" "github.com/golang/glog" "github.com/pkg/errors" ) @@ -91,11 +91,11 @@ func (ph *persistentHNSW[T]) applyOptions(o opt.Options) error { } if !o.Specifies(EfConstructionOpt) { - o.SetOpt(EfConstructionOpt, 6*exponent) + o.SetOpt(EfConstructionOpt, 50*exponent) } if !o.Specifies(EfSearchOpt) { - o.SetOpt(EfConstructionOpt, 9*exponent) + o.SetOpt(EfSearchOpt, 30*exponent) } } @@ -104,11 +104,11 @@ func (ph *persistentHNSW[T]) applyOptions(o opt.Options) error { if err != nil { return err } - ph.efConstruction, _, err = opt.GetOpt(o, EfConstructionOpt, 18) + ph.efConstruction, _, err = opt.GetOpt(o, EfConstructionOpt, 150) if err != nil { return err } - ph.efSearch, _, err = opt.GetOpt(o, EfSearchOpt, 27) + ph.efSearch, _, err = opt.GetOpt(o, EfSearchOpt, 90) if err != nil { return err } @@ -120,7 +120,7 @@ func (ph *persistentHNSW[T]) applyOptions(o opt.Options) error { } ph.simType = okSimType } else { - ph.simType = SimilarityType[T]{indexType: Euclidian, distanceScore: euclidianDistanceSq[T], + ph.simType = SimilarityType[T]{indexType: Euclidean, distanceScore: euclideanDistanceSq[T], insortHeap: insortPersistentHeapAscending[T], isBetterScore: isBetterScoreForDistance[T]} } return nil diff --git a/tok/hnsw/persistent_hnsw_test.go b/tok/hnsw/persistent_hnsw_test.go index 11adcbea90e..24183409371 100644 --- a/tok/hnsw/persistent_hnsw_test.go +++ b/tok/hnsw/persistent_hnsw_test.go @@ -24,9 +24,9 @@ import ( "sync" "testing" - c "github.com/dgraph-io/dgraph/tok/constraints" - "github.com/dgraph-io/dgraph/tok/index" - opt "github.com/dgraph-io/dgraph/tok/options" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" + "github.com/dgraph-io/dgraph/v24/tok/index" + opt "github.com/dgraph-io/dgraph/v24/tok/options" "golang.org/x/exp/slices" ) @@ -47,7 +47,7 @@ var createpersistentHNSWTests = []createpersistentHNSWTest[float64]{ efConstruction: 1, pred: "a", indexType: "b", - expectedIndexType: Euclidian, + expectedIndexType: Euclidean, floatBits: 64, }, { @@ -55,8 +55,8 @@ var createpersistentHNSWTests = []createpersistentHNSWTest[float64]{ efSearch: 1, efConstruction: 1, pred: "a", - indexType: Euclidian, - expectedIndexType: Euclidian, + indexType: Euclidean, + expectedIndexType: Euclidean, floatBits: 64, }, { @@ -275,7 +275,7 @@ var flatPhs = []*persistentHNSW[float64]{ vecKey: ConcatStrings("0-a", VecKeyword), vecDead: ConcatStrings("0-a", VecDead), floatBits: 64, - simType: GetSimType[float64](Euclidian, 64), + simType: GetSimType[float64](Euclidean, 64), nodeAllEdges: make(map[uint64][][]uint64), }, { diff --git a/tok/hnsw/search_layer.go b/tok/hnsw/search_layer.go index 2e39472dcc6..448afa32c28 100644 --- a/tok/hnsw/search_layer.go +++ b/tok/hnsw/search_layer.go @@ -19,8 +19,8 @@ package hnsw import ( - c "github.com/dgraph-io/dgraph/tok/constraints" - "github.com/dgraph-io/dgraph/tok/index" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" + "github.com/dgraph-io/dgraph/v24/tok/index" "fmt" ) diff --git a/tok/hnsw/test_helper.go b/tok/hnsw/test_helper.go index 69f851e659e..32705ed35d6 100644 --- a/tok/hnsw/test_helper.go +++ b/tok/hnsw/test_helper.go @@ -25,7 +25,7 @@ import ( "strings" "sync" - "github.com/dgraph-io/dgraph/tok/index" + "github.com/dgraph-io/dgraph/v24/tok/index" "github.com/pkg/errors" ) diff --git a/tok/index/helper.go b/tok/index/helper.go index 2d08897c18b..c09672254b3 100644 --- a/tok/index/helper.go +++ b/tok/index/helper.go @@ -24,7 +24,7 @@ import ( "reflect" "unsafe" - c "github.com/dgraph-io/dgraph/tok/constraints" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" "github.com/golang/glog" ) diff --git a/tok/index/helper_test.go b/tok/index/helper_test.go index 0dc0ab1a7b3..d3acd9b079b 100644 --- a/tok/index/helper_test.go +++ b/tok/index/helper_test.go @@ -28,8 +28,8 @@ import ( "testing" "unsafe" - "github.com/dgraph-io/dgraph/protos/pb" - c "github.com/dgraph-io/dgraph/tok/constraints" + "github.com/dgraph-io/dgraph/v24/protos/pb" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" "github.com/viterin/vek/vek32" ) diff --git a/tok/index/index.go b/tok/index/index.go index e5c46894ba2..9c8144782ee 100644 --- a/tok/index/index.go +++ b/tok/index/index.go @@ -21,8 +21,8 @@ package index import ( "context" - c "github.com/dgraph-io/dgraph/tok/constraints" - opts "github.com/dgraph-io/dgraph/tok/options" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" + opts "github.com/dgraph-io/dgraph/v24/tok/options" ) // IndexFactory is responsible for being able to create, find, and remove diff --git a/tok/index_factory.go b/tok/index_factory.go index a3d7e425b28..fcaeb0a5110 100644 --- a/tok/index_factory.go +++ b/tok/index_factory.go @@ -19,8 +19,8 @@ package tok import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/tok/index" - opts "github.com/dgraph-io/dgraph/tok/options" + "github.com/dgraph-io/dgraph/v24/tok/index" + opts "github.com/dgraph-io/dgraph/v24/tok/options" ) // registerIndexFactory(f) will register f as both a Tokenizer and specifically diff --git a/tok/options/README.md b/tok/options/README.md index b19079de192..6f87db3f094 100644 --- a/tok/options/README.md +++ b/tok/options/README.md @@ -2,10 +2,10 @@ In Dgraph, we have the abiltity to specify an @index directive for the type vfloat. Here, we want to expand that capability to allow us to specify something like: -myAttribute @index("hnsw-euclidian","maxNeighbors":"5","maxLevels":"5","exponent":"6") +myAttribute @index("hnsw-euclidean","maxNeighbors":"5","maxLevels":"5","exponent":"6") Roughly, this should be read as: -I want to specify an HNSW-type vector index using euclidian distance as a metric +I want to specify an HNSW-type vector index using euclidean distance as a metric with maxNeighbors, maxLevels, and exponent being declared as written, and with all other parameters taking on default values. (In the case of specifying an exponent, this should affect the defaults for the other options, but that is @@ -20,10 +20,10 @@ types". Hence, we get the AllowedOptions class, which specifies a set of named options and corresponding parsers for the given name. Now, if we want to populate an Options instance based on the content of -myAttribute @index(hnsw(metric:"euclidian",exponent:"6")), +myAttribute @index(hnsw(metric:"euclidean",exponent:"6")), we collect the key-value pairs: - "metric":"euclidian" + "metric":"euclidean" "exponent":"6" And we can now invoke: diff --git a/tok/options/options.go b/tok/options/options.go index a61755bb0cb..69a02b65fbe 100644 --- a/tok/options/options.go +++ b/tok/options/options.go @@ -19,7 +19,7 @@ package options import ( "fmt" - c "github.com/dgraph-io/dgraph/tok/constraints" + c "github.com/dgraph-io/dgraph/v24/tok/constraints" ) // An Options instance maps the various named options to their specific values. diff --git a/tok/stemmers_test.go b/tok/stemmers_test.go index 996acb286ce..060725df19c 100644 --- a/tok/stemmers_test.go +++ b/tok/stemmers_test.go @@ -69,9 +69,9 @@ func TestFilterStemmers(t *testing.T) { &analysis.Token{Term: []byte("Dgraph")}, }, out: analysis.TokenStream{ - &analysis.Token{Term: []byte("deseandol")}, + &analysis.Token{Term: []byte("deseándol")}, &analysis.Token{Term: []byte("much")}, - &analysis.Token{Term: []byte("alegri")}, + &analysis.Token{Term: []byte("alegrí")}, &analysis.Token{Term: []byte("a")}, &analysis.Token{Term: []byte("las")}, &analysis.Token{Term: []byte("señorit")}, diff --git a/tok/tok.go b/tok/tok.go index bf9d4b56bc4..1e467f31086 100644 --- a/tok/tok.go +++ b/tok/tok.go @@ -28,11 +28,11 @@ import ( "golang.org/x/crypto/blake2b" "golang.org/x/text/collate" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok/hnsw" - opts "github.com/dgraph-io/dgraph/tok/options" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok/hnsw" + opts "github.com/dgraph-io/dgraph/v24/tok/options" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) // Tokenizer identifiers are unique and can't be reused. diff --git a/types/compare.go b/types/compare.go index 27d6a410ac8..973acf5c96c 100644 --- a/types/compare.go +++ b/types/compare.go @@ -16,7 +16,7 @@ package types -import "github.com/dgraph-io/dgraph/x" +import "github.com/dgraph-io/dgraph/v24/x" // CompareVals compares two values using the given comparison type. // Should be used only in filtering arg1 by comparing with arg2. diff --git a/types/conversion.go b/types/conversion.go index f4b2826e14a..8c00c898453 100644 --- a/types/conversion.go +++ b/types/conversion.go @@ -31,7 +31,7 @@ import ( "github.com/twpayne/go-geom/encoding/geojson" "github.com/twpayne/go-geom/encoding/wkb" - "github.com/dgraph-io/dgo/v230/protos/api" + "github.com/dgraph-io/dgo/v240/protos/api" ) // parseVFloat(s) will generate a slice of float64 values, diff --git a/types/facets/facet_types.go b/types/facets/facet_types.go index d3375b62d21..91ed729c280 100644 --- a/types/facets/facet_types.go +++ b/types/facets/facet_types.go @@ -17,7 +17,7 @@ package facets import ( - "github.com/dgraph-io/dgo/v230/protos/api" + "github.com/dgraph-io/dgo/v240/protos/api" ) const ( diff --git a/types/facets/utils.go b/types/facets/utils.go index 9ec6a6ab4af..4a67c2cdc3e 100644 --- a/types/facets/utils.go +++ b/types/facets/utils.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" ) // SortAndValidate sorts And validates the facets. diff --git a/types/geofilter.go b/types/geofilter.go index 26a6d932b64..52e9c6f4079 100644 --- a/types/geofilter.go +++ b/types/geofilter.go @@ -26,8 +26,8 @@ import ( geom "github.com/twpayne/go-geom" "github.com/twpayne/go-geom/xy" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) // QueryType indicates the type of geo query. diff --git a/types/s2.go b/types/s2.go index 03e629db534..8be12f2d618 100644 --- a/types/s2.go +++ b/types/s2.go @@ -24,7 +24,7 @@ import ( geom "github.com/twpayne/go-geom" "github.com/twpayne/go-geom/encoding/geojson" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) func edgesCrossPoints(l *s2.Loop, pts []s2.Point) bool { diff --git a/types/s2index.go b/types/s2index.go index 477eda8d1eb..a0b13ecc572 100644 --- a/types/s2index.go +++ b/types/s2index.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" geom "github.com/twpayne/go-geom" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) func parentCoverTokens(parents s2.CellUnion, cover s2.CellUnion) []string { diff --git a/types/scalar_types.go b/types/scalar_types.go index b3f986227c4..f9842d5ad02 100644 --- a/types/scalar_types.go +++ b/types/scalar_types.go @@ -22,7 +22,7 @@ import ( "github.com/twpayne/go-geom" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) const nanoSecondsInSec = 1000000000 diff --git a/types/sort.go b/types/sort.go index 7d59155c9da..ae85a5d8b26 100644 --- a/types/sort.go +++ b/types/sort.go @@ -24,8 +24,8 @@ import ( "golang.org/x/text/collate" "golang.org/x/text/language" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) type sortBase struct { diff --git a/types/sort_test.go b/types/sort_test.go index dba97da0a2c..faa6d1f0c2e 100644 --- a/types/sort_test.go +++ b/types/sort_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) func toString(t *testing.T, values [][]Val, vID TypeID) []string { diff --git a/upgrade/change_v20.03.0.go b/upgrade/change_v20.03.0.go index 2c5133015d8..5702feeda31 100644 --- a/upgrade/change_v20.03.0.go +++ b/upgrade/change_v20.03.0.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/upgrade/change_v20.07.0.go b/upgrade/change_v20.07.0.go index a76292d2f2d..9b91b060ad3 100644 --- a/upgrade/change_v20.07.0.go +++ b/upgrade/change_v20.07.0.go @@ -19,10 +19,10 @@ package upgrade import ( "fmt" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/upgrade/change_v21.03.0.go b/upgrade/change_v21.03.0.go index 61c4af8c22c..a9450aff0e5 100644 --- a/upgrade/change_v21.03.0.go +++ b/upgrade/change_v21.03.0.go @@ -26,12 +26,12 @@ import ( "github.com/pkg/errors" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/upgrade/upgrade.go b/upgrade/upgrade.go index cc19028f8c5..f09df27971a 100644 --- a/upgrade/upgrade.go +++ b/upgrade/upgrade.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/cobra" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/upgrade/utils.go b/upgrade/utils.go index 2c5a850041b..a162f5643f5 100644 --- a/upgrade/utils.go +++ b/upgrade/utils.go @@ -29,10 +29,10 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/graphql/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/graphql/schema" + "github.com/dgraph-io/dgraph/v24/x" ) func hasAclCreds() bool { diff --git a/upgrade/utils_test.go b/upgrade/utils_test.go index 671ad3136d8..bdd85938390 100644 --- a/upgrade/utils_test.go +++ b/upgrade/utils_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" + "github.com/dgraph-io/dgo/v240/protos/api" ) func TestGetTypeSchemaString(t *testing.T) { diff --git a/worker/acl_cache.go b/worker/acl_cache.go index 55c408c4771..8e0f7703aa5 100644 --- a/worker/acl_cache.go +++ b/worker/acl_cache.go @@ -18,8 +18,8 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/ee/acl" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee/acl" + "github.com/dgraph-io/dgraph/v24/x" ) // AclCache is the cache mapping group names to the corresponding group acls diff --git a/worker/acl_cache_test.go b/worker/acl_cache_test.go index c6a913d3173..0a57bb7fb6b 100644 --- a/worker/acl_cache_test.go +++ b/worker/acl_cache_test.go @@ -18,8 +18,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/ee/acl" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee/acl" + "github.com/dgraph-io/dgraph/v24/x" ) func TestAclCache(t *testing.T) { diff --git a/worker/aggregator.go b/worker/aggregator.go index a0e5b9ee16c..788038e6229 100644 --- a/worker/aggregator.go +++ b/worker/aggregator.go @@ -17,7 +17,7 @@ package worker import ( - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/types" ) func couldApplyAggregatorOn(agrtr string, typ types.TypeID) bool { diff --git a/worker/backup.go b/worker/backup.go index a8d62ac2c9d..6aabb13f0c4 100644 --- a/worker/backup.go +++ b/worker/backup.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) // predicateSet is a map whose keys are predicates. It is meant to be used as a set. diff --git a/worker/backup_ee.go b/worker/backup_ee.go index dc77652dba5..fb7234dcdc9 100644 --- a/worker/backup_ee.go +++ b/worker/backup_ee.go @@ -34,11 +34,11 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok/hnsw" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok/hnsw" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/worker/backup_handler.go b/worker/backup_handler.go index 530b8c3ddea..7d0c5c937a1 100644 --- a/worker/backup_handler.go +++ b/worker/backup_handler.go @@ -27,8 +27,8 @@ import ( "github.com/minio/minio-go/v6/pkg/credentials" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/worker/backup_manifest.go b/worker/backup_manifest.go index 315a811359e..b85c3d73779 100644 --- a/worker/backup_manifest.go +++ b/worker/backup_manifest.go @@ -24,8 +24,8 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) func verifyManifests(manifests []*Manifest) error { diff --git a/worker/backup_oss.go b/worker/backup_oss.go index 17b66434250..d06be88c4e7 100644 --- a/worker/backup_oss.go +++ b/worker/backup_oss.go @@ -24,8 +24,8 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) // Backup implements the Worker interface. diff --git a/worker/cdc.go b/worker/cdc.go index 361d7dc458f..b4fa056651a 100644 --- a/worker/cdc.go +++ b/worker/cdc.go @@ -22,7 +22,7 @@ package worker import ( "math" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) type CDC struct { diff --git a/worker/cdc_ee.go b/worker/cdc_ee.go index ef9b408cc73..8243900cbe4 100644 --- a/worker/cdc_ee.go +++ b/worker/cdc_ee.go @@ -28,10 +28,10 @@ import ( "github.com/pkg/errors" "go.etcd.io/etcd/raft/v3/raftpb" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/worker/config.go b/worker/config.go index 8eb09aa7a8b..96d04c19b23 100644 --- a/worker/config.go +++ b/worker/config.go @@ -22,7 +22,7 @@ import ( "github.com/golang-jwt/jwt/v5" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/worker/draft.go b/worker/draft.go index 6ed5d97489c..da488bee126 100644 --- a/worker/draft.go +++ b/worker/draft.go @@ -41,13 +41,13 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/raftwal" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) @@ -1236,7 +1236,7 @@ func (n *node) Run() { timer.Start() _, span := otrace.StartSpan(n.ctx, "Alpha.RunLoop", - otrace.WithSampler(otrace.ProbabilitySampler(0.001))) + otrace.WithSampler(otrace.ProbabilitySampler(x.WorkerConfig.Trace.GetFloat64("ratio")))) if rd.SoftState != nil { groups().triggerMembershipSync() diff --git a/worker/draft_test.go b/worker/draft_test.go index c404c52fd19..4ba38797e4f 100644 --- a/worker/draft_test.go +++ b/worker/draft_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft/v3/raftpb" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/raftwal" + "github.com/dgraph-io/dgraph/v24/x" ) func getEntryForMutation(index, startTs uint64) raftpb.Entry { diff --git a/worker/export.go b/worker/export.go index f094e7e754b..059a8126ce1 100644 --- a/worker/export.go +++ b/worker/export.go @@ -37,13 +37,13 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/worker/export_test.go b/worker/export_test.go index bb0d8ca701d..b190ed13245 100644 --- a/worker/export_test.go +++ b/worker/export_test.go @@ -37,17 +37,17 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/chunker" - "github.com/dgraph-io/dgraph/dql" - "github.com/dgraph-io/dgraph/lex" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/chunker" + "github.com/dgraph-io/dgraph/v24/dql" + "github.com/dgraph-io/dgraph/v24/lex" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/worker/graphql_schema.go b/worker/graphql_schema.go index a630a74cf33..ac312596a78 100644 --- a/worker/graphql_schema.go +++ b/worker/graphql_schema.go @@ -26,10 +26,10 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc/metadata" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/worker/groups.go b/worker/groups.go index 74bf38e5c8e..d2c0b75263b 100644 --- a/worker/groups.go +++ b/worker/groups.go @@ -30,13 +30,13 @@ import ( "github.com/pkg/errors" badgerpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/raftwal" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/worker/match.go b/worker/match.go index baf53a39c38..34e68594ce1 100644 --- a/worker/match.go +++ b/worker/match.go @@ -17,11 +17,11 @@ package worker import ( - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/x" ) // LevenshteinDistance measures the difference between two strings. diff --git a/worker/multi_tenancy.go b/worker/multi_tenancy.go index 6cd6725c45b..6d2847db290 100644 --- a/worker/multi_tenancy.go +++ b/worker/multi_tenancy.go @@ -22,8 +22,8 @@ package worker import ( "context" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) func (w *grpcWorker) DeleteNamespace(ctx context.Context, diff --git a/worker/multi_tenancy_ee.go b/worker/multi_tenancy_ee.go index 81bc6850d1f..d71d1c130a3 100644 --- a/worker/multi_tenancy_ee.go +++ b/worker/multi_tenancy_ee.go @@ -21,9 +21,9 @@ import ( "github.com/pkg/errors" "golang.org/x/sync/errgroup" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) func (w *grpcWorker) DeleteNamespace(ctx context.Context, req *pb.DeleteNsRequest) (*pb.Status, error) { diff --git a/worker/mutation.go b/worker/mutation.go index 71b3db0cbc0..53572525e5d 100644 --- a/worker/mutation.go +++ b/worker/mutation.go @@ -32,14 +32,14 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/worker/mutation_integration_test.go b/worker/mutation_integration_test.go index 0fe20706a38..249505a2d6f 100644 --- a/worker/mutation_integration_test.go +++ b/worker/mutation_integration_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/x" ) func TestPopulateMutationMap(t *testing.T) { diff --git a/worker/mutation_unit_test.go b/worker/mutation_unit_test.go index 1bfb3441f51..d2b1053e95c 100644 --- a/worker/mutation_unit_test.go +++ b/worker/mutation_unit_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) func TestConvertEdgeType(t *testing.T) { diff --git a/worker/online_restore.go b/worker/online_restore.go index 8fcf44294ac..78c07337844 100644 --- a/worker/online_restore.go +++ b/worker/online_restore.go @@ -31,12 +31,12 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4/options" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/x" ) const ( diff --git a/worker/online_restore_oss.go b/worker/online_restore_oss.go index 48582a6b863..cca2673c619 100644 --- a/worker/online_restore_oss.go +++ b/worker/online_restore_oss.go @@ -25,8 +25,8 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) func ProcessRestoreRequest(ctx context.Context, req *pb.RestoreRequest, wg *sync.WaitGroup) error { diff --git a/worker/predicate_move.go b/worker/predicate_move.go index b80f230a4e7..bbec2e42d6f 100644 --- a/worker/predicate_move.go +++ b/worker/predicate_move.go @@ -31,12 +31,12 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/tok/hnsw" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/tok/hnsw" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/worker/predicate_test.go b/worker/predicate_test.go index 5144a6583e5..7e6bd547c2c 100644 --- a/worker/predicate_test.go +++ b/worker/predicate_test.go @@ -32,9 +32,9 @@ package worker // "github.com/stretchr/testify/require" // "google.golang.org/grpc" -// "github.com/dgraph-io/dgraph/posting" -// "github.com/dgraph-io/dgraph/protos/pb" -// "github.com/dgraph-io/dgraph/x" +// "github.com/dgraph-io/dgraph/v24/posting" +// "github.com/dgraph-io/dgraph/v24/protos/pb" +// "github.com/dgraph-io/dgraph/v24/x" // ) // func checkShard(ps *badger.DB) (int, []byte) { diff --git a/worker/proposal.go b/worker/proposal.go index 677d5dbf487..1797f220430 100644 --- a/worker/proposal.go +++ b/worker/proposal.go @@ -29,10 +29,10 @@ import ( tag "go.opencensus.io/tag" otrace "go.opencensus.io/trace" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/x" ) const baseTimeout time.Duration = 4 * time.Second diff --git a/worker/queue.go b/worker/queue.go index e469cd93732..953c1fe4039 100644 --- a/worker/queue.go +++ b/worker/queue.go @@ -29,10 +29,10 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/raftwal" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/worker/restore_map.go b/worker/restore_map.go index 96e0bc5882a..14e1cca887e 100644 --- a/worker/restore_map.go +++ b/worker/restore_map.go @@ -40,14 +40,14 @@ import ( bpb "github.com/dgraph-io/badger/v4/pb" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/codec" - "github.com/dgraph-io/dgraph/ee" - "github.com/dgraph-io/dgraph/ee/enc" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/tok/hnsw" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/codec" + "github.com/dgraph-io/dgraph/v24/ee" + "github.com/dgraph-io/dgraph/v24/ee/enc" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/tok/hnsw" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/worker/restore_reduce.go b/worker/restore_reduce.go index a3cd03f29f1..8007a55c643 100644 --- a/worker/restore_reduce.go +++ b/worker/restore_reduce.go @@ -31,8 +31,8 @@ import ( "github.com/golang/snappy" "github.com/dgraph-io/badger/v4/y" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/worker/schema.go b/worker/schema.go index b5f7db5297b..94aa83c4132 100644 --- a/worker/schema.go +++ b/worker/schema.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" otrace "go.opencensus.io/trace" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/types" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/types" ) var ( diff --git a/worker/server_state.go b/worker/server_state.go index 9cb256c7acd..0e8ec5b0967 100644 --- a/worker/server_state.go +++ b/worker/server_state.go @@ -25,9 +25,9 @@ import ( "github.com/golang/glog" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/raftwal" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/raftwal" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) @@ -77,7 +77,7 @@ func InitServerState() { State.FinishCh = make(chan struct{}) State.needTs = make(chan tsReq, 100) - State.initStorage() + State.InitStorage() go State.fillTimestampRequests() groupId, err := x.ReadGroupIdFile(Config.PostingDir) @@ -103,7 +103,7 @@ func setBadgerOptions(opt badger.Options) badger.Options { return opt } -func (s *ServerState) initStorage() { +func (s *ServerState) InitStorage() { var err error if x.WorkerConfig.EncryptionKey != nil { diff --git a/worker/sink_handler.go b/worker/sink_handler.go index d1feddcce32..bdbe8b0018b 100644 --- a/worker/sink_handler.go +++ b/worker/sink_handler.go @@ -31,7 +31,7 @@ import ( "github.com/pkg/errors" "github.com/xdg/scram" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/worker/snapshot.go b/worker/snapshot.go index 676821a4051..548fcc1d04b 100644 --- a/worker/snapshot.go +++ b/worker/snapshot.go @@ -27,11 +27,11 @@ import ( "go.etcd.io/etcd/raft/v3" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/worker/snapshot_test.go b/worker/snapshot_test.go index dc29f47b144..f8fa559c696 100644 --- a/worker/snapshot_test.go +++ b/worker/snapshot_test.go @@ -31,9 +31,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/testutil" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/testutil" ) func TestSnapshot(t *testing.T) { diff --git a/worker/sort.go b/worker/sort.go index a1867dd0d13..79e3f5b4a37 100644 --- a/worker/sort.go +++ b/worker/sort.go @@ -28,13 +28,13 @@ import ( otrace "go.opencensus.io/trace" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) var emptySortResult pb.SortResult diff --git a/worker/stringfilter.go b/worker/stringfilter.go index 59cb3e27f24..0a34b35365e 100644 --- a/worker/stringfilter.go +++ b/worker/stringfilter.go @@ -21,10 +21,10 @@ import ( "github.com/golang/glog" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) type matchFunc func(types.Val, *stringFilter) bool diff --git a/worker/task.go b/worker/task.go index 91e1b28a884..3b43c207ff7 100644 --- a/worker/task.go +++ b/worker/task.go @@ -34,19 +34,19 @@ import ( "golang.org/x/sync/errgroup" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - ctask "github.com/dgraph-io/dgraph/task" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/tok/hnsw" - "github.com/dgraph-io/dgraph/tok/index" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/types/facets" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + ctask "github.com/dgraph-io/dgraph/v24/task" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/tok/hnsw" + "github.com/dgraph-io/dgraph/v24/tok/index" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/types/facets" + "github.com/dgraph-io/dgraph/v24/x" ) func invokeNetworkRequest(ctx context.Context, addr string, @@ -854,7 +854,7 @@ func (qs *queryState) handleUidPostings( } len := pl.Length(args.q.ReadTs, 0) if len == -1 { - return posting.ErrTsTooOld + return errors.Wrapf(posting.ErrTsTooOld, "While reading posting list length") } count := int64(len) if evalCompare(srcFn.fname, count, srcFn.threshold[0]) { diff --git a/worker/tokens.go b/worker/tokens.go index 13f7f2cf703..3d54f79db58 100644 --- a/worker/tokens.go +++ b/worker/tokens.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/types" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/types" + "github.com/dgraph-io/dgraph/v24/x" ) func verifyStringIndex(ctx context.Context, attr string, funcType FuncType) (string, bool) { diff --git a/worker/trigram.go b/worker/trigram.go index b012e236c59..0cc0f8c2f22 100644 --- a/worker/trigram.go +++ b/worker/trigram.go @@ -21,11 +21,11 @@ import ( cindex "github.com/google/codesearch/index" - "github.com/dgraph-io/dgraph/algo" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/tok" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/algo" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/tok" + "github.com/dgraph-io/dgraph/v24/x" ) var errRegexTooWide = errors.New( diff --git a/worker/worker.go b/worker/worker.go index 1620d78c4af..4b6ed55424b 100644 --- a/worker/worker.go +++ b/worker/worker.go @@ -34,10 +34,10 @@ import ( "github.com/dgraph-io/badger/v4" badgerpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) var ( diff --git a/worker/worker_test.go b/worker/worker_test.go index 006a2a433cd..8b8f2736794 100644 --- a/worker/worker_test.go +++ b/worker/worker_test.go @@ -30,13 +30,13 @@ import ( "github.com/stretchr/testify/require" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" - "github.com/dgraph-io/dgraph/posting" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/schema" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" + "github.com/dgraph-io/dgraph/v24/posting" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/schema" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" ) var ts uint64 @@ -172,12 +172,12 @@ func initClusterTest(t *testing.T, schemaStr string) *dgo.Dgraph { func TestVectorSchema(t *testing.T) { dg := initClusterTest(t, ` neighbour: [uid] . - vectortest: float32vector @index(hnsw(metric: "euclidian")) .`) + vectortest: float32vector @index(hnsw(metric: "euclidean")) .`) resp, err := testutil.RetryQuery(dg, "schema {}") require.NoError(t, err) - x.AssertTrue(strings.Contains(string(resp.Json), `{"predicate":"vectortest","type":"float32vector","tokenizer":["hnsw(\"metric\":\"euclidian\")"],"index_specs":[{"name":"hnsw","options":[{"key":"metric","value":"euclidian"}]}]}]`)) + x.AssertTrue(strings.Contains(string(resp.Json), `{"predicate":"vectortest","type":"float32vector","tokenizer":["hnsw(\"metric\":\"euclidean\")"],"index_specs":[{"name":"hnsw","options":[{"key":"metric","value":"euclidean"}]}]}]`)) } func TestProcessTask(t *testing.T) { diff --git a/worker/zero.go b/worker/zero.go index c09499e90e6..2af29194671 100644 --- a/worker/zero.go +++ b/worker/zero.go @@ -19,8 +19,8 @@ package worker import ( "context" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) // RemoveNodeOverNetwork sends a request to remove the given node from given group to a zero server. diff --git a/worker/zero_proxy.go b/worker/zero_proxy.go index 03a416ff0e2..c94e75ad0e5 100644 --- a/worker/zero_proxy.go +++ b/worker/zero_proxy.go @@ -6,9 +6,9 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc" - "github.com/dgraph-io/dgraph/conn" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/conn" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" ) func forwardAssignUidsToZero(ctx context.Context, in *pb.Num) (*pb.AssignedIds, error) { diff --git a/x/debug.go b/x/debug.go index 5774bbcb102..6b758b2f464 100644 --- a/x/debug.go +++ b/x/debug.go @@ -28,7 +28,7 @@ import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) func PrintRollup(plist *pb.PostingList, parts map[uint64]*pb.PostingList, baseKey []byte, ts uint64) { diff --git a/x/keys.go b/x/keys.go index 1b0986fd0be..b55f0830e45 100644 --- a/x/keys.go +++ b/x/keys.go @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) const ( diff --git a/x/minioclient.go b/x/minioclient.go index 75fc79b6ea0..c787a64555f 100644 --- a/x/minioclient.go +++ b/x/minioclient.go @@ -12,7 +12,7 @@ import ( "github.com/minio/minio-go/v6/pkg/credentials" "github.com/pkg/errors" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) const ( diff --git a/x/nodebug.go b/x/nodebug.go index 930064f2342..65424e7779d 100644 --- a/x/nodebug.go +++ b/x/nodebug.go @@ -22,7 +22,7 @@ package x import ( "github.com/dgraph-io/badger/v4" bpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgraph/protos/pb" + "github.com/dgraph-io/dgraph/v24/protos/pb" ) // PrintRollup prints information about any rollup that happen diff --git a/x/x.go b/x/x.go index 5f3ed23939f..9ef7e8997ce 100644 --- a/x/x.go +++ b/x/x.go @@ -60,8 +60,8 @@ import ( "github.com/dgraph-io/badger/v4" bo "github.com/dgraph-io/badger/v4/options" badgerpb "github.com/dgraph-io/badger/v4/pb" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgo/v230/protos/api" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgo/v240/protos/api" "github.com/dgraph-io/ristretto/z" ) diff --git a/xidmap/xidmap.go b/xidmap/xidmap.go index 81e77fa511b..3980c66a43b 100644 --- a/xidmap/xidmap.go +++ b/xidmap/xidmap.go @@ -33,9 +33,9 @@ import ( "google.golang.org/grpc/metadata" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgo/v230" - "github.com/dgraph-io/dgraph/protos/pb" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgo/v240" + "github.com/dgraph-io/dgraph/v24/protos/pb" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" ) diff --git a/xidmap/xidmap_test.go b/xidmap/xidmap_test.go index 831711c3b77..87f376bc57a 100644 --- a/xidmap/xidmap_test.go +++ b/xidmap/xidmap_test.go @@ -16,8 +16,8 @@ import ( "google.golang.org/grpc" "github.com/dgraph-io/badger/v4" - "github.com/dgraph-io/dgraph/testutil" - "github.com/dgraph-io/dgraph/x" + "github.com/dgraph-io/dgraph/v24/testutil" + "github.com/dgraph-io/dgraph/v24/x" "github.com/dgraph-io/ristretto/z" )