Merge branch 'main' into http-canary

Author: TingDaoK

.builder/actions/aws_crt_java_build.py

@@ -0,0 +1,23 @@
+
+import Builder
+import os
+import argparse
+
+
+class AWSCrtJavaBuild(Builder.Action):
+
+    def run(self, env):
+        if os.getenv("CRT_FIPS") is not None:
+            env.shell.exec("mvn", "-Dmaven.wagon.http.retryHandler.class=standard", "-Dmaven.wagon.http.retryHandler.count=3", "-Dmaven.wagon.http.pool=false", "-P", "continuous-integration", "-B", "compile",
+                           "-Dcmake.crt_fips=ON", check=True)
+        else:
+            env.shell.exec("mvn", "-Dmaven.wagon.http.retryHandler.class=standard", "-Dmaven.wagon.http.retryHandler.count=3", "-Dmaven.wagon.http.pool=false", "-P", "continuous-integration",
+                           "-B", "compile", check=True)
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--classifier')
+        args = parser.parse_known_args(env.args.args)[0]
+        if args.classifier:
+            env.shell.exec("mvn", "-B", "install", "-DskipTests", "-Dshared-lib.skip=true",
+                           "-Dmaven.wagon.http.retryHandler.class=standard","-Dmaven.wagon.http.retryHandler.count=3", "-Dmaven.wagon.http.pool=false",
+                           f"-Dcrt.classifier={args.classifier}", check=True)

.builder/actions/aws_crt_java_test.py

@@ -1,30 +1,75 @@
-
 import Builder
 import sys
 import os
+import os.path
 
 
 class AWSCrtJavaTest(Builder.Action):
 
-    def run(self, env):
+    def _run_java_tests(self, *extra_args):
+        if os.path.exists('log.txt'):
+            os.remove('log.txt')
+
+        profiles = 'continuous-integration'
+        if os.getenv("AWS_GRAALVM_CI") is not None:
+            profiles = 'graalvm-native'
+
+        cmd_args = [
+            "mvn", "-B",
+            "-P", profiles,
+            "-DredirectTestOutputToFile=true",
+            "-DreuseForks=false",
+            "-Daws.crt.memory.tracing=2",
+            "-Daws.crt.debugnative=true",
+            "-Daws.crt.aws_trace_log_per_test",
+            "-Daws.crt.ci=true"
+        ]
+        cmd_args.extend(extra_args)
+        cmd_args.append("test")
+
+        result = self.env.shell.exec(*cmd_args, check=False)
+        if result.returncode:
+            if os.path.exists('log.txt'):
+                print("--- CRT logs from failing test ---")
+                with open('log.txt', 'r') as log:
+                    print(log.read())
+                print("----------------------------------")
+            sys.exit(f"Tests failed")
+
+    def start_maven_tests(self, env):
         # tests must run with leak detection turned on
         env.shell.setenv('AWS_CRT_MEMORY_TRACING', '2')
-        actions = []
 
-        all_test_result = os.system("mvn -P continuous-integration -B test -DredirectTestOutputToFile=true -DreuseForks=false \
-            -DrerunFailingTestsCount=5 -Daws.crt.memory.tracing=2 -Daws.crt.debugnative=true")
+        self._run_java_tests("-DrerunFailingTestsCount=5")
+
+        if os.getenv("AWS_GRAALVM_CI") is None:
+            # not running separate test for GraalVM, because GraalVM needs
+            # rebuild to have separate test to run and rebuild will fail the MQTT tests.
+            # because currently builder will pull the MQTT related cert/private to the
+            # `cmake-build` directory and it will be removed after rebuild :)
+            # also those tests mostly for JVM, which is not very meaning for GraalVM, skip them.
+
+            # run the ShutdownTest by itself
+            env.shell.setenv('AWS_CRT_SHUTDOWN_TESTING', '1')
+            self._run_java_tests("-Dtest=ShutdownTest")
 
-        env.shell.setenv('AWS_CRT_SHUTDOWN_TESTING', '1')
-        shutdown_test_result = os.system("mvn -P continuous-integration -B test -DredirectTestOutputToFile=true -DreuseForks=false \
-            -Daws.crt.memory.tracing=2 -Daws.crt.debugnative=true -Dtest=ShutdownTest")
+            # run the InitTest by itself.  This creates an environment where the test itself is the one that
+            # causes the CRT to be loaded and initialized.
+            self._run_java_tests("-Dtest=InitTest")
 
-        if shutdown_test_result or all_test_result:
-            # Failed
-            actions.append("exit 1")
-        os.system("cat log.txt")
-        python = sys.executable
-        actions.append(
-            [python, 'crt/aws-c-http/integration-testing/http_client_test.py',
-                python, 'integration-testing/java_elasticurl_runner.py'])
+            # postman-echo.com in now requires TLS1.3,
+            # but our Mac implementation doesn't support TLS1.3 yet.
+            # The work has been planned to Dec. 2025 to support TLS1.3,
+            # so disable the test for now. And reenable it afterward
+            # # run the elasticurl integration tests
+            # python = sys.executable
+            # env.shell.exec(python, 'crt/aws-c-http/integration-testing/http_client_test.py',
+            #                python, 'integration-testing/java_elasticurl_runner.py', check=True)
+
+    def run(self, env):
+        self.env = env
 
-        return Builder.Script(actions, name='aws-crt-java-test')
+        return Builder.Script([
+            Builder.SetupCrossCICrtEnvironment(),
+            self.start_maven_tests  # Then run the Maven stuff
+        ])

.builder/actions/crt-ci-prep.py

@@ -1,19 +1,60 @@
 import Builder
+import subprocess
+import socket
 import sys
+import time
 import os
-
+import platform
 
 class LocalhostTest(Builder.Action):
 
+    def start(self, env):
+        python = sys.executable
+        venv_path = os.path.join(env.root_dir,'crt','aws-c-http','tests','mock_server', '.venv')
+
+        result = env.shell.exec(python, '-m', 'venv', venv_path)
+        if result.returncode != 0:
+            print("Could not start a virtual environment. The localhost integration tests will fail.", file=sys.stderr)
+            return
+
+        # Platform-specific
+        if platform.system() == 'Windows':
+            python = os.path.join(venv_path, "Scripts", "python.exe")
+        else:
+            python = os.path.join(venv_path, "bin", "python")
+
+        result = env.shell.exec(python, '-m', 'pip', 'install', 'h11', 'h2', 'trio')
+        if result.returncode != 0:
+            print("Could not install python HTTP dependencies. The localhost integration tests will fail.", file=sys.stderr)
+            return
+
+        server_dir = os.path.join(env.root_dir,'crt','aws-c-http','tests','mock_server')
+
+        p1 = subprocess.Popen([python, "h2tls_mock_server.py"], cwd=server_dir)
+        p2 = subprocess.Popen([python, "h2non_tls_server.py"], cwd=server_dir)
+        p3 = subprocess.Popen([python, "h11mock_server.py"], cwd=server_dir)
+
+        # Wait for servers to be ready
+        ports = [3443, 3280, 8082, 8081]
+        for port in ports:
+            for attempt in range(30):
+                try:
+                    with socket.create_connection(("localhost", port), timeout=1):
+                        print(f"Server on port {port} is ready")
+                        break
+                except (socket.error, ConnectionRefusedError, OSError):
+                    if attempt == 29:
+                        print(f"ERROR: Server on port {port} failed to start", file=sys.stderr)
+                    time.sleep(1)
+
     def run(self, env):
+        self.start(env)
         env.shell.setenv('AWS_CRT_MEMORY_TRACING', '2')
-        actions = []
-        if os.system("mvn -Dtest=Http2ClientLocalHostTest test -DredirectTestOutputToFile=true -DforkCount=0 \
+
+        if os.system("mvn test -DredirectTestOutputToFile=true -DforkCount=0 \
             -Daws.crt.memory.tracing=2 \
             -Daws.crt.debugnative=true \
-            -Daws.crt.log.level=Debug \
+            -Daws.crt.aws_trace_log_per_test \
             -Daws.crt.localhost=true"):
             # Failed
-            actions.append("exit 1")
-
-        return Builder.Script(actions, name='aws-crt-java-test')
+            sys.exit(1)