cleanup

Makefile

@@ -168,7 +168,7 @@ build-all: $(foreach os,$(OS),build/shipperctl.$(os)-amd64.tar.gz) build/sha256s
 build:
 	mkdir -p build
 
-build/shipper-state-metrics.%-amd64: $(PKG) cmd/shipper-state-metrics/* 
+build/shipper-state-metrics.%-amd64: $(PKG) cmd/shipper-state-metrics/*
 	GOOS=$* GOARCH=amd64 go build $(LDFLAGS) -o build/shipper-state-metrics.$*-amd64 cmd/shipper-state-metrics/*.go
 
 build/shipper.%-amd64: $(PKG) cmd/shipper/*

cmd/shipperctl/cmd/backup/backup.go

@@ -18,7 +18,7 @@ var (
 	managementClusterContext string
 	verboseFlag              bool
 
-	BackupCmd = &cobra.Command{
+	Cmd = &cobra.Command{
 		Use:   "backup",
 		Short: "Backup and restore Shipper applications and releases",
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
@@ -49,23 +49,23 @@ func init() {
 	kubeConfigFlagName := "kubeconfig"
 	fileFlagName := "file"
 
-	config.RegisterFlag(BackupCmd.PersistentFlags(), &kubeConfigFile)
-	if err := BackupCmd.MarkPersistentFlagFilename(kubeConfigFlagName, "yaml"); err != nil {
-		BackupCmd.Printf("warning: could not mark %q for filename autocompletion: %s\n", kubeConfigFlagName, err)
+	config.RegisterFlag(Cmd.PersistentFlags(), &kubeConfigFile)
+	if err := Cmd.MarkPersistentFlagFilename(kubeConfigFlagName, "yaml"); err != nil {
+		Cmd.Printf("warning: could not mark %q for filename autocompletion: %s\n", kubeConfigFlagName, err)
 	}
 
-	BackupCmd.PersistentFlags().StringVar(&managementClusterContext, "management-cluster-context", "", "The name of the context to use to communicate with the management cluster. defaults to the current one")
-	BackupCmd.PersistentFlags().BoolVarP(&verboseFlag, "verbose", "v", false, "Prints the list of backup items")
-	BackupCmd.PersistentFlags().StringVar(&outputFormat, "format", "yaml", "Output format. One of: json|yaml")
+	Cmd.PersistentFlags().StringVar(&managementClusterContext, "management-cluster-context", "", "The name of the context to use to communicate with the management cluster. defaults to the current one")
+	Cmd.PersistentFlags().BoolVarP(&verboseFlag, "verbose", "v", false, "Prints the list of backup items")
+	Cmd.PersistentFlags().StringVar(&outputFormat, "format", "yaml", "Output format. One of: json|yaml")
 
-	BackupCmd.PersistentFlags().StringVarP(&backupFile, fileFlagName, "f", "backup.yaml", "The path to a backup file")
-	err := BackupCmd.MarkPersistentFlagFilename(fileFlagName, "yaml")
+	Cmd.PersistentFlags().StringVarP(&backupFile, fileFlagName, "f", "backup.yaml", "The path to a backup file")
+	err := Cmd.MarkPersistentFlagFilename(fileFlagName, "yaml")
 	if err != nil {
-		BackupCmd.Printf("warning: could not mark %q for filename yaml autocompletion: %s\n", fileFlagName, err)
+		Cmd.Printf("warning: could not mark %q for filename yaml autocompletion: %s\n", fileFlagName, err)
 	}
-	err = BackupCmd.MarkPersistentFlagFilename(fileFlagName, "json")
+	err = Cmd.MarkPersistentFlagFilename(fileFlagName, "json")
 	if err != nil {
-		BackupCmd.Printf("warning: could not mark %q for filename json autocompletion: %s\n", fileFlagName, err)
+		Cmd.Printf("warning: could not mark %q for filename json autocompletion: %s\n", fileFlagName, err)
 	}
 }
 

cmd/shipperctl/cmd/backup/prepare.go

@@ -26,7 +26,7 @@ var (
 )
 
 func init() {
-	BackupCmd.AddCommand(prepareBackupCmd)
+	Cmd.AddCommand(prepareBackupCmd)
 }
 
 func runPrepareCommand(cmd *cobra.Command, args []string) error {

cmd/shipperctl/cmd/backup/restore.go

@@ -35,7 +35,7 @@ var (
 )
 
 func init() {
-	BackupCmd.AddCommand(restoreBackupCmd)
+	Cmd.AddCommand(restoreBackupCmd)
 }
 
 func runRestoreCommand(cmd *cobra.Command, args []string) error {

cmd/shipperctl/cmd/chart/app.go

@@ -58,11 +58,11 @@ func renderChartFromApp(cmd *cobra.Command, args []string) error {
 	}
 	var application shipper.Application
 	if appName != "" {
-		applicationP, err := shipperClient.ShipperV1alpha1().Applications(namespace).Get(appName, metav1.GetOptions{})
+		applicationPointer, err := shipperClient.ShipperV1alpha1().Applications(namespace).Get(appName, metav1.GetOptions{})
 		if err != nil {
 			return err
 		}
-		application = *applicationP
+		application = *applicationPointer
 	} else {
 		appYaml, err := ioutil.ReadFile(fileName)
 		if err != nil {

cmd/shipperctl/cmd/clean/decommission.go

@@ -29,7 +29,7 @@ var (
 	kubeConfigFile           string
 	managementClusterContext string
 
-	CleanCmd = &cobra.Command{
+	Cmd = &cobra.Command{
 		Use:   "clean",
 		Short: "clean Shipper objects",
 	}
@@ -52,19 +52,19 @@ type releaseAndFilteredAnnotations struct {
 
 func init() {
 	// Flags common to all commands under `shipperctl clean`
-	config.RegisterFlag(CleanCmd.PersistentFlags(), &kubeConfigFile)
-	if err := CleanCmd.MarkPersistentFlagFilename(kubeConfigFlagName, "yaml"); err != nil {
-		CleanCmd.Printf("warning: could not mark %q for filename autocompletion: %s\n", kubeConfigFlagName, err)
+	config.RegisterFlag(Cmd.PersistentFlags(), &kubeConfigFile)
+	if err := Cmd.MarkPersistentFlagFilename(kubeConfigFlagName, "yaml"); err != nil {
+		Cmd.Printf("warning: could not mark %q for filename autocompletion: %s\n", kubeConfigFlagName, err)
 	}
 
-	CleanCmd.PersistentFlags().BoolVar(&dryrun, "dryrun", false, "If true, only prints the objects that will be modified/deleted")
-	CleanCmd.PersistentFlags().StringVar(&managementClusterContext, "management-cluster-context", "", "The name of the context to use to communicate with the management cluster. defaults to the current one")
-	CleanCmd.PersistentFlags().StringSliceVar(&clusters, decommissionedClustersFlagName, clusters, "List of decommissioned clusters. (Required)")
-	if err := CleanCmd.MarkPersistentFlagRequired(decommissionedClustersFlagName); err != nil {
-		CleanCmd.Printf("warning: could not mark %q as required: %s\n", decommissionedClustersFlagName, err)
+	Cmd.PersistentFlags().BoolVar(&dryrun, "dryrun", false, "If true, only prints the objects that will be modified/deleted")
+	Cmd.PersistentFlags().StringVar(&managementClusterContext, "management-cluster-context", "", "The name of the context to use to communicate with the management cluster. defaults to the current one")
+	Cmd.PersistentFlags().StringSliceVar(&clusters, decommissionedClustersFlagName, clusters, "List of decommissioned clusters. (Required)")
+	if err := Cmd.MarkPersistentFlagRequired(decommissionedClustersFlagName); err != nil {
+		Cmd.Printf("warning: could not mark %q as required: %s\n", decommissionedClustersFlagName, err)
 	}
 
-	CleanCmd.AddCommand(cleanDeadClustersCmd)
+	Cmd.AddCommand(cleanDeadClustersCmd)
 }
 
 func runCleanCommand(cmd *cobra.Command, args []string) error {

cmd/shipperctl/cmd/clusters/clusters.go

@@ -52,7 +52,7 @@ var (
 		RunE:  runJoinClustersCommand,
 	}
 
-	ClustersCmd = &cobra.Command{
+	Cmd = &cobra.Command{
 		Use:   "clusters",
 		Short: "manage Shipper clusters",
 	}
@@ -97,8 +97,8 @@ func init() {
 
 	setupCmd.AddCommand(setupMgmtCmd)
 
-	ClustersCmd.AddCommand(setupCmd)
-	ClustersCmd.AddCommand(joinCmd)
+	Cmd.AddCommand(setupCmd)
+	Cmd.AddCommand(joinCmd)
 }
 
 func runSetupMgmtClusterCommand(cmd *cobra.Command, args []string) error {

cmd/shipperctl/cmd/list/list.go

@@ -29,7 +29,7 @@ var (
 	kubeConfigFile           string
 	managementClusterContext string
 
-	ListCmd = &cobra.Command{
+	Cmd = &cobra.Command{
 		Use:   "list",
 		Short: "lists Shipper releases that are scheduled *only* on given clusters",
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
@@ -64,17 +64,17 @@ type outputRelease struct {
 
 func init() {
 	// Flags common to all commands under `shipperctl count`
-	config.RegisterFlag(ListCmd.PersistentFlags(), &kubeConfigFile)
-	if err := ListCmd.MarkPersistentFlagFilename(kubeConfigFlagName, "yaml"); err != nil {
-		ListCmd.Printf("warning: could not mark %q for filename autocompletion: %s\n", kubeConfigFlagName, err)
+	config.RegisterFlag(Cmd.PersistentFlags(), &kubeConfigFile)
+	if err := Cmd.MarkPersistentFlagFilename(kubeConfigFlagName, "yaml"); err != nil {
+		Cmd.Printf("warning: could not mark %q for filename autocompletion: %s\n", kubeConfigFlagName, err)
 	}
 
-	ListCmd.PersistentFlags().StringVar(&managementClusterContext, "management-cluster-context", "", "The name of the context to use to communicate with the management cluster. defaults to the current one")
-	ListCmd.PersistentFlags().StringSliceVar(&clusters, clustersFlagName, clusters, "List of comma separated clusters to list releases that are scheduled *only* on those clusters. If empty, will list without filtering")
-	ListCmd.PersistentFlags().StringVarP(&printOption, "output", "o", "", "Output format. One of: json|yaml. (Optional) defaults to verbose")
+	Cmd.PersistentFlags().StringVar(&managementClusterContext, "management-cluster-context", "", "The name of the context to use to communicate with the management cluster. defaults to the current one")
+	Cmd.PersistentFlags().StringSliceVar(&clusters, clustersFlagName, clusters, "List of comma separated clusters to list releases that are scheduled *only* on those clusters. If empty, will list without filtering")
+	Cmd.PersistentFlags().StringVarP(&printOption, "output", "o", "", "Output format. One of: json|yaml. (Optional) defaults to verbose")
 
-	ListCmd.AddCommand(countContendersCmd)
-	ListCmd.AddCommand(countReleasesCmd)
+	Cmd.AddCommand(countContendersCmd)
+	Cmd.AddCommand(countReleasesCmd)
 	for _, command := range []*cobra.Command{countContendersCmd, countReleasesCmd} {
 		command.SetOutput(os.Stdout)
 	}

cmd/shipperctl/main.go

@@ -21,10 +21,10 @@ var rootCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(clusters.ClustersCmd)
-	rootCmd.AddCommand(list.ListCmd)
-	rootCmd.AddCommand(clean.CleanCmd)
-	rootCmd.AddCommand(backup.BackupCmd)
+	rootCmd.AddCommand(clusters.Cmd)
+	rootCmd.AddCommand(list.Cmd)
+	rootCmd.AddCommand(clean.Cmd)
+	rootCmd.AddCommand(backup.Cmd)
 	rootCmd.AddCommand(chart.Command)
 }