Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions models/make_bucket_request.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions restapi/embedded_spec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions restapi/user_buckets.go
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,16 @@ func getMakeBucketResponse(session *models.Principal, br *models.MakeBucketReque
return prepareError(err)
}

// make sure to delete bucket if an error occurs after bucket was created
defer func() {
if err != nil {
log.Println("error creating bucket:", err)
if err := removeBucket(minioClient, *br.Name); err != nil {
log.Println("error removing bucket:", err)
}
}
}()

// if it has support for
if br.Quota != nil && br.Quota.Enabled != nil && *br.Quota.Enabled {
mAdmin, err := newMAdminClient(session)
Expand All @@ -337,6 +347,14 @@ func getMakeBucketResponse(session *models.Principal, br *models.MakeBucketReque
log.Println("error versioning bucket:", err)
}
}

// Set Bucket Retention Configuration if defined
if br.Retention != nil {
err = setBucketRetentionConfig(ctx, minioClient, *br.Name, br.Retention.Mode, br.Retention.Unit, br.Retention.Validity)
if err != nil {
return prepareError(err)
}
}
return nil
}

Expand Down
3 changes: 3 additions & 0 deletions swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2083,6 +2083,9 @@ definitions:
type: boolean
quota:
$ref: "#/definitions/setBucketQuota"
retention:
$ref: "#/definitions/putBucketRetentionRequest"

error:
type: object
required:
Expand Down