Add project attribute to workspaces block

internal/schema/1.1/terraform.go

@@ -45,7 +45,7 @@ func patchTerraformBlockSchema(bs *schema.BlockSchema) *schema.BlockSchema {
 								Constraint: schema.LiteralType{Type: cty.String},
 								IsOptional: true,
 								Description: lang.Markdown("The name of a single Terraform Cloud workspace " +
-									"to be used with this configuration When configured only the specified workspace " +
+									"to be used with this configuration. When configured only the specified workspace " +
 									"can be used. This option conflicts with `tags`."),
 							},
 							"tags": {
@@ -54,8 +54,8 @@ func patchTerraformBlockSchema(bs *schema.BlockSchema) *schema.BlockSchema {
 								},
 								IsOptional: true,
 								Description: lang.Markdown("A set of tags used to select remote Terraform Cloud workspaces" +
-									" to be used for this single configuration.  New workspaces will automatically be tagged " +
-									"with these tag values.  Generally, this is the primary and recommended strategy to use. " +
+									" to be used for this single configuration. New workspaces will automatically be tagged " +
+									"with these tag values. Generally, this is the primary and recommended strategy to use. " +
 									"This option conflicts with `name`."),
 							},
 						},

internal/schema/1.6/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_5_mod "github.com/hashicorp/terraform-schema/internal/schema/1.5"
+)
+
+func ModuleSchema(v *version.Version) *schema.BodySchema {
+	bs := v1_5_mod.ModuleSchema(v)
+	bs.Blocks["terraform"] = patchTerraformBlockSchema(bs.Blocks["terraform"])
+	return bs
+}

internal/schema/1.6/terraform.go

@@ -0,0 +1,41 @@
+// 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/zclconf/go-cty/cty"
+)
+
+func patchTerraformBlockSchema(bs *schema.BlockSchema) *schema.BlockSchema {
+	bs.Body.Blocks["cloud"].Body.Blocks["workspaces"].Body = &schema.BodySchema{
+		Attributes: map[string]*schema.AttributeSchema{
+			"name": {
+				Constraint: schema.LiteralType{Type: cty.String},
+				IsOptional: true,
+				Description: lang.Markdown("The name of a single Terraform Cloud workspace " +
+					"to be used with this configuration. When configured only the specified workspace " +
+					"can be used. This option conflicts with `tags`."),
+			},
+			"project": {
+				Constraint:  schema.LiteralType{Type: cty.String},
+				IsOptional:  true,
+				Description: lang.PlainText("The name of a Terraform Cloud project. Workspaces that need creating will be created within this project."),
+			},
+			"tags": {
+				Constraint: schema.Set{
+					Elem: schema.LiteralType{Type: cty.String},
+				},
+				IsOptional: true,
+				Description: lang.Markdown("A set of tags used to select remote Terraform Cloud workspaces" +
+					" to be used for this single configuration. New workspaces will automatically be tagged " +
+					"with these tag values. Generally, this is the primary and recommended strategy to use. " +
+					"This option conflicts with `name`."),
+			},
+		},
+	}
+
+	return bs
+}

schema/core_schema.go

@@ -14,6 +14,7 @@ import (
 	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"
+	mod_v1_6 "github.com/hashicorp/terraform-schema/internal/schema/1.6"
 )
 
 var (
@@ -26,13 +27,17 @@ var (
 	v1_3  = version.Must(version.NewVersion("1.3"))
 	v1_4  = version.Must(version.NewVersion("1.4"))
 	v1_5  = version.Must(version.NewVersion("1.5"))
+	v1_6  = version.Must(version.NewVersion("1.6"))
 )
 
 // 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_6) {
+		return mod_v1_6.ModuleSchema(ver), nil
+	}
 	if ver.GreaterThanOrEqual(v1_5) {
 		return mod_v1_5.ModuleSchema(ver), nil
 	}