TX-16896: upgrade go to 1.26 and gofmt

bump go to 1.26
go fix ./.. for depracated ioutil
gofmt -w . for modern syntax
go mod tidy to make transitive depdndencies explicit

Author: txanthopoulos

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM} golang:1.16.0-alpine AS build
+FROM --platform=${BUILDPLATFORM} golang:1.26.0-alpine AS build
 RUN apk update
 RUN apk add --no-cache git
 

build/Dockerfile-bin

@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM} golang:1.16.0-alpine AS build
+FROM --platform=${BUILDPLATFORM} golang:1.26.0-alpine AS build
 RUN apk update
 RUN apk add --no-cache git
 

cmd/tx/main.go

@@ -331,10 +331,7 @@ func Main() {
 						languages = strings.Split(c.String("languages"), ",")
 					}
 
-					workers := c.Int("workers")
-					if workers > 20 {
-						workers = 20
-					}
+					workers := min(c.Int("workers"), 20)
 
 					args := txlib.PushCommandArguments{
 						Source:               c.Bool("source"),
@@ -541,10 +538,7 @@ func Main() {
 						resourceIds = append(resourceIds, extraResourceIds...)
 					}
 
-					workers := c.Int("workers")
-					if workers > 20 {
-						workers = 20
-					}
+					workers := min(c.Int("workers"), 20)
 
 					arguments := txlib.PullCommandArguments{
 						ContentEncoding:   c.String("content_encoding"),

go.mod

@@ -1,6 +1,6 @@
 module github.com/transifex/cli
 
-go 1.16
+go 1.26
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
@@ -11,10 +11,45 @@ require (
 	github.com/manifoldco/promptui v0.8.0
 	github.com/mattn/go-isatty v0.0.14
 	github.com/rhysd/go-github-selfupdate v1.2.3
-	github.com/smartystreets/goconvey v1.6.4 // indirect
-	github.com/stretchr/testify v1.7.0 // indirect
+	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli/v2 v2.3.0
-	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
+	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
 	gopkg.in/ini.v1 v1.62.0
+)
+
+require (
+	github.com/Microsoft/go-winio v0.4.16 // indirect
+	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
+	github.com/go-git/gcfg v1.5.0 // indirect
+	github.com/go-git/go-billy/v5 v5.1.0 // indirect
+	github.com/golang/protobuf v1.3.2 // indirect
+	github.com/google/go-github/v30 v30.1.0 // indirect
+	github.com/google/go-querystring v1.0.0 // indirect
+	github.com/gosimple/unidecode v1.0.1 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
+	github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a // indirect
+	github.com/mattn/go-colorable v0.1.9 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/russross/blackfriday/v2 v2.0.1 // indirect
+	github.com/sergi/go-diff v1.1.0 // indirect
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/smartystreets/goconvey v1.6.4 // indirect
+	github.com/tcnksm/go-gitconfig v0.1.2 // indirect
+	github.com/ulikunitz/xz v0.5.9 // indirect
+	github.com/xanzy/ssh-agent v0.3.0 // indirect
+	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
+	golang.org/x/net v0.0.0-20210326060303-6b1517762897 // indirect
+	golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288 // indirect
+	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
+	google.golang.org/appengine v1.3.0 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

internal/txlib/add.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 
 	"github.com/fatih/color"
@@ -51,7 +52,7 @@ func validateFileFilter(input string) error {
 		return errors.New("you need to add an extension to your file")
 	}
 	input = normaliseFileFilter(input)
-	for _, part := range strings.Split(input, string(os.PathSeparator)) {
+	for part := range strings.SplitSeq(input, string(os.PathSeparator)) {
 		if strings.Count(part, "<lang>") > 1 {
 			return errors.New(
 				"<lang> cannot appear more than once in the same part of the path",
@@ -94,13 +95,7 @@ func validateNotEmpty(input string) error {
 }
 
 func i18nFormatExists(list []string, ext string) bool {
-	for _, value := range list {
-		if value == ext {
-			return true
-		}
-
-	}
-	return false
+	return slices.Contains(list, ext)
 }
 
 func getSelectTemplate(str string) *promptui.SelectTemplates {

internal/txlib/add_remote_test.go

@@ -2,7 +2,7 @@ package txlib
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/url"
 	"os"
 	"reflect"
@@ -147,7 +147,7 @@ func TestAddRemoteInvalidFileFormat(t *testing.T) {
 	// Restore stdout
 	w.Close()
 	os.Stdout = oldStdout
-	out, _ := ioutil.ReadAll(r)
+	out, _ := io.ReadAll(r)
 	r.Close()
 
 	testSimpleGet(t, mockData, projectUrl)

internal/txlib/config/local.go

@@ -85,7 +85,7 @@ func loadLocalConfigFromBytes(data []byte) (*LocalConfig, error) {
 	}
 	languageMappings := mainSection.Key("lang_map").String()
 	if languageMappings != "" {
-		for _, mapping := range strings.Split(languageMappings, ",") {
+		for mapping := range strings.SplitSeq(languageMappings, ",") {
 			err := fmt.Errorf("invalid language mapping '%s'", mapping)
 
 			split := strings.Split(mapping, ":")
@@ -170,7 +170,7 @@ func loadLocalConfigFromBytes(data []byte) (*LocalConfig, error) {
 
 		languageMappings := section.Key("lang_map").String()
 		if languageMappings != "" {
-			for _, mapping := range strings.Split(languageMappings, ",") {
+			for mapping := range strings.SplitSeq(languageMappings, ",") {
 				err := fmt.Errorf("invalid language mapping %s", mapping)
 				split := strings.Split(mapping, ":")
 				if len(split) != 2 {

internal/txlib/config/main.go

@@ -4,33 +4,32 @@ Slightly object-oriented tx configuration package.
 
 Usage:
 
-    import "github.com/transifex/cli/internal/txlib/config"
+	import "github.com/transifex/cli/internal/txlib/config"
 
-    cfg, err := config.Load()  // Loads based on current directory
-    if err != nil { ... }
+	cfg, err := config.Load()  // Loads based on current directory
+	if err != nil { ... }
 
-    // Lets add a resource
-    cfg.AddResource(config.Resource{
-        OrganizationSlug: "my_org",
-        ProjectSlug: "my_project",
-        ResourceSlug: "my_resource",
-        FileFilter: "locale/<lang>.po",
-        SourceFile: "locale/en.po",
-        SourceLanguage: "en",
-        Type: "PO",
-    })
+	// Lets add a resource
+	cfg.AddResource(config.Resource{
+	    OrganizationSlug: "my_org",
+	    ProjectSlug: "my_project",
+	    ResourceSlug: "my_resource",
+	    FileFilter: "locale/<lang>.po",
+	    SourceFile: "locale/en.po",
+	    SourceLanguage: "en",
+	    Type: "PO",
+	})
 
-    cfg.Save()  // Saves changes to disk
+	cfg.Save()  // Saves changes to disk
 
-    resource := cfg.FindResource("my_org.my_project")
+	resource := cfg.FindResource("my_org.my_project")
 
-    file, err := os.Open(resource.SourceFile)
-    if err != nil { ... }
-    defer file.Close()
-
-    resource.LanguageMappings["en_US"] = "en-us"
-    cfg.Save()
+	file, err := os.Open(resource.SourceFile)
+	if err != nil { ... }
+	defer file.Close()
 
+	resource.LanguageMappings["en_US"] = "en-us"
+	cfg.Save()
 */
 package config
 
@@ -99,10 +98,10 @@ Return the URL that will be used based on the configuration.
 
 The local configuration has a 'host' field in its 'main' section. That host
 points to a section in the root configuration. We return the rest_hostname of
-that section. The fallback value is `https://rest.api.transifex.com` */
+that section. The fallback value is `https://rest.api.transifex.com`
+*/
 func (cfg *Config) GetActiveHost() *Host {
-	if cfg.Root.Hosts == nil || len(cfg.Root.Hosts) == 0 ||
-		cfg.Local == nil {
+	if len(cfg.Root.Hosts) == 0 || cfg.Local == nil {
 		return nil
 	}
 	activeHostName := cfg.Local.Host
@@ -117,7 +116,8 @@ func (cfg *Config) GetActiveHost() *Host {
 
 /*
 Save
-Save changes to disk */
+Save changes to disk
+*/
 func (cfg *Config) Save() error {
 	if cfg.Root != nil {
 		var oldRootConfig *RootConfig
@@ -193,7 +193,8 @@ func (cfg *Config) FindHost(hostname string) *Host {
 /*
 FindResource
 Return a Resource reference that matches the argument. The format of the
-argument is "<project_slug>.<resource_slug>" */
+argument is "<project_slug>.<resource_slug>"
+*/
 func (cfg *Config) FindResource(id string) *Resource {
 	parts := strings.Split(id, ".")
 	if len(parts) != 2 {

internal/txlib/credentials.go

@@ -12,62 +12,62 @@ GetHostAndToken
 Function for getting the *final* API server hostname and token from a
 combination of environment variables, flags, config files and/or user input.
 
-- 'cfg' is a 'config.Config' object that has already been loaded either based
-  on the default configuration paths or ones that have been supplied by the
-  user.
+  - 'cfg' is a 'config.Config' object that has already been loaded either based
+    on the default configuration paths or ones that have been supplied by the
+    user.
 
-- 'hostname' is an override for the hostname to used that the user has maybe
-  provided either as a flag or an environment variable.
+  - 'hostname' is an override for the hostname to used that the user has maybe
+    provided either as a flag or an environment variable.
 
-- 'token' is an override for the API token to be used that the user has maybe
-  provided either as a flag or an environment variable.
+  - 'token' is an override for the API token to be used that the user has maybe
+    provided either as a flag or an environment variable.
 
 The logic for retrieving the final hostname and token is:
 
-1. If the hostname flag/env variable is provided, use it as a section *key* in
-   the root configuration file. For example, if the user provides 'aaa' and the
-   root configuration file looks like this:
+ 1. If the hostname flag/env variable is provided, use it as a section *key* in
+    the root configuration file. For example, if the user provides 'aaa' and the
+    root configuration file looks like this:
 
-       [aaa]
-       rest_hostname = bbb
+    [aaa]
+    rest_hostname = bbb
 
-   Then, the returned hostname will be 'bbb'.
+    Then, the returned hostname will be 'bbb'.
 
-   If a matching host isn't found, then the returned hostname will be the
-   provided value.
+    If a matching host isn't found, then the returned hostname will be the
+    provided value.
 
-2. If the user didn't provide a hostname, try to find the "active host" based
-   on both the local and root configuration. For example, if the local
-   configuration looks like this:
+ 2. If the user didn't provide a hostname, try to find the "active host" based
+    on both the local and root configuration. For example, if the local
+    configuration looks like this:
 
-       [main]
-       host = ccc
+    [main]
+    host = ccc
 
-   And the root configuration looks like this:
+    And the root configuration looks like this:
 
-       [aaa]
-       rest_hostname = bbb
+    [aaa]
+    rest_hostname = bbb
 
-       [ccc]
-       rest_hostname = ddd
+    [ccc]
+    rest_hostname = ddd
 
-       [eee]
-       rest_hostname = fff
+    [eee]
+    rest_hostname = fff
 
-   Then the "active host" will be the second one and the returned hostname will
-   be 'ddd'.
+    Then the "active host" will be the second one and the returned hostname will
+    be 'ddd'.
 
-   If an active host cannot be found, then 'https://rest.api.transifex.com'
-   will be returned.
+    If an active host cannot be found, then 'https://rest.api.transifex.com'
+    will be returned.
 
 3. If a token was provided by the user, simply return it.
 
-4. If a token wasn't provided, retrieve the token from either the "matching
-   host" (see step 1) or the "active host" (see step 2). If a "matching" or
-   "active" host wasn't found during the resolution of the hostname, the
-   program will ask the user to provide a token. After the token is provided,
-   it will be saved in the root configuration using the appropriate section key
-   and hostname that were already retrieved.
+ 4. If a token wasn't provided, retrieve the token from either the "matching
+    host" (see step 1) or the "active host" (see step 2). If a "matching" or
+    "active" host wasn't found during the resolution of the hostname, the
+    program will ask the user to provide a token. After the token is provided,
+    it will be saved in the root configuration using the appropriate section key
+    and hostname that were already retrieved.
 */
 func GetHostAndToken(
 	cfg *config.Config, hostname, token string,

internal/txlib/delete.go

@@ -182,7 +182,7 @@ func deleteResource(
 			if remoteStatAttributes.TranslatedStrings > 0 {
 				msg := fmt.Sprintf("Aborting due to translations in %s",
 					cfgResource.ResourceSlug)
-				return fmt.Errorf(msg)
+				return fmt.Errorf("%s", msg)
 			}
 		}
 	}