diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 00502c6..fd9fb17 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -18,11 +18,11 @@ jobs: # The main gotchas with this action are that it _only_ supports merge commits, # and that PRs _must_ be labelled before they're merged to trigger a backport. open-pr: - runs-on: ubuntu-18.04 + runs-on: ubuntu-24.04 if: github.event.pull_request.merged steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: fetch-depth: 0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0cdb7a..ac8cec7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,9 +10,9 @@ on: env: # Common versions - GO_VERSION: "1.16" - GOLANGCI_VERSION: "v1.31" - DOCKER_BUILDX_VERSION: "v0.4.2" + GO_VERSION: '1.23.2' + GOLANGCI_VERSION: 'v1.61.0' + DOCKER_BUILDX_VERSION: 'v0.11.2' # Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run # a step 'if env.AWS_USR' != ""', so we copy these to succinctly test whether @@ -22,13 +22,13 @@ env: jobs: detect-noop: - runs-on: ubuntu-18.04 + runs-on: ubuntu-24.04 outputs: noop: ${{ steps.noop.outputs.should_skip }} steps: - name: Detect No-op Changes id: noop - uses: fkirc/skip-duplicate-actions@v2.1.0 + uses: fkirc/skip-duplicate-actions@f75f66ce1886f00957d99748a42c724f4330bdcf # v5.3.1 with: github_token: ${{ secrets.GITHUB_TOKEN }} paths_ignore: '["**.md", "**.png", "**.jpg"]' @@ -36,105 +36,174 @@ jobs: concurrent_skipping: false lint: - runs-on: ubuntu-18.04 + runs-on: ubuntu-24.04 needs: detect-noop if: needs.detect-noop.outputs.noop != 'true' steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: true + - name: Setup Go + uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5 + with: + go-version: ${{ env.GO_VERSION }} + - name: Find the Go Build Cache id: go - run: echo "::set-output name=cache::$(go env GOCACHE)" + run: echo "::set-output name=cache::$(make go.cachedir)" - name: Cache the Go Build Cache - uses: actions/cache@v2 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 with: path: ${{ steps.go.outputs.cache }} key: ${{ runner.os }}-build-lint-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-build-lint- - name: Cache Go Dependencies - uses: actions/cache@v2 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 with: path: .work/pkg key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-pkg- - - name: Vendor Dependencies - run: make vendor vendor.check + - name: Download Go Modules + run: make modules.download modules.check - # This action uses its own setup-go, which always seems to use the latest - # stable version of Go. We could run 'make lint' to ensure our desired Go - # version, but we prefer this action because it leaves 'annotations' (i.e. - # it comments on PRs to point out linter violations). + # We could run 'make lint' to ensure our desired Go version, but we prefer + # this action because it leaves 'annotations' (i.e. it comments on PRs to + # point out linter violations). - name: Lint - uses: golangci/golangci-lint-action@v2 + uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6 with: version: ${{ env.GOLANGCI_VERSION }} + skip-cache: true # We do our own caching. check-diff: - runs-on: ubuntu-18.04 + runs-on: ubuntu-24.04 needs: detect-noop if: needs.detect-noop.outputs.noop != 'true' steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: true - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5 with: go-version: ${{ env.GO_VERSION }} - name: Find the Go Build Cache id: go - run: echo "::set-output name=cache::$(go env GOCACHE)" + run: echo "::set-output name=cache::$(make go.cachedir)" - name: Cache the Go Build Cache - uses: actions/cache@v2 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 with: path: ${{ steps.go.outputs.cache }} key: ${{ runner.os }}-build-check-diff-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-build-check-diff- - name: Cache Go Dependencies - uses: actions/cache@v2 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 with: path: .work/pkg key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-pkg- - - name: Vendor Dependencies - run: make vendor vendor.check + - name: Download Go Modules + run: make modules.download modules.check - name: Check Diff run: make check-diff + codeql: + runs-on: ubuntu-24.04 + needs: detect-noop + if: needs.detect-noop.outputs.noop != 'true' + + steps: + - name: Checkout + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 + with: + submodules: true + + - name: Setup Go + uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5 + with: + go-version: ${{ env.GO_VERSION }} + + - name: Find the Go Build Cache + id: go + run: echo "::set-output name=cache::$(make go.cachedir)" + + - name: Cache the Go Build Cache + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 + with: + path: ${{ steps.go.outputs.cache }} + key: ${{ runner.os }}-build-codeql-${{ hashFiles('**/go.sum') }} + restore-keys: ${{ runner.os }}-build-codeql- + + - name: Cache Go Dependencies + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 + with: + path: .work/pkg + key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} + restore-keys: ${{ runner.os }}-pkg- + + - name: Download Go Modules + run: make modules.download modules.check + + - name: Initialize CodeQL + uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3 + with: + languages: go + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3 + + trivy-scan-fs: + runs-on: ubuntu-24.04 + needs: detect-noop + if: needs.detect-noop.outputs.noop != 'true' + steps: + - name: Checkout + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 + with: + submodules: true + + - name: Run Trivy vulnerability scanner in fs mode + uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # 0.24.0 + with: + scan-type: 'fs' + ignore-unfixed: true + scan-ref: '.' + exit-code: '1' + severity: 'CRITICAL,HIGH' + publish-artifacts: - runs-on: ubuntu-18.04 + runs-on: ubuntu-24.04 needs: detect-noop if: needs.detect-noop.outputs.noop != 'true' steps: - name: Setup QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 with: platforms: all - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 with: version: ${{ env.DOCKER_BUILDX_VERSION }} install: true - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: true @@ -142,30 +211,30 @@ jobs: run: git fetch --prune --unshallow - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5 with: go-version: ${{ env.GO_VERSION }} - name: Find the Go Build Cache id: go - run: echo "::set-output name=cache::$(go env GOCACHE)" + run: echo "::set-output name=cache::$(make go.cachedir)" - name: Cache the Go Build Cache - uses: actions/cache@v2 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 with: path: ${{ steps.go.outputs.cache }} key: ${{ runner.os }}-build-publish-artifacts-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-build-publish-artifacts- - name: Cache Go Dependencies - uses: actions/cache@v2 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 with: path: .work/pkg key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-pkg- - - name: Vendor Dependencies - run: make vendor vendor.check + - name: Download Go Modules + run: make modules.download modules.check - name: Build Artifacts run: make -j2 build.all @@ -175,13 +244,13 @@ jobs: BUILD_ARGS: "--load" - name: Publish Artifacts to GitHub - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: output path: _output/** - name: Login to Docker - uses: docker/login-action@v1 + uses: docker/login-action@v3 if: env.DOCKER_USR != '' with: username: ${{ secrets.DOCKER_USR }} @@ -207,13 +276,13 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }} publish-test-configuration: - runs-on: ubuntu-18.04 + runs-on: ubuntu-24.04 needs: detect-noop if: needs.detect-noop.outputs.noop != 'true' steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: true fetch-depth: 0 @@ -225,27 +294,27 @@ jobs: id: tagger - name: Login to Docker - uses: docker/login-action@v1 + uses: docker/login-action@v3 if: env.DOCKER_USR != '' with: username: ${{ secrets.DOCKER_USR }} password: ${{ secrets.DOCKER_PSW }} - name: Build - uses: crossplane-contrib/xpkg-action@v0.2.0 + uses: crossplane-contrib/xpkg-action@master with: - channel: master + channel: stable version: current - command: build configuration -f testdata/configuration --name=conformance.xpkg + command: xpkg build -f testdata/configuration -o conformance.xpkg - name: Push - uses: crossplane-contrib/xpkg-action@v0.2.0 + uses: crossplane-contrib/xpkg-action@master if: env.DOCKER_USR != '' with: - command: push configuration -f testdata/configuration/conformance.xpkg crossplane/conformance-testdata-configuration:${{ steps.tagger.outputs.VERSION_TAG }} + command: xpkg push -f testdata/configuration/conformance.xpkg crossplane/conformance-testdata-configuration:${{ steps.tagger.outputs.VERSION_TAG }} - name: Push Latest - uses: crossplane-contrib/xpkg-action@v0.2.0 + uses: crossplane-contrib/xpkg-action@master if: env.DOCKER_USR != '' with: - command: push configuration -f testdata/configuration/conformance.xpkg crossplane/conformance-testdata-configuration + command: xpkg push -f testdata/configuration/conformance.xpkg crossplane/conformance-testdata-configuration diff --git a/.github/workflows/commands.yml b/.github/workflows/commands.yml index b9c504c..d1f9b58 100644 --- a/.github/workflows/commands.yml +++ b/.github/workflows/commands.yml @@ -4,7 +4,7 @@ on: issue_comment jobs: points: - runs-on: ubuntu-18.04 + runs-on: ubuntu-24.04 if: startsWith(github.event.comment.body, '/points') steps: @@ -65,7 +65,7 @@ jobs: # NOTE(negz): See also backport.yml, which is the variant that triggers on PR # merge rather than on comment. backport: - runs-on: ubuntu-18.04 + runs-on: ubuntu-24.04 if: github.event.issue.pull_request && startsWith(github.event.comment.body, '/backport') steps: - name: Extract Command @@ -80,7 +80,7 @@ jobs: permission-level: write - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: fetch-depth: 0 diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index d97099c..652b3d3 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -7,11 +7,11 @@ on: jobs: create-labels: - runs-on: ubuntu-18.04 + runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - name: Create Default Labels uses: crazy-max/ghaction-github-labeler@v3 diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml index 18af02c..9a8d463 100644 --- a/.github/workflows/promote.yml +++ b/.github/workflows/promote.yml @@ -20,11 +20,11 @@ env: jobs: promote-artifacts: - runs-on: ubuntu-18.04 + runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 with: submodules: true @@ -32,7 +32,7 @@ jobs: run: git fetch --prune --unshallow - name: Login to Docker - uses: docker/login-action@v1 + uses: docker/login-action@v3 if: env.DOCKER_USR != '' with: username: ${{ secrets.DOCKER_USR }} diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 0d0a89e..d9860a9 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -12,11 +12,11 @@ on: jobs: create-tag: - runs-on: ubuntu-18.04 + runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - name: Create Tag uses: negz/create-tag@v1 diff --git a/.gitignore b/.gitignore index 16797fc..e250a94 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ cover.out # ignore asdf local versions /.tool-versions +*.xpkg \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index c2fad47..8f84209 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "build"] path = build - url = https://github.com/upbound/build + url = https://github.com/crossplane/build diff --git a/.golangci.yml b/.golangci.yml index d477d67..deb881d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,12 +1,106 @@ run: timeout: 10m - skip-files: - - "zz_generated\\..+\\.go$" - output: # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number" - format: colored-line-number + formats: + - format: colored-line-number + path: stderr + +linters: + enable-all: true + fast: false + + disable: + # These linters are all deprecated. We disable them explicitly to avoid the + # linter logging deprecation warnings. + - execinquery + + # These are linters we'd like to enable, but that will be labor intensive to + # make existing code compliant. + - wrapcheck + - varnamelen + - testpackage + - paralleltest + - nilnil + - gomnd + + # Below are linters that lint for things we don't value. Each entry below + # this line must have a comment explaining the rationale. + + # These linters add whitespace in an attempt to make code more readable. + # This isn't a widely accepted Go best practice, and would be laborious to + # apply to existing code. + - wsl + - nlreturn + + # Warns about uses of fmt.Sprintf that are less performant than alternatives + # such as string concatenation. We value readability more than performance + # unless performance is measured to be an issue. + - perfsprint + + # This linter: + # + # 1. Requires errors.Is/errors.As to test equality. + # 2. Requires all errors be wrapped with fmt.Errorf specifically. + # 3. Disallows errors.New inline - requires package level errors. + # + # 1 is covered by other linters. 2 is covered by wrapcheck, which can also + # handle our use of crossplane-runtime's errors package. 3 is more strict + # than we need. Not every error needs to be tested for equality. + - err113 + + # These linters duplicate gocognit, but calculate complexity differently. + - gocyclo + - cyclop + - nestif + - funlen + - maintidx + + # Enforces max line length. It's not idiomatic to enforce a strict limit on + # line length in Go. We'd prefer to lint for things that often cause long + # lines, like functions with too many parameters or long parameter names + # that duplicate their types. + - lll + + # Warns about struct instantiations that don't specify every field. Could be + # useful in theory to catch fields that are accidentally omitted. Seems like + # it would have many more false positives than useful catches, though. + - exhaustruct + + # Warns about TODO comments. The rationale being they should be issues + # instead. We're okay with using TODO to track minor cleanups for next time + # we touch a particular file. + - godox + + # Warns about duplicated code blocks within the same file. Could be useful + # to prompt folks to think about whether code should be broken out into a + # function, but generally we're less worried about DRY and fine with a + # little copying. We don't want to give folks the impression that we require + # every duplicated code block to be factored out into a function. + - dupl + + # Warns about returning interfaces rather than concrete types. We do think + # it's best to avoid returning interfaces where possible. However, at the + # time of writing enabling this linter would only catch the (many) cases + # where we must return an interface. + - ireturn + + # Warns about returning named variables. We do think it's best to avoid + # returning named variables where possible. However, at the time of writing + # enabling this linter would only catch the (many) cases where returning + # named variables is useful to document what the variables are. For example + # we believe it makes sense to return (ready bool) rather than just (bool) + # to communicate what the bool means. + - nonamedreturns + + # Warns about taking the address of a range variable. This isn't an issue in + # Go v1.22 and above: https://tip.golang.org/doc/go1.22 + - exportloopref + + # Warns about using magic numbers. We do think it's best to avoid magic + # numbers, but we should not be strict about it. + - mnd linters-settings: errcheck: @@ -18,35 +112,23 @@ linters-settings: # default is false: such cases aren't reported by default. check-blank: false - # [deprecated] comma-separated list of pairs of the form pkg:regex - # the regex is used to ignore names within pkg. (default "fmt:.*"). - # see https://github.com/kisielk/errcheck#the-deprecated-method for details - ignore: fmt:.*,io/ioutil:^Read.* - govet: # report about shadowed variables - check-shadowing: false - - golint: - # minimal confidence for issues, default is 0.8 - min-confidence: 0.8 + disable: + - shadow gofmt: # simplify code: gofmt with `-s` option, true by default simplify: true - goimports: - # put imports beginning with prefix after 3rd-party packages; - # it's a comma-separated list of prefixes - local-prefixes: github.com/crossplane/conformance - - gocyclo: - # minimal code complexity to report, 30 by default (but we recommend 10-20) - min-complexity: 10 - - maligned: - # print struct with more effective memory layout or not, false by default - suggest-new: true + gci: + custom-order: true + sections: + - standard + - default + - prefix(github.com/crossplane) + - blank + - dot dupl: # tokens count to trigger issue, 150 by default @@ -67,7 +149,8 @@ linters-settings: # XXX: if you enable this setting, unused will report a lot of false-positives in text editors: # if it's called for subdir of a project it can't find funcs usages. All text editor integrations # with golangci-lint call it on a directory with the changed file. - check-exported: false + exported-is-used: true + exported-fields-are-used: true unparam: # Inspect exported functions, default is false. Set to true if no external program/library imports your code. @@ -102,65 +185,114 @@ linters-settings: rangeValCopy: sizeThreshold: 32 -linters: - enable: - - megacheck - - govet - - gocyclo - - gocritic - - interfacer - - goconst - - goimports - - gofmt # We enable this as well as goimports for its simplify mode. - - prealloc - - golint - - unconvert - - misspell - - nakedret - - presets: - - bugs - - unused - fast: false + nolintlint: + require-explanation: true + require-specific: true + + depguard: + rules: + no_third_party_test_libraries: + list-mode: lax + files: + - $test + deny: + - pkg: github.com/stretchr/testify + desc: "See https://go.dev/wiki/TestComments#assert-libraries" + - pkg: github.com/onsi/ginkgo + desc: "See https://go.dev/wiki/TestComments#assert-libraries" + - pkg: github.com/onsi/gomega + desc: "See https://go.dev/wiki/TestComments#assert-libraries" + + interfacebloat: + max: 5 + + tagliatelle: + case: + rules: + json: goCamel issues: - # Excluding configuration per-path and per-linter + # Excluding generated files. + exclude-files: + - "zz_generated\\..+\\.go$" + - ".+\\.pb.go$" + # Excluding configuration per-path and per-linter. exclude-rules: # Exclude some linters from running on tests files. - path: _test(ing)?\.go linters: - - gocyclo + - gocognit + - errcheck + - gosec + - scopelint + - unparam + - gochecknoinits + - gochecknoglobals + - containedctx + - forcetypeassert + + # Ease some gocritic warnings on test files. + - path: _test\.go + text: "(unnamedResult|exitAfterDefer)" + linters: + - gocritic + + # It's idiomatic to register Kubernetes types with a package scoped + # SchemeBuilder using an init function. + - path: apis/ + linters: + - gochecknoinits + - gochecknoglobals # These are performance optimisations rather than style issues per se. # They warn when function arguments or range values copy a lot of memory # rather than using a pointer. - text: "(hugeParam|rangeValCopy):" linters: - - gocritic + - gocritic # This "TestMain should call os.Exit to set exit code" warning is not clever # enough to notice that we call a helper method that calls os.Exit. - text: "SA3000:" linters: - - staticcheck + - staticcheck - text: "k8s.io/api/core/v1" linters: - - goimports + - goimports # This is a "potential hardcoded credentials" warning. It's triggered by # any variable with 'secret' in the same, and thus hits a lot of false # positives in Kubernetes land where a Secret is an object type. - text: "G101:" linters: - - gosec - - gas + - gosec + - gas # This is an 'errors unhandled' warning that duplicates errcheck. - text: "G104:" linters: - - gosec - - gas + - gosec + - gas + + # This is about implicit memory aliasing in a range loop. + # This is a false positive with Go v1.22 and above. + - text: "G601:" + linters: + - gosec + - gas + + # Some k8s dependencies do not have JSON tags on all fields in structs. + - path: k8s.io/ + linters: + - musttag + + # Various fields related to native patch and transform Composition are + # deprecated, but we can't drop support from Crossplane 1.x. We ignore the + # warnings globally instead of suppressing them with comments everywhere. + - text: "SA1019: .+ is deprecated: Use Composition Functions instead." + linters: + - staticcheck # Independently from option `exclude` we use default exclude patterns, # it can be disabled by this option. To list all @@ -177,7 +309,7 @@ issues: new: false # Maximum issues count per one linter. Set to 0 to disable. Default is 50. - max-per-linter: 0 + max-issues-per-linter: 0 # Maximum count of issues with the same text. Set to 0 to disable. Default is 3. - max-same-issues: 0 + max-same-issues: 0 \ No newline at end of file diff --git a/Makefile b/Makefile index 55f0553..33e1d8d 100644 --- a/Makefile +++ b/Makefile @@ -11,31 +11,30 @@ PLATFORMS ?= linux_amd64 linux_arm64 # Setup Go NPROCS ?= 1 GO_TEST_PARALLEL := $(shell echo $$(( $(NPROCS) / 2 ))) -GO_TEST_PACKAGES = $(GO_PROJECT)/crossplane $(GO_PROJECT)/provider -GO_LDFLAGS += -X $(GO_PROJECT)/internal.Version=$(VERSION) -GO_SUBDIRS += internal crossplane provider +GO_TEST_PACKAGES = $(GO_PROJECT)/tests +GO_LDFLAGS += -X $(GO_PROJECT)/internal.version=$(VERSION) +GO_SUBDIRS += internal tests GO111MODULE = on -include build/makelib/golang.mk # Setup Images DOCKER_REGISTRY = crossplane -IMAGES = conformance provider-conformance -OSBASEIMAGE = gcr.io/distroless/static:nonroot --include build/makelib/image.mk +IMAGES = conformance +OSBASEIMAGE = gcr.io/distroless/static:nonroot +-include build/makelib/imagelight.mk fallthrough: submodules @echo Initial setup complete. Running make again . . . @make -# Ensure a PR is ready for review. -reviewable: generate lint - @go mod tidy - -# Ensure branch is clean. -check-diff: reviewable - @$(INFO) checking that branch is clean - @test -z "$$(git status --porcelain)" || $(FAIL) - @$(OK) branch is clean +# NOTE(hasheddan): the build submodule currently overrides XDG_CACHE_HOME in +# order to force the Helm 3 to use the .work/helm directory. This causes Go on +# Linux machines to use that directory as the build cache as well. We should +# adjust this behavior in the build submodule because it is also causing Linux +# users to duplicate their build cache, but for now we just make it easier to +# identify its location in CI so that we cache between builds. +go.cachedir: + @go env GOCACHE # Update the submodules, such as the common build scripts. submodules: diff --git a/README.md b/README.md index c8df866..1935258 100644 --- a/README.md +++ b/README.md @@ -11,18 +11,8 @@ CROSSPLANE_VERSION=1.2 # must be pre-installed on the cluster where Sonobuoy will run. sonobuoy run --wait --plugin https://raw.githubusercontent.com/crossplane/conformance/release-${CROSSPLANE_VERSION}/plugin-crossplane.yaml sonobuoy results $(sonobuoy retrieve) -m dump - -# To determine whether a Crossplane provider is conformant. The provider must be -# pre-installed on the cluster where Sonobuoy will run, and must be the only -# provider installed on the cluster. -sonobuoy run --wait --plugin https://raw.githubusercontent.com/crossplane/conformance/release-${CROSSPLANE_VERSION}/plugin-provider.yaml -sonobuoy results $(sonobuoy retrieve) -m dump ``` -> Note that the provider conformance tests require some advanced setup. The test -> requires that at least one of each kind of managed resource exists and is -> ready (in the status condition sense). - This repository maintains a branch for each version of Crossplane that the conformance test suite supports. For example branch `release-1.2` will test conformance with Crossplane 1.2.x. The docker image that powers the conformance @@ -36,11 +26,9 @@ conformance test suite's version will not be bumped accordingly, and will remain at `1.2.0-cf.X`. In the unlikely event that a Crossplane patch release necessitates a conformance test suite update the patch version of the test suite will be updated to match the Crossplane patch version. The `image` referenced by -the [distribution] and [provider] plugins in any particular release branch is -always the authoritative conformance test for that major and minor version of -Crossplane. +the [distribution] plugin in any particular release branch is always the +authoritative conformance test for that major and minor version of Crossplane. [sonobuoy]: https://sonobuoy.io/ [crossplane]: https://crossplane.io/ [distribution]: ./plugin-crossplane.yaml -[provider]: ./plugin-provider.yaml diff --git a/build b/build index 4ea2059..d315554 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 4ea2059fb76ec1b32ba7e911a1f6e127e6f05e64 +Subproject commit d3155548bfab68fc8bea64c5526642b7b565ae33 diff --git a/cluster/images/conformance/Makefile b/cluster/images/conformance/Makefile index 4d9477b..9539dd5 100755 --- a/cluster/images/conformance/Makefile +++ b/cluster/images/conformance/Makefile @@ -7,7 +7,7 @@ IMAGE = $(BUILD_REGISTRY)/conformance-$(ARCH) # includes a busybox shell with just enough functionality to turn regular old # Go test output into the gzipped tarball of junit XML that Sonobuoy craves. OSBASEIMAGE = gcr.io/distroless/static@sha256:aea3063d00e3969d57cc8903709b58c8ee813576fbba56a977eeb915515e4ff0 -include ../../../build/makelib/image.mk +include ../../../build/makelib/imagelight.mk ifeq ($(PLATFORM),$(filter $(PLATFORM),darwin_amd64 windows_amd64)) $(info Skipping image build for $(PLATFORM)) @@ -16,7 +16,7 @@ else img.build: @$(INFO) docker build $(IMAGE) @cp Dockerfile $(IMAGE_TEMP_DIR) || $(FAIL) - @cp $(OUTPUT_DIR)/tests/$(OS)_$(ARCH)/crossplane $(IMAGE_TEMP_DIR)/conformance || $(FAIL) + @cp $(OUTPUT_DIR)/tests/$(OS)_$(ARCH)/tests $(IMAGE_TEMP_DIR)/conformance || $(FAIL) @cp ../../../run.sh $(IMAGE_TEMP_DIR) || $(FAIL) @cd $(IMAGE_TEMP_DIR) && $(SED_CMD) 's|BASEIMAGE|$(OSBASEIMAGE)|g' Dockerfile || $(FAIL) @docker build $(BUILD_ARGS) \ diff --git a/cluster/images/provider-conformance/Dockerfile b/cluster/images/provider-conformance/Dockerfile deleted file mode 100644 index b602980..0000000 --- a/cluster/images/provider-conformance/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM golang:1.16 -WORKDIR /go -RUN go get -u github.com/jstemmer/go-junit-report@v0.9.1 - -FROM BASEIMAGE -COPY --from=0 /go/bin/go-junit-report /usr/local/bin/ -ADD conformance /usr/local/bin/ -ADD run.sh /usr/local/bin/ -EXPOSE 8080 -USER 65532 -ENTRYPOINT ["run.sh"] diff --git a/cluster/images/provider-conformance/Makefile b/cluster/images/provider-conformance/Makefile deleted file mode 100755 index 1f3e740..0000000 --- a/cluster/images/provider-conformance/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -PLATFORMS := linux_amd64 linux_arm64 linux_arm -include ../../../build/makelib/common.mk - -IMAGE = $(BUILD_REGISTRY)/provider-conformance-$(ARCH) - -# Note that this is actually the 'debug' variant of the static image, which -# includes a busybox shell with just enough functionality to turn regular old -# Go test output into the gzipped tarball of junit XML that Sonobuoy craves. -OSBASEIMAGE = gcr.io/distroless/static@sha256:aea3063d00e3969d57cc8903709b58c8ee813576fbba56a977eeb915515e4ff0 -include ../../../build/makelib/image.mk - -ifeq ($(PLATFORM),$(filter $(PLATFORM),darwin_amd64 windows_amd64)) -$(info Skipping image build for $(PLATFORM)) -img.build: -else -img.build: - @$(INFO) docker build $(IMAGE) - @cp Dockerfile $(IMAGE_TEMP_DIR) || $(FAIL) - @cp $(OUTPUT_DIR)/tests/$(OS)_$(ARCH)/provider $(IMAGE_TEMP_DIR)/conformance || $(FAIL) - @cp ../../../run.sh $(IMAGE_TEMP_DIR) || $(FAIL) - @cd $(IMAGE_TEMP_DIR) && $(SED_CMD) 's|BASEIMAGE|$(OSBASEIMAGE)|g' Dockerfile || $(FAIL) - @docker build $(BUILD_ARGS) \ - --platform linux/$(ARCH) \ - -t $(IMAGE) \ - $(IMAGE_TEMP_DIR) || $(FAIL) - @$(OK) docker build $(IMAGE) -endif diff --git a/crossplane/apiextensions_test.go b/crossplane/apiextensions_test.go deleted file mode 100644 index cfcb696..0000000 --- a/crossplane/apiextensions_test.go +++ /dev/null @@ -1,895 +0,0 @@ -// Copyright 2021 The Crossplane Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package crossplane - -import ( - "context" - "fmt" - "testing" - "time" - - "github.com/google/go-cmp/cmp" - corev1 "k8s.io/api/core/v1" - kextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - kerrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/utils/pointer" - - xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" - "github.com/crossplane/crossplane-runtime/pkg/fieldpath" - "github.com/crossplane/crossplane-runtime/pkg/resource" - "github.com/crossplane/crossplane-runtime/pkg/resource/unstructured/claim" - "github.com/crossplane/crossplane-runtime/pkg/resource/unstructured/composite" - extv1 "github.com/crossplane/crossplane/apis/apiextensions/v1" - pkgv1 "github.com/crossplane/crossplane/apis/pkg/v1" - - "github.com/crossplane/conformance/internal" -) - -func TestCompositeResourceDefinition(t *testing.T) { - ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) - t.Cleanup(cancel) - - kube, err := internal.NewClient() - if err != nil { - t.Fatalf("Create client: %v", err) - } - - xrd := &extv1.CompositeResourceDefinition{ - ObjectMeta: metav1.ObjectMeta{Name: "clusterconformances.test.crossplane.io"}, - Spec: extv1.CompositeResourceDefinitionSpec{ - Group: "test.crossplane.io", - Names: kextv1.CustomResourceDefinitionNames{ - Kind: "ClusterConformance", - ListKind: "ClusterConformanceList", - Plural: "clusterconformances", - Singular: "clusterconformance", - }, - ClaimNames: &kextv1.CustomResourceDefinitionNames{ - Kind: "Conformance", - ListKind: "ConformanceList", - Plural: "conformances", - Singular: "conformance", - }, - Versions: []extv1.CompositeResourceDefinitionVersion{{ - Name: "v1alpha1", - Served: true, - Referenceable: true, - Schema: &extv1.CompositeResourceValidation{ - OpenAPIV3Schema: runtime.RawExtension{Raw: []byte("{}")}, - }, - }}, - }, - } - - if err := kube.Create(ctx, xrd); err != nil { - t.Fatalf("Create XRD %q: %v", xrd.GetName(), err) - } - t.Logf("Created XRD %q", xrd.GetName()) - - t.Cleanup(func() { - t.Logf("Cleaning up XRD %q.", xrd.GetName()) - if err := kube.Get(ctx, types.NamespacedName{Name: xrd.GetName()}, xrd); err != nil { - t.Fatalf("Get XRD %q: %v", xrd.GetName(), err) - } - if err := kube.Delete(ctx, xrd); err != nil { - t.Fatalf("Delete XRD %q: %v", xrd.GetName(), err) - } - t.Logf("Deleted XRD %q", xrd.GetName()) - }) - - t.Run("BecomesEstablishedAndOffered", func(t *testing.T) { - t.Log("Testing that the XRD's Established and Offered status conditions become 'True'.") - if err := wait.PollImmediate(10*time.Second, 90*time.Second, func() (done bool, err error) { - if err := kube.Get(ctx, types.NamespacedName{Name: xrd.GetName()}, xrd); err != nil { - return false, err - } - - if xrd.Status.GetCondition(extv1.TypeEstablished).Status != corev1.ConditionTrue { - t.Logf("XRD %q is not yet Established", xrd.GetName()) - return false, nil - } - - if xrd.Status.GetCondition(extv1.TypeOffered).Status != corev1.ConditionTrue { - t.Logf("XRD %q is not yet Offered", xrd.GetName()) - return false, nil - } - - t.Logf("XRD %q is Established and Offered", xrd.GetName()) - return true, nil - }); err != nil { - t.Errorf("XRD %q never became Established and Offered: %v", xrd.GetName(), err) - } - }) - - t.Run("CRDIsCreatedForXR", func(t *testing.T) { - t.Log("Testing that the XRD creates a conformant CRD for its XR.") - - // TODO(negz): Use Crossplane's internal/xcrd package instead? We can't - // import it because it's internal, so we replicate a bunch of it here. - // We could fork it, open it up, or move these tests into the core repo. - want := kextv1.CustomResourceDefinitionSpec{ - Group: xrd.Spec.Group, - Names: kextv1.CustomResourceDefinitionNames{ - Kind: xrd.Spec.Names.Kind, - ListKind: xrd.Spec.Names.ListKind, - Plural: xrd.Spec.Names.Plural, - Singular: xrd.Spec.Names.Singular, - Categories: []string{"composite"}, - }, - Scope: kextv1.ClusterScoped, - Versions: []kextv1.CustomResourceDefinitionVersion{{ - Name: xrd.Spec.Versions[0].Name, - Served: true, - Storage: true, - Subresources: &kextv1.CustomResourceSubresources{Status: &kextv1.CustomResourceSubresourceStatus{}}, - Schema: &kextv1.CustomResourceValidation{OpenAPIV3Schema: &kextv1.JSONSchemaProps{ - Type: "object", - Required: []string{"spec"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "apiVersion": { - Type: "string", - }, - "kind": { - Type: "string", - }, - "metadata": { - Type: "object", - }, - "spec": { - Type: "object", - Properties: map[string]kextv1.JSONSchemaProps{ - "compositionRef": { - Type: "object", - Required: []string{"name"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "name": {Type: "string"}, - }, - }, - "compositionSelector": { - Type: "object", - Required: []string{"matchLabels"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "matchLabels": { - Type: "object", - AdditionalProperties: &kextv1.JSONSchemaPropsOrBool{ - Allows: true, - Schema: &kextv1.JSONSchemaProps{Type: "string"}, - }, - }, - }, - }, - "claimRef": { - Type: "object", - Required: []string{"apiVersion", "kind", "namespace", "name"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "apiVersion": {Type: "string"}, - "kind": {Type: "string"}, - "namespace": {Type: "string"}, - "name": {Type: "string"}, - }, - }, - "resourceRefs": { - Type: "array", - Items: &kextv1.JSONSchemaPropsOrArray{ - Schema: &kextv1.JSONSchemaProps{ - Type: "object", - Properties: map[string]kextv1.JSONSchemaProps{ - "apiVersion": {Type: "string"}, - "name": {Type: "string"}, - "kind": {Type: "string"}, - }, - Required: []string{"apiVersion", "kind", "name"}, - }, - }, - }, - "writeConnectionSecretToRef": { - Type: "object", - Required: []string{"name", "namespace"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "name": {Type: "string"}, - "namespace": {Type: "string"}, - }, - }, - }, - }, - "status": { - Type: "object", - Properties: map[string]kextv1.JSONSchemaProps{ - "conditions": { - Description: "Conditions of the resource.", - Type: "array", - Items: &kextv1.JSONSchemaPropsOrArray{ - Schema: &kextv1.JSONSchemaProps{ - Type: "object", - Required: []string{"lastTransitionTime", "reason", "status", "type"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "lastTransitionTime": {Type: "string", Format: "date-time"}, - "message": {Type: "string"}, - "reason": {Type: "string"}, - "status": {Type: "string"}, - "type": {Type: "string"}, - }, - }, - }, - }, - "connectionDetails": { - Type: "object", - Properties: map[string]kextv1.JSONSchemaProps{ - "lastPublishedTime": {Type: "string", Format: "date-time"}, - }, - }, - }, - }, - }, - }, - }, - AdditionalPrinterColumns: []kextv1.CustomResourceColumnDefinition{ - { - Name: "READY", - Type: "string", - JSONPath: ".status.conditions[?(@.type=='Ready')].status", - }, - { - Name: "COMPOSITION", - Type: "string", - JSONPath: ".spec.compositionRef.name", - }, - { - Name: "AGE", - Type: "date", - JSONPath: ".metadata.creationTimestamp", - }, - }, - }}, - Conversion: &kextv1.CustomResourceConversion{Strategy: kextv1.NoneConverter}, - } - - if err := wait.PollImmediate(10*time.Second, 90*time.Second, func() (done bool, err error) { - crd := &kextv1.CustomResourceDefinition{} - if err := kube.Get(ctx, types.NamespacedName{Name: xrd.GetName()}, crd); err != nil { - if kerrors.IsNotFound(err) { - t.Logf("CRD %q has not yet been created", xrd.GetName()) - return false, nil - } - return false, err - } - - if !internal.CRDIs(crd.Status.Conditions, kextv1.Established) { - t.Logf("CRD %q is not yet Established", crd.GetName()) - return false, nil - } - - if diff := cmp.Diff(crd.Spec, want); diff != "" { - t.Errorf("CRD %q is not conformant: -want, +got:\n%s", crd.GetName(), diff) - return true, nil - } - - t.Logf("XRD %q created a conformant XR CRD", xrd.GetName()) - return true, nil - }); err != nil { - t.Errorf("CRD %q never created a conformant XR CRD: %v", xrd.GetName(), err) - } - }) - - t.Run("CRDIsCreatedForXRC", func(t *testing.T) { - t.Log("Testing that the XRD creates a conformant CRD for its XRC.") - - // TODO(negz): Use Crossplane's internal/xcrd package instead? We can't - // import it because it's internal, so we replicate a bunch of it here. - // We could fork it, open it up, or move these tests into the core repo. - want := kextv1.CustomResourceDefinitionSpec{ - Group: xrd.Spec.Group, - Names: kextv1.CustomResourceDefinitionNames{ - Kind: xrd.Spec.ClaimNames.Kind, - ListKind: xrd.Spec.ClaimNames.ListKind, - Plural: xrd.Spec.ClaimNames.Plural, - Singular: xrd.Spec.ClaimNames.Singular, - Categories: []string{"claim"}, - }, - Scope: kextv1.NamespaceScoped, - Versions: []kextv1.CustomResourceDefinitionVersion{{ - Name: xrd.Spec.Versions[0].Name, - Served: true, - Storage: true, - Subresources: &kextv1.CustomResourceSubresources{Status: &kextv1.CustomResourceSubresourceStatus{}}, - Schema: &kextv1.CustomResourceValidation{OpenAPIV3Schema: &kextv1.JSONSchemaProps{ - Type: "object", - Required: []string{"spec"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "apiVersion": { - Type: "string", - }, - "kind": { - Type: "string", - }, - "metadata": { - Type: "object", - }, - "spec": { - Type: "object", - Properties: map[string]kextv1.JSONSchemaProps{ - "compositionRef": { - Type: "object", - Required: []string{"name"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "name": {Type: "string"}, - }, - }, - "compositionSelector": { - Type: "object", - Required: []string{"matchLabels"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "matchLabels": { - Type: "object", - AdditionalProperties: &kextv1.JSONSchemaPropsOrBool{ - Allows: true, - Schema: &kextv1.JSONSchemaProps{Type: "string"}, - }, - }, - }, - }, - "resourceRef": { - Type: "object", - Required: []string{"apiVersion", "kind", "name"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "apiVersion": {Type: "string"}, - "kind": {Type: "string"}, - "name": {Type: "string"}, - }, - }, - "writeConnectionSecretToRef": { - Type: "object", - Required: []string{"name"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "name": {Type: "string"}, - }, - }, - }, - }, - "status": { - Type: "object", - Properties: map[string]kextv1.JSONSchemaProps{ - "conditions": { - Description: "Conditions of the resource.", - Type: "array", - Items: &kextv1.JSONSchemaPropsOrArray{ - Schema: &kextv1.JSONSchemaProps{ - Type: "object", - Required: []string{"lastTransitionTime", "reason", "status", "type"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "lastTransitionTime": {Type: "string", Format: "date-time"}, - "message": {Type: "string"}, - "reason": {Type: "string"}, - "status": {Type: "string"}, - "type": {Type: "string"}, - }, - }, - }, - }, - "connectionDetails": { - Type: "object", - Properties: map[string]kextv1.JSONSchemaProps{ - "lastPublishedTime": {Type: "string", Format: "date-time"}, - }, - }, - }, - }, - }, - }, - }, - AdditionalPrinterColumns: []kextv1.CustomResourceColumnDefinition{ - { - Name: "READY", - Type: "string", - JSONPath: ".status.conditions[?(@.type=='Ready')].status", - }, - { - Name: "CONNECTION-SECRET", - Type: "string", - JSONPath: ".spec.writeConnectionSecretToRef.name", - }, - { - Name: "AGE", - Type: "date", - JSONPath: ".metadata.creationTimestamp", - }, - }, - }}, - Conversion: &kextv1.CustomResourceConversion{Strategy: kextv1.NoneConverter}, - } - - if err := wait.PollImmediate(10*time.Second, 90*time.Second, func() (done bool, err error) { - name := xrd.Spec.ClaimNames.Plural + "." + xrd.Spec.Group - crd := &kextv1.CustomResourceDefinition{} - if err := kube.Get(ctx, types.NamespacedName{Name: name}, crd); err != nil { - if kerrors.IsNotFound(err) { - t.Logf("CRD %q has not yet been created", name) - return false, nil - } - return false, err - } - - if !internal.CRDIs(crd.Status.Conditions, kextv1.Established) { - t.Logf("CRD %q is not yet Established", crd.GetName()) - return false, nil - } - - if diff := cmp.Diff(crd.Spec, want); diff != "" { - t.Errorf("CRD %q is not conformant: -want, +got:\n%s", crd.GetName(), diff) - return true, nil - } - - t.Logf("XRD %q created a conformant XR CRD", xrd.GetName()) - return true, nil - }); err != nil { - t.Errorf("CRD %q never created a conformant XR CRD: %v", xrd.GetName(), err) - } - }) -} - -func TestCompositeResource(t *testing.T) { - ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) - t.Cleanup(cancel) - - kube, err := internal.NewClient() - if err != nil { - t.Fatalf("Create client: %v", err) - } - - // TODO(negz): Use the other provider-nop from contrib once it's ready. - // https://github.com/crossplane-contrib/provider-nop - prv := &pkgv1.Provider{ - ObjectMeta: metav1.ObjectMeta{Name: internal.SuiteName}, - Spec: pkgv1.ProviderSpec{ - PackageSpec: pkgv1.PackageSpec{ - Package: "negz/provider-nop:v0.1.0", - IgnoreCrossplaneConstraints: pointer.BoolPtr(true), - }, - }, - } - - if err := kube.Create(ctx, prv); err != nil { - t.Fatalf("Create provider %q: %v", prv.GetName(), err) - } - t.Logf("Created provider %q", prv.GetName()) - - t.Cleanup(func() { - t.Logf("Cleaning up provider %q.", prv.GetName()) - if err := kube.Get(ctx, types.NamespacedName{Name: prv.GetName()}, prv); resource.IgnoreNotFound(err) != nil { - t.Fatalf("Get provider %q: %v", prv.GetName(), err) - } - if err := kube.Delete(ctx, prv); resource.IgnoreNotFound(err) != nil { - t.Fatalf("Delete provider %q: %v", prv.GetName(), err) - } - t.Logf("Deleted provider %q", prv.GetName()) - }) - - xrd := &extv1.CompositeResourceDefinition{ - ObjectMeta: metav1.ObjectMeta{Name: "clusterconformances.test.crossplane.io"}, - Spec: extv1.CompositeResourceDefinitionSpec{ - Group: "test.crossplane.io", - Names: kextv1.CustomResourceDefinitionNames{ - Kind: "ClusterConformance", - ListKind: "ClusterConformanceList", - Plural: "clusterconformances", - Singular: "clusterconformance", - }, - ClaimNames: &kextv1.CustomResourceDefinitionNames{ - Kind: "Conformance", - ListKind: "ConformanceList", - Plural: "conformances", - Singular: "conformance", - }, - ConnectionSecretKeys: []string{internal.SuiteName}, - Versions: []extv1.CompositeResourceDefinitionVersion{{ - Name: "v1alpha1", - Served: true, - Referenceable: true, - Schema: &extv1.CompositeResourceValidation{ - OpenAPIV3Schema: runtime.RawExtension{Raw: []byte(`{ - "type": "object", - "properties": { - "spec": { - "type": "object", - "properties": { - "parameters": { - "type": "object", - "properties": { - "a": {"type": "string"}, - "b": {"type": "integer"}, - "c": {"type": "boolean"} - } - } - }, - "required": ["parameters"] - }, - "status": { - "type": "object", - "properties": { - "a": {"type": "string"}, - "b": {"type": "integer"}, - "c": {"type": "boolean"} - } - } - } - }`)}, - }, - }}, - }, - } - // XRDs take a while to delete, so we try a few times in case creates are - // failing due to an old XRD hanging around. - if err := wait.PollImmediate(10*time.Second, 90*time.Second, func() (done bool, err error) { - if err := kube.Create(ctx, xrd); err != nil { - t.Logf("Create XRD %q: %v", xrd.GetName(), err) - return false, nil - } - return true, nil - }); err != nil { - t.Fatalf("Create XRD %q: %v", xrd.GetName(), err) - } - t.Logf("Created XRD %q", xrd.GetName()) - - t.Cleanup(func() { - t.Logf("Cleaning up XRD %q.", xrd.GetName()) - if err := kube.Get(ctx, types.NamespacedName{Name: xrd.GetName()}, xrd); resource.IgnoreNotFound(err) != nil { - t.Fatalf("Get XRD %q: %v", xrd.GetName(), err) - } - if err := kube.Delete(ctx, xrd); resource.IgnoreNotFound(err) != nil { - t.Fatalf("Delete XRD %q: %v", xrd.GetName(), err) - } - t.Logf("Deleted XRD %q", xrd.GetName()) - }) - - t.Log("Waiting for the XRD's Established and Offered status conditions to become 'True'.") - if err := wait.PollImmediate(10*time.Second, 90*time.Second, func() (done bool, err error) { - if err := kube.Get(ctx, types.NamespacedName{Name: xrd.GetName()}, xrd); err != nil { - return false, err - } - - if xrd.Status.GetCondition(extv1.TypeEstablished).Status != corev1.ConditionTrue { - t.Logf("XRD %q is not yet Established", xrd.GetName()) - return false, nil - } - - if xrd.Status.GetCondition(extv1.TypeOffered).Status != corev1.ConditionTrue { - t.Logf("XRD %q is not yet Offered", xrd.GetName()) - return false, nil - } - - t.Logf("XRD %q is Established and Offered", xrd.GetName()) - return true, nil - }); err != nil { - t.Errorf("XRD %q never became Established and Offered: %v", xrd.GetName(), err) - } - - comp := &extv1.Composition{ - ObjectMeta: metav1.ObjectMeta{ - Name: internal.SuiteName, - Labels: map[string]string{ - "crossplane.io/test": internal.SuiteName, - }, - }, - Spec: extv1.CompositionSpec{ - CompositeTypeRef: extv1.TypeReference{ - APIVersion: "test.crossplane.io/v1alpha1", - Kind: "ClusterConformance", - }, - PatchSets: []extv1.PatchSet{ - { - // We patch our three spec fields (a string, int, and bool) - // as (string) annotations on the NopResource, exercising a - // few of our transforms. - Name: "fromcomposite", - Patches: []extv1.Patch{ - { - Type: extv1.PatchTypeFromCompositeFieldPath, - FromFieldPath: pointer.StringPtr("spec.parameters.a"), - ToFieldPath: pointer.StringPtr("metadata.annotations[nop.crossplane.io/a]"), - Transforms: []extv1.Transform{{ - Type: extv1.TransformTypeMap, - Map: &extv1.MapTransform{Pairs: map[string]string{"a": "A"}}, - }}, - Policy: &extv1.PatchPolicy{ - FromFieldPath: func() *extv1.FromFieldPathPolicy { p := extv1.FromFieldPathPolicyRequired; return &p }(), - }, - }, - { - Type: extv1.PatchTypeFromCompositeFieldPath, - FromFieldPath: pointer.StringPtr("spec.parameters.b"), - ToFieldPath: pointer.StringPtr("metadata.annotations[nop.crossplane.io/b]"), - Transforms: []extv1.Transform{ - { - Type: extv1.TransformTypeMath, - Math: &extv1.MathTransform{ - Multiply: pointer.Int64Ptr(2), - }, - }, - { - Type: extv1.TransformTypeConvert, - Convert: &extv1.ConvertTransform{ToType: "string"}, - }, - }, - Policy: &extv1.PatchPolicy{ - FromFieldPath: func() *extv1.FromFieldPathPolicy { p := extv1.FromFieldPathPolicyRequired; return &p }(), - }, - }, - { - Type: extv1.PatchTypeFromCompositeFieldPath, - FromFieldPath: pointer.StringPtr("spec.parameters.c"), - ToFieldPath: pointer.StringPtr("metadata.annotations[nop.crossplane.io/c]"), - Transforms: []extv1.Transform{{ - Type: extv1.TransformTypeConvert, - Convert: &extv1.ConvertTransform{ToType: "string"}, - }}, - Policy: &extv1.PatchPolicy{ - FromFieldPath: func() *extv1.FromFieldPathPolicy { p := extv1.FromFieldPathPolicyRequired; return &p }(), - }, - }, - }, - }, - { - // We patch the values we patched from the composite's spec - // to its status, to ensure patching works in both - // directions. - Name: "tocomposite", - Patches: []extv1.Patch{ - { - Type: extv1.PatchTypeToCompositeFieldPath, - FromFieldPath: pointer.StringPtr("metadata.annotations[nop.crossplane.io/a]"), - ToFieldPath: pointer.StringPtr("status.a"), - }, - { - Type: extv1.PatchTypeToCompositeFieldPath, - FromFieldPath: pointer.StringPtr("metadata.annotations[nop.crossplane.io/b]"), - ToFieldPath: pointer.StringPtr("status.b"), - Transforms: []extv1.Transform{ - { - Type: extv1.TransformTypeConvert, - Convert: &extv1.ConvertTransform{ToType: "int"}, - }, - }, - }, - { - Type: extv1.PatchTypeToCompositeFieldPath, - FromFieldPath: pointer.StringPtr("metadata.annotations[nop.crossplane.io/c]"), - ToFieldPath: pointer.StringPtr("status.c"), - Transforms: []extv1.Transform{{ - Type: extv1.TransformTypeConvert, - Convert: &extv1.ConvertTransform{ToType: "bool"}, - }}, - }, - }, - }, - }, - Resources: []extv1.ComposedTemplate{{ - // TODO(negz): Test anonymous resources too? - Name: pointer.StringPtr("nop"), - Base: runtime.RawExtension{Raw: []byte(fmt.Sprintf(`{ - "apiVersion": "nop.crossplane.io/v1alpha1", - "kind": "NopResource", - "spec": { - "writeConnectionSecretToRef": { - "namespace": "%s" - } - } - }`, internal.SuiteName))}, - Patches: []extv1.Patch{ - { - Type: extv1.PatchTypeFromCompositeFieldPath, - FromFieldPath: pointer.StringPtr("metadata.uid"), - ToFieldPath: pointer.StringPtr("spec.writeConnectionSecretToRef.name"), - // TODO(negz): Test all transform types. - Transforms: []extv1.Transform{ - { - Type: extv1.TransformTypeString, - String: &extv1.StringTransform{ - Format: "%s-nopresource", - }, - }, - }, - }, - { - Type: extv1.PatchTypePatchSet, - PatchSetName: pointer.StringPtr("fromcomposite"), - }, - { - Type: extv1.PatchTypePatchSet, - PatchSetName: pointer.StringPtr("tocomposite"), - }, - }, - ConnectionDetails: []extv1.ConnectionDetail{{ - Type: func() *extv1.ConnectionDetailType { v := extv1.ConnectionDetailTypeFromValue; return &v }(), - Name: pointer.StringPtr(internal.SuiteName), - Value: pointer.StringPtr(internal.SuiteName), - }}, - // TODO(negz): Test the various kinds of readiness check? - }}, - WriteConnectionSecretsToNamespace: pointer.StringPtr(internal.SuiteName), - }, - } - if err := kube.Create(ctx, comp); err != nil { - t.Fatalf("Create composition %q: %v", comp.GetName(), err) - } - t.Logf("Created composition %q", comp.GetName()) - - t.Cleanup(func() { - t.Logf("Cleaning up composition %q.", comp.GetName()) - if err := kube.Get(ctx, types.NamespacedName{Name: comp.GetName()}, comp); resource.IgnoreNotFound(err) != nil { - t.Fatalf("Get composition %q: %v", comp.GetName(), err) - } - if err := kube.Delete(ctx, comp); resource.IgnoreNotFound(err) != nil { - t.Fatalf("Delete composition %q: %v", comp.GetName(), err) - } - t.Logf("Deleted composition %q", comp.GetName()) - }) - - ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: internal.SuiteName}} - if err := kube.Create(ctx, ns); err != nil { - t.Fatalf("Create namespace %q: %v", ns.GetName(), err) - } - t.Logf("Created namespace %q", ns.GetName()) - - t.Cleanup(func() { - t.Logf("Cleaning up namespace %q.", ns.GetName()) - if err := kube.Get(ctx, types.NamespacedName{Name: ns.GetName()}, ns); resource.IgnoreNotFound(err) != nil { - t.Fatalf("Get namespace %q: %v", ns.GetName(), err) - } - if err := kube.Delete(ctx, ns); resource.IgnoreNotFound(err) != nil { - t.Fatalf("Delete namespace %q: %v", ns.GetName(), err) - } - t.Logf("Deleted namespace %q", ns.GetName()) - }) - - xrc := claim.New(claim.WithGroupVersionKind(schema.GroupVersionKind{ - Group: xrd.Spec.Group, - Version: xrd.Spec.Versions[0].Name, - Kind: xrd.Spec.ClaimNames.Kind, - })) - - xrc.SetNamespace(internal.SuiteName) - xrc.SetName(internal.SuiteName) - xrc.SetCompositionSelector(&metav1.LabelSelector{MatchLabels: map[string]string{"crossplane.io/test": internal.SuiteName}}) - xrc.SetWriteConnectionSecretToReference(&xpv1.LocalSecretReference{Name: internal.SuiteName}) - - paved := fieldpath.Pave(xrc.Object) - _ = paved.SetString("spec.parameters.a", "a") - _ = paved.SetNumber("spec.parameters.b", 1) - _ = paved.SetBool("spec.parameters.c", true) - - if err := kube.Create(ctx, xrc); err != nil { - t.Fatalf("Create claim %q: %v", xrc.GetName(), err) - } - t.Logf("Created claim %q", xrc.GetName()) - - t.Cleanup(func() { - t.Logf("Cleaning up claim %q.", xrc.GetName()) - if err := kube.Get(ctx, types.NamespacedName{Namespace: xrc.GetNamespace(), Name: xrc.GetName()}, xrc); resource.IgnoreNotFound(err) != nil { - t.Fatalf("Get claim %q: %v", xrc.GetName(), err) - } - if err := kube.Delete(ctx, xrc); resource.IgnoreNotFound(err) != nil { - t.Fatalf("Delete claim %q: %v", xrc.GetName(), err) - } - t.Logf("Deleted claim %q", xrc.GetName()) - }) - - t.Run("ClaimBecomesReady", func(t *testing.T) { - // Becoming Ready implies the claim selects a composition and creates an - // XR that successfully composes resources. - t.Log("Testing that the claim becomes Ready.") - if err := wait.PollImmediate(15*time.Second, 3*time.Minute, func() (done bool, err error) { - if err := kube.Get(ctx, types.NamespacedName{Namespace: xrc.GetNamespace(), Name: xrc.GetName()}, xrc); err != nil { - return false, err - } - - if xrc.GetCondition(xpv1.TypeReady).Status != corev1.ConditionTrue { - t.Logf("Claim %q is not yet Ready", xrc.GetName()) - return false, nil - } - - if xrc.GetResourceReference() == nil { - t.Logf("Claim %q did not populate its resource reference", xrc.GetName()) - return false, nil - } - - paved := fieldpath.Pave(xrc.Object) - if a, _ := paved.GetString("status.a"); a != "A" { - t.Logf("Claim %q status.a: want %q, got %q", xrc.GetName(), "A", a) - return false, nil - } - if b, _ := paved.GetInteger("status.b"); b != 2 { - t.Logf("Claim %q status.b: want %d, got %d", xrc.GetName(), 2, b) - return false, nil - } - if c, _ := paved.GetBool("status.c"); c != true { - t.Logf("Claim %q status.c: want %t, got %t", xrc.GetName(), true, c) - return false, nil - } - - // TODO(negz): Ensure the claim's compositionRef is set once - // https://github.com/crossplane/crossplane/issues/2263 is fixed. - - t.Logf("Claim %q is Ready", xrc.GetName()) - return true, nil - }); err != nil { - t.Errorf("Claim %q never became Ready: %v", xrc.GetName(), err) - } - }) - - t.Run("ClaimHasConnectionSecret", func(t *testing.T) { - t.Log("Testing that the claim writes the expected connection secret.") - - s := &corev1.Secret{} - if err := kube.Get(ctx, types.NamespacedName{Namespace: xrc.GetNamespace(), Name: internal.SuiteName}, s); err != nil { - t.Errorf("Get secret %q: %v", internal.SuiteName, err) - } - - want := map[string][]byte{internal.SuiteName: []byte(internal.SuiteName)} - if diff := cmp.Diff(want, s.Data); diff != "" { - t.Errorf("Claim %q connection secret %q: -want, +got\n%s", xrc.GetName(), s.GetName(), diff) - } - }) - - xrSecretRef := &xpv1.SecretReference{} - t.Run("CompositeBecomesReady", func(t *testing.T) { - t.Log("Testing that the composite resource becomes Ready.") - - xr := composite.New(composite.WithGroupVersionKind(schema.GroupVersionKind{ - Group: xrd.Spec.Group, - Version: xrd.Spec.Versions[0].Name, - Kind: xrd.Spec.Names.Kind, - })) - - if err := wait.PollImmediate(15*time.Second, 3*time.Minute, func() (done bool, err error) { - if err := kube.Get(ctx, types.NamespacedName{Name: xrc.GetResourceReference().Name}, xr); err != nil { - return false, err - } - - if xr.GetCondition(xpv1.TypeReady).Status != corev1.ConditionTrue { - t.Logf("Composite resource %q is not yet Ready", xr.GetName()) - return false, nil - } - - xrSecretRef = xr.GetWriteConnectionSecretToReference() - if xrSecretRef == nil { - t.Logf("Composite resource %q does not specify a connection secret", xr.GetName()) - return false, nil - } - - t.Logf("Composite resource %q is Ready", xr.GetName()) - return true, nil - }); err != nil { - t.Errorf("Composite resource %q never became Ready: %v", xr.GetName(), err) - } - }) - t.Run("CompositeHasConnectionSecret", func(t *testing.T) { - t.Log("Testing that the composite resource writes the expected connection secret.") - - s := &corev1.Secret{} - if err := kube.Get(ctx, types.NamespacedName{Namespace: xrSecretRef.Namespace, Name: xrSecretRef.Name}, s); err != nil { - t.Errorf("Get secret %q: %v", internal.SuiteName, err) - } - - want := map[string][]byte{internal.SuiteName: []byte(internal.SuiteName)} - if diff := cmp.Diff(want, s.Data); diff != "" { - t.Errorf("Composite resource %q connection secret %q: -want, +got\n%s", xrc.GetResourceReference().Name, s.GetName(), diff) - } - }) -} diff --git a/go.mod b/go.mod index b988d3e..4b0bf14 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,81 @@ module github.com/crossplane/conformance -go 1.16 +go 1.23 + +toolchain go1.23.2 require ( - github.com/crossplane/crossplane v1.2.0 - github.com/crossplane/crossplane-runtime v0.13.0 + github.com/crossplane/crossplane v1.17.0 + github.com/crossplane/crossplane-runtime v1.17.0 github.com/google/addlicense v0.0.0-20210428195630-6d92264d7170 - github.com/google/go-cmp v0.5.2 + github.com/google/go-cmp v0.6.0 github.com/pkg/errors v0.9.1 - k8s.io/api v0.20.2 - k8s.io/apiextensions-apiserver v0.20.1 - k8s.io/apimachinery v0.20.2 - k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 - sigs.k8s.io/controller-runtime v0.8.3 + k8s.io/api v0.30.0 + k8s.io/apiextensions-apiserver v0.30.0 + k8s.io/apimachinery v0.30.0 + k8s.io/utils v0.0.0-20230726121419-3b25d923346b + sigs.k8s.io/controller-runtime v0.18.2 +) + +require ( + dario.cat/mergo v1.0.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/emicklei/go-restful/v3 v3.11.0 // indirect + github.com/evanphx/json-patch/v5 v5.9.0 // indirect + github.com/fatih/color v1.16.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonreference v0.20.2 // indirect + github.com/go-openapi/swag v0.22.3 // indirect + github.com/gobuffalo/flect v1.0.2 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/imdario/mergo v0.3.16 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.5.0 // indirect + github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/procfs v0.12.0 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect + github.com/spf13/afero v1.11.0 // indirect + github.com/spf13/cobra v1.8.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect + golang.org/x/mod v0.17.0 // indirect + golang.org/x/net v0.24.0 // indirect + golang.org/x/oauth2 v0.17.0 // indirect + golang.org/x/sync v0.7.0 // indirect + golang.org/x/sys v0.19.0 // indirect + golang.org/x/term v0.19.0 // indirect + golang.org/x/text v0.14.0 // indirect + golang.org/x/time v0.5.0 // indirect + golang.org/x/tools v0.20.0 // indirect + gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/client-go v0.30.0 // indirect + k8s.io/klog/v2 v2.120.1 // indirect + k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect + sigs.k8s.io/controller-tools v0.14.0 // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index 0cf036f..5de33ff 100644 --- a/go.sum +++ b/go.sum @@ -1,1011 +1,246 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -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.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= -cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -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= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Azure/azure-sdk-for-go v43.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= -github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= -github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= -github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= -github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= -github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= -github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= -github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= -github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= -github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= -github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= -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/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317/go.mod h1:DF8FZRxMHMGv/vP2lQP6h+dYzzjpuRn24VeRiYn3qjQ= -github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= -github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= -github.com/alecthomas/kong v0.2.11/go.mod h1:kQOmtJgV+Lb4aj+I2LEn40cbtawdWJ9Y8QLq+lElKxE= -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/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= -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/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= -github.com/aws/aws-sdk-go v1.28.2/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.31.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -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= +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= 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/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -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/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/stargz-snapshotter/estargz v0.0.0-20201223015020-a9a0c2d64694/go.mod h1:E9uVkkBKf0EaC39j2JVW9EzdNhYvpz6eQIjILHebruk= -github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM= -github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -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/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -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-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -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/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +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/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/crossplane/crossplane v1.2.0 h1:bln+rsoo824tG4guwfp3wqqPld3AQtGtqbITN0OtDfw= -github.com/crossplane/crossplane v1.2.0/go.mod h1:RsojcoV2wRhR/6tpNzfglQOJQi3r77FXQLua212kWrg= -github.com/crossplane/crossplane-runtime v0.13.0 h1:TFeItxtW32/fETB9be0AsEha/ur0bbrtQRocC+Jd6RI= -github.com/crossplane/crossplane-runtime v0.13.0/go.mod h1:Bc54/KBvV9ld/tvervcnhcSzk13FYguTqmYt72Mybps= -github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/crossplane/crossplane v1.17.0 h1:Q7crMfnLd6DJmcORNjuB5D3QnJajliaQn3ACXMKK4NI= +github.com/crossplane/crossplane v1.17.0/go.mod h1:AoDLpKyrFqNDnDPkFDY2Csaqv+c0EyVyqdUDJcP9Xk8= +github.com/crossplane/crossplane-runtime v1.17.0 h1:y+GvxPT1M9s8BKt2AeZJdd2d6pg2xZeCO6LiR+VxEF8= +github.com/crossplane/crossplane-runtime v1.17.0/go.mod h1:vtglCrnnbq2HurAk9yLHa4qS0bbnCxaKL7C21cQcB/0= 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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= -github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v0.0.0-20200915230204-cd8016b6bcc5/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v17.12.0-ce-rc1.0.20200926000217-2617742802f6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= -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/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= -github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -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/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses= -github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -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-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -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-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc= -github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/zapr v0.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4= -github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU= -github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= -github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= -github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= -github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= -github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= -github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= -github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= -github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= -github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk= -github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= -github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= -github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= -github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= -github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= -github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= -github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= -github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= -github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= -github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= -github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= -github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/flect v0.1.5/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= -github.com/gobuffalo/flect v0.2.0/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= -github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -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= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= +github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls= +github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= +github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +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/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +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/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= +github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= +github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= +github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= +github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= +github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/gobuffalo/flect v1.0.2 h1:eqjPGSo2WmjgY2XlpGwo2NXgL3RucAKo4k4qQMNA5sA= +github.com/gobuffalo/flect v1.0.2/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +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/google/addlicense v0.0.0-20210428195630-6d92264d7170 h1:jLUa4MO3autxlRJmC4KubeE5QGIb5JqW9oEaqYTb/fA= github.com/google/addlicense v0.0.0-20210428195630-6d92264d7170/go.mod h1:EMjYTRimagHs1FwlIqKyX3wAM0u3rA+McvlIIWmSamA= -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/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= -github.com/google/go-cmp v0.4.0/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.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-containerregistry v0.4.1-0.20210128200529-19c2b639fab1/go.mod h1:GU9FUA/X9rd2cV3ZoUNaWihp27tki6/38EsVzL2Dyzc= -github.com/google/go-containerregistry v0.4.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= -github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20210330174036-3259211c1f24/go.mod h1:n9wRxRfKkHy6ZFyj0jJQHw11P+mGLnED4sqegwrXxDk= -github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= +github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9/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/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= -github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -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= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -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/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= -github.com/google/uuid v1.1.2/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/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= -github.com/googleapis/gnostic v0.5.1 h1:A8Yhf6EtqTv9RMsU6MQTyrtV1TjWlR6xU9BsZIwuTCM= -github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= -github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/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.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -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/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-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= -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-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -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-version v1.1.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/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -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/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA= -github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= -github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -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/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -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/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/pprof v0.0.0-20240422182052-72c8669ad3e7 h1:3q13T5NW3mlTJZM6B5UAsf2N5NYFbYWIyI3W8DlvBDU= +github.com/google/pprof v0.0.0-20240422182052-72c8669ad3e7/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +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/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= +github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +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/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/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -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.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +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/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= 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/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -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-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -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= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +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.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +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/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +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/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.1 h1:jMU0WaQrP0a/YAEq8eJmJKjBoMs+pClEr1vDMlM/Do4= -github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA= -github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= -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/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -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/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= +github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= +github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk= +github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -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/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/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.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -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.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -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-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -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.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4= -github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= -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/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= -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/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= -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/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -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.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -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.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.4.1 h1:asw9sl74539yqavKaglDM5hFpdJVK0Y5Dr/JOgQ89nQ= -github.com/spf13/afero v1.4.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= +github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= +github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= +github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= 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.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= 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 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/vdemeester/k8s-pkg-credentialprovider v1.19.7/go.mod h1:K2nMO14cgZitdwBqdQps9tInJgcaXcU/7q5F59lpbNI= -github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= -github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= -github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -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/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/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod h1:skWido08r9w6Lq/w70DO5XYIKMu4QFu1+4VsqLQuJy8= -go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= -go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -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.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= -go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= -go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.8.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM= -go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= -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-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +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.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +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-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/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-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -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/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= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -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 h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/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= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY= +golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= 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/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -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-20181005035420-146acd28ed58/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-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-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= 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-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/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-20191004110552-13f9640d40b9/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= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/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-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -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 h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -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= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/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-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= +golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -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-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/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/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-20190321052220-f7bb7a8bee54/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-20190616124812-15dcb6c0061f/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-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/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= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/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-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= +golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= 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.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.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -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.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s= -golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/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-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= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -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-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= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= -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-20190920225731-5eefd052ad72/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-20191108193012-7d206e10da11/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= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3 h1:DywqrEscRX7O2phNjkT0L6lhHKGBoMLCNX+XcAe7t6s= -golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= 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= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/jsonpatch/v2 v2.1.0 h1:Phva6wqu+xR//Njw6iorylFFgn/z547tw5Ne3HZPQ+k= -gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= -gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= -gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= -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= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.1-0.20200106000736-b8fc810ca6b5/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.1/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -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 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -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-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= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -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.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/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= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -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= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= +gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= +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.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -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/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +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/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -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.2.8/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-20190905181640-827449938966/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= -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= -k8s.io/api v0.0.0-20190918155943-95b840bb6a1f/go.mod h1:uWuOHnjmNrtQomJrvEBg0c0HRNyQ+8KTEERVsK0PW48= -k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= -k8s.io/api v0.19.7/go.mod h1:KTryDUT3l6Mtv7K2J2486PNL9DBns3wOYTkGR+iz63Y= -k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= -k8s.io/api v0.20.2 h1:y/HR22XDZY3pniu9hIFDLpUCPq2w5eQ6aV/VFQ7uJMw= -k8s.io/api v0.20.2/go.mod h1:d7n6Ehyzx+S+cE3VhTGfVNNqtGc/oL9DCdYYahlurV8= -k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783/go.mod h1:xvae1SZB3E17UpV59AWc271W/Ph25N+bjPyR63X6tPY= -k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY= -k8s.io/apiextensions-apiserver v0.20.1 h1:ZrXQeslal+6zKM/HjDXLzThlz/vPSxrfK3OqL8txgVQ= -k8s.io/apiextensions-apiserver v0.20.1/go.mod h1:ntnrZV+6a3dB504qwC5PN/Yg9PBiDNt1EVqbW2kORVk= -k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= -k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= -k8s.io/apimachinery v0.19.7/go.mod h1:6sRbGRAVY5DOCuZwB5XkqguBqpqLU6q/kOaOdk29z6Q= -k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.20.2 h1:hFx6Sbt1oG0n6DZ+g4bFt5f6BoMkOjKWsQFu077M3Vg= -k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad/go.mod h1:XPCXEwhjaFN29a8NldXA901ElnKeKLrLtREO9ZhFyhg= -k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw= -k8s.io/apiserver v0.19.7/go.mod h1:DmWVQggNePspa+vSsVytVbS3iBSDTXdJVt0akfHacKk= -k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= -k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90/go.mod h1:J69/JveO6XESwVgG53q3Uz5OSfgsv4uxpScmmyYOOlk= -k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU= -k8s.io/client-go v0.19.7/go.mod h1:iytGI7S3kmv6bWnn+bSQUE4VlrEi4YFssvVB7J7Hvqg= -k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= -k8s.io/client-go v0.20.2 h1:uuf+iIAbfnCSw8IGAv/Rg0giM+2bOzHLOsbbrwrdhNQ= -k8s.io/client-go v0.20.2/go.mod h1:kH5brqWqp7HDxUFKoEgiI4v8G1xzbe9giaCenUWJzgE= -k8s.io/cloud-provider v0.19.7/go.mod h1:aO/VpUwkG+JQN7ZXc5WBLZ5NBXuq/Y5B6vri6U94PZ8= -k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE= -k8s.io/code-generator v0.18.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= -k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= -k8s.io/code-generator v0.20.1/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg= -k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090/go.mod h1:933PBGtQFJky3TEwYx4aEPZ4IxqhWh3R6DCmzqIn1hA= -k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM= -k8s.io/component-base v0.19.7/go.mod h1:YX8spPBgwl3I6UGcSdQiEMAqRMSUsGQOW7SEr4+Qa3U= -k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= -k8s.io/component-base v0.20.2 h1:LMmu5I0pLtwjpp5009KLuMGFqSc2S2isGw8t1hpYKLE= -k8s.io/component-base v0.20.2/go.mod h1:pzFtCiwe/ASD0iV7ySMu8SYVJjCapNM9bjvk7ptpKh0= -k8s.io/csi-translation-lib v0.19.7/go.mod h1:WghizPQuzuygr2WdpgN2EjcNpDD2V4EAbxFXsgHgSBk= -k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= -k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI= -k8s.io/klog/v2 v2.5.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= -k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= -k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= -k8s.io/kube-openapi v0.0.0-20210113233702-8566a335510f h1:ZcWbnalfwIst131Zff7dGd1HQdt+NA9q7z9Fi0vbsHY= -k8s.io/kube-openapi v0.0.0-20210113233702-8566a335510f/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= -k8s.io/legacy-cloud-providers v0.19.7/go.mod h1:dsZk4gH9QIwAtHQ8CK0Ps257xlfgoXE3tMkMNhW2xDU= -k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 h1:0T5IaWHO3sJTEmCP6mUlBvMukxPKUQWqiI/YuiBNMiQ= -k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= -modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= -modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= -modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= -modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/controller-runtime v0.8.0/go.mod h1:v9Lbj5oX443uR7GXYY46E0EE2o7k2YxQ58GxVNeXSW4= -sigs.k8s.io/controller-runtime v0.8.3 h1:GMHvzjTmaWHQB8HadW+dIvBoJuLvZObYJ5YoZruPRao= -sigs.k8s.io/controller-runtime v0.8.3/go.mod h1:U/l+DUopBc1ecfRZ5aviA9JDmGFQKvLf5YkZNx2e0sU= -sigs.k8s.io/controller-tools v0.2.4/go.mod h1:m/ztfQNocGYBgTTCmFdnK94uVvgxeZeE3LtJvd/jIzA= -sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= -sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca h1:6dsH6AYQWbyZmtttJNe8Gq1cXOeS1BdV3eW37zHilAQ= -sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= -sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= -sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= -sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.0.2 h1:YHQV7Dajm86OuqnIR6zAelnDWBRjo+YhYV9PmGrh1s8= -sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= -sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +k8s.io/api v0.30.0 h1:siWhRq7cNjy2iHssOB9SCGNCl2spiF1dO3dABqZ8niA= +k8s.io/api v0.30.0/go.mod h1:OPlaYhoHs8EQ1ql0R/TsUgaRPhpKNxIMrKQfWUp8QSE= +k8s.io/apiextensions-apiserver v0.30.0 h1:jcZFKMqnICJfRxTgnC4E+Hpcq8UEhT8B2lhBcQ+6uAs= +k8s.io/apiextensions-apiserver v0.30.0/go.mod h1:N9ogQFGcrbWqAY9p2mUAL5mGxsLqwgtUce127VtRX5Y= +k8s.io/apimachinery v0.30.0 h1:qxVPsyDM5XS96NIh9Oj6LavoVFYff/Pon9cZeDIkHHA= +k8s.io/apimachinery v0.30.0/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= +k8s.io/client-go v0.30.0 h1:sB1AGGlhY/o7KCyCEQ0bPWzYDL0pwOZO4vAtTSh/gJQ= +k8s.io/client-go v0.30.0/go.mod h1:g7li5O5256qe6TYdAMyX/otJqMhIiGgTapdLchhmOaY= +k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= +k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/controller-runtime v0.18.2 h1:RqVW6Kpeaji67CY5nPEfRz6ZfFMk0lWQlNrLqlNpx+Q= +sigs.k8s.io/controller-runtime v0.18.2/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= +sigs.k8s.io/controller-tools v0.14.0 h1:rnNoCC5wSXlrNoBKKzL70LNJKIQKEzT6lloG6/LF73A= +sigs.k8s.io/controller-tools v0.14.0/go.mod h1:TV7uOtNNnnR72SpzhStvPkoS/U5ir0nMudrkrC4M9Sc= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/internal/common.go b/internal/common.go index 5f4f8a7..bbe8a80 100644 --- a/internal/common.go +++ b/internal/common.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Package internal contains internal helper functions used by the conformance tests. package internal import ( @@ -34,21 +35,26 @@ import ( const SuiteName = "crossplane-conformance" // Version of the conformance plugin. -var Version = "unknown" +var version = "unknown" + +// Version returns the version of the conformance plugin. +func Version() string { + return version +} // NewClient returns a Kubernetes API client suitable for use with conformance // tests. It uses controller-runtime's config loading precedence to figure out // how to connect to an API server, i.e. it will try in order: // -// 1. The KUBECONFIG environment variable if it is set to a kubeconfig file path -// 2. In-cluster config if running in cluster -// 3. $HOME/.kube/config if it exists +// 1. The KUBECONFIG environment variable if it is set to a kubeconfig file path. +// 2. In-cluster config if running in cluster. +// 3. $HOME/.kube/config if it exists. func NewClient() (client.Client, error) { cfg, err := ctrl.GetConfig() if err != nil { return nil, errors.Wrap(err, "cannot create Kubernetes API REST config") } - cfg.UserAgent = SuiteName + "/" + Version + cfg.UserAgent = SuiteName + "/" + Version() cfg.QPS = 20 cfg.Burst = 100 @@ -68,7 +74,6 @@ func NewClient() (client.Client, error) { if err := extv1.AddToScheme(s); err != nil { return nil, errors.Wrap(err, "cannot add Crossplane apiextensions/v1 to scheme") - } if err := appsv1.AddToScheme(s); err != nil { return nil, errors.Wrap(err, "cannot add Kubernetes apps/v1 to scheme") @@ -123,7 +128,7 @@ func IgnoreFieldsOfMapKey(key string, names ...string) cmp.Option { for _, n := range names { if _, ok := m.Type().FieldByName(n); !ok { - panic(errors.Errorf("%s field %q does not exist\n", m.Type(), n)) + panic(errors.Errorf("%s field %q does not exist", m.Type(), n)) } if f.Name() == n { return true @@ -147,7 +152,7 @@ func OnlySubproperties(key string, keys ...string) cmp.Option { } if _, ok := m.Type().FieldByName(props); !ok { - panic(errors.Errorf("%s field %q does not exist\n", m.Type(), props)) + panic(errors.Errorf("%s field %q does not exist", m.Type(), props)) } f, ok := p.Index(-2).(cmp.StructField) diff --git a/internal/generate.go b/internal/generate.go index 045adea..b67dc5a 100644 --- a/internal/generate.go +++ b/internal/generate.go @@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build generate // +build generate // NOTE(negz): See the below link for details on what is happening here. // https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module // Add license headers to all files. -//go:generate go run -tags generate github.com/google/addlicense -v -c "The Crossplane Authors" . ../crossplane ../provider +//go:generate go run -tags generate github.com/google/addlicense -v -c "The Crossplane Authors" . ../crossplane package internal diff --git a/plugin-provider.yaml b/plugin-provider.yaml deleted file mode 100644 index 763b456..0000000 --- a/plugin-provider.yaml +++ /dev/null @@ -1,13 +0,0 @@ -sonobuoy-config: - driver: Job - plugin-name: crossplane-provider-conformance - result-format: junit -spec: - command: ["run.sh"] - args: - image: crossplane/provider-conformance:alpha - name: plugin - resources: {} - volumeMounts: - - mountPath: /tmp/results - name: results diff --git a/provider/provider_test.go b/provider/provider_test.go deleted file mode 100644 index 5b1652c..0000000 --- a/provider/provider_test.go +++ /dev/null @@ -1,477 +0,0 @@ -// Copyright 2021 The Crossplane Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package provider - -import ( - "context" - "testing" - "time" - - "github.com/google/go-cmp/cmp" - "github.com/google/go-cmp/cmp/cmpopts" - corev1 "k8s.io/api/core/v1" - kextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/wait" - - xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" - "github.com/crossplane/crossplane-runtime/pkg/fieldpath" - pkgv1 "github.com/crossplane/crossplane/apis/pkg/v1" - - "github.com/crossplane/conformance/internal" -) - -func TestPackage(t *testing.T) { - ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute) - t.Cleanup(cancel) - - kube, err := internal.NewClient() - if err != nil { - t.Fatalf("Create client: %v", err) - } - - l := &pkgv1.ProviderList{} - if err := kube.List(ctx, l); err != nil { - t.Fatalf("List providers: %v", err) - } - - rl := &pkgv1.ProviderRevisionList{} - if err := kube.List(ctx, rl); err != nil { - t.Fatalf("List provider revisions: %v", err) - } - - if len(l.Items) != 1 { - t.Fatalf("Provider conformance test requires exactly 1 Provider, found %d", len(l.Items)) - } - - if len(rl.Items) != 1 { - t.Fatalf("Provider conformance test requires exactly 1 ProviderRevision, found %d", len(rl.Items)) - } - - prv := &l.Items[0] - rev := &rl.Items[0] - - t.Run("IsInstalledAndHealthy", func(t *testing.T) { - t.Log("Testing that the provider's Healthy and Installed status conditions are 'True'.") - if err := wait.PollImmediate(10*time.Second, 90*time.Second, func() (done bool, err error) { - if err := kube.Get(ctx, types.NamespacedName{Name: prv.GetName()}, prv); err != nil { - return false, err - } - - if prv.GetCondition(pkgv1.TypeHealthy).Status != corev1.ConditionTrue { - t.Logf("Provider %q is not yet Healthy", prv.GetName()) - return false, nil - } - - if prv.GetCondition(pkgv1.TypeInstalled).Status != corev1.ConditionTrue { - t.Logf("Provider %q is not yet Installed", prv.GetName()) - return false, nil - } - - t.Logf("Provider %q is Healthy and Installed", prv.GetName()) - return true, nil - }); err != nil { - t.Errorf("Provider %q never became Healthy and Installed: %v", prv.GetName(), err) - } - }) - - t.Run("DeploysConformantCRDs", func(t *testing.T) { - t.Logf("Testing that ProviderRevision %q delivers only conformant CRDs.", rev.GetName()) - - hasPC := false - hasPCU := false - hasMR := false - - want := kextv1.SchemeGroupVersion.WithKind("CustomResourceDefinition") - for i, ref := range rev.Status.ObjectRefs { - gv, _ := schema.ParseGroupVersion(ref.APIVersion) - got := gv.WithKind(ref.Kind) - if diff := cmp.Diff(want, got); diff != "" { - t.Errorf("ProviderRevision %q status.objectRefs[%d]: -want, +got:\n%s", rev.GetName(), i, diff) - continue - } - - crd := &kextv1.CustomResourceDefinition{} - if err := kube.Get(ctx, types.NamespacedName{Name: ref.Name}, crd); err != nil { - t.Errorf("Get CRD %q: %v", ref.Name, err) - continue - } - - switch crd.Spec.Names.Kind { - case "Provider": - // Deprecated, but still exists in some providers. - continue - case "ProviderConfig": - t.Run(crd.Spec.Names.Kind, SubtestForProviderConfigCRD(crd)) - hasPC = true - case "ProviderConfigUsage": - t.Run(crd.Spec.Names.Kind, SubtestForProviderConfigUsageCRD(crd)) - hasPCU = true - default: - t.Run(crd.Spec.Names.Kind, SubtestForManagedResourceCRD(crd)) - hasMR = true - } - } - - if !hasMR { - t.Errorf("ProviderRevision %q must define at least one conformant managed resource", rev.GetName()) - } - - if !hasPC { - t.Errorf("ProviderRevision %q must define at least one conformant provider config", rev.GetName()) - } - - if !hasPCU { - t.Errorf("ProviderRevision %q must define at least one conformant provider config usage", rev.GetName()) - } - }) - - t.Run("ManagedResourcesAppearConformant", func(t *testing.T) { - t.Logf("Testing that managed resources defined by ProviderRevision %q appear conformant.", rev.GetName()) - - totalMRs := 0 - totalPCUs := 0 - - for _, ref := range rev.Status.ObjectRefs { - - crd := &kextv1.CustomResourceDefinition{} - if err := kube.Get(ctx, types.NamespacedName{Name: ref.Name}, crd); err != nil { - t.Errorf("Get CRD %q: %v", ref.Name, err) - continue - } - - // TODO(negz): Use the highest version, rather than the first one. - gvk := schema.GroupVersionKind{Group: crd.Spec.Group, Kind: crd.Spec.Names.ListKind} - for _, v := range crd.Spec.Versions { - if !v.Served { - continue - } - gvk.Version = v.Name - break - } - - l := &unstructured.UnstructuredList{} - l.SetAPIVersion(gvk.GroupVersion().String()) - l.SetKind(gvk.Kind) - if err := kube.List(ctx, l); err != nil { - t.Fatalf("List resources defined by CRD %q: %v", crd.GetName(), err) - } - - switch crd.Spec.Names.Kind { - case "Provider": - continue - case "ProviderConfig": - continue - case "ProviderConfigUsage": - totalPCUs += len(l.Items) - default: - if len(l.Items) == 0 { - t.Errorf("At least one %q managed resource must be manually created in advance.", crd.GetName()) - continue - } - t.Run(crd.Spec.Names.Kind, SubtestForManagedResource(&l.Items[0])) - totalMRs += len(l.Items) - } - } - - if totalPCUs != totalMRs { - t.Errorf("One ProviderConfigUsage should exist for each managed resource. Want %d, got %d.", totalMRs, totalPCUs) - } - }) -} - -func SubtestForProviderConfigCRD(crd *kextv1.CustomResourceDefinition) func(t *testing.T) { - return func(t *testing.T) { - if crd.Spec.Scope != kextv1.ClusterScoped { - t.Error("provider configs must be cluster scoped") - } - - cats := internal.AsSet(crd.Spec.Names.Categories) - if !cats["crossplane"] { - t.Error("provider configs must be in the 'crossplane' CRD category") - } - - // We're not opinionated about ProviderConfig specs, so we mostly test that - // their status object appears to embed our ProviderConfigStatus type. - // https://github.com/crossplane/crossplane-runtime/blob/v0.13.0/apis/common/v1/resource.go#L223 - want := &kextv1.JSONSchemaProps{ - Type: "object", - Required: []string{"spec"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "apiVersion": {Type: "string"}, - "kind": {Type: "string"}, - "metadata": {Type: "object"}, - "spec": { - Type: "object", - }, - "status": { - Type: "object", - Properties: map[string]kextv1.JSONSchemaProps{ - "conditions": { - Type: "array", - Items: &kextv1.JSONSchemaPropsOrArray{Schema: &kextv1.JSONSchemaProps{ - Type: "object", - Required: []string{"lastTransitionTime", "reason", "status", "type"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "lastTransitionTime": {Type: "string", Format: "date-time"}, - "message": {Type: "string"}, - "reason": {Type: "string"}, - "status": {Type: "string"}, - "type": {Type: "string"}, - }, - }}, - }, - "users": {Type: "integer", Format: "int64"}, - }, - }, - }, - } - - opts := []cmp.Option{ - // Testing description strings is verbose, fragile, and questionably - // valuable. We're not too concerned about them. - cmpopts.IgnoreFields(kextv1.JSONSchemaProps{}, "Description"), - - // We're not opinionated about the schema of a ProviderConfig's spec. - internal.IgnoreFieldsOfMapKey("spec", "Properties", "Required"), - } - - served := false - for _, v := range crd.Spec.Versions { - if v.Served == false { - continue - } - served = true - - if diff := cmp.Diff(want, v.Schema.OpenAPIV3Schema, opts...); diff != "" { - t.Errorf("version %q OpenAPI schema: -want, +got:\n%s", v.Name, diff) - } - } - - if !served { - t.Error("CRDs must serve at least one custom resource version") - } - } -} - -func SubtestForProviderConfigUsageCRD(crd *kextv1.CustomResourceDefinition) func(t *testing.T) { - return func(t *testing.T) { - if crd.Spec.Scope != kextv1.ClusterScoped { - t.Error("provider config usages must be cluster scoped") - } - - cats := internal.AsSet(crd.Spec.Names.Categories) - if !cats["crossplane"] { - t.Error("provider config usages must be in the 'crossplane' CRD category") - } - - // We're quite opinionated about ProviderConfigUsage schemas, so we simply - // test that they appear to embed our ProviderConfigUsage type. - // https://github.com/crossplane/crossplane-runtime/blob/v0.13.0/apis/common/v1/resource.go#L231 - want := &kextv1.JSONSchemaProps{ - Type: "object", - Required: []string{"providerConfigRef", "resourceRef"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "apiVersion": {Type: "string"}, - "kind": {Type: "string"}, - "metadata": {Type: "object"}, - "providerConfigRef": { - Type: "object", - Required: []string{"name"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "name": {Type: "string"}, - }, - }, - "resourceRef": { - Type: "object", - Required: []string{"apiVersion", "kind", "name"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "apiVersion": {Type: "string"}, - "kind": {Type: "string"}, - "name": {Type: "string"}, - "uid": {Type: "string"}, - }, - }, - }, - } - opts := []cmp.Option{ - // Testing description strings is verbose, fragile, and questionably - // valuable. We're not too concerned about them. - cmpopts.IgnoreFields(kextv1.JSONSchemaProps{}, "Description"), - } - - served := false - for _, v := range crd.Spec.Versions { - if v.Served == false { - continue - } - served = true - - if diff := cmp.Diff(want, v.Schema.OpenAPIV3Schema, opts...); diff != "" { - t.Errorf("version %q OpenAPI schema: -want, +got:\n%s", v.Name, diff) - } - } - - if !served { - t.Error("CRDs must serve at least one custom resource version") - } - } -} - -func SubtestForManagedResourceCRD(crd *kextv1.CustomResourceDefinition) func(t *testing.T) { - return func(t *testing.T) { - if crd.Spec.Scope != kextv1.ClusterScoped { - t.Error("managed resources must be cluster scoped") - } - - cats := internal.AsSet(crd.Spec.Names.Categories) - if !cats["crossplane"] { - t.Error("managed resources must be in the 'crossplane' CRD category") - } - - if !cats["managed"] { - t.Error("managed resources must be in the 'managed' CRD category") - } - - // We're only concerned that managed resources appear to embed the expected - // types in their spec and status. - // https://github.com/crossplane/crossplane-runtime/blob/v0.13.0/apis/common/v1/resource.go#L130 - // https://github.com/crossplane/crossplane-runtime/blob/v0.13.0/apis/common/v1/resource.go#L159 - want := &kextv1.JSONSchemaProps{ - Type: "object", - Required: []string{"spec"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "apiVersion": {Type: "string"}, - "kind": {Type: "string"}, - "metadata": {Type: "object"}, - "spec": { - Type: "object", - Properties: map[string]kextv1.JSONSchemaProps{ - "deletionPolicy": { - Type: "string", - Enum: []kextv1.JSON{ - {Raw: []byte(`"Orphan"`)}, - {Raw: []byte(`"Delete"`)}, - }, - }, - "providerConfigRef": { - Type: "object", - Required: []string{"name"}, - Properties: map[string]kextv1.JSONSchemaProps{"name": {Type: "string"}}, - }, - "writeConnectionSecretToRef": { - Type: "object", - Required: []string{"name", "namespace"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "name": {Type: "string"}, - "namespace": {Type: "string"}, - }, - }, - }, - }, - "status": { - Type: "object", - Properties: map[string]kextv1.JSONSchemaProps{ - "conditions": { - Type: "array", - Items: &kextv1.JSONSchemaPropsOrArray{Schema: &kextv1.JSONSchemaProps{ - Type: "object", - Required: []string{"lastTransitionTime", "reason", "status", "type"}, - Properties: map[string]kextv1.JSONSchemaProps{ - "lastTransitionTime": {Type: "string", Format: "date-time"}, - "message": {Type: "string"}, - "reason": {Type: "string"}, - "status": {Type: "string"}, - "type": {Type: "string"}, - }, - }}, - }, - }, - }, - }, - } - - opts := []cmp.Option{ - // Testing description strings is verbose, fragile, and questionably - // valuable. We're not too concerned about them. - cmpopts.IgnoreFields(kextv1.JSONSchemaProps{}, "Description"), - - // We're not concerned with which spec fields are required. None of the - // spec fields we're concerned with are, but fields like 'forProvider' - // often are. - internal.IgnoreFieldsOfMapKey("spec", "Required"), - - // TODO(negz): Verify that provider config and deletion - // policy defaulting is in place once providers have had - // enough time to update to runtime v0.14 (which is not - // yet released at the time of writing). - // https://github.com/crossplane/crossplane-runtime/pull/255 - internal.IgnoreFieldsOfMapKey("providerConfigRef", "Default"), - internal.IgnoreFieldsOfMapKey("deletionPolicy", "Default"), - - // We're only concerned with the spec and status fields that we expect - // all managed resources to include. - internal.OnlySubproperties("spec", "deletionPolicy", "providerConfigRef", "writeConnectionSecretToRef"), - internal.OnlySubproperties("status", "conditions"), - } - - served := false - for _, v := range crd.Spec.Versions { - if v.Served == false { - continue - } - served = true - - if diff := cmp.Diff(want, v.Schema.OpenAPIV3Schema, opts...); diff != "" { - t.Errorf("version %q OpenAPI schema: -want, +got:\n%s", v.Name, diff) - } - } - - if !served { - t.Error("CRDs must serve at least one custom resource version") - } - } -} - -func SubtestForManagedResource(mr *unstructured.Unstructured) func(t *testing.T) { - return func(t *testing.T) { - paved := fieldpath.Pave(mr.Object) - - cs := &xpv1.ConditionedStatus{} - if err := paved.GetValueInto("status", cs); err != nil { - t.Errorf("Get %s status conditions: %v", mr.GetName(), err) - } - - want := xpv1.Available() - got := cs.GetCondition(xpv1.TypeReady) - if diff := cmp.Diff(want, got); diff != "" { - t.Errorf("%q status: -want, +got:\n%s", mr.GetName(), diff) - } - - n, err := paved.GetString("metadata.annotations[crossplane.io/external-name]") - if err != nil { - t.Errorf("Get %s external name annotation: %v", mr.GetName(), err) - } - if n == "" { - t.Errorf("%q must have a non-zero %q annotation", mr.GetName(), "crossplane.io/external-name") - } - - // TODO(negz): Test that spec.writeConnectionSecretToRef points to a - // secret that exists? We can't test that the secret actually has data, - // because not all managed resources write connection details. - } -} diff --git a/provider/version_test.go b/provider/version_test.go deleted file mode 100644 index df8d160..0000000 --- a/provider/version_test.go +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2021 The Crossplane Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package provider - -import ( - "testing" - - "github.com/crossplane/conformance/internal" -) - -func TestVersion(t *testing.T) { - // Not really a test, but we want somewhere to log this. - t.Logf("Conformance test version: %s", internal.Version) -} diff --git a/testdata/configuration/composition.yaml b/testdata/configuration/composition.yaml index 27c3a89..7fee9e2 100644 --- a/testdata/configuration/composition.yaml +++ b/testdata/configuration/composition.yaml @@ -16,6 +16,7 @@ spec: apiVersion: nop.crossplane.io/v1alpha1 kind: NopResource spec: + forProvider: {} writeConnectionSecretToRef: namespace: crossplane-conformance name: nop-example-resource diff --git a/testdata/configuration/crossplane.yaml b/testdata/configuration/crossplane.yaml index e1042ef..69753f1 100644 --- a/testdata/configuration/crossplane.yaml +++ b/testdata/configuration/crossplane.yaml @@ -6,7 +6,7 @@ metadata: crossplane.io/test: crossplane-conformance spec: crossplane: - version: ">=v1.1.0" + version: ">=v1.15.0" dependsOn: - - provider: negz/provider-nop - version: "v0.1.0" + - provider: xpkg.upbound.io/crossplane-contrib/provider-nop + version: "v0.2.1" diff --git a/tests/apiextensions_test.go b/tests/apiextensions_test.go new file mode 100644 index 0000000..f8f7f87 --- /dev/null +++ b/tests/apiextensions_test.go @@ -0,0 +1,1425 @@ +// Copyright 2021 The Crossplane Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package crossplane + +import ( + "context" + "encoding/json" + "fmt" + "testing" + "time" + + "github.com/google/go-cmp/cmp" + corev1 "k8s.io/api/core/v1" + kextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + kerrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/utils/ptr" + "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/crossplane/conformance/internal" + xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" + "github.com/crossplane/crossplane-runtime/pkg/fieldpath" + "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/resource/unstructured/claim" + "github.com/crossplane/crossplane-runtime/pkg/resource/unstructured/composite" + extv1 "github.com/crossplane/crossplane/apis/apiextensions/v1" + pkgv1 "github.com/crossplane/crossplane/apis/pkg/v1" +) + +func TestCompositeResourceDefinition(t *testing.T) { + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) + t.Cleanup(cancel) + + kube, err := internal.NewClient() + if err != nil { + t.Fatalf("Create client: %v", err) + } + + xrd := &extv1.CompositeResourceDefinition{ + ObjectMeta: metav1.ObjectMeta{Name: "clusterconformances.test.crossplane.io"}, + Spec: extv1.CompositeResourceDefinitionSpec{ + Group: "test.crossplane.io", + Names: kextv1.CustomResourceDefinitionNames{ + Kind: "ClusterConformance", + ListKind: "ClusterConformanceList", + Plural: "clusterconformances", + Singular: "clusterconformance", + }, + ClaimNames: &kextv1.CustomResourceDefinitionNames{ + Kind: "Conformance", + ListKind: "ConformanceList", + Plural: "conformances", + Singular: "conformance", + }, + Versions: []extv1.CompositeResourceDefinitionVersion{{ + Name: "v1alpha1", + Served: true, + Referenceable: true, + Schema: &extv1.CompositeResourceValidation{ + OpenAPIV3Schema: runtime.RawExtension{Raw: []byte("{}")}, + }, + }}, + }, + } + + if err := kube.Create(ctx, xrd); err != nil { + t.Fatalf("Create XRD %q: %v", xrd.GetName(), err) + } + t.Logf("Created XRD %q", xrd.GetName()) + + t.Cleanup(func() { + t.Logf("Cleaning up XRD %q.", xrd.GetName()) + if err := kube.Get(ctx, types.NamespacedName{Name: xrd.GetName()}, xrd); err != nil { + t.Fatalf("Get XRD %q: %v", xrd.GetName(), err) + } + if err := kube.Delete(ctx, xrd); err != nil { + t.Fatalf("Delete XRD %q: %v", xrd.GetName(), err) + } + t.Logf("Deleted XRD %q", xrd.GetName()) + }) + + t.Run("BecomesEstablishedAndOffered", func(t *testing.T) { + t.Log("Testing that the XRD's Established and Offered status conditions become 'True'.") + if err := wait.PollUntilContextTimeout(ctx, 10*time.Second, 90*time.Second, true, func(ctx context.Context) (done bool, err error) { + if err := kube.Get(ctx, types.NamespacedName{Name: xrd.GetName()}, xrd); err != nil { + return false, err + } + + if xrd.Status.GetCondition(extv1.TypeEstablished).Status != corev1.ConditionTrue { + t.Logf("XRD %q is not yet Established", xrd.GetName()) + return false, nil + } + + if xrd.Status.GetCondition(extv1.TypeOffered).Status != corev1.ConditionTrue { + t.Logf("XRD %q is not yet Offered", xrd.GetName()) + return false, nil + } + + t.Logf("XRD %q is Established and Offered", xrd.GetName()) + return true, nil + }); err != nil { + t.Errorf("XRD %q never became Established and Offered: %v", xrd.GetName(), err) + } + }) + + t.Run("CRDIsCreatedForXR", func(t *testing.T) { + t.Log("Testing that the XRD creates a conformant CRD for its XR.") + + // TODO(negz): Use Crossplane's internal/xcrd package instead? We can't + // import it because it's internal, so we replicate a bunch of it here. + // We could fork it, open it up, or move these tests into the core repo. + want := kextv1.CustomResourceDefinitionSpec{ + Group: xrd.Spec.Group, + Names: kextv1.CustomResourceDefinitionNames{ + Kind: xrd.Spec.Names.Kind, + ListKind: xrd.Spec.Names.ListKind, + Plural: xrd.Spec.Names.Plural, + Singular: xrd.Spec.Names.Singular, + Categories: []string{"composite"}, + }, + Scope: kextv1.ClusterScoped, + Versions: []kextv1.CustomResourceDefinitionVersion{{ + Name: xrd.Spec.Versions[0].Name, + Served: true, + Storage: true, + Subresources: &kextv1.CustomResourceSubresources{Status: &kextv1.CustomResourceSubresourceStatus{}}, + Schema: &kextv1.CustomResourceValidation{ + OpenAPIV3Schema: &kextv1.JSONSchemaProps{ + Type: "object", + Required: []string{"spec"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "apiVersion": { + Type: "string", + }, + "kind": { + Type: "string", + }, + "metadata": { + Type: "object", + Properties: map[string]kextv1.JSONSchemaProps{ + "name": { + Type: "string", + // https://github.com/crossplane/crossplane/commit/0181529f057049fc210ff02345a097bdc9ccc95d + MaxLength: ptr.To(int64(63)), + }, + }, + }, + "spec": { + Type: "object", + Properties: map[string]kextv1.JSONSchemaProps{ + "compositionRef": { + Type: "object", + Required: []string{"name"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "name": {Type: "string"}, + }, + }, + "compositionSelector": { + Type: "object", + Required: []string{"matchLabels"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "matchLabels": { + Type: "object", + AdditionalProperties: &kextv1.JSONSchemaPropsOrBool{ + Allows: true, + Schema: &kextv1.JSONSchemaProps{Type: "string"}, + }, + }, + }, + }, + "compositionRevisionRef": { // https://github.com/crossplane/crossplane/commit/deb18660640742f236d9057587671c74224afcc4 + Type: "object", + Required: []string{"name"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "name": {Type: "string"}, + }, + }, + "compositionRevisionSelector": { // https://github.com/crossplane/crossplane/commit/7802cf85a5dd068038a115c42434e0db2d9dfa1f + Type: "object", + Required: []string{"matchLabels"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "matchLabels": { + Type: "object", + AdditionalProperties: &kextv1.JSONSchemaPropsOrBool{ + Allows: true, + Schema: &kextv1.JSONSchemaProps{Type: "string"}, + }, + }, + }, + }, + "compositionUpdatePolicy": { // https://github.com/crossplane/crossplane/commit/deb18660640742f236d9057587671c74224afcc4 + Type: "string", + Enum: []kextv1.JSON{ + {Raw: []byte(`"Automatic"`)}, + {Raw: []byte(`"Manual"`)}, + }, + Default: &kextv1.JSON{Raw: []byte(`"Automatic"`)}, // https://github.com/crossplane/crossplane/commit/d346a67573e5cd111a7631bdb0f86ed9c0914204 + }, + "claimRef": { + Type: "object", + Required: []string{"apiVersion", "kind", "namespace", "name"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "apiVersion": {Type: "string"}, + "kind": {Type: "string"}, + "namespace": {Type: "string"}, + "name": {Type: "string"}, + }, + }, + "environmentConfigRefs": { // https://github.com/crossplane/crossplane/commit/200a41f84b48df2093090f8282c67099b936c0ea + Type: "array", + Items: &kextv1.JSONSchemaPropsOrArray{ + Schema: &kextv1.JSONSchemaProps{ + Type: "object", + Properties: map[string]kextv1.JSONSchemaProps{ + "apiVersion": {Type: "string"}, + "name": {Type: "string"}, + "kind": {Type: "string"}, + }, + Required: []string{"apiVersion", "kind"}, + }, + }, + }, + "resourceRefs": { + Type: "array", + Items: &kextv1.JSONSchemaPropsOrArray{ + Schema: &kextv1.JSONSchemaProps{ + Type: "object", + Properties: map[string]kextv1.JSONSchemaProps{ + "apiVersion": {Type: "string"}, + "name": {Type: "string"}, + "kind": {Type: "string"}, + }, + Required: []string{"apiVersion", "kind"}, // https://github.com/crossplane/crossplane/commit/6750ee120a75662d952689fc24c801384e96baa5 + }, + }, + XListType: ptr.To("atomic"), // https://github.com/crossplane/crossplane/commit/683f0c5763de698e1fec3eee460ba6fee75379a4 + }, + "publishConnectionDetailsTo": { // https://github.com/crossplane/crossplane/commit/47a7ad7392e829e5b938eb716ad768aec7bbebfa + Type: "object", + Required: []string{"name"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "name": {Type: "string"}, + "configRef": { + Type: "object", + Default: &kextv1.JSON{Raw: []byte(`{"name":"default"}`)}, + Properties: map[string]kextv1.JSONSchemaProps{ + "name": { + Type: "string", + }, + }, + }, + "metadata": { + Type: "object", + Properties: map[string]kextv1.JSONSchemaProps{ + "labels": { + Type: "object", + AdditionalProperties: &kextv1.JSONSchemaPropsOrBool{ + Allows: true, + Schema: &kextv1.JSONSchemaProps{Type: "string"}, + }, + }, + "annotations": { + Type: "object", + AdditionalProperties: &kextv1.JSONSchemaPropsOrBool{ + Allows: true, + Schema: &kextv1.JSONSchemaProps{Type: "string"}, + }, + }, + "type": { + Type: "string", + }, + }, + }, + }, + }, + "writeConnectionSecretToRef": { + Type: "object", + Required: []string{"name", "namespace"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "name": {Type: "string"}, + "namespace": {Type: "string"}, + }, + }, + }, + }, + "status": { + Type: "object", + Properties: map[string]kextv1.JSONSchemaProps{ + "conditions": { + Description: "Conditions of the resource.", + Type: "array", + // XListMapKeys and XListType both added in https://github.com/crossplane/crossplane/commit/6ac7567cbb5bf139c22aa90cdec643d1dcf15846 + XListMapKeys: []string{"type"}, + XListType: ptr.To("map"), + Items: &kextv1.JSONSchemaPropsOrArray{ + Schema: &kextv1.JSONSchemaProps{ + Type: "object", + Required: []string{"lastTransitionTime", "reason", "status", "type"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "lastTransitionTime": {Type: "string", Format: "date-time"}, + "message": {Type: "string"}, + "reason": {Type: "string"}, + "status": {Type: "string"}, + "type": {Type: "string"}, + }, + }, + }, + }, + "connectionDetails": { + Type: "object", + Properties: map[string]kextv1.JSONSchemaProps{ + "lastPublishedTime": {Type: "string", Format: "date-time"}, + }, + }, + "claimConditionTypes": { // https://github.com/crossplane/crossplane/commit/0b75611324407889a6064a17cb9058a6f40c2c36 + Type: "array", + XListType: ptr.To("set"), + Items: &kextv1.JSONSchemaPropsOrArray{ + Schema: &kextv1.JSONSchemaProps{ + Type: "string", + }, + }, + }, + }, + }, + }, + }, + }, + AdditionalPrinterColumns: []kextv1.CustomResourceColumnDefinition{ + { + // https://github.com/crossplane/crossplane/commit/b0437b7d3901a971fc60f525c8ea63460a4ed00d + Name: "SYNCED", + Type: "string", + JSONPath: ".status.conditions[?(@.type=='Synced')].status", + }, + { + Name: "READY", + Type: "string", + JSONPath: ".status.conditions[?(@.type=='Ready')].status", + }, + { + Name: "COMPOSITION", + Type: "string", + JSONPath: ".spec.compositionRef.name", + }, + { + Name: "AGE", + Type: "date", + JSONPath: ".metadata.creationTimestamp", + }, + }, + }}, + Conversion: &kextv1.CustomResourceConversion{Strategy: kextv1.NoneConverter}, + } + + if err := wait.PollUntilContextTimeout(ctx, 10*time.Second, 90*time.Second, true, func(ctx context.Context) (done bool, err error) { + crd := &kextv1.CustomResourceDefinition{} + if err := kube.Get(ctx, types.NamespacedName{Name: xrd.GetName()}, crd); err != nil { + if kerrors.IsNotFound(err) { + t.Logf("CRD %q has not yet been created", xrd.GetName()) + return false, nil + } + return false, err + } + + if !internal.CRDIs(crd.Status.Conditions, kextv1.Established) { + t.Logf("CRD %q is not yet Established", crd.GetName()) + return false, nil + } + + if diff := cmp.Diff(want, crd.Spec); diff != "" { + t.Errorf("CRD %q is not conformant: -want, +got:\n%s", crd.GetName(), diff) + return true, nil + } + + t.Logf("XRD %q created a conformant XR CRD", xrd.GetName()) + return true, nil + }); err != nil { + t.Errorf("CRD %q never created a conformant XR CRD: %v", xrd.GetName(), err) + } + }) + + t.Run("CRDIsCreatedForXRC", func(t *testing.T) { + t.Log("Testing that the XRD creates a conformant CRD for its XRC.") + + // TODO(negz): Use Crossplane's internal/xcrd package instead? We can't + // import it because it's internal, so we replicate a bunch of it here. + // We could fork it, open it up, or move these tests into the core repo. + want := kextv1.CustomResourceDefinitionSpec{ + Group: xrd.Spec.Group, + Names: kextv1.CustomResourceDefinitionNames{ + Kind: xrd.Spec.ClaimNames.Kind, + ListKind: xrd.Spec.ClaimNames.ListKind, + Plural: xrd.Spec.ClaimNames.Plural, + Singular: xrd.Spec.ClaimNames.Singular, + Categories: []string{"claim"}, + }, + Scope: kextv1.NamespaceScoped, + Versions: []kextv1.CustomResourceDefinitionVersion{{ + Name: xrd.Spec.Versions[0].Name, + Served: true, + Storage: true, + Subresources: &kextv1.CustomResourceSubresources{Status: &kextv1.CustomResourceSubresourceStatus{}}, + Schema: &kextv1.CustomResourceValidation{ + OpenAPIV3Schema: &kextv1.JSONSchemaProps{ + Type: "object", + Required: []string{"spec"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "apiVersion": { + Type: "string", + }, + "kind": { + Type: "string", + }, + "metadata": { + Type: "object", + Properties: map[string]kextv1.JSONSchemaProps{ + "name": { + Type: "string", + // https://github.com/crossplane/crossplane/commit/0181529f057049fc210ff02345a097bdc9ccc95d + MaxLength: ptr.To(int64(63)), + }, + }, + }, + "spec": { + Type: "object", + Properties: map[string]kextv1.JSONSchemaProps{ + "compositionRef": { + Type: "object", + Required: []string{"name"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "name": {Type: "string"}, + }, + }, + "compositionSelector": { + Type: "object", + Required: []string{"matchLabels"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "matchLabels": { + Type: "object", + AdditionalProperties: &kextv1.JSONSchemaPropsOrBool{ + Allows: true, + Schema: &kextv1.JSONSchemaProps{Type: "string"}, + }, + }, + }, + }, + "compositionRevisionRef": { // https://github.com/crossplane/crossplane/commit/deb18660640742f236d9057587671c74224afcc4 + Type: "object", + Required: []string{"name"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "name": {Type: "string"}, + }, + }, + "compositionRevisionSelector": { // https://github.com/crossplane/crossplane/commit/7802cf85a5dd068038a115c42434e0db2d9dfa1f + Type: "object", + Required: []string{"matchLabels"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "matchLabels": { + Type: "object", + AdditionalProperties: &kextv1.JSONSchemaPropsOrBool{ + Allows: true, + Schema: &kextv1.JSONSchemaProps{Type: "string"}, + }, + }, + }, + }, + "compositionUpdatePolicy": { // https://github.com/crossplane/crossplane/commit/deb18660640742f236d9057587671c74224afcc4 + Type: "string", + Enum: []kextv1.JSON{ + {Raw: []byte(`"Automatic"`)}, + {Raw: []byte(`"Manual"`)}, + }, + }, + "compositeDeletePolicy": { // https://github.com/crossplane/crossplane/commit/ba4c8a43ab800bde0e39300f0bb8bdf6e8bba889 + Type: "string", + Enum: []kextv1.JSON{ + {Raw: []byte(`"Background"`)}, + {Raw: []byte(`"Foreground"`)}, + }, + Default: &kextv1.JSON{Raw: []byte(`"Background"`)}, // https://github.com/crossplane/crossplane/commit/ca105476823a688f8235aea5383e626fa1a65721 + }, + "resourceRef": { + Type: "object", + Required: []string{"apiVersion", "kind", "name"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "apiVersion": {Type: "string"}, + "kind": {Type: "string"}, + "name": {Type: "string"}, + }, + }, + "publishConnectionDetailsTo": { // https://github.com/crossplane/crossplane/commit/47a7ad7392e829e5b938eb716ad768aec7bbebfa + Type: "object", + Required: []string{"name"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "name": {Type: "string"}, + "configRef": { + Type: "object", + Default: &kextv1.JSON{Raw: []byte(`{"name":"default"}`)}, + Properties: map[string]kextv1.JSONSchemaProps{ + "name": { + Type: "string", + }, + }, + }, + "metadata": { + Type: "object", + Properties: map[string]kextv1.JSONSchemaProps{ + "labels": { + Type: "object", + AdditionalProperties: &kextv1.JSONSchemaPropsOrBool{ + Allows: true, + Schema: &kextv1.JSONSchemaProps{Type: "string"}, + }, + }, + "annotations": { + Type: "object", + AdditionalProperties: &kextv1.JSONSchemaPropsOrBool{ + Allows: true, + Schema: &kextv1.JSONSchemaProps{Type: "string"}, + }, + }, + "type": { + Type: "string", + }, + }, + }, + }, + }, + "writeConnectionSecretToRef": { + Type: "object", + Required: []string{"name"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "name": {Type: "string"}, + }, + }, + }, + }, + "status": { + Type: "object", + Properties: map[string]kextv1.JSONSchemaProps{ + "conditions": { + Description: "Conditions of the resource.", + Type: "array", + // XListMapKeys and XListType both added in https://github.com/crossplane/crossplane/commit/6ac7567cbb5bf139c22aa90cdec643d1dcf15846 + XListMapKeys: []string{"type"}, + XListType: ptr.To("map"), + Items: &kextv1.JSONSchemaPropsOrArray{ + Schema: &kextv1.JSONSchemaProps{ + Type: "object", + Required: []string{"lastTransitionTime", "reason", "status", "type"}, + Properties: map[string]kextv1.JSONSchemaProps{ + "lastTransitionTime": {Type: "string", Format: "date-time"}, + "message": {Type: "string"}, + "reason": {Type: "string"}, + "status": {Type: "string"}, + "type": {Type: "string"}, + }, + }, + }, + }, + "connectionDetails": { + Type: "object", + Properties: map[string]kextv1.JSONSchemaProps{ + "lastPublishedTime": {Type: "string", Format: "date-time"}, + }, + }, + "claimConditionTypes": { // https://github.com/crossplane/crossplane/commit/0b75611324407889a6064a17cb9058a6f40c2c36 + Type: "array", + XListType: ptr.To("set"), + Items: &kextv1.JSONSchemaPropsOrArray{ + Schema: &kextv1.JSONSchemaProps{ + Type: "string", + }, + }, + }, + }, + }, + }, + }, + }, + AdditionalPrinterColumns: []kextv1.CustomResourceColumnDefinition{ + { + // https://github.com/crossplane/crossplane/commit/b0437b7d3901a971fc60f525c8ea63460a4ed00d + Name: "SYNCED", + Type: "string", + JSONPath: ".status.conditions[?(@.type=='Synced')].status", + }, + { + Name: "READY", + Type: "string", + JSONPath: ".status.conditions[?(@.type=='Ready')].status", + }, + { + Name: "CONNECTION-SECRET", + Type: "string", + JSONPath: ".spec.writeConnectionSecretToRef.name", + }, + { + Name: "AGE", + Type: "date", + JSONPath: ".metadata.creationTimestamp", + }, + }, + }}, + Conversion: &kextv1.CustomResourceConversion{Strategy: kextv1.NoneConverter}, + } + + if err := wait.PollUntilContextTimeout(ctx, 10*time.Second, 90*time.Second, true, func(ctx context.Context) (done bool, err error) { + name := xrd.Spec.ClaimNames.Plural + "." + xrd.Spec.Group + crd := &kextv1.CustomResourceDefinition{} + if err := kube.Get(ctx, types.NamespacedName{Name: name}, crd); err != nil { + if kerrors.IsNotFound(err) { + t.Logf("CRD %q has not yet been created", name) + return false, nil + } + return false, err + } + + if !internal.CRDIs(crd.Status.Conditions, kextv1.Established) { + t.Logf("CRD %q is not yet Established", crd.GetName()) + return false, nil + } + + if diff := cmp.Diff(want, crd.Spec); diff != "" { + t.Errorf("CRD %q is not conformant: -want, +got:\n%s", crd.GetName(), diff) + return true, nil + } + + t.Logf("XRD %q created a conformant XRC CRD", xrd.GetName()) + return true, nil + }); err != nil { + t.Errorf("CRD %q never created a conformant XRC CRD: %v", xrd.GetName(), err) + } + }) +} + +func TestCompositeResource(t *testing.T) { + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute) + t.Cleanup(cancel) + + kube, err := internal.NewClient() + if err != nil { + t.Fatalf("Create client: %v", err) + } + + // create provider that will be used in this test + createProvider(ctx, t, kube) + + // create XRD and verify it becomes established/offered + xrd := createAndTestXRD(ctx, t, kube) + + comp := &extv1.Composition{ + ObjectMeta: metav1.ObjectMeta{ + Name: internal.SuiteName, + Labels: map[string]string{ + "crossplane.io/test": internal.SuiteName, + }, + }, + Spec: extv1.CompositionSpec{ + CompositeTypeRef: extv1.TypeReference{ + APIVersion: "test.crossplane.io/v1alpha1", + Kind: "ClusterConformance", + }, + PatchSets: []extv1.PatchSet{ + { + // We patch our three spec fields (a string, int, and bool) + // as (string) annotations on the NopResource, exercising a + // few of our transforms. + Name: "fromcomposite", + Patches: []extv1.Patch{ + { + Type: extv1.PatchTypeFromCompositeFieldPath, + FromFieldPath: ptr.To("spec.parameters.a"), + ToFieldPath: ptr.To("metadata.annotations[nop.crossplane.io/a]"), + Transforms: []extv1.Transform{{ + Type: extv1.TransformTypeMap, + Map: &extv1.MapTransform{Pairs: map[string]kextv1.JSON{"a": asJSON(t, "A")}}, + }}, + Policy: &extv1.PatchPolicy{ + FromFieldPath: func() *extv1.FromFieldPathPolicy { p := extv1.FromFieldPathPolicyRequired; return &p }(), + }, + }, + { + Type: extv1.PatchTypeFromCompositeFieldPath, + FromFieldPath: ptr.To("spec.parameters.b"), + ToFieldPath: ptr.To("metadata.annotations[nop.crossplane.io/b]"), + Transforms: []extv1.Transform{ + { + Type: extv1.TransformTypeMath, + Math: &extv1.MathTransform{ + Multiply: ptr.To(int64(2)), + }, + }, + { + Type: extv1.TransformTypeConvert, + Convert: &extv1.ConvertTransform{ToType: "string"}, + }, + }, + Policy: &extv1.PatchPolicy{ + FromFieldPath: func() *extv1.FromFieldPathPolicy { p := extv1.FromFieldPathPolicyRequired; return &p }(), + }, + }, + { + Type: extv1.PatchTypeFromCompositeFieldPath, + FromFieldPath: ptr.To("spec.parameters.c"), + ToFieldPath: ptr.To("metadata.annotations[nop.crossplane.io/c]"), + Transforms: []extv1.Transform{{ + Type: extv1.TransformTypeConvert, + Convert: &extv1.ConvertTransform{ToType: "string"}, + }}, + Policy: &extv1.PatchPolicy{ + FromFieldPath: func() *extv1.FromFieldPathPolicy { p := extv1.FromFieldPathPolicyRequired; return &p }(), + }, + }, + }, + }, + { + // We patch the values we patched from the composite's spec + // to its status, to ensure patching works in both + // directions. + Name: "tocomposite", + Patches: []extv1.Patch{ + { + Type: extv1.PatchTypeToCompositeFieldPath, + FromFieldPath: ptr.To("metadata.annotations[nop.crossplane.io/a]"), + ToFieldPath: ptr.To("status.a"), + }, + { + Type: extv1.PatchTypeToCompositeFieldPath, + FromFieldPath: ptr.To("metadata.annotations[nop.crossplane.io/b]"), + ToFieldPath: ptr.To("status.b"), + Transforms: []extv1.Transform{ + { + Type: extv1.TransformTypeConvert, + Convert: &extv1.ConvertTransform{ToType: "int"}, + }, + }, + }, + { + Type: extv1.PatchTypeToCompositeFieldPath, + FromFieldPath: ptr.To("metadata.annotations[nop.crossplane.io/c]"), + ToFieldPath: ptr.To("status.c"), + Transforms: []extv1.Transform{{ + Type: extv1.TransformTypeConvert, + Convert: &extv1.ConvertTransform{ToType: "bool"}, + }}, + }, + }, + }, + }, + Resources: []extv1.ComposedTemplate{{ + // TODO(negz): Test anonymous resources too? + Name: ptr.To("nop"), + Base: runtime.RawExtension{Raw: []byte(fmt.Sprintf(`{ + "apiVersion": "nop.crossplane.io/v1alpha1", + "kind": "NopResource", + "spec": { + "forProvider": { + "conditionAfter": [ + { + "time": "1s", + "conditionType": "Ready", + "conditionStatus": "True" + } + ] + }, + "writeConnectionSecretToRef": { + "namespace": "%s" + } + } + }`, internal.SuiteName))}, + Patches: []extv1.Patch{ + { + Type: extv1.PatchTypeFromCompositeFieldPath, + FromFieldPath: ptr.To("metadata.uid"), + ToFieldPath: ptr.To("spec.writeConnectionSecretToRef.name"), + // TODO(negz): Test all transform types. + Transforms: []extv1.Transform{ + { + Type: extv1.TransformTypeString, + String: &extv1.StringTransform{ + Format: ptr.To("%s-nopresource"), + }, + }, + }, + }, + { + Type: extv1.PatchTypePatchSet, + PatchSetName: ptr.To("fromcomposite"), + }, + { + Type: extv1.PatchTypePatchSet, + PatchSetName: ptr.To("tocomposite"), + }, + }, + ConnectionDetails: []extv1.ConnectionDetail{{ + Type: func() *extv1.ConnectionDetailType { v := extv1.ConnectionDetailTypeFromValue; return &v }(), + Name: ptr.To(internal.SuiteName), + Value: ptr.To(internal.SuiteName), + }}, + // TODO(negz): Test the various kinds of readiness check? + }}, + WriteConnectionSecretsToNamespace: ptr.To(internal.SuiteName), + }, + } + if err := kube.Create(ctx, comp); err != nil { + t.Fatalf("Create composition %q: %v", comp.GetName(), err) + } + t.Logf("Created composition %q", comp.GetName()) + + t.Cleanup(func() { + t.Logf("Cleaning up composition %q.", comp.GetName()) + if err := kube.Get(ctx, types.NamespacedName{Name: comp.GetName()}, comp); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Get composition %q: %v", comp.GetName(), err) + } + if err := kube.Delete(ctx, comp); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Delete composition %q: %v", comp.GetName(), err) + } + t.Logf("Deleted composition %q", comp.GetName()) + }) + + // create a namespace for the claim to live in + createNamespace(ctx, t, kube) + + // create the claim and wait for it to become ready + xrc := createAndTestClaim(ctx, t, kube, xrd) + + // test the composite resource, wait for it to become ready + testXR(ctx, t, kube, xrd, xrc) +} + +func TestCompositeResourcePipelineMode(t *testing.T) { + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute) + t.Cleanup(cancel) + + kube, err := internal.NewClient() + if err != nil { + t.Fatalf("Create client: %v", err) + } + + // create provider that will be used in this test + createProvider(ctx, t, kube) + + // create and wait for function to be installed/healthy that will be used in this test + fnc := &pkgv1.Function{ + ObjectMeta: metav1.ObjectMeta{Name: internal.SuiteName + "-function"}, + Spec: pkgv1.FunctionSpec{ + PackageSpec: pkgv1.PackageSpec{ + Package: "xpkg.upbound.io/crossplane-contrib/function-patch-and-transform:v0.7.0", + IgnoreCrossplaneConstraints: ptr.To(true), + }, + }, + } + + if err := kube.Create(ctx, fnc); err != nil { + t.Fatalf("Create function %q: %v", fnc.GetName(), err) + } + t.Logf("Created function %q", fnc.GetName()) + + t.Cleanup(func() { + t.Logf("Cleaning up function %q.", fnc.GetName()) + if err := kube.Get(ctx, types.NamespacedName{Name: fnc.GetName()}, fnc); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Get function %q: %v", fnc.GetName(), err) + } + if err := kube.Delete(ctx, fnc); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Delete function %q: %v", fnc.GetName(), err) + } + t.Logf("Deleted function %q", fnc.GetName()) + }) + + // create XRD and verify it becomes established/offered + xrd := createAndTestXRD(ctx, t, kube) + + // create a composition that will create NopResources and patch/transform + // values in an identical way to the TestCompositeResource test, but using + // Pipeline mode that exercises functions (specifically + // function-patch-and-transform in this case). + comp := &extv1.Composition{ + ObjectMeta: metav1.ObjectMeta{ + Name: internal.SuiteName, + Labels: map[string]string{ + "crossplane.io/test": internal.SuiteName, + }, + }, + Spec: extv1.CompositionSpec{ + CompositeTypeRef: extv1.TypeReference{ + APIVersion: "test.crossplane.io/v1alpha1", + Kind: "ClusterConformance", + }, + Mode: ptr.To(extv1.CompositionModePipeline), + Pipeline: []extv1.PipelineStep{ + { + Step: "compose-resources", + FunctionRef: extv1.FunctionReference{ + Name: fnc.GetName(), + }, + // the raw input below was obtained by taking the runtime + // yaml of the composition used in the TestCompositeResource + // test and running crossplane beta convert + // pipeline-composition on it, then converting that yaml + // output to json. + Input: &runtime.RawExtension{ + Raw: []byte(fmt.Sprintf(`{ + "apiVersion": "pt.fn.crossplane.io/v1beta1", + "environment": null, + "kind": "Resources", + "patchSets": [ + { + "name": "fromcomposite", + "patches": [ + { + "fromFieldPath": "spec.parameters.a", + "policy": { + "fromFieldPath": "Required" + }, + "toFieldPath": "metadata.annotations[nop.crossplane.io/a]", + "transforms": [ + { + "map": { + "a": "A" + }, + "type": "map" + } + ], + "type": "FromCompositeFieldPath" + }, + { + "fromFieldPath": "spec.parameters.b", + "policy": { + "fromFieldPath": "Required" + }, + "toFieldPath": "metadata.annotations[nop.crossplane.io/b]", + "transforms": [ + { + "math": { + "multiply": 2, + "type": "Multiply" + }, + "type": "math" + }, + { + "convert": { + "toType": "string" + }, + "type": "convert" + } + ], + "type": "FromCompositeFieldPath" + }, + { + "fromFieldPath": "spec.parameters.c", + "policy": { + "fromFieldPath": "Required" + }, + "toFieldPath": "metadata.annotations[nop.crossplane.io/c]", + "transforms": [ + { + "convert": { + "toType": "string" + }, + "type": "convert" + } + ], + "type": "FromCompositeFieldPath" + } + ] + }, + { + "name": "tocomposite", + "patches": [ + { + "fromFieldPath": "metadata.annotations[nop.crossplane.io/a]", + "toFieldPath": "status.a", + "type": "ToCompositeFieldPath" + }, + { + "fromFieldPath": "metadata.annotations[nop.crossplane.io/b]", + "toFieldPath": "status.b", + "transforms": [ + { + "convert": { + "toType": "int" + }, + "type": "convert" + } + ], + "type": "ToCompositeFieldPath" + }, + { + "fromFieldPath": "metadata.annotations[nop.crossplane.io/c]", + "toFieldPath": "status.c", + "transforms": [ + { + "convert": { + "toType": "bool" + }, + "type": "convert" + } + ], + "type": "ToCompositeFieldPath" + } + ] + } + ], + "resources": [ + { + "base": { + "apiVersion": "nop.crossplane.io/v1alpha1", + "kind": "NopResource", + "spec": { + "forProvider": { + "conditionAfter": [ + { + "conditionStatus": "True", + "conditionType": "Ready", + "time": "1s" + } + ] + }, + "writeConnectionSecretToRef": { + "namespace": "%s" + } + } + }, + "connectionDetails": [ + { + "name": "%s", + "type": "FromValue", + "value": "%s" + } + ], + "name": "nop", + "patches": [ + { + "fromFieldPath": "metadata.uid", + "toFieldPath": "spec.writeConnectionSecretToRef.name", + "transforms": [ + { + "string": { + "fmt": "%%s-nopresource", + "type": "Format" + }, + "type": "string" + } + ], + "type": "FromCompositeFieldPath" + }, + { + "patchSetName": "fromcomposite", + "type": "PatchSet" + }, + { + "patchSetName": "tocomposite", + "type": "PatchSet" + } + ], + "readinessChecks": [ + { + "matchCondition": { + "status": "True", + "type": "Ready" + }, + "type": "MatchCondition" + } + ] + } + ] + }`, internal.SuiteName, internal.SuiteName, internal.SuiteName)), + }, + }, + }, + WriteConnectionSecretsToNamespace: ptr.To(internal.SuiteName), + }, + } + if err := kube.Create(ctx, comp); err != nil { + t.Fatalf("Create composition %q: %v", comp.GetName(), err) + } + t.Logf("Created composition %q", comp.GetName()) + + t.Cleanup(func() { + t.Logf("Cleaning up composition %q.", comp.GetName()) + if err := kube.Get(ctx, types.NamespacedName{Name: comp.GetName()}, comp); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Get composition %q: %v", comp.GetName(), err) + } + if err := kube.Delete(ctx, comp); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Delete composition %q: %v", comp.GetName(), err) + } + t.Logf("Deleted composition %q", comp.GetName()) + }) + + // create a namespace for the claim to live in + createNamespace(ctx, t, kube) + + // create the claim and wait for it to become ready + xrc := createAndTestClaim(ctx, t, kube, xrd) + + // test the composite resource, wait for it to become ready + testXR(ctx, t, kube, xrd, xrc) +} + +func createProvider(ctx context.Context, t *testing.T, kube client.Client) { + t.Helper() + prv := &pkgv1.Provider{ + ObjectMeta: metav1.ObjectMeta{Name: internal.SuiteName}, + Spec: pkgv1.ProviderSpec{ + PackageSpec: pkgv1.PackageSpec{ + Package: "xpkg.upbound.io/crossplane-contrib/provider-nop:v0.2.1", + IgnoreCrossplaneConstraints: ptr.To(true), + }, + }, + } + + if err := kube.Create(ctx, prv); err != nil { + t.Fatalf("Create provider %q: %v", prv.GetName(), err) + } + t.Logf("Created provider %q", prv.GetName()) + + t.Cleanup(func() { + t.Logf("Cleaning up provider %q.", prv.GetName()) + if err := kube.Get(ctx, types.NamespacedName{Name: prv.GetName()}, prv); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Get provider %q: %v", prv.GetName(), err) + } + if err := kube.Delete(ctx, prv); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Delete provider %q: %v", prv.GetName(), err) + } + t.Logf("Deleted provider %q", prv.GetName()) + }) +} + +func createAndTestXRD(ctx context.Context, t *testing.T, kube client.Client) *extv1.CompositeResourceDefinition { + t.Helper() + xrd := &extv1.CompositeResourceDefinition{ + ObjectMeta: metav1.ObjectMeta{Name: "clusterconformances.test.crossplane.io"}, + Spec: extv1.CompositeResourceDefinitionSpec{ + Group: "test.crossplane.io", + Names: kextv1.CustomResourceDefinitionNames{ + Kind: "ClusterConformance", + ListKind: "ClusterConformanceList", + Plural: "clusterconformances", + Singular: "clusterconformance", + }, + ClaimNames: &kextv1.CustomResourceDefinitionNames{ + Kind: "Conformance", + ListKind: "ConformanceList", + Plural: "conformances", + Singular: "conformance", + }, + ConnectionSecretKeys: []string{internal.SuiteName}, + Versions: []extv1.CompositeResourceDefinitionVersion{{ + Name: "v1alpha1", + Served: true, + Referenceable: true, + Schema: &extv1.CompositeResourceValidation{ + OpenAPIV3Schema: runtime.RawExtension{Raw: []byte(`{ + "type": "object", + "properties": { + "spec": { + "type": "object", + "properties": { + "parameters": { + "type": "object", + "properties": { + "a": {"type": "string"}, + "b": {"type": "integer"}, + "c": {"type": "boolean"} + } + } + }, + "required": ["parameters"] + }, + "status": { + "type": "object", + "properties": { + "a": {"type": "string"}, + "b": {"type": "integer"}, + "c": {"type": "boolean"} + } + } + } + }`)}, + }, + }}, + }, + } + // XRDs take a while to delete, so we try a few times in case creates are + // failing due to an old XRD hanging around. + if err := wait.PollUntilContextTimeout(ctx, 10*time.Second, 60*time.Second, true, func(ctx context.Context) (done bool, err error) { + if err := kube.Create(ctx, xrd); err != nil { + t.Logf("Create XRD %q: %v", xrd.GetName(), err) + return false, nil + } + return true, nil + }); err != nil { + t.Fatalf("Create XRD %q: %v", xrd.GetName(), err) + } + t.Logf("Created XRD %q", xrd.GetName()) + + t.Cleanup(func() { + t.Logf("Cleaning up XRD %q.", xrd.GetName()) + if err := kube.Get(ctx, types.NamespacedName{Name: xrd.GetName()}, xrd); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Get XRD %q: %v", xrd.GetName(), err) + } + if err := kube.Delete(ctx, xrd); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Delete XRD %q: %v", xrd.GetName(), err) + } + t.Logf("Deleted XRD %q", xrd.GetName()) + }) + + t.Log("Waiting for the XRD's Established and Offered status conditions to become 'True'.") + if err := wait.PollUntilContextTimeout(ctx, 10*time.Second, 60*time.Second, true, func(ctx context.Context) (done bool, err error) { + if err := kube.Get(ctx, types.NamespacedName{Name: xrd.GetName()}, xrd); err != nil { + return false, err + } + + if xrd.Status.GetCondition(extv1.TypeEstablished).Status != corev1.ConditionTrue { + t.Logf("XRD %q is not yet Established", xrd.GetName()) + return false, nil + } + + if xrd.Status.GetCondition(extv1.TypeOffered).Status != corev1.ConditionTrue { + t.Logf("XRD %q is not yet Offered", xrd.GetName()) + return false, nil + } + + t.Logf("XRD %q is Established and Offered", xrd.GetName()) + return true, nil + }); err != nil { + t.Errorf("XRD %q never became Established and Offered: %v", xrd.GetName(), err) + } + + return xrd +} + +func createNamespace(ctx context.Context, t *testing.T, kube client.Client) { + t.Helper() + ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: internal.SuiteName}} + if err := kube.Create(ctx, ns); err != nil { + t.Fatalf("Create namespace %q: %v", ns.GetName(), err) + } + t.Logf("Created namespace %q", ns.GetName()) + + t.Cleanup(func() { + t.Logf("Cleaning up namespace %q.", ns.GetName()) + if err := kube.Get(ctx, types.NamespacedName{Name: ns.GetName()}, ns); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Get namespace %q: %v", ns.GetName(), err) + } + if err := kube.Delete(ctx, ns); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Delete namespace %q: %v", ns.GetName(), err) + } + t.Logf("Deleted namespace %q", ns.GetName()) + }) +} + +func createAndTestClaim(ctx context.Context, t *testing.T, kube client.Client, xrd *extv1.CompositeResourceDefinition) *claim.Unstructured { + t.Helper() + xrc := claim.New(claim.WithGroupVersionKind(schema.GroupVersionKind{ + Group: xrd.Spec.Group, + Version: xrd.Spec.Versions[0].Name, + Kind: xrd.Spec.ClaimNames.Kind, + })) + + xrc.SetNamespace(internal.SuiteName) + xrc.SetName(internal.SuiteName) + xrc.SetCompositionSelector(&metav1.LabelSelector{MatchLabels: map[string]string{"crossplane.io/test": internal.SuiteName}}) + xrc.SetWriteConnectionSecretToReference(&xpv1.LocalSecretReference{Name: internal.SuiteName}) + + paved := fieldpath.Pave(xrc.Object) + _ = paved.SetString("spec.parameters.a", "a") + _ = paved.SetNumber("spec.parameters.b", 1) + _ = paved.SetBool("spec.parameters.c", true) + + if err := kube.Create(ctx, xrc); err != nil { + t.Fatalf("Create claim %q: %v", xrc.GetName(), err) + } + t.Logf("Created claim %q", xrc.GetName()) + + t.Cleanup(func() { + t.Logf("Cleaning up claim %q.", xrc.GetName()) + if err := kube.Get(ctx, types.NamespacedName{Namespace: xrc.GetNamespace(), Name: xrc.GetName()}, xrc); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Get claim %q: %v", xrc.GetName(), err) + } + if err := kube.Delete(ctx, xrc); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Delete claim %q: %v", xrc.GetName(), err) + } + t.Logf("Deleted claim %q", xrc.GetName()) + }) + + t.Run("ClaimBecomesReady", func(t *testing.T) { + // Becoming Ready implies the claim selects a composition and creates an + // XR that successfully composes resources. + t.Log("Testing that the claim becomes Ready.") + if err := wait.PollUntilContextTimeout(ctx, 15*time.Second, 2*time.Minute, true, func(ctx context.Context) (done bool, err error) { + if err := kube.Get(ctx, types.NamespacedName{Namespace: xrc.GetNamespace(), Name: xrc.GetName()}, xrc); err != nil { + return false, err + } + + if xrc.GetCondition(xpv1.TypeReady).Status != corev1.ConditionTrue { + t.Logf("Claim %q is not yet Ready", xrc.GetName()) + return false, nil + } + + if xrc.GetResourceReference() == nil { + t.Logf("Claim %q did not populate its resource reference", xrc.GetName()) + return false, nil + } + + paved := fieldpath.Pave(xrc.Object) + if a, _ := paved.GetString("status.a"); a != "A" { + t.Logf("Claim %q status.a: want %q, got %q", xrc.GetName(), "A", a) + return false, nil + } + if b, _ := paved.GetInteger("status.b"); b != 2 { + t.Logf("Claim %q status.b: want %d, got %d", xrc.GetName(), 2, b) + return false, nil + } + if c, _ := paved.GetBool("status.c"); c != true { + t.Logf("Claim %q status.c: want %t, got %t", xrc.GetName(), true, c) + return false, nil + } + + // TODO(negz): Ensure the claim's compositionRef is set once + // https://github.com/crossplane/crossplane/issues/2263 is fixed. + + t.Logf("Claim %q is Ready", xrc.GetName()) + return true, nil + }); err != nil { + t.Errorf("Claim %q never became Ready: %v", xrc.GetName(), err) + } + }) + + t.Run("ClaimHasConnectionSecret", func(t *testing.T) { + t.Log("Testing that the claim writes the expected connection secret.") + + s := &corev1.Secret{} + if err := kube.Get(ctx, types.NamespacedName{Namespace: xrc.GetNamespace(), Name: internal.SuiteName}, s); err != nil { + t.Errorf("Get secret %q: %v", internal.SuiteName, err) + } + + want := map[string][]byte{internal.SuiteName: []byte(internal.SuiteName)} + if diff := cmp.Diff(want, s.Data); diff != "" { + t.Errorf("Claim %q connection secret %q: -want, +got\n%s", xrc.GetName(), s.GetName(), diff) + } + }) + + return xrc +} + +func testXR(ctx context.Context, t *testing.T, kube client.Client, xrd *extv1.CompositeResourceDefinition, xrc *claim.Unstructured) { + t.Helper() + xrSecretRef := &xpv1.SecretReference{} + t.Run("CompositeBecomesReady", func(t *testing.T) { + t.Log("Testing that the composite resource becomes Ready.") + + xr := composite.New(composite.WithGroupVersionKind(schema.GroupVersionKind{ + Group: xrd.Spec.Group, + Version: xrd.Spec.Versions[0].Name, + Kind: xrd.Spec.Names.Kind, + })) + + if err := wait.PollUntilContextTimeout(ctx, 15*time.Second, 2*time.Minute, true, func(ctx context.Context) (done bool, err error) { + if err := kube.Get(ctx, types.NamespacedName{Name: xrc.GetResourceReference().Name}, xr); err != nil { + return false, err + } + + if xr.GetCondition(xpv1.TypeReady).Status != corev1.ConditionTrue { + t.Logf("Composite resource %q is not yet Ready", xr.GetName()) + return false, nil + } + + xrSecretRef = xr.GetWriteConnectionSecretToReference() + if xrSecretRef == nil { + t.Logf("Composite resource %q does not specify a connection secret", xr.GetName()) + return false, nil + } + + t.Logf("Composite resource %q is Ready", xr.GetName()) + return true, nil + }); err != nil { + t.Errorf("Composite resource %q never became Ready: %v", xr.GetName(), err) + } + }) + t.Run("CompositeHasConnectionSecret", func(t *testing.T) { + t.Log("Testing that the composite resource writes the expected connection secret.") + + s := &corev1.Secret{} + if err := kube.Get(ctx, types.NamespacedName{Namespace: xrSecretRef.Namespace, Name: xrSecretRef.Name}, s); err != nil { + t.Errorf("Get secret %q: %v", internal.SuiteName, err) + } + + want := map[string][]byte{internal.SuiteName: []byte(internal.SuiteName)} + if diff := cmp.Diff(want, s.Data); diff != "" { + t.Errorf("Composite resource %q connection secret %q: -want, +got\n%s", xrc.GetResourceReference().Name, s.GetName(), diff) + } + }) +} + +func asJSON(t *testing.T, val interface{}) kextv1.JSON { + t.Helper() + raw, err := json.Marshal(val) + if err != nil { + t.Fatal(err) + } + res := kextv1.JSON{} + if err := json.Unmarshal(raw, &res); err != nil { + t.Fatal(err) + } + return res +} diff --git a/crossplane/configuration_test.go b/tests/configuration_test.go similarity index 87% rename from crossplane/configuration_test.go rename to tests/configuration_test.go index 93c6c74..8de137e 100644 --- a/crossplane/configuration_test.go +++ b/tests/configuration_test.go @@ -25,12 +25,11 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" + "github.com/crossplane/conformance/internal" "github.com/crossplane/crossplane-runtime/pkg/resource" pkgv1 "github.com/crossplane/crossplane/apis/pkg/v1" - - "github.com/crossplane/conformance/internal" ) func TestConfiguration(t *testing.T) { @@ -45,17 +44,17 @@ func TestConfiguration(t *testing.T) { // This configuration is defined in the testdata/configuration directory // of this repository. It is built and pushed by CI/CD. cfg := &pkgv1.Configuration{ - ObjectMeta: metav1.ObjectMeta{Name: internal.SuiteName}, + ObjectMeta: metav1.ObjectMeta{Name: internal.SuiteName + "-configuration"}, Spec: pkgv1.ConfigurationSpec{ PackageSpec: pkgv1.PackageSpec{ - Package: "crossplane/conformance-testdata-configuration:latest", - IgnoreCrossplaneConstraints: pointer.BoolPtr(true), + Package: "index.docker.io/crossplane/conformance-testdata-configuration:latest", + IgnoreCrossplaneConstraints: ptr.To(true), }, }, } - // The crossplane-conformance provider depends on negz/provider-nop. - prv := &pkgv1.Provider{ObjectMeta: metav1.ObjectMeta{Name: "negz-provider-nop"}} + // The crossplane-conformance provider depends on xpkg.upbound.io/crossplane-contrib/provider-nop. + prv := &pkgv1.Provider{ObjectMeta: metav1.ObjectMeta{Name: "crossplane-contrib-provider-nop"}} if err := kube.Create(ctx, cfg); err != nil { t.Fatalf("Create configuration %q: %v", cfg.GetName(), err) @@ -86,7 +85,7 @@ func TestConfiguration(t *testing.T) { t.Run("BecomesInstalledAndHealthy", func(t *testing.T) { t.Log("Testing that the configuration's Healthy and Installed status conditions become 'True'.") - if err := wait.PollImmediate(10*time.Second, 90*time.Second, func() (done bool, err error) { + if err := wait.PollUntilContextTimeout(ctx, 10*time.Second, 90*time.Second, true, func(ctx context.Context) (done bool, err error) { if err := kube.Get(ctx, types.NamespacedName{Name: cfg.GetName()}, cfg); err != nil { return false, err } @@ -111,15 +110,13 @@ func TestConfiguration(t *testing.T) { t.Run("RevisionBecomesHealthyAndDeploysObjects", func(t *testing.T) { t.Log("Testing that the configuration's revision's Healthy status condition becomes 'True', and that it deploys its objects.") - if err := wait.PollImmediate(10*time.Second, 90*time.Second, func() (done bool, err error) { + if err := wait.PollUntilContextTimeout(ctx, 10*time.Second, 90*time.Second, true, func(ctx context.Context) (done bool, err error) { l := &pkgv1.ConfigurationRevisionList{} if err := kube.List(ctx, l); err != nil { return false, err } for _, rev := range l.Items { - rev := rev // To avoid using the range var in a fn literal. - for _, o := range rev.GetOwnerReferences() { // This is not the revision we're looking for. if o.Name != cfg.GetName() { @@ -168,7 +165,7 @@ func TestConfiguration(t *testing.T) { t.Run("DependencyBecomesInstalledAndHealthy", func(t *testing.T) { t.Log("Testing that the configuration's dependencies' Healthy and Installed status conditions become 'True'.") - if err := wait.PollImmediate(10*time.Second, 90*time.Second, func() (done bool, err error) { + if err := wait.PollUntilContextTimeout(ctx, 10*time.Second, 90*time.Second, true, func(ctx context.Context) (done bool, err error) { if err := kube.Get(ctx, types.NamespacedName{Name: prv.GetName()}, prv); err != nil { // Most likely the provider hasn't been created yet. if kerrors.IsNotFound(err) { diff --git a/crossplane/customresources_test.go b/tests/customresources_test.go similarity index 97% rename from crossplane/customresources_test.go rename to tests/customresources_test.go index be29bca..74d5812 100644 --- a/crossplane/customresources_test.go +++ b/tests/customresources_test.go @@ -46,7 +46,6 @@ func TestCustomResourceDefinitions(t *testing.T) { cmp := kextv1.CustomResourceDefinition{ObjectMeta: metav1.ObjectMeta{Name: "compositions.apiextensions.crossplane.io"}} for _, crd := range []kextv1.CustomResourceDefinition{cfg, cfgRev, prv, prvRev, xrd, cmp} { - crd := crd // Don't take the address of a range var. if err := kube.Get(ctx, types.NamespacedName{Name: crd.GetName()}, &crd); err != nil { t.Errorf("Cannot get CRD %q: %v", crd.GetName(), err) continue diff --git a/tests/function_test.go b/tests/function_test.go new file mode 100644 index 0000000..48a8222 --- /dev/null +++ b/tests/function_test.go @@ -0,0 +1,149 @@ +// Copyright 2024 The Crossplane Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package crossplane + +import ( + "context" + "testing" + "time" + + corev1 "k8s.io/api/core/v1" + kerrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/utils/ptr" + + "github.com/crossplane/conformance/internal" + "github.com/crossplane/crossplane-runtime/pkg/resource" + pkgv1 "github.com/crossplane/crossplane/apis/pkg/v1" +) + +func TestFunction(t *testing.T) { + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) + t.Cleanup(cancel) + + kube, err := internal.NewClient() + if err != nil { + t.Fatalf("Create client: %v", err) + } + + fnc := &pkgv1.Function{ + ObjectMeta: metav1.ObjectMeta{Name: internal.SuiteName + "-function"}, + Spec: pkgv1.FunctionSpec{ + PackageSpec: pkgv1.PackageSpec{ + Package: "xpkg.upbound.io/crossplane-contrib/function-patch-and-transform:v0.7.0", + IgnoreCrossplaneConstraints: ptr.To(true), + }, + }, + } + + if err := kube.Create(ctx, fnc); err != nil { + t.Fatalf("Create function %q: %v", fnc.GetName(), err) + } + t.Logf("Created function %q", fnc.GetName()) + + t.Cleanup(func() { + t.Logf("Cleaning up function %q.", fnc.GetName()) + if err := kube.Get(ctx, types.NamespacedName{Name: fnc.GetName()}, fnc); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Get function %q: %v", fnc.GetName(), err) + } + if err := kube.Delete(ctx, fnc); resource.IgnoreNotFound(err) != nil { + t.Fatalf("Delete function %q: %v", fnc.GetName(), err) + } + t.Logf("Deleted function %q", fnc.GetName()) + }) + + t.Run("BecomesInstalledAndHealthy", func(t *testing.T) { + t.Log("Testing that the function's Healthy and Installed status conditions become 'True'.") + if err := wait.PollUntilContextTimeout(ctx, 10*time.Second, 90*time.Second, true, func(ctx context.Context) (done bool, err error) { + if err := kube.Get(ctx, types.NamespacedName{Name: fnc.GetName()}, fnc); err != nil { + return false, err + } + + if fnc.GetCondition(pkgv1.TypeHealthy).Status != corev1.ConditionTrue { + t.Logf("Function %q is not yet Healthy", fnc.GetName()) + return false, nil + } + + if fnc.GetCondition(pkgv1.TypeInstalled).Status != corev1.ConditionTrue { + t.Logf("Function %q is not yet Installed", fnc.GetName()) + return false, nil + } + + t.Logf("Function %q is Healthy and Installed", fnc.GetName()) + return true, nil + }); err != nil { + t.Errorf("Function %q never became Healthy and Installed: %v", fnc.GetName(), err) + } + }) + + t.Run("RevisionBecomesHealthyAndDeploysObjects", func(t *testing.T) { + t.Log("Testing that the function's revision's Healthy status condition becomes 'True', and that it deploys its objects.") + + if err := wait.PollUntilContextTimeout(ctx, 10*time.Second, 90*time.Second, true, func(ctx context.Context) (done bool, err error) { + l := &pkgv1.FunctionRevisionList{} + if err := kube.List(ctx, l); err != nil { + return false, err + } + + for _, rev := range l.Items { + for _, o := range rev.GetOwnerReferences() { + // This is not the revision we're looking for. + if o.Name != fnc.GetName() { + continue + } + t.Logf("Found revision %q owned by function %q", rev.GetName(), fnc.GetName()) + + if rev.GetCondition(pkgv1.TypeHealthy).Status != corev1.ConditionTrue { + t.Logf("Revision %q is not yet Healthy", rev.GetName()) + return false, nil + } + + t.Logf("Revision %q is Healthy", rev.GetName()) + + // We expect the revision to deploy one object - the CRD of + // the Resources function input object. + if len(rev.Status.ObjectRefs) != 1 { + t.Logf("Revision %q has deployed %d objects, want %d", rev.GetName(), len(rev.Status.ObjectRefs), 1) + return false, nil + } + + for _, ref := range rev.Status.ObjectRefs { + u := &unstructured.Unstructured{} + u.SetAPIVersion(ref.APIVersion) + u.SetKind(ref.Kind) + + if err := kube.Get(ctx, types.NamespacedName{Name: ref.Name}, u); err != nil { + if kerrors.IsNotFound(err) { + t.Logf("Revision %q has not yet been created %s %q", rev.GetName(), ref.Kind, ref.Name) + return false, nil + } + return false, err + } + t.Logf("Revision %q created %s %q", rev.GetName(), ref.Kind, ref.Name) + } + + return true, nil + } + } + + return false, nil + }); err != nil { + t.Errorf("Function %q's revision never became Healthy and deployed its objects: %v", fnc.GetName(), err) + } + }) +} diff --git a/crossplane/provider_test.go b/tests/provider_test.go similarity index 88% rename from crossplane/provider_test.go rename to tests/provider_test.go index 8623ad0..ec25036 100644 --- a/crossplane/provider_test.go +++ b/tests/provider_test.go @@ -25,12 +25,11 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" + "github.com/crossplane/conformance/internal" "github.com/crossplane/crossplane-runtime/pkg/resource" pkgv1 "github.com/crossplane/crossplane/apis/pkg/v1" - - "github.com/crossplane/conformance/internal" ) func TestProvider(t *testing.T) { @@ -42,14 +41,12 @@ func TestProvider(t *testing.T) { t.Fatalf("Create client: %v", err) } - // TODO(negz): Use the other provider-nop from contrib once it's ready. - // https://github.com/crossplane-contrib/provider-nop prv := &pkgv1.Provider{ - ObjectMeta: metav1.ObjectMeta{Name: internal.SuiteName}, + ObjectMeta: metav1.ObjectMeta{Name: internal.SuiteName + "-provider"}, Spec: pkgv1.ProviderSpec{ PackageSpec: pkgv1.PackageSpec{ - Package: "negz/provider-nop:v0.1.0", - IgnoreCrossplaneConstraints: pointer.BoolPtr(true), + Package: "xpkg.upbound.io/crossplane-contrib/provider-nop:v0.2.1", + IgnoreCrossplaneConstraints: ptr.To(true), }, }, } @@ -72,7 +69,7 @@ func TestProvider(t *testing.T) { t.Run("BecomesInstalledAndHealthy", func(t *testing.T) { t.Log("Testing that the provider's Healthy and Installed status conditions become 'True'.") - if err := wait.PollImmediate(10*time.Second, 90*time.Second, func() (done bool, err error) { + if err := wait.PollUntilContextTimeout(ctx, 10*time.Second, 90*time.Second, true, func(ctx context.Context) (done bool, err error) { if err := kube.Get(ctx, types.NamespacedName{Name: prv.GetName()}, prv); err != nil { return false, err } @@ -97,15 +94,13 @@ func TestProvider(t *testing.T) { t.Run("RevisionBecomesHealthyAndDeploysObjects", func(t *testing.T) { t.Log("Testing that the provider's revision's Healthy status condition becomes 'True', and that it deploys its objects.") - if err := wait.PollImmediate(10*time.Second, 90*time.Second, func() (done bool, err error) { + if err := wait.PollUntilContextTimeout(ctx, 10*time.Second, 90*time.Second, true, func(ctx context.Context) (done bool, err error) { l := &pkgv1.ProviderRevisionList{} if err := kube.List(ctx, l); err != nil { return false, err } for _, rev := range l.Items { - rev := rev // To avoid using the range var in a fn literal. - for _, o := range rev.GetOwnerReferences() { // This is not the revision we're looking for. if o.Name != prv.GetName() { diff --git a/crossplane/version_test.go b/tests/version_test.go similarity index 92% rename from crossplane/version_test.go rename to tests/version_test.go index 902fd8b..6c0e81a 100644 --- a/crossplane/version_test.go +++ b/tests/version_test.go @@ -22,5 +22,5 @@ import ( func TestVersion(t *testing.T) { // Not really a test, but we want somewhere to log this. - t.Logf("Conformance test version: %s", internal.Version) + t.Logf("Conformance test version: %s", internal.Version()) }