Skip to content

Commit a2b66d3

Browse files
fix(deps): update module github.com/bmatcuk/doublestar to v4 (#14977)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Paul Rogers <[email protected]>
1 parent ad3bde4 commit a2b66d3

20 files changed

+2202
-854
lines changed

clients/pkg/promtail/targets/file/filetarget.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sync"
88
"time"
99

10-
"github.com/bmatcuk/doublestar"
10+
"github.com/bmatcuk/doublestar/v4"
1111
"github.com/fsnotify/fsnotify"
1212
"github.com/go-kit/log"
1313
"github.com/go-kit/log/level"
@@ -246,7 +246,8 @@ func (t *FileTarget) sync() error {
246246
matches = []string{t.path}
247247
} else {
248248
// Gets current list of files to tail.
249-
matches, err = doublestar.Glob(t.path)
249+
matches, err = doublestar.FilepathGlob(t.path)
250+
250251
if err != nil {
251252
return errors.Wrap(err, "filetarget.sync.filepath.Glob")
252253
}
@@ -255,7 +256,8 @@ func (t *FileTarget) sync() error {
255256
if fi, err := os.Stat(t.pathExclude); err == nil && !fi.IsDir() {
256257
matchesExcluded = []string{t.pathExclude}
257258
} else {
258-
matchesExcluded, err = doublestar.Glob(t.pathExclude)
259+
matchesExcluded, err = doublestar.FilepathGlob(t.pathExclude)
260+
259261
if err != nil {
260262
return errors.Wrap(err, "filetarget.sync.filepathexclude.Glob")
261263
}

clients/pkg/promtail/targets/file/filetargetmanager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88
"sync"
99

10-
"github.com/bmatcuk/doublestar"
10+
"github.com/bmatcuk/doublestar/v4"
1111
"github.com/fsnotify/fsnotify"
1212
"github.com/go-kit/log"
1313
"github.com/go-kit/log/level"

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
2222
github.com/aws/aws-sdk-go v1.55.5
2323
github.com/baidubce/bce-sdk-go v0.9.200
24-
github.com/bmatcuk/doublestar v1.3.4
24+
github.com/bmatcuk/doublestar/v4 v4.7.1
2525
github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500
2626
github.com/cespare/xxhash/v2 v2.3.0
2727
github.com/containerd/fifo v1.1.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1030,8 +1030,8 @@ github.com/bitly/go-hostpool v0.1.0 h1:XKmsF6k5el6xHG3WPJ8U0Ku/ye7njX7W81Ng7O2io
10301030
github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw=
10311031
github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
10321032
github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0=
1033-
github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=
1034-
github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
1033+
github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=
1034+
github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
10351035
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
10361036
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
10371037
github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=

vendor/github.com/bmatcuk/doublestar/.travis.yml

-20
This file was deleted.

vendor/github.com/bmatcuk/doublestar/README.md

-140
This file was deleted.

0 commit comments

Comments
 (0)