make fmt (#156)

1gtm · web-flow · commit ea950f220cb8 · 2022-03-01T13:28:33.000Z
/cherry-pick

Signed-off-by: 1gtm &lt;1gtm@appscode.com&gt;
diff --git a/hack/gendocs/main.go b/hack/gendocs/main.go
@@ -83,7 +83,7 @@ func main() {
 	if err != nil {
 		klog.Fatalln(err)
 	}
-	err = os.MkdirAll(dir, 0755)
+	err = os.MkdirAll(dir, 0o755)
 	if err != nil {
 		klog.Fatalln(err)
 	}
@@ -121,7 +121,7 @@ func main() {
 	}
 
 	index := filepath.Join(dir, "_index.md")
-	f, err := os.OpenFile(index, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+	f, err := os.OpenFile(index, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o644)
 	if err != nil {
 		klog.Fatalln(err)
 	}
diff --git a/pkg/cli.go b/pkg/cli.go
@@ -64,5 +64,5 @@ func (localDirs *cliLocalDirectories) prepareDownloadDir() (err error) {
 			return err
 		}
 	}
-	return os.MkdirAll(localDirs.downloadDir, 0755)
+	return os.MkdirAll(localDirs.downloadDir, 0o755)
 }
diff --git a/pkg/clone.go b/pkg/clone.go
@@ -31,7 +31,6 @@ func NewCmdClone(clientGetter genericclioptions.RESTClientGetter) *cobra.Command
 		Short:             `Clone Kubernetes resources`,
 		DisableAutoGenTag: true,
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-
 			cfg, err := clientGetter.ToRESTConfig()
 			if err != nil {
 				return errors.Wrap(err, "failed to read kubeconfig")
diff --git a/pkg/clone_pvc.go b/pkg/clone_pvc.go
@@ -34,15 +34,13 @@ import (
 	ofst "kmodules.xyz/offshoot-api/api/v1"
 )
 
-var (
-	cloneExample = templates.Examples(`
+var cloneExample = templates.Examples(`
 		# Clone PVC
 		stash clone pvc source-pvc -n demo --to-namespace=demo1 --secret=<secret> --bucket=<bucket> --prefix=<prefix> --provider=<provider>`)
-)
 
 func NewCmdClonePVC() *cobra.Command {
-	var repoOpt = repositoryOption{}
-	var cmd = &cobra.Command{
+	repoOpt := repositoryOption{}
+	cmd := &cobra.Command{
 		Use:               "pvc",
 		Short:             `Clone PVC`,
 		Long:              `Use Backup and Restore process for cloning PVC`,
@@ -198,6 +196,7 @@ func restorePVC(pvcName string, repository kmapi.ObjectReference) error {
 	// delete RestoreSession
 	return stashClient.StashV1beta1().RestoreSessions(dstNamespace).Delete(context.TODO(), restoreSession.Name, metav1.DeleteOptions{})
 }
+
 func ensurePVC(pvc *core.PersistentVolumeClaim) error {
 	klog.Infof("Creating pvc in %s namespace", pvc.Namespace)
 	pvcTemplates := []ofst.PersistentVolumeClaim{
@@ -215,7 +214,6 @@ func ensurePVC(pvc *core.PersistentVolumeClaim) error {
 	}
 	claim := pvcTemplates[0].DeepCopy().ToCorePVC()
 	_, err := kubeClient.CoreV1().PersistentVolumeClaims(dstNamespace).Create(context.TODO(), claim, metav1.CreateOptions{})
-
 	if err != nil {
 		return err
 	}
diff --git a/pkg/copy.go b/pkg/copy.go
@@ -40,7 +40,6 @@ func NewCmdCopy(clientGetter genericclioptions.RESTClientGetter) *cobra.Command
 		Short:             `Copy stash resources from one namespace to another namespace`,
 		DisableAutoGenTag: true,
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-
 			cfg, err := clientGetter.ToRESTConfig()
 			if err != nil {
 				return errors.Wrap(err, "failed to read kubeconfig")
diff --git a/pkg/copy_backupconfiguration.go b/pkg/copy_backupconfiguration.go
@@ -28,13 +28,12 @@ import (
 )
 
 func NewCmdCopyBackupConfiguration() *cobra.Command {
-	var cmd = &cobra.Command{
+	cmd := &cobra.Command{
 		Use:               "backupconfig",
 		Short:             `Copy BackupConfiguration from one namespace to another namespace`,
 		Long:              `Copy BackupConfiguration with respective Repository and Secret if they are not present in the target namespace`,
 		DisableAutoGenTag: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-
 			if len(args) == 0 || args[0] == "" {
 				return fmt.Errorf("BackupConfiguration name is not provided")
 			}
diff --git a/pkg/copy_repository.go b/pkg/copy_repository.go
@@ -26,14 +26,12 @@ import (
 )
 
 func NewCmdCopyRepository() *cobra.Command {
-
-	var cmd = &cobra.Command{
+	cmd := &cobra.Command{
 		Use:               "repository",
 		Short:             `Copy Repository and Secret`,
 		Long:              `Copy Repository and Secret from one namespace to another namespace`,
 		DisableAutoGenTag: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-
 			if len(args) == 0 || args[0] == "" {
 				return fmt.Errorf("Repository name is not provided")
 			}
diff --git a/pkg/copy_secret.go b/pkg/copy_secret.go
@@ -28,13 +28,12 @@ import (
 )
 
 func NewCmdCopySecret() *cobra.Command {
-	var cmd = &cobra.Command{
+	cmd := &cobra.Command{
 		Use:               "secret",
 		Short:             `Copy Secret`,
 		Long:              `Copy Secret from one namespace to another namespace`,
 		DisableAutoGenTag: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-
 			if len(args) == 0 || args[0] == "" {
 				return fmt.Errorf("secret name is not provided")
 			}
diff --git a/pkg/copy_volumesnapshot.go b/pkg/copy_volumesnapshot.go
@@ -31,13 +31,12 @@ import (
 var json = jsoniter.ConfigFastest
 
 func NewCmdCopyVolumeSnapshot() *cobra.Command {
-	var cmd = &cobra.Command{
+	cmd := &cobra.Command{
 		Use:               "volumesnapshot",
 		Short:             `Copy VolumeSnapshot`,
 		Long:              `Copy VolumeSnapshot from one namespace to another namespace`,
 		DisableAutoGenTag: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-
 			if len(args) == 0 || args[0] == "" {
 				return fmt.Errorf("volumeSnapshot name not found")
 			}
diff --git a/pkg/create.go b/pkg/create.go
@@ -25,17 +25,14 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
-var (
-	namespace string
-)
+var namespace string
 
 func NewCmdCreate(clientGetter genericclioptions.RESTClientGetter) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:               "create",
 		Short:             `create stash resources`,
 		DisableAutoGenTag: true,
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-
 			cfg, err := clientGetter.ToRESTConfig()
 			if err != nil {
 				return errors.Wrap(err, "failed to read kubeconfig")
diff --git a/pkg/create_backupconfiguration.go b/pkg/create_backupconfiguration.go
@@ -33,15 +33,13 @@ import (
 	kmapi "kmodules.xyz/client-go/api/v1"
 )
 
-var (
-	createBackupConfigExample = templates.Examples(`
+var createBackupConfigExample = templates.Examples(`
 		# Create a new BackupConfiguration
 		# stash create backupconfig --namespace=<namespace> gcs-repo [Flag]
         # For Restic driver
         stash create backupconfig ss-backup --namespace=demo --repo-name=gcs-repo --schedule="*/4 * * * *" --target-apiversion=apps/v1 --target-kind=StatefulSet --target-name=stash-demo --paths=/source/data --volume-mounts=source-data:/source/data --keep-last=5 --prune=true
         # For VolumeSnapshotter driver
          stash create backupconfig statefulset-volume-snapshot --namespace=demo --driver=VolumeSnapshotter --schedule="*/4 * * * *" --target-apiversion=apps/v1 --target-kind=StatefulSet --target-name=stash-demo --replica=1 --volumesnpashotclass=default-snapshot-class --keep-last=5 --prune=true`)
-)
 
 type backupConfigOption struct {
 	paths        []string
@@ -58,8 +56,8 @@ type backupConfigOption struct {
 }
 
 func NewCmdCreateBackupConfiguration() *cobra.Command {
-	var backupConfigOpt = backupConfigOption{}
-	var cmd = &cobra.Command{
+	backupConfigOpt := backupConfigOption{}
+	cmd := &cobra.Command{
 		Use:               "backupconfig",
 		Short:             `Create a new BackupConfiguration`,
 		Long:              `Create a new BackupConfiguration to backup a target`,
@@ -82,7 +80,6 @@ func NewCmdCreateBackupConfiguration() *cobra.Command {
 			}
 			klog.Infof("BackupConfiguration %s/%s has been created successfully.", backupConfig.Namespace, backupConfig.Name)
 			return err
-
 		},
 	}
 
@@ -113,7 +110,6 @@ func NewCmdCreateBackupConfiguration() *cobra.Command {
 }
 
 func (opt backupConfigOption) newBackupConfiguration(name string, namespace string) (*v1beta1.BackupConfiguration, error) {
-
 	backupConfig := &v1beta1.BackupConfiguration{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
@@ -130,7 +126,8 @@ func (opt backupConfigOption) newBackupConfiguration(name string, namespace stri
 	} else {
 		backupConfig.Spec.Repository = kmapi.ObjectReference{
 			Name:      opt.repository.Name,
-			Namespace: opt.repository.Namespace}
+			Namespace: opt.repository.Namespace,
+		}
 		backupConfig.Spec.Task = v1beta1.TaskRef{Name: opt.task}
 	}
 
@@ -156,7 +153,6 @@ func createBackupConfiguration(backupConfig *v1beta1.BackupConfiguration, meta m
 }
 
 func (opt backupConfigOption) setBackupTarget(backupConfig *v1beta1.BackupConfiguration) error {
-
 	if v1beta1.Snapshotter(opt.driver) == v1beta1.VolumeSnapshotter {
 		backupConfig.Spec.Target = &v1beta1.BackupTarget{
 			Ref:                     opt.targetRef,
diff --git a/pkg/create_repository.go b/pkg/create_repository.go
@@ -30,12 +30,10 @@ import (
 	storage "kmodules.xyz/objectstore-api/api/v1"
 )
 
-var (
-	createRepositoryExample = templates.Examples(`
+var createRepositoryExample = templates.Examples(`
 		# Create a new repository
 		stash create repository --namespace=<namespace> <repository-name> [Flag]
         stash create repository gcs-repo --namespace=demo --secret=gcs-secret --bucket=appscode-qa --prefix=/source/data --provider=gcs`)
-)
 
 type repositoryOption struct {
 	provider       string
@@ -47,8 +45,8 @@ type repositoryOption struct {
 }
 
 func NewCmdCreateRepository() *cobra.Command {
-	var repoOpt = repositoryOption{}
-	var cmd = &cobra.Command{
+	repoOpt := repositoryOption{}
+	cmd := &cobra.Command{
 		Use:               "repository",
 		Short:             `Create a new repository`,
 		Long:              "Create a new Repository using Backend Credential",
@@ -69,7 +67,6 @@ func NewCmdCreateRepository() *cobra.Command {
 			}
 			klog.Infof("Repository %s/%s has been created successfully.", repository.Namespace, repository.Name)
 			return err
-
 		},
 	}
 	cmd.Flags().StringVar(&repoOpt.provider, "provider", repoOpt.provider, "Backend provider (i.e. gcs, s3, azure etc)")
diff --git a/pkg/create_restoresession.go b/pkg/create_restoresession.go
@@ -35,15 +35,13 @@ import (
 	ofst "kmodules.xyz/offshoot-api/api/v1"
 )
 
-var (
-	createRestoreSessionExample = templates.Examples(`
+var createRestoreSessionExample = templates.Examples(`
 		# Create a RestoreSession
 		# stash create restore --namespace=demo <restore session name> [Flag]
         # For Restic driver
          stash create restoresession ss-restore --namespace=demo --repo-name=gcs-repo --target-apiversion=apps/v1 --target-kind=StatefulSet --target-name=stash-recovered --paths=/source/data --volume-mounts=source-data:/source/data
         # For VolumeSnapshotter driver
          stash create restoresession restore-pvc --namespace=demo --driver=VolumeSnapshotter --replica=3 --claim.name=restore-data-restore-demo-${POD_ORDINAL} --claim.access-modes=ReadWriteOnce --claim.storageclass=standard --claim.size=1Gi --claim.datasource=source-data-stash-demo-0-1567146010`)
-)
 
 type restoreSessionOption struct {
 	volumeMounts []string
@@ -67,8 +65,8 @@ type volumeclaimTemplate struct {
 }
 
 func NewCmdCreateRestoreSession() *cobra.Command {
-	var restoreSessionOpt = restoreSessionOption{}
-	var cmd = &cobra.Command{
+	restoreSessionOpt := restoreSessionOption{}
+	cmd := &cobra.Command{
 		Use:               "restoresession",
 		Short:             `Create a new RestoreSession`,
 		Long:              `Create a new RestoreSession to restore backed up data`,
@@ -92,7 +90,6 @@ func NewCmdCreateRestoreSession() *cobra.Command {
 			}
 			klog.Infof("RestoreSession %s/%s has been created successfully.", restoreSession.Namespace, restoreSession.Name)
 			return err
-
 		},
 	}
 
@@ -134,7 +131,8 @@ func (opt restoreSessionOption) newRestoreSession(name string, namespace string)
 		restoreSession.Spec = v1beta1.RestoreSessionSpec{
 			Repository: kmapi.ObjectReference{
 				Name:      opt.repository.Name,
-				Namespace: opt.repository.Namespace},
+				Namespace: opt.repository.Namespace,
+			},
 		}
 		restoreSession.Spec.Task = v1beta1.TaskRef{Name: opt.task}
 	}
@@ -180,7 +178,6 @@ func (opt restoreSessionOption) setRestoreTarget(restoreSession *v1beta1.Restore
 			restoreSession.Spec.Target = &v1beta1.RestoreTarget{
 				Ref: opt.targetRef,
 			}
-
 		}
 
 		if len(opt.volumeMounts) > 0 {
diff --git a/pkg/delete_snapshot.go b/pkg/delete_snapshot.go
@@ -38,18 +38,14 @@ import (
 	"k8s.io/kubectl/pkg/util/templates"
 )
 
-var (
-	deleteExample = templates.Examples(`
+var deleteExample = templates.Examples(`
 		# Delete Snapshot
 		stash delete snapshot gcs-repo-c063d146 -n demo`)
-)
 
 func NewCmdDeleteSnapshot(clientGetter genericclioptions.RESTClientGetter) *cobra.Command {
-	var (
-		localDirs = &cliLocalDirectories{}
-	)
+	localDirs := &cliLocalDirectories{}
 
-	var cmd = &cobra.Command{
+	cmd := &cobra.Command{
 		Use:               "snapshot",
 		Short:             `Delete a snapshot from repository backend`,
 		Long:              `Delete a snapshot from repository backend`,
@@ -99,7 +95,7 @@ func NewCmdDeleteSnapshot(clientGetter genericclioptions.RESTClientGetter) *cobr
 				return err
 			}
 
-			if err = os.MkdirAll(ScratchDir, 0755); err != nil {
+			if err = os.MkdirAll(ScratchDir, 0o755); err != nil {
 				return err
 			}
 			defer os.RemoveAll(ScratchDir)
diff --git a/pkg/download.go b/pkg/download.go
@@ -44,7 +44,7 @@ func NewCmdDownloadRepository(clientGetter genericclioptions.RESTClientGetter) *
 			Destination: DestinationDir,
 		}
 	)
-	var cmd = &cobra.Command{
+	cmd := &cobra.Command{
 		Use:               "download",
 		Short:             `Download snapshots`,
 		Long:              `Download contents of snapshots from Repository`,
@@ -92,7 +92,7 @@ func NewCmdDownloadRepository(clientGetter genericclioptions.RESTClientGetter) *
 				return err
 			}
 
-			if err = os.MkdirAll(ScratchDir, 0755); err != nil {
+			if err = os.MkdirAll(ScratchDir, 0o755); err != nil {
 				return err
 			}
 			defer os.RemoveAll(ScratchDir)
diff --git a/pkg/pause.go b/pkg/pause.go
@@ -30,7 +30,6 @@ func NewCmdPause(clientGetter genericclioptions.RESTClientGetter) *cobra.Command
 		Short:             `Pause Stash backup temporarily`,
 		DisableAutoGenTag: true,
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-
 			cfg, err := clientGetter.ToRESTConfig()
 			if err != nil {
 				return errors.Wrap(err, "failed to read kubeconfig")
diff --git a/pkg/pause_backup.go b/pkg/pause_backup.go
@@ -29,15 +29,13 @@ import (
 	"k8s.io/kubectl/pkg/util/templates"
 )
 
-var (
-	pauseBackupExample = templates.Examples(`
+var pauseBackupExample = templates.Examples(`
 		# Pause a BackupConfigration
 		stash pause backup --namespace=<namespace> --backupconfig=<backup-configuration-name>
         stash pause backup --backup-config=sample-mongodb -n demo`)
-)
 
 func NewCmdPauseBackup() *cobra.Command {
-	var cmd = &cobra.Command{
+	cmd := &cobra.Command{
 		Use:               "backup",
 		Short:             `Pause backup`,
 		Long:              `Pause backup by setting "paused" field of BackupConfiguration/BackupBatch to "true"`,
diff --git a/pkg/resume.go b/pkg/resume.go
@@ -30,7 +30,6 @@ func NewCmdResume(clientGetter genericclioptions.RESTClientGetter) *cobra.Comman
 		Short:             `Resume stash resources`,
 		DisableAutoGenTag: true,
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-
 			cfg, err := clientGetter.ToRESTConfig()
 			if err != nil {
 				return errors.Wrap(err, "failed to read kubeconfig")
diff --git a/pkg/resume_backup.go b/pkg/resume_backup.go
diff --git a/pkg/root.go b/pkg/root.go
diff --git a/pkg/trigger.go b/pkg/trigger.go
diff --git a/pkg/unlock.go b/pkg/unlock.go

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func main() {`
`83`	`83`	`if err != nil {`
`84`	`84`	`klog.Fatalln(err)`
`85`	`85`	`}`
`86`		`- err = os.MkdirAll(dir, 0755)`
	`86`	`+ err = os.MkdirAll(dir, 0o755)`
`87`	`87`	`if err != nil {`
`88`	`88`	`klog.Fatalln(err)`
`89`	`89`	`}`
`@@ -121,7 +121,7 @@ func main() {`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`index := filepath.Join(dir, "_index.md")`
`124`		`- f, err := os.OpenFile(index, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, 0644)`
	`124`	`+ f, err := os.OpenFile(index, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, 0o644)`
`125`	`125`	`if err != nil {`
`126`	`126`	`klog.Fatalln(err)`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,5 +64,5 @@ func (localDirs *cliLocalDirectories) prepareDownloadDir() (err error) {`
`64`	`64`	`return err`
`65`	`65`	`}`
`66`	`66`	`}`
`67`		`- return os.MkdirAll(localDirs.downloadDir, 0755)`
	`67`	`+ return os.MkdirAll(localDirs.downloadDir, 0o755)`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,12 @@ import (`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`func NewCmdCopyBackupConfiguration() *cobra.Command {`
`31`		`- var cmd = &cobra.Command{`
	`31`	`+ cmd := &cobra.Command{`
`32`	`32`	`Use: "backupconfig",`
`33`	`33`	Short: `Copy BackupConfiguration from one namespace to another namespace`,
`34`	`34`	Long: `Copy BackupConfiguration with respective Repository and Secret if they are not present in the target namespace`,
`35`	`35`	`DisableAutoGenTag: true,`
`36`	`36`	`RunE: func(cmd *cobra.Command, args []string) error {`
`37`		`-`
`38`	`37`	`if len(args) == 0 \|\| args[0] == "" {`
`39`	`38`	`return fmt.Errorf("BackupConfiguration name is not provided")`
`40`	`39`	`}`