Skip to content
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

Jump to bottom

Fix s3 store producer #84

Merged
merged 2 commits into from
Apr 8, 2024
Merged

Fix s3 store producer #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e69e4e
Fix s3 store producer
ruhan1 Apr 7, 2024
7232f2d
Revert default storage as nfs
ruhan1 Apr 8, 2024
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
2 changes: 1 addition & 1 deletion src/main/java/org/commonjava/service/storage/config/StorageServiceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ public interface StorageServiceConfig
String type();

@WithName( "bucket.name" )
@WithDefault( "" )
@WithDefault( "test" )
String bucketName();
}
4 changes: 2 additions & 2 deletions src/main/java/org/commonjava/service/storage/core/FileManagerProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ public PathMappedFileManager getFileManager()

if ( StorageServiceConfig.STORAGE_S3.equals( storageType ) )
{
physicalStore = new FileBasedPhysicalStore( storageConfig.baseDir() );
physicalStore = new S3PhysicalStore( s3Client, storageConfig.bucketName() );
}
else
{
physicalStore = new S3PhysicalStore( s3Client, storageConfig.bucketName() );
physicalStore = new FileBasedPhysicalStore( storageConfig.baseDir() );
}

return new PathMappedFileManager( config, pathDB, physicalStore );
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ storage:
baseDir: "/tmp"
readonly: false
removableFilesystemPattern: ".+:(remote|group):.+"
type: s3
bucket:
name: test
#type: s3
#bucket:
# name: test

"%dev":
quarkus:
Expand Down
Loading