Skip to content

Commit 27b06ef

Browse files
nirvana124nirvana124
authored
Merge branch 'master' into nirvana124/requestValidator
2 parents 4ed59a7 + 4994e0d commit 27b06ef

File tree

2 files changed

+106
-41
lines changed

2 files changed

+106
-41
lines changed

‎packages/@aws-cdk/aws-lambda/lib/runtime.ts

+106-23
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,112 @@ export class Runtime {
2626
/** A list of all known `Runtime`'s. */
2727
public static readonly ALL = new Array<Runtime>();
2828

29-
/** @deprecated Use {@link NODEJS_10_X} */
30-
public static readonly NODEJS = new Runtime('nodejs', RuntimeFamily.NODEJS, { supportsInlineCode: true });
31-
/** @deprecated Use {@link NODEJS_10_X} */
32-
public static readonly NODEJS_4_3 = new Runtime('nodejs4.3', RuntimeFamily.NODEJS, { supportsInlineCode: true });
33-
/** @deprecated Use {@link NODEJS_10_X} */
34-
public static readonly NODEJS_6_10 = new Runtime('nodejs6.10', RuntimeFamily.NODEJS, { supportsInlineCode: true });
35-
/** @deprecated Use {@link NODEJS_10_X} */
36-
public static readonly NODEJS_8_10 = new Runtime('nodejs8.10', RuntimeFamily.NODEJS, { supportsInlineCode: true });
37-
public static readonly NODEJS_10_X = new Runtime('nodejs10.x', RuntimeFamily.NODEJS, { supportsInlineCode: true });
38-
public static readonly NODEJS_12_X = new Runtime('nodejs12.x', RuntimeFamily.NODEJS, { supportsInlineCode: true });
39-
public static readonly PYTHON_2_7 = new Runtime('python2.7', RuntimeFamily.PYTHON, { supportsInlineCode: true });
40-
public static readonly PYTHON_3_6 = new Runtime('python3.6', RuntimeFamily.PYTHON, { supportsInlineCode: true });
41-
public static readonly PYTHON_3_7 = new Runtime('python3.7', RuntimeFamily.PYTHON, { supportsInlineCode: true });
42-
public static readonly PYTHON_3_8 = new Runtime('python3.8', RuntimeFamily.PYTHON);
43-
public static readonly JAVA_8 = new Runtime('java8', RuntimeFamily.JAVA);
44-
public static readonly JAVA_11 = new Runtime('java11', RuntimeFamily.JAVA);
45-
public static readonly DOTNET_CORE_1 = new Runtime('dotnetcore1.0', RuntimeFamily.DOTNET_CORE);
46-
/** @deprecated Use {@link DotNetCore21} */
47-
public static readonly DOTNET_CORE_2 = new Runtime('dotnetcore2.0', RuntimeFamily.DOTNET_CORE);
48-
public static readonly DOTNET_CORE_2_1 = new Runtime('dotnetcore2.1', RuntimeFamily.DOTNET_CORE);
49-
public static readonly GO_1_X = new Runtime('go1.x', RuntimeFamily.GO);
50-
public static readonly RUBY_2_5 = new Runtime('ruby2.5', RuntimeFamily.RUBY);
51-
public static readonly PROVIDED = new Runtime('provided', RuntimeFamily.OTHER);
29+
/**
30+
* The NodeJS runtime (nodejs)
31+
*
32+
* @deprecated Use {@link NODEJS_10_X}
33+
*/
34+
public static readonly NODEJS = new Runtime('nodejs', RuntimeFamily.NODEJS, { supportsInlineCode: true });
35+
36+
/**
37+
* The NodeJS 4.3 runtime (nodejs4.3)
38+
*
39+
* @deprecated Use {@link NODEJS_10_X}
40+
*/
41+
public static readonly NODEJS_4_3 = new Runtime('nodejs4.3', RuntimeFamily.NODEJS, { supportsInlineCode: true });
42+
43+
/**
44+
* The NodeJS 6.10 runtime (nodejs6.10)
45+
*
46+
* @deprecated Use {@link NODEJS_10_X}
47+
*/
48+
public static readonly NODEJS_6_10 = new Runtime('nodejs6.10', RuntimeFamily.NODEJS, { supportsInlineCode: true });
49+
50+
/**
51+
* The NodeJS 8.10 runtime (nodejs8.10)
52+
*
53+
* @deprecated Use {@link NODEJS_10_X}
54+
*/
55+
public static readonly NODEJS_8_10 = new Runtime('nodejs8.10', RuntimeFamily.NODEJS, { supportsInlineCode: true });
56+
57+
/**
58+
* The NodeJS 10.x runtime (nodejs10.x)
59+
*/
60+
public static readonly NODEJS_10_X = new Runtime('nodejs10.x', RuntimeFamily.NODEJS, { supportsInlineCode: true });
61+
62+
/**
63+
* The NodeJS 12.x runtime (nodejs12.x)
64+
*/
65+
public static readonly NODEJS_12_X = new Runtime('nodejs12.x', RuntimeFamily.NODEJS, { supportsInlineCode: true });
66+
67+
/**
68+
* The Python 2.7 runtime (python2.7)
69+
*/
70+
public static readonly PYTHON_2_7 = new Runtime('python2.7', RuntimeFamily.PYTHON, { supportsInlineCode: true });
71+
72+
/**
73+
* The Python 3.6 runtime (python3.6)
74+
*/
75+
public static readonly PYTHON_3_6 = new Runtime('python3.6', RuntimeFamily.PYTHON, { supportsInlineCode: true });
76+
77+
/**
78+
* The Python 3.7 runtime (python3.7)
79+
*/
80+
public static readonly PYTHON_3_7 = new Runtime('python3.7', RuntimeFamily.PYTHON, { supportsInlineCode: true });
81+
82+
/**
83+
* The Python 3.8 runtime (python3.8)
84+
*/
85+
public static readonly PYTHON_3_8 = new Runtime('python3.8', RuntimeFamily.PYTHON);
86+
87+
/**
88+
* The Java 8 runtime (java8)
89+
*/
90+
public static readonly JAVA_8 = new Runtime('java8', RuntimeFamily.JAVA);
91+
92+
/**
93+
* The Java 11 runtime (java11)
94+
*/
95+
public static readonly JAVA_11 = new Runtime('java11', RuntimeFamily.JAVA);
96+
97+
/**
98+
* The .NET Core 1.0 runtime (dotnetcore1.0)
99+
*
100+
* @deprecated Use {@link DOTNET_CORE_2_1}
101+
*/
102+
public static readonly DOTNET_CORE_1 = new Runtime('dotnetcore1.0', RuntimeFamily.DOTNET_CORE);
103+
104+
/**
105+
* The .NET Core 2.0 runtime (dotnetcore2.0)
106+
*
107+
* @deprecated Use {@link DOTNET_CORE_2_1}
108+
*/
109+
public static readonly DOTNET_CORE_2 = new Runtime('dotnetcore2.0', RuntimeFamily.DOTNET_CORE);
110+
111+
/**
112+
* The .NET Core 2.1 runtime (dotnetcore2.1)
113+
*/
114+
public static readonly DOTNET_CORE_2_1 = new Runtime('dotnetcore2.1', RuntimeFamily.DOTNET_CORE);
115+
116+
/**
117+
* The Go 1.x runtime (go1.x)
118+
*/
119+
public static readonly GO_1_X = new Runtime('go1.x', RuntimeFamily.GO);
120+
121+
/**
122+
* The Ruby 2.5 runtime (ruby2.5)
123+
*/
124+
public static readonly RUBY_2_5 = new Runtime('ruby2.5', RuntimeFamily.RUBY);
125+
126+
/**
127+
* The Ruby 2.7 runtime (ruby2.7)
128+
*/
129+
public static readonly RUBY_2_7 = new Runtime('ruby2.7', RuntimeFamily.RUBY);
130+
131+
/**
132+
* The custom provided runtime (provided)
133+
*/
134+
public static readonly PROVIDED = new Runtime('provided', RuntimeFamily.OTHER);
52135

53136
/**
54137
* The name of this runtime, as expected by the Lambda resource.

‎packages/@aws-cdk/aws-lambda/package.json

-18
Original file line numberDiff line numberDiff line change
@@ -138,24 +138,6 @@
138138
"docs-public-apis:@aws-cdk/aws-lambda.FunctionBase",
139139
"docs-public-apis:@aws-cdk/aws-lambda.QualifiedFunctionBase",
140140
"docs-public-apis:@aws-cdk/aws-lambda.QualifiedFunctionBase.lambda",
141-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.DOTNET_CORE_1",
142-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.DOTNET_CORE_2",
143-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.DOTNET_CORE_2_1",
144-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.GO_1_X",
145-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.JAVA_8",
146-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.JAVA_11",
147-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.NODEJS",
148-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.NODEJS_10_X",
149-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.NODEJS_12_X",
150-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.NODEJS_4_3",
151-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.NODEJS_6_10",
152-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.NODEJS_8_10",
153-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.PROVIDED",
154-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.PYTHON_2_7",
155-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.PYTHON_3_6",
156-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.PYTHON_3_7",
157-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.PYTHON_3_8",
158-
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.RUBY_2_5",
159141
"docs-public-apis:@aws-cdk/aws-lambda.RuntimeFamily",
160142
"docs-public-apis:@aws-cdk/aws-lambda.Runtime.toString",
161143
"docs-public-apis:@aws-cdk/aws-lambda.Version.fromVersionAttributes",

0 commit comments

Comments
 (0)