Merge pull request #27903 from hashicorp/jbardin/plan-valid-computed

objchange: catch invalidly planned attributes earlier

plans/objchange/plan_valid.go

@@ -255,10 +255,23 @@ func assertPlannedValueValid(attrS *configschema.Attribute, priorV, configV, pla
 		// the configuration value in favor of the prior.
 		return errs
 	}
-	if attrS.Computed && configV.IsNull() {
-		// The provider is allowed to change the value of any computed
-		// attribute that isn't explicitly set in the config.
-		return errs
+
+	// the provider is allowed to insert values when the config is
+	// null, but only if the attribute is computed.
+	if configV.IsNull() {
+		if attrS.Computed {
+			return errs
+		}
+
+		// if the attribute is not computed, then any planned value is incorrect
+		if !plannedV.IsNull() {
+			if attrS.Sensitive {
+				errs = append(errs, path.NewErrorf("sensitive planned value for a non-computed attribute"))
+			} else {
+				errs = append(errs, path.NewErrorf("planned value %#v for a non-computed attribute", plannedV))
+			}
+			return errs
+		}
 	}
 
 	// If this attribute has a NestedType, validate the nested object
@@ -276,11 +289,13 @@ func assertPlannedValueValid(attrS *configschema.Attribute, priorV, configV, pla
 		}
 		return errs
 	}
+
 	if attrS.Sensitive {
 		errs = append(errs, path.NewErrorf("sensitive planned value does not match config value nor prior value"))
 	} else {
 		errs = append(errs, path.NewErrorf("planned value %#v does not match config value %#v nor prior value %#v", plannedV, configV, priorV))
 	}
+
 	return errs
 }
 

plans/objchange/plan_valid_test.go

@@ -1077,7 +1077,7 @@ func TestAssertPlanValid(t *testing.T) {
 					}),
 				}),
 			}),
-			[]string{".bloop: planned for existence but config wants absense"},
+			[]string{`.bloop: planned value cty.ListVal([]cty.Value{cty.ObjectVal(map[string]cty.Value{"blop":cty.StringVal("ok")})}) for a non-computed attribute`},
 		},
 		"NestedType nested set attribute to null": {
 			&configschema.Block{
@@ -1116,7 +1116,7 @@ func TestAssertPlanValid(t *testing.T) {
 					}),
 				}),
 			}),
-			[]string{".bloop: planned for existence but config wants absense"},
+			[]string{`.bloop: planned value cty.ListVal([]cty.Value{cty.ObjectVal(map[string]cty.Value{"blop":cty.StringVal("ok")})}) for a non-computed attribute`},
 		},
 	}