Merge pull request #134 from ekristen/chore-golangci-linting

chore: golangci-lint updates

Author: ekristen

.github/workflows/golangci-lint.yml

@@ -1,25 +1,23 @@
 name: golangci-lint
 
 on:
-  push:
-    branches:
-      - main
   pull_request:
     branches:
       - main
+      - next
 
 permissions:
   contents: read
 
 jobs:
-  lint:
-    name: lint
+  golangci-lint:
+    name: golangci-lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
         with:
-          go-version: '1.21.x'
+          go-version: "1.24.x"
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8

.golangci.yaml

@@ -1,53 +1,17 @@
-linters-settings:
-  dupl:
-    threshold: 100
-  funlen:
-    lines: 100
-    statements: 50
-  goconst:
-    min-len: 2
-    min-occurrences: 3
-  gocritic:
-    enabled-tags:
-      - diagnostic
-      - experimental
-      - opinionated
-      - performance
-      - style
-    disabled-checks:
-      - dupImport # https://github.com/go-critic/go-critic/issues/845
-      - ifElseChain
-      - octalLiteral
-      - whyNoLint
-  gocyclo:
-    min-complexity: 15
-  golint:
-    min-confidence: 0
-  lll:
-    line-length: 140
-  maligned:
-    suggest-new: true
-  misspell:
-    locale: US
-
+version: "2"
 linters:
-  # please, do not use `enable-all`: it's deprecated and will be removed soon.
-  # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
-  disable-all: true
+  default: none
   enable:
     - bodyclose
+    - copyloopvar
     - dogsled
     - errcheck
-    - copyloopvar
     - funlen
     - goconst
     - gocritic
     - gocyclo
-    - gofmt
-    - goimports
     - goprintffuncname
     - gosec
-    - gosimple
     - govet
     - ineffassign
     - lll
@@ -57,18 +21,59 @@ linters:
     - noctx
     - nolintlint
     - staticcheck
-    - stylecheck
-    - typecheck
     - unconvert
     - unparam
     - unused
     - whitespace
-
-issues:
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - funlen
-
-run:
-  timeout: 2m
+  settings:
+    dupl:
+      threshold: 100
+    funlen:
+      lines: 100
+      statements: 50
+    goconst:
+      min-len: 2
+      min-occurrences: 3
+    gocritic:
+      disabled-checks:
+        - dupImport
+        - ifElseChain
+        - octalLiteral
+        - whyNoLint
+      enabled-tags:
+        - diagnostic
+        - experimental
+        - opinionated
+        - performance
+        - style
+    gocyclo:
+      min-complexity: 15
+    lll:
+      line-length: 140
+    misspell:
+      locale: US
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - funlen
+        path: _test\.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

pkg/commands/list/list.go

@@ -29,13 +29,15 @@ func execute(c *cli.Context) error {
 		} else {
 			_, _ = color.New(color.Bold).Printf("%-55s", name)
 			c := color.FgGreen
-			if reg.Scope == azure.TenantScope {
+			switch reg.Scope {
+			case azure.TenantScope:
 				c = color.FgHiGreen
-			} else if reg.Scope == azure.SubscriptionScope {
+			case azure.SubscriptionScope:
 				c = color.FgHiBlue
-			} else if reg.Scope == azure.ResourceGroupScope {
+			case azure.ResourceGroupScope:
 				c = color.FgHiMagenta
 			}
+
 			_, _ = color.New(c).Printf("%s\n", string(reg.Scope))
 		}
 	}

resources/disk.go

@@ -88,7 +88,7 @@ func (l DiskLister) List(ctx context.Context, o interface{}) ([]resource.Resourc
 				client:       client,
 				Name:         r.Name,
 				Tags:         r.Tags,
-				CreationDate: ptr.Time(r.DiskProperties.TimeCreated.Time),
+				CreationDate: ptr.Time(r.TimeCreated.Time),
 			})
 		}
 

resources/security-alert.go

@@ -106,7 +106,7 @@ func (l SecurityAlertsLister) List(ctx context.Context, o interface{}) ([]resour
 				ID:          *g.ID,
 				Name:        *g.Name,
 				DisplayName: ptr.ToString(g.AlertDisplayName),
-				Status:      string(g.AlertProperties.Status),
+				Status:      string(g.Status),
 			})
 		}
 

resources/snapshot.go

@@ -88,7 +88,7 @@ func (l ComputeSnapshotLister) List(ctx context.Context, o interface{}) ([]resou
 				client:       client,
 				Name:         r.Name,
 				Tags:         r.Tags,
-				CreationDate: ptr.Time(r.SnapshotProperties.TimeCreated.Time),
+				CreationDate: ptr.Time(r.TimeCreated.Time),
 			})
 		}
 

resources/subscription-role-assignment.go

@@ -127,7 +127,7 @@ func (l *SubscriptionRoleAssignmentLister) List(ctx context.Context, o interface
 			}
 
 			if _, ok := l.roleNameCache[t.Properties.RoleDefinitionID]; !ok {
-				l.roleNameCache[t.Properties.RoleDefinitionID] = rel.RoleDefinition.Properties.RoleName
+				l.roleNameCache[t.Properties.RoleDefinitionID] = rel.Properties.RoleName
 			}
 
 			var principalName = ptr.String("unknown")