chore: simplify code

- replace `interface{}` with `any` using `gofmt -r 'interface{} -> any -w'` - replace `a = []T{}` with `var a []T` where possible. - replace `a = []T{}` with `a = make([]T, 0, len(b))` where possible. Signed-off-by: Dmitriy Matrenichev <dmitry.matrenichev@siderolabs.com>
siderolabs · Jul 8, 2024 · dad9c40 · dad9c40
1 parent 963612b
commit dad9c40
Show file tree

Hide file tree

Showing 144 changed files with 410 additions and 403 deletions.
diff --git a/cmd/installer/pkg/install/manifest.go b/cmd/installer/pkg/install/manifest.go
@@ -129,7 +129,7 @@ func NewManifest(mode Mode, uefiOnlyBoot bool, bootLoaderPresent bool, opts *Opt
 		manifest.Targets[opts.Disk] = []*Target{}
 	}
 
-	targets := []*Target{}
+	var targets []*Target
 
 	// create GRUB BIOS+UEFI partitions, or only one big EFI partition if not using GRUB
 	if !uefiOnlyBoot {

diff --git a/cmd/talosctl/cmd/mgmt/dhcpd_launch_linux.go b/cmd/talosctl/cmd/mgmt/dhcpd_launch_linux.go
@@ -29,7 +29,7 @@ var dhcpdLaunchCmd = &cobra.Command{
 	Args:   cobra.NoArgs,
 	Hidden: true,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		ips := []net.IP{}
+		var ips []net.IP
 
 		for _, ip := range strings.Split(dhcpdLaunchCmdFlags.addr, ",") {
 			ips = append(ips, net.ParseIP(ip))

diff --git a/cmd/talosctl/cmd/mgmt/gen/csr.go b/cmd/talosctl/cmd/mgmt/gen/csr.go
@@ -49,7 +49,7 @@ var genCSRCmd = &cobra.Command{
 			return fmt.Errorf("error parsing ECDSA key: %s", err)
 		}
 
-		opts := []x509.Option{}
+		var opts []x509.Option
 
 		parsed := net.ParseIP(genCSRCmdFlags.ip)
 		if parsed == nil {

diff --git a/cmd/talosctl/cmd/mgmt/gen/keypair.go b/cmd/talosctl/cmd/mgmt/gen/keypair.go
@@ -20,14 +20,14 @@ var genKeypairCmdFlags struct {
 	organization string
 }
 
-// genKeypairCmd represents the `gen keypair` command.
 var genKeypairCmd = &cobra.Command{
 	Use:   "keypair",
 	Short: "Generates an X.509 Ed25519 key pair",
 	Long:  ``,
 	Args:  cobra.NoArgs,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		opts := []x509.Option{}
+		var opts []x509.Option
+
 		if genKeypairCmdFlags.ip != "" {
 			parsed := net.ParseIP(genKeypairCmdFlags.ip)
 			if parsed == nil {

diff --git a/cmd/talosctl/cmd/talos/disks.go b/cmd/talosctl/cmd/talos/disks.go
@@ -92,7 +92,7 @@ func printDisks(ctx context.Context, c *client.Client) error {
 				}
 			}
 
-			args := []interface{}{}
+			var args []any
 
 			if node != "" {
 				args = append(args, node)
@@ -110,7 +110,7 @@ func printDisks(ctx context.Context, c *client.Client) error {
 				isSystemDisk = "*"
 			}
 
-			args = append(args, []interface{}{
+			args = append(args, []any{
 				getWithPlaceholder(disk.DeviceName),
 				getWithPlaceholder(disk.Model),
 				getWithPlaceholder(disk.Serial),

diff --git a/cmd/talosctl/cmd/talos/diskusage.go b/cmd/talosctl/cmd/talos/diskusage.go
@@ -89,7 +89,7 @@ var duCmd = &cobra.Command{
 
 				size := stringifySize(info.Size)
 
-				args := []interface{}{
+				args := []any{
 					size, info.RelativeName,
 				}
 
@@ -109,7 +109,7 @@ var duCmd = &cobra.Command{
 
 				if multipleNodes {
 					pattern = "%s\t%s\t%s\n"
-					args = append([]interface{}{node}, args...)
+					args = append([]any{node}, args...)
 				}
 
 				fmt.Fprintf(w, pattern, args...)

diff --git a/cmd/talosctl/cmd/talos/etcd.go b/cmd/talosctl/cmd/talos/etcd.go
@@ -67,12 +67,12 @@ func displayAlarms(messages []alarmMessage) error {
 				fmt.Fprintln(w, header)
 			}
 
-			args := []interface{}{
+			args := []any{
 				etcdresource.FormatMemberID(alarm.GetMemberId()),
 				alarm.GetAlarm().String(),
 			}
 			if node != "" {
-				args = append([]interface{}{node}, args...)
+				args = append([]any{node}, args...)
 			}
 
 			fmt.Fprintf(w, pattern, args...)
@@ -233,15 +233,15 @@ var etcdMemberListCmd = &cobra.Command{
 						}
 					}
 
-					args := []interface{}{
+					args := []any{
 						etcdresource.FormatMemberID(member.Id),
 						member.Hostname,
 						strings.Join(member.PeerUrls, ","),
 						strings.Join(member.ClientUrls, ","),
 						member.IsLearner,
 					}
 					if node != "" {
-						args = append([]interface{}{node}, args...)
+						args = append([]any{node}, args...)
 					}
 
 					fmt.Fprintf(w, pattern, args...)
@@ -292,7 +292,7 @@ var etcdStatusCmd = &cobra.Command{
 					ratio = float64(message.GetMemberStatus().GetDbSizeInUse()) / float64(message.GetMemberStatus().GetDbSize()) * 100.0
 				}
 
-				args := []interface{}{
+				args := []any{
 					etcdresource.FormatMemberID(message.GetMemberStatus().GetMemberId()),
 					humanize.Bytes(uint64(message.GetMemberStatus().GetDbSize())),
 					humanize.Bytes(uint64(message.GetMemberStatus().GetDbSizeInUse())),
@@ -305,7 +305,7 @@ var etcdStatusCmd = &cobra.Command{
 					strings.Join(message.GetMemberStatus().GetErrors(), ", "),
 				}
 				if node != "" {
-					args = append([]interface{}{node}, args...)
+					args = append([]any{node}, args...)
 				}
 
 				fmt.Fprintf(w, pattern, args...)

diff --git a/cmd/talosctl/cmd/talos/events.go b/cmd/talosctl/cmd/talos/events.go
@@ -38,7 +38,7 @@ var eventsCmd = &cobra.Command{
 			w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
 			fmt.Fprintln(w, "NODE\tID\tEVENT\tACTOR\tSOURCE\tMESSAGE")
 
-			opts := []client.EventsOptionFunc{}
+			var opts []client.EventsOptionFunc
 
 			if eventsCmdFlags.tailEvents != 0 {
 				opts = append(opts, client.WithTailEvents(eventsCmdFlags.tailEvents))
@@ -73,30 +73,30 @@ var eventsCmd = &cobra.Command{
 					return err
 				}
 
-				var args []interface{}
+				var args []any
 
 				switch msg := event.Payload.(type) {
 				case *machine.SequenceEvent:
-					args = []interface{}{msg.GetSequence()}
+					args = []any{msg.GetSequence()}
 					if msg.Error != nil {
 						args = append(args, "error:"+" "+msg.GetError().GetMessage())
 					} else {
 						args = append(args, msg.GetAction().String())
 					}
 				case *machine.PhaseEvent:
-					args = []interface{}{msg.GetPhase(), msg.GetAction().String()}
+					args = []any{msg.GetPhase(), msg.GetAction().String()}
 				case *machine.TaskEvent:
-					args = []interface{}{msg.GetTask(), msg.GetAction().String()}
+					args = []any{msg.GetTask(), msg.GetAction().String()}
 				case *machine.ServiceStateEvent:
-					args = []interface{}{msg.GetService(), fmt.Sprintf("%s: %s", msg.GetAction(), msg.GetMessage())}
+					args = []any{msg.GetService(), fmt.Sprintf("%s: %s", msg.GetAction(), msg.GetMessage())}
 				case *machine.ConfigLoadErrorEvent:
-					args = []interface{}{"error", msg.GetError()}
+					args = []any{"error", msg.GetError()}
 				case *machine.ConfigValidationErrorEvent:
-					args = []interface{}{"error", msg.GetError()}
+					args = []any{"error", msg.GetError()}
 				case *machine.AddressEvent:
-					args = []interface{}{msg.GetHostname(), fmt.Sprintf("ADDRESSES: %s", strings.Join(msg.GetAddresses(), ","))}
+					args = []any{msg.GetHostname(), fmt.Sprintf("ADDRESSES: %s", strings.Join(msg.GetAddresses(), ","))}
 				case *machine.MachineStatusEvent:
-					args = []interface{}{
+					args = []any{
 						msg.GetStage().String(),
 						fmt.Sprintf("ready: %v, unmet conditions: %v",
 							msg.GetStatus().Ready,
@@ -109,7 +109,7 @@ var eventsCmd = &cobra.Command{
 					}
 				}
 
-				args = append([]interface{}{event.Node, event.ID, event.TypeURL, event.ActorID}, args...)
+				args = append([]any{event.Node, event.ID, event.TypeURL, event.ActorID}, args...)
 				fmt.Fprintf(w, format, args...)
 
 				return w.Flush()

diff --git a/cmd/talosctl/cmd/talos/netstat.go b/cmd/talosctl/cmd/talos/netstat.go
@@ -281,7 +281,7 @@ func (n *netstat) printNetstat(response *machine.NetstatResponse) error {
 				}
 			}
 
-			args := []interface{}{}
+			var args []any
 
 			if node != "" {
 				args = append(args, node)
@@ -292,7 +292,7 @@ func (n *netstat) printNetstat(response *machine.NetstatResponse) error {
 				state = record.State.String()
 			}
 
-			args = append(args, []interface{}{
+			args = append(args, []any{
 				record.L4Proto,
 				strconv.FormatUint(record.Rxqueue, 10),
 				strconv.FormatUint(record.Txqueue, 10),
@@ -302,31 +302,31 @@ func (n *netstat) printNetstat(response *machine.NetstatResponse) error {
 			}...)
 
 			if netstatCmdFlags.extend {
-				args = append(args, []interface{}{
+				args = append(args, []any{
 					strconv.FormatUint(uint64(record.Uid), 10),
 					strconv.FormatUint(record.Inode, 10),
 				}...)
 			}
 
 			if netstatCmdFlags.pid {
 				if record.Process.Pid != 0 {
-					args = append(args, []interface{}{
+					args = append(args, []any{
 						fmt.Sprintf("%d/%s", record.Process.Pid, record.Process.Name),
 					}...)
 				} else {
-					args = append(args, []interface{}{
+					args = append(args, []any{
 						"-",
 					}...)
 				}
 			}
 
 			if netstatCmdFlags.pods {
 				if record.Netns == "" || node == "" || n.NodeNetNSPods[node] == nil {
-					args = append(args, []interface{}{
+					args = append(args, []any{
 						"-",
 					}...)
 				} else {
-					args = append(args, []interface{}{
+					args = append(args, []any{
 						n.NodeNetNSPods[node][record.Netns],
 					}...)
 				}
@@ -335,7 +335,7 @@ func (n *netstat) printNetstat(response *machine.NetstatResponse) error {
 			if netstatCmdFlags.timers {
 				timerwhen := strconv.FormatFloat(float64(record.Timerwhen)/100, 'f', 2, 64)
 
-				args = append(args, []interface{}{
+				args = append(args, []any{
 					fmt.Sprintf("%s (%s/%d/%d)", strings.ToLower(record.Tr.String()), timerwhen, record.Retrnsmt, record.Timeout),
 				}...)
 			}

diff --git a/cmd/talosctl/cmd/talos/output/json.go b/cmd/talosctl/cmd/talos/output/json.go
@@ -38,7 +38,7 @@ func (j *JSON) WriteHeader(definition *meta.ResourceDefinition, withEvents bool)
 }
 
 // prepareEncodableData prepares the data of a resource to be encoded as JSON and populates it with some extra information.
-func (j *JSON) prepareEncodableData(node string, r resource.Resource, event state.EventType) (map[string]interface{}, error) {
+func (j *JSON) prepareEncodableData(node string, r resource.Resource, event state.EventType) (map[string]any, error) {
 	if r.Metadata().Type() == config.MachineConfigType {
 		r = &mcYamlRepr{r}
 	}
@@ -53,7 +53,7 @@ func (j *JSON) prepareEncodableData(node string, r resource.Resource, event stat
 		return nil, err
 	}
 
-	var data map[string]interface{}
+	var data map[string]any
 
 	err = yaml.Unmarshal(yamlBytes, &data)
 	if err != nil {
@@ -69,7 +69,7 @@ func (j *JSON) prepareEncodableData(node string, r resource.Resource, event stat
 	return data, nil
 }
 
-func writeAsIndentedJSON(wr io.Writer, data interface{}) error {
+func writeAsIndentedJSON(wr io.Writer, data any) error {
 	enc := json.NewEncoder(wr)
 	enc.SetIndent("", "    ")
 

diff --git a/cmd/talosctl/cmd/talos/output/table.go b/cmd/talosctl/cmd/talos/output/table.go
@@ -27,7 +27,7 @@ type Table struct {
 	dynamicColumns []dynamicColumn
 }
 
-type dynamicColumn func(value interface{}) (string, error)
+type dynamicColumn func(value any) (string, error)
 
 // NewTable initializes table resource output.
 func NewTable(writer io.Writer) *Table {
@@ -60,7 +60,7 @@ func (table *Table) WriteHeader(definition *meta.ResourceDefinition, withEvents
 
 		expr = expr.AllowMissingKeys(true)
 
-		table.dynamicColumns = append(table.dynamicColumns, func(val interface{}) (string, error) {
+		table.dynamicColumns = append(table.dynamicColumns, func(val any) (string, error) {
 			var buf bytes.Buffer
 
 			if e := expr.Execute(&buf, val); e != nil {
@@ -104,7 +104,7 @@ func (table *Table) WriteResource(node string, r resource.Resource, event state.
 		return err
 	}
 
-	var unstructured interface{}
+	var unstructured any
 
 	if err = yaml.Unmarshal(yml, &unstructured); err != nil {
 		return err

diff --git a/cmd/talosctl/cmd/talos/processes.go b/cmd/talosctl/cmd/talos/processes.go
@@ -188,7 +188,7 @@ func processesOutput(ctx context.Context, c *client.Client) (output string, err
 
 	defaultNode := client.AddrFromPeer(&remotePeer)
 
-	s := []string{}
+	var s []string
 
 	s = append(s, "NODE | PID | STATE | THREADS | CPU-TIME | VIRTMEM | RESMEM | LABEL | COMMAND")
 

diff --git a/cmd/talosctl/pkg/mgmt/helpers/wireguard.go b/cmd/talosctl/pkg/mgmt/helpers/wireguard.go
@@ -61,7 +61,8 @@ func NewWireguardConfigBundle(ips []netip.Addr, wireguardCidr string, listenPort
 
 		config := &v1alpha1.DeviceWireguardConfig{}
 
-		currentPeers := []*v1alpha1.DeviceWireguardPeer{}
+		var currentPeers []*v1alpha1.DeviceWireguardPeer
+
 		// add all peers except self
 		for _, peer := range peers {
 			if peer.PublicKey() != keys[i].PublicKey().String() {

diff --git a/cmd/talosctl/pkg/talos/helpers/error.go b/cmd/talosctl/pkg/talos/helpers/error.go
@@ -18,7 +18,7 @@ func AppendErrors(err error, errs ...error) error {
 	res := multierror.Append(err, errs...)
 
 	res.ErrorFormat = func(errs []error) string {
-		lines := []string{}
+		var lines []string
 
 		for _, err := range errs {
 			lines = append(lines, fmt.Sprintf(" %s", err.Error()))

diff --git a/cmd/talosctl/pkg/talos/yamlstrip/yamlstrip.go b/cmd/talosctl/pkg/talos/yamlstrip/yamlstrip.go
@@ -65,7 +65,8 @@ func removeComments(node *yaml.Node) {
 }
 
 func stripManual(b []byte) []byte {
-	stripped := []byte{}
+	var stripped []byte
+
 	lines := bytes.Split(b, []byte("\n"))
 
 	for i, line := range lines {

diff --git a/hack/cloud-image-uploader/aws.go b/hack/cloud-image-uploader/aws.go
@@ -36,7 +36,7 @@ func GetAWSDefaultRegions() ([]string, error) {
 		return nil, fmt.Errorf("failed getting list of regions: %w", err)
 	}
 
-	regions := []string{}
+	var regions []string
 
 	for _, r := range result.Regions {
 		if r.OptInStatus != nil {

diff --git a/hack/docgen/main.go b/hack/docgen/main.go
diff --git a/internal/app/init/main.go b/internal/app/init/main.go
@@ -145,7 +145,7 @@ func mountRootFS() error {
 		image string
 	}
 
-	layers := []layer{}
+	var layers []layer
 
 	squashfs := mount.NewMountPoints()