Add removed block (v1.7) (#313)

* Regenerate Terraform versions

Including 1.7

* Add 1.7 removed block

* Apply suggestions from code review

Co-authored-by: Radek Simko <radek.simko@gmail.com>

* Fix typos

---------

Co-authored-by: Radek Simko <radek.simko@gmail.com>

internal/schema/1.7/removed.go

@@ -0,0 +1,46 @@
+// 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 removedBlock() *schema.BlockSchema {
+ return &schema.BlockSchema{
+ Description: lang.Markdown("Declaration to specify what resource or module to remove from the state"),
+ Body: &schema.BodySchema{
+ HoverURL: "https://developer.hashicorp.com/terraform/language/resources/syntax#removing-resources",
+ Attributes: map[string]*schema.AttributeSchema{
+ "from": {
+ Constraint: schema.OneOf{
+ schema.Reference{OfScopeId: refscope.ModuleScope},
+ schema.Reference{OfScopeId: refscope.ResourceScope},
+ },
+ IsRequired: true,
+ Description: lang.Markdown("Address of the module or resource to be removed"),
+ },
+ },
+ Blocks: map[string]*schema.BlockSchema{
+ "lifecycle": {
+ Description: lang.Markdown("Lifecycle customizations controlling the removal"),
+ Body: &schema.BodySchema{
+ Attributes: map[string]*schema.AttributeSchema{
+ "destroy": {
+ Constraint: schema.LiteralType{Type: cty.Bool},
+ IsRequired: true,
+ Description: lang.Markdown("Whether Terraform will attempt to destroy the objects (`true`) or not, i.e. just remove from state (`false`)."),
+ },
+ },
+ },
+ MinItems: 1,
+ MaxItems: 1,
+ },
+ },
+ },
+ }
+}

internal/schema/1.7/root.go

@@ -0,0 +1,17 @@
+// 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_6_mod "github.com/hashicorp/terraform-schema/internal/schema/1.6"
+)
+
+func ModuleSchema(v *version.Version) *schema.BodySchema {
+ bs := v1_6_mod.ModuleSchema(v)
+ bs.Blocks["removed"] = removedBlock()
+ return bs
+}

schema/core_schema.go

@@ -15,6 +15,7 @@ import (
  mod_v1_4 "github.com/hashicorp/terraform-schema/internal/schema/1.4"
  mod_v1_5 "github.com/hashicorp/terraform-schema/internal/schema/1.5"
  mod_v1_6 "github.com/hashicorp/terraform-schema/internal/schema/1.6"
+ mod_v1_7 "github.com/hashicorp/terraform-schema/internal/schema/1.7"
 )
 
 var (
@@ -28,13 +29,17 @@ var (
  v1_4 = version.Must(version.NewVersion("1.4"))
  v1_5 = version.Must(version.NewVersion("1.5"))
  v1_6 = version.Must(version.NewVersion("1.6"))
+ v1_7 = version.Must(version.NewVersion("1.7"))
 )
 
 // 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_7) {
+ return mod_v1_7.ModuleSchema(ver), nil
+ }
  if ver.GreaterThanOrEqual(v1_6) {
  return mod_v1_6.ModuleSchema(ver), nil
  }