Skip to content

Commit 72bddea

Browse files
Jillian InapurapuJillian Inapurapu
authored andcommitted
Fix lint errors correctly
1 parent 9260810 commit 72bddea

File tree

1 file changed

+16
-18
lines changed

1 file changed

+16
-18
lines changed

restapi/user_buckets_lifecycle.go

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,12 @@ func addBucketLifecycle(ctx context.Context, client MinioClient, params bucketAp
197197
noncurrentVersionTransitionStorageClass := strings.ToUpper(params.Body.NoncurrentversionTransitionStorageClass)
198198
opts.NoncurrentVersionTransitionDays = &newerNoncurrentVersionTransitionVersions
199199
opts.NoncurrentVersionTransitionStorageClass = &noncurrentVersionTransitionStorageClass
200-
}
201-
if params.Body.NoncurrentversionTransitionDays > 0 {
200+
} else if params.Body.NoncurrentversionTransitionDays > 0 {
202201
noncurrentVersionTransitionDays := int(params.Body.NoncurrentversionTransitionDays)
203202
noncurrentVersionTransitionStorageClass := strings.ToUpper(params.Body.NoncurrentversionTransitionStorageClass)
204203
opts.NoncurrentVersionTransitionDays = &noncurrentVersionTransitionDays
205204
opts.NoncurrentVersionTransitionStorageClass = &noncurrentVersionTransitionStorageClass
206-
} else {
205+
} else if params.Body.TransitionDays > 0 {
207206
tdays := strconv.Itoa(int(params.Body.TransitionDays))
208207
sclass := strings.ToUpper(params.Body.StorageClass)
209208
opts.TransitionDays = &tdays
@@ -231,11 +230,10 @@ func addBucketLifecycle(ctx context.Context, client MinioClient, params bucketAp
231230
if params.Body.NewerNoncurrentversionExpirationVersions > 0 {
232231
versions := int(params.Body.NewerNoncurrentversionExpirationVersions)
233232
opts.NewerNoncurrentExpirationVersions = &versions
234-
}
235-
if params.Body.NoncurrentversionExpirationDays > 0 {
233+
} else if params.Body.NoncurrentversionExpirationDays > 0 {
236234
days := int(params.Body.NoncurrentversionExpirationDays)
237235
opts.NoncurrentVersionExpirationDays = &days
238-
} else {
236+
} else if params.Body.ExpiryDays > 0 {
239237
days := strconv.Itoa(int(params.Body.ExpiryDays))
240238
opts.ExpiryDays = &days
241239
}
@@ -305,20 +303,20 @@ func editBucketLifecycle(ctx context.Context, client MinioClient, params bucketA
305303
Tags: &params.Body.Tags,
306304
ExpiredObjectDeleteMarker: &params.Body.ExpiredObjectDeleteMarker,
307305
}
308-
if params.Body.NewerNoncurrentversionTransitionVersions > 0 {
309-
newerNoncurrentVersionTransitionVersions := int(params.Body.NewerNoncurrentversionTransitionVersions)
310-
noncurrentVersionTransitionStorageClass := strings.ToUpper(params.Body.NoncurrentversionTransitionStorageClass)
311-
opts.NewerNoncurrentExpirationVersions = &newerNoncurrentVersionTransitionVersions
312-
opts.NoncurrentVersionTransitionStorageClass = &noncurrentVersionTransitionStorageClass
313306

314-
}
315307
if params.Body.NoncurrentversionTransitionDays > 0 {
316308
noncurrentVersionTransitionDays := int(params.Body.NoncurrentversionTransitionDays)
317309
noncurrentVersionTransitionStorageClass := strings.ToUpper(params.Body.NoncurrentversionTransitionStorageClass)
318310
opts.NoncurrentVersionTransitionDays = &noncurrentVersionTransitionDays
319311
opts.NoncurrentVersionTransitionStorageClass = &noncurrentVersionTransitionStorageClass
320312

321-
} else {
313+
} else if params.Body.NewerNoncurrentversionTransitionVersions > 0 {
314+
newerNoncurrentVersionTransitionVersions := int(params.Body.NewerNoncurrentversionTransitionVersions)
315+
noncurrentVersionTransitionStorageClass := strings.ToUpper(params.Body.NoncurrentversionTransitionStorageClass)
316+
opts.NewerNoncurrentExpirationVersions = &newerNoncurrentVersionTransitionVersions
317+
opts.NoncurrentVersionTransitionStorageClass = &noncurrentVersionTransitionStorageClass
318+
319+
} else if params.Body.TransitionDays > 0 {
322320
tdays := strconv.Itoa(int(params.Body.TransitionDays))
323321
sclass := strings.ToUpper(params.Body.StorageClass)
324322
opts.TransitionDays = &tdays
@@ -341,14 +339,14 @@ func editBucketLifecycle(ctx context.Context, client MinioClient, params bucketA
341339
Tags: &params.Body.Tags,
342340
ExpiredObjectDeleteMarker: &params.Body.ExpiredObjectDeleteMarker,
343341
}
344-
if params.Body.NewerNoncurrentversionExpirationVersions > 0 {
345-
versions := int(params.Body.NewerNoncurrentversionExpirationVersions)
346-
opts.NewerNoncurrentExpirationVersions = &versions
347-
}
342+
348343
if params.Body.NoncurrentversionExpirationDays > 0 {
349344
days := int(params.Body.NoncurrentversionExpirationDays)
350345
opts.NoncurrentVersionExpirationDays = &days
351-
} else {
346+
} else if params.Body.NewerNoncurrentversionExpirationVersions > 0 {
347+
versions := int(params.Body.NewerNoncurrentversionExpirationVersions)
348+
opts.NewerNoncurrentExpirationVersions = &versions
349+
} else if params.Body.ExpiryDays > 0 {
352350
days := strconv.Itoa(int(params.Body.ExpiryDays))
353351
opts.ExpiryDays = &days
354352
}

0 commit comments

Comments
 (0)