@aws-cdk-testing/cli-integ 2.61.0

package/resources/cdk-apps/sam_cdk_integ_app/lib/test-stack.js

@@ -0,0 +1,134 @@
+var path = require('path');
+var { NestedStack1 } = require('./nested-stack');
+if (process.env.PACKAGE_LAYOUT_VERSION === '1') {
+  var { Stack } = require('@aws-cdk/core');
+  var { Runtime, LayerVersion, Code, Function, DockerImageFunction, DockerImageCode } = require('@aws-cdk/aws-lambda');
+  var { SpecRestApi, ApiDefinition } = require('@aws-cdk/aws-apigateway');
+  var { NodejsFunction } = require('@aws-cdk/aws-lambda-nodejs');
+  var { GoFunction } = require('@aws-cdk/aws-lambda-go');
+  var { PythonFunction, PythonLayerVersion } = require('@aws-cdk/aws-lambda-python');
+  var { Role, ServicePrincipal, PolicyStatement } = require('@aws-cdk/aws-iam');
+  var { RetentionDays } = require('@aws-cdk/aws-logs');
+} else {
+  var { Stack } = require('aws-cdk-lib');
+  var { Runtime, LayerVersion, Code, Function, DockerImageFunction, DockerImageCode } = require('aws-cdk-lib/aws-lambda');
+  var { SpecRestApi, ApiDefinition } = require('aws-cdk-lib/aws-apigateway');
+  var { NodejsFunction } = require('aws-cdk-lib/aws-lambda-nodejs');
+  var { GoFunction } = require('@aws-cdk/aws-lambda-go-alpha');
+  var { PythonFunction, PythonLayerVersion } = require('@aws-cdk/aws-lambda-python-alpha');
+  var { Role, ServicePrincipal, PolicyStatement } = require('aws-cdk-lib/aws-iam');
+  var { RetentionDays } = require('aws-cdk-lib/aws-logs');
+}
+
+const isRunningOnCodeBuild = !!process.env.CODEBUILD_BUILD_ID;
+
+class CDKSupportDemoRootStack extends Stack{
+  constructor(scope, id, props) {
+    super(scope, id, props);
+    // Python Runtime
+    // Layers
+    new PythonLayerVersion(this, 'PythonLayerVersion', {
+      compatibleRuntimes: [
+        Runtime.PYTHON_3_7,
+      ],
+      entry: './src/python/Layer',
+    });
+    new LayerVersion(this, 'LayerVersion', {
+      compatibleRuntimes: [
+        Runtime.PYTHON_3_7,
+      ],
+      code: Code.fromAsset('./src/python/Layer'),
+    });
+    new LayerVersion(this, 'BundledLayerVersionPythonRuntime', {
+      compatibleRuntimes: [
+        Runtime.PYTHON_3_7,
+      ],
+      code: Code.fromAsset('./src/python/Layer', {
+        bundling: {
+          command: [
+            '/bin/sh',
+            '-c',
+            'rm -rf /tmp/asset-input && mkdir /tmp/asset-input && cp * /tmp/asset-input && cd /tmp/asset-input && pip install -r requirements.txt -t . && mkdir /asset-output/python && cp -R /tmp/asset-input/* /asset-output/python',
+          ],
+          image: Runtime.PYTHON_3_7.bundlingImage,
+          user: 'root',
+        }
+      }),
+    });
+
+    // ZIP package type Functions
+    new PythonFunction(this, 'PythonFunction', {
+      entry: './src/python/Function',
+      index: 'app.py',
+      handler: 'lambda_handler',
+      runtime: Runtime.PYTHON_3_7,
+      functionName: 'pythonFunc',
+      logRetention: RetentionDays.THREE_MONTHS,
+    });
+    new Function(this, 'FunctionPythonRuntime', {
+      runtime: Runtime.PYTHON_3_7,
+      code: Code.fromAsset('./src/python/Function'),
+      handler: 'app.lambda_handler',
+    });
+    new Function(this, 'BundledFunctionPythonRuntime', {
+      runtime: Runtime.PYTHON_3_7,
+      code: Code.fromAsset('./src/python/Function/', {
+        bundling: {
+          command: [
+            '/bin/sh',
+            '-c',
+            'rm -rf /tmp/asset-input && mkdir /tmp/asset-input && cp * /tmp/asset-input && cd /tmp/asset-input && pip install -r requirements.txt -t . && cp -R /tmp/asset-input/* /asset-output',
+          ],
+          image: Runtime.PYTHON_3_7.bundlingImage,
+          user: 'root',
+        }
+      }),
+      handler: 'app.lambda_handler',
+    });
+
+    // NodeJs Runtime
+    new NodejsFunction(this, 'NodejsFunction', {
+      entry: path.join(__dirname, '../src/nodejs/NodeJsFunctionConstruct/app.ts'),
+      depsLockFilePath: path.join(__dirname, '../src/nodejs/NodeJsFunctionConstruct/package-lock.json'),
+      bundling: {
+        forceDockerBundling: true,
+      },
+      handler: 'lambdaHandler',
+    });
+
+    // Go Runtime
+    new GoFunction(this, 'GoFunction', {
+      entry: './src/go/GoFunctionConstruct',
+      bundling: {
+        forcedDockerBundling: true,
+        // Only use Google proxy in the CI tests, as it is blocked on workstations
+        goProxies: isRunningOnCodeBuild ? [GoFunction.GOOGLE_GOPROXY, 'direct'] : undefined,
+      },
+    });
+
+    // Image Package Type Functions
+    new DockerImageFunction(this, 'DockerImageFunction', {
+      code: DockerImageCode.fromImageAsset('./src/docker/DockerImageFunctionConstruct', {
+        file: 'Dockerfile',
+      }),
+    });
+
+    // Spec Rest Api
+    new SpecRestApi(this, 'SpecRestAPI', {
+      apiDefinition: ApiDefinition.fromAsset('./src/rest-api-definition.yaml'),
+    });
+    // Role to be used as credentials for the Spec rest APi
+    // it is used inside the spec rest api definition file
+    new Role(this, 'SpecRestApiRole', {
+      assumedBy: new ServicePrincipal('apigateway.amazonaws.com'),
+      roleName: 'SpecRestApiRole',
+    }).addToPolicy(new PolicyStatement({
+      actions: ['lambda:InvokeFunction'],
+      resources: ['*'],
+    }));
+
+    // Nested Stack
+    new NestedStack1(this, 'NestedStack', {});
+  }
+}
+exports.CDKSupportDemoRootStack = CDKSupportDemoRootStack;

package/resources/cdk-apps/sam_cdk_integ_app/src/docker/DockerImageFunctionConstruct/Dockerfile

@@ -0,0 +1,9 @@
+FROM public.ecr.aws/lambda/nodejs:14
+
+# Assumes your function is named "app.js", and there is a package.json file in the app directory
+COPY app.js  package.json ./
+
+RUN npm install
+
+# Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)
+CMD [ "app.lambdaHandler" ]

package/resources/cdk-apps/sam_cdk_integ_app/src/docker/DockerImageFunctionConstruct/app.js

@@ -0,0 +1,22 @@
+var gen = require('unique-names-generator');
+
+const colorName = gen.uniqueNamesGenerator({
+    dictionaries: [gen.colors]
+});
+
+exports.lambdaHandler = async(event, context) => {
+    let response;
+
+    try {
+        response = {
+            'statusCode': 200,
+            'body': JSON.stringify({
+                message: "Hello World",
+            })
+        };
+    } catch (err) {
+        console.log(err);
+        return err;
+    }
+    return response;
+};

package/resources/cdk-apps/sam_cdk_integ_app/src/docker/DockerImageFunctionConstruct/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "DockerImageFunctionConstruct",
+  "description": "testing docker lambda function ",
+  "version": "0.1.0",
+  "bin": {
+    "randomColors": "bin/app.js"
+  },
+  "scripts": {
+    "build": "tsc",
+    "watch": "tsc -w",
+    "test": "jest",
+    "cdk": "cdk"
+  },
+  "license": "Apache-2.0",
+  "dependencies": {
+    "unique-names-generator": "^4.6.0"
+  }
+}

package/resources/cdk-apps/sam_cdk_integ_app/src/go/GoFunctionConstruct/go.mod

@@ -0,0 +1,5 @@
+require github.com/aws/aws-lambda-go v1.28.0
+
+module hello-world
+
+go 1.15

package/resources/cdk-apps/sam_cdk_integ_app/src/go/GoFunctionConstruct/go.sum

@@ -0,0 +1,17 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/aws/aws-lambda-go v1.28.0 h1:fZiik1PZqW2IyAN4rj+Y0UBaO1IDFlsNo9Zz/XnArK4=
+github.com/aws/aws-lambda-go v1.28.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

package/resources/cdk-apps/sam_cdk_integ_app/src/go/GoFunctionConstruct/main.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"github.com/aws/aws-lambda-go/events"
+	"github.com/aws/aws-lambda-go/lambda"
+)
+
+func handler(request events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
+	return events.APIGatewayProxyResponse{
+		Body:       "{\"message\": \"Hello World\"}",
+		StatusCode: 200,
+	}, nil
+}
+
+func main() {
+	lambda.Start(handler)
+}

package/resources/cdk-apps/sam_cdk_integ_app/src/nodejs/NodeJsFunctionConstruct/app.ts

@@ -0,0 +1,16 @@
+let response;
+
+exports.lambdaHandler = async(event, context) => {
+    try {
+        response = {
+            'statusCode': 200,
+            'body': JSON.stringify({
+                message: `Hello World`,
+            })
+        };
+    } catch (err) {
+        console.log(err);
+        return err;
+    }
+    return response;
+};

package/resources/cdk-apps/sam_cdk_integ_app/src/nodejs/NodeJsFunctionConstruct/package-lock.json

@@ -0,0 +1,12 @@
+{
+  "name": "hello_world",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "hello_world",
+      "version": "1.0.0"
+    }
+  }
+}

package/resources/cdk-apps/sam_cdk_integ_app/src/nodejs/NodeJsFunctionConstruct/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "hello_world",
+  "version": "1.0.0",
+  "main": "app.js"
+}

package/resources/cdk-apps/sam_cdk_integ_app/src/python/Function/app.py

@@ -0,0 +1,15 @@
+from geonamescache import GeonamesCache
+import json
+
+
+def lambda_handler(event, context):
+
+    response = {
+        "statusCode": 200,
+        "body": json.dumps(
+            {
+                "message": "Hello World",
+            }
+        ),
+    }
+    return response

package/resources/cdk-apps/sam_cdk_integ_app/src/python/Function/requirements.txt

@@ -0,0 +1 @@
+geonamescache==1.3.0

package/resources/cdk-apps/sam_cdk_integ_app/src/python/Layer/layer_version_dependency.py

@@ -0,0 +1,5 @@
+from geonamescache import GeonamesCache
+
+
+def get_dependency():
+    return 5

package/resources/cdk-apps/sam_cdk_integ_app/src/python/Layer/requirements.txt

@@ -0,0 +1 @@
+geonamescache==1.3.0

package/resources/cdk-apps/sam_cdk_integ_app/src/rest-api-definition.yaml

@@ -0,0 +1,12 @@
+openapi: '3.0.2'
+info:
+  title: API Gateway IP Filtering Example API
+
+paths:
+  "/restapis/spec/pythonFunction":
+    get:
+      x-amazon-apigateway-integration:
+        httpMethod: POST
+        type: AWS_PROXY
+        uri: arn:${AWS::Partition}:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/arn:${AWS::Partition}:lambda:${AWS::Region}:${AWS::AccountId}:function:pythonFunc:$LATEST/invocations
+        credentials: arn:${AWS::Partition}:iam::${AWS::AccountId}:role/SpecRestApiRole

package/resources/cli-regression-patches/v1.119.0/NOTES.md

@@ -0,0 +1,5 @@
+This [PR](https://github.com/aws/aws-cdk/pull/16205) added a node version check to our CLI courtesy of [`@jsii/check-node/run`](https://github.com/aws/jsii/tree/main/packages/%40jsii/check-node).
+
+This check now causes the CLI to print a deprecation warning that changes the output of the `synth` command. We don't consider this a breaking change since we have no guarantess for CLI output, but it did break some our integ tests (namely `cdk synth`) that used to rely on a specific output.
+
+This patch brings the [fix](https://github.com/aws/aws-cdk/pull/16216) into the regression suite.