format everything with gofmt -s -w .

Author: Michal Tichák

apricot/cacheproxy/service.go

@@ -127,7 +127,7 @@ func (s Service) GetDetectorsForHosts(hosts []string) ([]string, error) {
 		detectors[det] = struct{}{}
 	}
 	detList := make([]string, 0, len(detectors))
-	for det, _ := range detectors {
+	for det := range detectors {
 		detList = append(detList, det)
 	}
 	return detList, nil

apricot/local/service.go

@@ -385,7 +385,7 @@ func (s *Service) GetDetectorsForHosts(hosts []string) ([]string, error) {
 
 	detectorSlice := make([]string, len(detectorMap))
 	i := 0
-	for k, _ := range detectorMap {
+	for k := range detectorMap {
 		detectorSlice[i] = k
 		i++
 	}
@@ -548,7 +548,7 @@ func (s *Service) ListComponents() (components []string, err error) {
 	}
 	components = make([]string, len(componentSet))
 	i := 0
-	for component, _ := range componentSet {
+	for component := range componentSet {
 		components[i] = component
 		i++
 	}

apricot/local/servicehttp.go

@@ -297,7 +297,7 @@ func (httpsvc *HttpService) ApiListComponentEntries(w http.ResponseWriter, r *ht
 	filteredEntries := make([]string, 0)
 	if hasRuntype { // if there's any filtering to do
 		for _, entry := range entries {
-			for filterPrefix, _ := range filterPrefixes {
+			for filterPrefix := range filterPrefixes {
 				if strings.HasPrefix(entry, filterPrefix) {
 					filteredEntries = append(filteredEntries, entry)
 				}

apricot/remote/client.go

@@ -48,9 +48,8 @@ func newRpcClient(cxt context.Context, cancel context.CancelFunc, endpoint strin
 
 	client := &rpcClient{
 		ApricotClient: apricotpb.NewApricotClient(conn),
-		conn: conn,
+		conn:          conn,
 	}
 
 	return client
 }
-

cmd/coconut/main.go

@@ -24,18 +24,18 @@
 
 package main
 
-import(
+import (
 	"github.com/AliceO2Group/Control/coconut/cmd"
-	"github.com/teo/logrus-prefixed-formatter"
 	log "github.com/sirupsen/logrus"
+	"github.com/teo/logrus-prefixed-formatter"
 )
 
 func init() {
 	log.SetFormatter(&prefixed.TextFormatter{
-		DisableTimestamp:true,
-		FullTimestamp:   true,
-		SpacePadding:    20,
-		PrefixPadding:   12,
+		DisableTimestamp: true,
+		FullTimestamp:    true,
+		SpacePadding:     20,
+		PrefixPadding:    12,
 
 		// Needed for colored stdout/stderr in GoLand, IntelliJ, etc.
 		ForceColors:     true,
@@ -45,4 +45,4 @@ func init() {
 
 func main() {
 	cmd.Execute()
-}
+}

cmd/walnut/main.go

@@ -25,7 +25,6 @@
 // Package walnut implements the O² Workflow Administration and Linting Utility.
 package main
 
-
 import "github.com/AliceO2Group/Control/walnut/cmd"
 
 func main() {

coconut/app/constants.go

@@ -28,4 +28,4 @@ const (
 	NAME             = "coconut"
 	PRETTY_SHORTNAME = "coconut"
 	PRETTY_FULLNAME  = "O² Control and Configuration Utility"
-)
+)

coconut/cmd/about.go

@@ -25,20 +25,20 @@
 package cmd
 
 import (
+	"fmt"
 	"github.com/AliceO2Group/Control/coconut/app"
+	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"fmt"
 	"github.com/spf13/viper"
-	"github.com/fatih/color"
 	"time"
 )
 
 // aboutCmd represents the about command
 var aboutCmd = &cobra.Command{
-	Use:   "about",
+	Use:     "about",
 	Aliases: []string{},
-	Short: fmt.Sprintf("about %s", app.NAME),
-	Long: `The about command shows some basic information on this utility.`,
+	Short:   fmt.Sprintf("about %s", app.NAME),
+	Long:    `The about command shows some basic information on this utility.`,
 	Run: func(*cobra.Command, []string) {
 		color.Set(color.FgHiWhite)
 		fmt.Print(app.PRETTY_SHORTNAME + " *** ")
@@ -52,15 +52,20 @@ endpoint:        %s
 config_endpoint: %s
 `,
 			color.HiGreenString(viper.GetString("version")),
-			color.HiGreenString(func() string {if len(viper.ConfigFileUsed()) > 0 { return viper.ConfigFileUsed() }; return "builtin"}()),
+			color.HiGreenString(func() string {
+				if len(viper.ConfigFileUsed()) > 0 {
+					return viper.ConfigFileUsed()
+				}
+				return "builtin"
+			}()),
 			color.HiGreenString(viper.GetString("endpoint")),
 			color.HiGreenString(viper.GetString("config_endpoint")))
 
 		color.Set(color.FgHiBlue)
-		fmt.Printf("\nCopyright 2017-%d CERN and the copyright holders of ALICE O².\n" +
-			"This program is free software: you can redistribute it and/or modify \n" +
-			"it under the terms of the GNU General Public License as published by \n" +
-			"the Free Software Foundation, either version 3 of the License, or \n" +
+		fmt.Printf("\nCopyright 2017-%d CERN and the copyright holders of ALICE O².\n"+
+			"This program is free software: you can redistribute it and/or modify \n"+
+			"it under the terms of the GNU General Public License as published by \n"+
+			"the Free Software Foundation, either version 3 of the License, or \n"+
 			"(at your option) any later version.\n", time.Now().Year())
 		color.Unset()
 

coconut/cmd/configuration.go

@@ -30,9 +30,9 @@ import (
 
 // configurationCmd represents the configuration command
 var configurationCmd = &cobra.Command{
-	Use:   "configuration",
+	Use:     "configuration",
 	Aliases: []string{"config", "conf", "c"},
-	Short: "view or modify O² configuration",
+	Short:   "view or modify O² configuration",
 	Long: `The configuration command allows you to perform operations on the O² 
 configuration store.`,
 }

coconut/cmd/configuration_dump.go

@@ -31,16 +31,16 @@ import (
 
 // configurationDumpCmd represents the configuration list command
 var configurationDumpCmd = &cobra.Command{
-	Use:   "dump [key]",
+	Use:     "dump [key]",
 	Aliases: []string{"d"},
-	Short: "dump configuration subtree",
+	Short:   "dump configuration subtree",
 	Long: `The configuration dump command requests from O² Configuration 
 a subtree of key-values, and dumps it to standard output in the specified 
 format. This command has full read access to the O² Configuration store 
 and performs a raw query with no additional processing or access control
 semantics.`,
-	Run:   configuration.WrapCall(configuration.Dump),
-	Args:  cobra.ExactArgs(1),
+	Run:  configuration.WrapCall(configuration.Dump),
+	Args: cobra.ExactArgs(1),
 }
 
 func init() {