This is an automated email from the ASF dual-hosted git repository. xuanwo pushed a commit to branch planner in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git
commit 3e8872a2190e3e92c9f6eded9ff2405067ba95f6 Author: Xuanwo <[email protected]> AuthorDate: Wed Oct 18 16:14:45 2023 +0800 Migrate Signed-off-by: Xuanwo <[email protected]> --- .../services/fs/{local-fs => local_fs}/action.yml | 0 .github/services/s3/{aws-s3 => aws_s3}/action.yml | 0 .../{aws-s3 => aws_s3_with_assume_role}/action.yml | 9 +++- .../s3/{aws-s3 => aws_s3_with_sse_c}/action.yml | 11 ++++- .../action.yml | 9 +++- .github/workflows/service_test_s3.yml | 50 +--------------------- 6 files changed, 24 insertions(+), 55 deletions(-) diff --git a/.github/services/fs/local-fs/action.yml b/.github/services/fs/local_fs/action.yml similarity index 100% rename from .github/services/fs/local-fs/action.yml rename to .github/services/fs/local_fs/action.yml diff --git a/.github/services/s3/aws-s3/action.yml b/.github/services/s3/aws_s3/action.yml similarity index 100% copy from .github/services/s3/aws-s3/action.yml copy to .github/services/s3/aws_s3/action.yml diff --git a/.github/services/s3/aws-s3/action.yml b/.github/services/s3/aws_s3_with_assume_role/action.yml similarity index 82% copy from .github/services/s3/aws-s3/action.yml copy to .github/services/s3/aws_s3_with_assume_role/action.yml index ce95ec863..db5ee5db7 100644 --- a/.github/services/s3/aws-s3/action.yml +++ b/.github/services/s3/aws_s3_with_assume_role/action.yml @@ -15,8 +15,8 @@ # specific language governing permissions and limitations # under the License. -name: aws_s3 -description: 'Behavior test for AWS S3. This service is sponsored by @datafuse_labs.' +name: aws_s3_with_assume_role +description: 'Behavior test for AWS S3 with assume role. This service is sponsored by @datafuse_labs.' runs: using: "composite" @@ -32,3 +32,8 @@ runs: OPENDAL_S3_ACCESS_KEY_ID: op://services/s3/access_key_id OPENDAL_S3_SECRET_ACCESS_KEY: op://services/s3/secret_access_key OPENDAL_S3_REGION: op://services/s3/region + + - name: Add extra settings + shell: bash + run: + echo "OPENDAL_S3_ENABLE_VIRTUAL_HOST_STYLE=on" >> $GITHUB_ENV diff --git a/.github/services/s3/aws-s3/action.yml b/.github/services/s3/aws_s3_with_sse_c/action.yml similarity index 71% copy from .github/services/s3/aws-s3/action.yml copy to .github/services/s3/aws_s3_with_sse_c/action.yml index ce95ec863..c28416a44 100644 --- a/.github/services/s3/aws-s3/action.yml +++ b/.github/services/s3/aws_s3_with_sse_c/action.yml @@ -15,8 +15,8 @@ # specific language governing permissions and limitations # under the License. -name: aws_s3 -description: 'Behavior test for AWS S3. This service is sponsored by @datafuse_labs.' +name: aws_s3_with_sse_c +description: 'Behavior test for AWS S3 with SSE-C. This service is sponsored by @datafuse_labs.' runs: using: "composite" @@ -32,3 +32,10 @@ runs: OPENDAL_S3_ACCESS_KEY_ID: op://services/s3/access_key_id OPENDAL_S3_SECRET_ACCESS_KEY: op://services/s3/secret_access_key OPENDAL_S3_REGION: op://services/s3/region + + - name: Add extra settings + shell: bash + run: + echo "OPENDAL_S3_SERVER_SIDE_ENCRYPTION_CUSTOMER_ALGORITHM=AES256" >> $GITHUB_ENV + echo "OPENDAL_S3_SERVER_SIDE_ENCRYPTION_CUSTOMER_KEY=MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA=" >> $GITHUB_ENV + echo "OPENDAL_S3_SERVER_SIDE_ENCRYPTION_CUSTOMER_KEY_MD5=zZ5FnqcIqUjVwvWmyog4zw==" >> $GITHUB_ENV diff --git a/.github/services/s3/aws-s3/action.yml b/.github/services/s3/aws_s3_with_virtual_host/action.yml similarity index 82% rename from .github/services/s3/aws-s3/action.yml rename to .github/services/s3/aws_s3_with_virtual_host/action.yml index ce95ec863..3e7e1ebf5 100644 --- a/.github/services/s3/aws-s3/action.yml +++ b/.github/services/s3/aws_s3_with_virtual_host/action.yml @@ -15,8 +15,8 @@ # specific language governing permissions and limitations # under the License. -name: aws_s3 -description: 'Behavior test for AWS S3. This service is sponsored by @datafuse_labs.' +name: aws_s3_with_virtual_host +description: 'Behavior test for AWS S3 with virtual host. This service is sponsored by @datafuse_labs.' runs: using: "composite" @@ -32,3 +32,8 @@ runs: OPENDAL_S3_ACCESS_KEY_ID: op://services/s3/access_key_id OPENDAL_S3_SECRET_ACCESS_KEY: op://services/s3/secret_access_key OPENDAL_S3_REGION: op://services/s3/region + + - name: Add extra settings + shell: bash + run: + echo "OPENDAL_S3_ENABLE_VIRTUAL_HOST_STYLE=on" >> $GITHUB_ENV diff --git a/.github/workflows/service_test_s3.yml b/.github/workflows/service_test_s3.yml index 5cb35faad..0a42c0b7c 100644 --- a/.github/workflows/service_test_s3.yml +++ b/.github/workflows/service_test_s3.yml @@ -39,54 +39,6 @@ concurrency: cancel-in-progress: true jobs: - aws_s3_with_virtual_host: - runs-on: ubuntu-latest - if: github.event_name == 'push' || !github.event.pull_request.head.repo.fork - steps: - - uses: actions/checkout@v4 - - name: Setup Rust toolchain - uses: ./.github/actions/setup - with: - need-nextest: true - - name: Test - shell: bash - working-directory: core - run: cargo nextest run behavior - env: - OPENDAL_TEST: s3 - OPENDAL_S3_ROOT: ${{ secrets.OPENDAL_S3_ROOT }} - OPENDAL_S3_BUCKET: ${{ secrets.OPENDAL_S3_BUCKET }} - OPENDAL_S3_ENDPOINT: ${{ secrets.OPENDAL_S3_ENDPOINT }} - OPENDAL_S3_ACCESS_KEY_ID: ${{ secrets.OPENDAL_S3_ACCESS_KEY_ID }} - OPENDAL_S3_SECRET_ACCESS_KEY: ${{ secrets.OPENDAL_S3_SECRET_ACCESS_KEY }} - OPENDAL_S3_ENABLE_VIRTUAL_HOST_STYLE: on - OPENDAL_S3_REGION: ap-northeast-1 - - aws_s3_with_sse_c: - runs-on: ubuntu-latest - if: github.event_name == 'push' || !github.event.pull_request.head.repo.fork - steps: - - uses: actions/checkout@v4 - - name: Setup Rust toolchain - uses: ./.github/actions/setup - with: - need-nextest: true - - name: Test - shell: bash - working-directory: core - run: cargo nextest run behavior - env: - OPENDAL_TEST: s3 - OPENDAL_S3_ROOT: ${{ secrets.OPENDAL_S3_ROOT }} - OPENDAL_S3_BUCKET: ${{ secrets.OPENDAL_S3_BUCKET }} - OPENDAL_S3_ENDPOINT: ${{ secrets.OPENDAL_S3_ENDPOINT }} - OPENDAL_S3_ACCESS_KEY_ID: ${{ secrets.OPENDAL_S3_ACCESS_KEY_ID }} - OPENDAL_S3_SECRET_ACCESS_KEY: ${{ secrets.OPENDAL_S3_SECRET_ACCESS_KEY }} - OPENDAL_S3_SERVER_SIDE_ENCRYPTION_CUSTOMER_ALGORITHM: AES256 - OPENDAL_S3_SERVER_SIDE_ENCRYPTION_CUSTOMER_KEY: MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA= - OPENDAL_S3_SERVER_SIDE_ENCRYPTION_CUSTOMER_KEY_MD5: zZ5FnqcIqUjVwvWmyog4zw== - OPENDAL_S3_REGION: ap-northeast-1 - aws_s3_with_assume_role: runs-on: ubuntu-latest if: github.event_name == 'push' || !github.event.pull_request.head.repo.fork @@ -237,7 +189,7 @@ jobs: - name: Test shell: bash working-directory: bindings/java - run: ./mvnw test -Dtest="behavior.*Test" + run: ./mvnw test -Dtest="behavior.*Test" env: OPENDAL_TEST: s3 OPENDAL_S3_BUCKET: test
