Skip to content

Fix libcurl download url #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 4, 2022
Merged
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: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ generated.docker-compose.*.yml

tests/integration/resources/init

.idea

node_modules/
*.tsbuildinfo

Expand Down
2 changes: 1 addition & 1 deletion awslambdaric/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ class FramedTelemetryLogSink(object):

def __init__(self, fd):
self.fd = int(fd)
self.frame_type = 0xA55A0001 .to_bytes(4, "big")
self.frame_type = 0xA55A0001.to_bytes(4, "big")

def __enter__(self):
self.file = os.fdopen(self.fd, "wb", 0)
Expand Down
4 changes: 3 additions & 1 deletion deps/versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
AWS_LAMBDA_CPP_RELEASE=0.2.6
CURL_VERSION=7.83.0
CURL_MAJOR_VERSION=7
CURL_MINOR_VERSION=83
CURL_PATCH_VERSION=0
2 changes: 2 additions & 0 deletions scripts/preinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ else
cd deps
. ./versions

CURL_VERSION="${CURL_MAJOR_VERSION}.${CURL_MINOR_VERSION}.${CURL_PATCH_VERSION}"

rm -rf ./curl-$CURL_VERSION
rm -rf ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE

Expand Down
2 changes: 1 addition & 1 deletion scripts/update_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ source versions
rm -f aws-lambda-cpp-*.tar.gz && rm -f curl-*.tar.gz

# Grab Curl
wget -c https://github.com/curl/curl/archive/curl-$CURL_VERSION.tar.gz
wget -c "https://github.com/curl/curl/releases/download/curl-${CURL_MAJOR_VERSION}_${CURL_MINOR_VERSION}_${CURL_PATCH_VERSION}/curl-${CURL_MAJOR_VERSION}.${CURL_MINOR_VERSION}.${CURL_PATCH_VERSION}.tar.gz"

# Grab aws-lambda-cpp
wget -c https://github.com/awslabs/aws-lambda-cpp/archive/v$AWS_LAMBDA_CPP_RELEASE.tar.gz -O - | tar -xz
Expand Down
4 changes: 3 additions & 1 deletion tests/test_bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,9 @@ def test_log_error_empty_stacktrace_line_framed_log_sink(self):
# Just to ensure we are not logging the requestId from error response, just sending in the response
def test_log_error_invokeId_line_framed_log_sink(self):
with NamedTemporaryFile() as temp_file:
with bootstrap.FramedTelemetryLogSink(temp_file.name) as log_sink:
with bootstrap.FramedTelemetryLogSink(
os.open(temp_file.name, os.O_CREAT | os.O_RDWR)
) as log_sink:
err_to_log = bootstrap.make_error(
"Error message",
"ErrorType",
Expand Down