chore: adding tests for cloudfront and lambda (#174)

This adds tests for some additional popular resources. aws-native:s3:Bucket aws-native:s3:BucketPolicy aws-native:cloudfront:KeyValueStore aws-native:cloudfront:Function aws-native:lambda:Function aws-native:iam:Role aws-native:lambda:Permission aws-native:lambda:Alias aws-native:lambda:Url aws-native:lambda:Version aws-native:cloudfront:Distribution aws-native:cloudfront:CloudFrontOriginAccessIdentity
pulumi · Oct 23, 2024 · 72108f4 · 72108f4
1 parent 9f3122e
commit 72108f4
Show file tree

Hide file tree

Showing 18 changed files with 249 additions and 148 deletions.
diff --git a/examples/alb/package.json b/examples/alb/package.json
@@ -4,8 +4,8 @@
         "@types/node": "^10.0.0"
     },
     "dependencies": {
-        "@pulumi/aws": "^4.6.0",
-        "@pulumi/aws-native": "^0.117.0",
+        "@pulumi/aws": "^6.0.0",
+        "@pulumi/aws-native": "^1.0.0",
         "@pulumi/pulumi": "^3.0.0",
         "aws-cdk-lib": "2.149.0",
         "constructs": "10.3.0",

diff --git a/examples/api-websocket-lambda-dynamodb/package.json b/examples/api-websocket-lambda-dynamodb/package.json
@@ -7,8 +7,8 @@
         "@aws-sdk/client-apigatewaymanagementapi": "^3.632.0",
         "@aws-sdk/client-dynamodb": "^3.632.0",
         "@aws-sdk/lib-dynamodb": "^3.632.0",
-        "@pulumi/aws": "^4.6.0",
-        "@pulumi/aws-native": "^0.117.0",
+        "@pulumi/aws": "^6.0.0",
+        "@pulumi/aws-native": "^1.0.0",
         "@pulumi/cdk": "^0.5.0",
         "@pulumi/pulumi": "^3.0.0",
         "aws-cdk-lib": "2.149.0",

diff --git a/examples/apprunner/package.json b/examples/apprunner/package.json
@@ -4,9 +4,8 @@
         "@types/node": "^10.0.0"
     },
     "dependencies": {
-        "@pulumi/aws": "^4.6.0",
-        "@pulumi/awsx": "^0.32.0",
-        "@pulumi/aws-native": "^0.117.0",
+        "@pulumi/aws": "^6.0.0",
+        "@pulumi/aws-native": "^1.0.0",
         "@pulumi/pulumi": "^3.0.0",
         "aws-cdk-lib": "2.149.0",
         "constructs": "10.3.0",

diff --git a/examples/appsvc/index.ts b/examples/appsvc/index.ts
@@ -7,7 +7,9 @@ import * as pulumicdk from '@pulumi/cdk';
 import * as aws from '@pulumi/aws';
 
 const defaultVpc = pulumi.output(aws.ec2.getVpc({ default: true }));
-const defaultVpcSubnets = defaultVpc.id.apply((id) => aws.ec2.getSubnetIds({ vpcId: id }));
+const defaultVpcSubnets = defaultVpc.id.apply((id) =>
+    aws.ec2.getSubnets({ filters: [{ name: 'vpc-id', values: [id] }] }),
+);
 const azs = aws.getAvailabilityZonesOutput({
     filters: [
         {

diff --git a/examples/appsvc/package.json b/examples/appsvc/package.json
@@ -4,8 +4,8 @@
         "@types/node": "^10.0.0"
     },
     "dependencies": {
-        "@pulumi/aws": "^4.6.0",
-        "@pulumi/aws-native": "^0.117.0",
+        "@pulumi/aws": "^6.0.0",
+        "@pulumi/aws-native": "^1.0.0",
         "@pulumi/pulumi": "^3.0.0",
         "aws-cdk-lib": "2.149.0",
         "constructs": "10.3.0",

diff --git a/examples/cloudfront-lambda-urls/Pulumi.yaml b/examples/cloudfront-lambda-urls/Pulumi.yaml
@@ -0,0 +1,3 @@
+name: cloudfront-lambda-urls
+runtime: nodejs
+description: cloudfront-lambda-urls CDK example
diff --git a/examples/cloudfront-lambda-urls/index.handler.ts b/examples/cloudfront-lambda-urls/index.handler.ts
@@ -0,0 +1,8 @@
+import { Handler, APIGatewayProxyEventV2, APIGatewayProxyResultV2 } from 'aws-lambda';
+
+export const handler: Handler = async (event: APIGatewayProxyEventV2): Promise<APIGatewayProxyResultV2> => {
+    return {
+        statusCode: 200,
+        body: 'Hello world!',
+    };
+};
diff --git a/examples/cloudfront-lambda-urls/index.ts b/examples/cloudfront-lambda-urls/index.ts
@@ -0,0 +1,61 @@
+import * as pulumi from '@pulumi/pulumi';
+import * as pulumicdk from '@pulumi/cdk';
+import { Code, FunctionUrlAuthType, Runtime } from 'aws-cdk-lib/aws-lambda';
+import {
+    Distribution,
+    experimental,
+    Function,
+    FunctionCode,
+    FunctionEventType,
+    FunctionRuntime,
+    KeyValueStore,
+    LambdaEdgeEventType,
+} from 'aws-cdk-lib/aws-cloudfront';
+import { FunctionUrlOrigin, S3Origin } from 'aws-cdk-lib/aws-cloudfront-origins';
+import { NodejsFunction } from 'aws-cdk-lib/aws-lambda-nodejs';
+import { Bucket } from 'aws-cdk-lib/aws-s3';
+
+class CloudFrontAppStack extends pulumicdk.Stack {
+    public cloudFrontUrl: pulumi.Output<string>;
+    constructor(id: string) {
+        super(id);
+
+        const handler = new NodejsFunction(this, 'handler', {
+            runtime: Runtime.NODEJS_LATEST,
+        });
+
+        const cfFunction = new Function(this, 'CfFunction', {
+            code: FunctionCode.fromInline('export function handler(event) { return event.request }'),
+            runtime: FunctionRuntime.JS_2_0,
+        });
+
+        const alias = handler.addAlias('live');
+        const url = alias.addFunctionUrl({
+            authType: FunctionUrlAuthType.NONE,
+        });
+
+        const bucket = new Bucket(this, 'Bucket');
+
+        const distro = new Distribution(this, 'distro', {
+            defaultBehavior: {
+                origin: new FunctionUrlOrigin(url),
+                functionAssociations: [
+                    {
+                        function: cfFunction,
+                        eventType: FunctionEventType.VIEWER_REQUEST,
+                    },
+                ],
+            },
+        });
+        distro.addBehavior('/images/*', new S3Origin(bucket));
+
+        new KeyValueStore(this, 'KVStore');
+
+        this.cloudFrontUrl = this.asOutput(distro.distributionDomainName);
+
+        this.synth();
+    }
+}
+
+const stack = new CloudFrontAppStack('cloudfront-app');
+export const url = pulumi.interpolate`https://${stack.cloudFrontUrl}`;
diff --git a/examples/cloudfront-lambda-urls/package.json b/examples/cloudfront-lambda-urls/package.json
@@ -0,0 +1,17 @@
+{
+    "name": "cloudfront-lambda-urls",
+    "devDependencies": {
+        "@types/node": "^10.0.0"
+    },
+    "dependencies": {
+        "@pulumi/aws": "^6.0.0",
+        "@pulumi/aws-native": "^1.0.0",
+        "@pulumi/cdk": "^0.5.0",
+        "@pulumi/pulumi": "^3.0.0",
+        "@types/aws-lambda": "^8.10.145",
+        "aws-cdk-lib": "2.149.0",
+        "aws-lambda": "^1.0.7",
+        "constructs": "10.3.0",
+        "esbuild": "^0.24.0"
+    }
+}
diff --git a/examples/cloudfront-lambda-urls/tsconfig.json b/examples/cloudfront-lambda-urls/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "strict": true,
+        "outDir": "bin",
+        "target": "es2016",
+        "module": "commonjs",
+        "moduleResolution": "node",
+        "sourceMap": true,
+        "experimentalDecorators": true,
+        "pretty": true,
+        "noFallthroughCasesInSwitch": true,
+        "noImplicitReturns": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.ts"
+    ]
+}
diff --git a/examples/cron-lambda/package.json b/examples/cron-lambda/package.json
@@ -4,9 +4,8 @@
         "@types/node": "^10.0.0"
     },
     "dependencies": {
-        "@pulumi/aws": "^4.6.0",
-        "@pulumi/awsx": "^0.32.0",
-        "@pulumi/aws-native": "^0.117.0",
+        "@pulumi/aws": "^6.0.0",
+        "@pulumi/aws-native": "^1.0.0",
         "@pulumi/pulumi": "^3.0.0",
         "aws-cdk-lib": "2.149.0",
         "constructs": "10.3.0",

diff --git a/examples/ec2-instance/package.json b/examples/ec2-instance/package.json
@@ -4,8 +4,8 @@
         "@types/node": "^10.0.0"
     },
     "dependencies": {
-        "@pulumi/aws": "^4.6.0",
-        "@pulumi/aws-native": "^0.117.0",
+        "@pulumi/aws": "^6.0.0",
+        "@pulumi/aws-native": "^1.0.0",
         "@pulumi/pulumi": "^3.0.0",
         "aws-cdk-lib": "2.149.0",
         "constructs": "10.3.0",

diff --git a/examples/ecscluster/package.json b/examples/ecscluster/package.json
@@ -4,8 +4,8 @@
         "@types/node": "^10.0.0"
     },
     "dependencies": {
-        "@pulumi/aws": "^4.6.0",
-        "@pulumi/aws-native": "^0.117.0",
+        "@pulumi/aws": "^6.0.0",
+        "@pulumi/aws-native": "^1.0.0",
         "@pulumi/pulumi": "^3.0.0",
         "aws-cdk-lib": "2.149.0",
         "constructs": "10.3.0",

diff --git a/examples/examples_nodejs_test.go b/examples/examples_nodejs_test.go
@@ -102,6 +102,15 @@ func TestEC2Instance(t *testing.T) {
 	integration.ProgramTest(t, &test)
 }
 
+func TestCloudFront(t *testing.T) {
+	test := getJSBaseOptions(t).
+		With(integration.ProgramTestOptions{
+			Dir: filepath.Join(getCwd(t), "cloudfront-lambda-urls"),
+		})
+
+	integration.ProgramTest(t, &test)
+}
+
 func TestAPIWebsocketLambdaDynamoDB(t *testing.T) {
 	test := getJSBaseOptions(t).
 		With(integration.ProgramTestOptions{

diff --git a/examples/fargate/package.json b/examples/fargate/package.json
@@ -4,8 +4,8 @@
         "@types/node": "^10.0.0"
     },
     "dependencies": {
-        "@pulumi/aws": "^4.6.0",
-        "@pulumi/aws-native": "^0.117.0",
+        "@pulumi/aws": "^6.0.0",
+        "@pulumi/aws-native": "^1.0.0",
         "@pulumi/pulumi": "^3.0.0",
         "aws-cdk-lib": "2.149.0",
         "constructs": "10.3.0",

diff --git a/examples/s3-object-lambda/package.json b/examples/s3-object-lambda/package.json
@@ -5,7 +5,7 @@
     },
     "dependencies": {
         "@pulumi/cdk": "^0.5.0",
-        "@pulumi/aws-native": "^0.117.0",
+        "@pulumi/aws-native": "^1.0.0",
         "@pulumi/pulumi": "^3.0.0",
         "aws-cdk-lib": "2.149.0",
         "constructs": "10.3.0" 

diff --git a/package.json b/package.json
@@ -21,15 +21,16 @@
     }
   },
   "resolutions": {
+    "@pulumi/pulumi": "3.121.0", 
     "wrap-ansi": "7.0.0",
     "string-width": "4.1.0"
   },
   "devDependencies": {
     "@aws-cdk/aws-apprunner-alpha": "2.20.0-alpha.0",
     "@pulumi/aws": "^6.32.0",
-    "@pulumi/aws-native": "0.121.0",
+    "@pulumi/aws-native": "^1.0.0",
     "@pulumi/docker": "^4.5.0",
-    "@pulumi/pulumi": "^3.117.0",
+    "@pulumi/pulumi": "3.121.0",
     "@types/archiver": "^6.0.2",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.2",
@@ -50,7 +51,7 @@
   },
   "peerDependencies": {
     "@pulumi/aws": "^6.32.0",
-    "@pulumi/aws-native": "^0.121.0",
+    "@pulumi/aws-native": "^1.0.0",
     "@pulumi/docker": "^4.5.0",
     "@pulumi/pulumi": "^3.117.0",
     "aws-cdk-lib": "^2.20.0",