From bf147854045f498414a00282442ab5003b387712 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Mon, 4 Mar 2024 17:17:44 +0100 Subject: [PATCH 1/2] Fix invalid PUT signatures for URI-encoded paths We encode the URLs ourselves, and the default option for the aws-sigv4 gem breaks that functionality. --- lib/remote_storage/s3.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/remote_storage/s3.rb b/lib/remote_storage/s3.rb index 4fd910b..0729707 100644 --- a/lib/remote_storage/s3.rb +++ b/lib/remote_storage/s3.rb @@ -15,7 +15,8 @@ module RemoteStorage service: 's3', region: settings.s3["region"], access_key_id: settings.s3["access_key_id"].to_s, - secret_access_key: settings.s3["secret_key_id"].to_s + secret_access_key: settings.s3["secret_key_id"].to_s, + uri_escape_path: false ) end -- 2.25.1 From 6455f24ab00e1e2f625cde520d5ef69f93489c7e Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Tue, 5 Mar 2024 13:43:48 +0100 Subject: [PATCH 2/2] Set up Drone CI, remove Actions configs --- .drone.yml | 16 ++++++++++++++++ .github/workflows/ruby.yml | 33 --------------------------------- 2 files changed, 16 insertions(+), 33 deletions(-) create mode 100644 .drone.yml delete mode 100644 .github/workflows/ruby.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..93e4f33 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,16 @@ +kind: pipeline +name: default + +steps: +- name: specs + image: ruby + environment: + REDIS_HOST: redis + commands: + - cp config.yml.erb.example config.yml.erb + - bundle install --jobs=3 --retry=3 + - bundle exec rake test + +services: + - name: redis + image: redis diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml deleted file mode 100644 index af92abc..0000000 --- a/.github/workflows/ruby.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Tests - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -permissions: - contents: read - -jobs: - test: - runs-on: ubuntu-latest - strategy: - matrix: - ruby-version: ['2.7', '3.0', '3.1'] - redis-version: [6, 7] - steps: - - uses: actions/checkout@v3 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby-version }} - bundler-cache: true # runs 'bundle install' and caches installed gems automatically - - name: Start Redis - uses: supercharge/redis-github-action@1.4.0 - with: - redis-version: ${{ matrix.redis-version }} - - name: Configure - run: cp config.yml.erb.example config.yml.erb - - name: Run tests - run: bundle exec rake test -- 2.25.1