Add pulumi.Asset support to lambda function

Author: lblackstone

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

@@ -2,6 +2,13 @@
 
 import * as aws from "@pulumi/aws-native";
 import * as random from "@pulumi/random";
+import * as pulumi from "@pulumi/pulumi";
+
+new aws.lambda.Function("test", {
+    code: {
+        zipFile: new pulumi.asset.FileAsset("lambda_function_payload.js"),
+    },
+});
 
 const name = new random.RandomString("name", {
     length: 8,

examples/simple-ts/lambda_function_payload.js

@@ -0,0 +1,22 @@
+var aws = require('aws-sdk')
+var response = require('cfn-response')
+exports.handler = function(event, context) {
+    console.log("REQUEST RECEIVED:\\n" + JSON.stringify(event))
+    // For Delete requests, immediately send a SUCCESS response.
+    if (event.RequestType == "Delete") {
+        response.send(event, context, "SUCCESS")
+        return
+    }
+    var responseStatus = "FAILED"
+    var responseData = {}
+    var functionName = event.ResourceProperties.FunctionName
+    var lambda = new aws.Lambda()
+    lambda.invoke({ FunctionName: functionName }, function(err, invokeResult) {
+        if (err) {
+            responseData = {Error: "Invoke call failed"}
+            console.log(responseData.Error + ":\\n", err)
+        }
+        else responseStatus = "SUCCESS"
+        response.send(event, context, responseStatus, responseData)
+    })
+}

provider/cmd/cf2pulumi/schema-full.json

@@ -44626,7 +44626,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

@@ -44212,7 +44212,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/schema.json

@@ -485,8 +485,9 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.4/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI=

provider/go.sum

@@ -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 {
@@ -589,6 +589,7 @@ func (p *cfnProvider) Create(ctx context.Context, req *pulumirpc.CreateRequest)
 	resourceToken := string(urn.Type())
 	var cfType string
 	var payload map[string]interface{}
+	//q.Q(resourceToken) // DEBUG
 	switch resourceToken {
 	case schema.ExtensionResourceToken:
 		// For a custom resource, both CF type and inputs shape are defined explicitly in the SDK.
@@ -611,7 +612,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 +818,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 +1005,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 +1018,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 {