Cluster backup: add useClusterSecret option to enable backup command (#…

…320) * Cluster backup: add useClusterSecret option to enable backup command (#321) * Update internal/cli/command/cluster/integratedservice/services/backup/enable.go Co-authored-by: Máté Őry <[email protected]> * fix description Co-authored-by: Máté Őry <[email protected]>
banzaicloud · Nov 9, 2020 · 505bebb · 505bebb
1 parent a6026b9
commit 505bebb
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/internal/cli/command/cluster/context/context.go b/internal/cli/command/cluster/context/context.go
@@ -29,11 +29,13 @@ type Context interface {
 	Init(...string) error
 	ClusterID() int32
 	ClusterName() string
+	ClusterCloud() string
 }
 
 type clusterContext struct {
 	id        int32
 	name      string
+	cloud     string
 	banzaiCli cli.Cli
 }
 
@@ -60,6 +62,10 @@ func (c *clusterContext) ClusterName() string {
 	return c.name
 }
 
+func (c *clusterContext) ClusterCloud() string {
+	return c.cloud
+}
+
 // Init completes the cluster context from the options, env vars, and if possible from the user
 func (c *clusterContext) Init(args ...string) error {
 	pipeline := c.banzaiCli.Client()
@@ -84,6 +90,7 @@ func (c *clusterContext) Init(args ...string) error {
 		}
 
 		c.name = cluster.Name
+
 		return nil
 	}
 
@@ -115,6 +122,7 @@ func (c *clusterContext) Init(args ...string) error {
 	for _, cluster := range clusters {
 		if c.name == cluster.Name {
 			c.id = cluster.Id
+			c.cloud = cluster.Cloud
 			return nil
 		}
 	}

diff --git a/internal/cli/command/cluster/integratedservice/services/backup/enable.go b/internal/cli/command/cluster/integratedservice/services/backup/enable.go
@@ -27,7 +27,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/banzaicloud/banzai-cli/internal/cli"
-	clustercontext "github.com/banzaicloud/banzai-cli/internal/cli/command/cluster/context"
+	"github.com/banzaicloud/banzai-cli/internal/cli/command/cluster/context"
 )
 
 const (
@@ -126,7 +126,7 @@ func enableService(banzaiCli cli.Cli, options enableOptions) error {
 
 	var request pipeline.EnableArkRequest
 	if options.filePath == "" && banzaiCli.Interactive() {
-		if request, err = buildEnableRequestInteractively(banzaiCli); err != nil {
+		if request, err = buildEnableRequestInteractively(banzaiCli, options); err != nil {
 			return errors.WrapIf(err, "failed to build enable backup service request interactively")
 		}
 	} else {
@@ -164,7 +164,7 @@ func readEnableReqFromFileOrStdin(filePath string, req *pipeline.EnableArkReques
 	return nil
 }
 
-func buildEnableRequestInteractively(banzaiCli cli.Cli) (pipeline.EnableArkRequest, error) {
+func buildEnableRequestInteractively(banzaiCli cli.Cli, options enableOptions) (pipeline.EnableArkRequest, error) {
 	var scheduleLabel string
 	var ttlLabel string
 
@@ -223,12 +223,29 @@ func buildEnableRequestInteractively(banzaiCli cli.Cli) (pipeline.EnableArkReque
 		return pipeline.EnableArkRequest{}, errors.WrapIf(err, "failed to get bucket")
 	}
 
+	useClusterSecret := false
+	if options.ClusterCloud() == amazonType {
+		err = input.DoQuestions([]input.QuestionMaker{
+			input.QuestionConfirm{
+					QuestionBase: input.QuestionBase{
+						Message: "Deploy cluster secret to give access for Velero to make volume snapshots",
+						Help:    "This option deploys the cloud provider secret used for creating this cluster to the cluster itself. In case you are not deploying cluster secret you must add snapshot permissions to your node instance role."},
+					DefaultValue: false,
+					Output:       &useClusterSecret,
+			},
+		})
+		if err != nil {
+			return pipeline.EnableArkRequest{}, errors.WrapIf(err, "error during getting useClusterSecret option")
+		}
+	}
+
 	return pipeline.EnableArkRequest{
 		Cloud:      bucketInfo.provider,
 		BucketName: bucketInfo.name,
 		Schedule:   selectedSchedule,
 		Ttl:        selectedTTL,
 		SecretId:   bucketInfo.secretID,
+		UseClusterSecret: useClusterSecret,
 	}, nil
 }
 

diff --git a/internal/cli/command/cluster/restore/create.go b/internal/cli/command/cluster/restore/create.go
@@ -38,7 +38,7 @@ func newCreateCommand(banzaiCli cli.Cli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "create",
 		Aliases: []string{"c"},
-		Short:   "Restore backup into a new cluster",
+		Short:   "Restore backup to the cluster",
 		Args:    cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cmd.SilenceUsage = true