Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE.TXT
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion lambda/managedeni.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lambda/nodemanager.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions lambda/package/managedeni_pkg.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions lambda/package/nodemanager_pkg.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion lambda/utils.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion templates/ml-endpoint.template
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 1 addition & 5 deletions templates/ml-managedeni.template
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand Down
6 changes: 1 addition & 5 deletions templates/ml-nodemanager.template
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down