SchemaForListResourceType

Author: dsa0x

internal/providers/provider.go

@@ -220,6 +220,19 @@ func (a ActionSchema) IsNil() bool {
 	return a.ConfigSchema == nil
 }
 
+type ListResourceSchema struct {
+	// schema for the nested "config" block.
+	ConfigSchema *configschema.Block
+
+	// schema for the entire block (including "config" block)
+	FullSchema *configschema.Block
+}
+
+// IsNil() returns true if there is no list resource schema at all.
+func (l ListResourceSchema) IsNil() bool {
+	return l.FullSchema == nil
+}
+
 // Schema pairs a provider or resource schema with that schema's version.
 // This is used to be able to upgrade the schema in UpgradeResourceState.
 //

internal/providers/schemas.go

@@ -47,3 +47,18 @@ func (ss ProviderSchema) SchemaForActionType(typeName string) (schema ActionSche
 	}
 	return ActionSchema{}
 }
+
+// SchemaForListResourceType attempts to find a schema for the given type. Returns an
+// empty schema if none is available.
+func (ss ProviderSchema) SchemaForListResourceType(typeName string) ListResourceSchema {
+	schema, ok := ss.ListResourceTypes[typeName]
+	if !ok || schema.Body == nil {
+		return ListResourceSchema{}
+	}
+	// The configuration for the list block is nested within a "config" block.
+	configSchema, ok := schema.Body.BlockTypes["config"]
+	if !ok {
+		return ListResourceSchema{}
+	}
+	return ListResourceSchema{ConfigSchema: &configSchema.Block, FullSchema: schema.Body}
+}

internal/terraform/node_resource_plan_instance_query.go

@@ -36,9 +36,15 @@ func (n *NodePlannableResourceInstance) listResourceExecute(ctx EvalContext) (di
 		keyData = EvalDataForInstanceKey(addr.Resource.Key, forEach)
 	}
 
+	schema := providerSchema.SchemaForListResourceType(n.Config.Type)
+	if schema.IsNil() { // Not possible, as the schema should have already been validated to exist
+		diags = diags.Append(fmt.Errorf("no schema available for %s; this is a bug in Terraform and should be reported", addr))
+		return diags
+	}
+
 	// evaluate the list config block
 	var configDiags tfdiags.Diagnostics
-	blockVal, _, configDiags := ctx.EvaluateBlock(config.Config, n.Schema.Body, nil, keyData)
+	blockVal, _, configDiags := ctx.EvaluateBlock(config.Config, schema.FullSchema, nil, keyData)
 	diags = diags.Append(configDiags)
 	if diags.HasErrors() {
 		return diags
@@ -79,11 +85,10 @@ func (n *NodePlannableResourceInstance) listResourceExecute(ctx EvalContext) (di
 	}
 
 	log.Printf("[TRACE] NodePlannableResourceInstance: Re-validating config for %s", n.Addr)
-	configSchema := n.Schema.Body.BlockTypes["config"]
 	// if the config value is null, we still want to send a full object with all attributes being null
 	if !unmarkedBlockVal.IsNull() && unmarkedBlockVal.GetAttr("config").IsNull() {
 		mp := unmarkedBlockVal.AsValueMap()
-		mp["config"] = configSchema.Block.EmptyValue()
+		mp["config"] = schema.ConfigSchema.EmptyValue()
 		unmarkedBlockVal = cty.ObjectVal(mp)
 	}
 

internal/terraform/node_resource_validate.go

@@ -471,8 +471,8 @@ func (n *NodeValidatableResource) validateResource(ctx EvalContext) tfdiags.Diag
 		resp := provider.ValidateEphemeralResourceConfig(req)
 		diags = diags.Append(resp.Diagnostics.InConfigBody(n.Config.Config, n.Addr.String()))
 	case addrs.ListResourceMode:
-		schema := providerSchema.SchemaForResourceType(n.Config.Mode, n.Config.Type)
-		if schema.Body == nil {
+		schema := providerSchema.SchemaForListResourceType(n.Config.Type)
+		if schema.IsNil() {
 			diags = diags.Append(&hcl.Diagnostic{
 				Severity: hcl.DiagError,
 				Summary:  "Invalid list resource",
@@ -482,7 +482,7 @@ func (n *NodeValidatableResource) validateResource(ctx EvalContext) tfdiags.Diag
 			return diags
 		}
 
-		blockVal, _, valDiags := ctx.EvaluateBlock(n.Config.Config, schema.Body, nil, keyData)
+		blockVal, _, valDiags := ctx.EvaluateBlock(n.Config.Config, schema.FullSchema, nil, keyData)
 		diags = diags.Append(valDiags)
 		if valDiags.HasErrors() {
 			return diags
@@ -503,11 +503,10 @@ func (n *NodeValidatableResource) validateResource(ctx EvalContext) tfdiags.Diag
 		// Use unmarked value for validate request
 		unmarkedBlockVal, _ := blockVal.UnmarkDeep()
 
-		configSchema := schema.Body.BlockTypes["config"]
 		// if the config value is null, we still want to send a full object with all attributes being null
 		if !unmarkedBlockVal.IsNull() && unmarkedBlockVal.GetAttr("config").IsNull() {
 			mp := unmarkedBlockVal.AsValueMap()
-			mp["config"] = configSchema.Block.EmptyValue()
+			mp["config"] = schema.ConfigSchema.EmptyValue()
 			unmarkedBlockVal = cty.ObjectVal(mp)
 		}
 		req := providers.ValidateListResourceConfigRequest{