From dc0c7cf229a224c6563b4944bdac9863b71fdd5b Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Wed, 4 Dec 2024 12:08:58 +0100 Subject: [PATCH 1/2] Update Lambda Runtimes enum --- provider/types.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/provider/types.go b/provider/types.go index bb28a94158a..876d5cacb2d 100644 --- a/provider/types.go +++ b/provider/types.go @@ -225,7 +225,6 @@ var extraTypes = map[string]schema.ComplexTypeSpec{ }, Enum: []schema.EnumValueSpec{ {Value: "dotnet6", Name: "Dotnet6"}, - {Value: "dotnet7", Name: "Dotnet7"}, {Value: "dotnet8", Name: "Dotnet8"}, {Value: "java11", Name: "Java11"}, {Value: "java17", Name: "Java17"}, @@ -233,16 +232,19 @@ var extraTypes = map[string]schema.ComplexTypeSpec{ {Value: "java8.al2", Name: "Java8AL2"}, {Value: "nodejs18.x", Name: "NodeJS18dX"}, {Value: "nodejs20.x", Name: "NodeJS20dX"}, + {Value: "nodejs22.x", Name: "NodeJS22dX"}, {Value: "provided.al2", Name: "CustomAL2"}, {Value: "provided.al2023", Name: "CustomAL2023"}, {Value: "python3.10", Name: "Python3d10"}, {Value: "python3.11", Name: "Python3d11"}, {Value: "python3.12", Name: "Python3d12"}, - {Value: "python3.8", Name: "Python3d8"}, + {Value: "python3.13", Name: "Python3d13"}, {Value: "python3.9", Name: "Python3d9"}, {Value: "ruby3.2", Name: "Ruby3d2"}, + {Value: "ruby3.3", Name: "Ruby3d3"}, deprecateRuntime("dotnet5.0", "Dotnet5d0"), + deprecatedRuntime("dotnet7", "Dotnet7"), deprecateRuntime("dotnetcore2.1", "DotnetCore2d1"), deprecateRuntime("dotnetcore3.1", "DotnetCore3d1"), deprecateRuntime("go1.x", "Go1dx"), @@ -255,6 +257,7 @@ var extraTypes = map[string]schema.ComplexTypeSpec{ deprecateRuntime("python2.7", "Python2d7"), deprecateRuntime("python3.6", "Python3d6"), deprecateRuntime("python3.7", "Python3d7"), + deprecateRuntime("python3.8", "Python3d8"), deprecateRuntime("ruby2.5", "Ruby2d5"), deprecateRuntime("ruby2.7", "Ruby2d7"), }, From 9012c9e98907f7d6cd936f6c6044e38bc9804b6a Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Wed, 4 Dec 2024 12:23:02 +0100 Subject: [PATCH 2/2] Regenerate schema & SDKs --- provider/cmd/pulumi-resource-aws/schema.json | 26 ++++++++++++++----- provider/types.go | 2 +- sdk/dotnet/Lambda/Enums.cs | 9 +++++-- sdk/go/aws/lambda/pulumiEnums.go | 14 +++++++--- .../com/pulumi/aws/lambda/enums/Runtime.java | 17 ++++++++++-- sdk/nodejs/types/enums/lambda/index.ts | 13 ++++++++-- sdk/python/pulumi_aws/lambda_/_enums.py | 7 +++-- 7 files changed, 69 insertions(+), 19 deletions(-) diff --git a/provider/cmd/pulumi-resource-aws/schema.json b/provider/cmd/pulumi-resource-aws/schema.json index 1034875681b..30c53d65fc6 100644 --- a/provider/cmd/pulumi-resource-aws/schema.json +++ b/provider/cmd/pulumi-resource-aws/schema.json @@ -92215,10 +92215,6 @@ "name": "Dotnet6", "value": "dotnet6" }, - { - "name": "Dotnet7", - "value": "dotnet7" - }, { "name": "Dotnet8", "value": "dotnet8" @@ -92247,6 +92243,10 @@ "name": "NodeJS20dX", "value": "nodejs20.x" }, + { + "name": "NodeJS22dX", + "value": "nodejs22.x" + }, { "name": "CustomAL2", "value": "provided.al2" @@ -92268,8 +92268,8 @@ "value": "python3.12" }, { - "name": "Python3d8", - "value": "python3.8" + "name": "Python3d13", + "value": "python3.13" }, { "name": "Python3d9", @@ -92279,11 +92279,20 @@ "name": "Ruby3d2", "value": "ruby3.2" }, + { + "name": "Ruby3d3", + "value": "ruby3.3" + }, { "name": "Dotnet5d0", "value": "dotnet5.0", "deprecationMessage": "This runtime is now deprecated" }, + { + "name": "Dotnet7", + "value": "dotnet7", + "deprecationMessage": "This runtime is now deprecated" + }, { "name": "DotnetCore2d1", "value": "dotnetcore2.1", @@ -92344,6 +92353,11 @@ "value": "python3.7", "deprecationMessage": "This runtime is now deprecated" }, + { + "name": "Python3d8", + "value": "python3.8", + "deprecationMessage": "This runtime is now deprecated" + }, { "name": "Ruby2d5", "value": "ruby2.5", diff --git a/provider/types.go b/provider/types.go index 876d5cacb2d..4d543c405d9 100644 --- a/provider/types.go +++ b/provider/types.go @@ -244,7 +244,7 @@ var extraTypes = map[string]schema.ComplexTypeSpec{ {Value: "ruby3.3", Name: "Ruby3d3"}, deprecateRuntime("dotnet5.0", "Dotnet5d0"), - deprecatedRuntime("dotnet7", "Dotnet7"), + deprecateRuntime("dotnet7", "Dotnet7"), deprecateRuntime("dotnetcore2.1", "DotnetCore2d1"), deprecateRuntime("dotnetcore3.1", "DotnetCore3d1"), deprecateRuntime("go1.x", "Go1dx"), diff --git a/sdk/dotnet/Lambda/Enums.cs b/sdk/dotnet/Lambda/Enums.cs index 97dd6a359f1..6ac6b21a9c9 100644 --- a/sdk/dotnet/Lambda/Enums.cs +++ b/sdk/dotnet/Lambda/Enums.cs @@ -21,7 +21,6 @@ private Runtime(string value) } public static Runtime Dotnet6 { get; } = new Runtime("dotnet6"); - public static Runtime Dotnet7 { get; } = new Runtime("dotnet7"); public static Runtime Dotnet8 { get; } = new Runtime("dotnet8"); public static Runtime Java11 { get; } = new Runtime("java11"); public static Runtime Java17 { get; } = new Runtime("java17"); @@ -29,17 +28,21 @@ private Runtime(string value) public static Runtime Java8AL2 { get; } = new Runtime("java8.al2"); public static Runtime NodeJS18dX { get; } = new Runtime("nodejs18.x"); public static Runtime NodeJS20dX { get; } = new Runtime("nodejs20.x"); + public static Runtime NodeJS22dX { get; } = new Runtime("nodejs22.x"); public static Runtime CustomAL2 { get; } = new Runtime("provided.al2"); public static Runtime CustomAL2023 { get; } = new Runtime("provided.al2023"); public static Runtime Python3d10 { get; } = new Runtime("python3.10"); public static Runtime Python3d11 { get; } = new Runtime("python3.11"); public static Runtime Python3d12 { get; } = new Runtime("python3.12"); - public static Runtime Python3d8 { get; } = new Runtime("python3.8"); + public static Runtime Python3d13 { get; } = new Runtime("python3.13"); public static Runtime Python3d9 { get; } = new Runtime("python3.9"); public static Runtime Ruby3d2 { get; } = new Runtime("ruby3.2"); + public static Runtime Ruby3d3 { get; } = new Runtime("ruby3.3"); [Obsolete(@"This runtime is now deprecated")] public static Runtime Dotnet5d0 { get; } = new Runtime("dotnet5.0"); [Obsolete(@"This runtime is now deprecated")] + public static Runtime Dotnet7 { get; } = new Runtime("dotnet7"); + [Obsolete(@"This runtime is now deprecated")] public static Runtime DotnetCore2d1 { get; } = new Runtime("dotnetcore2.1"); [Obsolete(@"This runtime is now deprecated")] public static Runtime DotnetCore3d1 { get; } = new Runtime("dotnetcore3.1"); @@ -64,6 +67,8 @@ private Runtime(string value) [Obsolete(@"This runtime is now deprecated")] public static Runtime Python3d7 { get; } = new Runtime("python3.7"); [Obsolete(@"This runtime is now deprecated")] + public static Runtime Python3d8 { get; } = new Runtime("python3.8"); + [Obsolete(@"This runtime is now deprecated")] public static Runtime Ruby2d5 { get; } = new Runtime("ruby2.5"); [Obsolete(@"This runtime is now deprecated")] public static Runtime Ruby2d7 { get; } = new Runtime("ruby2.7"); diff --git a/sdk/go/aws/lambda/pulumiEnums.go b/sdk/go/aws/lambda/pulumiEnums.go index e5bdcee41fd..25713d6545a 100644 --- a/sdk/go/aws/lambda/pulumiEnums.go +++ b/sdk/go/aws/lambda/pulumiEnums.go @@ -15,7 +15,6 @@ type Runtime string const ( RuntimeDotnet6 = Runtime("dotnet6") - RuntimeDotnet7 = Runtime("dotnet7") RuntimeDotnet8 = Runtime("dotnet8") RuntimeJava11 = Runtime("java11") RuntimeJava17 = Runtime("java17") @@ -23,17 +22,21 @@ const ( RuntimeJava8AL2 = Runtime("java8.al2") RuntimeNodeJS18dX = Runtime("nodejs18.x") RuntimeNodeJS20dX = Runtime("nodejs20.x") + RuntimeNodeJS22dX = Runtime("nodejs22.x") RuntimeCustomAL2 = Runtime("provided.al2") RuntimeCustomAL2023 = Runtime("provided.al2023") RuntimePython3d10 = Runtime("python3.10") RuntimePython3d11 = Runtime("python3.11") RuntimePython3d12 = Runtime("python3.12") - RuntimePython3d8 = Runtime("python3.8") + RuntimePython3d13 = Runtime("python3.13") RuntimePython3d9 = Runtime("python3.9") RuntimeRuby3d2 = Runtime("ruby3.2") + RuntimeRuby3d3 = Runtime("ruby3.3") // Deprecated: This runtime is now deprecated RuntimeDotnet5d0 = Runtime("dotnet5.0") // Deprecated: This runtime is now deprecated + RuntimeDotnet7 = Runtime("dotnet7") + // Deprecated: This runtime is now deprecated RuntimeDotnetCore2d1 = Runtime("dotnetcore2.1") // Deprecated: This runtime is now deprecated RuntimeDotnetCore3d1 = Runtime("dotnetcore3.1") @@ -58,6 +61,8 @@ const ( // Deprecated: This runtime is now deprecated RuntimePython3d7 = Runtime("python3.7") // Deprecated: This runtime is now deprecated + RuntimePython3d8 = Runtime("python3.8") + // Deprecated: This runtime is now deprecated RuntimeRuby2d5 = Runtime("ruby2.5") // Deprecated: This runtime is now deprecated RuntimeRuby2d7 = Runtime("ruby2.7") @@ -186,7 +191,6 @@ func (o RuntimePtrOutput) ToStringPtrOutputWithContext(ctx context.Context) pulu // A concrete instance of `RuntimeInput` can be one of the following: // // RuntimeDotnet6 -// RuntimeDotnet7 // RuntimeDotnet8 // RuntimeJava11 // RuntimeJava17 @@ -194,14 +198,16 @@ func (o RuntimePtrOutput) ToStringPtrOutputWithContext(ctx context.Context) pulu // RuntimeJava8AL2 // RuntimeNodeJS18dX // RuntimeNodeJS20dX +// RuntimeNodeJS22dX // RuntimeCustomAL2 // RuntimeCustomAL2023 // RuntimePython3d10 // RuntimePython3d11 // RuntimePython3d12 -// RuntimePython3d8 +// RuntimePython3d13 // RuntimePython3d9 // RuntimeRuby3d2 +// RuntimeRuby3d3 type RuntimeInput interface { pulumi.Input diff --git a/sdk/java/src/main/java/com/pulumi/aws/lambda/enums/Runtime.java b/sdk/java/src/main/java/com/pulumi/aws/lambda/enums/Runtime.java index c73541eb360..2aef041385a 100644 --- a/sdk/java/src/main/java/com/pulumi/aws/lambda/enums/Runtime.java +++ b/sdk/java/src/main/java/com/pulumi/aws/lambda/enums/Runtime.java @@ -15,7 +15,6 @@ @EnumType public enum Runtime { Dotnet6("dotnet6"), - Dotnet7("dotnet7"), Dotnet8("dotnet8"), Java11("java11"), Java17("java17"), @@ -23,14 +22,16 @@ public enum Runtime { Java8AL2("java8.al2"), NodeJS18dX("nodejs18.x"), NodeJS20dX("nodejs20.x"), + NodeJS22dX("nodejs22.x"), CustomAL2("provided.al2"), CustomAL2023("provided.al2023"), Python3d10("python3.10"), Python3d11("python3.11"), Python3d12("python3.12"), - Python3d8("python3.8"), + Python3d13("python3.13"), Python3d9("python3.9"), Ruby3d2("ruby3.2"), + Ruby3d3("ruby3.3"), /** * @deprecated * This runtime is now deprecated @@ -42,6 +43,12 @@ public enum Runtime { * This runtime is now deprecated */ @Deprecated /* This runtime is now deprecated */ + Dotnet7("dotnet7"), + /** + * @deprecated + * This runtime is now deprecated + */ + @Deprecated /* This runtime is now deprecated */ DotnetCore2d1("dotnetcore2.1"), /** * @deprecated @@ -114,6 +121,12 @@ public enum Runtime { * This runtime is now deprecated */ @Deprecated /* This runtime is now deprecated */ + Python3d8("python3.8"), + /** + * @deprecated + * This runtime is now deprecated + */ + @Deprecated /* This runtime is now deprecated */ Ruby2d5("ruby2.5"), /** * @deprecated diff --git a/sdk/nodejs/types/enums/lambda/index.ts b/sdk/nodejs/types/enums/lambda/index.ts index 2f0e9f4191a..892c27bc5d9 100644 --- a/sdk/nodejs/types/enums/lambda/index.ts +++ b/sdk/nodejs/types/enums/lambda/index.ts @@ -4,7 +4,6 @@ export const Runtime = { Dotnet6: "dotnet6", - Dotnet7: "dotnet7", Dotnet8: "dotnet8", Java11: "java11", Java17: "java17", @@ -12,18 +11,24 @@ export const Runtime = { Java8AL2: "java8.al2", NodeJS18dX: "nodejs18.x", NodeJS20dX: "nodejs20.x", + NodeJS22dX: "nodejs22.x", CustomAL2: "provided.al2", CustomAL2023: "provided.al2023", Python3d10: "python3.10", Python3d11: "python3.11", Python3d12: "python3.12", - Python3d8: "python3.8", + Python3d13: "python3.13", Python3d9: "python3.9", Ruby3d2: "ruby3.2", + Ruby3d3: "ruby3.3", /** * @deprecated This runtime is now deprecated */ Dotnet5d0: "dotnet5.0", + /** + * @deprecated This runtime is now deprecated + */ + Dotnet7: "dotnet7", /** * @deprecated This runtime is now deprecated */ @@ -72,6 +77,10 @@ export const Runtime = { * @deprecated This runtime is now deprecated */ Python3d7: "python3.7", + /** + * @deprecated This runtime is now deprecated + */ + Python3d8: "python3.8", /** * @deprecated This runtime is now deprecated */ diff --git a/sdk/python/pulumi_aws/lambda_/_enums.py b/sdk/python/pulumi_aws/lambda_/_enums.py index df872ae2f17..f610104178e 100644 --- a/sdk/python/pulumi_aws/lambda_/_enums.py +++ b/sdk/python/pulumi_aws/lambda_/_enums.py @@ -14,7 +14,6 @@ class Runtime(str, Enum): See https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html """ DOTNET6 = "dotnet6" - DOTNET7 = "dotnet7" DOTNET8 = "dotnet8" JAVA11 = "java11" JAVA17 = "java17" @@ -22,15 +21,18 @@ class Runtime(str, Enum): JAVA8_AL2 = "java8.al2" NODE_JS18D_X = "nodejs18.x" NODE_JS20D_X = "nodejs20.x" + NODE_JS22D_X = "nodejs22.x" CUSTOM_AL2 = "provided.al2" CUSTOM_AL2023 = "provided.al2023" PYTHON3D10 = "python3.10" PYTHON3D11 = "python3.11" PYTHON3D12 = "python3.12" - PYTHON3D8 = "python3.8" + PYTHON3D13 = "python3.13" PYTHON3D9 = "python3.9" RUBY3D2 = "ruby3.2" + RUBY3D3 = "ruby3.3" DOTNET5D0 = "dotnet5.0" + DOTNET7 = "dotnet7" DOTNET_CORE2D1 = "dotnetcore2.1" DOTNET_CORE3D1 = "dotnetcore3.1" GO1DX = "go1.x" @@ -43,5 +45,6 @@ class Runtime(str, Enum): PYTHON2D7 = "python2.7" PYTHON3D6 = "python3.6" PYTHON3D7 = "python3.7" + PYTHON3D8 = "python3.8" RUBY2D5 = "ruby2.5" RUBY2D7 = "ruby2.7"