Simplify integration tests for sequential execution

Author: reyhankoyun

.github/workflows/integration-tests.yml

@@ -21,14 +21,14 @@ jobs:
     if: |
       github.event_name != 'pull_request_target' ||
       github.event.pull_request.author_association == 'COLLABORATOR' ||
-      contains(github.event.pull_request.labels.*.name, 'safe to test')
+      contains(github.event.pull_request.labels.*.name, 'safe-to-test')
     
     permissions:
       id-token: write
       contents: read
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || github.sha }}
 
@@ -48,7 +48,7 @@ jobs:
         key: ${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@v5
       with:
         role-to-assume: ${{ secrets.ROLE_ARN }}
         role-session-name: secrets-manager-agent-ci-${{ github.run_id }}

.github/workflows/rust.yml

@@ -48,9 +48,9 @@ jobs:
       - name: Build
         run: cargo build --verbose
       - name: Run tests
-        run: cargo test --verbose --all-features --no-fail-fast
+        run: cargo test --verbose --all-features --no-fail-fast --workspace --exclude integration-tests
       - name: Code Coverage
-        run: cargo llvm-cov --all-features --workspace --codecov --output-path ./codecov.json
+        run: cargo llvm-cov --all-features --workspace --exclude integration-tests --codecov --output-path ./codecov.json
       - name: Publish Code Coverage
         uses: codecov/codecov-action@v5
         with:

Cargo.lock

@@ -13,5 +13,4 @@ aws-config = "1"
 aws-sdk-secretsmanager = "1"
 url = "2"
 derive_builder = "0.20"
-fastrand = "2"
 

integration-tests/Cargo.toml

@@ -5,14 +5,11 @@ use std::env;
 use std::fmt;
 use std::path::PathBuf;
 use std::process::Stdio;
-use std::sync::atomic::{AtomicU16, Ordering};
 use std::time::Duration;
 use tokio::io::{AsyncBufReadExt, BufReader};
 use tokio::process::Command as TokioCommand;
 use url::Url;
 
-static PORT_COUNTER: AtomicU16 = AtomicU16::new(2775);
-
 #[derive(Debug, Clone, Copy)]
 pub enum SecretType {
     Basic,
@@ -81,8 +78,7 @@ pub struct AgentProcess {
 
 impl AgentProcess {
     pub async fn start() -> AgentProcess {
-        let port = PORT_COUNTER.fetch_add(1, Ordering::SeqCst);
-        Self::start_with_config(port, 5).await
+        Self::start_with_config(2775, 5).await
     }
 
     pub async fn start_with_config(port: u16, ttl_seconds: u16) -> AgentProcess {
@@ -196,20 +192,12 @@ impl TestSecrets {
     }
 
     pub async fn setup() -> Self {
-        use std::collections::hash_map::DefaultHasher;
-        use std::hash::{Hash, Hasher};
-
-        let mut hasher = DefaultHasher::new();
-        std::thread::current().id().hash(&mut hasher);
-        std::time::SystemTime::now()
+        let timestamp = std::time::SystemTime::now()
             .duration_since(std::time::UNIX_EPOCH)
             .unwrap()
-            .as_nanos()
-            .hash(&mut hasher);
-        fastrand::u64(..).hash(&mut hasher);
-        let hash = hasher.finish();
+            .as_nanos();
 
-        let test_prefix = format!("aws-sm-agent-test-{}", hash);
+        let test_prefix = format!("aws-sm-agent-test-{}", timestamp);
 
         let config = aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await;
         let client = aws_sdk_secretsmanager::Client::new(&config);