Merge remote-tracking branch 'public/main'

awslabs · Oct 31, 2024 · 94f95b4 · 94f95b4
2 parents 129a1c7 + 084e141
commit 94f95b4
Show file tree

Hide file tree

Showing 22 changed files with 78 additions and 32 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -12,6 +12,14 @@ body:
       description: What is the problem? A clear and concise description of the bug.
     validations:
       required: true
+  - type: checkboxes
+    id: regression
+    attributes:
+      label: Regression Issue
+      description: What is a regression? If it worked in a previous version but doesn't in the latest version, it's considered a regression. In this case, please provide specific version number in the report.
+      options:
+        - label: Select this option if this issue appears to be a regression.
+          required: false
   - type: textarea
     id: expected
     attributes:

diff --git a/.github/workflows/issue-regression-labeler.yml b/.github/workflows/issue-regression-labeler.yml
@@ -0,0 +1,32 @@
+# Apply potential regression label on issues
+name: issue-regression-label
+on:
+  issues:
+    types: [opened, edited]
+jobs:
+  add-regression-label:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+    - name: Fetch template body
+      id: check_regression
+      uses: actions/github-script@v7
+      env: 
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        TEMPLATE_BODY: ${{ github.event.issue.body }}
+      with:
+        script: |
+          const regressionPattern = /\[x\] Select this option if this issue appears to be a regression\./i;
+          const template = `${process.env.TEMPLATE_BODY}`
+          const match = regressionPattern.test(template);
+          core.setOutput('is_regression', match);
+    - name: Manage regression label
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        if [ "${{ steps.check_regression.outputs.is_regression }}" == "true" ]; then
+          gh issue edit ${{ github.event.issue.number }} --add-label "potential-regression" -R ${{ github.repository }}
+        else
+          gh issue edit ${{ github.event.issue.number }} --remove-label "potential-regression" -R ${{ github.repository }}
+        fi
diff --git a/awscrt/eventstream/__init__.py b/awscrt/eventstream/__init__.py
@@ -5,9 +5,8 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0.
 
-from collections.abc import ByteString
 from enum import IntEnum
-from typing import Any
+from typing import Any, Union
 from uuid import UUID
 
 __all__ = ['HeaderType', 'Header']
@@ -135,7 +134,7 @@ def from_int64(cls, name: str, value: int) -> 'Header':
         return cls(name, value, HeaderType.INT64)
 
     @classmethod
-    def from_byte_buf(cls, name: str, value: ByteString) -> 'Header':
+    def from_byte_buf(cls, name: str, value: Union[bytes, bytearray]) -> 'Header':
         """Create a Header of type :attr:`~HeaderType.BYTE_BUF`
 
         The value must be a bytes-like object"""
@@ -246,7 +245,7 @@ def value_as_int64(self) -> int:
         Raises an exception if type is not :attr:`~HeaderType.INT64`"""
         return self._value_as(HeaderType.INT64)
 
-    def value_as_byte_buf(self) -> ByteString:
+    def value_as_byte_buf(self) -> Union[bytes, bytearray]:
         """Return value of bytes
 
         Raises an exception if type is not :attr:`~HeaderType.BYTE_BUF`"""

diff --git a/awscrt/eventstream/rpc.py b/awscrt/eventstream/rpc.py
@@ -11,11 +11,11 @@
 import awscrt.exceptions
 from awscrt.eventstream import Header
 from awscrt.io import ClientBootstrap, SocketOptions, TlsConnectionOptions
-from collections.abc import ByteString, Callable
+from collections.abc import Callable
 from concurrent.futures import Future
 from enum import IntEnum
 from functools import partial
-from typing import Optional, Sequence
+from typing import Optional, Sequence, Union
 
 __all__ = [
     'MessageType',
@@ -381,7 +381,7 @@ def send_protocol_message(
             self,
             *,
             headers: Optional[Sequence[Header]] = None,
-            payload: Optional[ByteString] = None,
+            payload: Optional[Union[bytes, bytearray]] = None,
             message_type: MessageType,
             flags: Optional[int] = None,
             on_flush: Callable = None) -> 'concurrent.futures.Future':
@@ -483,7 +483,7 @@ def activate(
             *,
             operation: str,
             headers: Sequence[Header] = None,
-            payload: ByteString = None,
+            payload: Union[bytes, bytearray] = None,
             message_type: MessageType,
             flags: int = None,
             on_flush: Callable = None):
@@ -553,7 +553,7 @@ def send_message(
             self,
             *,
             headers: Sequence[Header] = None,
-            payload: ByteString = None,
+            payload: Union[bytes, bytearray] = None,
             message_type: MessageType,
             flags: int = None,
             on_flush: Callable = None) -> 'concurrent.futures.Future':

diff --git a/codebuild/cd/manylinux-x64-build.yml b/codebuild/cd/manylinux-x64-build.yml
@@ -8,7 +8,7 @@ phases:
     commands:
       - export CC=gcc
       - cd aws-crt-python
-      - /opt/python/cp37-cp37m/bin/python ./continuous-delivery/update-version.py
+      - /opt/python/cp38-cp38/bin/python ./continuous-delivery/update-version.py
   build:
     commands:
       - echo Build started on `date`

diff --git a/codebuild/cd/manylinux-x86-build.yml b/codebuild/cd/manylinux-x86-build.yml
@@ -8,7 +8,7 @@ phases:
     commands:
       - export CC=gcc
       - cd aws-crt-python
-      - /opt/python/cp37-cp37m/bin/python ./continuous-delivery/update-version.py
+      - /opt/python/cp38-cp38/bin/python ./continuous-delivery/update-version.py
   build:
     commands:
       - echo Build started on `date`

diff --git a/continuous-delivery/sanity-check-test-pypi.bat b/continuous-delivery/sanity-check-test-pypi.bat
@@ -1,8 +1,8 @@
 FOR /F "delims=" %%A in ('git describe --tags') do ( set TAG_VERSION=%%A )
 set CURRENT_VERSION=%TAG_VERSION:v=%
 
-"C:\Program Files\Python37\python.exe" continuous-delivery\pip-install-with-retry.py --no-cache-dir -i https://testpypi.python.org/simple --user awscrt==%CURRENT_VERSION% || goto error
-"C:\Program Files\Python37\python.exe" continuous-delivery\test-pip-install.py || goto error
+"C:\Program Files\Python38\python.exe" continuous-delivery\pip-install-with-retry.py --no-cache-dir -i https://testpypi.python.org/simple --user awscrt==%CURRENT_VERSION% || goto error
+"C:\Program Files\Python38\python.exe" continuous-delivery\test-pip-install.py || goto error
 
 goto :EOF
 

diff --git a/crt/CMakeLists.txt b/crt/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0.
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 
 # This CMakeLists.txt exists so we can build all the C libraries we depend on
 # simultaneously. This is much faster than building dependencies one at a time.
@@ -30,9 +30,9 @@ include(CTest)
 # (On Windows and Apple we use the default OS libraries)
 if(UNIX AND NOT APPLE)
     option(USE_OPENSSL "Set this if you want to use your system's OpenSSL compatible libcrypto" OFF)
+    include(AwsPrebuildDependency)
 
     if(NOT USE_OPENSSL)
-        include(AwsPrebuildDependency)
 
         set(AWSLC_CMAKE_ARGUMENTS
             -DDISABLE_GO=ON  # Build without using Go, we don't want the extra dependency
@@ -54,8 +54,14 @@ if(UNIX AND NOT APPLE)
         )
     endif()
 
-    set(UNSAFE_TREAT_WARNINGS_AS_ERRORS OFF CACHE BOOL "")
-    add_subdirectory(s2n)
+    # prebuild s2n-tls.
+    aws_prebuild_dependency(
+        DEPENDENCY_NAME S2N
+        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/s2n
+        CMAKE_ARGUMENTS
+            -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF
+            -DBUILD_TESTING=OFF
+    )
 endif()
 
 add_subdirectory(aws-c-common)

diff --git a/crt/aws-c-auth b/crt/aws-c-auth
diff --git a/crt/aws-c-cal b/crt/aws-c-cal
diff --git a/crt/aws-c-common b/crt/aws-c-common
diff --git a/crt/aws-c-compression b/crt/aws-c-compression
diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream
diff --git a/crt/aws-c-http b/crt/aws-c-http
diff --git a/crt/aws-c-io b/crt/aws-c-io
diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt
diff --git a/crt/aws-c-s3 b/crt/aws-c-s3
diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils
diff --git a/crt/aws-checksums b/crt/aws-checksums
diff --git a/crt/aws-lc b/crt/aws-lc
diff --git a/crt/s2n b/crt/s2n
diff --git a/test/test_s3.py b/test/test_s3.py
@@ -222,8 +222,9 @@ def test_sanity_secure(self):
         self.assertIsNotNone(s3_client)
 
     def test_sanity_network_interface_names(self):
-        s3_client = s3_client_new(True, self.region, network_interface_names=("eth0", "eth1"))
-        self.assertIsNotNone(s3_client)
+        # This is just a sanity test to ensure that we are passing the parameter correctly.
+        with self.assertRaises(Exception):
+            s3_client_new(True, self.region, network_interface_names=("eth0", "invalid-network-interface"))
 
     def test_wait_shutdown(self):
         s3_client = s3_client_new(False, self.region)
+1 −1		AWSCRTAndroidTestRunner/app/src/main/cpp/CMakeLists.txt
+3 −6		CMakeLists.txt
+15 −20		cmake/AwsCFlags.cmake
+11 −7		cmake/AwsPrebuildDependency.cmake
+2 −1		cmake/AwsSIMD.cmake
+6 −3		cmake/AwsTestHarness.cmake
+1 −1		include/aws/common/array_list.h
+2 −1		include/aws/common/atomics.h
+1 −2		include/aws/common/atomics.inl
+1 −1		include/aws/common/byte_order.h
+2 −1		include/aws/common/clock.h
+9 −4		include/aws/common/condition_variable.h
+2 −1		include/aws/common/encoding.h
+1 −2		include/aws/common/error.h
+1 −1		include/aws/common/linked_list.h
+1 −1		include/aws/common/math.h
+2 −2		include/aws/common/math.inl
+2 −1		include/aws/common/ring_buffer.h
+2 −1		include/aws/common/string.h
+2 −1		include/aws/common/zero.h
+5 −6		tests/memtrace_test.c
+1 −5		CMakeLists.txt
+1 −1		README.md
+2 −2		source/h1_connection.c
+1 −1		source/http.c
+16 −9		CMakeLists.txt
+1 −1		README.md
+5 −0		include/aws/io/socket.h
+13 −54		source/future.c
+10 −1		source/posix/socket.c
+8 −2		source/s2n/s2n_tls_channel_handler.c
+6 −0		source/windows/iocp/socket.c
+24 −0		source/windows/windows_pki_utils.c
+2 −0		tests/CMakeLists.txt
+14 −0		tests/socket_test.c
+36 −0		tests/tls_handler_test.c
+17 −15		CMakeLists.txt
+3 −3		README.md
+3 −0		include/aws/mqtt/mqtt.h
+10 −1		source/mqtt.c
+3 −0		.gitignore
+1 −5		CMakeLists.txt
+1 −1		README.md
+8 −0		include/aws/s3/private/s3_meta_request_impl.h
+1 −0		include/aws/s3/s3.h
+7 −6		include/aws/s3/s3_client.h
+1 −0		source/s3.c
+55 −39		source/s3_client.c
+25 −1		source/s3_copy_object.c
+16 −4		source/s3_meta_request.c
+99 −21		source/s3_request_messages.c
+5 −0		source/s3_util.c
+9 −0		tests/CMakeLists.txt
+15 −0		tests/mock_s3_server/CreateMultipartUpload/request_timeout.json
+153 −244		tests/s3_data_plane_tests.c
+57 −6		tests/s3_mock_server_tests.c
+44 −0		tests/s3_s3express_client_test.c
+261 −1		tests/s3_tester.c
+28 −0		tests/s3_tester.h
+4 −0		tests/test_helper/README.md
+4 −5		tests/test_helper/test_helper.py