Add a new CI job to check that smithy-rs compiles on 32bit Linux-based targets

.github/workflows/ci-pr.yml

@@ -5,6 +5,7 @@
 
 name: CI
 on:
+  workflow_dispatch:
   pull_request:
 
 # Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed

.github/workflows/ci.yml

@@ -143,6 +143,73 @@ jobs:
           popd &>/dev/null
         done
 
+  # We make sure that Smithy-rs can be compiled on platforms that are not natively supported by GitHub actions.
+  # We do not run tests on those platforms (yet) because it'd require a more complicated setup involving architecture
+  # emulation via QEMU, likely to cause a significant degradation on CI completion time.
+  test-exotic-platform-support:
+    name: Exotic platform support
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - target: i686-unknown-linux-gnu
+          features: --all-features
+          aws_excludes: ''
+        # We only test `native-tls` here because `rustls` depends on `ring` which in turn does not support powerpc
+        # as a target platform (see https://github.com/briansmith/ring/issues/389)
+        # We also exclude all first-party crates that have a non-optional dependency on `ring`.
+        - target: powerpc-unknown-linux-gnu
+          features: --features native-tls
+          aws_excludes: --exclude aws-inlineable --exclude aws-sigv4 --exclude aws-sig-auth
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+      # Pinned to the commit hash of v1.3.0
+    - uses: Swatinem/rust-cache@842ef286fff290e445b90b4002cc9807c3669641
+      with:
+        sharedKey: ${{ runner.os }}-${{ env.rust_version }}-${{ github.job }}-${{ matrix.target }}
+        target-dir: ./target
+    - uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ env.rust_version }}
+        components: ${{ env.rust_toolchain_components }}
+        profile: minimal
+        override: true
+        target: ${{ matrix.target }}
+    - name: Configure cross
+      shell: bash
+      run: |
+        cat > Cross.toml << EOF
+        [build]
+        pre-build = ["dpkg --add-architecture i386", "apt-get update && apt-get install --assume-yes pkg-config:i386 libssl-dev:i386"]
+        [build.env]
+        passthrough = [
+            "OPENSSL_LIB_DIR",
+            "OPENSSL_INCLUDE_DIR",
+        ]
+        EOF
+    - name: Build rust-runtime crates
+      uses: actions-rs/cargo@v1
+      env:
+        CROSS_CONFIG: Cross.toml
+        OPENSSL_LIB_DIR: /usr/lib/i386-linux-gnu/
+        OPENSSL_INCLUDE_DIR: /usr/include/i386-linux-gnu/openssl/
+      with:
+        use-cross: true
+        command: build
+        args: --target ${{ matrix.target }} --manifest-path "rust-runtime/Cargo.toml" --exclude aws-smithy-http-server-python --workspace ${{ matrix.features }}
+    - name: Build AWS rust-runtime crates
+      uses: actions-rs/cargo@v1
+      env:
+        CROSS_CONFIG: Cross.toml
+        OPENSSL_LIB_DIR: /usr/lib/i386-linux-gnu/
+        OPENSSL_INCLUDE_DIR: /usr/include/i386-linux-gnu/openssl/
+      with:
+        use-cross: true
+        command: build
+        args: --target ${{ matrix.target }} --manifest-path "aws/rust-runtime/Cargo.toml" ${{ matrix.aws_excludes }} --workspace ${{ matrix.features }}
+
   # This job is split out from the rest since it is not required to pass for merge
   check-sdk-examples:
     name: Check SDK Examples
@@ -166,6 +233,7 @@ jobs:
     - test-codegen
     - test-sdk
     - test-rust-windows
+    - test-exotic-platform-support
     # Run this job even if its dependency jobs fail
     if: always()
     runs-on: ubuntu-latest

CHANGELOG.next.toml

@@ -11,6 +11,22 @@
 # meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client | server | all"}
 # author = "rcoh"
 
+[[smithy-rs]]
+message = """
+Replace all usages of `AtomicU64` with `AtomicUsize` to support 32bit targets.
+"""
+references = ["smithy-rs#1811"]
+meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "server"}
+author = "LukeMathWalker"
+
+[[smithy-rs]]
+message = """
+Replace all usages of `AtomicU64` with `AtomicUsize` to support 32bit targets.
+"""
+references = ["smithy-rs#1811"]
+meta = { "breaking" = true, "tada" = false, "bug" = false, "target" = "client"}
+author = "LukeMathWalker"
+
 [[smithy-rs]]
 message = """
 Mark `operation` and `operation_handler` modules as private in the generated server crate.

rust-runtime/aws-smithy-client/src/builder.rs

@@ -135,7 +135,7 @@ impl<M, R> Builder<(), M, R> {
         let with_https = |b: Builder<_, M, R>| b.rustls_connector(connector_settings);
         // If we are compiling this function & rustls is not enabled, then native-tls MUST be enabled
         #[cfg(not(feature = "rustls"))]
-        let with_https = |b: Builder<_, M, R>| b.native_tls_connector();
+        let with_https = |b: Builder<_, M, R>| b.native_tls_connector(connector_settings);
 
         with_https(self)
     }

rust-runtime/aws-smithy-client/src/never.rs

@@ -10,7 +10,7 @@ use http::Uri;
 use aws_smithy_async::future::never::Never;
 
 use std::marker::PhantomData;
-use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 
 use std::task::{Context, Poll};
@@ -27,7 +27,7 @@ use tower::BoxError;
 #[derive(Debug)]
 pub struct NeverService<Req, Resp, Err> {
     _resp: PhantomData<(Req, Resp, Err)>,
-    invocations: Arc<AtomicU64>,
+    invocations: Arc<AtomicUsize>,
 }
 
 impl<Req, Resp, Err> Clone for NeverService<Req, Resp, Err> {
@@ -55,7 +55,7 @@ impl<Req, Resp, Err> NeverService<Req, Resp, Err> {
     }
 
     /// Returns the number of invocations made to this service
-    pub fn num_calls(&self) -> u64 {
+    pub fn num_calls(&self) -> usize {
         self.invocations.load(Ordering::SeqCst)
     }
 }

rust-runtime/aws-smithy-http-server-python/src/socket.rs

@@ -73,6 +73,14 @@ impl PySocket {
 }
 
 #[cfg(test)]
+// `is_listener` on `Socket` is only available on certain platforms.
+// In particular, this fails to compile on MacOS.
+#[cfg(any(
+    target_os = "android",
+    target_os = "freebsd",
+    target_os = "fuchsia",
+    target_os = "linux",
+))]
 mod tests {
     use super::*;
 

rust-runtime/aws-smithy-http-server/examples/pokemon-service/src/lib.rs

@@ -10,7 +10,7 @@
 use std::{
     collections::HashMap,
     convert::TryInto,
-    sync::{atomic::AtomicU64, Arc},
+    sync::{atomic::AtomicUsize, Arc},
 };
 
 use async_stream::stream;
@@ -108,7 +108,7 @@ struct PokemonTranslations {
 #[derive(Debug)]
 pub struct State {
     pokemons_translations: HashMap<String, PokemonTranslations>,
-    call_count: AtomicU64,
+    call_count: AtomicUsize,
 }
 
 impl Default for State {