chore: update linting configuration (#627)

.github/workflows/scan-lint.yaml

@@ -24,12 +24,3 @@ jobs:
         uses: pre-commit/action@f7acafac0271bdd064cdfa1b13f17b4350e565ed #
         with:
           extra_args: --all-files --verbose # pre-commit run --all-files --verbose
-
-      - name: Run Revive Action by pulling pre-built image
-        uses: docker://morphy/revive-action:v2@sha256:087d4e61077087755711ab7e9fae3cc899b7bb07ff8f6a30c3dfb240b1620ae8
-        with:
-          config: revive.toml
-          # Exclude patterns, separated by semicolons (optional)
-          exclude: "src/cmd/viper.go;src/config/lang/lang.go"
-          # Path pattern (default: ./...)
-          path: "./src/..."

.golangci.yml

@@ -22,3 +22,45 @@ linters:
     - goimports
     - gosec
     - govet
+    - staticcheck
+    - nilerr
+    - revive
+
+linters-settings:
+  govet:
+    enable-all: true
+    disable:
+      - shadow
+      - fieldalignment
+      - unusedwrite
+  nolintlint:
+    require-specific: true
+
+  unused:
+    local-variables-are-used: false
+
+  revive:
+    rules:
+      - name: blank-imports
+      - name: context-as-argument
+      - name: context-keys-type
+      - name: dot-imports
+      - name: error-return
+      - name: error-strings
+      - name: error-naming
+      - name: exported
+      - name: if-return
+      - name: increment-decrement
+      - name: var-declaration
+      - name: package-comments
+      - name: range
+      - name: receiver-naming
+      - name: time-naming
+      - name: unexported-return
+      - name: indent-error-flow
+      - name: errorf
+      - name: empty-block
+      - name: superfluous-else
+      - name: unused-parameter
+      - name: unreachable-code
+      - name: redefines-builtin-id

.pre-commit-config.yaml

@@ -24,8 +24,9 @@ repos:
   - repo: https://github.com/golangci/golangci-lint
     rev: v1.55.2
     hooks:
-      - id: golangci-lint
+      - id: golangci-lint-full
         args: [--timeout=5m]
+        linters:
   - repo: local
     hooks:
       - id: check-docs-and-schema

src/cmd/root.go

@@ -11,7 +11,6 @@ import (
 	"github.com/defenseunicorns/uds-cli/src/config"
 	"github.com/defenseunicorns/uds-cli/src/config/lang"
 	"github.com/defenseunicorns/uds-cli/src/types"
-	"github.com/defenseunicorns/zarf/src/cmd/common"
 	zarfCommon "github.com/defenseunicorns/zarf/src/cmd/common"
 	"github.com/defenseunicorns/zarf/src/pkg/message"
 	"github.com/spf13/cobra"
@@ -28,7 +27,7 @@ var rootCmd = &cobra.Command{
 	Use: "uds COMMAND",
 	PersistentPreRun: func(cmd *cobra.Command, _ []string) {
 		// Skip for vendor-only commands
-		if common.CheckVendorOnlyFromPath(cmd) {
+		if zarfCommon.CheckVendorOnlyFromPath(cmd) {
 			return
 		}
 

src/pkg/bundle/deploy.go

@@ -130,9 +130,6 @@ func deployPackages(packages []types.Package, resume bool, b *Bundle) error {
 		}
 
 		pkgClient := packager.NewOrDie(&pkgCfg, packager.WithSource(source), packager.WithTemp(opts.PackageSource))
-		if err != nil {
-			return err
-		}
 
 		if err := pkgClient.Deploy(); err != nil {
 			return err

src/pkg/bundle/remote.go

@@ -177,9 +177,6 @@ func (op *ociProvider) LoadBundle(opts types.BundlePullOptions, _ int) (*types.U
 		// grab sha of zarf image manifest and pull it down
 		sha := strings.Split(pkg.Ref, "@sha256:")[1] // this is where we use the SHA appended to the Zarf pkg inside the bundle
 		manifestDesc := rootManifest.Locate(sha)
-		if err != nil {
-			return nil, nil, err
-		}
 		manifestBytes, err := op.FetchLayer(ctx, manifestDesc)
 		if err != nil {
 			return nil, nil, err
@@ -311,7 +308,7 @@ func ValidateArch(arch string) error {
 	}
 	if c != nil {
 		clusterArchs, err = c.GetArchitectures()
-		if err == nil {
+		if err != nil {
 			return err
 		}
 		// check if bundle arch is in clusterArchs

src/pkg/bundle/remove.go

@@ -99,9 +99,6 @@ func removePackages(packagesToRemove []types.Package, b *Bundle) error {
 			}
 
 			pkgClient := packager.NewOrDie(&pkgCfg, packager.WithSource(source), packager.WithTemp(pkgTmp))
-			if err != nil {
-				return err
-			}
 			defer pkgClient.ClearTempPaths()
 
 			if err := pkgClient.Remove(); err != nil {

src/pkg/bundle/tarball.go

@@ -279,9 +279,6 @@ func (tp *tarballBundleProvider) PublishBundle(bundle types.UDSBundle, remote *o
 
 	// copy bundle
 	copyOpts := utils.CreateCopyOpts(layersToPush, config.CommonOptions.OCIConcurrency)
-	if err != nil {
-		return err
-	}
 	progressBar := message.NewProgressBar(estimatedBytes, fmt.Sprintf("Publishing %s:%s", remote.Repo().Reference.Repository, remote.Repo().Reference.Reference))
 	defer progressBar.Stop()
 	remote.SetProgressWriter(progressBar)

src/pkg/bundler/fetcher/local.go

@@ -198,8 +198,6 @@ func (f *localFetcher) toBundle(pkg zarfTypes.ZarfPackage, pkgTmp string) ([]oci
 		if exists, err := f.cfg.Store.Exists(ctx, desc); !exists && err == nil {
 			if err := f.cfg.Store.Push(ctx, desc, layer); err != nil {
 				return nil, err
-			} else if err != nil {
-				return nil, err
 			}
 		}
 		descs = append(descs, desc)

src/pkg/bundler/localbundle.go

@@ -222,7 +222,10 @@ func writeTarball(bundle *types.UDSBundle, artifactPathMap types.PathMap, output
 	filename := fmt.Sprintf("%s%s-%s-%s.tar.zst", config.BundlePrefix, bundle.Metadata.Name, bundle.Metadata.Architecture, bundle.Metadata.Version)
 
 	if !helpers.IsDir(outputDir) {
-		os.MkdirAll(outputDir, 0755)
+		err := os.MkdirAll(outputDir, 0755)
+		if err != nil {
+			return err
+		}
 	}
 
 	dst := filepath.Join(outputDir, filename)

src/pkg/sources/remote.go

@@ -183,15 +183,13 @@ func (r *RemoteBundle) downloadPkgFromRemoteBundle() ([]ocispec.Descriptor, erro
 	estimatedBytes := int64(0)
 	layersToPull := []ocispec.Descriptor{pkgManifestDesc}
 	layersInBundle := []ocispec.Descriptor{pkgManifestDesc}
-	numLayersVerified := 0.0
 
 	for _, layer := range pkgManifest.Layers {
 		ok, err := r.Remote.Repo().Blobs().Exists(ctx, layer)
 		if err != nil {
 			return nil, err
 		}
 		progressBar.Add(1)
-		numLayersVerified++
 		if ok {
 			estimatedBytes += layer.Size
 			layersInBundle = append(layersInBundle, layer)

src/pkg/sources/tarball.go

@@ -19,7 +19,6 @@ import (
 	"github.com/defenseunicorns/zarf/src/pkg/packager/filters"
 	"github.com/defenseunicorns/zarf/src/pkg/packager/sources"
 	zarfUtils "github.com/defenseunicorns/zarf/src/pkg/utils"
-	"github.com/defenseunicorns/zarf/src/types"
 	zarfTypes "github.com/defenseunicorns/zarf/src/types"
 	av4 "github.com/mholt/archiver/v4"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@@ -59,7 +58,7 @@ func (t *TarballBundle) LoadPackage(dst *layout.PackagePaths, filter filters.Com
 	}
 
 	// if in dev mode and package is a zarf init config, return an empty package
-	if config.Dev && pkg.Kind == types.ZarfInitConfig {
+	if config.Dev && pkg.Kind == zarfTypes.ZarfInitConfig {
 		return zarfTypes.ZarfPackage{}, nil, nil
 	}
 

src/pkg/utils/oci.go

@@ -85,11 +85,9 @@ func ToOCIRemote(t any, mediaType string, remote *oci.OrasRemote) (*ocispec.Desc
 func CreateCopyOpts(layersToPull []ocispec.Descriptor, concurrency int) oras.CopyOptions {
 	var copyOpts oras.CopyOptions
 	copyOpts.Concurrency = concurrency
-	estimatedBytes := int64(0)
 	var shas []string
 	for _, layer := range layersToPull {
 		if len(layer.Digest.String()) > 0 {
-			estimatedBytes += layer.Size
 			shas = append(shas, layer.Digest.Encoded())
 		}
 	}

src/pkg/utils/utils.go

@@ -66,11 +66,9 @@ func ConfigureLogs(cmd *cobra.Command) error {
 		return err
 	}
 
-	logWriter := io.MultiWriter(logFile)
-
 	// use Zarf pterm output
 	message.Notef("Saving log file to %s", tmpLogLocation)
-	logWriter = io.MultiWriter(os.Stderr, logFile)
+	logWriter := io.MultiWriter(os.Stderr, logFile)
 	pterm.SetDefaultOutput(logWriter)
 	message.Debugf(fmt.Sprintf("Saving log file to %s", tmpLogLocation))
 	return nil