Skip to content

Commit

Permalink
Merge branch 'master' into nirvana124/requestValidator
Browse files Browse the repository at this point in the history
  • Loading branch information
@nirvana124
nirvana124 authored Apr 1, 2020
2 parents 4ed59a7 + 4994e0d commit 27b06ef
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 41 deletions.
129 changes: 106 additions & 23 deletions packages/@aws-cdk/aws-lambda/lib/runtime.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,112 @@ export class Runtime {
/** A list of all known `Runtime`'s. */
public static readonly ALL = new Array<Runtime>();

/** @deprecated Use {@link NODEJS_10_X} */
public static readonly NODEJS = new Runtime('nodejs', RuntimeFamily.NODEJS, { supportsInlineCode: true });
/** @deprecated Use {@link NODEJS_10_X} */
public static readonly NODEJS_4_3 = new Runtime('nodejs4.3', RuntimeFamily.NODEJS, { supportsInlineCode: true });
/** @deprecated Use {@link NODEJS_10_X} */
public static readonly NODEJS_6_10 = new Runtime('nodejs6.10', RuntimeFamily.NODEJS, { supportsInlineCode: true });
/** @deprecated Use {@link NODEJS_10_X} */
public static readonly NODEJS_8_10 = new Runtime('nodejs8.10', RuntimeFamily.NODEJS, { supportsInlineCode: true });
public static readonly NODEJS_10_X = new Runtime('nodejs10.x', RuntimeFamily.NODEJS, { supportsInlineCode: true });
public static readonly NODEJS_12_X = new Runtime('nodejs12.x', RuntimeFamily.NODEJS, { supportsInlineCode: true });
public static readonly PYTHON_2_7 = new Runtime('python2.7', RuntimeFamily.PYTHON, { supportsInlineCode: true });
public static readonly PYTHON_3_6 = new Runtime('python3.6', RuntimeFamily.PYTHON, { supportsInlineCode: true });
public static readonly PYTHON_3_7 = new Runtime('python3.7', RuntimeFamily.PYTHON, { supportsInlineCode: true });
public static readonly PYTHON_3_8 = new Runtime('python3.8', RuntimeFamily.PYTHON);
public static readonly JAVA_8 = new Runtime('java8', RuntimeFamily.JAVA);
public static readonly JAVA_11 = new Runtime('java11', RuntimeFamily.JAVA);
public static readonly DOTNET_CORE_1 = new Runtime('dotnetcore1.0', RuntimeFamily.DOTNET_CORE);
/** @deprecated Use {@link DotNetCore21} */
public static readonly DOTNET_CORE_2 = new Runtime('dotnetcore2.0', RuntimeFamily.DOTNET_CORE);
public static readonly DOTNET_CORE_2_1 = new Runtime('dotnetcore2.1', RuntimeFamily.DOTNET_CORE);
public static readonly GO_1_X = new Runtime('go1.x', RuntimeFamily.GO);
public static readonly RUBY_2_5 = new Runtime('ruby2.5', RuntimeFamily.RUBY);
public static readonly PROVIDED = new Runtime('provided', RuntimeFamily.OTHER);
/**
* The NodeJS runtime (nodejs)
*
* @deprecated Use {@link NODEJS_10_X}
*/
public static readonly NODEJS = new Runtime('nodejs', RuntimeFamily.NODEJS, { supportsInlineCode: true });

/**
* The NodeJS 4.3 runtime (nodejs4.3)
*
* @deprecated Use {@link NODEJS_10_X}
*/
public static readonly NODEJS_4_3 = new Runtime('nodejs4.3', RuntimeFamily.NODEJS, { supportsInlineCode: true });

/**
* The NodeJS 6.10 runtime (nodejs6.10)
*
* @deprecated Use {@link NODEJS_10_X}
*/
public static readonly NODEJS_6_10 = new Runtime('nodejs6.10', RuntimeFamily.NODEJS, { supportsInlineCode: true });

/**
* The NodeJS 8.10 runtime (nodejs8.10)
*
* @deprecated Use {@link NODEJS_10_X}
*/
public static readonly NODEJS_8_10 = new Runtime('nodejs8.10', RuntimeFamily.NODEJS, { supportsInlineCode: true });

/**
* The NodeJS 10.x runtime (nodejs10.x)
*/
public static readonly NODEJS_10_X = new Runtime('nodejs10.x', RuntimeFamily.NODEJS, { supportsInlineCode: true });

/**
* The NodeJS 12.x runtime (nodejs12.x)
*/
public static readonly NODEJS_12_X = new Runtime('nodejs12.x', RuntimeFamily.NODEJS, { supportsInlineCode: true });

/**
* The Python 2.7 runtime (python2.7)
*/
public static readonly PYTHON_2_7 = new Runtime('python2.7', RuntimeFamily.PYTHON, { supportsInlineCode: true });

/**
* The Python 3.6 runtime (python3.6)
*/
public static readonly PYTHON_3_6 = new Runtime('python3.6', RuntimeFamily.PYTHON, { supportsInlineCode: true });

/**
* The Python 3.7 runtime (python3.7)
*/
public static readonly PYTHON_3_7 = new Runtime('python3.7', RuntimeFamily.PYTHON, { supportsInlineCode: true });

/**
* The Python 3.8 runtime (python3.8)
*/
public static readonly PYTHON_3_8 = new Runtime('python3.8', RuntimeFamily.PYTHON);

/**
* The Java 8 runtime (java8)
*/
public static readonly JAVA_8 = new Runtime('java8', RuntimeFamily.JAVA);

/**
* The Java 11 runtime (java11)
*/
public static readonly JAVA_11 = new Runtime('java11', RuntimeFamily.JAVA);

/**
* The .NET Core 1.0 runtime (dotnetcore1.0)
*
* @deprecated Use {@link DOTNET_CORE_2_1}
*/
public static readonly DOTNET_CORE_1 = new Runtime('dotnetcore1.0', RuntimeFamily.DOTNET_CORE);

/**
* The .NET Core 2.0 runtime (dotnetcore2.0)
*
* @deprecated Use {@link DOTNET_CORE_2_1}
*/
public static readonly DOTNET_CORE_2 = new Runtime('dotnetcore2.0', RuntimeFamily.DOTNET_CORE);

/**
* The .NET Core 2.1 runtime (dotnetcore2.1)
*/
public static readonly DOTNET_CORE_2_1 = new Runtime('dotnetcore2.1', RuntimeFamily.DOTNET_CORE);

/**
* The Go 1.x runtime (go1.x)
*/
public static readonly GO_1_X = new Runtime('go1.x', RuntimeFamily.GO);

/**
* The Ruby 2.5 runtime (ruby2.5)
*/
public static readonly RUBY_2_5 = new Runtime('ruby2.5', RuntimeFamily.RUBY);

/**
* The Ruby 2.7 runtime (ruby2.7)
*/
public static readonly RUBY_2_7 = new Runtime('ruby2.7', RuntimeFamily.RUBY);

/**
* The custom provided runtime (provided)
*/
public static readonly PROVIDED = new Runtime('provided', RuntimeFamily.OTHER);

/**
* The name of this runtime, as expected by the Lambda resource.
Expand Down
18 changes: 0 additions & 18 deletions packages/@aws-cdk/aws-lambda/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,24 +138,6 @@
"docs-public-apis:@aws-cdk/aws-lambda.FunctionBase",
"docs-public-apis:@aws-cdk/aws-lambda.QualifiedFunctionBase",
"docs-public-apis:@aws-cdk/aws-lambda.QualifiedFunctionBase.lambda",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.DOTNET_CORE_1",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.DOTNET_CORE_2",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.DOTNET_CORE_2_1",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.GO_1_X",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.JAVA_8",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.JAVA_11",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.NODEJS",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.NODEJS_10_X",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.NODEJS_12_X",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.NODEJS_4_3",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.NODEJS_6_10",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.NODEJS_8_10",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.PROVIDED",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.PYTHON_2_7",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.PYTHON_3_6",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.PYTHON_3_7",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.PYTHON_3_8",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.RUBY_2_5",
"docs-public-apis:@aws-cdk/aws-lambda.RuntimeFamily",
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.toString",
"docs-public-apis:@aws-cdk/aws-lambda.Version.fromVersionAttributes",
Expand Down

0 comments on commit 27b06ef

Please sign in to comment.