Additional unit-tests and unit-test adjustment

.builder/actions/aws_crt_java_test.py

@@ -1,22 +1,10 @@
-
 import Builder
 import sys
 import os
 import os.path
-import tempfile
-
 
 class AWSCrtJavaTest(Builder.Action):
 
-    def _write_secret_to_temp_file(self, secret_name):
-        secret_value = self.env.shell.get_secret(secret_name)
-
-        temp_file = tempfile.NamedTemporaryFile()
-        temp_file.write(str.encode(secret_value))
-        temp_file.flush()
-
-        return temp_file
-
     def _run_java_tests(self, *cmd_args):
         if os.path.exists('log.txt'):
             os.remove('log.txt')
@@ -28,39 +16,22 @@ def _run_java_tests(self, *cmd_args):
                 with open('log.txt', 'r') as log:
                     print(log.read())
                 print("----------------------------------")
-
             sys.exit(f"Tests failed")
 
-    def run(self, env):
-        self.env = env
-
+    def start_maven_tests(self, env):
         # tests must run with leak detection turned on
         env.shell.setenv('AWS_CRT_MEMORY_TRACING', '2')
 
-        endpoint = env.shell.get_secret("unit-test/endpoint")
-
-        with self._write_secret_to_temp_file("unit-test/rootca") as root_ca_file, \
-                self._write_secret_to_temp_file("unit-test/certificate") as cert_file, \
-                self._write_secret_to_temp_file("unit-test/privatekey") as key_file, \
-                self._write_secret_to_temp_file("ecc-test/certificate") as ecc_cert_file, \
-                self._write_secret_to_temp_file("ecc-test/privatekey") as ecc_key_file:
-
-            self._run_java_tests(
-                "mvn", "-P", "continuous-integration", "-B", "test",
-                "-DredirectTestOutputToFile=true",
-                "-DreuseForks=false",
-                "-DrerunFailingTestsCount=5",
-                "-Daws.crt.memory.tracing=2",
-                "-Daws.crt.debugnative=true",
-                "-Daws.crt.aws_trace_log_per_test",
-                "-Daws.crt.ci=true",
-                f"-Dendpoint={endpoint}",
-                f"-Drootca={root_ca_file.name}",
-                f"-Dcertificate={cert_file.name}",
-                f"-Dprivatekey={key_file.name}",
-                f"-Decc_certificate={ecc_cert_file.name}",
-                f"-Decc_privatekey={ecc_key_file.name}",
-            )
+        self._run_java_tests(
+            "mvn", "-P", "continuous-integration", "-B", "test",
+            "-DredirectTestOutputToFile=true",
+            "-DreuseForks=false",
+            "-DrerunFailingTestsCount=5",
+            "-Daws.crt.memory.tracing=2",
+            "-Daws.crt.debugnative=true",
+            "-Daws.crt.aws_trace_log_per_test",
+            "-Daws.crt.ci=true",
+        )
 
         # run the ShutdownTest by itself
         env.shell.setenv('AWS_CRT_SHUTDOWN_TESTING', '1')
@@ -79,3 +50,11 @@ def run(self, env):
         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([
+            Builder.SetupCrossCICrtEnvironment(),
+            self.start_maven_tests # Then run the Maven stuff
+            ])

.github/workflows/ci.yml

@@ -7,8 +7,8 @@ on:
       - 'docs'
 
 env:
-  BUILDER_VERSION: v0.9.43
-  BUILDER_SOURCE: releases
+  BUILDER_VERSION: setup_crt_ci_from_action
+  BUILDER_SOURCE: channels
   BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
   PACKAGE_NAME: aws-crt-java
   LINUX_BASE_IMAGE: ubuntu-18-x64

builder.json

@@ -7,7 +7,6 @@
         "mvn -P continuous-integration -B compile"
     ],
     "test_steps": [
-        "crt-ci-prep",
         "aws-crt-java-test"
     ],
     "+imports": [
@@ -36,8 +35,6 @@
     },
     "targets": {
         "linux": {
-            "_comment": "set up SoftHSM2 for PKCS#11 tests (see: ./builder/actions/pkcs11_test_setup.py)",
-            "+pre_build_steps": ["pkcs11-test-setup"],
             "!build_steps": [
                 "mvn -P continuous-integration -B compile"
             ],

codebuild/linux-integration-tests.yml

@@ -1,4 +1,13 @@
 version: 0.2
+
+env:
+  shell: bash
+  variables:
+    BUILDER_VERSION: setup_crt_ci_from_action
+    BUILDER_SOURCE: channels
+    BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
+    PACKAGE_NAME: aws-crt-java
+
 phases:
   install:
     commands:
@@ -9,9 +18,11 @@ phases:
   build:
     commands:
       - echo Build started on `date`
-      - aws s3 cp s3://aws-crt-test-stuff/setup_proxy_test_env.sh /tmp/setup_proxy_test_env.sh
-      - sudo chmod a+xr /tmp/setup_proxy_test_env.sh
-      - $CODEBUILD_SRC_DIR/codebuild/common-linux.sh
+      # Update the submodules
+      - git submodule update --init
+      # Build library and test
+      - python3 -c "from urllib.request import urlretrieve; urlretrieve('$BUILDER_HOST/$BUILDER_SOURCE/$BUILDER_VERSION/builder.pyz?run=$CODEBUILD_BUILD_ID', 'builder.pyz')"
+      - python3 builder.pyz build --project aws-crt-java downstream
   post_build:
     commands:
       - echo Build completed on `date`