github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-09-14 14:19:02 +00:00
Code Issues Projects Releases Wiki Activity

Add tests for all supported storage classes

Browse Source 
Signed-off-by: ddelange <14880945+ddelange@users.noreply.github.com>
This commit is contained in:
ddelange
2022-04-04 09:55:51 +02:00
parent fb937deabf
commit 966fae5463
2 changed files with 54 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
registry/storage/driver/s3-aws/s3.go
View File

@@ -75,6 +75,18 @@ const listMax = 1000
// noStorageClass defines the value to be used if storage class is not supported by the S3 endpoint
const noStorageClass = "NONE"
// s3StorageClasses lists all compatible (instant retrieval) S3 storage classes
var s3StorageClasses = []string{
noStorageClass,
s3.StorageClassStandard,
s3.StorageClassReducedRedundancy,
s3.StorageClassStandardIa,
s3.StorageClassOnezoneIa,
s3.StorageClassIntelligentTiering,
s3.StorageClassOutposts,
s3.StorageClassGlacierIr,
}
// validRegions maps known s3 region identifiers to region descriptors
var validRegions = map[string]struct{}{}
@@ -310,16 +322,7 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
if !ok {
return nil, fmt.Errorf(
"the storageclass parameter must be one of %v, %v invalid",
[]string{
noStorageClass,
s3.StorageClassStandard,
s3.StorageClassReducedRedundancy,
s3.StorageClassStandardIa,
s3.StorageClassOnezoneIa,
s3.StorageClassIntelligentTiering,
s3.StorageClassOutposts,
s3.StorageClassGlacierIr,
},
s3StorageClasses,
storageClassParam,
)
}
@@ -335,16 +338,7 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
storageClassString != s3.StorageClassGlacierIr {
return nil, fmt.Errorf(
"the storageclass parameter must be one of %v, %v invalid",
[]string{
noStorageClass,
s3.StorageClassStandard,
s3.StorageClassReducedRedundancy,
s3.StorageClassStandardIa,
s3.StorageClassOnezoneIa,
s3.StorageClassIntelligentTiering,
s3.StorageClassOutposts,
s3.StorageClassGlacierIr,
},
s3StorageClasses,
storageClassParam,
)
}