fix: linux ci (#286)

Author: kneekey23

.github/workflows/continuous-integration.yml

@@ -20,7 +20,6 @@ env:
   SMITHY_SWIFT_CI_DIR: /Users/runner/work/aws-sdk-swift/aws-sdk-swift/target/build/deps/smithy-swift
 
 jobs:
-  #TODO: add linux compatibility after aws-crt-swift supports Linux appropriately.
   ios-compat:
     runs-on: macos-11
     env:
@@ -72,4 +71,31 @@ jobs:
         run: |
           python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
           chmod a+x builder.pyz
-          GIT_ASKPASS="$(pwd)/.github/scripts/git-ci-askpass.sh" AWS_CRT_SWIFT_CI_DIR="${{ env.AWS_CRT_SWIFT_CI_DIR }}" AWS_SDK_SWIFT_CI_DIR="${{ env.AWS_SDK_SWIFT_CI_DIR }}" SMITHY_SWIFT_CI_DIR="${{ env.SMITHY_SWIFT_CI_DIR }}" ./builder.pyz build -p ${{ env.PACKAGE_NAME }}
+          GIT_ASKPASS="$(pwd)/.github/scripts/git-ci-askpass.sh" AWS_CRT_SWIFT_CI_DIR="${{ env.AWS_CRT_SWIFT_CI_DIR }}" AWS_SDK_SWIFT_CI_DIR="${{ env.AWS_SDK_SWIFT_CI_DIR }}" SMITHY_SWIFT_CI_DIR="${{ env.SMITHY_SWIFT_CI_DIR }}" ./builder.pyz build -p ${{ env.PACKAGE_NAME }}
+  linux-compat:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        image:
+          - aws-crt-swift-5-al2-x64
+    steps:
+      - name: Checkout Sources
+        uses: actions/checkout@v2
+      - name: Build and Test ${{ env.PACKAGE_NAME }}
+        env:
+          CI_USER: ${{ secrets.CI_USER }}
+          CI_ACCESS_TOKEN: ${{ secrets.CI_ACCESS_TOKEN }}
+        run: |
+          echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u awslabs --password-stdin
+          export DOCKER_IMAGE=docker.pkg.github.com/awslabs/aws-crt-builder/${{ matrix.image }}:${{ env.BUILDER_VERSION }}
+          docker pull $DOCKER_IMAGE
+          docker run --mount type=bind,source=$(pwd),target=/root/${{ env.PACKAGE_NAME }} \
+          --env GITHUB_REF \
+          --env GITHUB_HEAD_REF \
+          --env CI_USER \
+          --env CI_ACCESS_TOKEN \
+          --env GIT_ASKPASS="/root/${{ env.PACKAGE_NAME }}/.github/scripts/git-ci-askpass.sh" \
+          --env AWS_CRT_SWIFT_CI_DIR="/root/${{ env.PACKAGE_NAME }}/target/build/deps/aws-crt-swift" \
+          --env AWS_SDK_SWIFT_CI_DIR="/root/${{ env.PACKAGE_NAME }}" \
+          --env SMITHY_SWIFT_CI_DIR="/root/${{ env.PACKAGE_NAME }}/target/build/deps/smithy-swift" \
+          $DOCKER_IMAGE build -p ${{ env.PACKAGE_NAME }} --build-dir=/root/${{ env.PACKAGE_NAME }} --spec=downstream

AWSClientRuntime/Dockerfile

@@ -0,0 +1,20 @@
+FROM swift:5.4-focal
+# TODO: Remove the following 2 lines when repos are public
+ARG GIT_ACCESS_TOKEN
+RUN git config --global url."https://${GIT_ACCESS_TOKEN}@github.com".insteadOf "https://github.com"
+
+WORKDIR /package
+
+COPY . ./
+
+# to test on al2 swift images uncomment this and comment out other line.
+# RUN yum -y install openssl-devel
+RUN apt-get update -qq
+RUN apt-get -y install libssl-dev
+
+RUN swift package clean
+
+RUN swift build
+
+CMD ["swift", "test", "-Xcc", "-g"]
+

AWSClientRuntime/Tests/Protocols/RestJSON/RestJSONErrorTests.swift

@@ -46,7 +46,6 @@ class RestJSONErrorTests: HttpResponseTestBase {
         } else {
             XCTFail("The deserialized error type does not match expected type")
         }
-        print(try? GreetingWithErrorsError(errorType: nil, httpResponse: httpResponse, decoder: decoder, message: nil, requestID: nil))
     }
 
     func testSanitizeErrorName() {

AWSClientRuntime/Tests/UserAgent/UserAgentTests.swift

@@ -25,7 +25,19 @@ class UserAgentTests: XCTestCase {
                                       apiMetadata: apiMeta,
                                       osMetadata: osMeta,
                                       languageMetadata: langMeta)
-        let expected = "aws-sdk-swift/1.2.3 api/test-service/1.2.3 os/macOS/11.4 lang/swift/9.9"
+        var expected: String = ""
+        switch currentOS {
+        case .linux:
+            expected = "aws-sdk-swift/1.2.3 api/test-service/1.2.3 os/linux/11.4 lang/swift/9.9"
+        case .macOS:
+            expected = "aws-sdk-swift/1.2.3 api/test-service/1.2.3 os/macOS/11.4 lang/swift/9.9"
+        case .iOS:
+            expected = "aws-sdk-swift/1.2.3 api/test-service/1.2.3 os/iOS/11.4 lang/swift/9.9"
+        case .unknown:
+            expected = "aws-sdk-swift/1.2.3 api/test-service/1.2.3 os/unknown/11.4 lang/swift/9.9"
+        default:
+            XCTFail("Unexpected OS")
+        }
         XCTAssert(awsUserAgent.xAmzUserAgent == expected, awsUserAgent.xAmzUserAgent)
     }
 }

TestLambdaSdk/Dockerfile

@@ -0,0 +1,11 @@
+FROM swift:5.4.2-amazonlinux2 as builder
+ARG TARGET_NAME
+# TODO: Remove the following 2 lines when repos are public
+ARG GIT_ACCESS_TOKEN
+RUN git config --global url."https://${GIT_ACCESS_TOKEN}@github.com".insteadOf "https://github.com"
+RUN yum -y install git jq tar zip openssl-devel
+WORKDIR /build-lambda
+COPY . ./
+RUN swift package clean
+RUN swift build
+

TestLambdaSdk/Package.swift

@@ -14,7 +14,7 @@ let package = Package(
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
-        .target(
+        .executableTarget(
             name: "TestSdk",
             dependencies: [
                 "S3"

builder.json

@@ -17,15 +17,21 @@
   ],
   "build_dir": "target/build",
   "hosts": {
-    "ubuntu": {
+    "al2": {
       "packages": [
-        "openjdk-8-jdk-headless"
-      ]
+        "java-11-amazon-corretto-headless"
+      ],
+      "env": {
+        "JAVA_HOME": "/usr/lib/jvm/java-11-amazon-corretto.x86_64"
+      }
     },
     "debian": {
       "packages": [
-        "openjdk-8-jdk-headless"
-      ]
+        "openjdk-11-jdk-headless"
+      ],
+      "env": {
+        "JAVA_HOME": "/usr/lib/jvm/openjdk-11-jdk"
+      }
     }
   },
   "upstream": [