From 56187da765a87599bcb973db06b084712bbb51a1 Mon Sep 17 00:00:00 2001 From: Peter Deme Date: Fri, 17 Nov 2023 17:25:03 +0100 Subject: [PATCH] GHE/Azure/Gitlab multi VCS (#477) --- .github/workflows/analysis-lint.yml | 10 +- .github/workflows/check-documentation.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test-prod.yml | 2 +- .github/workflows/test.yml | 6 +- .golangci.yml | 2 +- README.md | 2 +- docs/data-sources/azure_devops_integration.md | 11 +- .../github_enterprise_integration.md | 10 +- docs/data-sources/gitlab_integration.md | 11 +- docs/data-sources/module.md | 18 + docs/data-sources/stack.md | 18 + docs/data-sources/stacks.md | 18 + docs/resources/module.md | 28 ++ docs/resources/stack.md | 12 + go.mod | 74 ++-- go.sum | 419 ++++++------------ spacelift/data_azure_devops_integration.go | 104 ++++- .../data_azure_devops_integration_test.go | 48 +- spacelift/data_contexts.go | 2 +- .../data_github_enterprise_integration.go | 99 ++++- ...data_github_enterprise_integration_test.go | 48 +- spacelift/data_gitlab_integration.go | 105 ++++- spacelift/data_gitlab_integration_test.go | 47 +- spacelift/data_module.go | 93 ++++ spacelift/data_spaces_test.go | 5 +- spacelift/data_stack.go | 95 +++- spacelift/internal/structs/module.go | 43 +- spacelift/internal/structs/module_input.go | 2 + spacelift/internal/structs/stack.go | 45 +- spacelift/internal/structs/stack_input.go | 1 + spacelift/internal/structs/vcs_provider.go | 19 +- spacelift/resource_module.go | 101 ++++- spacelift/resource_stack.go | 45 +- spacelift/test_provider.go | 1 + tools/go.mod | 11 +- tools/go.sum | 37 +- 37 files changed, 1114 insertions(+), 482 deletions(-) diff --git a/.github/workflows/analysis-lint.yml b/.github/workflows/analysis-lint.yml index 0000dbb0..47430585 100644 --- a/.github/workflows/analysis-lint.yml +++ b/.github/workflows/analysis-lint.yml @@ -16,13 +16,13 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: "1.19" + go-version: "1.21" - name: Check formatting using gofmt run: gofmt -s -l -d . - name: Run golangci-lint - uses: golangci/golangci-lint-action@v3 - with: - version: v1.54 - args: -v + uses: reviewdog/action-golangci-lint@v2 + env: + REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: { reporter: github-pr-review } diff --git a/.github/workflows/check-documentation.yml b/.github/workflows/check-documentation.yml index c7fb86a3..e1c9b502 100644 --- a/.github/workflows/check-documentation.yml +++ b/.github/workflows/check-documentation.yml @@ -20,7 +20,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: "1.19" + go-version: "1.21" - name: Generate documentation run: cd tools && go generate ./... diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8538bffe..1a9dff33 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 - with: { go-version: 1.19 } + with: { go-version: 1.21 } - name: Import GPG key uses: crazy-max/ghaction-import-gpg@v5 diff --git a/.github/workflows/test-prod.yml b/.github/workflows/test-prod.yml index 5af72060..8437194a 100644 --- a/.github/workflows/test-prod.yml +++ b/.github/workflows/test-prod.yml @@ -16,7 +16,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: "1.19" + go-version: "1.21" - name: Install Terraform uses: hashicorp/setup-terraform@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4fa7485b..f60a80b7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,6 +2,10 @@ name: Test on: [push] +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + jobs: deployment: name: Test the code @@ -14,7 +18,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: "1.19" + go-version: "1.21" - name: Install Terraform uses: hashicorp/setup-terraform@v2 diff --git a/.golangci.yml b/.golangci.yml index 0863e909..140cfe36 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -104,7 +104,7 @@ linters: - ineffassign - nolintlint - staticcheck - - structcheck + - unused - typecheck severity: diff --git a/README.md b/README.md index cb03b6bf..a825cd05 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ If you want to build from source, you can simply use `go build` in the root of t To develop the provider locally you need the following tools: -- [Go 1.19](https://go.dev/doc/install). +- [Go 1.21](https://go.dev/doc/install). - [GoReleaser](https://goreleaser.com/). - A Spacelift account to use for testing. diff --git a/docs/data-sources/azure_devops_integration.md b/docs/data-sources/azure_devops_integration.md index 13760b57..2bd28fd1 100644 --- a/docs/data-sources/azure_devops_integration.md +++ b/docs/data-sources/azure_devops_integration.md @@ -19,8 +19,17 @@ data "spacelift_azure_devops_integration" "azure_devops_integration" {} ## Schema +### Optional + +- `id` (String) Azure DevOps integration id. If not provided, the default integration will be returned + ### Read-Only -- `id` (String) The ID of this resource. +- `description` (String) Azure DevOps integration description +- `is_default` (Boolean) Azure DevOps integration is default +- `labels` (List of String) Azure DevOps integration labels +- `name` (String) Azure DevOps integration name - `organization_url` (String) Azure DevOps integration organization url +- `space_id` (String) Azure DevOps integration space id - `webhook_password` (String) Azure DevOps integration webhook password +- `webhook_url` (String) Azure DevOps integration webhook url diff --git a/docs/data-sources/github_enterprise_integration.md b/docs/data-sources/github_enterprise_integration.md index 649235c6..4ce2d674 100644 --- a/docs/data-sources/github_enterprise_integration.md +++ b/docs/data-sources/github_enterprise_integration.md @@ -19,9 +19,17 @@ data "spacelift_github_enterprise_integration" "github_enterprise_integration" { ## Schema +### Optional + +- `id` (String) Github integration id. If not provided, the default integration will be returned + ### Read-Only - `api_host` (String) Github integration api host - `app_id` (String) Github integration app id -- `id` (String) The ID of this resource. +- `description` (String) Github integration description +- `is_default` (Boolean) Github integration is default +- `labels` (List of String) Github integration labels +- `name` (String) Github integration name +- `space_id` (String) Github integration space id - `webhook_secret` (String) Github integration webhook secret diff --git a/docs/data-sources/gitlab_integration.md b/docs/data-sources/gitlab_integration.md index ca59206c..f172458e 100644 --- a/docs/data-sources/gitlab_integration.md +++ b/docs/data-sources/gitlab_integration.md @@ -19,8 +19,17 @@ data "spacelift_gitlab_integration" "gitlab_integration" {} ## Schema +### Optional + +- `id` (String) Gitlab integration id. If not provided, the default integration will be returned + ### Read-Only - `api_host` (String) Gitlab integration api host -- `id` (String) The ID of this resource. +- `description` (String) Gitlab integration description +- `is_default` (Boolean) Gitlab integration is default +- `labels` (List of String) Gitlab integration labels +- `name` (String) Gitlab integration name +- `space_id` (String) Gitlab integration space id - `webhook_secret` (String) Gitlab integration webhook secret +- `webhook_url` (String) Gitlab integration webhook url diff --git a/docs/data-sources/module.md b/docs/data-sources/module.md index dd160449..2043391d 100644 --- a/docs/data-sources/module.md +++ b/docs/data-sources/module.md @@ -54,7 +54,13 @@ data "spacelift_module" "k8s-module" { Read-Only: +- `description` (String) +- `id` (String) +- `is_default` (Boolean) +- `labels` (Set of String) +- `name` (String) - `project` (String) +- `space_id` (String) @@ -78,7 +84,13 @@ Read-Only: Read-Only: +- `description` (String) +- `id` (String) +- `is_default` (Boolean) +- `labels` (Set of String) +- `name` (String) - `namespace` (String) +- `space_id` (String) @@ -86,4 +98,10 @@ Read-Only: Read-Only: +- `description` (String) +- `id` (String) +- `is_default` (Boolean) +- `labels` (Set of String) +- `name` (String) - `namespace` (String) +- `space_id` (String) diff --git a/docs/data-sources/stack.md b/docs/data-sources/stack.md index ac356bc3..4e8d25b0 100644 --- a/docs/data-sources/stack.md +++ b/docs/data-sources/stack.md @@ -89,7 +89,13 @@ Read-Only: Read-Only: +- `description` (String) +- `id` (String) +- `is_default` (Boolean) +- `labels` (Set of String) +- `name` (String) - `project` (String) +- `space_id` (String) @@ -124,7 +130,13 @@ Read-Only: Read-Only: +- `description` (String) +- `id` (String) +- `is_default` (Boolean) +- `labels` (Set of String) +- `name` (String) - `namespace` (String) +- `space_id` (String) @@ -132,7 +144,13 @@ Read-Only: Read-Only: +- `description` (String) +- `id` (String) +- `is_default` (Boolean) +- `labels` (Set of String) +- `name` (String) - `namespace` (String) +- `space_id` (String) diff --git a/docs/data-sources/stacks.md b/docs/data-sources/stacks.md index 96b35c23..3c4beeb7 100644 --- a/docs/data-sources/stacks.md +++ b/docs/data-sources/stacks.md @@ -186,7 +186,13 @@ Read-Only: Read-Only: +- `description` (String) +- `id` (String) +- `is_default` (Boolean) +- `labels` (Set of String) +- `name` (String) - `project` (String) +- `space_id` (String) @@ -221,7 +227,13 @@ Read-Only: Read-Only: +- `description` (String) +- `id` (String) +- `is_default` (Boolean) +- `labels` (Set of String) +- `name` (String) - `namespace` (String) +- `space_id` (String) @@ -229,7 +241,13 @@ Read-Only: Read-Only: +- `description` (String) +- `id` (String) +- `is_default` (Boolean) +- `labels` (Set of String) +- `name` (String) - `namespace` (String) +- `space_id` (String) diff --git a/docs/resources/module.md b/docs/resources/module.md index 16c7588b..a53bb7e6 100644 --- a/docs/resources/module.md +++ b/docs/resources/module.md @@ -73,6 +73,18 @@ Required: - `project` (String) The name of the Azure DevOps project +Optional: + +- `id` (String) ID of the Azure Devops integration. If not specified, the default integration will be used. + +Read-Only: + +- `description` (String) Description of the Azure Devops integration +- `is_default` (Boolean) Indicates whether this is the default Azure Devops integration +- `labels` (Set of String) Labels of the Azure Devops integration +- `name` (String) Name of the Azure Devops integration +- `space_id` (String) ID (slug) of the space the Azure Devops integration is in + ### Nested Schema for `bitbucket_cloud` @@ -97,6 +109,10 @@ Required: - `namespace` (String) The GitHub organization / user the repository belongs to +Optional: + +- `id` (String) The ID of the GitHub Enterprise integration. If not specified, the default integration will be used. + ### Nested Schema for `gitlab` @@ -105,6 +121,18 @@ Required: - `namespace` (String) The GitLab namespace containing the repository +Optional: + +- `id` (String) ID of the Gitlab integration. If not specified, the default integration will be used. + +Read-Only: + +- `description` (String) Description of the Gitlab integration +- `is_default` (Boolean) Indicates whether this is the default Gitlab integration +- `labels` (Set of String) Labels of the Gitlab integration +- `name` (String) Name of the Gitlab integration +- `space_id` (String) ID (slug) of the space the Gitlab integration is in + ## Import Import is supported using the following syntax: diff --git a/docs/resources/stack.md b/docs/resources/stack.md index 5417185a..573f4ebc 100644 --- a/docs/resources/stack.md +++ b/docs/resources/stack.md @@ -258,6 +258,10 @@ Required: - `project` (String) The name of the Azure DevOps project +Optional: + +- `id` (String) The ID of the Azure Devops integration. If not specified, the default integration will be used. + ### Nested Schema for `bitbucket_cloud` @@ -293,6 +297,10 @@ Required: - `namespace` (String) The GitHub organization / user the repository belongs to +Optional: + +- `id` (String) The ID of the GitHub Enterprise integration. If not specified, the default integration will be used. + ### Nested Schema for `gitlab` @@ -301,6 +309,10 @@ Required: - `namespace` (String) The GitLab namespace containing the repository +Optional: + +- `id` (String) The ID of the Gitlab integration. If not specified, the default integration will be used. + ### Nested Schema for `kubernetes` diff --git a/go.mod b/go.mod index 49eb9774..e70ce809 100644 --- a/go.mod +++ b/go.mod @@ -1,49 +1,46 @@ module github.com/spacelift-io/terraform-provider-spacelift -go 1.19 +go 1.21 require ( github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1 github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 - github.com/hashicorp/go-retryablehttp v0.7.0 - github.com/hashicorp/terraform-plugin-sdk/v2 v2.16.0 + github.com/hashicorp/go-retryablehttp v0.7.4 + github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0 github.com/pkg/errors v0.9.1 github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a - golang.org/x/exp v0.0.0-20221230185412-738e83a70c30 - golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d - golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac + golang.org/x/oauth2 v0.13.0 + golang.org/x/time v0.3.0 ) require ( + github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect github.com/agext/levenshtein v1.2.2 // indirect - github.com/apparentlymart/go-cidr v1.1.0 // indirect - github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect + github.com/cloudflare/circl v1.3.3 // indirect github.com/fatih/color v1.13.0 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect - github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/go-checkpoint v0.5.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-hclog v1.2.0 // indirect + github.com/hashicorp/go-hclog v1.5.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/go-plugin v1.4.3 // indirect + github.com/hashicorp/go-plugin v1.5.1 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/go-version v1.6.0 // indirect - github.com/hashicorp/hc-install v0.5.0 // indirect - github.com/hashicorp/hcl/v2 v2.12.0 // indirect + github.com/hashicorp/hc-install v0.6.0 // indirect + github.com/hashicorp/hcl/v2 v2.18.0 // indirect github.com/hashicorp/logutils v1.0.0 // indirect - github.com/hashicorp/terraform-exec v0.18.1 // indirect - github.com/hashicorp/terraform-json v0.15.0 // indirect - github.com/hashicorp/terraform-plugin-go v0.9.0 // indirect - github.com/hashicorp/terraform-plugin-log v0.4.0 // indirect - github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896 // indirect - github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect + github.com/hashicorp/terraform-exec v0.19.0 // indirect + github.com/hashicorp/terraform-json v0.17.1 // indirect + github.com/hashicorp/terraform-plugin-go v0.19.0 // indirect + github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect + github.com/hashicorp/terraform-registry-address v0.2.2 // indirect + github.com/hashicorp/terraform-svchost v0.1.1 // indirect github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect - github.com/imdario/mergo v0.3.13 // indirect - github.com/kr/pretty v0.3.0 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.14 // 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.0 // indirect @@ -51,19 +48,18 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/oklog/run v1.0.0 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect - github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect - github.com/vmihailenco/tagparser v0.1.1 // indirect - github.com/zclconf/go-cty v1.13.0 // indirect - golang.org/x/crypto v0.5.0 // indirect - golang.org/x/mod v0.8.0 // indirect - golang.org/x/net v0.8.0 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/text v0.8.0 // indirect - google.golang.org/appengine v1.6.6 // indirect - google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect - google.golang.org/grpc v1.45.0 // indirect - google.golang.org/protobuf v1.28.0 // indirect - gopkg.in/yaml.v3 v3.0.0 // indirect + github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect + github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect + github.com/zclconf/go-cty v1.14.0 // indirect + golang.org/x/crypto v0.14.0 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/net v0.16.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect + google.golang.org/grpc v1.57.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect ) -replace github.com/shurcooL/graphql => github.com/spacelift-io/graphql v1.1.0 +replace github.com/shurcooL/graphql => github.com/spacelift-io/graphql v1.2.0 diff --git a/go.sum b/go.sum index 01f81228..c0942470 100644 --- a/go.sum +++ b/go.sum @@ -1,409 +1,238 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/sprig/v3 v3.2.1/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= -github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= -github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk= -github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= -github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C67SkzkDfmQuVln04ygHj3vjZfd9FL+GmQQ= -github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= -github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= -github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= -github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 h1:KLq8BE0KwCL+mmXnjLWEAOYO+2l2AE4YMmqG1ZpZHBs= +github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ= +github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE= github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= -github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU= -github.com/apparentlymart/go-cidr v1.1.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= -github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= -github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0 h1:MzVXffFUye+ZcSR6opIgz9Co7WcDx6ZcY+RjfFHoA0I= -github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec= -github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= -github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= +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/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= +github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= +github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= +github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1 h1:CaO/zOnF8VvUfEbhRatPcwKVWamvbYd8tQGRWacE9kU= github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1/go.mod h1:+hnT3ywWDTAFrW5aE+u2Sa/wT555ZqwoCS+pk3p6ry4= -github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= -github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= +github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= -github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= -github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= -github.com/go-git/go-billy/v5 v5.3.1 h1:CPiOUAzKtMRvolEKw+bG1PLRpT7D3LIs3/3ey4Aiu34= -github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= -github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0= -github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4= -github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= +github.com/go-git/go-billy/v5 v5.4.1 h1:Uwp5tDRkPr+l/TnbHOQzp+tmJfLceOlbVucgpTz8ix4= +github.com/go-git/go-billy/v5 v5.4.1/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg= +github.com/go-git/go-git/v5 v5.8.1 h1:Zo79E4p7TRk0xoRgMq0RShiTHGKcKI4+DI6BfJc/Q+A= +github.com/go-git/go-git/v5 v5.8.1/go.mod h1:FHFuoD6yGz5OSKEBK+aWN9Oah0q54Jxl0abmj6GnqAo= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/protobuf v1.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.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/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.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.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= -github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU= github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-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 v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= -github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +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-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.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v6UZM= -github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= -github.com/hashicorp/go-retryablehttp v0.7.0 h1:eu1EI/mbirUgP5C8hVsTNaGZreBDlYiwC1FZWkvQPQ4= -github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= +github.com/hashicorp/go-plugin v1.5.1 h1:oGm7cWBaYIp3lJpx1RUEfLWophprE2EV/KUeqBYo+6k= +github.com/hashicorp/go-plugin v1.5.1/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= +github.com/hashicorp/go-retryablehttp v0.7.4 h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA= +github.com/hashicorp/go-retryablehttp v0.7.4/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/hc-install v0.5.0 h1:D9bl4KayIYKEeJ4vUDe9L5huqxZXczKaykSRcmQ0xY0= -github.com/hashicorp/hc-install v0.5.0/go.mod h1:JyzMfbzfSBSjoDCRPna1vi/24BEDxFaCPfdHtM5SCdo= -github.com/hashicorp/hcl/v2 v2.12.0 h1:PsYxySWpMD4KPaoJLnsHwtK5Qptvj/4Q6s0t4sUxZf4= -github.com/hashicorp/hcl/v2 v2.12.0/go.mod h1:FwWsfWEjyV/CMj8s/gqAuiviY72rJ1/oayI9WftqcKg= +github.com/hashicorp/hc-install v0.6.0 h1:fDHnU7JNFNSQebVKYhHZ0va1bC6SrPQ8fpebsvNr2w4= +github.com/hashicorp/hc-install v0.6.0/go.mod h1:10I912u3nntx9Umo1VAeYPUUuehk0aRQJYpMwbX5wQA= +github.com/hashicorp/hcl/v2 v2.18.0 h1:wYnG7Lt31t2zYkcquwgKo6MWXzRUDIeIVU5naZwHLl8= +github.com/hashicorp/hcl/v2 v2.18.0/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/terraform-exec v0.18.1 h1:LAbfDvNQU1l0NOQlTuudjczVhHj061fNX5H8XZxHlH4= -github.com/hashicorp/terraform-exec v0.18.1/go.mod h1:58wg4IeuAJ6LVsLUeD2DWZZoc/bYi6dzhLHzxM41980= -github.com/hashicorp/terraform-json v0.15.0 h1:/gIyNtR6SFw6h5yzlbDbACyGvIhKtQi8mTsbkNd79lE= -github.com/hashicorp/terraform-json v0.15.0/go.mod h1:+L1RNzjDU5leLFZkHTFTbJXaoqUC6TqXlFgDoOXrtvk= -github.com/hashicorp/terraform-plugin-go v0.9.0 h1:FvLY/3z4SNVatPZdoFcyrlNbCar+WyyOTv5X4Tp+WZc= -github.com/hashicorp/terraform-plugin-go v0.9.0/go.mod h1:EawBkgjBWNf7jiKnVoyDyF39OSV+u6KUX+Y73EPj3oM= -github.com/hashicorp/terraform-plugin-log v0.4.0 h1:F3eVnm8r2EfQCe2k9blPIiF/r2TT01SHijXnS7bujvc= -github.com/hashicorp/terraform-plugin-log v0.4.0/go.mod h1:9KclxdunFownr4pIm1jdmwKRmE4d6HVG2c9XDq47rpg= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.16.0 h1:9fjPgCenJqnbjo95SDcbJ+YdLyEC1N35cwKWcRWhJTQ= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.16.0/go.mod h1:hLa0sTiySU/AWEgV2GxJh0/pQIqcCmm30IPja9N9lTg= -github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896 h1:1FGtlkJw87UsTMg5s8jrekrHmUPUJaMcu6ELiVhQrNw= -github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896/go.mod h1:bzBPnUIkI0RxauU8Dqo+2KrZZ28Cf48s8V6IHt3p4co= -github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 h1:HKLsbzeOsfXmKNpr3GiT18XAblV0BjCbzL8KQAMZGa0= -github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg= -github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/hashicorp/terraform-exec v0.19.0 h1:FpqZ6n50Tk95mItTSS9BjeOVUb4eg81SpgVtZNNtFSM= +github.com/hashicorp/terraform-exec v0.19.0/go.mod h1:tbxUpe3JKruE9Cuf65mycSIT8KiNPZ0FkuTE3H4urQg= +github.com/hashicorp/terraform-json v0.17.1 h1:eMfvh/uWggKmY7Pmb3T85u86E2EQg6EQHgyRwf3RkyA= +github.com/hashicorp/terraform-json v0.17.1/go.mod h1:Huy6zt6euxaY9knPAFKjUITn8QxUFIe9VuSzb4zn/0o= +github.com/hashicorp/terraform-plugin-go v0.19.0 h1:BuZx/6Cp+lkmiG0cOBk6Zps0Cb2tmqQpDM3iAtnhDQU= +github.com/hashicorp/terraform-plugin-go v0.19.0/go.mod h1:EhRSkEPNoylLQntYsk5KrDHTZJh9HQoumZXbOGOXmec= +github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0= +github.com/hashicorp/terraform-plugin-log v0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0 h1:wcOKYwPI9IorAJEBLzgclh3xVolO7ZorYd6U1vnok14= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0/go.mod h1:qH/34G25Ugdj5FcM95cSoXzUgIbgfhVLXCcEcYaMwq8= +github.com/hashicorp/terraform-registry-address v0.2.2 h1:lPQBg403El8PPicg/qONZJDC6YlgCVbWDtNmmZKtBno= +github.com/hashicorp/terraform-registry-address v0.2.2/go.mod h1:LtwNbCihUoUZ3RYriyS2wF/lGPB6gF9ICLRtuDk7hSo= +github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ= +github.com/hashicorp/terraform-svchost v0.1.1/go.mod h1:mNsjQfZyf/Jhz35v6/0LWcv26+X7JPS+buii2c9/ctc= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= -github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= -github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= -github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= -github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck= -github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= +github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= +github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= +github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +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.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/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/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= -github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mitchellh/cli v1.1.5/go.mod h1:v8+iFts2sPIKUV1ltktPXMCC8fumSKFItNcD2cLtRR4= -github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= 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= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= -github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce h1:RPclfga2SEJmgMmz2k+Mg7cowZ8yv4Trqw9UsJby758= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= +github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/sebdah/goldie v1.0.0/go.mod h1:jXP4hmWywNEwZzhMuv2ccnqTSFpuq8iyQhtQdkkZBH4= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= -github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/spacelift-io/graphql v1.1.0 h1:LHVbHHPev1xCBAgJqVoo2t8XPgck4plq7TxlumVR+3Y= -github.com/spacelift-io/graphql v1.1.0/go.mod h1:38Gellz6DbdwPcYHLHByFDScgORYU7pVCOE7rFCg3bg= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/skeema/knownhosts v1.2.0 h1:h9r9cf0+u7wSE+M183ZtMGgOJKiL96brpaz5ekfJCpM= +github.com/skeema/knownhosts v1.2.0/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo= +github.com/spacelift-io/graphql v1.2.0 h1:oUS1fyO4cqMGOcydu26BVbZkTf/pdDnLWVal6lYv49Q= +github.com/spacelift-io/graphql v1.2.0/go.mod h1:Q/JMkvFWF8uXZQkDn8i9Nc3aXucbgTFeuFZ6WQMt0Wg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= -github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U= -github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= -github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY= -github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= -github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI= -github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= +github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= +github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= +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/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= -github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= -github.com/zclconf/go-cty v1.8.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= -github.com/zclconf/go-cty v1.10.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= -github.com/zclconf/go-cty v1.13.0 h1:It5dfKTTZHe9aeppbNOda3mN7Ag7sg6QkBNm6TkyFa0= -github.com/zclconf/go-cty v1.13.0/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0= -github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +github.com/zclconf/go-cty v1.14.0 h1:/Xrd39K7DXbHzlisFP9c4pHao4yyf+/Ug9LEz+Y/yhc= +github.com/zclconf/go-cty v1.14.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= -golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20221230185412-738e83a70c30 h1:m9O6OTJ627iFnN2JIWfdqlZCzneRO6EEBsHXI25P8ws= -golang.org/x/exp v0.0.0-20221230185412-738e83a70c30/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= -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/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.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180811021610-c39426892332/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-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +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/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos= +golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +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/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/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-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/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-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/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-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-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.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +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= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= -golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= +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= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= 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.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs= -golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/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.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -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-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200711021454-869866162049 h1:YFTFpQhgvrLrmxtiIncJxFXeCyq84ixuKWVCaCAi9Oc= -google.golang.org/genproto v0.0.0-20200711021454-869866162049/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -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.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= -google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= +google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= +google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= 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.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= -google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +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-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= -gopkg.in/yaml.v3 v3.0.0/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= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/spacelift/data_azure_devops_integration.go b/spacelift/data_azure_devops_integration.go index 419a71f9..196c83a6 100644 --- a/spacelift/data_azure_devops_integration.go +++ b/spacelift/data_azure_devops_integration.go @@ -9,13 +9,19 @@ import ( "github.com/spacelift-io/terraform-provider-spacelift/spacelift/internal" ) -var azureDevopsIntegrationFields = struct { - OrganizationURL string - WebhookPassword string -}{ - OrganizationURL: "organization_url", - WebhookPassword: "webhook_password", -} +const ( + azureDevopsID = "id" + azureDevopsName = "name" + azureDevopsDescription = "description" + azureDevopsIsDefault = "is_default" + azureDevopsLabels = "labels" + azureDevopsSpaceID = "space_id" + azureDevopsOrganizationURL = "organization_url" + azureDevopsWebhookPassword = "webhook_password" + azureDevopsWebhookURL = "webhook_url" + + defaultAzureDevopsIntegrationID = "azure-devops-repo-default-integration" +) func dataAzureDevopsIntegration() *schema.Resource { return &schema.Resource{ @@ -24,16 +30,54 @@ func dataAzureDevopsIntegration() *schema.Resource { ReadContext: dataAzureDevopsIntegrationRead, Schema: map[string]*schema.Schema{ - azureDevopsIntegrationFields.OrganizationURL: { + azureDevopsID: { + Type: schema.TypeString, + Description: "Azure DevOps integration id. If not provided, the default integration will be returned", + Optional: true, + }, + azureDevopsName: { + Type: schema.TypeString, + Description: "Azure DevOps integration name", + Computed: true, + }, + azureDevopsDescription: { + Type: schema.TypeString, + Description: "Azure DevOps integration description", + Computed: true, + }, + azureDevopsIsDefault: { + Type: schema.TypeBool, + Description: "Azure DevOps integration is default", + Computed: true, + }, + azureDevopsLabels: { + Type: schema.TypeList, + Description: "Azure DevOps integration labels", + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + azureDevopsSpaceID: { + Type: schema.TypeString, + Description: "Azure DevOps integration space id", + Computed: true, + }, + azureDevopsOrganizationURL: { Type: schema.TypeString, Description: "Azure DevOps integration organization url", Computed: true, }, - azureDevopsIntegrationFields.WebhookPassword: { + azureDevopsWebhookPassword: { Type: schema.TypeString, Description: "Azure DevOps integration webhook password", Computed: true, }, + azureDevopsWebhookURL: { + Type: schema.TypeString, + Description: "Azure DevOps integration webhook url", + Computed: true, + }, }, } } @@ -41,12 +85,27 @@ func dataAzureDevopsIntegration() *schema.Resource { func dataAzureDevopsIntegrationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var query struct { AzureDevOpsIntegration *struct { - OrganizationURL string `graphql:"organizationURL"` - WebhookPassword string `graphql:"webhookPassword"` - } `graphql:"azureDevOpsRepoIntegration"` + ID string `graphql:"id"` + Name string `graphql:"name"` + Description string `graphql:"description"` + IsDefault bool `graphql:"isDefault"` + Space struct { + ID string `graphql:"id"` + } `graphql:"space"` + Labels []string `graphql:"labels"` + OrganizationURL string `graphql:"organizationURL"` + WebhookPassword string `graphql:"webhookPassword"` + WebhookURL string `graphql:"webhookUrl"` + } `graphql:"azureDevOpsRepoIntegration(id: $id)"` } - if err := meta.(*internal.Client).Query(ctx, "AzureDevOpsIntegrationRead", &query, map[string]interface{}{}); err != nil { + variables := map[string]interface{}{"id": defaultAzureDevopsIntegrationID} + + if id, ok := d.GetOk(azureDevopsID); ok && id != "" { + variables["id"] = toID(id) + } + + if err := meta.(*internal.Client).Query(ctx, "AzureDevOpsIntegrationRead", &query, variables); err != nil { return diag.Errorf("could not query for azure devops integration: %v", err) } @@ -55,9 +114,22 @@ func dataAzureDevopsIntegrationRead(ctx context.Context, d *schema.ResourceData, return diag.Errorf("azure devops integration not found") } - d.SetId("spacelift_azure_devops_integration_id") // TF expects id to be set otherwise it will fail - d.Set(azureDevopsIntegrationFields.OrganizationURL, azureDevopsIntegration.OrganizationURL) - d.Set(azureDevopsIntegrationFields.WebhookPassword, azureDevopsIntegration.WebhookPassword) + d.SetId(azureDevopsIntegration.ID) + d.Set(azureDevopsID, azureDevopsIntegration.ID) + d.Set(azureDevopsName, azureDevopsIntegration.Name) + d.Set(azureDevopsDescription, azureDevopsIntegration.Description) + d.Set(azureDevopsIsDefault, azureDevopsIntegration.IsDefault) + d.Set(azureDevopsSpaceID, azureDevopsIntegration.Space.ID) + d.Set(azureDevopsOrganizationURL, azureDevopsIntegration.OrganizationURL) + d.Set(azureDevopsWebhookPassword, azureDevopsIntegration.WebhookPassword) + d.Set(azureDevopsWebhookURL, azureDevopsIntegration.WebhookURL) + + labels := schema.NewSet(schema.HashString, []interface{}{}) + for _, label := range azureDevopsIntegration.Labels { + labels.Add(label) + } + + d.Set(azureDevopsLabels, labels) return nil } diff --git a/spacelift/data_azure_devops_integration_test.go b/spacelift/data_azure_devops_integration_test.go index aa97c6dc..9c1b2b99 100644 --- a/spacelift/data_azure_devops_integration_test.go +++ b/spacelift/data_azure_devops_integration_test.go @@ -10,14 +10,42 @@ import ( ) func TestAzureDevOpsIntegrationData(t *testing.T) { - testSteps(t, []resource.TestStep{{ - Config: ` - data "spacelift_azure_devops_integration" "test" {} - `, - Check: Resource( - "data.spacelift_azure_devops_integration.test", - Attribute("organization_url", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_AZURE_DEVOPS_ORGANIZATION_URL"))), - Attribute("webhook_password", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_AZURE_DEVOPS_WEBHOOK_PASSWORD"))), - ), - }}) + t.Run("without the id specified", func(t *testing.T) { + testSteps(t, []resource.TestStep{{ + Config: ` + data "spacelift_azure_devops_integration" "test" {} + `, + Check: Resource( + "data.spacelift_azure_devops_integration.test", + Attribute("id", IsNotEmpty()), + Attribute("name", IsNotEmpty()), + Attribute("is_default", Equals("true")), + Attribute("space_id", IsNotEmpty()), + Attribute("organization_url", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_AZURE_DEVOPS_ORGANIZATION_URL"))), + Attribute("webhook_password", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_AZURE_DEVOPS_WEBHOOK_PASSWORD"))), + Attribute("webhook_url", IsNotEmpty()), + ), + }}) + }) + + t.Run("with the id specified", func(t *testing.T) { + testSteps(t, []resource.TestStep{{ + Config: ` + data "spacelift_azure_devops_integration" "test" { + id = "azure-devops-repo-default-integration" + } + `, + Check: Resource( + "data.spacelift_azure_devops_integration.test", + Attribute("id", IsNotEmpty()), + Attribute("name", IsNotEmpty()), + Attribute("is_default", Equals("true")), + Attribute("space_id", IsNotEmpty()), + Attribute("organization_url", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_AZURE_DEVOPS_ORGANIZATION_URL"))), + Attribute("webhook_password", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_AZURE_DEVOPS_WEBHOOK_PASSWORD"))), + Attribute("webhook_url", IsNotEmpty()), + ), + }}) + }) + } diff --git a/spacelift/data_contexts.go b/spacelift/data_contexts.go index fb2e6d66..fef81a7b 100644 --- a/spacelift/data_contexts.go +++ b/spacelift/data_contexts.go @@ -2,10 +2,10 @@ package spacelift import ( "context" + "slices" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "golang.org/x/exp/slices" "github.com/spacelift-io/terraform-provider-spacelift/spacelift/internal" "github.com/spacelift-io/terraform-provider-spacelift/spacelift/internal/structs" diff --git a/spacelift/data_github_enterprise_integration.go b/spacelift/data_github_enterprise_integration.go index 79ec97c0..53a48dc9 100644 --- a/spacelift/data_github_enterprise_integration.go +++ b/spacelift/data_github_enterprise_integration.go @@ -9,15 +9,19 @@ import ( "github.com/spacelift-io/terraform-provider-spacelift/spacelift/internal" ) -var githubEnterpriseIntegrationFields = struct { - AppID string - APIHost string - WebhookSecret string -}{ - AppID: "app_id", - APIHost: "api_host", - WebhookSecret: "webhook_secret", -} +const ( + ghEnterpriseId = "id" + ghEnterpriseName = "name" + ghEnterpriseDescription = "description" + ghEnterpriseIsDefault = "is_default" + ghEnterpriseLabels = "labels" + ghEnterpriseSpaceID = "space_id" + ghEnterpriseAppID = "app_id" + ghEnterpriseAPIHost = "api_host" + ghEnterpriseWebhookSecret = "webhook_secret" + + defaultGHEIntegrationID = "github-enterprise-default-integration" +) func dataGithubEnterpriseIntegration() *schema.Resource { return &schema.Resource{ @@ -26,17 +30,50 @@ func dataGithubEnterpriseIntegration() *schema.Resource { ReadContext: dataGithubEnterpriseIntegrationRead, Schema: map[string]*schema.Schema{ - githubEnterpriseIntegrationFields.APIHost: { + ghEnterpriseId: { + Type: schema.TypeString, + Description: "Github integration id. If not provided, the default integration will be returned", + Optional: true, + }, + ghEnterpriseName: { + Type: schema.TypeString, + Description: "Github integration name", + Computed: true, + }, + ghEnterpriseDescription: { + Type: schema.TypeString, + Description: "Github integration description", + Computed: true, + }, + ghEnterpriseIsDefault: { + Type: schema.TypeBool, + Description: "Github integration is default", + Computed: true, + }, + ghEnterpriseLabels: { + Type: schema.TypeList, + Description: "Github integration labels", + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + ghEnterpriseSpaceID: { + Type: schema.TypeString, + Description: "Github integration space id", + Computed: true, + }, + ghEnterpriseAPIHost: { Type: schema.TypeString, Description: "Github integration api host", Computed: true, }, - githubEnterpriseIntegrationFields.WebhookSecret: { + ghEnterpriseWebhookSecret: { Type: schema.TypeString, Description: "Github integration webhook secret", Computed: true, }, - githubEnterpriseIntegrationFields.AppID: { + ghEnterpriseAppID: { Type: schema.TypeString, Description: "Github integration app id", Computed: true, @@ -51,10 +88,24 @@ func dataGithubEnterpriseIntegrationRead(ctx context.Context, d *schema.Resource AppID string `graphql:"appID"` APIHost string `graphql:"apiHost"` WebhookSecret string `graphql:"webhookSecret"` - } `graphql:"githubEnterpriseIntegration"` + ID string `graphql:"id"` + Name string `graphql:"name"` + Description string `graphql:"description"` + IsDefault bool `graphql:"isDefault"` + Space struct { + ID string `graphql:"id"` + } `graphql:"space"` + Labels []string `graphql:"labels"` + } `graphql:"githubEnterpriseIntegration(id: $id)"` } - if err := meta.(*internal.Client).Query(ctx, "GithubEnterpriseIntegrationRead", &query, map[string]interface{}{}); err != nil { + variables := map[string]interface{}{"id": defaultGHEIntegrationID} + + if id, ok := d.GetOk(ghEnterpriseId); ok && id != "" { + variables["id"] = toID(id) + } + + if err := meta.(*internal.Client).Query(ctx, "GithubEnterpriseIntegrationRead", &query, variables); err != nil { return diag.Errorf("could not query for github enterprise integration: %v", err) } @@ -63,10 +114,22 @@ func dataGithubEnterpriseIntegrationRead(ctx context.Context, d *schema.Resource return diag.Errorf("github enterprise integration not found") } - d.SetId("spacelift_github_enterprise_integration_id") // TF expects id to be set otherwise it will fail - d.Set(githubEnterpriseIntegrationFields.APIHost, githubEnterpriseIntegration.APIHost) - d.Set(githubEnterpriseIntegrationFields.WebhookSecret, githubEnterpriseIntegration.WebhookSecret) - d.Set(githubEnterpriseIntegrationFields.AppID, githubEnterpriseIntegration.AppID) + d.SetId(githubEnterpriseIntegration.ID) + d.Set(ghEnterpriseAPIHost, githubEnterpriseIntegration.APIHost) + d.Set(ghEnterpriseWebhookSecret, githubEnterpriseIntegration.WebhookSecret) + d.Set(ghEnterpriseAppID, githubEnterpriseIntegration.AppID) + d.Set(ghEnterpriseId, githubEnterpriseIntegration.ID) + d.Set(ghEnterpriseName, githubEnterpriseIntegration.Name) + d.Set(ghEnterpriseDescription, githubEnterpriseIntegration.Description) + d.Set(ghEnterpriseIsDefault, githubEnterpriseIntegration.IsDefault) + d.Set(ghEnterpriseSpaceID, githubEnterpriseIntegration.Space.ID) + + labels := schema.NewSet(schema.HashString, []interface{}{}) + for _, label := range githubEnterpriseIntegration.Labels { + labels.Add(label) + } + + d.Set(ghEnterpriseLabels, labels) return nil } diff --git a/spacelift/data_github_enterprise_integration_test.go b/spacelift/data_github_enterprise_integration_test.go index 30225b5a..78d29d62 100644 --- a/spacelift/data_github_enterprise_integration_test.go +++ b/spacelift/data_github_enterprise_integration_test.go @@ -10,15 +10,41 @@ import ( ) func TestGithubEnterpriseIntegrationData(t *testing.T) { - testSteps(t, []resource.TestStep{{ - Config: ` - data "spacelift_github_enterprise_integration" "test" {} - `, - Check: Resource( - "data.spacelift_github_enterprise_integration.test", - Attribute("api_host", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITHUB_ENTERPRISE_API_HOST"))), - Attribute("webhook_secret", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITHUB_ENTERPRISE_WEBHOOK_SECRET"))), - Attribute("app_id", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITHUB_ENTERPRISE_APP_ID"))), - ), - }}) + t.Run("without the ID specified", func(t *testing.T) { + testSteps(t, []resource.TestStep{{ + Config: ` + data "spacelift_github_enterprise_integration" "test" {} + `, + Check: Resource( + "data.spacelift_github_enterprise_integration.test", + Attribute("id", IsNotEmpty()), + Attribute("name", IsNotEmpty()), + Attribute("is_default", Equals("true")), + Attribute("space_id", IsNotEmpty()), + Attribute("api_host", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITHUB_ENTERPRISE_API_HOST"))), + Attribute("webhook_secret", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITHUB_ENTERPRISE_WEBHOOK_SECRET"))), + Attribute("app_id", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITHUB_ENTERPRISE_APP_ID"))), + ), + }}) + }) + + t.Run("with the ID specified", func(t *testing.T) { + testSteps(t, []resource.TestStep{{ + Config: ` + data "spacelift_github_enterprise_integration" "test" { + id = "github-enterprise-default-integration" + } + `, + Check: Resource( + "data.spacelift_github_enterprise_integration.test", + Attribute("id", Equals("github-enterprise-default-integration")), + Attribute("name", IsNotEmpty()), + Attribute("is_default", Equals("true")), + Attribute("space_id", IsNotEmpty()), + Attribute("api_host", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITHUB_ENTERPRISE_API_HOST"))), + Attribute("webhook_secret", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITHUB_ENTERPRISE_WEBHOOK_SECRET"))), + Attribute("app_id", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITHUB_ENTERPRISE_APP_ID"))), + ), + }}) + }) } diff --git a/spacelift/data_gitlab_integration.go b/spacelift/data_gitlab_integration.go index 461b8156..7f882434 100644 --- a/spacelift/data_gitlab_integration.go +++ b/spacelift/data_gitlab_integration.go @@ -9,13 +9,20 @@ import ( "github.com/spacelift-io/terraform-provider-spacelift/spacelift/internal" ) -var gitlabIntegrationFields = struct { - APIHost string - WebhookSecret string -}{ - APIHost: "api_host", - WebhookSecret: "webhook_secret", -} +const ( + gitlabId = "id" + gitlabName = "name" + gitlabDescription = "description" + gitlabIsDefault = "is_default" + gitlabLabels = "labels" + gitlabSpaceID = "space_id" + gitlabAppID = "app_id" + gitlabAPIHost = "api_host" + gitlabWebhookSecret = "webhook_secret" + gitlabWebhookURL = "webhook_url" + + defaultGitlabIntegrationID = "gitlab-default-integration" +) func dataGitlabIntegration() *schema.Resource { return &schema.Resource{ @@ -24,16 +31,54 @@ func dataGitlabIntegration() *schema.Resource { ReadContext: dataGitlabIntegrationRead, Schema: map[string]*schema.Schema{ - gitlabIntegrationFields.APIHost: { + gitlabId: { + Type: schema.TypeString, + Description: "Gitlab integration id. If not provided, the default integration will be returned", + Optional: true, + }, + gitlabName: { + Type: schema.TypeString, + Description: "Gitlab integration name", + Computed: true, + }, + gitlabDescription: { + Type: schema.TypeString, + Description: "Gitlab integration description", + Computed: true, + }, + gitlabIsDefault: { + Type: schema.TypeBool, + Description: "Gitlab integration is default", + Computed: true, + }, + gitlabLabels: { + Type: schema.TypeList, + Description: "Gitlab integration labels", + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + gitlabSpaceID: { + Type: schema.TypeString, + Description: "Gitlab integration space id", + Computed: true, + }, + gitlabAPIHost: { Type: schema.TypeString, Description: "Gitlab integration api host", Computed: true, }, - gitlabIntegrationFields.WebhookSecret: { + gitlabWebhookSecret: { Type: schema.TypeString, Description: "Gitlab integration webhook secret", Computed: true, }, + gitlabWebhookURL: { + Type: schema.TypeString, + Description: "Gitlab integration webhook url", + Computed: true, + }, }, } } @@ -42,12 +87,27 @@ func dataGitlabIntegrationRead(ctx context.Context, d *schema.ResourceData, meta var query struct { GitlabIntegration *struct { - APIHost string `graphql:"apiHost"` - WebhookSecret string `graphql:"webhookSecret"` - } `graphql:"gitlabIntegration"` + ID string `graphql:"id"` + Name string `graphql:"name"` + Description string `graphql:"description"` + IsDefault bool `graphql:"isDefault"` + Space struct { + ID string `graphql:"id"` + } `graphql:"space"` + Labels []string `graphql:"labels"` + APIHost string `graphql:"apiHost"` + WebhookSecret string `graphql:"webhookSecret"` + WebhookURL string `graphql:"webhookUrl"` + } `graphql:"gitlabIntegration(id: $id)"` } - if err := meta.(*internal.Client).Query(ctx, "GitlabIntegrationRead", &query, map[string]interface{}{}); err != nil { + variables := map[string]interface{}{"id": defaultGitlabIntegrationID} + + if id, ok := d.GetOk(gitlabId); ok && id != "" { + variables["id"] = toID(id) + } + + if err := meta.(*internal.Client).Query(ctx, "GitlabIntegrationRead", &query, variables); err != nil { return diag.Errorf("could not query for gitlab integration: %v", err) } @@ -56,9 +116,22 @@ func dataGitlabIntegrationRead(ctx context.Context, d *schema.ResourceData, meta return diag.Errorf("gitlab integration not found") } - d.SetId("spacelift_gitlab_integration_id") // TF expects id to be set otherwise it will fail - d.Set(gitlabIntegrationFields.APIHost, gitlabIntegration.APIHost) - d.Set(gitlabIntegrationFields.WebhookSecret, gitlabIntegration.WebhookSecret) + d.SetId(gitlabIntegration.ID) + d.Set(gitlabAPIHost, gitlabIntegration.APIHost) + d.Set(gitlabWebhookSecret, gitlabIntegration.WebhookSecret) + d.Set(gitlabWebhookURL, gitlabIntegration.WebhookURL) + d.Set(gitlabId, gitlabIntegration.ID) + d.Set(gitlabName, gitlabIntegration.Name) + d.Set(gitlabDescription, gitlabIntegration.Description) + d.Set(gitlabIsDefault, gitlabIntegration.IsDefault) + d.Set(gitlabSpaceID, gitlabIntegration.Space.ID) + + labels := schema.NewSet(schema.HashString, []interface{}{}) + for _, label := range gitlabIntegration.Labels { + labels.Add(label) + } + + d.Set(gitlabLabels, labels) return nil } diff --git a/spacelift/data_gitlab_integration_test.go b/spacelift/data_gitlab_integration_test.go index 7b4eee89..a4a9d829 100644 --- a/spacelift/data_gitlab_integration_test.go +++ b/spacelift/data_gitlab_integration_test.go @@ -10,14 +10,41 @@ import ( ) func TestGitlabIntegrationData(t *testing.T) { - testSteps(t, []resource.TestStep{{ - Config: ` - data "spacelift_gitlab_integration" "test" {} - `, - Check: Resource( - "data.spacelift_gitlab_integration.test", - Attribute("api_host", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITLAB_API_HOST"))), - Attribute("webhook_secret", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITLAB_WEBHOOK_SECRET"))), - ), - }}) + t.Run("without the id specified", func(t *testing.T) { + testSteps(t, []resource.TestStep{{ + Config: ` + data "spacelift_gitlab_integration" "test" {} + `, + Check: Resource( + "data.spacelift_gitlab_integration.test", + Attribute("id", IsNotEmpty()), + Attribute("name", IsNotEmpty()), + Attribute("is_default", Equals("true")), + Attribute("space_id", IsNotEmpty()), + Attribute("api_host", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITLAB_API_HOST"))), + Attribute("webhook_secret", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITLAB_WEBHOOK_SECRET"))), + Attribute("webhook_url", IsNotEmpty()), + ), + }}) + }) + + t.Run("with the id specified", func(t *testing.T) { + testSteps(t, []resource.TestStep{{ + Config: ` + data "spacelift_gitlab_integration" "test" { + id = "gitlab-default-integration" + } + `, + Check: Resource( + "data.spacelift_gitlab_integration.test", + Attribute("id", Equals("gitlab-default-integration")), + Attribute("name", IsNotEmpty()), + Attribute("is_default", Equals("true")), + Attribute("space_id", IsNotEmpty()), + Attribute("api_host", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITLAB_API_HOST"))), + Attribute("webhook_secret", Equals(os.Getenv("SPACELIFT_PROVIDER_TEST_GITLAB_WEBHOOK_SECRET"))), + Attribute("webhook_url", IsNotEmpty()), + ), + }}) + }) } diff --git a/spacelift/data_module.go b/spacelift/data_module.go index 65d758cc..7c57e0f0 100644 --- a/spacelift/data_module.go +++ b/spacelift/data_module.go @@ -41,6 +41,37 @@ func dataModule() *schema.Resource { Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Description: "ID of the Azure Devops integration", + Computed: true, + }, + "name": { + Type: schema.TypeString, + Description: "Name of the Azure Devops integration", + Computed: true, + }, + "description": { + Type: schema.TypeString, + Description: "Description of the Azure Devops integration", + Computed: true, + }, + "is_default": { + Type: schema.TypeBool, + Description: "Indicates whether this is the default Azure Devops integration", + Computed: true, + }, + "labels": { + Type: schema.TypeSet, + Description: "Labels of the Azure Devops integration", + Elem: &schema.Schema{Type: schema.TypeString}, + Computed: true, + }, + "space_id": { + Type: schema.TypeString, + Description: "ID (slug) of the space the Azure Devops integration is in", + Computed: true, + }, "project": { Type: schema.TypeString, Required: true, @@ -93,6 +124,37 @@ func dataModule() *schema.Resource { Description: "GitHub Enterprise namespace of the stack's repository", Required: true, }, + "id": { + Type: schema.TypeString, + Description: "ID of the GitHub Enterprise application", + Computed: true, + }, + "name": { + Type: schema.TypeString, + Description: "Name of the GitHub Enterprise application", + Computed: true, + }, + "description": { + Type: schema.TypeString, + Description: "Description of the GitHub Enterprise application", + Computed: true, + }, + "is_default": { + Type: schema.TypeBool, + Description: "Indicates whether this is the default GitHub Enterprise application", + Computed: true, + }, + "labels": { + Type: schema.TypeSet, + Description: "Labels of the GitHub Enterprise application", + Elem: &schema.Schema{Type: schema.TypeString}, + Computed: true, + }, + "space_id": { + Type: schema.TypeString, + Description: "ID (slug) of the space the GitHub Enterprise application is in", + Computed: true, + }, }, }, }, @@ -101,6 +163,37 @@ func dataModule() *schema.Resource { Description: "GitLab VCS settings", Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Description: "ID of the Gitlab integration", + Computed: true, + }, + "name": { + Type: schema.TypeString, + Description: "Name of the Gitlab integration", + Computed: true, + }, + "description": { + Type: schema.TypeString, + Description: "Description of the Gitlab integration", + Computed: true, + }, + "is_default": { + Type: schema.TypeBool, + Description: "Indicates whether this is the default Gitlab integration", + Computed: true, + }, + "labels": { + Type: schema.TypeSet, + Description: "Labels of the Gitlab integration", + Elem: &schema.Schema{Type: schema.TypeString}, + Computed: true, + }, + "space_id": { + Type: schema.TypeString, + Description: "ID (slug) of the space the Gitlab integration is in", + Computed: true, + }, "namespace": { Type: schema.TypeString, Description: "GitLab namespace of the repository", diff --git a/spacelift/data_spaces_test.go b/spacelift/data_spaces_test.go index ac409405..7a6fd28f 100644 --- a/spacelift/data_spaces_test.go +++ b/spacelift/data_spaces_test.go @@ -1,7 +1,6 @@ package spacelift import ( - "fmt" "testing" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" @@ -15,10 +14,10 @@ func TestSpacesData(t *testing.T) { testSteps(t, []resource.TestStep{{ // Should find at least the legacy and root spaces. - Config: fmt.Sprintf(` + Config: ` data "spacelift_spaces" "test" { } - `), + `, Check: resource.ComposeTestCheckFunc( Resource(datasourceName, Attribute("id", IsNotEmpty())), ), diff --git a/spacelift/data_stack.go b/spacelift/data_stack.go index f1fbf35d..b4313a66 100644 --- a/spacelift/data_stack.go +++ b/spacelift/data_stack.go @@ -103,6 +103,37 @@ func dataStack() *schema.Resource { Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Description: "ID of the Azure Devops project", + Computed: true, + }, + "name": { + Type: schema.TypeString, + Description: "Name of the Azure Devops project", + Computed: true, + }, + "description": { + Type: schema.TypeString, + Description: "Description of the Azure Devops project", + Computed: true, + }, + "is_default": { + Type: schema.TypeBool, + Description: "Indicates whether this is the default Azure Devops project", + Computed: true, + }, + "labels": { + Type: schema.TypeSet, + Description: "Labels of the Azure Devops project", + Elem: &schema.Schema{Type: schema.TypeString}, + Computed: true, + }, + "space_id": { + Type: schema.TypeString, + Description: "ID (slug) of the space the Azure Devops project is in", + Computed: true, + }, "project": { Type: schema.TypeString, Required: true, @@ -219,10 +250,41 @@ func dataStack() *schema.Resource { Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Description: "ID of the GitHub Enterprise application", + Computed: true, + }, + "name": { + Type: schema.TypeString, + Description: "Name of the GitHub Enterprise application", + Computed: true, + }, + "description": { + Type: schema.TypeString, + Description: "Description of the GitHub Enterprise application", + Computed: true, + }, + "is_default": { + Type: schema.TypeBool, + Description: "Indicates whether this is the default GitHub Enterprise application", + Computed: true, + }, + "labels": { + Type: schema.TypeSet, + Description: "Labels of the GitHub Enterprise application", + Elem: &schema.Schema{Type: schema.TypeString}, + Computed: true, + }, + "space_id": { + Type: schema.TypeString, + Description: "ID (slug) of the space the GitHub Enterprise application is in", + Computed: true, + }, "namespace": { Type: schema.TypeString, Description: "GitHub Enterprise namespace of the stack's repository", - Required: true, + Computed: true, }, }, }, @@ -233,6 +295,37 @@ func dataStack() *schema.Resource { Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Description: "ID of the Gitlab integration", + Computed: true, + }, + "name": { + Type: schema.TypeString, + Description: "Name of the Gitlab integration", + Computed: true, + }, + "description": { + Type: schema.TypeString, + Description: "Description of the Gitlab integration", + Computed: true, + }, + "is_default": { + Type: schema.TypeBool, + Description: "Indicates whether this is the default Gitlab integration", + Computed: true, + }, + "labels": { + Type: schema.TypeSet, + Description: "Labels of the Gitlab integration", + Elem: &schema.Schema{Type: schema.TypeString}, + Computed: true, + }, + "space_id": { + Type: schema.TypeString, + Description: "ID (slug) of the space the Gitlab integration is in", + Computed: true, + }, "namespace": { Type: schema.TypeString, Description: "GitLab namespace of the stack's repository", diff --git a/spacelift/internal/structs/module.go b/spacelift/internal/structs/module.go index 32d9c72f..845d75bf 100644 --- a/spacelift/internal/structs/module.go +++ b/spacelift/internal/structs/module.go @@ -18,12 +18,23 @@ type Module struct { Namespace string `graphql:"namespace"` ProjectRoot *string `graphql:"projectRoot"` ProtectFromDeletion bool `graphql:"protectFromDeletion"` - Provider string `graphql:"provider"` + Provider VCSProvider `graphql:"provider"` Repository string `graphql:"repository"` SharedAccounts []string `graphql:"sharedAccounts"` Space string `graphql:"space"` TerraformProvider string `graphql:"terraformProvider"` - WorkerPool *struct { + VCSIntegration *struct { + ID string `graphql:"id"` + Description string `graphql:"description"` + IsDefault bool `graphql:"isDefault"` + Labels []string `graphql:"labels"` + Name string `graphql:"name"` + Provider string `graphql:"provider"` + Space struct { + ID string `graphql:"id"` + } `graphql:"space"` + } `graphql:"vcsIntegration"` + WorkerPool *struct { ID string `graphql:"id"` } `graphql:"workerPool"` WorkflowTool *string `graphql:"workflowTool"` @@ -36,6 +47,12 @@ func (m *Module) ExportVCSSettings(d *schema.ResourceData) error { switch m.Provider { case VCSProviderAzureDevOps: + vcsSettings["id"] = m.VCSIntegration.ID + vcsSettings["name"] = m.VCSIntegration.Name + vcsSettings["description"] = m.VCSIntegration.Description + vcsSettings["is_default"] = m.VCSIntegration.IsDefault + vcsSettings["labels"] = populateLabels(m.VCSIntegration.Labels) + vcsSettings["space_id"] = m.VCSIntegration.Space.ID vcsSettings["project"] = m.Namespace fieldName = "azure_devops" case VCSProviderBitbucketCloud: @@ -45,9 +62,21 @@ func (m *Module) ExportVCSSettings(d *schema.ResourceData) error { vcsSettings["namespace"] = m.Namespace fieldName = "bitbucket_datacenter" case VCSProviderGitHubEnterprise: + vcsSettings["id"] = m.VCSIntegration.ID + vcsSettings["name"] = m.VCSIntegration.Name + vcsSettings["description"] = m.VCSIntegration.Description + vcsSettings["is_default"] = m.VCSIntegration.IsDefault + vcsSettings["labels"] = populateLabels(m.VCSIntegration.Labels) + vcsSettings["space_id"] = m.VCSIntegration.Space.ID vcsSettings["namespace"] = m.Namespace fieldName = "github_enterprise" case VCSProviderGitlab: + vcsSettings["id"] = m.VCSIntegration.ID + vcsSettings["name"] = m.VCSIntegration.Name + vcsSettings["description"] = m.VCSIntegration.Description + vcsSettings["is_default"] = m.VCSIntegration.IsDefault + vcsSettings["labels"] = populateLabels(m.VCSIntegration.Labels) + vcsSettings["space_id"] = m.VCSIntegration.Space.ID vcsSettings["namespace"] = m.Namespace fieldName = "gitlab" } @@ -60,3 +89,13 @@ func (m *Module) ExportVCSSettings(d *schema.ResourceData) error { return nil } + +func populateLabels(labels []string) *schema.Set { + retVal := schema.NewSet(schema.HashString, []interface{}{}) + + for _, label := range labels { + retVal.Add(label) + } + + return retVal +} diff --git a/spacelift/internal/structs/module_input.go b/spacelift/internal/structs/module_input.go index e51f6ea8..09a1e232 100644 --- a/spacelift/internal/structs/module_input.go +++ b/spacelift/internal/structs/module_input.go @@ -11,6 +11,7 @@ type ModuleCreateInput struct { Repository graphql.String `json:"repository"` TerraformProvider *graphql.String `json:"terraformProvider"` Space *graphql.String `json:"space"` + VCSIntegrationID *graphql.ID `json:"vcsIntegrationId"` WorkflowTool *graphql.String `json:"workflowTool"` } @@ -43,6 +44,7 @@ type ModuleUpdateV2Input struct { Repository graphql.String `json:"repository"` SharedAccounts *[]graphql.String `json:"sharedAccounts"` Space *graphql.String `json:"space"` + VCSIntegrationID *graphql.ID `json:"vcsIntegrationId"` WorkerPool *graphql.ID `json:"workerPool"` WorkflowTool *graphql.String `json:"workflowTool"` } diff --git a/spacelift/internal/structs/stack.go b/spacelift/internal/structs/stack.go index b7cb7f9a..fbc27296 100644 --- a/spacelift/internal/structs/stack.go +++ b/spacelift/internal/structs/stack.go @@ -51,13 +51,24 @@ type Stack struct { ProjectRoot *string `graphql:"projectRoot"` AdditionalProjectGlobs []string `graphql:"additionalProjectGlobs"` ProtectFromDeletion bool `graphql:"protectFromDeletion"` - Provider string `graphql:"provider"` + Provider VCSProvider `graphql:"provider"` Repository string `graphql:"repository"` RepositoryURL *string `graphql:"repositoryURL"` RunnerImage *string `graphql:"runnerImage"` Space string `graphql:"space"` TerraformVersion *string `graphql:"terraformVersion"` - VendorConfig struct { + VCSIntegration *struct { + ID string `graphql:"id"` + Description string `graphql:"description"` + IsDefault bool `graphql:"isDefault"` + Labels []string `graphql:"labels"` + Name string `graphql:"name"` + Provider string `graphql:"provider"` + Space struct { + ID string `graphql:"id"` + } `graphql:"space"` + } `graphql:"vcsIntegration"` + VendorConfig struct { Typename string `graphql:"__typename"` Ansible struct { Playbook string `graphql:"playbook"` @@ -131,15 +142,39 @@ func (s *Stack) IaCSettings() (string, map[string]interface{}) { func (s *Stack) VCSSettings() (string, map[string]interface{}) { switch s.Provider { case VCSProviderAzureDevOps: - return "azure_devops", singleKeyMap("project", s.Namespace) + return "azure_devops", map[string]interface{}{ + "id": s.VCSIntegration.ID, + "name": s.VCSIntegration.Name, + "description": s.VCSIntegration.Description, + "is_default": s.VCSIntegration.IsDefault, + "labels": s.VCSIntegration.Labels, + "space_id": s.VCSIntegration.Space.ID, + "project": s.Namespace, + } case VCSProviderBitbucketCloud: return "bitbucket_cloud", singleKeyMap("namespace", s.Namespace) case VCSProviderBitbucketDatacenter: return "bitbucket_datacenter", singleKeyMap("namespace", s.Namespace) case VCSProviderGitHubEnterprise: - return "github_enterprise", singleKeyMap("namespace", s.Namespace) + return "github_enterprise", map[string]interface{}{ + "id": s.VCSIntegration.ID, + "name": s.VCSIntegration.Name, + "namespace": s.Namespace, + "description": s.VCSIntegration.Description, + "is_default": s.VCSIntegration.IsDefault, + "labels": s.VCSIntegration.Labels, + "space_id": s.VCSIntegration.Space.ID, + } case VCSProviderGitlab: - return "gitlab", singleKeyMap("namespace", s.Namespace) + return "gitlab", map[string]interface{}{ + "id": s.VCSIntegration.ID, + "name": s.VCSIntegration.Name, + "namespace": s.Namespace, + "description": s.VCSIntegration.Description, + "is_default": s.VCSIntegration.IsDefault, + "labels": s.VCSIntegration.Labels, + "space_id": s.VCSIntegration.Space.ID, + } case VCSProviderRawGit: return "raw_git", map[string]interface{}{ "namespace": s.Namespace, diff --git a/spacelift/internal/structs/stack_input.go b/spacelift/internal/structs/stack_input.go index 5cd85a54..693212ac 100644 --- a/spacelift/internal/structs/stack_input.go +++ b/spacelift/internal/structs/stack_input.go @@ -33,6 +33,7 @@ type StackInput struct { RepositoryURL *graphql.String `json:"repositoryURL"` RunnerImage *graphql.String `json:"runnerImage"` Space *graphql.String `json:"space"` + VCSIntegrationID *graphql.ID `json:"vcsIntegrationId"` VendorConfig *VendorConfigInput `json:"vendorConfig"` WorkerPool *graphql.ID `json:"workerPool"` } diff --git a/spacelift/internal/structs/vcs_provider.go b/spacelift/internal/structs/vcs_provider.go index dbf0ba9c..910654f8 100644 --- a/spacelift/internal/structs/vcs_provider.go +++ b/spacelift/internal/structs/vcs_provider.go @@ -1,27 +1,32 @@ package structs +type VCSProvider string + const ( // VCSProviderAzureDevOps represents Azure DevOps VCS provider. - VCSProviderAzureDevOps = "AZURE_DEVOPS" + VCSProviderAzureDevOps VCSProvider = "AZURE_DEVOPS" // VCSProviderBitbucketDatacenter represents Bitbucket Datacenter // (self-hosted) VCS provider. - VCSProviderBitbucketDatacenter = "BITBUCKET_DATACENTER" + VCSProviderBitbucketDatacenter VCSProvider = "BITBUCKET_DATACENTER" // VCSProviderBitbucketCloud represents Bitbucket Cloud (managed) VCS // provider. - VCSProviderBitbucketCloud = "BITBUCKET_CLOUD" + VCSProviderBitbucketCloud VCSProvider = "BITBUCKET_CLOUD" + + // VCSProviderGitHub represents GitHub VCS provider. + VCSProviderGitHub VCSProvider = "GITHUB" // VCSProviderGitHubEnterprise represents GitHub Enterprise (self-hosted) // VCS provider. - VCSProviderGitHubEnterprise = "GITHUB_ENTERPRISE" + VCSProviderGitHubEnterprise VCSProvider = "GITHUB_ENTERPRISE" // VCSProviderGitlab represents GitLab VCS provider. - VCSProviderGitlab = "GITLAB" + VCSProviderGitlab VCSProvider = "GITLAB" // VCSProviderRawGit represents raw Git link VCS provider. - VCSProviderRawGit = "GIT" + VCSProviderRawGit VCSProvider = "GIT" // VCSProviderShowcases represents the showcases provider. - VCSProviderShowcases = "SHOWCASE" + VCSProviderShowcases VCSProvider = "SHOWCASE" ) diff --git a/spacelift/resource_module.go b/spacelift/resource_module.go index 93bcd2a8..7fe9d29b 100644 --- a/spacelift/resource_module.go +++ b/spacelift/resource_module.go @@ -49,6 +49,37 @@ func resourceModule() *schema.Resource { MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Description: "ID of the Azure Devops integration. If not specified, the default integration will be used.", + Optional: true, + }, + "name": { + Type: schema.TypeString, + Description: "Name of the Azure Devops integration", + Computed: true, + }, + "description": { + Type: schema.TypeString, + Description: "Description of the Azure Devops integration", + Computed: true, + }, + "is_default": { + Type: schema.TypeBool, + Description: "Indicates whether this is the default Azure Devops integration", + Computed: true, + }, + "labels": { + Type: schema.TypeSet, + Description: "Labels of the Azure Devops integration", + Elem: &schema.Schema{Type: schema.TypeString}, + Computed: true, + }, + "space_id": { + Type: schema.TypeString, + Description: "ID (slug) of the space the Azure Devops integration is in", + Computed: true, + }, "project": { Type: schema.TypeString, Required: true, @@ -122,6 +153,11 @@ func resourceModule() *schema.Resource { Description: "The GitHub organization / user the repository belongs to", ValidateDiagFunc: validations.DisallowEmptyString, }, + "id": { + Type: schema.TypeString, + Optional: true, + Description: "The ID of the GitHub Enterprise integration. If not specified, the default integration will be used.", + }, }, }, }, @@ -133,6 +169,37 @@ func resourceModule() *schema.Resource { MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Description: "ID of the Gitlab integration. If not specified, the default integration will be used.", + Optional: true, + }, + "name": { + Type: schema.TypeString, + Description: "Name of the Gitlab integration", + Computed: true, + }, + "description": { + Type: schema.TypeString, + Description: "Description of the Gitlab integration", + Computed: true, + }, + "is_default": { + Type: schema.TypeBool, + Description: "Indicates whether this is the default Gitlab integration", + Computed: true, + }, + "labels": { + Type: schema.TypeSet, + Description: "Labels of the Gitlab integration", + Elem: &schema.Schema{Type: schema.TypeString}, + Computed: true, + }, + "space_id": { + Type: schema.TypeString, + Description: "ID (slug) of the space the Gitlab integration is in", + Computed: true, + }, "namespace": { Type: schema.TypeString, Required: true, @@ -329,42 +396,52 @@ func resourceModuleDelete(ctx context.Context, d *schema.ResourceData, meta inte return nil } -func getSourceData(d *schema.ResourceData) (provider *graphql.String, namespace *graphql.String) { +func getSourceData(d *schema.ResourceData) (provider *graphql.String, namespace *graphql.String, vcsIntegrationID *graphql.ID) { provider = graphql.NewString("GITHUB") if azureDevOps, ok := d.Get("azure_devops").([]interface{}); ok && len(azureDevOps) > 0 { - namespace = toOptionalString(azureDevOps[0].(map[string]interface{})["project"]) - provider = graphql.NewString(structs.VCSProviderAzureDevOps) + azureSettings := azureDevOps[0].(map[string]interface{}) + if id, ok := azureSettings["id"]; ok { + vcsIntegrationID = graphql.NewID(id) + } + namespace = toOptionalString(azureSettings["project"]) + provider = graphql.NewString(graphql.String(structs.VCSProviderAzureDevOps)) return } if bitbucketCloud, ok := d.Get("bitbucket_cloud").([]interface{}); ok && len(bitbucketCloud) > 0 { namespace = toOptionalString(bitbucketCloud[0].(map[string]interface{})["namespace"]) - provider = graphql.NewString(structs.VCSProviderBitbucketCloud) + provider = graphql.NewString(graphql.String(structs.VCSProviderBitbucketCloud)) return } if bitbucketDatacenter, ok := d.Get("bitbucket_datacenter").([]interface{}); ok && len(bitbucketDatacenter) > 0 { namespace = toOptionalString(bitbucketDatacenter[0].(map[string]interface{})["namespace"]) - provider = graphql.NewString(structs.VCSProviderBitbucketDatacenter) + provider = graphql.NewString(graphql.String(structs.VCSProviderBitbucketDatacenter)) return } if githubEnterprise, ok := d.Get("github_enterprise").([]interface{}); ok && len(githubEnterprise) > 0 { + ghEnterpriseSettings := githubEnterprise[0].(map[string]interface{}) + if id, ok := ghEnterpriseSettings["id"]; ok { + vcsIntegrationID = graphql.NewID(id) + } namespace = toOptionalString(githubEnterprise[0].(map[string]interface{})["namespace"]) - provider = graphql.NewString(structs.VCSProviderGitHubEnterprise) + provider = graphql.NewString(graphql.String(structs.VCSProviderGitHubEnterprise)) return } if gitlab, ok := d.Get("gitlab").([]interface{}); ok && len(gitlab) > 0 { - namespace = toOptionalString(gitlab[0].(map[string]interface{})["namespace"]) - provider = graphql.NewString(structs.VCSProviderGitlab) - - return + gitlabSettings := gitlab[0].(map[string]interface{}) + if id, ok := gitlabSettings["id"]; ok { + vcsIntegrationID = graphql.NewID(id.(string)) + } + namespace = toOptionalString(gitlabSettings["namespace"]) + provider = graphql.NewString(graphql.String(structs.VCSProviderGitlab)) } return @@ -375,7 +452,7 @@ func moduleCreateInput(d *schema.ResourceData) structs.ModuleCreateInput { UpdateInput: moduleUpdateInput(d), Repository: toString(d.Get("repository")), } - ret.Provider, ret.Namespace = getSourceData(d) + ret.Provider, ret.Namespace, ret.VCSIntegrationID = getSourceData(d) name, ok := d.GetOk("name") if ok { @@ -454,7 +531,7 @@ func moduleUpdateV2Input(d *schema.ResourceData) structs.ModuleUpdateV2Input { ProtectFromDeletion: graphql.Boolean(d.Get("protect_from_deletion").(bool)), Repository: toString(d.Get("repository")), } - ret.Provider, ret.Namespace = getSourceData(d) + ret.Provider, ret.Namespace, ret.VCSIntegrationID = getSourceData(d) description, ok := d.GetOk("description") if ok { diff --git a/spacelift/resource_stack.go b/spacelift/resource_stack.go index 964826f9..338f3061 100644 --- a/spacelift/resource_stack.go +++ b/spacelift/resource_stack.go @@ -137,6 +137,11 @@ func resourceStack() *schema.Resource { MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Optional: true, + Description: "The ID of the Azure Devops integration. If not specified, the default integration will be used.", + }, "project": { Type: schema.TypeString, Required: true, @@ -297,6 +302,11 @@ func resourceStack() *schema.Resource { Description: "The GitHub organization / user the repository belongs to", ValidateDiagFunc: validations.DisallowEmptyString, }, + "id": { + Type: schema.TypeString, + Optional: true, + Description: "The ID of the GitHub Enterprise integration. If not specified, the default integration will be used.", + }, }, }, }, @@ -308,6 +318,11 @@ func resourceStack() *schema.Resource { MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ + "id": { + Type: schema.TypeString, + Optional: true, + Description: "The ID of the Gitlab integration. If not specified, the default integration will be used.", + }, "namespace": { Type: schema.TypeString, Required: true, @@ -732,39 +747,51 @@ func stackInput(d *schema.ResourceData) structs.StackInput { ret.Provider = graphql.NewString("GITHUB") if azureDevOps, ok := d.Get("azure_devops").([]interface{}); ok && len(azureDevOps) > 0 { + azureSettings := azureDevOps[0].(map[string]interface{}) + if id, ok := azureSettings["id"]; ok { + ret.VCSIntegrationID = graphql.NewID(id.(string)) + } ret.Namespace = toOptionalString(azureDevOps[0].(map[string]interface{})["project"]) - ret.Provider = graphql.NewString(structs.VCSProviderAzureDevOps) + ret.Provider = graphql.NewString(graphql.String(structs.VCSProviderAzureDevOps)) } if bitbucketCloud, ok := d.Get("bitbucket_cloud").([]interface{}); ok && len(bitbucketCloud) > 0 { ret.Namespace = toOptionalString(bitbucketCloud[0].(map[string]interface{})["namespace"]) - ret.Provider = graphql.NewString(structs.VCSProviderBitbucketCloud) + ret.Provider = graphql.NewString(graphql.String(structs.VCSProviderBitbucketCloud)) } if bitbucketDatacenter, ok := d.Get("bitbucket_datacenter").([]interface{}); ok && len(bitbucketDatacenter) > 0 { ret.Namespace = toOptionalString(bitbucketDatacenter[0].(map[string]interface{})["namespace"]) - ret.Provider = graphql.NewString(structs.VCSProviderBitbucketDatacenter) + ret.Provider = graphql.NewString(graphql.String(structs.VCSProviderBitbucketDatacenter)) } if githubEnterprise, ok := d.Get("github_enterprise").([]interface{}); ok && len(githubEnterprise) > 0 { - ret.Namespace = toOptionalString(githubEnterprise[0].(map[string]interface{})["namespace"]) - ret.Provider = graphql.NewString(structs.VCSProviderGitHubEnterprise) + ghEnterpriseSettings := githubEnterprise[0].(map[string]interface{}) + if id, ok := ghEnterpriseSettings["id"]; ok { + ret.VCSIntegrationID = graphql.NewID(id) + } + ret.Namespace = toOptionalString(ghEnterpriseSettings["namespace"]) + ret.Provider = graphql.NewString(graphql.String(structs.VCSProviderGitHubEnterprise)) } if gitlab, ok := d.Get("gitlab").([]interface{}); ok && len(gitlab) > 0 { - ret.Namespace = toOptionalString(gitlab[0].(map[string]interface{})["namespace"]) - ret.Provider = graphql.NewString(structs.VCSProviderGitlab) + gitlabSettings := gitlab[0].(map[string]interface{}) + if id, ok := gitlabSettings["id"]; ok { + ret.VCSIntegrationID = graphql.NewID(id.(string)) + } + ret.Namespace = toOptionalString(gitlabSettings["namespace"]) + ret.Provider = graphql.NewString(graphql.String(structs.VCSProviderGitlab)) } if rawGit, ok := d.Get("raw_git").([]interface{}); ok && len(rawGit) > 0 { - ret.Provider = graphql.NewString(structs.VCSProviderRawGit) + ret.Provider = graphql.NewString(graphql.String(structs.VCSProviderRawGit)) ret.Namespace = toOptionalString(rawGit[0].(map[string]interface{})["namespace"]) ret.RepositoryURL = toOptionalString(rawGit[0].(map[string]interface{})["url"]) } if showcase, ok := d.Get("showcase").([]interface{}); ok && len(showcase) > 0 { ret.Namespace = toOptionalString(showcase[0].(map[string]interface{})["namespace"]) - ret.Provider = graphql.NewString(structs.VCSProviderShowcases) + ret.Provider = graphql.NewString(graphql.String(structs.VCSProviderShowcases)) } if labelSet, ok := d.Get("labels").(*schema.Set); ok { diff --git a/spacelift/test_provider.go b/spacelift/test_provider.go index 81db2081..ee66e887 100644 --- a/spacelift/test_provider.go +++ b/spacelift/test_provider.go @@ -1,3 +1,4 @@ +//nolint:unused package spacelift import ( diff --git a/tools/go.mod b/tools/go.mod index e0ffb5c1..24d68d71 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,8 +1,8 @@ module tools -go 1.19 +go 1.21 -require github.com/hashicorp/terraform-plugin-docs v0.15.0 +require github.com/hashicorp/terraform-plugin-docs v0.16.0 require ( github.com/Masterminds/goutils v1.1.1 // indirect @@ -23,7 +23,7 @@ require ( github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hc-install v0.5.2 // indirect github.com/hashicorp/terraform-exec v0.18.1 // indirect - github.com/hashicorp/terraform-json v0.16.0 // indirect + github.com/hashicorp/terraform-json v0.17.1 // indirect github.com/huandu/xstrings v1.3.2 // indirect github.com/imdario/mergo v0.3.13 // indirect github.com/mattn/go-colorable v0.1.13 // indirect @@ -37,7 +37,8 @@ require ( github.com/spf13/cast v1.5.0 // indirect github.com/zclconf/go-cty v1.13.2 // indirect golang.org/x/crypto v0.8.0 // indirect - golang.org/x/mod v0.10.0 // indirect + golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect + golang.org/x/mod v0.11.0 // indirect golang.org/x/sys v0.7.0 // indirect - golang.org/x/text v0.9.0 // indirect + golang.org/x/text v0.11.0 // indirect ) diff --git a/tools/go.sum b/tools/go.sum index bff61a2e..27da1893 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -6,9 +6,11 @@ github.com/Masterminds/sprig/v3 v3.2.1/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFP github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8= github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= +github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 h1:wPbRQzjjwFc0ih8puEVAOFGELsn1zoIIYdxvML7mDxA= github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g= github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ= +github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -24,14 +26,20 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= +github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= +github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= github.com/go-git/go-billy/v5 v5.4.1 h1:Uwp5tDRkPr+l/TnbHOQzp+tmJfLceOlbVucgpTz8ix4= +github.com/go-git/go-billy/v5 v5.4.1/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg= github.com/go-git/go-git/v5 v5.6.1 h1:q4ZRqQl4pR/ZJHc1L5CFjGA1a10u76aV1iC+nh+bHsk= +github.com/go-git/go-git/v5 v5.6.1/go.mod h1:mvyoL6Unz0PiTQrGQfSfiLFhBH1c1e84ylC2MDs4ee8= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -56,10 +64,10 @@ github.com/hashicorp/hc-install v0.5.2 h1:SfwMFnEXVVirpwkDuSF5kymUOhrUxrTq3udEse github.com/hashicorp/hc-install v0.5.2/go.mod h1:9QISwe6newMWIfEiXpzuu1k9HAGtQYgnSH8H9T8wmoI= github.com/hashicorp/terraform-exec v0.18.1 h1:LAbfDvNQU1l0NOQlTuudjczVhHj061fNX5H8XZxHlH4= github.com/hashicorp/terraform-exec v0.18.1/go.mod h1:58wg4IeuAJ6LVsLUeD2DWZZoc/bYi6dzhLHzxM41980= -github.com/hashicorp/terraform-json v0.16.0 h1:UKkeWRWb23do5LNAFlh/K3N0ymn1qTOO8c+85Albo3s= -github.com/hashicorp/terraform-json v0.16.0/go.mod h1:v0Ufk9jJnk6tcIZvScHvetlKfiNTC+WS21mnXIlc0B0= -github.com/hashicorp/terraform-plugin-docs v0.15.0 h1:W5xYB5kCUBqO7lyjE2UMmUBh95c0aAf4jwO0Xuuw2Ec= -github.com/hashicorp/terraform-plugin-docs v0.15.0/go.mod h1:K5Taof1Y7sL4dw6Ie0qMFyQnHN0W+RSVMD0iIyFDFJc= +github.com/hashicorp/terraform-json v0.17.1 h1:eMfvh/uWggKmY7Pmb3T85u86E2EQg6EQHgyRwf3RkyA= +github.com/hashicorp/terraform-json v0.17.1/go.mod h1:Huy6zt6euxaY9knPAFKjUITn8QxUFIe9VuSzb4zn/0o= +github.com/hashicorp/terraform-plugin-docs v0.16.0 h1:UmxFr3AScl6Wged84jndJIfFccGyBZn52KtMNsS12dI= +github.com/hashicorp/terraform-plugin-docs v0.16.0/go.mod h1:M3ZrlKBJAbPMtNOPwHicGi1c+hZUh7/g0ifT/z7TVfA= github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= @@ -67,9 +75,13 @@ github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= +github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= @@ -88,19 +100,23 @@ github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= +github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww= github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= +github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/skeema/knownhosts v1.1.0 h1:Wvr9V0MxhjRbl3f9nMnKnFfiWTJmtECJ9Njkea3ysW0= +github.com/skeema/knownhosts v1.1.0/go.mod h1:sKFq3RD6/TKZkSWn8boUbDC7Qkgcv+8XXijpFO6roag= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= @@ -111,6 +127,7 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= +github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/zclconf/go-cty v1.13.2 h1:4GvrUxe/QUDYuJKAav4EYqdM47/kZa672LwmXFmEKT0= github.com/zclconf/go-cty v1.13.2/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -119,11 +136,14 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ= golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME= +golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= +golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= +golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 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= @@ -138,11 +158,12 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=