chore(golangci-lint): enable format, import, and unused presets; disable depguard (#387)

Signed-off-by: Chris Gianelloni <[email protected]>

Author: wolf31o2

.golangci.yml

@@ -4,6 +4,8 @@ issues:
   max-issues-per-linter: 0
   max-same-issues: 0
 linters:
+  disable:
+    - depguard
   enable:
     - errcheck
     - gosimple
@@ -12,9 +14,15 @@ linters:
     - staticcheck
     - unused
     # Defaults above ours below
+    - copyloopvar
+    - usestdlibvars
+    - whitespace
   presets:
     - bugs
+    - format
+    - import
     - performance
+    - unused
 #linters-settings:
 #  errcheck:
 #    check-type-assertions: true

cmd/cardano-up/context.go

@@ -69,7 +69,7 @@ func contextListCommand() *cobra.Command {
 				tmpContextNames = append(tmpContextNames, contextName)
 			}
 			sort.Strings(tmpContextNames)
-			//for contextName, context := range contexts {
+			// for contextName, context := range contexts {
 			for _, contextName := range tmpContextNames {
 				context := contexts[contextName]
 				activeMarker := " "

cmd/cardano-up/list_test.go

@@ -16,7 +16,13 @@ func TestCompareVersions(t *testing.T) {
 	for _, tc := range cases {
 		result := compareVersions(tc.v1, tc.v2)
 		if result == tc.expected {
-			t.Logf("Test Passed: compareVersions(%s, %s) = %v (Expected: %v)\n", tc.v1, tc.v2, result, tc.expected)
+			t.Logf(
+				"Test Passed: compareVersions(%s, %s) = %v (Expected: %v)\n",
+				tc.v1,
+				tc.v2,
+				result,
+				tc.expected,
+			)
 
 		} else {
 			t.Errorf("Test Failed: compareVersions(%s, %s) = %v; Expected %v", tc.v1, tc.v2, result, tc.expected)

cmd/cardano-up/main.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/blinklabs-io/cardano-up/internal/consolelog"
 	"github.com/blinklabs-io/cardano-up/pkgmgr"
-
 	"github.com/spf13/cobra"
 )
 

internal/version/version.go

@@ -19,8 +19,10 @@ import (
 )
 
 // These are populated at build time
-var Version string
-var CommitHash string
+var (
+	Version    string
+	CommitHash string
+)
 
 func GetVersionString() string {
 	if Version != "" {

pkgmgr/package.go

@@ -627,7 +627,7 @@ func (p Package) services(
 						err,
 					),
 				)
-				continue
+				return ret, ErrOperationFailed
 			}
 			ret = append(ret, dockerService)
 		}
@@ -674,6 +674,7 @@ type PackageInstallStepDocker struct {
 
 func (p *PackageInstallStepDocker) validate(cfg Config) error {
 	if p.Image == "" {
+		cfg.Logger.Debug("docker image missing")
 		return errors.New("docker image must be provided")
 	}
 	// TODO: add more checks
@@ -1034,7 +1035,7 @@ func (p *PackageInstallStepFile) deactivate(cfg Config, pkgName string) error {
 				return err
 			}
 		}
-		cfg.Logger.Debug("removed symlink " + binPath)
+		cfg.Logger.Debug("removed symlink " + binPath + "for " + pkgName)
 	}
 	return nil
 }

pkgmgr/package_test.go

@@ -128,6 +128,8 @@ func TestOSAndARCH(t *testing.T) {
 	}
 
 	if actualOS == expectOS && actualARCH == expectARCH {
-		t.Logf("Test is successful and OS, ARCH values are correctly injected to config template")
+		t.Logf(
+			"Test is successful and OS, ARCH values are correctly injected to config template",
+		)
 	}
 }

pkgmgr/pkgmgr.go

@@ -122,7 +122,6 @@ func (p *PackageManager) Up() error {
 		if err != nil {
 			return err
 		}
-
 	}
 	return nil
 }
@@ -514,10 +513,16 @@ func (p *PackageManager) Info(pkgs ...string) error {
 			}
 		}
 		if statusOutput != "" {
-			infoOutput += "\n\nServices:\n\n" + strings.TrimSuffix(statusOutput, "\n")
+			infoOutput += "\n\nServices:\n\n" + strings.TrimSuffix(
+				statusOutput,
+				"\n",
+			)
 		}
 		if portOutput != "" {
-			infoOutput += "\n\nMapped ports:\n\n" + strings.TrimSuffix(portOutput, "\n")
+			infoOutput += "\n\nMapped ports:\n\n" + strings.TrimSuffix(
+				portOutput,
+				"\n",
+			)
 		}
 		if idx < len(infoPkgs)-1 {
 			infoOutput += "\n\n---\n\n"

pkgmgr/registry.go

@@ -138,7 +138,12 @@ func registryPackagesUrl(cfg Config, validate bool) ([]Package, error) {
 			"Fetching package registry " + cfg.RegistryUrl,
 		)
 		ctx := context.Background()
-		req, err := http.NewRequestWithContext(ctx, http.MethodGet, cfg.RegistryUrl, nil)
+		req, err := http.NewRequestWithContext(
+			ctx,
+			http.MethodGet,
+			cfg.RegistryUrl,
+			nil,
+		)
 		if err != nil {
 			return nil, err
 		}

pkgmgr/state.go

@@ -94,7 +94,7 @@ func (s *State) saveFile(filename string, src any) error {
 	// Create parent directory if it doesn't exist
 	if _, err := os.Stat(s.config.ConfigDir); err != nil {
 		if os.IsNotExist(err) {
-			if err := os.MkdirAll(s.config.ConfigDir, 0700); err != nil {
+			if err := os.MkdirAll(s.config.ConfigDir, 0o700); err != nil {
 				return err
 			}
 		}
@@ -107,7 +107,7 @@ func (s *State) saveFile(filename string, src any) error {
 	if err != nil {
 		return err
 	}
-	if err := os.WriteFile(tmpPath, yamlContent, 0600); err != nil {
+	if err := os.WriteFile(tmpPath, yamlContent, 0o600); err != nil {
 		return err
 	}
 	return nil