Skip to content

Commit

Permalink
Merge pull request #798 from linode/dev
Browse files Browse the repository at this point in the history
v2.0.0
  • Loading branch information
jriddle-linode committed Apr 25, 2023
2 parents 55f0d23 + 241cd32 commit 05f2e76
Show file tree
Hide file tree
Showing 126 changed files with 2,720 additions and 778 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gosec_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
GO111MODULE: on
steps:
- name: Checkout Source
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # pin@v2
uses: actions/checkout@v3
- name: Run Gosec Security Scanner
uses: securego/gosec@master
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Clone Repository
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # pin@v2
- uses: actions/setup-go@37335c7bb261b353407cff977110895fa0b4f7d8 # pin@v2
uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.19'
- run: go version
- run: make testacc
env:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integration_tests_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
github.event.client_payload.pull_request.head.sha == github.event.client_payload.slash_command.sha

steps:
- uses: actions/setup-go@37335c7bb261b353407cff977110895fa0b4f7d8 # pin@v2
- uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.19'
- run: go version
- uses: actions-ecosystem/action-regex-match@v2
id: validate-pkg
Expand All @@ -29,7 +29,7 @@ jobs:

# Check out merge commit
- name: Checkout PR
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ github.event.client_payload.slash_command.sha }}

Expand All @@ -38,7 +38,7 @@ jobs:
env:
LINODE_TOKEN: ${{ secrets.DX_LINODE_TOKEN }}

- uses: actions/github-script@v5
- uses: actions/github-script@v6
id: update-check-run
if: ${{ always() }}
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # pin@v2
- uses: actions/checkout@v3
- uses: micnncim/action-label-syncer@3abd5ab72fda571e69fffd97bd4e0033dd5f495c # pin@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ jobs:
tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # pin@v2
- uses: actions/setup-go@37335c7bb261b353407cff977110895fa0b4f7d8 # pin@v2
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.19'
- run: go version

- run: make tooldeps
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # pin@v2
uses: actions/checkout@v3
- name: Unshallow
run: git fetch --prune --unshallow
- name: Set up Go
uses: actions/setup-go@37335c7bb261b353407cff977110895fa0b4f7d8 # pin@v2
uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: 1.19
- name: Import GPG key
id: import_gpg
uses: paultyng/ghaction-import-gpg@53deb67fe3b05af114ad9488a4da7b782455d588 # pin@v2.1.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@8af60513daf46d35533e7d765d4553d223d810e0 # pin@main
- uses: actions/stale@v5
id: stale
with:
stale-issue-message: 'This issue is stale because it has been open 30 days with
Expand Down
19 changes: 17 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ run:
timeout: 2m

linters-settings:
revive:
rules:
- name: unused-parameter
severity: warning
disabled: true
errcheck:
check-type-assertions: true
check-blank: true
Expand All @@ -15,6 +20,7 @@ linters-settings:

enable:
- atomicalign
- fieldalignment
enable-all: false
disable:
- shadow
Expand All @@ -25,8 +31,6 @@ linters-settings:
# min-complexity: 30
# gocognit:
# min-complexity: 30
maligned:
suggest-new: true
dupl:
threshold: 100

Expand All @@ -48,6 +52,17 @@ linters:
- interfacer
- gomnd

# not compatible with upper stream design
- ireturn

# deprecated linters
- deadcode
- structcheck
- varcheck
- golint
- nosnakecase
- maligned

# TODO(charliekenney23): enable these rules once compliant
- prealloc
- funlen
Expand Down
60 changes: 33 additions & 27 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,50 @@ module github.com/linode/terraform-provider-linode

require (
github.com/aws/aws-sdk-go v1.42.16
github.com/go-resty/resty/v2 v2.7.0
github.com/google/go-cmp v0.5.9
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
github.com/linode/linodego v1.12.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.26.1
github.com/linode/linodego v1.16.1
github.com/linode/linodego/k8s v0.0.0-20200831124119-58d5d5bb7947
golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167
golang.org/x/crypto v0.8.0
)

require (
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
)

require (
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/fatih/color v1.13.0 // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.5.5 // 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.1 // 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.6 // indirect
github.com/hashicorp/go-plugin v1.4.9 // 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.4.0 // indirect
github.com/hashicorp/hcl/v2 v2.15.0 // indirect
github.com/hashicorp/hc-install v0.5.0 // indirect
github.com/hashicorp/hcl/v2 v2.16.2 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-exec v0.17.3 // indirect
github.com/hashicorp/terraform-json v0.14.0 // indirect
github.com/hashicorp/terraform-plugin-go v0.14.1 // indirect
github.com/hashicorp/terraform-plugin-log v0.7.0 // indirect
github.com/hashicorp/terraform-registry-address v0.0.0-20220623143253-7d51757b572c // indirect
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
github.com/hashicorp/terraform-exec v0.18.1 // indirect
github.com/hashicorp/terraform-json v0.16.0 // indirect
github.com/hashicorp/terraform-plugin-framework v1.2.0
github.com/hashicorp/terraform-plugin-framework-validators v0.10.0
github.com/hashicorp/terraform-plugin-go v0.15.0
github.com/hashicorp/terraform-plugin-log v0.8.0 // indirect
github.com/hashicorp/terraform-plugin-mux v0.10.0
github.com/hashicorp/terraform-registry-address v0.2.0 // indirect
github.com/hashicorp/terraform-svchost v0.0.1 // indirect
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
Expand All @@ -55,19 +62,18 @@ require (
github.com/oklog/run v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // 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.12.1 // indirect
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
golang.org/x/text v0.3.7 // indirect
github.com/zclconf/go-cty v1.13.1 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/term v0.7.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1 // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
google.golang.org/grpc v1.54.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.6 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand All @@ -83,4 +89,4 @@ require (
sigs.k8s.io/yaml v1.2.0 // indirect
)

go 1.18
go 1.19

0 comments on commit 05f2e76

Please sign in to comment.