fix: R2 key names in tests (#1115)

conda · Feb 27, 2025 · e56db3a · e56db3a
1 parent 80fa520
commit e56db3a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/python-bindings.yml b/.github/workflows/python-bindings.yml
@@ -46,8 +46,8 @@ jobs:
           pixi run -e test fmt-check
       - name: Run tests
         env:
-          RATTLER_TEST_R2_ACCESS_KEY_ID: ${{ secrets.RATTLER_TEST_R2_ACCESS_KEY_ID }}
-          RATTLER_TEST_R2_SECRET_ACCESS_KEY: ${{ secrets.RATTLER_TEST_R2_SECRET_ACCESS_KEY }}
+          RATTLER_TEST_R2_READWRITE_ACCESS_KEY_ID: ${{ secrets.RATTLER_TEST_R2_READWRITE_ACCESS_KEY_ID }}
+          RATTLER_TEST_R2_READWRITE_SECRET_ACCESS_KEY: ${{ secrets.RATTLER_TEST_R2_READWRITE_SECRET_ACCESS_KEY }}
         run: |
           cd py-rattler
           pixi run -e test test --color=yes
diff --git a/.github/workflows/rust-compile.yml b/.github/workflows/rust-compile.yml
@@ -142,8 +142,8 @@ jobs:
         if: ${{ !matrix.skip-tests }}
         env:
           GOOGLE_CLOUD_TEST_KEY_JSON: ${{ secrets.GOOGLE_CLOUD_TEST_KEY_JSON }}
-          RATTLER_TEST_R2_ACCESS_KEY_ID: ${{ secrets.RATTLER_TEST_R2_ACCESS_KEY_ID }}
-          RATTLER_TEST_R2_SECRET_ACCESS_KEY: ${{ secrets.RATTLER_TEST_R2_SECRET_ACCESS_KEY }}
+          RATTLER_TEST_R2_READONLY_ACCESS_KEY_ID: ${{ secrets.RATTLER_TEST_R2_READONLY_ACCESS_KEY_ID }}
+          RATTLER_TEST_R2_READONLY_SECRET_ACCESS_KEY: ${{ secrets.RATTLER_TEST_R2_READONLY_SECRET_ACCESS_KEY }}
         run: >
           cargo nextest run
           --workspace

diff --git a/crates/rattler_networking/tests/s3_integration_test.rs b/crates/rattler_networking/tests/s3_integration_test.rs
@@ -22,15 +22,15 @@ fn r2_host() -> String {
 
 #[fixture]
 fn r2_credentials() -> Option<(String, String)> {
-    let r2_access_key_id = std::env::var("RATTLER_TEST_R2_ACCESS_KEY_ID").ok();
-    let r2_secret_access_key = std::env::var("RATTLER_TEST_R2_SECRET_ACCESS_KEY").ok();
+    let r2_access_key_id = std::env::var("RATTLER_TEST_R2_READONLY_ACCESS_KEY_ID").ok();
+    let r2_secret_access_key = std::env::var("RATTLER_TEST_R2_READONLY_SECRET_ACCESS_KEY").ok();
     if r2_access_key_id.is_none()
         || r2_access_key_id.clone().unwrap().is_empty()
         || r2_secret_access_key.is_none()
         || r2_secret_access_key.clone().unwrap().is_empty()
     {
         eprintln!(
-            "Skipping test as RATTLER_TEST_R2_ACCESS_KEY_ID or RATTLER_TEST_R2_SECRET_ACCESS_KEY is not set"
+            "Skipping test as RATTLER_TEST_R2_READONLY_ACCESS_KEY_ID or RATTLER_TEST_R2_READONLY_SECRET_ACCESS_KEY is not set"
         );
         None
     } else {

diff --git a/py-rattler/tests/unit/test_index.py b/py-rattler/tests/unit/test_index.py
@@ -75,12 +75,12 @@ class S3Config:
 
 @pytest.fixture()
 def s3_config() -> S3Config:
-    access_key_id = os.environ.get("RATTLER_TEST_R2_ACCESS_KEY_ID")
+    access_key_id = os.environ.get("RATTLER_TEST_R2_READWRITE_ACCESS_KEY_ID")
     if not access_key_id:
-        pytest.skip("RATTLER_TEST_R2_ACCESS_KEY_ID environment variable is not set")
-    secret_access_key = os.environ.get("RATTLER_TEST_R2_SECRET_ACCESS_KEY")
+        pytest.skip("RATTLER_TEST_R2_READWRITE_ACCESS_KEY_ID environment variable is not set")
+    secret_access_key = os.environ.get("RATTLER_TEST_R2_READWRITE_SECRET_ACCESS_KEY")
     if not secret_access_key:
-        pytest.skip("RATTLER_TEST_R2_SECRET_ACCESS_KEY environment variable is not set")
+        pytest.skip("RATTLER_TEST_R2_READWRITE_SECRET_ACCESS_KEY environment variable is not set")
     return S3Config(
         access_key_id=access_key_id,
         secret_access_key=secret_access_key,