diff --git a/.github/workflows/commits.yml b/.github/workflows/commits.yml new file mode 100644 index 0000000..853cbf2 --- /dev/null +++ b/.github/workflows/commits.yml @@ -0,0 +1,47 @@ +name: Commits +on: + - pull_request + +permissions: + contents: read + +jobs: + dco-check: + permissions: + pull-requests: read # for tim-actions/get-pr-commits to get list of commits from the PR + name: Signed-off-by (DCO) + runs-on: ubuntu-22.04 + steps: + - name: Get PR Commits + id: 'get-pr-commits' + uses: tim-actions/get-pr-commits@master + with: + token: ${{ secrets.GITHUB_TOKEN }} + + - name: Check that all commits are signed-off + uses: tim-actions/dco@master + with: + commits: ${{ steps.get-pr-commits.outputs.commits }} + + target-branch: + permissions: + contents: none + name: Branch target + runs-on: ubuntu-22.04 + steps: + - name: Check branch target + env: + TARGET: ${{ github.event.pull_request.base.ref }} + TITLE: ${{ github.event.pull_request.title }} + run: | + set -eux + TARGET_FROM_PR_TITLE="$(echo "${TITLE}" | sed -n 's/.*(\(stable-[0-9]\.[0-9]\))$/\1/p')" + if [ -z "${TARGET_FROM_PR_TITLE}" ]; then + TARGET_FROM_PR_TITLE="main" + else + echo "Branch target overridden from PR title" + fi + [ "${TARGET}" = "${TARGET_FROM_PR_TITLE}" ] && exit 0 + + echo "Invalid branch target: ${TARGET} != ${TARGET_FROM_PR_TITLE}" + exit 1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 9f5dbff..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,47 +0,0 @@ -# This GitHub action can publish assets for release when a tag is created. -# Currently its setup to run on any tag that matches the pattern "v*" (ie. v0.1.0). -# -# This uses an action (paultyng/ghaction-import-gpg) that assumes you set your -# private key in the `GPG_PRIVATE_KEY` secret and passphrase in the `PASSPHRASE` -# secret. If you would rather own your own GPG handling, please fork this action -# or use an alternative one for key handling. -# -# You will need to pass the `--batch` flag to `gpg` in your signing step -# in `goreleaser` to indicate this is being used in a non-interactive mode. -# -name: release -on: - push: - tags: - - "v*" - -jobs: - goreleaser: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Unshallow - run: git fetch --prune --unshallow - - - name: Set up Go - uses: actions/setup-go@v5 - with: - go-version: "1.21" - - - name: Import GPG key - id: import_gpg - uses: crazy-max/ghaction-import-gpg@v6 - with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.PASSPHRASE }} - - - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v5 - with: - version: latest - args: release --clean - env: - GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1c9fd72..baf1bd3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,11 +22,9 @@ jobs: matrix: go-version: - "1.21" - channel: - - 5.0/stable - - 5.0/candidate - - latest/stable - - latest/candidate + incus-version: + - daily + - stable env: TF_ACC: "1" @@ -37,7 +35,6 @@ jobs: LXD_GENERATE_CLIENT_CERTS: "true" LXD_ACCEPT_SERVER_CERTIFICATE: "true" LXD_SCHEME: https - LXD_PASSWORD: the-password steps: - uses: actions/checkout@v4 @@ -46,31 +43,29 @@ jobs: with: go-version: ${{ matrix.go-version }} - - name: Setup LXD from ${{ matrix.channel }} channel + - name: Setup Incus from ${{ matrix.incus-version }} repository run: | - sudo snap refresh lxd --channel=${{ matrix.channel }} - sudo lxd waitready --timeout 60 - sudo lxd init --auto --trust-password="$LXD_PASSWORD" --network-port="$LXD_PORT" --network-address="$LXD_ADDR" - sudo chmod 777 /var/snap/lxd/common/lxd/unix.socket - - # 5.0/* currently use core20 which ships with a buggy lvm2 package so - # if the base used by the LXD snap is core20, use the external lvm provider - # which is the one installed on the runner machine. Since there are plans - # to switch 5.0/* to using core22, it's best to autodetect this condition. - if snap info lxd --verbose | grep -qxE 'base:\s+core20'; then - echo "WARN: Using external lvm command to workaround bug in core20" >&2 - sudo snap set lxd lvm.external=true - sudo snap restart --reload lxd - fi + sudo apt-get update + sudo apt-get install --no-install-recommends --yes \ + zfsutils-linux \ + bind9-dnsutils \ + jq + sudo apt-get remove --purge uidmap --yes + sudo rm -f /etc/subuid /etc/subgid + + curl -sL https://pkgs.zabbly.com/get/incus-${{ matrix.incus-version }} | sudo sh + sudo chmod 666 /var/lib/incus/unix.socket + sudo incus admin init --auto --network-port="$LXD_PORT" --network-address="$LXD_ADDR" + + LXD_TOKEN=$(incus config trust add terraform --quiet) + incus remote add localhost "${LXD_TOKEN}" - name: Configure OVN run: | sudo apt-get update sudo apt-get install --no-install-recommends --yes \ ovn-host \ - ovn-central \ - bind9-dnsutils \ - jq + ovn-central sudo ovs-vsctl set open_vswitch . \ external_ids:ovn-remote=unix:/var/run/ovn/ovnsb_db.sock \ @@ -84,7 +79,8 @@ jobs: - uses: hashicorp/setup-terraform@v3 with: terraform_wrapper: false - - run: make test + - run: | + make test build-platforms: runs-on: ubuntu-22.04 diff --git a/Makefile b/Makefile index f47200b..acf927e 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +GO ?= go GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor) TARGETS=darwin/amd64 freebsd/386 freebsd/amd64 freebsd/arm linux/386 linux/amd64 linux/arm openbsd/386 openbsd/amd64 windows/386 windows/amd64 TF_LOG?=error @@ -5,14 +6,14 @@ TF_LOG?=error default: build test: - go get -d -t ./... - go test -parallel $$(nproc) -race -timeout 60m -v ./internal/... + $(GO) get -d -t ./... + $(GO) test -parallel $$(nproc) -race -timeout 60m -v ./internal/... testacc: - TF_LOG=$(TF_LOG) TF_ACC=1 go test -parallel 4 -v -race $(TESTARGS) -timeout 60m ./internal/... + TF_LOG=$(TF_LOG) TF_ACC=1 $(GO) test -parallel 4 -v -race $(TESTARGS) -timeout 60m ./internal/... build: - go build -v + $(GO) build -v targets: gox -osarch='$(TARGETS)' -output="dist/{{.OS}}_{{.Arch}}/terraform-provider-lxd_${TRAVIS_TAG}_x4" @@ -21,11 +22,11 @@ targets: xargs -0 --verbose --replace={} zip -r -j "dist/terraform-provider-lxd_${TRAVIS_TAG}_{}.zip" "dist/{}" dev: - go build -v + $(GO) build -v vet: - @echo "go vet ." - @go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \ + @echo "$(GO) vet ." + @$(GO) vet $$($(GO) list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \ echo ""; \ echo "Vet found suspicious constructs. Please check the reported constructs"; \ echo "and fix them if necessary before submitting the code for review."; \ @@ -61,4 +62,11 @@ static-analysis: echo "Missing \"terraform\" command, not checking .tf format" >&2; \ fi +.PHONY: update-gomod +update-gomod: + $(GO) get -t -v -d -u ./... + $(GO) mod tidy --go=1.20 + $(GO) get toolchain@none + @echo "Dependencies updated" + .PHONY: build test testacc dev vet fmt fmtcheck targets diff --git a/docs/index.md b/docs/index.md index 2325f92..85c3e9f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -6,7 +6,7 @@ Use Terraform to manage LXD resources. This provider connects to the LXD daemon over local Unix socket or HTTPS. -It makes use of the [LXD client library](https://github.com/canonical/lxd), which +It makes use of the [LXD client library](https://github.com/lxc/incus), which currently looks in `~/snap/lxd/common/config` (and `~/.config/lxc`) for `client.crt` and `client.key` files to authenticate against the LXD daemon. diff --git a/go.mod b/go.mod index 97a4181..0a2e527 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,8 @@ -module github.com/terraform-lxd/terraform-provider-lxd +module github.com/lxc/terraform-provider-incus go 1.20 require ( - github.com/canonical/lxd v0.0.0-20230721084020-fa2ec65c7e2e github.com/dustinkirkland/golang-petname v0.0.0-20231002161417-6a283f1aaaf2 github.com/hashicorp/go-version v1.6.0 github.com/hashicorp/terraform-plugin-framework v1.4.2 @@ -11,32 +10,30 @@ require ( github.com/hashicorp/terraform-plugin-go v0.20.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.31.0 github.com/hashicorp/terraform-plugin-testing v1.6.0 + github.com/lxc/incus v0.3.0 github.com/mitchellh/go-homedir v1.1.0 github.com/stretchr/testify v1.8.4 golang.org/x/sys v0.15.0 ) require ( - github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect + github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect github.com/agext/levenshtein v1.2.3 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect - github.com/cloudflare/circl v1.3.3 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/fatih/color v1.15.0 // indirect - github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 // indirect - github.com/go-macaroon-bakery/macaroon-bakery/v3 v3.0.1 // indirect - github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect + github.com/cloudflare/circl v1.3.6 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/fatih/color v1.16.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/uuid v1.3.1 // indirect - github.com/gorilla/schema v1.2.0 // indirect - github.com/gorilla/securecookie v1.1.1 // indirect - github.com/gorilla/websocket v1.5.0 // indirect + github.com/google/uuid v1.5.0 // indirect + github.com/gorilla/schema v1.2.1 // indirect + github.com/gorilla/securecookie v1.1.2 // indirect + github.com/gorilla/websocket v1.5.1 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-checkpoint v0.5.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect - github.com/hashicorp/go-hclog v1.5.0 // indirect + github.com/hashicorp/go-hclog v1.6.2 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-plugin v1.6.0 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect @@ -49,15 +46,9 @@ require ( github.com/hashicorp/terraform-registry-address v0.2.3 // indirect github.com/hashicorp/terraform-svchost v0.1.1 // indirect github.com/hashicorp/yamux v0.1.1 // indirect - github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a // indirect - github.com/juju/persistent-cookiejar v1.0.0 // indirect - github.com/juju/schema v1.0.1 // indirect - github.com/juju/webbrowser v1.0.0 // indirect - github.com/julienschmidt/httprouter v1.3.0 // indirect - github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/kr/fs v0.1.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect @@ -65,34 +56,25 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/muhlemmer/gu v0.3.1 // indirect github.com/oklog/run v1.1.0 // indirect - github.com/pborman/uuid v1.2.1 // indirect - github.com/pkg/sftp v1.13.5 // indirect - github.com/pkg/xattr v0.4.9 // indirect + github.com/pkg/sftp v1.13.6 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/robfig/cron/v3 v3.0.1 // indirect - github.com/rogpeppe/fastuuid v1.2.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/zclconf/go-cty v1.14.1 // indirect - github.com/zitadel/oidc/v2 v2.7.0 // indirect + github.com/zitadel/oidc/v2 v2.12.0 // indirect golang.org/x/crypto v0.16.0 // indirect - golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect + golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.18.0 // indirect - golang.org/x/oauth2 v0.13.0 // indirect + golang.org/x/net v0.19.0 // indirect + golang.org/x/oauth2 v0.15.0 // indirect golang.org/x/term v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect google.golang.org/grpc v1.60.0 // indirect google.golang.org/protobuf v1.31.0 // indirect - gopkg.in/errgo.v1 v1.0.1 // indirect - gopkg.in/httprequest.v1 v1.2.1 // indirect - gopkg.in/juju/environschema.v1 v1.0.1 // indirect - gopkg.in/macaroon.v2 v2.1.0 // indirect - gopkg.in/retry.v1 v1.0.3 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 81c1c15..7e7bb4b 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,7 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= -github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg= -github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c h1:kMFnB0vCcX7IL/m9Y5LO+KQYv+t1CQOiFe6+SV2J7bE= +github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec= @@ -11,75 +9,46 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/canonical/lxd v0.0.0-20230721084020-fa2ec65c7e2e h1:ZEh99cE2usyShX3rlY1hPAsh/yGhZ66S38tfnmrXgJ8= -github.com/canonical/lxd v0.0.0-20230721084020-fa2ec65c7e2e/go.mod h1:vZcjHrzTRT0VxTaiQd93m1j3+4EOdv2zpnGH+xLvSY8= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= +github.com/cloudflare/circl v1.3.6 h1:/xbKIqSHbZXHwkhbrhrt2YOHIwYJlXH94E3tI/gDlUg= +github.com/cloudflare/circl v1.3.6/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= 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/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dustinkirkland/golang-petname v0.0.0-20231002161417-6a283f1aaaf2 h1:S6Dco8FtAhEI/qkg/00H6RdEGC+MCy5GPiQ+xweNRFE= github.com/dustinkirkland/golang-petname v0.0.0-20231002161417-6a283f1aaaf2/go.mod h1:8AuBTZBRSFqEYBPYULd+NN474/zZBLP+6WeT5S9xlAc= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= -github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= -github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 h1:fmFk0Wt3bBxxwZnu48jqMdaOR/IZ4vdtJFuaFV8MpIE= -github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3/go.mod h1:bJWSKrZyQvfTnb2OudyUjurSG4/edverV7n82+K3JiM= -github.com/frankban/quicktest v1.0.0/go.mod h1:R98jIehRai+d1/3Hv2//jOVCTJhW1VBavT6B6CuGq2k= -github.com/frankban/quicktest v1.2.2/go.mod h1:Qh/WofXFeiAFII1aEBu529AtJo6Zg2VHscnEsbBnJ20= -github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o= -github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y= -github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY= +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/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= github.com/go-git/go-git/v5 v5.10.1 h1:tu8/D8i+TWxgKpzQ3Vc43e+kkhXqtsZCKI/egajKnxk= -github.com/go-macaroon-bakery/macaroon-bakery/v3 v3.0.1 h1:uvQJoKTHrFFu8zxoaopNKedRzwdy3+8H72we4T/5cGs= -github.com/go-macaroon-bakery/macaroon-bakery/v3 v3.0.1/go.mod h1:H59IYeChwvD1po3dhGUPvq5na+4NVD7SJlbhGKvslr0= -github.com/go-macaroon-bakery/macaroonpb v1.0.0 h1:It9exBaRMZ9iix1iJ6gwzfwsDE6ExNuwtAJ9e09v6XE= -github.com/go-macaroon-bakery/macaroonpb v1.0.0/go.mod h1:UzrGOcbiwTXISFP2XDLDPjfhMINZa+fX/7A2lMd31zc= +github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.1.0/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.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -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.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= 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.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.2.1-0.20190312032427-6f77996f0c42/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -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.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= -github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -github.com/gorilla/schema v1.2.0 h1:YufUaxZYCKGFuAq3c96BOhjgd5nmXiOY9NGzF247Tsc= -github.com/gorilla/schema v1.2.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlIO2eleU= -github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/schema v1.2.1 h1:tjDxcmdb+siIqkTNoV+qRH2mjYdr2hHe5MKXbp61ziM= +github.com/gorilla/schema v1.2.1/go.mod h1:Dg5SSm5PV60mhF2NFaTV1xuYYj8tV8NOPRo4FggUMnM= +github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA= +github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -90,8 +59,8 @@ github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUKaCaGKZ/dR2roBXv0vKbSCnssIldfQdI= github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs= -github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= -github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-hclog v1.6.2 h1:NOtoftovWkDheyUM/8JW3QMiXyxJK3uHRK7wV04nD2I= +github.com/hashicorp/go-hclog v1.6.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-plugin v1.6.0 h1:wgd4KxHJTVGGqWBq4QPB1i5BZNEx9BR8+OFmHDmTk8A= @@ -132,31 +101,17 @@ github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbg github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jeremija/gosubmit v0.2.7 h1:At0OhGCFGPXyjPYAsCchoBUhE099pcBXmsb4iZqROIc= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= -github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a h1:45JtCyuNYE+QN9aPuR1ID9++BQU+NMTMudHSuaK0Las= -github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a/go.mod h1:RVHtZuvrpETIepiNUrNlih2OynoFf1eM6DGC6dloXzk= -github.com/juju/persistent-cookiejar v1.0.0 h1:Ag7+QLzqC2m+OYXy2QQnRjb3gTkEBSZagZ6QozwT3EQ= -github.com/juju/persistent-cookiejar v1.0.0/go.mod h1:zrbmo4nBKaiP/Ez3F67ewkMbzGYfXyMvRtbOfuAwG0w= -github.com/juju/qthttptest v0.1.1/go.mod h1:aTlAv8TYaflIiTDIQYzxnl1QdPjAg8Q8qJMErpKy6A4= -github.com/juju/qthttptest v0.1.3 h1:M0HdpwsK/UTHRGRcIw5zvh5z+QOgdqyK+ecDMN+swwM= -github.com/juju/schema v1.0.0/go.mod h1:Y+ThzXpUJ0E7NYYocAbuvJ7vTivXfrof/IfRPq/0abI= -github.com/juju/schema v1.0.1 h1:GBEiwxZQeoQuXI6gOTG58W/ZpdongMwl9pfZq1KcNgM= -github.com/juju/schema v1.0.1/go.mod h1:Y+ThzXpUJ0E7NYYocAbuvJ7vTivXfrof/IfRPq/0abI= -github.com/juju/webbrowser v1.0.0 h1:JLdmbFtCGY6Qf2jmS6bVaenJFGIFkdF1/BjUm76af78= -github.com/juju/webbrowser v1.0.0/go.mod h1:RwVlbBcF91Q4vS+iwlkJ6bZTE3EwlrjbYlM3WMVD6Bc= -github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= -github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= 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 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= 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/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/lxc/incus v0.3.0 h1:lEJxZHeCcNgjlNz5gsZoaTMLutXbZFC5iw//6SLjdJo= +github.com/lxc/incus v0.3.0/go.mod h1:kOvaD/A6wnFfpGVKMz23u8YSV3qOMAJeV09a5f5FKjs= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= @@ -164,8 +119,8 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +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/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -180,34 +135,26 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/muhlemmer/gu v0.3.1 h1:7EAqmFrW7n3hETvuAdmFmn4hS8W+z3LgKtrnow+YzNM= github.com/muhlemmer/gu v0.3.1/go.mod h1:YHtHR+gxM+bKEIIs7Hmi9sPT3ZDUvTN/i88wQpZkrdM= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/muhlemmer/httpforwarded v0.1.0 h1:x4DLrzXdliq8mprgUMR0olDvHGkou5BJsK/vWUetyzY= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= -github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= -github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= -github.com/pkg/sftp v1.13.5 h1:a3RLUqkyjYRtBTZJZ1VRrKbN3zhuPLlUc3sphVz81go= -github.com/pkg/sftp v1.13.5/go.mod h1:wHDZ0IZX6JcBYRK1TH9bcVq8G7TLpVHYIGJRFnmPfxg= -github.com/pkg/xattr v0.4.9 h1:5883YPCtkSd8LFbs13nXplj9g9tlrwoJRjgpgMu1/fE= -github.com/pkg/xattr v0.4.9/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU= +github.com/pkg/sftp v1.13.6 h1:JFZT4XbOU7l77xGSpOdW+pwIMqP044IyjXX6FGyEKFo= +github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= -github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= -github.com/rogpeppe/clock v0.0.0-20190514195947-2896927a307a h1:3QH7VyOaaiUHNrA9Se4YQIRkDTCw1EJls9xTUCaCeRM= -github.com/rogpeppe/clock v0.0.0-20190514195947-2896927a307a/go.mod h1:4r5QyqhjIWCcK8DO4KMclc5Iknq5qVBAlbYYzAbUScQ= -github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE= +github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= @@ -218,77 +165,56 @@ github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= -github.com/zitadel/oidc/v2 v2.7.0 h1:IGX4EDk6tegTjUSsZDWeTfLseFU0BdJ/Glf1tgys2lU= -github.com/zitadel/oidc/v2 v2.7.0/go.mod h1:zkUkVJS0sDVy9m0UA9RgO3f8i/C0rtjvXU36UJj7T+0= -golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +github.com/zitadel/oidc/v2 v2.12.0 h1:4aMTAy99/4pqNwrawEyJqhRb3yY3PtcDxnoDSryhpn4= +github.com/zitadel/oidc/v2 v2.12.0/go.mod h1:LrRav74IiThHGapQgCHZOUNtnqJG0tcZKHro/91rtLw= +go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= +go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= +go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 h1:EDuYyU/MkFXllv9QF9819VlI9a4tzGuCbhG0ExK9o1U= -golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= -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-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 h1:qCEDpW1G+vcj3Y7Fy52pEM1AWm3abj8WimGYejI3SC4= +golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -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-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-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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-20200505041828-1ed23360d12c/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= -golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ= +golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM= 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-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-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/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-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/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-20220715151400-c0bba94af5f8/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.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -297,6 +223,7 @@ golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= @@ -305,7 +232,6 @@ golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/text v0.3.0/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.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= @@ -314,71 +240,31 @@ golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= 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/tools v0.0.0-20180917221912-90fa682c2a6e/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-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-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= +golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= 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= 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.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 h1:6GQBEOdGkX6MMTLT9V+TjtIRZCw9VPD5Z+yHY9wMgS0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 h1:/jFB8jK5R3Sq3i/lmeZO0cATSzFfZaJq1J2Euan3XKU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA= google.golang.org/grpc v1.60.0 h1:6FQAR0kM31P6MRdeluor2w2gPaS4SVNrD/DNTxrQ15k= google.golang.org/grpc v1.60.0/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= -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.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/errgo.v1 v1.0.0/go.mod h1:CxwszS/Xz1C49Ucd2i6Zil5UToP1EmyrFhKaMVbg1mk= -gopkg.in/errgo.v1 v1.0.1 h1:oQFRXzZ7CkBGdm1XZm/EbQYaYNNEElNBOd09M6cqNso= -gopkg.in/errgo.v1 v1.0.1/go.mod h1:3NjfXwocQRYAPTq4/fzX+CwUhPRcR/azYRhj8G+LqMo= -gopkg.in/httprequest.v1 v1.2.1 h1:pEPLMdF/gjWHnKxLpuCYaHFjc8vAB2wrYjXrqDVC16E= -gopkg.in/httprequest.v1 v1.2.1/go.mod h1:x2Otw96yda5+8+6ZeWwHIJTFkEHWP/qP8pJOzqEtWPM= -gopkg.in/juju/environschema.v1 v1.0.1 h1:eXQQsfSJykpp1Kz79pVmKWE6G5yzKuiCqkR01LHFVS0= -gopkg.in/juju/environschema.v1 v1.0.1/go.mod h1:WTgU3KXKCVoO9bMmG/4KHzoaRvLeoxfjArpgd1MGWFA= -gopkg.in/macaroon.v2 v2.1.0 h1:HZcsjBCzq9t0eBPMKqTN/uSN6JOm78ZJ2INbqcBQOUI= -gopkg.in/macaroon.v2 v2.1.0/go.mod h1:OUb+TQP/OP0WOerC2Jp/3CwhIKyIa9kQjuc7H24e6/o= -gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= -gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= -gopkg.in/retry.v1 v1.0.3 h1:a9CArYczAVv6Qs6VGoLMio99GEs7kY9UzSF9+LD+iGs= -gopkg.in/retry.v1 v1.0.3/go.mod h1:FJkXmWiMaAo7xB+xhvDF59zhfjDWyzmyAxiT4dB688g= gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/internal/acctest/checks.go b/internal/acctest/checks.go index ce83d7d..15c1b32 100644 --- a/internal/acctest/checks.go +++ b/internal/acctest/checks.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" - "github.com/terraform-lxd/terraform-provider-lxd/internal/utils" + "github.com/lxc/terraform-provider-incus/internal/utils" ) // PreCheck is a precheck that ensures test requirements, such as existing diff --git a/internal/acctest/provider_factory.go b/internal/acctest/provider_factory.go index 7264c83..2c6982b 100644 --- a/internal/acctest/provider_factory.go +++ b/internal/acctest/provider_factory.go @@ -3,11 +3,11 @@ package acctest import ( "sync" - lxd_config "github.com/canonical/lxd/lxc/config" "github.com/hashicorp/terraform-plugin-framework/providerserver" "github.com/hashicorp/terraform-plugin-go/tfprotov6" - "github.com/terraform-lxd/terraform-provider-lxd/internal/provider" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" + lxd_config "github.com/lxc/incus/shared/cliconfig" + "github.com/lxc/terraform-provider-incus/internal/provider" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" ) // TestImage is a constant that specifies the default image used in all tests. diff --git a/internal/common/lxd_file.go b/internal/common/lxd_file.go index f83f53f..43b3393 100644 --- a/internal/common/lxd_file.go +++ b/internal/common/lxd_file.go @@ -9,11 +9,11 @@ import ( "strconv" "strings" - lxd "github.com/canonical/lxd/client" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" + lxd "github.com/lxc/incus/client" + "github.com/lxc/terraform-provider-incus/internal/errors" "github.com/mitchellh/go-homedir" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" ) type InstanceFileModel struct { @@ -148,7 +148,7 @@ func InstanceFileUpload(server lxd.InstanceServer, instanceName string, file Ins } // recursiveMkdir recursively creates directories on target instance. -// This was copied almost as-is from github.com/canonical/lxd/blob/main/lxc/file.go. +// This was copied almost as-is from github.com/lxc/incus/blob/main/lxc/file.go. func recursiveMkdir(server lxd.InstanceServer, instanceName string, p string, args lxd.InstanceFileArgs) error { // Special case, every instance has a /, so there is nothing to do. if p == "/" { diff --git a/internal/common/lxd_import.go b/internal/common/lxd_import.go index 7ceef2b..d80b10f 100644 --- a/internal/common/lxd_import.go +++ b/internal/common/lxd_import.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/hashicorp/terraform-plugin-framework/diag" - "github.com/terraform-lxd/terraform-provider-lxd/internal/utils" + "github.com/lxc/terraform-provider-incus/internal/utils" ) // ImportMetadata defines import ID properties that are used when parsing diff --git a/internal/errors/errors.go b/internal/errors/errors.go index 60ac659..20d75f9 100644 --- a/internal/errors/errors.go +++ b/internal/errors/errors.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "github.com/canonical/lxd/shared/api" "github.com/hashicorp/terraform-plugin-framework/diag" + "github.com/lxc/incus/shared/api" ) // IsNotFoundError checks whether the given error is of type NotFound. diff --git a/internal/image/resource_cached_image.go b/internal/image/resource_cached_image.go index b8a8ef5..87e0f6d 100644 --- a/internal/image/resource_cached_image.go +++ b/internal/image/resource_cached_image.go @@ -5,8 +5,6 @@ import ( "fmt" "strings" - lxd "github.com/canonical/lxd/client" - "github.com/canonical/lxd/shared/api" "github.com/hashicorp/terraform-plugin-framework-validators/setvalidator" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/diag" @@ -22,9 +20,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" - "github.com/terraform-lxd/terraform-provider-lxd/internal/utils" + lxd "github.com/lxc/incus/client" + "github.com/lxc/incus/shared/api" + "github.com/lxc/terraform-provider-incus/internal/errors" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" + "github.com/lxc/terraform-provider-incus/internal/utils" ) // CachedImageModel resource data model that matches the schema. diff --git a/internal/image/resource_cached_image_test.go b/internal/image/resource_cached_image_test.go index a329033..b9b1d08 100644 --- a/internal/image/resource_cached_image_test.go +++ b/internal/image/resource_cached_image_test.go @@ -8,7 +8,7 @@ import ( petname "github.com/dustinkirkland/golang-petname" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/terraform-lxd/terraform-provider-lxd/internal/acctest" + "github.com/lxc/terraform-provider-incus/internal/acctest" ) func TestAccCachedImage_basic(t *testing.T) { diff --git a/internal/image/resource_publish_image.go b/internal/image/resource_publish_image.go index 5502184..a1271ec 100644 --- a/internal/image/resource_publish_image.go +++ b/internal/image/resource_publish_image.go @@ -4,8 +4,6 @@ import ( "context" "fmt" - lxd "github.com/canonical/lxd/client" - "github.com/canonical/lxd/shared/api" "github.com/hashicorp/terraform-plugin-framework-validators/mapvalidator" "github.com/hashicorp/terraform-plugin-framework-validators/setvalidator" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" @@ -25,10 +23,12 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/terraform-lxd/terraform-provider-lxd/internal/common" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" - "github.com/terraform-lxd/terraform-provider-lxd/internal/utils" + lxd "github.com/lxc/incus/client" + "github.com/lxc/incus/shared/api" + "github.com/lxc/terraform-provider-incus/internal/common" + "github.com/lxc/terraform-provider-incus/internal/errors" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" + "github.com/lxc/terraform-provider-incus/internal/utils" ) // PublishImageModel resource data model that matches the schema. diff --git a/internal/image/resource_publish_image_test.go b/internal/image/resource_publish_image_test.go index 275c8e4..a449da6 100644 --- a/internal/image/resource_publish_image_test.go +++ b/internal/image/resource_publish_image_test.go @@ -7,7 +7,7 @@ import ( petname "github.com/dustinkirkland/golang-petname" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/terraform-lxd/terraform-provider-lxd/internal/acctest" + "github.com/lxc/terraform-provider-incus/internal/acctest" ) func TestAccPublishImage_basic(t *testing.T) { diff --git a/internal/instance/resource_instance.go b/internal/instance/resource_instance.go index 72b11bf..fd8548e 100644 --- a/internal/instance/resource_instance.go +++ b/internal/instance/resource_instance.go @@ -6,8 +6,6 @@ import ( "strings" "time" - lxd "github.com/canonical/lxd/client" - "github.com/canonical/lxd/shared/api" "github.com/hashicorp/terraform-plugin-framework-validators/listvalidator" "github.com/hashicorp/terraform-plugin-framework-validators/mapvalidator" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" @@ -26,10 +24,12 @@ import ( "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/terraform-lxd/terraform-provider-lxd/internal/common" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" - "github.com/terraform-lxd/terraform-provider-lxd/internal/utils" + lxd "github.com/lxc/incus/client" + "github.com/lxc/incus/shared/api" + "github.com/lxc/terraform-provider-incus/internal/common" + "github.com/lxc/terraform-provider-incus/internal/errors" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" + "github.com/lxc/terraform-provider-incus/internal/utils" ) type InstanceModel struct { diff --git a/internal/instance/resource_instance_file.go b/internal/instance/resource_instance_file.go index 7a5268f..4a7a898 100644 --- a/internal/instance/resource_instance_file.go +++ b/internal/instance/resource_instance_file.go @@ -17,9 +17,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/terraform-lxd/terraform-provider-lxd/internal/common" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" + "github.com/lxc/terraform-provider-incus/internal/common" + "github.com/lxc/terraform-provider-incus/internal/errors" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" ) // InstanceFileModel diff --git a/internal/instance/resource_instance_file_test.go b/internal/instance/resource_instance_file_test.go index bdd9748..be2ba6c 100644 --- a/internal/instance/resource_instance_file_test.go +++ b/internal/instance/resource_instance_file_test.go @@ -6,7 +6,7 @@ import ( petname "github.com/dustinkirkland/golang-petname" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/terraform-lxd/terraform-provider-lxd/internal/acctest" + "github.com/lxc/terraform-provider-incus/internal/acctest" ) func TestAccInstanceFile_basic(t *testing.T) { diff --git a/internal/instance/resource_instance_snapshot.go b/internal/instance/resource_instance_snapshot.go index 7f7af56..1e5474d 100644 --- a/internal/instance/resource_instance_snapshot.go +++ b/internal/instance/resource_instance_snapshot.go @@ -7,8 +7,6 @@ import ( "strings" "time" - lxd "github.com/canonical/lxd/client" - "github.com/canonical/lxd/shared/api" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/resource" @@ -20,8 +18,10 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" + lxd "github.com/lxc/incus/client" + "github.com/lxc/incus/shared/api" + "github.com/lxc/terraform-provider-incus/internal/errors" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" ) type InstanceSnapshotModel struct { diff --git a/internal/instance/resource_instance_snapshot_test.go b/internal/instance/resource_instance_snapshot_test.go index 4632546..71c781c 100644 --- a/internal/instance/resource_instance_snapshot_test.go +++ b/internal/instance/resource_instance_snapshot_test.go @@ -6,7 +6,7 @@ import ( petname "github.com/dustinkirkland/golang-petname" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/terraform-lxd/terraform-provider-lxd/internal/acctest" + "github.com/lxc/terraform-provider-incus/internal/acctest" ) func TestAccInstanceSnapshot_stateless(t *testing.T) { diff --git a/internal/instance/resource_instance_test.go b/internal/instance/resource_instance_test.go index 522ae6b..a9299a1 100644 --- a/internal/instance/resource_instance_test.go +++ b/internal/instance/resource_instance_test.go @@ -7,7 +7,7 @@ import ( petname "github.com/dustinkirkland/golang-petname" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/terraform-lxd/terraform-provider-lxd/internal/acctest" + "github.com/lxc/terraform-provider-incus/internal/acctest" ) func TestAccInstance_basic(t *testing.T) { @@ -126,7 +126,7 @@ func TestAccInstance_virtualMachineNoDevLxd(t *testing.T) { resource.TestCheckResourceAttr("lxd_instance.instance1", "name", instanceName), resource.TestCheckResourceAttr("lxd_instance.instance1", "type", "virtual-machine"), resource.TestCheckResourceAttr("lxd_instance.instance1", "status", "Running"), - resource.TestCheckResourceAttr("lxd_instance.instance1", "config.security.devlxd", "false"), + resource.TestCheckResourceAttr("lxd_instance.instance1", "config.security.guestapi", "false"), ), }, }, @@ -804,7 +804,7 @@ resource "lxd_instance" "instance1" { config = { # Alpine images do not support secureboot. "security.secureboot" = false - "security.devlxd" = false + "security.guestapi" = false } } `, name, acctest.TestImage) diff --git a/internal/instance/schema_validators.go b/internal/instance/schema_validators.go index dcc5aa1..1fb74c7 100644 --- a/internal/instance/schema_validators.go +++ b/internal/instance/schema_validators.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/hashicorp/terraform-plugin-framework/schema/validator" - "github.com/terraform-lxd/terraform-provider-lxd/internal/utils" + "github.com/lxc/terraform-provider-incus/internal/utils" ) // configKeyValidator ensures config key does not start diff --git a/internal/network/resource_network.go b/internal/network/resource_network.go index c12f3fe..d1d8bcc 100644 --- a/internal/network/resource_network.go +++ b/internal/network/resource_network.go @@ -4,8 +4,6 @@ import ( "context" "fmt" - lxd "github.com/canonical/lxd/client" - "github.com/canonical/lxd/shared/api" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/path" @@ -18,9 +16,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/terraform-lxd/terraform-provider-lxd/internal/common" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" + lxd "github.com/lxc/incus/client" + "github.com/lxc/incus/shared/api" + "github.com/lxc/terraform-provider-incus/internal/common" + "github.com/lxc/terraform-provider-incus/internal/errors" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" ) // NetworkModel resource data model that matches the schema. diff --git a/internal/network/resource_network_lb.go b/internal/network/resource_network_lb.go index 0484740..1f0b0a7 100644 --- a/internal/network/resource_network_lb.go +++ b/internal/network/resource_network_lb.go @@ -4,8 +4,6 @@ import ( "context" "fmt" - lxd "github.com/canonical/lxd/client" - "github.com/canonical/lxd/shared/api" "github.com/hashicorp/terraform-plugin-framework-validators/setvalidator" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/attr" @@ -18,9 +16,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/terraform-lxd/terraform-provider-lxd/internal/common" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" + lxd "github.com/lxc/incus/client" + "github.com/lxc/incus/shared/api" + "github.com/lxc/terraform-provider-incus/internal/common" + "github.com/lxc/terraform-provider-incus/internal/errors" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" ) // NetworkLBModel resource data model that matches the schema. diff --git a/internal/network/resource_network_lb_test.go b/internal/network/resource_network_lb_test.go index 6fd1fc9..c15ff32 100644 --- a/internal/network/resource_network_lb_test.go +++ b/internal/network/resource_network_lb_test.go @@ -5,10 +5,10 @@ import ( "strings" "testing" - "github.com/canonical/lxd/shared/api" petname "github.com/dustinkirkland/golang-petname" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/terraform-lxd/terraform-provider-lxd/internal/acctest" + "github.com/lxc/incus/shared/api" + "github.com/lxc/terraform-provider-incus/internal/acctest" ) func TestAccNetworkLB_basic(t *testing.T) { diff --git a/internal/network/resource_network_test.go b/internal/network/resource_network_test.go index 5bf7a84..669c7e2 100644 --- a/internal/network/resource_network_test.go +++ b/internal/network/resource_network_test.go @@ -6,7 +6,7 @@ import ( petname "github.com/dustinkirkland/golang-petname" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/terraform-lxd/terraform-provider-lxd/internal/acctest" + "github.com/lxc/terraform-provider-incus/internal/acctest" ) func TestAccNetwork_basic(t *testing.T) { @@ -126,7 +126,7 @@ func TestAccNetwork_typeMacvlan(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr("lxd_network.eth1", "name", "eth1"), resource.TestCheckResourceAttr("lxd_network.eth1", "type", "macvlan"), - resource.TestCheckResourceAttr("lxd_network.eth1", "config.parent", "lxdbr0"), + resource.TestCheckResourceAttr("lxd_network.eth1", "config.parent", "incusbr0"), ), }, }, @@ -361,7 +361,7 @@ resource "lxd_network" "eth1" { type = "macvlan" config = { - "parent" = "lxdbr0" + "parent" = "incusbr0" } } ` diff --git a/internal/network/resource_network_zone.go b/internal/network/resource_network_zone.go index 83af6de..12f1c7e 100644 --- a/internal/network/resource_network_zone.go +++ b/internal/network/resource_network_zone.go @@ -4,8 +4,6 @@ import ( "context" "fmt" - lxd "github.com/canonical/lxd/client" - "github.com/canonical/lxd/shared/api" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/path" @@ -17,9 +15,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/terraform-lxd/terraform-provider-lxd/internal/common" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" + lxd "github.com/lxc/incus/client" + "github.com/lxc/incus/shared/api" + "github.com/lxc/terraform-provider-incus/internal/common" + "github.com/lxc/terraform-provider-incus/internal/errors" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" ) // NetworkZoneModel resource data model that matches the schema. diff --git a/internal/network/resource_network_zone_record.go b/internal/network/resource_network_zone_record.go index 16b5318..0b43f0d 100644 --- a/internal/network/resource_network_zone_record.go +++ b/internal/network/resource_network_zone_record.go @@ -4,8 +4,6 @@ import ( "context" "fmt" - lxd "github.com/canonical/lxd/client" - "github.com/canonical/lxd/shared/api" "github.com/hashicorp/terraform-plugin-framework-validators/int64validator" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/attr" @@ -19,9 +17,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/terraform-lxd/terraform-provider-lxd/internal/common" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" + lxd "github.com/lxc/incus/client" + "github.com/lxc/incus/shared/api" + "github.com/lxc/terraform-provider-incus/internal/common" + "github.com/lxc/terraform-provider-incus/internal/errors" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" ) // NetworkZoneRecordModel resource data model that diff --git a/internal/network/resource_network_zone_record_test.go b/internal/network/resource_network_zone_record_test.go index b987798..7355c82 100644 --- a/internal/network/resource_network_zone_record_test.go +++ b/internal/network/resource_network_zone_record_test.go @@ -6,7 +6,7 @@ import ( petname "github.com/dustinkirkland/golang-petname" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/terraform-lxd/terraform-provider-lxd/internal/acctest" + "github.com/lxc/terraform-provider-incus/internal/acctest" ) func TestAccNetworkZoneRecord_basic(t *testing.T) { diff --git a/internal/network/resource_network_zone_test.go b/internal/network/resource_network_zone_test.go index d5455b7..7f13d06 100644 --- a/internal/network/resource_network_zone_test.go +++ b/internal/network/resource_network_zone_test.go @@ -6,7 +6,7 @@ import ( petname "github.com/dustinkirkland/golang-petname" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/terraform-lxd/terraform-provider-lxd/internal/acctest" + "github.com/lxc/terraform-provider-incus/internal/acctest" ) func TestAccNetworkZone_basic(t *testing.T) { diff --git a/internal/profile/resource_profile.go b/internal/profile/resource_profile.go index fa7594b..99936b7 100644 --- a/internal/profile/resource_profile.go +++ b/internal/profile/resource_profile.go @@ -4,8 +4,6 @@ import ( "context" "fmt" - lxd "github.com/canonical/lxd/client" - "github.com/canonical/lxd/shared/api" "github.com/hashicorp/terraform-plugin-framework-validators/mapvalidator" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/attr" @@ -20,9 +18,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/terraform-lxd/terraform-provider-lxd/internal/common" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" + lxd "github.com/lxc/incus/client" + "github.com/lxc/incus/shared/api" + "github.com/lxc/terraform-provider-incus/internal/common" + "github.com/lxc/terraform-provider-incus/internal/errors" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" ) type ProfileModel struct { diff --git a/internal/profile/resource_profile_test.go b/internal/profile/resource_profile_test.go index c60c7bb..171840a 100644 --- a/internal/profile/resource_profile_test.go +++ b/internal/profile/resource_profile_test.go @@ -6,7 +6,7 @@ import ( petname "github.com/dustinkirkland/golang-petname" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/terraform-lxd/terraform-provider-lxd/internal/acctest" + "github.com/lxc/terraform-provider-incus/internal/acctest" ) func TestAccProfile_basic(t *testing.T) { @@ -489,7 +489,7 @@ resource "lxd_profile" "profile1" { properties = { name = "bar" nictype = "bridged" - parent = "lxdbr0" + parent = "incusbr0" } } } diff --git a/internal/project/resource_project.go b/internal/project/resource_project.go index 9ccc1da..1165337 100644 --- a/internal/project/resource_project.go +++ b/internal/project/resource_project.go @@ -4,8 +4,6 @@ import ( "context" "fmt" - lxd "github.com/canonical/lxd/client" - "github.com/canonical/lxd/shared/api" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/resource" @@ -16,9 +14,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/terraform-lxd/terraform-provider-lxd/internal/common" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" + lxd "github.com/lxc/incus/client" + "github.com/lxc/incus/shared/api" + "github.com/lxc/terraform-provider-incus/internal/common" + "github.com/lxc/terraform-provider-incus/internal/errors" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" ) // ProjectModel resource data model that matches the schema. diff --git a/internal/project/resource_project_test.go b/internal/project/resource_project_test.go index 5b937d4..31099c9 100644 --- a/internal/project/resource_project_test.go +++ b/internal/project/resource_project_test.go @@ -6,7 +6,7 @@ import ( petname "github.com/dustinkirkland/golang-petname" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/terraform-lxd/terraform-provider-lxd/internal/acctest" + "github.com/lxc/terraform-provider-incus/internal/acctest" ) // At a high level, the first basic test for a resource should establish the following: diff --git a/internal/provider-config/config.go b/internal/provider-config/config.go index 137b484..c04c9c8 100644 --- a/internal/provider-config/config.go +++ b/internal/provider-config/config.go @@ -7,15 +7,16 @@ import ( "path/filepath" "sync" - lxd "github.com/canonical/lxd/client" - lxd_config "github.com/canonical/lxd/lxc/config" - lxd_shared "github.com/canonical/lxd/shared" - lxd_api "github.com/canonical/lxd/shared/api" - "github.com/terraform-lxd/terraform-provider-lxd/internal/utils" + lxd "github.com/lxc/incus/client" + lxd_api "github.com/lxc/incus/shared/api" + lxd_config "github.com/lxc/incus/shared/cliconfig" + incus_tls "github.com/lxc/incus/shared/tls" + lxd_shared "github.com/lxc/incus/shared/util" + "github.com/lxc/terraform-provider-incus/internal/utils" ) -// supportedLXDVersions defines LXD versions that are supported by the provider. -const supportedLXDVersions = ">= 4.0.0" +// supportedIncusVersions defines Incus versions that are supported by the provider. +const supportedIncusVersions = ">= 0.1" // A global mutex. var mutex sync.RWMutex @@ -26,7 +27,7 @@ type LxdProviderRemoteConfig struct { Name string Address string Port string - Password string + Token string Scheme string Bootstrapped bool } @@ -41,7 +42,7 @@ type LxdProviderConfig struct { // LXDConfig is the converted form of terraformLXDConfig // in LXD's native data structure. This is lazy-loaded / created // only when a connection to an LXD remote/server happens. - // https://github.com/canonical/lxd/blob/main/lxc/config/config.go + // https://github.com/lxc/incus/blob/main/lxc/config/config.go lxdConfig *lxd_config.Config // remotes is a map of LXD remotes which the user has defined in @@ -89,7 +90,7 @@ func (p *LxdProviderConfig) InstanceServer(remoteName string, project string, ta return nil, err } - if connInfo.Protocol != "lxd" { + if connInfo.Protocol != "incus" { return nil, fmt.Errorf("Remote %q (%s) is not an InstanceServer", remoteName, connInfo.Protocol) } @@ -116,7 +117,7 @@ func (p *LxdProviderConfig) ImageServer(remoteName string) (lxd.ImageServer, err return nil, err } - if connInfo.Protocol == "simplestreams" || connInfo.Protocol == "lxd" { + if connInfo.Protocol == "simplestreams" || connInfo.Protocol == "incus" { return server.(lxd.ImageServer), nil } @@ -160,7 +161,7 @@ func (p *LxdProviderConfig) server(remoteName string) (lxd.Server, error) { return nil, err } - _ = os.Setenv("LXD_DIR", lxdDir) + _ = os.Setenv("INCUS_DIR", lxdDir) } var err error @@ -254,7 +255,7 @@ func (p *LxdProviderConfig) createLxdServerClient(remote LxdProviderRemoteConfig p.mux.Lock() defer p.mux.Unlock() - err = authenticateToLxdServer(instServer, remote.Password) + err = authenticateToLxdServer(instServer, remote.Token) if err != nil { return err } @@ -268,7 +269,7 @@ func (p *LxdProviderConfig) createLxdServerClient(remote LxdProviderRemoteConfig func (p *LxdProviderConfig) fetchLxdServerCertificate(remoteName string) error { lxdRemote := p.getLxdConfigRemote(remoteName) - certificate, err := lxd_shared.GetRemoteCertificate(lxdRemote.Addr, "terraform-provider-lxd/2.0") + certificate, err := incus_tls.GetRemoteCertificate(lxdRemote.Addr, "terraform-provider-lxd/1.0") if err != nil { return err } @@ -305,13 +306,13 @@ func verifyLxdServerVersion(instServer lxd.InstanceServer) error { return nil } - ok, err := utils.CheckVersion(serverVersion, supportedLXDVersions) + ok, err := utils.CheckVersion(serverVersion, supportedIncusVersions) if err != nil { return err } if !ok { - return fmt.Errorf("LXD server with version %q does not meet the required version constraint: %q", serverVersion, supportedLXDVersions) + return fmt.Errorf("LXD server with version %q does not meet the required version constraint: %q", serverVersion, supportedIncusVersions) } return nil @@ -320,7 +321,7 @@ func verifyLxdServerVersion(instServer lxd.InstanceServer) error { // authenticateToLXDServer authenticates to a given remote LXD server. // If successful, the LXD server becomes trusted to the LXD client, // and vice-versa. -func authenticateToLxdServer(instServer lxd.InstanceServer, password string) error { +func authenticateToLxdServer(instServer lxd.InstanceServer, token string) error { server, _, err := instServer.GetServer() if err != nil { return err @@ -331,7 +332,7 @@ func authenticateToLxdServer(instServer lxd.InstanceServer, password string) err } req := lxd_api.CertificatesPost{} - req.Password = password + req.TrustToken = token req.Type = "client" err = instServer.CreateCertificate(req) @@ -379,31 +380,30 @@ func determineLxdDaemonAddr(remote LxdProviderRemoteConfig) (string, error) { } // determineLxdDir determines which standard LXD directory contains a writable UNIX socket. -// If environment variable LXD_DIR or LXD_SOCKET is set, the function will return LXD directory +// If environment variable INCUS_DIR or INCUS_SOCKET is set, the function will return LXD directory // based on the value from any of those variables. func determineLxdDir() (string, error) { - lxdSocket, ok := os.LookupEnv("LXD_SOCKET") + lxdSocket, ok := os.LookupEnv("INCUS_SOCKET") if ok { if utils.IsSocketWritable(lxdSocket) { return filepath.Dir(lxdSocket), nil } - return "", fmt.Errorf("Environment variable LXD_SOCKET points to either a non-existing or non-writable unix socket") + return "", fmt.Errorf("Environment variable INCUS_SOCKET points to either a non-existing or non-writable unix socket") } - lxdDir, ok := os.LookupEnv("LXD_DIR") + lxdDir, ok := os.LookupEnv("INCUS_DIR") if ok { socketPath := filepath.Join(lxdDir, "unix.socket") if utils.IsSocketWritable(socketPath) { return lxdDir, nil } - return "", fmt.Errorf("Environment variable LXD_DIR points to a LXD directory that does not contain a writable unix socket") + return "", fmt.Errorf("Environment variable INCUS_DIR points to a LXD directory that does not contain a writable unix socket") } lxdDirs := []string{ - "/var/lib/lxd", - "/var/snap/lxd/common/lxd", + "/var/lib/incus", } // Iterate over LXD directories and find a writable unix socket. diff --git a/internal/provider/provider.go b/internal/provider/provider.go index 3e86a1f..7f6237f 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -6,8 +6,6 @@ import ( "os" "path/filepath" - lxd_config "github.com/canonical/lxd/lxc/config" - lxd_shared "github.com/canonical/lxd/shared" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/provider" @@ -15,23 +13,25 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/terraform-lxd/terraform-provider-lxd/internal/image" - "github.com/terraform-lxd/terraform-provider-lxd/internal/instance" - "github.com/terraform-lxd/terraform-provider-lxd/internal/network" - "github.com/terraform-lxd/terraform-provider-lxd/internal/profile" - "github.com/terraform-lxd/terraform-provider-lxd/internal/project" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" - "github.com/terraform-lxd/terraform-provider-lxd/internal/storage" + lxd_config "github.com/lxc/incus/shared/cliconfig" + lxd_shared "github.com/lxc/incus/shared/util" + "github.com/lxc/terraform-provider-incus/internal/image" + "github.com/lxc/terraform-provider-incus/internal/instance" + "github.com/lxc/terraform-provider-incus/internal/network" + "github.com/lxc/terraform-provider-incus/internal/profile" + "github.com/lxc/terraform-provider-incus/internal/project" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" + "github.com/lxc/terraform-provider-incus/internal/storage" ) // LxdProviderRemoteModel represents provider's schema remote. type LxdProviderRemoteModel struct { - Name types.String `tfsdk:"name"` - Address types.String `tfsdk:"address"` - Port types.String `tfsdk:"port"` - Password types.String `tfsdk:"password"` - Scheme types.String `tfsdk:"scheme"` - Default types.Bool `tfsdk:"default"` + Name types.String `tfsdk:"name"` + Address types.String `tfsdk:"address"` + Port types.String `tfsdk:"port"` + Token types.String `tfsdk:"token"` + Scheme types.String `tfsdk:"scheme"` + Default types.Bool `tfsdk:"default"` } // LxdProviderModel represents provider's schema. @@ -67,7 +67,7 @@ func (p *LxdProvider) Schema(_ context.Context, _ provider.SchemaRequest, resp * Attributes: map[string]schema.Attribute{ "config_dir": schema.StringAttribute{ Optional: true, - Description: "The directory to look for existing LXD configuration. (default = $HOME/snap/lxd/common/config:$HOME/.config/lxc)", + Description: "The directory to look for existing LXD configuration. (default = $HOME/.config/incus)", }, "generate_client_certificates": schema.BoolAttribute{ @@ -138,17 +138,10 @@ func (p *LxdProvider) Configure(ctx context.Context, req provider.ConfigureReque diags := req.Config.Get(ctx, &data) resp.Diagnostics.Append(diags...) - // Determine LXD configuration directory. First check for the presence - // of the /var/snap/lxd directory. If the directory exists, return - // snap's config path. Otherwise return the fallback path. + // Determine LXD configuration directory. configDir := data.ConfigDir.ValueString() if configDir == "" { - _, err := os.Stat("/var/snap/lxd") - if err == nil || os.IsExist(err) { - configDir = "$HOME/snap/lxd/common/config" - } else { - configDir = "$HOME/.config/lxc" - } + configDir = "$HOME/.config/incus" } // Try to load config.yml from determined configDir. If there's @@ -214,11 +207,11 @@ func (p *LxdProvider) Configure(ctx context.Context, req provider.ConfigureReque envName := os.Getenv("LXD_REMOTE") if envName != "" { envRemote := provider_config.LxdProviderRemoteConfig{ - Name: envName, - Address: os.Getenv("LXD_ADDR"), - Port: os.Getenv("LXD_PORT"), - Password: os.Getenv("LXD_PASSWORD"), - Scheme: os.Getenv("LXD_SCHEME"), + Name: envName, + Address: os.Getenv("LXD_ADDR"), + Port: os.Getenv("LXD_PORT"), + Token: os.Getenv("LXD_TOKEN"), + Scheme: os.Getenv("LXD_SCHEME"), } // This will be the default remote unless overridden by an @@ -248,11 +241,11 @@ func (p *LxdProvider) Configure(ctx context.Context, req provider.ConfigureReque } lxdRemote := provider_config.LxdProviderRemoteConfig{ - Name: remote.Name.ValueString(), - Password: remote.Password.ValueString(), - Address: remote.Address.ValueString(), - Port: port, - Scheme: scheme, + Name: remote.Name.ValueString(), + Token: remote.Token.ValueString(), + Address: remote.Address.ValueString(), + Port: port, + Scheme: scheme, } isDefault := remote.Default.ValueBool() diff --git a/internal/storage/resource_storage_pool.go b/internal/storage/resource_storage_pool.go index bc4141f..001e577 100644 --- a/internal/storage/resource_storage_pool.go +++ b/internal/storage/resource_storage_pool.go @@ -4,8 +4,6 @@ import ( "context" "fmt" - lxd "github.com/canonical/lxd/client" - "github.com/canonical/lxd/shared/api" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/diag" @@ -19,9 +17,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/terraform-lxd/terraform-provider-lxd/internal/common" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" + lxd "github.com/lxc/incus/client" + "github.com/lxc/incus/shared/api" + "github.com/lxc/terraform-provider-incus/internal/common" + "github.com/lxc/terraform-provider-incus/internal/errors" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" ) type StoragePoolModel struct { diff --git a/internal/storage/resource_storage_pool_test.go b/internal/storage/resource_storage_pool_test.go index 2c6be56..24b17ed 100644 --- a/internal/storage/resource_storage_pool_test.go +++ b/internal/storage/resource_storage_pool_test.go @@ -6,7 +6,7 @@ import ( petname "github.com/dustinkirkland/golang-petname" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/terraform-lxd/terraform-provider-lxd/internal/acctest" + "github.com/lxc/terraform-provider-incus/internal/acctest" ) func TestAccStoragePool_dir(t *testing.T) { diff --git a/internal/storage/resource_storage_volume.go b/internal/storage/resource_storage_volume.go index 0188d3e..2422953 100644 --- a/internal/storage/resource_storage_volume.go +++ b/internal/storage/resource_storage_volume.go @@ -4,8 +4,6 @@ import ( "context" "fmt" - lxd "github.com/canonical/lxd/client" - "github.com/canonical/lxd/shared/api" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/diag" @@ -19,9 +17,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/terraform-lxd/terraform-provider-lxd/internal/common" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" + lxd "github.com/lxc/incus/client" + "github.com/lxc/incus/shared/api" + "github.com/lxc/terraform-provider-incus/internal/common" + "github.com/lxc/terraform-provider-incus/internal/errors" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" ) type StorageVolumeModel struct { diff --git a/internal/storage/resource_storage_volume_copy.go b/internal/storage/resource_storage_volume_copy.go index 8f23a84..f8ffc5c 100644 --- a/internal/storage/resource_storage_volume_copy.go +++ b/internal/storage/resource_storage_volume_copy.go @@ -4,8 +4,6 @@ import ( "context" "fmt" - lxd "github.com/canonical/lxd/client" - "github.com/canonical/lxd/shared/api" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" @@ -13,8 +11,10 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/terraform-lxd/terraform-provider-lxd/internal/errors" - provider_config "github.com/terraform-lxd/terraform-provider-lxd/internal/provider-config" + lxd "github.com/lxc/incus/client" + "github.com/lxc/incus/shared/api" + "github.com/lxc/terraform-provider-incus/internal/errors" + provider_config "github.com/lxc/terraform-provider-incus/internal/provider-config" ) type StorageVolumeCopyModel struct { diff --git a/internal/storage/resource_storage_volume_copy_test.go b/internal/storage/resource_storage_volume_copy_test.go index 691e778..ad62e5c 100644 --- a/internal/storage/resource_storage_volume_copy_test.go +++ b/internal/storage/resource_storage_volume_copy_test.go @@ -7,7 +7,7 @@ import ( petname "github.com/dustinkirkland/golang-petname" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/plancheck" - "github.com/terraform-lxd/terraform-provider-lxd/internal/acctest" + "github.com/lxc/terraform-provider-incus/internal/acctest" ) func TestAccStorageVolumeCopy_basic(t *testing.T) { diff --git a/internal/storage/resource_storage_volume_test.go b/internal/storage/resource_storage_volume_test.go index 8a4e80e..9e57e0c 100644 --- a/internal/storage/resource_storage_volume_test.go +++ b/internal/storage/resource_storage_volume_test.go @@ -6,7 +6,7 @@ import ( petname "github.com/dustinkirkland/golang-petname" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/terraform-lxd/terraform-provider-lxd/internal/acctest" + "github.com/lxc/terraform-provider-incus/internal/acctest" ) func TestAccStorageVolume_basic(t *testing.T) { diff --git a/main.go b/main.go index 8e9333d..03c3aeb 100644 --- a/main.go +++ b/main.go @@ -6,7 +6,7 @@ import ( "log" "github.com/hashicorp/terraform-plugin-framework/providerserver" - "github.com/terraform-lxd/terraform-provider-lxd/internal/provider" + "github.com/lxc/terraform-provider-incus/internal/provider" ) // version indicates provider's version. The appropriate value diff --git a/test-infra/files/deploy.sh b/test-infra/files/deploy.sh index d687cc9..269e352 100644 --- a/test-infra/files/deploy.sh +++ b/test-infra/files/deploy.sh @@ -47,7 +47,7 @@ eval "$(/usr/local/bin/gimme 1.19)" export GOPATH=$HOME/go export PATH=$PATH:$GOROOT/bin:$GOPATH/bin -git clone https://github.com/terraform-lxd/terraform-provider-lxd +git clone https://github.com/lxc/terraform-provider-incus echo fs.inotify.max_queued_events = 1048576 | sudo tee -a /etc/sysctl.conf echo fs.inotify.max_user_instances = 1048576 | sudo tee -a /etc/sysctl.conf