chore: Fix lint failures

Author: bryantbiggs

.golangci.yml

@@ -118,7 +118,7 @@ issues:
         - ^vendor$
         - ^build$
         - ^pkg\/eks\/mocks$
-        - ^pkg\/goformation$
+        - ^pkg\/goformation*
 
     # Which files to exclude: they will be analyzed, but issues from them won't be reported.
     # There is no need to include all autogenerated files,

go.mod

@@ -75,6 +75,7 @@ require (
 	golang.org/x/crypto v0.33.0
 	golang.org/x/oauth2 v0.25.0
 	golang.org/x/sync v0.11.0
+	golang.org/x/text v0.22.0
 	golang.org/x/tools v0.30.0
 	gopkg.in/yaml.v2 v2.4.0
 	helm.sh/helm/v3 v3.17.0
@@ -405,7 +406,6 @@ require (
 	golang.org/x/net v0.35.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
 	golang.org/x/term v0.29.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
 	golang.org/x/time v0.8.0 // indirect
 	google.golang.org/api v0.215.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect

pkg/goformation/generate/generate.go

@@ -5,13 +5,16 @@ import (
 	"encoding/json"
 	"fmt"
 	"go/format"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"os"
 	"sort"
 	"strings"
 	"text/template"
+
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 )
 
 // ResourceGenerator takes AWS CloudFormation Resource Specification
@@ -138,14 +141,14 @@ func (rg *ResourceGenerator) downloadSpec(location string) ([]byte, error) {
 			return nil, err
 		}
 
-		data, err := ioutil.ReadAll(response.Body)
+		data, err := io.ReadAll(response.Body)
 		if err != nil {
 			return nil, err
 		}
 
 		return data, nil
 	case "file":
-		data, err := ioutil.ReadFile(strings.Replace(location, "file://", "", -1))
+		data, err := os.ReadFile(strings.Replace(location, "file://", "", -1))
 		if err != nil {
 			return nil, err
 		}
@@ -242,7 +245,7 @@ func (rg *ResourceGenerator) generateAllResourcesMap(resources []GeneratedResour
 	}
 
 	// Write the file contents out
-	if err := ioutil.WriteFile("cloudformation/all.go", formatted, 0644); err != nil {
+	if err := os.WriteFile("cloudformation/all.go", formatted, 0644); err != nil {
 		return fmt.Errorf("failed to write Go file for iterable map of all resources: %s", err)
 	}
 
@@ -344,7 +347,7 @@ func (rg *ResourceGenerator) generateResources(name string, resource Resource, i
 	// Check if the file has changed since the last time generate ran
 	dir := "cloudformation/" + pname
 	fn := dir + "/" + filename(name)
-	current, err := ioutil.ReadFile(fn)
+	current, err := os.ReadFile(fn)
 
 	if err != nil || bytes.Compare(formatted, current) != 0 {
 
@@ -354,7 +357,7 @@ func (rg *ResourceGenerator) generateResources(name string, resource Resource, i
 		}
 
 		// Write the file contents out
-		if err := ioutil.WriteFile(fn, formatted, 0644); err != nil {
+		if err := os.WriteFile(fn, formatted, 0644); err != nil {
 			return fmt.Errorf("failed to write resource file %s: %s", fn, err)
 		}
 		// Log the updated resource name to the results
@@ -403,20 +406,20 @@ func (rg *ResourceGenerator) generateJSONSchema(specname string, spec *CloudForm
 	}
 
 	filename := fmt.Sprintf("schema/%s.schema.json", specname)
-	if err := ioutil.WriteFile(filename, formatted, 0644); err != nil {
+	if err := os.WriteFile(filename, formatted, 0644); err != nil {
 		return fmt.Errorf("failed to write JSON Schema: %s", err)
 	}
 
 	// Also create a Go importable version
 	var gocode []byte
 	gocode = append(gocode, []byte("package schema\n")...)
 	gocode = append(gocode, []byte("\n")...)
-	gocode = append(gocode, []byte("// "+strings.Title(specname)+"Schema defined a JSON Schema that can be used to validate CloudFormation/SAM templates\n")...)
-	gocode = append(gocode, []byte("var "+strings.Title(specname)+"Schema = `")...)
+	gocode = append(gocode, []byte("// "+cases.Title(language.Und, cases.NoLower).String(specname)+"Schema defined a JSON Schema that can be used to validate CloudFormation/SAM templates\n")...)
+	gocode = append(gocode, []byte("var "+cases.Title(language.Und, cases.NoLower).String(specname)+"Schema = `")...)
 	gocode = append(gocode, formatted...)
 	gocode = append(gocode, []byte("`\n")...)
 	gofilename := fmt.Sprintf("schema/%s.go", specname)
-	if err := ioutil.WriteFile(gofilename, gocode, 0644); err != nil {
+	if err := os.WriteFile(gofilename, gocode, 0644); err != nil {
 		return fmt.Errorf("failed to write Go version of JSON Schema: %s", err)
 	}
 
@@ -430,7 +433,7 @@ func generatePolymorphicProperty(typename string, name string, property Property
 
 	// Open the polymorphic property template
 	tmpl, err := template.New("polymorphic-property.template").Funcs(template.FuncMap{
-		"convertToGoType": convertTypeToGo,
+		"convertToGoType":     convertTypeToGo,
 		"convertToPureGoType": convertTypeToPureGo,
 	}).ParseFiles("generate/templates/polymorphic-property.template")
 
@@ -485,7 +488,7 @@ func generatePolymorphicProperty(typename string, name string, property Property
 	}
 
 	// Write the file out
-	if err := ioutil.WriteFile(dir+"/"+filename(name), formatted, 0644); err != nil {
+	if err := os.WriteFile(dir+"/"+filename(name), formatted, 0644); err != nil {
 		fmt.Printf("Error: Failed to write JSON Schema\n%s\n", err)
 		os.Exit(1)
 	}

pkg/goformation/generate/resource.go

@@ -72,7 +72,7 @@ func (r Resource) Required() string {
 		}
 	}
 
-	// As Go doesn't provide ordering guarentees for maps, we should
+	// As Go doesn't provide ordering guarantees for maps, we should
 	// sort the required property names by alphabetical order so that
 	// they don't shuffle on every generation, and cause annoying commit diffs
 	sort.Strings(required)

pkg/goformation/goformation.go

@@ -2,7 +2,7 @@ package goformation
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"strings"
 
 	"github.com/weaveworks/eksctl/pkg/goformation/cloudformation"
@@ -22,7 +22,7 @@ func Open(filename string) (*cloudformation.Template, error) {
 // Parsing can be tweaked via the specified options.
 func OpenWithOptions(filename string, options *intrinsics.ProcessorOptions) (*cloudformation.Template, error) {
 
-	data, err := ioutil.ReadFile(filename)
+	data, err := os.ReadFile(filename)
 	if err != nil {
 		return nil, err
 	}