Skip to content

Commit 1214a16

Browse files
jbardinjbardin
authored
Merge pull request hashicorp#31347 from hashicorp/jbardin/remove-etcdv3
remove deprecated etcdv3 backend
2 parents 8fac3d6 + d61d3e9 commit 1214a16

9 files changed

Lines changed: 3 additions & 793 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ require (
8080
github.com/zclconf/go-cty v1.10.0
8181
github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b
8282
github.com/zclconf/go-cty-yaml v1.0.2
83-
go.etcd.io/etcd/client/pkg/v3 v3.5.4
84-
go.etcd.io/etcd/client/v3 v3.5.4
8583
golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898
8684
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
8785
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
@@ -126,9 +124,7 @@ require (
126124
github.com/armon/go-radix v1.0.0 // indirect
127125
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
128126
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
129-
github.com/coreos/go-semver v0.3.0 // indirect
130127
github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d // indirect
131-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
132128
github.com/creack/pty v1.1.18 // indirect
133129
github.com/dimchansky/utfbom v1.1.1 // indirect
134130
github.com/dylanmei/iso8601 v0.1.0 // indirect
@@ -173,14 +169,11 @@ require (
173169
github.com/shopspring/decimal v1.2.0 // indirect
174170
github.com/spf13/cast v1.3.1 // indirect
175171
github.com/spf13/pflag v1.0.5 // indirect
172+
github.com/stretchr/objx v0.1.1 // indirect
176173
github.com/ulikunitz/xz v0.5.8 // indirect
177174
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
178175
github.com/vmihailenco/tagparser v0.1.1 // indirect
179-
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
180176
go.opencensus.io v0.23.0 // indirect
181-
go.uber.org/atomic v1.7.0 // indirect
182-
go.uber.org/multierr v1.6.0 // indirect
183-
go.uber.org/zap v1.17.0 // indirect
184177
golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect
185178
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
186179
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect

‎go.sum‎

Lines changed: 0 additions & 78 deletions
Large diffs are not rendered by default.

‎internal/backend/init/init.go‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
backendAzure "github.com/hashicorp/terraform/internal/backend/remote-state/azure"
1717
backendConsul "github.com/hashicorp/terraform/internal/backend/remote-state/consul"
1818
backendCos "github.com/hashicorp/terraform/internal/backend/remote-state/cos"
19-
backendEtcdv3 "github.com/hashicorp/terraform/internal/backend/remote-state/etcdv3"
2019
backendGCS "github.com/hashicorp/terraform/internal/backend/remote-state/gcs"
2120
backendHTTP "github.com/hashicorp/terraform/internal/backend/remote-state/http"
2221
backendInmem "github.com/hashicorp/terraform/internal/backend/remote-state/inmem"
@@ -86,12 +85,6 @@ func Init(services *disco.Disco) {
8685
`Warning: "artifactory" backend is deprecated, and will be removed in a future release."`,
8786
)
8887
},
89-
"etcdv3": func() backend.Backend {
90-
return deprecateBackend(
91-
backendEtcdv3.New(),
92-
`Warning: "etcdv3" backend is deprecated, and will be removed in a future release."`,
93-
)
94-
},
9588
"manta": func() backend.Backend {
9689
return deprecateBackend(
9790
backendManta.New(),
@@ -107,7 +100,8 @@ func Init(services *disco.Disco) {
107100
}
108101

109102
RemovedBackends = map[string]string{
110-
"etcd": `The "etcd" backend is not supported in Terraform v1.3 or later.`,
103+
"etcd": `The "etcd" backend is not supported in Terraform v1.3 or later.`,
104+
"etcdv3": `The "etcdv3" backend is not supported in Terraform v1.3 or later.`,
111105
}
112106
}
113107

‎internal/backend/init/init_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ func TestInit_backend(t *testing.T) {
2525

2626
{"azure", "init.deprecatedBackendShim"},
2727
{"artifactory", "init.deprecatedBackendShim"},
28-
{"etcdv3", "init.deprecatedBackendShim"},
2928
{"manta", "init.deprecatedBackendShim"},
3029
{"swift", "init.deprecatedBackendShim"},
3130
}

‎internal/backend/remote-state/etcdv3/backend.go‎

Lines changed: 0 additions & 168 deletions
This file was deleted.

‎internal/backend/remote-state/etcdv3/backend_state.go‎

Lines changed: 0 additions & 109 deletions
This file was deleted.

0 commit comments

Comments
 (0)