Update linter version and migrated configuration

.github/workflows/test.yml

@@ -41,7 +41,7 @@ jobs:
           go-version-file: go.mod
           check-latest: true
 
-      - uses: golangci/golangci-lint-action@4696ba8babb6127d732c3c6dde519db15edab9ea # v6.5.1
+      - uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
         with:
           version: latest
 

.golangci.yml

@@ -1,29 +1,29 @@
+version: "2"
 run:
-  timeout: 10m
-
-  # Run linters over integration tests
   build-tags:
     - integration
-
 linters:
-  disable-all: true # Disable defaults, then enable the ones we want
+  default: none
   enable:
     - errcheck
-    - gosimple
+    - gosec
     - govet
     - ineffassign
     - staticcheck
-    # - structcheck https://github.com/golangci/golangci-lint/issues/2649
-    - typecheck
     - unused
-    # - bodyclose Disabled so concurrent GETs can happen
-    - stylecheck
-    - gosec
+  settings:
+    staticcheck:
+      checks:
+        - -SA1019
+        - all
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+formatters:
+  enable:
+    - gofmt
     - goimports
-    - gci
-
-linters-settings:
-  staticcheck:
-    checks:
-      - all
-      - "-SA1019" # Disable "rand.Seed has been deprecated"

cmd/cryptography/checksum.go

@@ -62,7 +62,7 @@ func GenerateChecksum(sourcePack, destinationDir, hashFunction string) error {
 		}
 		base = filepath.Clean(destinationDir) + string(filepath.Separator) + strings.TrimSuffix(string(filepath.Base(sourcePack)), ".pack")
 	}
-	checksumFilename := base + "." + strings.Replace(hashFunction, "-", "", -1) + ".checksum"
+	checksumFilename := base + "." + strings.ReplaceAll(hashFunction, "-", "") + ".checksum"
 	if utils.FileExists(checksumFilename) {
 		log.Errorf("\"%s\" already exists, choose a diferent path", checksumFilename)
 		return errs.ErrPathAlreadyExists

cmd/installer/pack.go

@@ -453,11 +453,11 @@ func (p *PackType) uninstall(installation *PacksInstallationType) error {
 func (p *PackType) readEula() ([]byte, error) {
 	log.Debug("Reading EULA")
 
-	licenseFileName := strings.Replace(p.Pdsc.License, "\\", "/", -1)
+	licenseFileName := strings.ReplaceAll(p.Pdsc.License, "\\", "/")
 
 	// License contains the license path inside the pack file
 	for _, file := range p.zipReader.File {
-		possibleLicense := strings.Replace(file.Name, "\\", "/", -1)
+		possibleLicense := strings.ReplaceAll(file.Name, "\\", "/")
 		if possibleLicense == licenseFileName {
 
 			reader, _ := file.Open()

cmd/installer/root.go

@@ -915,12 +915,12 @@ func findInstalledPacks(addLocalPacks, removeDuplicates bool) ([]installedPack,
 		return nil, err
 	}
 	for _, match := range matches {
-		pdscPath := strings.Replace(match, Installation.PackRoot, "", -1)
+		pdscPath := strings.ReplaceAll(match, Installation.PackRoot, "")
 		packName, _ := filepath.Split(pdscPath)
-		packName = strings.Replace(packName, "/", " ", -1)
-		packName = strings.Replace(packName, "\\", " ", -1)
+		packName = strings.ReplaceAll(packName, "/", " ")
+		packName = strings.ReplaceAll(packName, "\\", " ")
 		packName = strings.Trim(packName, " ")
-		packName = strings.Replace(packName, " ", ".", -1)
+		packName = strings.ReplaceAll(packName, " ", ".")
 
 		packNameBits := strings.SplitN(packName, ".", 3)
 
@@ -978,6 +978,7 @@ func findInstalledPacks(addLocalPacks, removeDuplicates bool) ([]installedPack,
 			noDupInstalledPacks = append(noDupInstalledPacks, installedPacks[0])
 			for i, installedPack := range installedPacks {
 				if i > 0 {
+					//nolint:staticcheck // intentional logic for clarity
 					if !(installedPacks[last].Vendor == installedPack.Vendor && installedPacks[last].Name == installedPack.Name) {
 						noDupInstalledPacks = append(noDupInstalledPacks, installedPack)
 						last = i

cmd/installer/root_pack_list_test.go

@@ -87,7 +87,7 @@ func ExampleListInstalledPacks_list() {
 	_ = installer.ReadIndexFiles()
 	defer removePackRoot(localTestingDir)
 
-	pdscFilePath := strings.Replace(publicLocalPack123, ".1.2.3.pack", ".pdsc", -1)
+	pdscFilePath := strings.ReplaceAll(publicLocalPack123, ".1.2.3.pack", ".pdsc")
 	_ = utils.CopyFile(pdscFilePath, filepath.Join(installer.Installation.WebDir, "TheVendor.PublicLocalPack.pdsc"))
 	_ = installer.Installation.PublicIndexXML.AddPdsc(xml.PdscTag{
 		Vendor:  "TheVendor",
@@ -125,7 +125,7 @@ func ExampleListInstalledPacks_listCached() {
 	_ = installer.ReadIndexFiles()
 	defer removePackRoot(localTestingDir)
 
-	pdscFilePath := strings.Replace(publicLocalPack123, ".1.2.3.pack", ".pdsc", -1)
+	pdscFilePath := strings.ReplaceAll(publicLocalPack123, ".1.2.3.pack", ".pdsc")
 	_ = utils.CopyFile(pdscFilePath, filepath.Join(installer.Installation.WebDir, "TheVendor.PublicLocalPack.pdsc"))
 	_ = installer.Installation.PublicIndexXML.AddPdsc(xml.PdscTag{
 		Vendor:  "TheVendor",
@@ -165,7 +165,7 @@ func TestListInstalledPacks(t *testing.T) {
 		assert.Nil(installer.ReadIndexFiles())
 		defer removePackRoot(localTestingDir)
 
-		pdscFilePath := strings.Replace(publicLocalPack123, ".1.2.3.pack", ".pdsc", -1)
+		pdscFilePath := strings.ReplaceAll(publicLocalPack123, ".1.2.3.pack", ".pdsc")
 		assert.Nil(utils.CopyFile(pdscFilePath, filepath.Join(installer.Installation.WebDir, "TheVendor.PublicLocalPack.pdsc")))
 		assert.Nil(installer.Installation.PublicIndexXML.AddPdsc(xml.PdscTag{
 			Vendor:  "TheVendor",
@@ -251,7 +251,7 @@ func ExampleListInstalledPacks_listMalformedInstalledPacks() {
 	_ = installer.ReadIndexFiles()
 	defer removePackRoot(localTestingDir)
 
-	pdscFilePath := strings.Replace(publicLocalPack123, ".1.2.3.pack", ".pdsc", -1)
+	pdscFilePath := strings.ReplaceAll(publicLocalPack123, ".1.2.3.pack", ".pdsc")
 	_ = utils.CopyFile(pdscFilePath, filepath.Join(installer.Installation.WebDir, "TheVendor.PublicLocalPack.pdsc"))
 	_ = installer.Installation.PublicIndexXML.AddPdsc(xml.PdscTag{
 		Vendor:  "TheVendor",
@@ -290,7 +290,7 @@ func ExampleListInstalledPacks_filter() {
 	_ = installer.ReadIndexFiles()
 	defer removePackRoot(localTestingDir)
 
-	pdscFilePath := strings.Replace(publicLocalPack123, ".1.2.3.pack", ".pdsc", -1)
+	pdscFilePath := strings.ReplaceAll(publicLocalPack123, ".1.2.3.pack", ".pdsc")
 	_ = utils.CopyFile(pdscFilePath, filepath.Join(installer.Installation.WebDir, "TheVendor.PublicLocalPack.pdsc"))
 	_ = installer.Installation.PublicIndexXML.AddPdsc(xml.PdscTag{
 		Vendor:  "TheVendor",
@@ -326,7 +326,7 @@ func ExampleListInstalledPacks_filterErrorPackages() {
 	_ = installer.ReadIndexFiles()
 	defer removePackRoot(localTestingDir)
 
-	pdscFilePath := strings.Replace(publicLocalPack123, ".1.2.3.pack", ".pdsc", -1)
+	pdscFilePath := strings.ReplaceAll(publicLocalPack123, ".1.2.3.pack", ".pdsc")
 	_ = utils.CopyFile(pdscFilePath, filepath.Join(installer.Installation.WebDir, "TheVendor.PublicLocalPack.pdsc"))
 	_ = installer.Installation.PublicIndexXML.AddPdsc(xml.PdscTag{
 		Vendor:  "TheVendor",
@@ -364,7 +364,7 @@ func ExampleListInstalledPacks_filterInvalidChars() {
 	_ = installer.ReadIndexFiles()
 	defer removePackRoot(localTestingDir)
 
-	pdscFilePath := strings.Replace(publicLocalPack123, ".1.2.3.pack", ".pdsc", -1)
+	pdscFilePath := strings.ReplaceAll(publicLocalPack123, ".1.2.3.pack", ".pdsc")
 	_ = utils.CopyFile(pdscFilePath, filepath.Join(installer.Installation.WebDir, "TheVendor.PublicLocalPack.pdsc"))
 	_ = installer.Installation.PublicIndexXML.AddPdsc(xml.PdscTag{
 		Vendor:  "TheVendor",
@@ -399,7 +399,7 @@ func ExampleListInstalledPacks_filteradditionalMessages() {
 	_ = installer.ReadIndexFiles()
 	defer removePackRoot(localTestingDir)
 
-	pdscFilePath := strings.Replace(publicLocalPack123, ".1.2.3.pack", ".pdsc", -1)
+	pdscFilePath := strings.ReplaceAll(publicLocalPack123, ".1.2.3.pack", ".pdsc")
 	_ = utils.CopyFile(pdscFilePath, filepath.Join(installer.Installation.WebDir, "TheVendor.PublicLocalPack.pdsc"))
 	_ = installer.Installation.PublicIndexXML.AddPdsc(xml.PdscTag{
 		Vendor:  "TheVendor",

cmd/installer/root_test.go

@@ -488,7 +488,7 @@ func TestUpdatePublicIndex(t *testing.T) {
 		assert.Nil(err)
 		indexServer := NewServer()
 		// The psd URL needs to be updated as it's not known beforehand
-		updatedIndex := []byte(strings.Replace(string(indexContent), "https://127.0.0.1", indexServer.URL(), -1))
+		updatedIndex := []byte(strings.ReplaceAll(string(indexContent), "https://127.0.0.1", indexServer.URL()))
 		indexServer.AddRoute(installer.PublicIndex, updatedIndex)
 		indexPath := indexServer.URL() + installer.PublicIndex
 
@@ -619,7 +619,7 @@ func TestUpdatePublicIndex(t *testing.T) {
 		assert.Nil(err)
 		indexServer := NewServer()
 		// The psd URL needs to be updated as it's not known beforehand
-		updatedIndex := []byte(strings.Replace(string(indexContent), "https://127.0.0.1", indexServer.URL(), -1))
+		updatedIndex := []byte(strings.ReplaceAll(string(indexContent), "https://127.0.0.1", indexServer.URL()))
 		indexServer.AddRoute(installer.PublicIndex, updatedIndex)
 		indexPath := indexServer.URL() + installer.PublicIndex
 
@@ -650,7 +650,7 @@ func TestUpdatePublicIndex(t *testing.T) {
 		assert.Nil(err)
 		indexServer := NewServer()
 		// The psd URL needs to be updated as it's not known beforehand
-		updatedIndex := []byte(strings.Replace(string(indexContent), "https://127.0.0.1", indexServer.URL(), -1))
+		updatedIndex := []byte(strings.ReplaceAll(string(indexContent), "https://127.0.0.1", indexServer.URL()))
 		indexServer.AddRoute(installer.PublicIndex, updatedIndex)
 		indexPath := indexServer.URL() + installer.PublicIndex
 

cmd/ui/eula.go

@@ -121,7 +121,7 @@ func NewLicenseWindow(licenseTitle, licenseContents, promptText string) *License
 			}
 			v.Wrap = true
 			v.Title = licenseTitle
-			fmt.Fprint(v, strings.Replace(licenseContents, "\r", "", -1))
+			fmt.Fprint(v, strings.ReplaceAll(licenseContents, "\r", ""))
 		}
 
 		// Prompt window dimensions

cmd/utils/packs.go

@@ -222,6 +222,7 @@ func ExtractPackInfo(packPath string) (PackInfo, error) {
 		// location can be either a URL or a path to the local
 		// file system. If it's the latter, make sure to fill in
 		// in case the file is coming from the current directory
+		//nolint:staticcheck // intentional logic for clarity
 		if !(strings.HasPrefix(location, "http://") || strings.HasPrefix(location, "https://") || strings.HasPrefix(location, "file://")) {
 			if !filepath.IsAbs(location) {
 				if len(filepath.VolumeName(location)) == 0 && len(location) > 0 && (location[0] == '/' || location[0] == '\\') {

cmd/utils/utils.go

@@ -87,6 +87,7 @@ func (t *TimeoutTransport) RoundTrip(req *http.Request) (*http.Response, error)
 
 	select {
 	case <-timeout:
+		//nolint:staticcheck
 		t.Transport.CancelRequest(req)
 		return nil, errs.ErrHTTPtimeout
 	case r := <-resp: