Skip to content

Commit 612342a

Browse files
dnwepoiana
authored andcommitted
chore(deps): migrate blang/semver to v4
The semver package moved to the versioned import path some time back. Move to /v4 to sync with falcoctl and avoid pulling in two copies of the module. Signed-off-by: Dominic Evans <[email protected]>
1 parent 77a9076 commit 612342a

File tree

14 files changed

+18
-24
lines changed

14 files changed

+18
-24
lines changed

go.mod

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@ toolchain go1.24.2
66

77
require (
88
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
9-
github.com/blang/semver v3.5.1+incompatible
9+
github.com/blang/semver/v4 v4.0.0
1010
github.com/creasty/defaults v1.7.0
1111
github.com/docker/docker v28.3.0+incompatible
12+
github.com/falcosecurity/falcoctl v0.11.1
1213
github.com/go-playground/locales v0.14.1
1314
github.com/go-playground/universal-translator v0.18.1
1415
github.com/go-playground/validator/v10 v10.24.0
1516
github.com/mitchellh/go-homedir v1.1.0
17+
github.com/olekukonko/tablewriter v0.0.5
1618
github.com/opencontainers/image-spec v1.1.1
17-
github.com/sirupsen/logrus v1.9.3 // indirect
19+
github.com/pterm/pterm v0.12.80
1820
github.com/spf13/cobra v1.9.1
1921
github.com/spf13/pflag v1.0.6
2022
github.com/spf13/viper v1.20.0
23+
gopkg.in/yaml.v3 v3.0.1
2124
gotest.tools v2.2.0+incompatible
2225
k8s.io/api v0.32.3
2326
k8s.io/apimachinery v0.32.3
@@ -26,13 +29,6 @@ require (
2629
k8s.io/kubectl v0.30.0
2730
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
2831
modernc.org/sqlite v1.29.9
29-
)
30-
31-
require (
32-
github.com/falcosecurity/falcoctl v0.11.1
33-
github.com/olekukonko/tablewriter v0.0.5
34-
github.com/pterm/pterm v0.12.80
35-
gopkg.in/yaml.v3 v3.0.1
3632
oras.land/oras-go/v2 v2.5.0
3733
)
3834

@@ -43,7 +39,6 @@ require (
4339
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
4440
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4541
github.com/Microsoft/go-winio v0.6.2 // indirect
46-
github.com/blang/semver/v4 v4.0.0 // indirect
4742
github.com/chai2010/gettext-go v1.0.3 // indirect
4843
github.com/containerd/console v1.0.4 // indirect
4944
github.com/containerd/errdefs v1.0.0 // indirect
@@ -121,6 +116,7 @@ require (
121116
github.com/russross/blackfriday/v2 v2.1.0 // indirect
122117
github.com/sagikazarmark/locafero v0.7.0 // indirect
123118
github.com/sergi/go-diff v1.3.1 // indirect
119+
github.com/sirupsen/logrus v1.9.3 // indirect
124120
github.com/sourcegraph/conc v0.3.0 // indirect
125121
github.com/spf13/afero v1.12.0 // indirect
126122
github.com/spf13/cast v1.7.1 // indirect

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat6
2828
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
2929
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
3030
github.com/atomicgo/cursor v0.0.1/go.mod h1:cBON2QmmrysudxNBFthvMtN32r3jxVRIvzkUiF/RuIk=
31-
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
32-
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
3331
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
3432
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
3533
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=

pkg/driverbuilder/builder/amazonlinux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"database/sql"
2323
_ "embed"
2424
"fmt"
25-
"github.com/blang/semver"
25+
"github.com/blang/semver/v4"
2626
"io"
2727
"log"
2828
"net/http"

pkg/driverbuilder/builder/builders.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"strings"
2727
"text/template"
2828

29-
"github.com/blang/semver"
29+
"github.com/blang/semver/v4"
3030
"github.com/falcosecurity/driverkit/pkg/kernelrelease"
3131
)
3232

pkg/driverbuilder/builder/builders_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package builder
1717
import (
1818
"testing"
1919

20-
"github.com/blang/semver"
20+
"github.com/blang/semver/v4"
2121
"github.com/falcosecurity/driverkit/pkg/kernelrelease"
2222
)
2323

pkg/driverbuilder/builder/centos.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
_ "embed"
1919
"fmt"
2020

21-
"github.com/blang/semver"
21+
"github.com/blang/semver/v4"
2222
"github.com/falcosecurity/driverkit/pkg/kernelrelease"
2323
)
2424

pkg/driverbuilder/builder/flatcar.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"net/http"
2222
"strings"
2323

24-
"github.com/blang/semver"
24+
"github.com/blang/semver/v4"
2525
"github.com/falcosecurity/driverkit/pkg/kernelrelease"
2626
)
2727

pkg/driverbuilder/builder/image.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"regexp"
2323
"strings"
2424

25-
"github.com/blang/semver"
25+
"github.com/blang/semver/v4"
2626
"github.com/falcosecurity/driverkit/pkg/kernelrelease"
2727
"github.com/falcosecurity/falcoctl/pkg/oci/repository"
2828
"gopkg.in/yaml.v3"

pkg/driverbuilder/builder/image_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"os"
2323
"testing"
2424

25-
"github.com/blang/semver"
25+
"github.com/blang/semver/v4"
2626
"github.com/docker/docker/testutil/registry"
2727
"gotest.tools/assert"
2828
)

pkg/driverbuilder/builder/minikube.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ limitations under the License.
1515
package builder
1616

1717
import (
18-
"github.com/blang/semver"
18+
"github.com/blang/semver/v4"
1919
"github.com/falcosecurity/driverkit/pkg/kernelrelease"
2020
)
2121

0 commit comments

Comments
 (0)