Skip to content

Commit 41c76e6

Browse files
Arthur1Arthur1
authored
Merge pull request #209 from tosuke/mux-framework
Add an empty framework provider
2 parents 6e3ace2 + 65c43e0 commit 41c76e6

33 files changed

+606
-565
lines changed

‎.github/workflows/acceptance-test.yml

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
strategy:
1010
matrix:
1111
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
12+
framework: ['0', '1']
1213
runs-on: ${{ matrix.os }}
1314
steps:
1415
- uses: actions/checkout@v4
@@ -25,6 +26,7 @@ jobs:
2526
env:
2627
TF_ACC: 1
2728
MACKEREL_API_KEY: ${{ secrets.MACKEREL_API_KEY }}
29+
MACKEREL_EXPERIMENTAL_TFFRAMEWORK: ${{ matrix.framework }}
2830
EXTERNAL_ID: ${{ secrets.EXTERNAL_ID }}
2931
AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
3032
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

‎go.mod

+42-50
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
module github.com/mackerelio-labs/terraform-provider-mackerel
22

3-
go 1.18
3+
go 1.21
44

55
require (
66
github.com/golangci/golangci-lint v1.50.1
7-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.7.0
7+
github.com/hashicorp/terraform-plugin-go v0.23.0
8+
github.com/hashicorp/terraform-plugin-mux v0.16.0
9+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
810
github.com/mackerelio/mackerel-client-go v0.31.0
911
)
1012

1113
require (
1214
4d63.com/gochecknoglobals v0.1.0 // indirect
13-
cloud.google.com/go v0.100.2 // indirect
14-
cloud.google.com/go/compute v1.6.1 // indirect
15-
cloud.google.com/go/iam v0.3.0 // indirect
16-
cloud.google.com/go/storage v1.14.0 // indirect
1715
github.com/Abirdcfly/dupword v0.0.7 // indirect
1816
github.com/Antonboom/errname v0.1.7 // indirect
1917
github.com/Antonboom/nilnil v0.1.1 // indirect
@@ -22,33 +20,31 @@ require (
2220
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
2321
github.com/Masterminds/semver v1.5.0 // indirect
2422
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
23+
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
2524
github.com/agext/levenshtein v1.2.2 // indirect
2625
github.com/alexkohler/prealloc v1.0.0 // indirect
2726
github.com/alingse/asasalint v0.0.11 // indirect
28-
github.com/apparentlymart/go-cidr v1.0.1 // indirect
29-
github.com/apparentlymart/go-textseg v1.0.0 // indirect
30-
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
27+
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
3128
github.com/ashanbrown/forbidigo v1.3.0 // indirect
3229
github.com/ashanbrown/makezero v1.1.1 // indirect
33-
github.com/aws/aws-sdk-go v1.36.30 // indirect
3430
github.com/beorn7/perks v1.0.1 // indirect
35-
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
3631
github.com/bkielbasa/cyclop v1.2.0 // indirect
3732
github.com/blizzy78/varnamelen v0.8.0 // indirect
3833
github.com/bombsimon/wsl/v3 v3.3.0 // indirect
3934
github.com/breml/bidichk v0.2.3 // indirect
4035
github.com/breml/errchkjson v0.3.0 // indirect
4136
github.com/butuzov/ireturn v0.1.1 // indirect
42-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
37+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4338
github.com/charithe/durationcheck v0.0.9 // indirect
4439
github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
40+
github.com/cloudflare/circl v1.3.7 // indirect
4541
github.com/curioswitch/go-reassign v0.2.0 // indirect
4642
github.com/daixiang0/gci v0.8.1 // indirect
4743
github.com/davecgh/go-spew v1.1.1 // indirect
4844
github.com/denis-tingaikin/go-header v0.4.3 // indirect
4945
github.com/esimonov/ifshort v1.0.4 // indirect
5046
github.com/ettle/strcase v0.1.1 // indirect
51-
github.com/fatih/color v1.13.0 // indirect
47+
github.com/fatih/color v1.16.0 // indirect
5248
github.com/fatih/structtag v1.2.0 // indirect
5349
github.com/firefart/nonamedreturns v1.0.4 // indirect
5450
github.com/fsnotify/fsnotify v1.5.4 // indirect
@@ -64,8 +60,7 @@ require (
6460
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
6561
github.com/gobwas/glob v0.2.3 // indirect
6662
github.com/gofrs/flock v0.8.1 // indirect
67-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
68-
github.com/golang/protobuf v1.5.2 // indirect
63+
github.com/golang/protobuf v1.5.4 // indirect
6964
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
7065
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
7166
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
@@ -75,8 +70,7 @@ require (
7570
github.com/golangci/misspell v0.3.5 // indirect
7671
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
7772
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
78-
github.com/google/go-cmp v0.5.9 // indirect
79-
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
73+
github.com/google/go-cmp v0.6.0 // indirect
8074
github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
8175
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
8276
github.com/gostaticanalysis/comment v1.4.2 // indirect
@@ -86,31 +80,32 @@ require (
8680
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
8781
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
8882
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
89-
github.com/hashicorp/go-getter v1.5.3 // indirect
90-
github.com/hashicorp/go-hclog v1.2.0 // indirect
83+
github.com/hashicorp/go-hclog v1.5.0 // indirect
9184
github.com/hashicorp/go-multierror v1.1.1 // indirect
92-
github.com/hashicorp/go-plugin v1.4.1 // indirect
93-
github.com/hashicorp/go-safetemp v1.0.0 // indirect
94-
github.com/hashicorp/go-uuid v1.0.1 // indirect
85+
github.com/hashicorp/go-plugin v1.6.0 // indirect
86+
github.com/hashicorp/go-uuid v1.0.3 // indirect
9587
github.com/hashicorp/go-version v1.6.0 // indirect
88+
github.com/hashicorp/hc-install v0.6.4 // indirect
9689
github.com/hashicorp/hcl v1.0.0 // indirect
97-
github.com/hashicorp/hcl/v2 v2.3.0 // indirect
90+
github.com/hashicorp/hcl/v2 v2.20.1 // indirect
9891
github.com/hashicorp/logutils v1.0.0 // indirect
99-
github.com/hashicorp/terraform-exec v0.14.0 // indirect
100-
github.com/hashicorp/terraform-json v0.13.0 // indirect
101-
github.com/hashicorp/terraform-plugin-go v0.3.0 // indirect
102-
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
92+
github.com/hashicorp/terraform-exec v0.21.0 // indirect
93+
github.com/hashicorp/terraform-json v0.22.1 // indirect
94+
github.com/hashicorp/terraform-plugin-framework v1.8.0 // indirect
95+
github.com/hashicorp/terraform-plugin-framework-validators v0.12.0 // indirect
96+
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
97+
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
98+
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
99+
github.com/hashicorp/yamux v0.1.1 // indirect
103100
github.com/hexops/gotextdiff v1.0.3 // indirect
104101
github.com/inconshreveable/mousetrap v1.0.1 // indirect
105102
github.com/jgautheron/goconst v1.5.1 // indirect
106103
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
107104
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
108-
github.com/jmespath/go-jmespath v0.4.0 // indirect
109105
github.com/julz/importas v0.1.0 // indirect
110106
github.com/kisielk/errcheck v1.6.2 // indirect
111107
github.com/kisielk/gotool v1.0.0 // indirect
112108
github.com/kkHAIKE/contextcheck v1.1.3 // indirect
113-
github.com/klauspost/compress v1.11.2 // indirect
114109
github.com/kulti/thelper v0.6.3 // indirect
115110
github.com/kunwardeep/paralleltest v1.0.6 // indirect
116111
github.com/kyoh86/exportloopref v0.1.8 // indirect
@@ -123,14 +118,14 @@ require (
123118
github.com/maratori/testpackage v1.1.0 // indirect
124119
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
125120
github.com/mattn/go-colorable v0.1.13 // indirect
126-
github.com/mattn/go-isatty v0.0.16 // indirect
121+
github.com/mattn/go-isatty v0.0.20 // indirect
127122
github.com/mattn/go-runewidth v0.0.9 // indirect
128123
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
129124
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
130125
github.com/mgechev/revive v1.2.4 // indirect
131126
github.com/mitchellh/copystructure v1.2.0 // indirect
132127
github.com/mitchellh/go-homedir v1.1.0 // indirect
133-
github.com/mitchellh/go-testing-interface v1.0.4 // indirect
128+
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
134129
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
135130
github.com/mitchellh/mapstructure v1.5.0 // indirect
136131
github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -176,44 +171,41 @@ require (
176171
github.com/spf13/viper v1.12.0 // indirect
177172
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
178173
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
179-
github.com/stretchr/objx v0.4.0 // indirect
180-
github.com/stretchr/testify v1.8.0 // indirect
174+
github.com/stretchr/objx v0.5.0 // indirect
175+
github.com/stretchr/testify v1.8.1 // indirect
181176
github.com/subosito/gotenv v1.4.1 // indirect
182177
github.com/tdakkota/asciicheck v0.1.1 // indirect
183178
github.com/tetafro/godot v1.4.11 // indirect
184179
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect
185180
github.com/timonwong/loggercheck v0.9.3 // indirect
186181
github.com/tomarrell/wrapcheck/v2 v2.7.0 // indirect
187182
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
188-
github.com/ulikunitz/xz v0.5.8 // indirect
189183
github.com/ultraware/funlen v0.0.3 // indirect
190184
github.com/ultraware/whitespace v0.0.5 // indirect
191185
github.com/uudashr/gocognit v1.0.6 // indirect
192186
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
187+
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
188+
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
193189
github.com/yagipy/maintidx v1.0.0 // indirect
194190
github.com/yeya24/promlinter v0.2.0 // indirect
195-
github.com/zclconf/go-cty v1.9.1 // indirect
191+
github.com/zclconf/go-cty v1.14.4 // indirect
196192
gitlab.com/bosi/decorder v0.2.3 // indirect
197-
go.opencensus.io v0.23.0 // indirect
198193
go.uber.org/atomic v1.7.0 // indirect
199194
go.uber.org/multierr v1.6.0 // indirect
200195
go.uber.org/zap v1.17.0 // indirect
201-
golang.org/x/crypto v0.1.0 // indirect
196+
golang.org/x/crypto v0.23.0 // indirect
202197
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
203198
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
204-
golang.org/x/mod v0.6.0 // indirect
205-
golang.org/x/net v0.1.0 // indirect
206-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
207-
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
208-
golang.org/x/sys v0.1.0 // indirect
209-
golang.org/x/text v0.4.0 // indirect
210-
golang.org/x/tools v0.2.0 // indirect
211-
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
212-
google.golang.org/api v0.81.0 // indirect
213-
google.golang.org/appengine v1.6.7 // indirect
214-
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
215-
google.golang.org/grpc v1.46.2 // indirect
216-
google.golang.org/protobuf v1.28.0 // indirect
199+
golang.org/x/mod v0.16.0 // indirect
200+
golang.org/x/net v0.23.0 // indirect
201+
golang.org/x/sync v0.6.0 // indirect
202+
golang.org/x/sys v0.20.0 // indirect
203+
golang.org/x/text v0.15.0 // indirect
204+
golang.org/x/tools v0.13.0 // indirect
205+
google.golang.org/appengine v1.6.8 // indirect
206+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
207+
google.golang.org/grpc v1.63.2 // indirect
208+
google.golang.org/protobuf v1.34.0 // indirect
217209
gopkg.in/ini.v1 v1.67.0 // indirect
218210
gopkg.in/yaml.v2 v2.4.0 // indirect
219211
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)