minor updates to get familiar with the code again

Author: lucapette

.github/workflows/go.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.1
+          go-version: 1.24.0
 
       - name: build
         run: make build

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.1
+          go-version: 1.24.0
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3

go.mod

@@ -1,15 +1,15 @@
 module github.com/lucapette/fakedata
 
-go 1.20
+go 1.24.0
 
 require (
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/kr/pretty v0.3.1
-	github.com/spf13/pflag v1.0.5
-	golang.org/x/text v0.9.0
+	github.com/spf13/pflag v1.0.10
+	golang.org/x/text v0.32.0
 )
 
 require (
 	github.com/kr/text v0.2.0 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
 )

go.sum

@@ -1,23 +1,15 @@
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc=
-github.com/gofrs/uuid v4.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
 github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/kr/pretty v0.0.0-20160823170715-cfb55aafdaf3 h1:dhwb1Ev84SKKVBfLuhR4bw/29yYHzwtTyTLUWWnvYxI=
-github.com/kr/pretty v0.0.0-20160823170715-cfb55aafdaf3/go.mod h1:Bvhd+E3laJ0AVkG0c9rmtZcnhV0HQ3+c3YxxqTvc/gA=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/text v0.0.0-20160504234017-7cafcd837844 h1:kpzneEBeC0dMewP3gr/fADv1OlblH9r1goWVwpOt3TU=
-github.com/kr/text v0.0.0-20160504234017-7cafcd837844/go.mod h1:sjUstKUATFIcff4qlB53Kml0wQPtJVc/3fWrmuUmcfA=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
+github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=

pkg/fakedata/completion.go

@@ -32,9 +32,7 @@ _fakedata () {
 }
 compdef _fakedata fakedata`
 
-const fishTemplate = `
-complete -c fakedata -a '%s'
-`
+const fishTemplate = "complete -c fakedata -a '%s'"
 
 func getTemplate(shell string) (string, error) {
 	switch shell {
@@ -50,7 +48,7 @@ func getTemplate(shell string) (string, error) {
 }
 
 // GetCompletionFunc returns a string representing a completion function for the
-// given shell. It returns an error for unsupported shell.
+// given shell. It returns an error for unsupported shells.
 func GetCompletionFunc(shell string) (string, error) {
 	t, err := getTemplate(shell)
 	if err != nil {
@@ -61,7 +59,10 @@ func GetCompletionFunc(shell string) (string, error) {
 	allCliArgs := &bytes.Buffer{}
 
 	for _, gen := range NewGenerators() {
-		fmt.Fprintf(gens, gen.Name+" ")
+		_, err = fmt.Fprint(gens, gen.Name+" ")
+		if err != nil {
+			return "", err
+		}
 	}
 
 	pflag.VisitAll(func(f *pflag.Flag) {

pkg/fakedata/generator.go

@@ -127,38 +127,40 @@ func domain() string {
 }
 
 func date(options string) (f func() string, err error) {
-	var min, max string
+	var minDate, maxDate string
 
 	endDate := time.Now()
 	startDate := endDate.AddDate(-1, 0, 0)
 
 	dateRange := strings.Split(options, ",")
-	min = dateRange[0]
+	minDate = dateRange[0]
 
 	if len(dateRange) > 1 {
-		max = dateRange[1]
+		maxDate = dateRange[1]
 	}
 
-	if len(min) > 0 {
-		if len(max) > 0 {
-			formattedMax := fmt.Sprintf("%sT00:00:00.000Z", max)
+	if len(minDate) > 0 {
+		if len(maxDate) > 0 {
+			formattedMax := fmt.Sprintf("%sT00:00:00.000Z", maxDate)
 
-			date, err := time.Parse("2006-01-02T15:04:05.000Z", formattedMax)
+			var d time.Time
+			d, err = time.Parse("2006-01-02T15:04:05.000Z", formattedMax)
 			if err != nil {
-				return nil, fmt.Errorf("problem parsing max date: %v", err)
+				return nil, fmt.Errorf("problem parsing maxDate date: %v", err)
 			}
 
-			endDate = date
+			endDate = d
 		}
 
-		formattedMin := fmt.Sprintf("%sT00:00:00.000Z", min)
+		formattedMin := fmt.Sprintf("%sT00:00:00.000Z", minDate)
 
-		date, err := time.Parse("2006-01-02T15:04:05.000Z", formattedMin)
+		var d time.Time
+		d, err = time.Parse("2006-01-02T15:04:05.000Z", formattedMin)
 		if err != nil {
 			return nil, fmt.Errorf("problem parsing mix date: %v", err)
 		}
 
-		startDate = date
+		startDate = d
 	}
 
 	if startDate.After(endDate) {
@@ -171,8 +173,8 @@ func date(options string) (f func() string, err error) {
 }
 
 func integer(options string) (func() string, error) {
-	min := 0
-	max := 1000
+	minInt := 0
+	maxInt := 1000
 	var low, high string
 	intRange := strings.Split(options, ",")
 	low = intRange[0]
@@ -187,23 +189,23 @@ func integer(options string) (func() string, error) {
 			return nil, fmt.Errorf("could not convert min: %v", err)
 		}
 
-		min = m
+		minInt = m
 
 		if len(high) > 0 {
-			m, err := strconv.Atoi(high)
+			m, err = strconv.Atoi(high)
 			if err != nil {
 				return nil, fmt.Errorf("could not convert max: %v", err)
 			}
 
-			max = m
+			maxInt = m
 		}
 	}
 
-	if min > max {
-		return nil, fmt.Errorf("max(%d) is smaller than min(%d)", max, min)
+	if minInt > maxInt {
+		return nil, fmt.Errorf("max(%d) is smaller than min(%d)", maxInt, minInt)
 	}
 
-	return func() string { return strconv.Itoa(min + rand.Intn(max+1-min)) }, nil
+	return func() string { return strconv.Itoa(minInt + rand.Intn(maxInt+1-minInt)) }, nil
 }
 
 func file(path string) (func() string, error) {
@@ -213,12 +215,12 @@ func file(path string) (func() string, error) {
 
 	filePath := strings.Trim(path, "'\"")
 
-	file, err := os.ReadFile(filePath)
+	f, err := os.ReadFile(filePath)
 	if err != nil {
 		return nil, fmt.Errorf("could not read file %s: %v", filePath, err)
 	}
 
-	content := strings.Split(strings.Trim(string(file), "\n"), "\n")
+	content := strings.Split(strings.Trim(string(f), "\n"), "\n")
 	list := withList(content)
 
 	return func() string { return list() }, nil