cleanup: avoid passing version where it's not needed

hashicorp · Aug 4, 2022 · 2d308dd · 2d308dd
1 parent e6ed356
commit 2d308dd
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 24 deletions.
diff --git a/internal/schema/0.14/provisioners.go b/internal/schema/0.14/provisioners.go
@@ -19,21 +19,19 @@ func ConnectionDependentBodies(v *version.Version) map[schema.SchemaKey]*schema.
 	return v013_mod.ConnectionDependentBodies(v)
 }
 
-func ProvisionerDependentBodies(v *version.Version) map[schema.SchemaKey]*schema.BodySchema {
-	return map[schema.SchemaKey]*schema.BodySchema{
-		labelKey("file"):        FileProvisioner,
-		labelKey("local-exec"):  LocalExecProvisioner,
-		labelKey("remote-exec"): RemoteExecProvisioner,
-
-		// Vendor provisioners are deprecated in 0.13.4+
-		// See https://discuss.hashicorp.com/t/notice-terraform-to-begin-deprecation-of-vendor-tool-specific-provisioners-starting-in-terraform-0-13-4/13997
-		// Some of these provisioners have complex schemas
-		// but we can at least helpfully list their names
-		labelKey("chef"):            {IsDeprecated: true},
-		labelKey("salt-masterless"): {IsDeprecated: true},
-		labelKey("habitat"):         {IsDeprecated: true},
-		labelKey("puppet"):          {IsDeprecated: true},
-	}
+var ProvisionerDependentBodies = map[schema.SchemaKey]*schema.BodySchema{
+	labelKey("file"):        FileProvisioner,
+	labelKey("local-exec"):  LocalExecProvisioner,
+	labelKey("remote-exec"): RemoteExecProvisioner,
+
+	// Vendor provisioners are deprecated in 0.13.4+
+	// See https://discuss.hashicorp.com/t/notice-terraform-to-begin-deprecation-of-vendor-tool-specific-provisioners-starting-in-terraform-0-13-4/13997
+	// Some of these provisioners have complex schemas
+	// but we can at least helpfully list their names
+	labelKey("chef"):            {IsDeprecated: true},
+	labelKey("salt-masterless"): {IsDeprecated: true},
+	labelKey("habitat"):         {IsDeprecated: true},
+	labelKey("puppet"):          {IsDeprecated: true},
 }
 
 func labelKey(value string) schema.SchemaKey {

diff --git a/internal/schema/0.14/root.go b/internal/schema/0.14/root.go
@@ -12,7 +12,7 @@ func ModuleSchema(v *version.Version) *schema.BodySchema {
 
 	bs.Blocks["variable"] = variableBlockSchema
 	bs.Blocks["terraform"] = terraformBlockSchema(v)
-	bs.Blocks["resource"].Body.Blocks["provisioner"].DependentBody = ProvisionerDependentBodies(v)
+	bs.Blocks["resource"].Body.Blocks["provisioner"].DependentBody = ProvisionerDependentBodies
 
 	return bs
 }
diff --git a/internal/schema/0.15/root.go b/internal/schema/0.15/root.go
@@ -9,7 +9,7 @@ import (
 
 func ModuleSchema(v *version.Version) *schema.BodySchema {
 	bs := v014_mod.ModuleSchema(v)
-	bs.Blocks["terraform"] = patchTerraformBlockSchema(bs.Blocks["terraform"], v)
+	bs.Blocks["terraform"] = patchTerraformBlockSchema(bs.Blocks["terraform"])
 	bs.Blocks["resource"].Body.Blocks["provisioner"].DependentBody = ProvisionerDependentBodies(v)
 	bs.Blocks["resource"].Body.Blocks["connection"].DependentBody = ConnectionDependentBodies(v)
 

diff --git a/internal/schema/0.15/terraform.go b/internal/schema/0.15/terraform.go
@@ -1,14 +1,13 @@
 package schema
 
 import (
-	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/hcl-lang/lang"
 	"github.com/hashicorp/hcl-lang/schema"
 	"github.com/hashicorp/terraform-schema/internal/schema/refscope"
 	"github.com/zclconf/go-cty/cty"
 )
 
-func patchTerraformBlockSchema(bs *schema.BlockSchema, v *version.Version) *schema.BlockSchema {
+func patchTerraformBlockSchema(bs *schema.BlockSchema) *schema.BlockSchema {
 	bs.Body.Blocks["required_providers"].Body = &schema.BodySchema{
 		AnyAttribute: &schema.AttributeSchema{
 			Expr: schema.ExprConstraints{

diff --git a/internal/schema/1.1/root.go b/internal/schema/1.1/root.go
@@ -10,6 +10,6 @@ import (
 func ModuleSchema(v *version.Version) *schema.BodySchema {
 	bs := v015_mod.ModuleSchema(v)
 	bs.Blocks["moved"] = movedBlockSchema
-	bs.Blocks["terraform"] = patchTerraformBlockSchema(bs.Blocks["terraform"], v)
+	bs.Blocks["terraform"] = patchTerraformBlockSchema(bs.Blocks["terraform"])
 	return bs
 }
diff --git a/internal/schema/1.1/terraform.go b/internal/schema/1.1/terraform.go
@@ -1,13 +1,12 @@
 package schema
 
 import (
-	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/hcl-lang/lang"
 	"github.com/hashicorp/hcl-lang/schema"
 	"github.com/zclconf/go-cty/cty"
 )
 
-func patchTerraformBlockSchema(bs *schema.BlockSchema, v *version.Version) *schema.BlockSchema {
+func patchTerraformBlockSchema(bs *schema.BlockSchema) *schema.BlockSchema {
 	bs.Body.Blocks["cloud"] = &schema.BlockSchema{
 		Description: lang.PlainText("Terraform Cloud configuration"),
 		MaxItems:    1,

diff --git a/internal/schema/1.2/root.go b/internal/schema/1.2/root.go
@@ -9,8 +9,6 @@ import (
 	v1_1_mod "github.com/hashicorp/terraform-schema/internal/schema/1.1"
 )
 
-var v1_2 = version.Must(version.NewVersion("1.2.0"))
-
 func ModuleSchema(v *version.Version) *schema.BodySchema {
 	bs := v1_1_mod.ModuleSchema(v)
 	bs.Blocks["data"].Body.Blocks = map[string]*schema.BlockSchema{