Add DeletedAt to server type (#134)

jakeschuurmans · web-flow · commit 78ad1ed15d75 · 2025-04-02T12:47:12.000-04:00
* Add DeletedAt to server type

* fix lint
diff --git a/.github/workflows/push-pr-lint.yaml b/.github/workflows/push-pr-lint.yaml
@@ -12,10 +12,10 @@ jobs:
       with:
         go-version-file: go.mod
     - name: golangci-lint
-      uses: golangci/golangci-lint-action@v6
+      uses: golangci/golangci-lint-action@v7
       with:
         args: --config .golangci.yml --timeout 2m
-        version: v1.60.1
+        version: v2.0.2
 
   build-test:
     runs-on: ubuntu-latest
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,109 +1,111 @@
-# golangci.com configuration
-# https://github.com/golangci/golangci/wiki/Configuration
-
+version: "2"
 run:
   build-tags:
     - testtools
-
-linters-settings:
-  govet:
-    settings:
-      printf:
-        funcs:
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
-  gocyclo:
-    min-complexity: 12
-  dupl:
-    threshold: 100
-  goconst:
-    min-len: 2
-    min-occurrences: 2
-  misspell:
-    locale: US
-  lll:
-    line-length: 140
-  goimports:
-    local-prefixes: github.com/golangci/golangci-lint
-  gocritic:
-    enabled-tags:
-      - performance
-      - style
-      - experimental
-    disabled-checks:
-      - wrapperFunc
-  gofumpt:
-    extra-rules: true
-
 linters:
+  default: none
   enable:
-    - errcheck
-    - gosimple
-    - govet
-    - gofmt
-    - gocyclo
-    - ineffassign
-    - stylecheck
-    - misspell
-    - staticcheck
-    - unused
-    - prealloc
-    - typecheck
-    # additional linters
     - bodyclose
-    - gocritic
-    - err113
-    - goimports
-    - revive
-    - misspell
-    - noctx
-    - stylecheck
-    - gosec
     - contextcheck
     - durationcheck
+    - err113
+    - errcheck
     - errchkjson
-#    - errorlint
     - gochecksumtype
+    - gocritic
+    - gocyclo
+    - gosec
+    - govet
+    - ineffassign
+    - misspell
     - nilerr
+    - noctx
+    - prealloc
     - reassign
+    - revive
+    - staticcheck
+    - unused
     - whitespace
-  enable-all: false
-  disable-all: true
-
-issues:
-  exclude-files:
-    - "(.*/)*.*_test.go"
-  exclude-dirs:
-    - internal/fixtures
-  exclude-rules:
-    - linters:
-        - gosec
-      text: "weak cryptographic primitive"
-
-    - linters:
-        - stylecheck
-      text: "ST1016"
-  exclude:
-    # Default excludes from `golangci-lint run --help` with EXC0002 removed
-    # EXC0001 errcheck: Almost all programs ignore errors on these functions and in most cases it's ok
-    - Error return value of .((os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*print(f|ln)?|os\.(Un)?Setenv). is not checked
-    # EXC0002 golint: Annoying issue about not having a comment. The rare codebase has such comments
-    # - (comment on exported (method|function|type|const)|should have( a package)? comment|comment should be of the form)
-    # EXC0003 golint: False positive when tests are defined in package 'test'
-    - func name will be used as test\.Test.* by other packages, and that stutters; consider calling this
-    # EXC0004 govet: Common false positives
-    - (possible misuse of unsafe.Pointer|should have signature)
-    # EXC0005 staticcheck: Developers tend to write in C-style with an explicit 'break' in a 'switch', so it's ok to ignore
-    - ineffective break statement. Did you mean to break out of the outer loop
-    # EXC0006 gosec: Too many false-positives on 'unsafe' usage
-    - Use of unsafe calls should be audited
-    # EXC0007 gosec: Too many false-positives for parametrized shell calls
-    - Subprocess launch(ed with variable|ing should be audited)
-    # EXC0008 gosec: Duplicated errcheck checks
-    - (G104|G307)
-    # EXC0009 gosec: Too many issues in popular repos
-    - (Expect directory permissions to be 0750 or less|Expect file permissions to be 0600 or less)
-    # EXC0010 gosec: False positive is triggered by 'src, err := ioutil.ReadFile(filename)'
-    - Potential file inclusion via variable
+  settings:
+    dupl:
+      threshold: 100
+    goconst:
+      min-len: 2
+      min-occurrences: 2
+    gocritic:
+      disabled-checks:
+        - wrapperFunc
+      enabled-tags:
+        - performance
+        - style
+        - experimental
+    gocyclo:
+      min-complexity: 12
+    govet:
+      settings:
+        printf:
+          funcs:
+            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
+            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
+            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
+            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
+    lll:
+      line-length: 140
+    misspell:
+      locale: US
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - gosec
+        text: weak cryptographic primitive
+      - linters:
+          - staticcheck
+        text: ST1016
+      - path: (.+)\.go$
+        text: Error return value of .((os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*print(f|ln)?|os\.(Un)?Setenv). is not checked
+      - path: (.+)\.go$
+        text: func name will be used as test\.Test.* by other packages, and that stutters; consider calling this
+      - path: (.+)\.go$
+        text: (possible misuse of unsafe.Pointer|should have signature)
+      - path: (.+)\.go$
+        text: ineffective break statement. Did you mean to break out of the outer loop
+      - path: (.+)\.go$
+        text: Use of unsafe calls should be audited
+      - path: (.+)\.go$
+        text: Subprocess launch(ed with variable|ing should be audited)
+      - path: (.+)\.go$
+        text: (G104|G307)
+      - path: (.+)\.go$
+        text: (Expect directory permissions to be 0750 or less|Expect file permissions to be 0600 or less)
+      - path: (.+)\.go$
+        text: Potential file inclusion via variable
+    paths:
+      - (.*/)*.*_test.go
+      - internal/fixtures
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    gofumpt:
+      extra-rules: true
+    goimports:
+      local-prefixes:
+        - github.com/golangci/golangci-lint
+  exclusions:
+    generated: lax
+    paths:
+      - (.*/)*.*_test.go
+      - internal/fixtures
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/ginauth/errors.go b/ginauth/errors.go
@@ -35,7 +35,7 @@ type AuthError struct {
 func NewAuthenticationError(msg string) *AuthError {
 	return &AuthError{
 		HTTPErrorCode: http.StatusUnauthorized,
-		//nolint:goerr113 // it must be dynamic here
+		//nolint:err113 // it must be dynamic here
 		err: errors.New(msg),
 	}
 }
@@ -55,7 +55,7 @@ func NewAuthenticationErrorFrom(err error) *AuthError {
 func NewAuthorizationError(msg string) *AuthError {
 	return &AuthError{
 		HTTPErrorCode: http.StatusForbidden,
-		//nolint:goerr113 // it must be dynamic here
+		//nolint:err113 // it must be dynamic here
 		err: errors.New(msg),
 	}
 }
diff --git a/ginjwt/jwt.go b/ginjwt/jwt.go
@@ -148,7 +148,7 @@ func (m *Middleware) VerifyToken(c *gin.Context) (ginauth.ClaimMetadata, error)
 
 	authHeaderParts := strings.SplitN(authHeader, " ", expectedAuthHeaderParts)
 
-	if !(len(authHeaderParts) == expectedAuthHeaderParts && strings.EqualFold(authHeaderParts[0], "bearer")) {
+	if len(authHeaderParts) != expectedAuthHeaderParts || !strings.EqualFold(authHeaderParts[0], "bearer") {
 		return ginauth.ClaimMetadata{}, ginauth.NewAuthenticationError("invalid authorization header, expected format: \"Bearer token\"")
 	}
 
diff --git a/types/types.go b/types/types.go
@@ -64,6 +64,7 @@ func (c Components) ByNameModel(cSlug string, cModels []string) *Component {
 // Server is a generic server  type
 type Server struct {
 	UpdatedAt   time.Time         `json:"updated,omitempty"`
+	DeletedAt   *time.Time        `json:"deleted_at,omitempty"`
 	BIOSCfg     map[string]string `json:"bios_cfg,omitempty"`
 	ID          string            `json:"id,omitempty"`
 	Facility    string            `json:"facility,omitempty"`

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ type AuthError struct {`
`35`	`35`	`func NewAuthenticationError(msg string) *AuthError {`
`36`	`36`	`return &AuthError{`
`37`	`37`	`HTTPErrorCode: http.StatusUnauthorized,`
`38`		`- //nolint:goerr113 // it must be dynamic here`
	`38`	`+ //nolint:err113 // it must be dynamic here`
`39`	`39`	`err: errors.New(msg),`
`40`	`40`	`}`
`41`	`41`	`}`
`@@ -55,7 +55,7 @@ func NewAuthenticationErrorFrom(err error) *AuthError {`
`55`	`55`	`func NewAuthorizationError(msg string) *AuthError {`
`56`	`56`	`return &AuthError{`
`57`	`57`	`HTTPErrorCode: http.StatusForbidden,`
`58`		`- //nolint:goerr113 // it must be dynamic here`
	`58`	`+ //nolint:err113 // it must be dynamic here`
`59`	`59`	`err: errors.New(msg),`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ func (m Middleware) VerifyToken(c gin.Context) (ginauth.ClaimMetadata, error)`
`148`	`148`
`149`	`149`	`authHeaderParts := strings.SplitN(authHeader, " ", expectedAuthHeaderParts)`
`150`	`150`
`151`		`- if !(len(authHeaderParts) == expectedAuthHeaderParts && strings.EqualFold(authHeaderParts[0], "bearer")) {`
	`151`	`+ if len(authHeaderParts) != expectedAuthHeaderParts \|\| !strings.EqualFold(authHeaderParts[0], "bearer") {`
`152`	`152`	`return ginauth.ClaimMetadata{}, ginauth.NewAuthenticationError("invalid authorization header, expected format: \"Bearer token\"")`
`153`	`153`	`}`
`154`	`154`