maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix a type cast problem in aws/cf provider

Browse source 
...and also add better diagnostics to the associated error messages, so
that the "expected" type is printed in addition to the "got" type.
This commit is contained in:
joeduffy 2016-11-29 15:33:43 -08:00
parent cb9c152104
commit c9f7d44a30
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkg/compiler/backends/clouds/aws/cloud.go
View file

@ -228,7 +228,7 @@ func (c *awsCloud) genMuExtensionServiceTemplate(comp core.Compiland, stack *ast
resType, ok = r.(string)
if !ok {
c.Diag().Errorf(errors.ErrorIncorrectExtensionPropertyType.At(stack),
CloudFormationExtensionProviderResource, "string")
CloudFormationExtensionProviderResource, reflect.TypeOf(r), "string")
return nil
}
} else {
@ -247,7 +247,7 @@ func (c *awsCloud) genMuExtensionServiceTemplate(comp core.Compiland, stack *ast
}
} else {
c.Diag().Errorf(errors.ErrorIncorrectExtensionPropertyType.At(stack),
CloudFormationExtensionProviderProperties, "[]string")
CloudFormationExtensionProviderProperties, reflect.TypeOf(au), "[]string")
}
}
@ -261,7 +261,7 @@ func (c *awsCloud) genMuExtensionServiceTemplate(comp core.Compiland, stack *ast
}
} else {
c.Diag().Errorf(errors.ErrorIncorrectExtensionPropertyType.At(stack),
CloudFormationExtensionProviderSkipProperties, "[]string")
CloudFormationExtensionProviderSkipProperties, reflect.TypeOf(sk), "[]string")
}
}
@ -278,7 +278,7 @@ func (c *awsCloud) genMuExtensionServiceTemplate(comp core.Compiland, stack *ast
// Next, if there are any "extra" properties, merge them in with the existing map.
if ex, ok := svc.Props[CloudFormationExtensionProviderExtraProperties]; ok {
if extra, ok := ex.(ast.PropertyBag); ok {
if extra, ok := ex.(map[string]interface{}); ok {
for _, exname := range ast.StableKeys(extra) {
v := extra[exname]
// If there is an existing property, we can (possibly) merge it, for maps and slices (using some
@ -318,6 +318,9 @@ func (c *awsCloud) genMuExtensionServiceTemplate(comp core.Compiland, stack *ast
resProps[exname] = v
}
}
} else {
c.Diag().Errorf(errors.ErrorIncorrectExtensionPropertyType.At(stack),
CloudFormationExtensionProviderExtraProperties, reflect.TypeOf(ex), "map[string]interface{}")
}
}
@ -331,7 +334,7 @@ func (c *awsCloud) genMuExtensionServiceTemplate(comp core.Compiland, stack *ast
}
} else {
c.Diag().Errorf(errors.ErrorIncorrectExtensionPropertyType.At(stack),
CloudFormationExtensionProviderDependsOn, "[]string")
CloudFormationExtensionProviderDependsOn, reflect.TypeOf(do), "[]string")
}
}

2
pkg/errors/backend.go
View file

@ -18,5 +18,5 @@ var ErrorMissingExtensionProperty = &diag.Diag{
var ErrorIncorrectExtensionPropertyType = &diag.Diag{
ID: 1001,
Message: "Property '%v' has the wrong type; expected '%v'",
Message: "Property '%v' has the wrong type; got '%v', expected '%v'",
}