Add pulumi.Asset support to lambda function

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## HEAD (Unreleased)
 
+- Add lambda.Function support for pulumi Assets [#182](https://github.com/pulumi/pulumi-aws-native/pull/182)
+
 ## 0.2.0 (October 8, 2021)
 
 - Deduplicate type names [#160](https://github.com/pulumi/pulumi-aws-native/issues/160)

examples/aws-native-ts-stepfunctions/index.ts

@@ -45,11 +45,7 @@ const worldFunction = new awsnative.lambda.Function('worldFunction',
     runtime: "nodejs14.x",
     handler: "index.handler",
     code: {
-      zipFile: `exports.handler = function(event, context, callback){
-                                          var response = event.response;
-                                          const updated = { "response": response + "World!" };
-                                          callback(null, updated);
-                                        };`,
+      zipFile: new pulumi.asset.FileAsset("world_function.js"),
     },
   }, {dependsOn: lambdaRolePolicy});
 

examples/aws-native-ts-stepfunctions/world_function.js

@@ -0,0 +1,5 @@
+exports.handler = function(event, context, callback){
+    var response = event.response;
+    const updated = { "response": response + "World!" };
+    callback(null, updated);
+};

examples/simple-ts/index.ts

@@ -1,4 +1,18 @@
-// Copyright 2016-2021, Pulumi Corporation.
+/*
+ * Copyright 2016-2021, Pulumi Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 import * as aws from "@pulumi/aws-native";
 import * as random from "@pulumi/random";

provider/cmd/cf2pulumi/schema-full.json

@@ -45950,7 +45950,7 @@
                     "description": "For versioned objects, the version of the deployment package object to use."
                 },
                 "zipFile": {
-                    "type": "string",
+                    "$ref": "pulumi.json#/Asset",
                     "description": "The source code of your Lambda function. If you include your function source inline with this parameter, AWS CloudFormation places it in a file named index and zips it to create a deployment package.."
                 }
             },

provider/cmd/pulumi-resource-aws-native/metadata.json

@@ -46597,7 +46597,7 @@
                     "description": "For versioned objects, the version of the deployment package object to use."
                 },
                 "zipFile": {
-                    "type": "string",
+                    "$ref": "pulumi.json#/Asset",
                     "description": "The source code of your Lambda function. If you include your function source inline with this parameter, AWS CloudFormation places it in a file named index and zips it to create a deployment package.."
                 }
             }

provider/pkg/provider/provider.go

@@ -235,7 +235,7 @@ func (p *cfnProvider) DiffConfig(ctx context.Context, req *pulumirpc.DiffRequest
 	news, err := plugin.UnmarshalProperties(req.GetNews(), plugin.MarshalOptions{
 		Label:        fmt.Sprintf("%s.news", label),
 		KeepUnknowns: true,
-		RejectAssets: true,
+		RejectAssets: false,
 	})
 	if err != nil {
 		return nil, errors.Wrapf(err, "diffConfig failed because of malformed resource inputs")
@@ -511,7 +511,7 @@ func (p *cfnProvider) Check(ctx context.Context, req *pulumirpc.CheckRequest) (*
 	newInputs, err := plugin.UnmarshalProperties(req.GetNews(), plugin.MarshalOptions{
 		Label:        fmt.Sprintf("%s.properties", label),
 		KeepUnknowns: true,
-		RejectAssets: true,
+		RejectAssets: false,
 		KeepSecrets:  true,
 	})
 	if err != nil {
@@ -579,7 +579,7 @@ func (p *cfnProvider) Create(ctx context.Context, req *pulumirpc.CreateRequest)
 	inputs, err := plugin.UnmarshalProperties(req.GetProperties(), plugin.MarshalOptions{
 		Label:        fmt.Sprintf("%s.properties", label),
 		KeepUnknowns: true,
-		RejectAssets: true,
+		RejectAssets: false,
 		KeepSecrets:  true,
 	})
 	if err != nil {
@@ -611,7 +611,10 @@ func (p *cfnProvider) Create(ctx context.Context, req *pulumirpc.CreateRequest)
 		cfType = spec.CfType
 
 		// Convert SDK inputs to CFN payload.
-		payload = schema.SdkToCfn(&spec, p.resourceMap.Types, inputs.MapRepl(nil, mapReplStripSecrets))
+		payload, err = schema.SdkToCfn(&spec, p.resourceMap.Types, inputs.MapRepl(nil, mapReplStripSecrets))
+		if err != nil {
+			return nil, fmt.Errorf("failed to convert SDK inputs to CFN: %w", err)
+		}
 	}
 
 	// Serialize inputs as a desired state JSON.
@@ -814,7 +817,7 @@ func (p *cfnProvider) Update(ctx context.Context, req *pulumirpc.UpdateRequest)
 	newInputs, err := plugin.UnmarshalProperties(req.GetNews(), plugin.MarshalOptions{
 		Label:        fmt.Sprintf("%s.newInputs", label),
 		KeepUnknowns: true,
-		RejectAssets: true,
+		RejectAssets: false,
 		KeepSecrets:  true,
 	})
 	if err != nil {
@@ -1001,7 +1004,7 @@ func (p *cfnProvider) diffState(olds *pbstruct.Struct, news *pbstruct.Struct, la
 	oldState, err := plugin.UnmarshalProperties(olds, plugin.MarshalOptions{
 		Label:        fmt.Sprintf("%s.oldState", label),
 		KeepUnknowns: true,
-		RejectAssets: true,
+		RejectAssets: false,
 		KeepSecrets:  true,
 	})
 	if err != nil {
@@ -1014,7 +1017,7 @@ func (p *cfnProvider) diffState(olds *pbstruct.Struct, news *pbstruct.Struct, la
 	newInputs, err := plugin.UnmarshalProperties(news, plugin.MarshalOptions{
 		Label:        fmt.Sprintf("%s.newInputs", label),
 		KeepUnknowns: true,
-		RejectAssets: true,
+		RejectAssets: false,
 		KeepSecrets:  true,
 	})
 	if err != nil {

provider/pkg/schema/convert.go

@@ -1,9 +1,22 @@
 // Copyright 2016-2021, Pulumi Corporation.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package schema
 
 import (
 	"encoding/json"
+	"fmt"
 	"reflect"
 	"strings"
 
@@ -15,7 +28,7 @@ import (
 
 // SdkToCfn converts Pulumi-SDK-shaped state to CloudFormation-shaped payload. In particular, SDK properties
 // are lowerCamelCase, while CloudFormation is usually (but not always) PascalCase.
-func SdkToCfn(res *CloudAPIResource, types map[string]CloudAPIType, properties map[string]interface{}) map[string]interface{} {
+func SdkToCfn(res *CloudAPIResource, types map[string]CloudAPIType, properties map[string]interface{}) (map[string]interface{}, error) {
 	converter := sdkToCfnConverter{res, types}
 	return converter.sdkToCfn(properties)
 }
@@ -24,98 +37,134 @@ func SdkToCfn(res *CloudAPIResource, types map[string]CloudAPIType, properties m
 // mapped to corresponding patch terms, and SDK properties are translated to respective CFN names.
 func DiffToPatch(res *CloudAPIResource, types map[string]CloudAPIType, diff *resource.ObjectDiff) ([]jsonpatch.JsonPatchOperation, error) {
 	converter := sdkToCfnConverter{res, types}
-	return converter.diffToPatch(diff), nil
+	return converter.diffToPatch(diff)
 }
 
 type sdkToCfnConverter struct {
 	spec  *CloudAPIResource
 	types map[string]CloudAPIType
 }
 
-func (c *sdkToCfnConverter) sdkToCfn(properties map[string]interface{}) map[string]interface{} {
+func (c *sdkToCfnConverter) sdkToCfn(properties map[string]interface{}) (map[string]interface{}, error) {
 	result := map[string]interface{}{}
+	var err error
 	for k, prop := range c.spec.Inputs {
 		if v, ok := properties[k]; ok {
-			result[ToCfnName(k)] = c.sdkTypedValueToCfn(&prop.TypeSpec, v)
+			result[ToCfnName(k)], err = c.sdkTypedValueToCfn(&prop.TypeSpec, v)
+			if err != nil {
+				return nil, err
+			}
 		}
 	}
 	for k, attr := range c.spec.Outputs {
 		if v, ok := properties[k]; ok {
-			result[ToCfnName(k)] = c.sdkTypedValueToCfn(&attr.TypeSpec, v)
+			result[ToCfnName(k)], err = c.sdkTypedValueToCfn(&attr.TypeSpec, v)
+			if err != nil {
+				return nil, err
+			}
 		}
 	}
-	return result
+	return result, nil
 }
 
-func (c *sdkToCfnConverter) sdkTypedValueToCfn(spec *pschema.TypeSpec, v interface{}) interface{} {
+func (c *sdkToCfnConverter) sdkTypedValueToCfn(spec *pschema.TypeSpec, v interface{}) (interface{}, error) {
 	if spec.Ref != "" {
-		if spec.Ref == "pulumi.json#/Any" {
-			return v
+		switch spec.Ref {
+		case "pulumi.json#/Any":
+			return v, nil
+		case "pulumi.json#/Asset", "pulumi.json#/Archive":
+			switch t := v.(type) {
+			case *resource.Asset:
+				b, err := t.Bytes()
+				if err != nil {
+					return nil, err
+				}
+				return string(b), nil
+			case *resource.Archive:
+				return nil, fmt.Errorf("pulumi.Archive support not yet implemented")
+			}
 		}
 
 		typName := strings.TrimPrefix(spec.Ref, "#/types/")
 		return c.sdkObjectValueToCfn(typName, v)
 	}
 
+	var err error
 	switch spec.Type {
 	case "array":
 		array := v.([]interface{})
 		vs := make([]interface{}, len(array))
 		for i, item := range array {
-			vs[i] = c.sdkTypedValueToCfn(spec.Items, item)
+			vs[i], err = c.sdkTypedValueToCfn(spec.Items, item)
+			if err != nil {
+				return nil, err
+			}
 		}
-		return vs
+		return vs, nil
 	case "object":
 		sourceMap := v.(map[string]interface{})
 		vs := map[string]interface{}{}
 		for n, item := range sourceMap {
-			vs[n] = c.sdkTypedValueToCfn(spec.AdditionalProperties, item)
+			vs[n], err = c.sdkTypedValueToCfn(spec.AdditionalProperties, item)
+			if err != nil {
+				return nil, err
+			}
 		}
-		return vs
+		return vs, nil
 	default:
-		return v
+		return v, nil
 	}
 }
 
-func (c *sdkToCfnConverter) sdkObjectValueToCfn(typeName string, value interface{}) interface{} {
+func (c *sdkToCfnConverter) sdkObjectValueToCfn(typeName string, value interface{}) (interface{}, error) {
 	properties, ok := value.(map[string]interface{})
 	if !ok {
-		return value
+		return value, nil
 	}
 
 	spec := c.types[typeName]
 	result := map[string]interface{}{}
+	var err error
 	for k, prop := range spec.Properties {
 		if v, ok := properties[k]; ok {
-			result[ToCfnName(k)] = c.sdkTypedValueToCfn(&prop.TypeSpec, v)
+			result[ToCfnName(k)], err = c.sdkTypedValueToCfn(&prop.TypeSpec, v)
+			if err != nil {
+				return nil, err
+			}
 		}
 	}
-	return result
+	return result, nil
 }
 
-func (c *sdkToCfnConverter) diffToPatch(diff *resource.ObjectDiff) []jsonpatch.JsonPatchOperation {
+func (c *sdkToCfnConverter) diffToPatch(diff *resource.ObjectDiff) ([]jsonpatch.JsonPatchOperation, error) {
 	var ops []jsonpatch.JsonPatchOperation
 	for sdkName, prop := range c.spec.Inputs {
 		cfnName := ToCfnName(sdkName)
 		key := resource.PropertyKey(sdkName)
 		if v, ok := diff.Updates[key]; ok {
-			op := c.valueToPatch("replace", cfnName, prop, v.New)
+			op, err := c.valueToPatch("replace", cfnName, prop, v.New)
+			if err != nil {
+				return nil, err
+			}
 			ops = append(ops, op)
 		}
 		if v, ok := diff.Adds[key]; ok {
-			op := c.valueToPatch("add", cfnName, prop, v)
+			op, err := c.valueToPatch("add", cfnName, prop, v)
+			if err != nil {
+				return nil, err
+			}
 			ops = append(ops, op)
 		}
 		if _, ok := diff.Deletes[key]; ok {
-			op := jsonpatch.NewPatch("remove", "/" + cfnName, nil)
+			op := jsonpatch.NewPatch("remove", "/"+cfnName, nil)
 			ops = append(ops, op)
 		}
 	}
-	return ops
+	return ops, nil
 }
 
-func (c *sdkToCfnConverter) valueToPatch(opName, propName string, prop pschema.PropertySpec, value resource.PropertyValue) jsonpatch.JsonPatchOperation {
-	op := jsonpatch.NewPatch(opName, "/" + propName, nil)
+func (c *sdkToCfnConverter) valueToPatch(opName, propName string, prop pschema.PropertySpec, value resource.PropertyValue) (jsonpatch.JsonPatchOperation, error) {
+	op := jsonpatch.NewPatch(opName, "/"+propName, nil)
 	switch {
 	case value.IsNumber() && prop.Type == "integer":
 		i := int32(value.NumberValue())
@@ -128,12 +177,15 @@ func (c *sdkToCfnConverter) valueToPatch(opName, propName string, prop pschema.P
 		op.Value = value.StringValue()
 	default:
 		sdkObj := value.MapRepl(nil, nil)
-		cfnObj := c.sdkTypedValueToCfn(&prop.TypeSpec, sdkObj)
+		cfnObj, err := c.sdkTypedValueToCfn(&prop.TypeSpec, sdkObj)
+		if err != nil {
+			return jsonpatch.JsonPatchOperation{}, err
+		}
 		jsonBytes, err := json.Marshal(cfnObj)
 		contract.AssertNoError(err)
 		op.Value = string(jsonBytes)
 	}
-	return op
+	return op, nil
 }
 
 // CfnToSdk converts CloudFormation-shaped payload to Pulumi-SDK-shaped state. In particular, SDK properties

provider/pkg/schema/convert_test.go

@@ -1,4 +1,16 @@
 // Copyright 2016-2021, Pulumi Corporation.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package schema
 
@@ -19,7 +31,8 @@ func TestCfnToSdk(t *testing.T) {
 
 func TestSdkToCfn(t *testing.T) {
 	res := sampleSchema.Resources["aws-native:ecs:Service"]
-	actual := SdkToCfn(&res, sampleSchema.Types, sdkState)
+	actual, err := SdkToCfn(&res, sampleSchema.Types, sdkState)
+	assert.NoError(t, err)
 	assert.Equal(t, cfnPayload, actual)
 }
 

provider/pkg/schema/gen.go

@@ -346,7 +346,7 @@ func GatherPackage(supportedResourceTypes []string, jsonSchemas []jsschema.Schem
 				"region",
 			},
 		},
-		Types:     map[string]pschema.ComplexTypeSpec{},
+		Types: map[string]pschema.ComplexTypeSpec{},
 		Resources: map[string]pschema.ResourceSpec{
 			ExtensionResourceToken: {
 				ObjectTypeSpec: pschema.ObjectTypeSpec{
@@ -427,7 +427,7 @@ func GatherPackage(supportedResourceTypes []string, jsonSchemas []jsschema.Schem
 				CreateOnly: []string{"type", "properties"},
 			},
 		},
-		Types:     map[string]CloudAPIType{},
+		Types: map[string]CloudAPIType{},
 	}
 
 	supportedResources := codegen.NewStringSet(supportedResourceTypes...)
@@ -828,6 +828,9 @@ func (ctx *context) genProperties(parentName string, typeSchema *jsschema.Schema
 			Description: value.Description,
 			TypeSpec:    *typeSpec,
 		}
+		if parentName == "FunctionCode" && name == "ZipFile" {
+			propertySpec.TypeSpec = pschema.TypeSpec{Ref: "pulumi.json#/Asset"}
+		}
 		// TODO: temporary workaround to get the 0.1.0 out, let's find a better solution later.
 		if name == "ClusterLogging" {
 			propertySpec.Language = map[string]pschema.RawMessage{