diff --git a/pkg/operator/ceph/object/bucket.go b/pkg/operator/ceph/object/bucket.go index 09143dab2..2efa01ece 100644 --- a/pkg/operator/ceph/object/bucket.go +++ b/pkg/operator/ceph/object/bucket.go @@ -52,20 +52,6 @@ type rgwBucketStats struct { } } -type ObjectBuckets []ObjectBucket - -func (slice ObjectBuckets) Len() int { - return len(slice) -} - -func (slice ObjectBuckets) Less(i, j int) bool { - return slice[i].Name < slice[j].Name -} - -func (slice ObjectBuckets) Swap(i, j int) { - slice[i], slice[j] = slice[j], slice[i] -} - func bucketStatsFromRGW(stats rgwBucketStats) ObjectBucketStats { s := ObjectBucketStats{Size: 0, NumberOfObjects: 0} for _, usage := range stats.Usage { @@ -99,29 +85,6 @@ func GetBucketStats(c *Context, bucketName string) (*ObjectBucketStats, bool, er return &stat, false, nil } -func GetBucketsStats(c *Context) (map[string]ObjectBucketStats, error) { - result, err := runAdminCommand(c, - true, - "bucket", - "stats") - if err != nil { - return nil, errors.Wrap(err, "failed to list buckets") - } - - var rgwStats []rgwBucketStats - if err := json.Unmarshal([]byte(result), &rgwStats); err != nil { - return nil, errors.Wrapf(err, "failed to read buckets stats result=%s", result) - } - - stats := map[string]ObjectBucketStats{} - - for _, rgwStat := range rgwStats { - stats[rgwStat.Bucket] = bucketStatsFromRGW(rgwStat) - } - - return stats, nil -} - func getBucketMetadata(c *Context, bucket string) (*ObjectBucketMetadata, bool, error) { result, err := runAdminCommand(c, false, diff --git a/pkg/operator/ceph/object/s3-handlers.go b/pkg/operator/ceph/object/s3-handlers.go index e335dd2d6..c55e3c4b9 100644 --- a/pkg/operator/ceph/object/s3-handlers.go +++ b/pkg/operator/ceph/object/s3-handlers.go @@ -95,11 +95,6 @@ func NewS3Agent(accessKey, secretKey, endpoint string, debug bool, tlsCert []byt }, nil } -// CreateBucket creates a bucket with the given name -func (s *S3Agent) CreateBucketNoInfoLogging(name string) error { - return s.createBucket(name, false) -} - // CreateBucket creates a bucket with the given name func (s *S3Agent) CreateBucket(name string) error { return s.createBucket(name, true) @@ -135,18 +130,6 @@ func (s *S3Agent) createBucket(name string, infoLogging bool) error { return nil } -// DeleteBucket function deletes given bucket using s3 client -func (s *S3Agent) DeleteBucket(name string) (bool, error) { - _, err := s.Client.DeleteBucket(context.TODO(), &s3.DeleteBucketInput{ - Bucket: &name, - }) - if err != nil { - logger.Errorf("failed to delete bucket. %v", err) - return false, err - } - return true, nil -} - // PutObjectInBucket function puts an object in a bucket using s3 client func (s *S3Agent) PutObjectInBucket(bucketname string, body string, key string, contentType string,