feat: add base

euskadi31 · euskadi31 · commit 6237865cf9b6 · 2024-03-11T17:03:42.000+01:00
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -2,96 +2,93 @@ name: Go
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
-
   build:
     name: Build
     runs-on: ubuntu-latest
     steps:
-
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v5
-      with:
-        go-version: "1.x"
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v4
-
-    - name: Build
-      run: go build -race -v ./...
-
-    - name: Test
-      run: go test -race -cover -coverprofile ./coverage.out ./...
-
-    - name: Coverage
-      id: coverage
-      run: |
-        go tool cover -func ./coverage.out | tee -a coverage.txt
-        echo "COVERAGE_CONTENT<<EOF" >> $GITHUB_ENV
-        cat coverage.txt >> $GITHUB_ENV
-        echo "EOF" >> $GITHUB_ENV
-
-
-    - uses: actions/github-script@v4
-      if: github.event_name == 'pull_request'
-      continue-on-error: true
-      env:
-        COVERAGE_CONTENT: "${{ env.COVERAGE_CONTENT }}"
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          const output = `Code Coverage\n
-          \`\`\`\n
-          ${process.env.COVERAGE_CONTENT}
-          \`\`\`
-
-          *Pusher: @${{ github.actor }}, Action: \`${{ github.event_name }}\`, Workflow: \`${{ github.workflow }}\`*`;
-
-          const response = await github.issues.listComments({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            issue_number: context.issue.number,
-          });
-
-          var comments = response.data;
-
-          console.log(comments);
-
-          if (comments.length > 0) {
-            comments = comments.filter(comment => comment.body.includes('Code Coverage') && comment.user.type === 'Bot');
-          }
-
-          if (comments.length > 0) {
-            const comment = comments.shift();
-
-            github.issues.updateComment({
-              issue_number: context.issue.number,
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.x"
+        id: go
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v4
+
+      - name: Build
+        run: go build -race -v ./...
+
+      - name: Test
+        run: go test -race -cover -coverprofile ./coverage.out ./...
+
+      - name: Coverage
+        id: coverage
+        run: |
+          go tool cover -func ./coverage.out | tee -a coverage.txt
+          echo "COVERAGE_CONTENT<<EOF" >> $GITHUB_ENV
+          cat coverage.txt >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
+      - uses: actions/github-script@v4
+        if: github.event_name == 'pull_request'
+        continue-on-error: true
+        env:
+          COVERAGE_CONTENT: "${{ env.COVERAGE_CONTENT }}"
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const output = `Code Coverage\n
+            \`\`\`\n
+            ${process.env.COVERAGE_CONTENT}
+            \`\`\`
+
+            *Pusher: @${{ github.actor }}, Action: \`${{ github.event_name }}\`, Workflow: \`${{ github.workflow }}\`*`;
+
+            const response = await github.issues.listComments({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              comment_id: comment.id,
-              body: output
-            })
-          } else {
-            github.issues.createComment({
               issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: output
-            })
-          }
-
-    - name: Run golangci-lint
-      uses: golangci/golangci-lint-action@v4
-      with:
-        version: v1.52.2
-        skip-pkg-cache: true
-
-    - name: Coveralls
-      uses: shogo82148/actions-goveralls@v1
-      with:
-        path-to-profile: coverage.out
+            });
+
+            var comments = response.data;
+
+            console.log(comments);
+
+            if (comments.length > 0) {
+              comments = comments.filter(comment => comment.body.includes('Code Coverage') && comment.user.type === 'Bot');
+            }
+
+            if (comments.length > 0) {
+              const comment = comments.shift();
+
+              github.issues.updateComment({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: comment.id,
+                body: output
+              })
+            } else {
+              github.issues.createComment({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: output
+              })
+            }
+
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@v4
+        with:
+          version: v1.55.2
+          skip-cache: true
+
+      - name: Coveralls
+        uses: shogo82148/actions-goveralls@v1
+        with:
+          path-to-profile: coverage.out
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,56 +1,6 @@
-run:
-  concurrency: 4
-  deadline: 1m
-  issues-exit-code: 1
-  tests: false
-  skip-files:
-    - ".*_mock\\.go"
-    - "mock_.*\\.go"
-    - ".*/pkg/mod/.*$"
-
-output:
-  format: colored-line-number
-  print-issued-lines: true
-  print-linter-name: true
-
-linters-settings:
-  errcheck:
-    check-type-assertions: false
-    check-blank: false
-  govet:
-    check-shadowing: false
-  revive:
-    ignore-generated-header: true
-    severity: warning
-  gofmt:
-    simplify: true
-  gocyclo:
-    min-complexity: 18
-  maligned:
-    suggest-new: true
-  dupl:
-    threshold: 80
-  goconst:
-    min-len: 4
-    min-occurrences: 3
-  depguard:
-    list-type: blacklist
-    include-go-root: false
-    packages:
-      - github.com/davecgh/go-spew/spew
-  misspell:
-    locale: US
-    ignore-words:
-      - cancelled
-  goimports:
-    local-prefixes: go.opentelemetry.io
-
-
 linters:
   disable-all: true
   enable:
-    - deadcode
-    - depguard
     - errcheck
     - gas
     - goconst
@@ -61,17 +11,14 @@ linters:
     - ineffassign
     - megacheck
     - misspell
-    - structcheck
     - typecheck
     - unconvert
-    - varcheck
     - gosimple
     - staticcheck
     - unused
     - asciicheck
     - bodyclose
     - dogsled
-    - dupl
     - durationcheck
     - errorlint
     - exhaustive
@@ -81,15 +28,58 @@ linters:
     - gocritic
     - godot
     - gosec
-    - ifshort
     - nestif
     - nilerr
     - nlreturn
     - noctx
     - prealloc
     - predeclared
     - sqlclosecheck
-    - tagliatelle
     - whitespace
+    - wrapcheck
     - wsl
   fast: false
+linters-settings:
+  depguard:
+    rules:
+      main:
+        allow:
+          - $all
+  dupl:
+    threshold: 99
+  errcheck:
+    check-blank: false
+    check-type-assertions: false
+  goconst:
+    min-len: 3
+    min-occurrences: 2
+  gocyclo:
+    min-complexity: 18
+  gofmt:
+    simplify: true
+  goimports:
+    local-prefixes: go.opentelemetry.io
+  govet:
+    check-shadowing: false
+  maligned:
+    suggest-new: true
+  misspell:
+    ignore-words:
+      - cancelled
+    locale: US
+  revive:
+    ignore-generated-header: true
+    severity: warning
+output:
+  format: colored-line-number
+  print-issued-lines: true
+  print-linter-name: true
+run:
+  concurrency: 4
+  issues-exit-code: 1
+  skip-files:
+    - .*_mock\.go
+    - mock_.*\.go
+    - .*/pkg/mod/.*$
+  tests: false
+  timeout: 1m
diff --git a/filter.go b/filter.go
@@ -78,7 +78,7 @@ func (f inputFilter) filterField(key string, value interface{}) (interface{}, er
 	for _, filter := range filters {
 		val, err = filter.Filter(val)
 		if err != nil {
-			return val, err
+			return val, fmt.Errorf("filter error: %w", err)
 		}
 	}
 
@@ -141,7 +141,7 @@ func (f inputFilter) filterFieldValues(key string, values []interface{}) ([]inte
 		for _, filter := range filters {
 			val, err = filter.Filter(val)
 			if err != nil {
-				return retvals, err
+				return retvals, fmt.Errorf("filter error: %w", err)
 			}
 
 			retvals[i] = val

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func (f inputFilter) filterField(key string, value interface{}) (interface{}, er`
`78`	`78`	`for _, filter := range filters {`
`79`	`79`	`val, err = filter.Filter(val)`
`80`	`80`	`if err != nil {`
`81`		`- return val, err`
	`81`	`+ return val, fmt.Errorf("filter error: %w", err)`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`@@ -141,7 +141,7 @@ func (f inputFilter) filterFieldValues(key string, values []interface{}) ([]inte`
`141`	`141`	`for _, filter := range filters {`
`142`	`142`	`val, err = filter.Filter(val)`
`143`	`143`	`if err != nil {`
`144`		`- return retvals, err`
	`144`	`+ return retvals, fmt.Errorf("filter error: %w", err)`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`retvals[i] = val`