Added support for the new identity attribute in import blocks (Terraform 1.12.0+) (#472)

* Added support for the new `identity` attribute in import blocks, introduced in Terraform 1.12.0.

* Ran go fmt

* Ran 'go generate ./schema

Author: AdamTylerLynch

internal/schema/1.12/import.go

@@ -0,0 +1,48 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package schema
+
+import (
+	"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 importBlock() *schema.BlockSchema {
+	return &schema.BlockSchema{
+		Description: lang.Markdown("Import resources into Terraform to bring them under Terraform's management"),
+		Body: &schema.BodySchema{
+			HoverURL: "https://developer.hashicorp.com/terraform/language/import",
+			Attributes: map[string]*schema.AttributeSchema{
+				"provider": {
+					Constraint:  schema.Reference{OfScopeId: refscope.ProviderScope},
+					IsOptional:  true,
+					Description: lang.Markdown("Reference to a `provider` configuration block, e.g. `mycloud.west` or `mycloud`"),
+				},
+				"id": {
+					Constraint: schema.OneOf{
+						schema.AnyExpression{OfType: cty.String},
+					},
+					IsOptional:   true,
+					IsDeprecated: false,
+					Description:  lang.Markdown("ID of the resource to be imported. e.g. `i-abcd1234`. Either `id` or `identity` must be specified, but not both."),
+				},
+				"identity": {
+					Constraint: schema.OneOf{
+						schema.AnyExpression{OfType: cty.Map(cty.String)},
+						schema.AnyExpression{OfType: cty.Object(map[string]cty.Type{})},
+					},
+					IsOptional:  true,
+					Description: lang.Markdown("Key-value pairs to identify the resource to be imported. Either `id` or `identity` must be specified, but not both."),
+				},
+				"to": {
+					Constraint:  schema.Reference{OfScopeId: refscope.ResourceScope},
+					IsRequired:  true,
+					Description: lang.Markdown("An address of the resource instance to import to. e.g. `aws_instance.example` or `module.foo.aws_instance.bar`"),
+				},
+			},
+		},
+	}
+}

internal/schema/1.12/import_test.go

@@ -0,0 +1,79 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package schema
+
+import (
+	"testing"
+
+	"github.com/hashicorp/hcl-lang/lang"
+)
+
+func TestImportBlock(t *testing.T) {
+	schema := importBlock()
+
+	// Test basic schema properties
+	if schema.Description != lang.Markdown("Import resources into Terraform to bring them under Terraform's management") {
+		t.Errorf("unexpected description: %v", schema.Description)
+	}
+
+	if schema.Body.HoverURL != "https://developer.hashicorp.com/terraform/language/import" {
+		t.Errorf("unexpected hover URL: %v", schema.Body.HoverURL)
+	}
+
+	// Test that all expected attributes are present
+	expectedAttrs := []string{"provider", "id", "identity", "to"}
+	for _, attr := range expectedAttrs {
+		if _, ok := schema.Body.Attributes[attr]; !ok {
+			t.Errorf("missing expected attribute: %s", attr)
+		}
+	}
+
+	// Test id attribute
+	idAttr := schema.Body.Attributes["id"]
+	if !idAttr.IsOptional {
+		t.Error("id attribute should be optional")
+	}
+	if idAttr.Description != lang.Markdown("ID of the resource to be imported. e.g. `i-abcd1234`. Either `id` or `identity` must be specified, but not both.") {
+		t.Errorf("unexpected id description: %v", idAttr.Description)
+	}
+
+	// Test identity attribute
+	identityAttr := schema.Body.Attributes["identity"]
+	if !identityAttr.IsOptional {
+		t.Error("identity attribute should be optional")
+	}
+	if identityAttr.Description != lang.Markdown("Key-value pairs to identify the resource to be imported. Either `id` or `identity` must be specified, but not both.") {
+		t.Errorf("unexpected identity description: %v", identityAttr.Description)
+	}
+}
+
+func TestImportBlock_Attributes(t *testing.T) {
+	schema := importBlock()
+
+	// Test that all expected attributes are present
+	expectedAttrs := []string{"provider", "id", "identity", "to"}
+	for _, attr := range expectedAttrs {
+		if _, ok := schema.Body.Attributes[attr]; !ok {
+			t.Errorf("missing expected attribute: %s", attr)
+		}
+	}
+
+	// Test that id and identity are optional
+	if !schema.Body.Attributes["id"].IsOptional {
+		t.Error("id attribute should be optional")
+	}
+	if !schema.Body.Attributes["identity"].IsOptional {
+		t.Error("identity attribute should be optional")
+	}
+
+	// Test that to is required
+	if !schema.Body.Attributes["to"].IsRequired {
+		t.Error("to attribute should be required")
+	}
+
+	// Test that provider is optional
+	if !schema.Body.Attributes["provider"].IsOptional {
+		t.Error("provider attribute should be optional")
+	}
+}

internal/schema/1.12/root.go

@@ -0,0 +1,20 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package schema
+
+import (
+	"github.com/hashicorp/go-version"
+	"github.com/hashicorp/hcl-lang/schema"
+
+	v1_10_mod "github.com/hashicorp/terraform-schema/internal/schema/1.10"
+)
+
+func ModuleSchema(v *version.Version) *schema.BodySchema {
+	bs := v1_10_mod.ModuleSchema(v)
+
+	// Override the import block with the new schema that supports identity attribute
+	bs.Blocks["import"] = importBlock()
+
+	return bs
+}

schema/core_schema.go

@@ -12,6 +12,7 @@ import (
 	mod_v0_15 "github.com/hashicorp/terraform-schema/internal/schema/0.15"
 	mod_v1_1 "github.com/hashicorp/terraform-schema/internal/schema/1.1"
 	mod_v1_10 "github.com/hashicorp/terraform-schema/internal/schema/1.10"
+	mod_v1_12 "github.com/hashicorp/terraform-schema/internal/schema/1.12"
 	mod_v1_2 "github.com/hashicorp/terraform-schema/internal/schema/1.2"
 	mod_v1_4 "github.com/hashicorp/terraform-schema/internal/schema/1.4"
 	mod_v1_5 "github.com/hashicorp/terraform-schema/internal/schema/1.5"
@@ -36,13 +37,17 @@ var (
 	v1_8  = version.Must(version.NewVersion("1.8"))
 	v1_9  = version.Must(version.NewVersion("1.9"))
 	v1_10 = version.Must(version.NewVersion("1.10"))
+	v1_12 = version.Must(version.NewVersion("1.12"))
 )
 
 // CoreModuleSchemaForVersion finds a module schema which is relevant
 // for the given Terraform version.
 // It will return error if such schema cannot be found.
 func CoreModuleSchemaForVersion(v *version.Version) (*schema.BodySchema, error) {
 	ver := v.Core()
+	if ver.GreaterThanOrEqual(v1_12) {
+		return mod_v1_12.ModuleSchema(ver), nil
+	}
 	if ver.GreaterThanOrEqual(v1_10) {
 		return mod_v1_10.ModuleSchema(ver), nil
 	}

schema/core_schema_test.go

@@ -15,6 +15,7 @@ import (
 	mod_v0_13 "github.com/hashicorp/terraform-schema/internal/schema/0.13"
 	mod_v0_14 "github.com/hashicorp/terraform-schema/internal/schema/0.14"
 	mod_v1_1 "github.com/hashicorp/terraform-schema/internal/schema/1.1"
+	mod_v1_12 "github.com/hashicorp/terraform-schema/internal/schema/1.12"
 	mod_v1_2 "github.com/hashicorp/terraform-schema/internal/schema/1.2"
 	"github.com/zclconf/go-cty-debug/ctydebug"
 )
@@ -44,6 +45,7 @@ func TestCoreModuleSchemaForVersion_validate(t *testing.T) {
 		"1.0.0",
 		"1.1.0",
 		"1.2.0",
+		"1.12.0",
 	}
 
 	for _, v := range versions {
@@ -92,6 +94,10 @@ func TestCoreModuleSchemaForVersion_matching(t *testing.T) {
 			version.Must(version.NewVersion("1.2.0")),
 			mod_v1_2.ModuleSchema,
 		},
+		{
+			version.Must(version.NewVersion("1.12.0")),
+			mod_v1_12.ModuleSchema,
+		},
 	}
 
 	for i, tc := range testCases {