7b1d6ec1ac
These changes support arbitrary combinations of input + plain types within a schema. Handling plain types at the property level was not sufficient to support such combinations. Reifying these types required updating quite a bit of code. This is likely to have caused some temporary complications, but should eventually lead to substantial simplification in the SDK and program code generators. With the new design, input and optional types are explicit in the schema type system. Optionals will only appear at the outermost level of a type (i.e. Input<Optional<>>, Array<Optional<>>, etc. will not occur). In addition to explicit input types, each object type now has a "plain" shape and an "input" shape. The former uses only plain types; the latter uses input shapes wherever a plain type is not specified. Plain types are indicated in the schema by setting the "plain" property of a type spec to true.
119 lines
3.3 KiB
Go
119 lines
3.3 KiB
Go
package gen
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/hashicorp/hcl/v2"
|
|
"github.com/hashicorp/hcl/v2/hclsyntax"
|
|
"github.com/pulumi/pulumi/pkg/v3/codegen"
|
|
"github.com/pulumi/pulumi/pkg/v3/codegen/hcl2"
|
|
"github.com/pulumi/pulumi/pkg/v3/codegen/hcl2/model"
|
|
"github.com/pulumi/pulumi/pkg/v3/codegen/hcl2/syntax"
|
|
"github.com/pulumi/pulumi/pkg/v3/codegen/schema"
|
|
)
|
|
|
|
type optionalTemp struct {
|
|
Name string
|
|
Value model.Expression
|
|
}
|
|
|
|
func (ot *optionalTemp) Type() model.Type {
|
|
return ot.Value.Type()
|
|
}
|
|
|
|
func (ot *optionalTemp) Traverse(traverser hcl.Traverser) (model.Traversable, hcl.Diagnostics) {
|
|
return ot.Type().Traverse(traverser)
|
|
}
|
|
|
|
func (ot *optionalTemp) SyntaxNode() hclsyntax.Node {
|
|
return syntax.None
|
|
}
|
|
|
|
type optionalSpiller struct {
|
|
temps []*optionalTemp
|
|
count int
|
|
}
|
|
|
|
func (os *optionalSpiller) spillExpressionHelper(
|
|
x model.Expression,
|
|
destType model.Type,
|
|
isInvoke bool,
|
|
) (model.Expression, hcl.Diagnostics) {
|
|
var temp *optionalTemp
|
|
switch x := x.(type) {
|
|
case *model.FunctionCallExpression:
|
|
if x.Name == "invoke" {
|
|
// recurse into invoke args
|
|
isInvoke = true
|
|
_, diags := os.spillExpressionHelper(x.Args[1], x.Args[1].Type(), isInvoke)
|
|
return x, diags
|
|
}
|
|
if x.Name == hcl2.IntrinsicConvert {
|
|
// propagate convert type
|
|
_, diags := os.spillExpressionHelper(x.Args[0], x.Signature.ReturnType, isInvoke)
|
|
return x, diags
|
|
}
|
|
case *model.ObjectConsExpression:
|
|
// only rewrite invoke args (required to be prompt values in Go)
|
|
// pulumi.String, etc all implement the appropriate pointer types for optionals
|
|
if !isInvoke {
|
|
return x, nil
|
|
}
|
|
if schemaType, ok := hcl2.GetSchemaForType(destType); ok {
|
|
if schemaType, ok := schemaType.(*schema.ObjectType); ok {
|
|
var optionalPrimitives []string
|
|
for _, v := range schemaType.Properties {
|
|
isPrimitive := false
|
|
switch codegen.UnwrapType(v.Type) {
|
|
case schema.NumberType, schema.BoolType, schema.IntType, schema.StringType:
|
|
isPrimitive = true
|
|
}
|
|
if isPrimitive && !v.IsRequired() {
|
|
optionalPrimitives = append(optionalPrimitives, v.Name)
|
|
}
|
|
}
|
|
for i, item := range x.Items {
|
|
// keys for schematized objects should be simple strings
|
|
if key, ok := item.Key.(*model.LiteralValueExpression); ok {
|
|
if model.StringType.AssignableFrom(key.Type()) {
|
|
strKey := key.Value.AsString()
|
|
for _, op := range optionalPrimitives {
|
|
if strKey == op {
|
|
temp = &optionalTemp{
|
|
Name: fmt.Sprintf("opt%d", os.count),
|
|
Value: item.Value,
|
|
}
|
|
os.temps = append(os.temps, temp)
|
|
os.count++
|
|
x.Items[i].Value = &model.ScopeTraversalExpression{
|
|
RootName: fmt.Sprintf("&%s", temp.Name),
|
|
Traversal: hcl.Traversal{hcl.TraverseRoot{Name: ""}},
|
|
Parts: []model.Traversable{temp},
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return x, nil
|
|
}
|
|
|
|
func (os *optionalSpiller) spillExpression(x model.Expression) (model.Expression, hcl.Diagnostics) {
|
|
isInvoke := false
|
|
return os.spillExpressionHelper(x, x.Type(), isInvoke)
|
|
}
|
|
|
|
func (g *generator) rewriteOptionals(
|
|
x model.Expression,
|
|
spiller *optionalSpiller,
|
|
) (model.Expression, []*optionalTemp, hcl.Diagnostics) {
|
|
spiller.temps = nil
|
|
x, diags := model.VisitExpression(x, spiller.spillExpression, nil)
|
|
|
|
return x, spiller.temps, diags
|
|
|
|
}
|