-
Notifications
You must be signed in to change notification settings - Fork 376
chore(deps): bump s3mock from 3.11.0 to 4.7.0 #2375
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.
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
pingtimeout
merged 2 commits into
apache:main
from
binarycat0:chore/bump-s3mock-from-3.11.0-to-4.7.0
Aug 19, 2025
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
runtime/test-common/src/main/java/org/apache/polaris/test/commons/s3mock/S3Mock.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.polaris.test.commons.s3mock; | ||
|
|
||
| import com.adobe.testing.s3mock.testcontainers.S3MockContainer; | ||
| import java.util.Map; | ||
| import org.apache.polaris.containerspec.ContainerSpecHelper; | ||
|
|
||
| public class S3Mock extends S3MockContainer { | ||
|
|
||
| private static final String DEFAULT_BUCKETS = "my-bucket,my-old-bucket"; | ||
| private static final String DEFAULT_ACCESS_KEY = "ap1"; | ||
| private static final String DEFAULT_SECRET_KEY = "s3cr3t"; | ||
|
|
||
| public S3Mock() { | ||
| this(DEFAULT_BUCKETS); | ||
| } | ||
|
|
||
| public S3Mock(String initialBuckets) { | ||
| super( | ||
| ContainerSpecHelper.containerSpecHelper("s3mock", S3Mock.class) | ||
| .dockerImageName(null) | ||
| .asCompatibleSubstituteFor("adobe/s3mock")); | ||
| this.withInitialBuckets(initialBuckets); | ||
| } | ||
|
|
||
| public Map<String, String> getS3ConfigProperties() { | ||
| String endpoint = this.getHttpEndpoint(); | ||
| return Map.of( | ||
| "table-default.s3.endpoint", endpoint, | ||
| "table-default.s3.path-style-access", "true", | ||
| "table-default.s3.access-key-id", DEFAULT_ACCESS_KEY, | ||
| "table-default.s3.secret-access-key", DEFAULT_SECRET_KEY, | ||
| "s3.endpoint", endpoint, | ||
| "s3.path-style-access", "true", | ||
| "s3.access-key-id", DEFAULT_ACCESS_KEY, | ||
| "s3.secret-access-key", DEFAULT_SECRET_KEY); | ||
| } | ||
| } | ||
22 changes: 22 additions & 0 deletions
22
...ommon/src/main/resources/org/apache/polaris/test/commons/s3mock/Dockerfile-s3mock-version
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| # | ||
|
|
||
| # Dockerfile to provide the image name and tag to a test. | ||
| # Version is managed by Renovate - do not edit. | ||
| FROM docker.io/adobe/s3mock:4.7.0 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
side note: why not use MinIO now that it is supported? It looks like from the Polaris POV using S3Mock is mostly the same as using any S3-compatible storage. The advantage of MinIO is that it is real (meaning not a mock).
This is just a tangential comment for this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi, thanks for the comment! This is a good observation, looks like an idea for the next PR! The current PR was aimed at fixing the environment to unblock further steps in studying the project.