From 42071d362f844f32227d23cae3a89200eea8906d Mon Sep 17 00:00:00 2001 From: sumanthravipati Date: Tue, 4 Nov 2025 15:25:11 -0800 Subject: [PATCH 1/2] MLE-24915: Python version upgrade to 3.13 changes commit --- README.md | 2 +- templates/ml-endpoint.template | 2 +- templates/ml-managedeni.template | 6 +----- templates/ml-nodemanager.template | 6 +----- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 78543eb..816ba18 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Since AWS is retiring the Classic Load Balancer (CLB) as of August 15, 2022, the ### Python Upgrade for Lambda Functions in the MarkLogic CloudFormation Templates: -The lambda functions in MarkLogic CloudFormation templates used on AWS are now configured to use Python 3.9. AWS has scheduled the end of support for Python 3.6 by July 2022. +The lambda functions in MarkLogic CloudFormation templates used on AWS are now configured to use Python 3.13. AWS has scheduled the end of support for Python 3.9 by December 2025. ### Launch Templates and IMDSv2 support in the MarkLogic CloudFormation Templates: diff --git a/templates/ml-endpoint.template b/templates/ml-endpoint.template index ac4444f..6f09d57 100644 --- a/templates/ml-endpoint.template +++ b/templates/ml-endpoint.template @@ -78,7 +78,7 @@ Resources: S3Key: !Join ['/',[!Ref S3Directory,'endpoint.zip']] Handler: endpoint.handler Role: !GetAtt [EndpointExecRole, Arn] - Runtime: python3.9 + Runtime: python3.13 Timeout: '180' Ec2InterfaceEndpoint: Type: 'Custom::Ec2InterfaceEndpoint' diff --git a/templates/ml-managedeni.template b/templates/ml-managedeni.template index 2ef7e32..7f6c281 100644 --- a/templates/ml-managedeni.template +++ b/templates/ml-managedeni.template @@ -98,7 +98,6 @@ Resources: - 'logs:CreateLogStream' - 'logs:PutLogEvents' Resource: 'arn:aws:logs:*:*:*' - # BUG-60314: Added RuntimeManagementConfig property to point python runtime version to 3.9.v18 ManagedEniFunction: Type: 'AWS::Lambda::Function' DependsOn: ManagedEniExecRole @@ -108,10 +107,7 @@ Resources: S3Key: !Join ['/', [!Ref S3Directory,'managed_eni.zip']] Handler: managedeni.handler Role: !GetAtt [ManagedEniExecRole, Arn] - Runtime: python3.9 - RuntimeManagementConfig: - RuntimeVersionArn: !Join [ "", ['arn:aws:lambda:', !Ref 'AWS::Region', '::runtime:edb5a058bfa782cb9cedc6d534ac8b8c193bc28e9a9879d9f5ebaaf619cd0fc0']] - UpdateRuntimeOn: 'Manual' + Runtime: python3.13 Timeout: '180' ManagedEni: Type: 'Custom::ManagedEni' diff --git a/templates/ml-nodemanager.template b/templates/ml-nodemanager.template index 26c4873..d68357a 100644 --- a/templates/ml-nodemanager.template +++ b/templates/ml-nodemanager.template @@ -66,7 +66,6 @@ Resources: - 'logs:CreateLogStream' - 'logs:PutLogEvents' Resource: 'arn:aws:logs:*:*:*' - # BUG-60314: Added RuntimeManagementConfig property to point python runtime version to 3.9.v18 NodeManagerFunction: Type: 'AWS::Lambda::Function' DependsOn: NodeManagerExecRole @@ -76,10 +75,7 @@ Resources: S3Key: !Join ['/', [!Ref S3Directory,'node_manager.zip']] Handler: nodemanager.handler Role: !GetAtt [NodeManagerExecRole, Arn] - Runtime: python3.9 - RuntimeManagementConfig: - RuntimeVersionArn: !Join [ "", ['arn:aws:lambda:', !Ref 'AWS::Region', '::runtime:edb5a058bfa782cb9cedc6d534ac8b8c193bc28e9a9879d9f5ebaaf619cd0fc0']] - UpdateRuntimeOn: 'Manual' + Runtime: python3.13 Timeout: '180' NodeManagerSnsTopic: Type: "AWS::SNS::Topic" From f271c5532189ef3d7847f3bae2d987a202b162bc Mon Sep 17 00:00:00 2001 From: sumanthravipati Date: Tue, 4 Nov 2025 15:50:34 -0800 Subject: [PATCH 2/2] MLE-24915: Copyright changes commit --- LICENSE.TXT | 2 +- lambda/managedeni.py | 2 +- lambda/nodemanager.py | 2 +- lambda/package/managedeni_pkg.sh | 1 + lambda/package/nodemanager_pkg.sh | 2 ++ lambda/utils.py | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/LICENSE.TXT b/LICENSE.TXT index e12afd2..bcf79b9 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -1,4 +1,4 @@ -Copyright © 2018-2024 MarkLogic Corporation. +Copyright (c) 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/lambda/managedeni.py b/lambda/managedeni.py index c887da4..8037259 100644 --- a/lambda/managedeni.py +++ b/lambda/managedeni.py @@ -1,4 +1,4 @@ -# Copyright 2018-2024 MarkLogic Corporation. All Rights Reserved. +# Copyright (c) 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. import boto3 import logging diff --git a/lambda/nodemanager.py b/lambda/nodemanager.py index 345d946..09a5490 100644 --- a/lambda/nodemanager.py +++ b/lambda/nodemanager.py @@ -1,4 +1,4 @@ -# Copyright 2018-2024 MarkLogic Corporation. All Rights Reserved. +# Copyright (c) 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. import boto3 import botocore diff --git a/lambda/package/managedeni_pkg.sh b/lambda/package/managedeni_pkg.sh index 93d6379..bf42a0c 100755 --- a/lambda/package/managedeni_pkg.sh +++ b/lambda/package/managedeni_pkg.sh @@ -1,4 +1,5 @@ #!/bin/sh +# Copyright (c) 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. [ -e ../managed_eni.zip ] && rm ../managed_eni.zip [ -e ../version.txt ] && rm ../version.txt diff --git a/lambda/package/nodemanager_pkg.sh b/lambda/package/nodemanager_pkg.sh index 44673d6..ac6c0dd 100755 --- a/lambda/package/nodemanager_pkg.sh +++ b/lambda/package/nodemanager_pkg.sh @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (c) 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. + [ -e ../node_manager.zip ] && rm ../node_manager.zip [ -e ../version.txt ] && rm ../version.txt diff --git a/lambda/utils.py b/lambda/utils.py index 6cb6639..a90683e 100644 --- a/lambda/utils.py +++ b/lambda/utils.py @@ -1,4 +1,4 @@ -# Copyright 2018-2024 MarkLogic Corporation. All Rights Reserved. +# Copyright (c) 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. import boto3 import logging