cmd/uplink: support --force (like awscli) for rb
Change-Id: If835c6dd08ee95e7c66ba7e4c7451cb3f0f95442
This commit is contained in:
parent
6109fa685d
commit
e2d5b403e6
@ -9,18 +9,25 @@ import (
|
|||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
"storj.io/common/fpath"
|
"storj.io/common/fpath"
|
||||||
|
"storj.io/uplink"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
rbForceFlag *bool
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
addCmd(&cobra.Command{
|
rbCmd := addCmd(&cobra.Command{
|
||||||
Use: "rb sj://BUCKET",
|
Use: "rb sj://BUCKET",
|
||||||
Short: "Remove an empty bucket",
|
Short: "Remove an empty bucket",
|
||||||
RunE: deleteBucket,
|
RunE: deleteBucket,
|
||||||
Args: cobra.ExactArgs(1),
|
Args: cobra.ExactArgs(1),
|
||||||
}, RootCmd)
|
}, RootCmd)
|
||||||
|
rbForceFlag = rbCmd.Flags().Bool("force", false, "if true, empties the bucket of objects first")
|
||||||
|
setBasicFlags(rbCmd.Flags(), "force")
|
||||||
}
|
}
|
||||||
|
|
||||||
func deleteBucket(cmd *cobra.Command, args []string) error {
|
func deleteBucket(cmd *cobra.Command, args []string) (err error) {
|
||||||
ctx, _ := withTelemetry(cmd)
|
ctx, _ := withTelemetry(cmd)
|
||||||
|
|
||||||
if len(args) == 0 {
|
if len(args) == 0 {
|
||||||
@ -40,17 +47,48 @@ func deleteBucket(cmd *cobra.Command, args []string) error {
|
|||||||
return fmt.Errorf("nested buckets not supported, use format sj://bucket/")
|
return fmt.Errorf("nested buckets not supported, use format sj://bucket/")
|
||||||
}
|
}
|
||||||
|
|
||||||
project, err := cfg.getProject(ctx, false)
|
project, err := cfg.getProject(ctx, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return convertError(err, dst)
|
return convertError(err, dst)
|
||||||
}
|
}
|
||||||
defer closeProject(project)
|
defer closeProject(project)
|
||||||
|
|
||||||
|
counter := 0
|
||||||
|
defer func() {
|
||||||
|
// print number of deleted files no mater if we end with error or without
|
||||||
|
if counter > 0 {
|
||||||
|
fmt.Printf("Files (%d) from bucket %s deleted\n", counter, dst.Bucket())
|
||||||
|
}
|
||||||
|
if err == nil {
|
||||||
|
fmt.Printf("Bucket %s deleted\n", dst.Bucket())
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
if *rbForceFlag {
|
||||||
|
objects := project.ListObjects(ctx, dst.Bucket(), &uplink.ListObjectsOptions{
|
||||||
|
Recursive: true,
|
||||||
|
})
|
||||||
|
|
||||||
|
for objects.Next() {
|
||||||
|
object := objects.Item()
|
||||||
|
path := object.Key
|
||||||
|
_, err := project.DeleteObject(ctx, dst.Bucket(), path)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to delete encrypted object, cannot empty bucket: %q", path)
|
||||||
|
}
|
||||||
|
counter++
|
||||||
|
if counter%10 == 0 {
|
||||||
|
fmt.Printf("Files (%d) from bucket %s deleted\n", counter, dst.Bucket())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := objects.Err(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if _, err := project.DeleteBucket(ctx, dst.Bucket()); err != nil {
|
if _, err := project.DeleteBucket(ctx, dst.Bucket()); err != nil {
|
||||||
return convertError(err, dst)
|
return convertError(err, dst)
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("Bucket %s deleted\n", dst.Bucket())
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -100,3 +100,10 @@ compare_files "$SRC_DIR/multisegment-upload-testfile" "$DST_DIR/multisegment-upl
|
|||||||
compare_files "$SRC_DIR/diff-size-segments" "$DST_DIR/diff-size-segments"
|
compare_files "$SRC_DIR/diff-size-segments" "$DST_DIR/diff-size-segments"
|
||||||
compare_files "$SRC_DIR/put-file" "$DST_DIR/put-file"
|
compare_files "$SRC_DIR/put-file" "$DST_DIR/put-file"
|
||||||
compare_files "$SRC_DIR/put-file" "$DST_DIR/put-file-from-cat"
|
compare_files "$SRC_DIR/put-file" "$DST_DIR/put-file-from-cat"
|
||||||
|
|
||||||
|
# test deleting non empty bucket with --force flag
|
||||||
|
uplink mb "sj://$BUCKET/"
|
||||||
|
|
||||||
|
uplink cp "$SRC_DIR/small-upload-testfile" "sj://$BUCKET/" --progress=false
|
||||||
|
|
||||||
|
uplink rb "sj://$BUCKET" --force
|
Loading…
Reference in New Issue
Block a user