Merge pull request #14801 from hashicorp/jbardin/validate-computed-object
check for IsComputed when validating a schema object
This commit is contained in:
commit
cd7c5cb61d
|
@ -1374,7 +1374,7 @@ func (m schemaMap) validateObject(
|
||||||
schema map[string]*Schema,
|
schema map[string]*Schema,
|
||||||
c *terraform.ResourceConfig) ([]string, []error) {
|
c *terraform.ResourceConfig) ([]string, []error) {
|
||||||
raw, _ := c.Get(k)
|
raw, _ := c.Get(k)
|
||||||
if _, ok := raw.(map[string]interface{}); !ok {
|
if _, ok := raw.(map[string]interface{}); !ok && !c.IsComputed(k) {
|
||||||
return nil, []error{fmt.Errorf(
|
return nil, []error{fmt.Errorf(
|
||||||
"%s: expected object, got %s",
|
"%s: expected object, got %s",
|
||||||
k, reflect.ValueOf(raw).Kind())}
|
k, reflect.ValueOf(raw).Kind())}
|
||||||
|
|
|
@ -3974,6 +3974,35 @@ func TestSchemaMap_Validate(t *testing.T) {
|
||||||
Err: false,
|
Err: false,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"Good sub-resource, computed value": {
|
||||||
|
Schema: map[string]*Schema{
|
||||||
|
"ingress": &Schema{
|
||||||
|
Type: TypeList,
|
||||||
|
Optional: true,
|
||||||
|
Elem: &Resource{
|
||||||
|
Schema: map[string]*Schema{
|
||||||
|
"from": &Schema{
|
||||||
|
Type: TypeInt,
|
||||||
|
Optional: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
Config: map[string]interface{}{
|
||||||
|
"ingress": []interface{}{
|
||||||
|
`${map("from", var.port)}`,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
Vars: map[string]string{
|
||||||
|
"var.port": config.UnknownVariableValue,
|
||||||
|
},
|
||||||
|
|
||||||
|
Err: false,
|
||||||
|
},
|
||||||
|
|
||||||
"Invalid/unknown field": {
|
"Invalid/unknown field": {
|
||||||
Schema: map[string]*Schema{
|
Schema: map[string]*Schema{
|
||||||
"availability_zone": &Schema{
|
"availability_zone": &Schema{
|
||||||
|
|
Loading…
Reference in New Issue