Skip to content

Commit ccfd1f1

Browse files
alanhamlettalanhamlett
authored
Merge pull request #1246 from wakatime/develop
Release v1.132.0
2 parents 71f75a0 + 636336b commit ccfd1f1

30 files changed

+350
-163
lines changed

‎.github/workflows/on_push.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Checkout
2222
uses: actions/checkout@v4
2323
-
24-
uses: actions/setup-go@v5
24+
uses: actions/setup-go@v6
2525
with:
2626
go-version-file: ${{ env.GO_VERSION_FILE }}
2727
check-latest: ${{ env.CHECK_LATEST }}
@@ -56,7 +56,7 @@ jobs:
5656
name: Checkout
5757
uses: actions/checkout@v4
5858
-
59-
uses: actions/setup-go@v5
59+
uses: actions/setup-go@v6
6060
with:
6161
go-version-file: ${{ env.GO_VERSION_FILE }}
6262
check-latest: ${{ env.CHECK_LATEST }}
@@ -81,7 +81,7 @@ jobs:
8181
name: Checkout
8282
uses: actions/checkout@v4
8383
-
84-
uses: actions/setup-go@v5
84+
uses: actions/setup-go@v6
8585
with:
8686
go-version-file: ${{ env.GO_VERSION_FILE }}
8787
check-latest: ${{ env.CHECK_LATEST }}
@@ -107,7 +107,7 @@ jobs:
107107
name: Checkout
108108
uses: actions/checkout@v4
109109
-
110-
uses: actions/setup-go@v5
110+
uses: actions/setup-go@v6
111111
with:
112112
go-version-file: ${{ env.GO_VERSION_FILE }}
113113
check-latest: ${{ env.CHECK_LATEST }}
@@ -132,7 +132,7 @@ jobs:
132132
name: Checkout
133133
uses: actions/checkout@v4
134134
-
135-
uses: actions/setup-go@v5
135+
uses: actions/setup-go@v6
136136
with:
137137
go-version-file: ${{ env.GO_VERSION_FILE }}
138138
check-latest: ${{ env.CHECK_LATEST }}
@@ -158,7 +158,7 @@ jobs:
158158
name: Checkout
159159
uses: actions/checkout@v4
160160
-
161-
uses: actions/setup-go@v5
161+
uses: actions/setup-go@v6
162162
with:
163163
go-version-file: ${{ env.GO_VERSION_FILE }}
164164
check-latest: ${{ env.CHECK_LATEST }}
@@ -207,7 +207,7 @@ jobs:
207207
name: Checkout
208208
uses: actions/checkout@v4
209209
-
210-
uses: actions/setup-go@v5
210+
uses: actions/setup-go@v6
211211
with:
212212
go-version-file: ${{ env.GO_VERSION_FILE }}
213213
check-latest: ${{ env.CHECK_LATEST }}
@@ -273,7 +273,7 @@ jobs:
273273
uses: actions/checkout@v4
274274
-
275275
name: Setup go
276-
uses: actions/setup-go@v5
276+
uses: actions/setup-go@v6
277277
with:
278278
go-version-file: ${{ env.GO_VERSION_FILE }}
279279
check-latest: ${{ env.CHECK_LATEST }}
@@ -321,7 +321,7 @@ jobs:
321321
uses: actions/checkout@v4
322322
-
323323
name: Setup go
324-
uses: actions/setup-go@v5
324+
uses: actions/setup-go@v6
325325
with:
326326
go-version-file: ${{ env.GO_VERSION_FILE }}
327327
check-latest: ${{ env.CHECK_LATEST }}
@@ -362,7 +362,7 @@ jobs:
362362
uses: actions/checkout@v4
363363
-
364364
name: Setup go
365-
uses: actions/setup-go@v5
365+
uses: actions/setup-go@v6
366366
with:
367367
go-version-file: ${{ env.GO_VERSION_FILE }}
368368
check-latest: ${{ env.CHECK_LATEST }}
@@ -403,7 +403,7 @@ jobs:
403403
uses: actions/checkout@v4
404404
-
405405
name: Setup go
406-
uses: actions/setup-go@v5
406+
uses: actions/setup-go@v6
407407
with:
408408
go-version-file: ${{ env.GO_VERSION_FILE }}
409409
check-latest: ${{ env.CHECK_LATEST }}
@@ -444,7 +444,7 @@ jobs:
444444
uses: actions/checkout@v4
445445
-
446446
name: Setup go
447-
uses: actions/setup-go@v5
447+
uses: actions/setup-go@v6
448448
with:
449449
go-version-file: ${{ env.GO_VERSION_FILE }}
450450
check-latest: ${{ env.CHECK_LATEST }}
@@ -485,7 +485,7 @@ jobs:
485485
uses: actions/checkout@v4
486486
-
487487
name: Setup go
488-
uses: actions/setup-go@v5
488+
uses: actions/setup-go@v6
489489
with:
490490
go-version-file: ${{ env.GO_VERSION_FILE }}
491491
check-latest: ${{ env.CHECK_LATEST }}
@@ -526,7 +526,7 @@ jobs:
526526
uses: actions/checkout@v4
527527
-
528528
name: Setup go
529-
uses: actions/setup-go@v5
529+
uses: actions/setup-go@v6
530530
with:
531531
go-version-file: ${{ env.GO_VERSION_FILE }}
532532
check-latest: ${{ env.CHECK_LATEST }}

‎.golangci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ run:
55
linters:
66
enable:
77
- bodyclose
8+
- exhaustive
89
- gochecknoglobals
910
- gochecknoinits
1011
- gocritic
@@ -21,6 +22,8 @@ linters:
2122
- whitespace
2223
- wsl_v5
2324
settings:
25+
exhaustive:
26+
ignore-enum-members: "chroma.+"
2427
revive:
2528
rules:
2629
- name: bare-return

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ lint: install-linter
156156
.PHONY: vulncheck
157157
vulncheck:
158158
go install golang.org/x/vuln/cmd/govulncheck@latest
159-
./bin/govulncheck-with-excludes.sh ./...
159+
govulncheck
160160

161161
.PHONY: test
162162
test:

‎cmd/fileexperts/fileexperts_test.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"testing"
1313
"time"
1414

15-
"github.com/wakatime/wakatime-cli/cmd"
1615
"github.com/wakatime/wakatime-cli/cmd/fileexperts"
1716
"github.com/wakatime/wakatime-cli/pkg/api"
1817
"github.com/wakatime/wakatime-cli/pkg/log"
18+
"github.com/wakatime/wakatime-cli/pkg/log/setup"
1919
"github.com/wakatime/wakatime-cli/pkg/project"
2020

2121
"github.com/spf13/viper"
@@ -32,7 +32,7 @@ func TestFileExperts(t *testing.T) {
3232
numCalls int
3333
)
3434

35-
projectFolder, err := filepath.Abs("../..")
35+
projectFolder, err := filepath.Abs("testdata")
3636
require.NoError(t, err)
3737

3838
subfolders := project.CountSlashesInProjectFolder(projectFolder)
@@ -85,7 +85,7 @@ func TestFileExperts(t *testing.T) {
8585
v.Set("key", "00000000-0000-4000-8000-000000000000")
8686
v.Set("api-url", testServerURL)
8787
v.Set("plugin", plugin)
88-
v.Set("project", "wakatime-cli")
88+
v.Set("projectmap..*", "wakatime-cli")
8989
v.Set("entity", "testdata/main.go")
9090

9191
output, err := fileexperts.FileExperts(t.Context(), v)
@@ -111,7 +111,7 @@ func TestFileExperts_NonExistingEntity(t *testing.T) {
111111
v.Set("log-file", logFile.Name())
112112
v.Set("verbose", true)
113113

114-
logger, err := cmd.SetupLogging(ctx, v)
114+
logger, err := setup.Logging(ctx, v)
115115
require.NoError(t, err)
116116

117117
defer logger.Flush()
@@ -143,6 +143,7 @@ func TestFileExperts_ErrApi(t *testing.T) {
143143
v.Set("key", "00000000-0000-4000-8000-000000000000")
144144
v.Set("api-url", testServerURL)
145145
v.Set("entity", "testdata/main.go")
146+
v.Set("projectmap..*", "wakatime-cli")
146147

147148
_, err := fileexperts.FileExperts(t.Context(), v)
148149
require.Error(t, err)
@@ -177,6 +178,7 @@ func TestFileExperts_ErrAuth(t *testing.T) {
177178
v.Set("key", "00000000-0000-4000-8000-000000000000")
178179
v.Set("api-url", testServerURL)
179180
v.Set("entity", "testdata/main.go")
181+
v.Set("projectmap..*", "wakatime-cli")
180182

181183
_, err := fileexperts.FileExperts(t.Context(), v)
182184
require.Error(t, err)
@@ -210,6 +212,7 @@ func TestFileExperts_ErrBadRequest(t *testing.T) {
210212
v.Set("key", "00000000-0000-4000-8000-000000000000")
211213
v.Set("api-url", testServerURL)
212214
v.Set("entity", "testdata/main.go")
215+
v.Set("projectmap..*", "wakatime-cli")
213216

214217
_, err := fileexperts.FileExperts(t.Context(), v)
215218
require.Error(t, err)

‎cmd/handler/option.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ func WithProjectFiltering() Preprocessor {
119119
func WithHeartbeatSanitization() Preprocessor {
120120
return func(params params.Params) heartbeat.HandleOption {
121121
return heartbeat.WithSanitization(heartbeat.SanitizeConfig{
122-
BranchPatterns: params.Heartbeat.Sanitize.HideBranchNames,
123-
DependencyPatterns: params.Heartbeat.Sanitize.HideDependencies,
124-
FilePatterns: params.Heartbeat.Sanitize.HideFileNames,
125-
HideProjectFolder: params.Heartbeat.Sanitize.HideProjectFolder,
126-
ProjectPatterns: params.Heartbeat.Sanitize.HideProjectNames,
122+
HideBranchPatterns: params.Heartbeat.Sanitize.HideBranchNames,
123+
HideDependencyPatterns: params.Heartbeat.Sanitize.HideDependencies,
124+
HideFilePatterns: params.Heartbeat.Sanitize.HideFileNames,
125+
HideProjectFolder: params.Heartbeat.Sanitize.HideProjectFolder,
126+
HideProjectPatterns: params.Heartbeat.Sanitize.HideProjectNames,
127127
})
128128
}
129129
}

0 commit comments

Comments
 (0)