Skip to content

Commit b67cf70

Browse files
temblekingtembleking
authored
build: update to Go 1.26 (#65)
- Add the new `go fix` tool to automatically modernize code to newer versions. - Update dependencies. - Update base images. - Build with the newer 1.26 toolchain.
1 parent 4f58d93 commit b67cf70

24 files changed

+122
-118
lines changed

‎.golangci.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: "2"
2+
3+
linters:
4+
settings:
5+
staticcheck:
6+
checks:
7+
- "-SA4006" # Disabled: false positives with Go 1.26's new(value) syntax
8+
- "-SA4017" # Disabled: false positives with Go 1.26's new(value) syntax

‎.pre-commit-config.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ repos:
1818
entry: just fmt
1919
language: system
2020
pass_filenames: false
21+
- id: fix
22+
name: fix files
23+
entry: just fix
24+
language: system
25+
pass_filenames: false
2126
- id: lint
2227
name: run linter
2328
entry: just lint

‎docker-base-aarch64.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
imageName = "quay.io/sysdig/sysdig-mini-ubi9";
3-
imageDigest = "sha256:efee7299f1be1971c83826175f8583bed3736ff817dc38c1d266dfa6385d9b3b";
4-
hash = "sha256-Ga+VuvBYshe93r8yIN9//dRdw/sfTNsxHl2x+3A5TXE=";
3+
imageDigest = "sha256:39d40b40c28b784c9f50e74759eef17524b02c395a4fba6f5d625e0de2df3dd9";
4+
hash = "sha256-tKMD8maxhYpXddPLvCtdgJMYGOY4tugQ40na33//Zl4=";
55
finalImageName = "quay.io/sysdig/sysdig-mini-ubi9";
66
finalImageTag = "1";
77
}

‎docker-base-amd64.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
imageName = "quay.io/sysdig/sysdig-mini-ubi9";
3-
imageDigest = "sha256:efee7299f1be1971c83826175f8583bed3736ff817dc38c1d266dfa6385d9b3b";
4-
hash = "sha256-3K1eClgXOCAYFg5OA6SbzrUrI9xATXkG3bM1Y/t3E6I=";
3+
imageDigest = "sha256:39d40b40c28b784c9f50e74759eef17524b02c395a4fba6f5d625e0de2df3dd9";
4+
hash = "sha256-2OwX3zig0K85FGETxBy3AapbwycUYGIC1fKXlcHAcO4=";
55
finalImageName = "quay.io/sysdig/sysdig-mini-ubi9";
66
finalImageTag = "1";
77
}

‎flake.lock‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
prev.pkgsStatic.callPackage ./package.nix { }
1717
else
1818
prev.callPackage ./package.nix { };
19-
go = prev.go_1_24;
2019
};
2120
flake = flake-utils.lib.eachDefaultSystem (
2221
system:
@@ -39,7 +38,7 @@
3938
mkShell {
4039
packages = [
4140
ginkgo
42-
go
41+
go_1_26
4342
govulncheck
4443
gofumpt
4544
golangci-lint

‎go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/sysdiglabs/sysdig-mcp-server
22

3-
go 1.24.13
3+
go 1.26.0
44

55
require (
6-
github.com/mark3labs/mcp-go v0.43.2
6+
github.com/mark3labs/mcp-go v0.44.0
77
github.com/oapi-codegen/runtime v1.1.2
8-
github.com/onsi/ginkgo/v2 v2.27.5
9-
github.com/onsi/gomega v1.39.0
8+
github.com/onsi/ginkgo/v2 v2.28.1
9+
github.com/onsi/gomega v1.39.1
1010
github.com/spf13/cobra v1.10.2
1111
go.uber.org/mock v0.6.0
1212
gopkg.in/yaml.v2 v2.4.0
@@ -20,7 +20,7 @@ require (
2020
github.com/go-logr/logr v1.4.3 // indirect
2121
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
2222
github.com/google/go-cmp v0.7.0 // indirect
23-
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
23+
github.com/google/pprof v0.0.0-20260202012954-cb029daf43ef // indirect
2424
github.com/google/uuid v1.6.0 // indirect
2525
github.com/inconshreveable/mousetrap v1.1.0 // indirect
2626
github.com/invopop/jsonschema v0.13.0 // indirect
@@ -31,12 +31,12 @@ require (
3131
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
3232
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
3333
go.yaml.in/yaml/v3 v3.0.4 // indirect
34-
golang.org/x/mod v0.32.0 // indirect
35-
golang.org/x/net v0.49.0 // indirect
34+
golang.org/x/mod v0.33.0 // indirect
35+
golang.org/x/net v0.50.0 // indirect
3636
golang.org/x/sync v0.19.0 // indirect
37-
golang.org/x/sys v0.40.0 // indirect
38-
golang.org/x/text v0.33.0 // indirect
39-
golang.org/x/tools v0.41.0 // indirect
37+
golang.org/x/sys v0.41.0 // indirect
38+
golang.org/x/text v0.34.0 // indirect
39+
golang.org/x/tools v0.42.0 // indirect
4040
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
4141
gopkg.in/yaml.v3 v3.0.1 // indirect
4242
)

‎go.sum‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
2828
github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
2929
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
3030
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
31-
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 h1:z2ogiKUYzX5Is6zr/vP9vJGqPwcdqsWjOt+V8J7+bTc=
32-
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=
31+
github.com/google/pprof v0.0.0-20260202012954-cb029daf43ef h1:xpF9fUHpoIrrjX24DURVKiwHcFpw19ndIs+FwTSMbno=
32+
github.com/google/pprof v0.0.0-20260202012954-cb029daf43ef/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=
3333
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
3434
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
3535
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -45,18 +45,18 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
4545
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
4646
github.com/mailru/easyjson v0.9.1 h1:LbtsOm5WAswyWbvTEOqhypdPeZzHavpZx96/n553mR8=
4747
github.com/mailru/easyjson v0.9.1/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
48-
github.com/mark3labs/mcp-go v0.43.2 h1:21PUSlWWiSbUPQwXIJ5WKlETixpFpq+WBpbMGDSVy/I=
49-
github.com/mark3labs/mcp-go v0.43.2/go.mod h1:YnJfOL382MIWDx1kMY+2zsRHU/q78dBg9aFb8W6Thdw=
48+
github.com/mark3labs/mcp-go v0.44.0 h1:OlYfcVviAnwNN40QZUrrzU0QZjq3En7rCU5X09a/B7I=
49+
github.com/mark3labs/mcp-go v0.44.0/go.mod h1:YnJfOL382MIWDx1kMY+2zsRHU/q78dBg9aFb8W6Thdw=
5050
github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo=
5151
github.com/maruel/natural v1.1.1/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg=
5252
github.com/mfridman/tparse v0.18.0 h1:wh6dzOKaIwkUGyKgOntDW4liXSo37qg5AXbIhkMV3vE=
5353
github.com/mfridman/tparse v0.18.0/go.mod h1:gEvqZTuCgEhPbYk/2lS3Kcxg1GmTxxU7kTC8DvP0i/A=
5454
github.com/oapi-codegen/runtime v1.1.2 h1:P2+CubHq8fO4Q6fV1tqDBZHCwpVpvPg7oKiYzQgXIyI=
5555
github.com/oapi-codegen/runtime v1.1.2/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg=
56-
github.com/onsi/ginkgo/v2 v2.27.5 h1:ZeVgZMx2PDMdJm/+w5fE/OyG6ILo1Y3e+QX4zSR0zTE=
57-
github.com/onsi/ginkgo/v2 v2.27.5/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
58-
github.com/onsi/gomega v1.39.0 h1:y2ROC3hKFmQZJNFeGAMeHZKkjBL65mIZcvrLQBF9k6Q=
59-
github.com/onsi/gomega v1.39.0/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4=
56+
github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI=
57+
github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=
58+
github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
59+
github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg=
6060
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
6161
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
6262
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
@@ -90,18 +90,18 @@ go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
9090
go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
9191
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
9292
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
93-
golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
94-
golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
95-
golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
96-
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
93+
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
94+
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
95+
golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
96+
golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
9797
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
9898
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
99-
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
100-
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
101-
golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
102-
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
103-
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
104-
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
99+
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
100+
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
101+
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
102+
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
103+
golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
104+
golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
105105
google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
106106
google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
107107
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎internal/infra/mcp/tools/tool_k8s_list_clusters_test.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ var _ = Describe("KubernetesListClusters Tool", func() {
6161
},
6262
sysdig.GetQueryV1Params{
6363
Query: `kube_cluster_info`,
64-
Limit: asPtr(sysdig.LimitQuery(10)),
64+
Limit: new(sysdig.LimitQuery(10)),
6565
},
6666
),
6767
Entry(nil,
@@ -74,7 +74,7 @@ var _ = Describe("KubernetesListClusters Tool", func() {
7474
},
7575
sysdig.GetQueryV1Params{
7676
Query: `kube_cluster_info`,
77-
Limit: asPtr(sysdig.LimitQuery(20)),
77+
Limit: new(sysdig.LimitQuery(20)),
7878
},
7979
),
8080
Entry(nil,
@@ -87,7 +87,7 @@ var _ = Describe("KubernetesListClusters Tool", func() {
8787
},
8888
sysdig.GetQueryV1Params{
8989
Query: `kube_cluster_info{cluster="my_cluster"}`,
90-
Limit: asPtr(sysdig.LimitQuery(10)),
90+
Limit: new(sysdig.LimitQuery(10)),
9191
},
9292
),
9393
Entry(nil,
@@ -100,13 +100,9 @@ var _ = Describe("KubernetesListClusters Tool", func() {
100100
},
101101
sysdig.GetQueryV1Params{
102102
Query: `kube_cluster_info{cluster="my_cluster"}`,
103-
Limit: asPtr(sysdig.LimitQuery(20)),
103+
Limit: new(sysdig.LimitQuery(20)),
104104
},
105105
),
106106
)
107107
})
108108
})
109-
110-
func asPtr[T any](arg T) *T {
111-
return &arg
112-
}

‎internal/infra/mcp/tools/tool_k8s_list_count_pods_per_cluster_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ var _ = Describe("KubernetesListCountPodsPerCluster Tool", func() {
6161
},
6262
sysdig.GetQueryV1Params{
6363
Query: `sum by (kube_cluster_name, kube_namespace_name) (kube_pod_info)`,
64-
Limit: asPtr(sysdig.LimitQuery(20)),
64+
Limit: new(sysdig.LimitQuery(20)),
6565
},
6666
),
6767
Entry(nil,
@@ -74,7 +74,7 @@ var _ = Describe("KubernetesListCountPodsPerCluster Tool", func() {
7474
},
7575
sysdig.GetQueryV1Params{
7676
Query: `sum by (kube_cluster_name, kube_namespace_name) (kube_pod_info)`,
77-
Limit: asPtr(sysdig.LimitQuery(10)),
77+
Limit: new(sysdig.LimitQuery(10)),
7878
},
7979
),
8080
Entry(nil,
@@ -87,7 +87,7 @@ var _ = Describe("KubernetesListCountPodsPerCluster Tool", func() {
8787
},
8888
sysdig.GetQueryV1Params{
8989
Query: `sum by (kube_cluster_name, kube_namespace_name) (kube_pod_info{kube_cluster_name="my_cluster"})`,
90-
Limit: asPtr(sysdig.LimitQuery(20)),
90+
Limit: new(sysdig.LimitQuery(20)),
9191
},
9292
),
9393
Entry(nil,
@@ -100,7 +100,7 @@ var _ = Describe("KubernetesListCountPodsPerCluster Tool", func() {
100100
},
101101
sysdig.GetQueryV1Params{
102102
Query: `sum by (kube_cluster_name, kube_namespace_name) (kube_pod_info{kube_namespace_name="my_namespace"})`,
103-
Limit: asPtr(sysdig.LimitQuery(20)),
103+
Limit: new(sysdig.LimitQuery(20)),
104104
},
105105
),
106106
Entry(nil,
@@ -113,7 +113,7 @@ var _ = Describe("KubernetesListCountPodsPerCluster Tool", func() {
113113
},
114114
sysdig.GetQueryV1Params{
115115
Query: `sum by (kube_cluster_name, kube_namespace_name) (kube_pod_info{kube_cluster_name="my_cluster",kube_namespace_name="my_namespace"})`,
116-
Limit: asPtr(sysdig.LimitQuery(20)),
116+
Limit: new(sysdig.LimitQuery(20)),
117117
},
118118
),
119119
)

0 commit comments

Comments
 (0)