Skip to content

fix: R2 key names #1115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wolfv merged 1 commit into from
Feb 27, 2025
Merged

fix: R2 key names #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/python-bindings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/rust-compile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions crates/rattler_networking/tests/s3_integration_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions py-rattler/tests/unit/test_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down