Merge pull request #31215 from hashicorp/jbardin/deprecate-backends

deprecate unmaintained remote state backends

internal/backend/init/init.go

@@ -54,26 +54,22 @@ func Init(services *disco.Disco) {
 		"remote": func() backend.Backend { return backendRemote.New(services) },
 
 		// Remote State backends.
-		"artifactory": func() backend.Backend { return backendArtifactory.New() },
 		"azurerm":    func() backend.Backend { return backendAzure.New() },
 		"consul":     func() backend.Backend { return backendConsul.New() },
 		"cos":        func() backend.Backend { return backendCos.New() },
-		"etcd":        func() backend.Backend { return backendEtcdv2.New() },
-		"etcdv3":      func() backend.Backend { return backendEtcdv3.New() },
 		"gcs":        func() backend.Backend { return backendGCS.New() },
 		"http":       func() backend.Backend { return backendHTTP.New() },
 		"inmem":      func() backend.Backend { return backendInmem.New() },
 		"kubernetes": func() backend.Backend { return backendKubernetes.New() },
-		"manta":       func() backend.Backend { return backendManta.New() },
 		"oss":        func() backend.Backend { return backendOSS.New() },
 		"pg":         func() backend.Backend { return backendPg.New() },
 		"s3":         func() backend.Backend { return backendS3.New() },
-		"swift":       func() backend.Backend { return backendSwift.New() },
 
 		// Terraform Cloud 'backend'
 		// This is an implementation detail only, used for the cloud package
 		"cloud": func() backend.Backend { return backendCloud.New(services) },
 
+		// FIXME: remove deprecated backends for v1.3
 		// Deprecated backends.
 		"azure": func() backend.Backend {
 			return deprecateBackend(
@@ -81,6 +77,36 @@ func Init(services *disco.Disco) {
 				`Warning: "azure" name is deprecated, please use "azurerm"`,
 			)
 		},
+		"artifactory": func() backend.Backend {
+			return deprecateBackend(
+				backendArtifactory.New(),
+				`Warning: "artifactory" backend is deprecated, and will be removed in a future release."`,
+			)
+		},
+		"etcd": func() backend.Backend {
+			return deprecateBackend(
+				backendEtcdv2.New(),
+				`Warning: "etcd" backend is deprecated, and will be removed in a future release."`,
+			)
+		},
+		"etcdv3": func() backend.Backend {
+			return deprecateBackend(
+				backendEtcdv3.New(),
+				`Warning: "etcdv3" backend is deprecated, and will be removed in a future release."`,
+			)
+		},
+		"manta": func() backend.Backend {
+			return deprecateBackend(
+				backendManta.New(),
+				`Warning: "manta" backend is deprecated, and will be removed in a future release."`,
+			)
+		},
+		"swift": func() backend.Backend {
+			return deprecateBackend(
+				backendSwift.New(),
+				`Warning: "swift" backend is deprecated, and will be removed in a future release."`,
+			)
+		},
 	}
 }
 

internal/backend/init/init_test.go

@@ -18,14 +18,17 @@ func TestInit_backend(t *testing.T) {
 		{"azurerm", "*azure.Backend"},
 		{"consul", "*consul.Backend"},
 		{"cos", "*cos.Backend"},
-		{"etcdv3", "*etcd.Backend"},
 		{"gcs", "*gcs.Backend"},
 		{"inmem", "*inmem.Backend"},
-		{"manta", "*manta.Backend"},
 		{"pg", "*pg.Backend"},
 		{"s3", "*s3.Backend"},
-		{"swift", "*swift.Backend"},
+
 		{"azure", "init.deprecatedBackendShim"},
+		{"artifactory", "init.deprecatedBackendShim"},
+		{"etcd", "init.deprecatedBackendShim"},
+		{"etcdv3", "init.deprecatedBackendShim"},
+		{"manta", "init.deprecatedBackendShim"},
+		{"swift", "init.deprecatedBackendShim"},
 	}
 
 	// Make sure we get the requested backend