Skip to content

Commit ba4bfcd

Browse files
roosterfishroosterfish
authored
Go: Update deps (v2-edge) (#833)
2 parents e54c0b2 + f833af9 commit ba4bfcd

8 files changed

Lines changed: 70 additions & 69 deletions

File tree

‎Makefile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GOMIN=1.23.7
1+
GOMIN=1.24.4
22
GOCOVERDIR ?= $(shell go env GOCOVERDIR)
33
GOPATH ?= $(shell go env GOPATH)
44
DQLITE_PATH=$(GOPATH)/deps/dqlite
@@ -81,9 +81,10 @@ update-gomod:
8181
go get -t -v -u ./...
8282

8383
# Static pins
84-
go get github.com/canonical/lxd@stable-5.21 # Stay on v2 dqlite and LXD LTS client
85-
go get github.com/canonical/microceph@1200ba77f2320be2acec45939f4b96a8ac4f0722 # Right after releasing squid LTS.
86-
go get github.com/canonical/microovn@branch-24.03 # 24.03 LTS.
84+
go get github.com/canonical/lxd@8079534cf291bbc562aeffc26b671a03c322ae10 # 5.21 LTS.
85+
go get github.com/canonical/microceph/microceph@64d02d9538a89be039707ecbf942ca1aeae29760 # squid LTS.
86+
go get github.com/canonical/microovn/microovn@branch-24.03 # 24.03 LTS.
87+
go get github.com/olekukonko/tablewriter@v0.0.5 # Due to breaking API in later versions
8788

8889
go mod tidy -go=$(GOMIN)
8990

‎cmd/microcloud/ask.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func checkInitialized(stateDir string, expectInitialized bool, preseed bool) err
8383

8484
// askUpdateProfile asks whether to update the existing profile configuration if it has changed.
8585
func (c *initConfig) askUpdateProfile(profile api.ProfilesPost, profiles []string, lxdClient lxd.InstanceServer) (*api.ProfilePut, error) {
86-
if !shared.ValueInSlice(profile.Name, profiles) {
86+
if !slices.Contains(profiles, profile.Name) {
8787
return &profile.ProfilePut, nil
8888
}
8989

@@ -1578,7 +1578,7 @@ func (c *initConfig) askJoinIntents(gw *cloudClient.WebsocketGateway, expectedSy
15781578
}
15791579

15801580
// Skip systems which aren't listed in the preseed.
1581-
if !shared.ValueInSlice(session.Intent.Name, expectedSystems) {
1581+
if !slices.Contains(expectedSystems, session.Intent.Name) {
15821582
continue
15831583
}
15841584

‎cmd/microcloud/main_init.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"fmt"
77
"net"
88
"os"
9+
"slices"
910
"strings"
1011
"sync"
1112
"time"
@@ -969,7 +970,7 @@ func (c *initConfig) setupCluster(s *service.Handler) error {
969970
}
970971
}
971972

972-
if !shared.ValueInSlice(profile.Name, profiles) {
973+
if !slices.Contains(profiles, profile.Name) {
973974
err = lxdClient.CreateProfile(profile)
974975
if err != nil {
975976
return err

‎cmd/microcloud/preseed.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"io"
77
"net"
88
"os"
9+
"slices"
910
"strconv"
1011
"strings"
1112
"time"
1213

13-
"github.com/canonical/lxd/shared"
1414
lxdAPI "github.com/canonical/lxd/shared/api"
1515
"github.com/canonical/lxd/shared/filter"
1616
"github.com/canonical/lxd/shared/units"
@@ -383,7 +383,7 @@ func (p *Preseed) validate(name string, bootstrap bool) error {
383383
directLocalCount++
384384
}
385385

386-
if shared.ValueInSlice(system.Name, systemNames) {
386+
if slices.Contains(systemNames, system.Name) {
387387
return fmt.Errorf("Duplicate system name %q", system.Name)
388388
}
389389

@@ -645,7 +645,7 @@ func (p *Preseed) Parse(s *service.Handler, c *initConfig, installedServices map
645645
addressStrings = append(addressStrings, ipNet.IP.String())
646646
}
647647

648-
if shared.ValueInSlice(c.address, addressStrings) {
648+
if slices.Contains(addressStrings, c.address) {
649649
c.lookupIface = &iface
650650
break
651651
}

‎go.mod‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/canonical/microcloud/microcloud
22

3-
go 1.23.7
3+
go 1.24.4
44

55
require (
6-
github.com/canonical/lxd v0.0.0-20250325123738-fcb8c6503907
7-
github.com/canonical/microceph/microceph v0.0.0-20250327150042-265036a9667c
8-
github.com/canonical/microcluster/v2 v2.1.0
9-
github.com/canonical/microovn/microovn v0.0.0-20250328134802-336b7904ac05
6+
github.com/canonical/lxd v0.0.0-20250624133916-8079534cf291
7+
github.com/canonical/microceph/microceph v0.0.0-20250620092923-64d02d9538a8
8+
github.com/canonical/microcluster/v2 v2.2.0
9+
github.com/canonical/microovn/microovn v0.0.0-20250114100905-d990fee49400
1010
github.com/charmbracelet/bubbletea v1.3.5
1111
github.com/charmbracelet/lipgloss v1.1.0
1212
github.com/charmbracelet/x/ansi v0.9.3
@@ -27,17 +27,17 @@ require (
2727
github.com/Rican7/retry v0.3.1 // indirect
2828
github.com/armon/go-proxyproto v0.1.0 // indirect
2929
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
30-
github.com/canonical/go-dqlite/v2 v2.0.0 // indirect
31-
github.com/charmbracelet/colorprofile v0.3.0 // indirect
30+
github.com/canonical/go-dqlite/v2 v2.0.1 // indirect
31+
github.com/charmbracelet/colorprofile v0.3.1 // indirect
3232
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
3333
github.com/charmbracelet/x/term v0.2.1 // indirect
3434
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3535
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
3636
github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 // indirect
37-
github.com/fsnotify/fsnotify v1.8.0 // indirect
37+
github.com/fsnotify/fsnotify v1.9.0 // indirect
3838
github.com/fvbommel/sortorder v1.1.0 // indirect
39-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
40-
github.com/go-logr/logr v1.4.2 // indirect
39+
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
40+
github.com/go-logr/logr v1.4.3 // indirect
4141
github.com/go-logr/stdr v1.2.2 // indirect
4242
github.com/google/renameio v1.0.1 // indirect
4343
github.com/google/uuid v1.6.0 // indirect
@@ -50,30 +50,30 @@ require (
5050
github.com/mattn/go-isatty v0.0.20 // indirect
5151
github.com/mattn/go-localereader v0.0.1 // indirect
5252
github.com/mattn/go-runewidth v0.0.16 // indirect
53-
github.com/mattn/go-sqlite3 v1.14.24 // indirect
53+
github.com/mattn/go-sqlite3 v1.14.28 // indirect
5454
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
5555
github.com/muesli/cancelreader v0.2.2 // indirect
5656
github.com/muesli/termenv v0.16.0 // indirect
5757
github.com/muhlemmer/gu v0.3.1 // indirect
5858
github.com/olekukonko/tablewriter v0.0.5 // indirect
5959
github.com/pkg/errors v0.9.1 // indirect
6060
github.com/pkg/sftp v1.13.9 // indirect
61-
github.com/pkg/xattr v0.4.10 // indirect
61+
github.com/pkg/xattr v0.4.11 // indirect
6262
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6363
github.com/rivo/uniseg v0.4.7 // indirect
6464
github.com/robfig/cron/v3 v3.0.1 // indirect
6565
github.com/sirupsen/logrus v1.9.3 // indirect
6666
github.com/spf13/pflag v1.0.6 // indirect
6767
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
6868
github.com/zitadel/logging v0.6.2 // indirect
69-
github.com/zitadel/oidc/v3 v3.37.0 // indirect
69+
github.com/zitadel/oidc/v3 v3.39.0 // indirect
7070
github.com/zitadel/schema v1.3.1 // indirect
7171
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
72-
go.opentelemetry.io/otel v1.35.0 // indirect
73-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
74-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
72+
go.opentelemetry.io/otel v1.37.0 // indirect
73+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
74+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
7575
golang.org/x/crypto v0.39.0 // indirect
76-
golang.org/x/oauth2 v0.28.0 // indirect
76+
golang.org/x/oauth2 v0.30.0 // indirect
7777
golang.org/x/term v0.32.0 // indirect
7878
golang.org/x/text v0.26.0 // indirect
7979
)

‎go.sum‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWp
88
github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=
99
github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38=
1010
github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
11-
github.com/canonical/go-dqlite/v2 v2.0.0 h1:RNFcFVhHMh70muKKErbW35rSzqmAFswheHdAgxW0Ddw=
12-
github.com/canonical/go-dqlite/v2 v2.0.0/go.mod h1:IaIC8u4Z1UmPjuAqPzA2r83YMaMHRLoKZdHKI5uHCJI=
13-
github.com/canonical/lxd v0.0.0-20250325123738-fcb8c6503907 h1:aMycv2Z7Pv+AF/EWVi3FfWUUmRT4oWbdWkvUFwZ4ssI=
14-
github.com/canonical/lxd v0.0.0-20250325123738-fcb8c6503907/go.mod h1:2TlAkDBeTKhbM8YUsxbVmyquQSxg6jYFxdZjoRbRWBs=
15-
github.com/canonical/microceph/microceph v0.0.0-20250327150042-265036a9667c h1:FXLQkKaewX5D9SpBY4sZG18LpJByRSif/hNmMtYLZyI=
16-
github.com/canonical/microceph/microceph v0.0.0-20250327150042-265036a9667c/go.mod h1:xM3IgZAWK6KCOvKEc2CDpZ6KwOooaHwxZ3DYFtTU2o4=
17-
github.com/canonical/microcluster/v2 v2.1.0 h1:jEycvk2vu8XH5SaT4GatqymCOmY7Bhj/mOM4d8XN13c=
18-
github.com/canonical/microcluster/v2 v2.1.0/go.mod h1:Aofp11LCtIpIm8OdkQRpl7RWXYtLMTE+B+SOE0gcyAE=
19-
github.com/canonical/microovn/microovn v0.0.0-20250328134802-336b7904ac05 h1:AkpzMGA80jTfKYJDEGQLD4hgkZcrlJmokfUzVKozr2A=
20-
github.com/canonical/microovn/microovn v0.0.0-20250328134802-336b7904ac05/go.mod h1:Z641vwo0yEELl9vqvl6eT37ngl03eo9eeE906HTVqZk=
11+
github.com/canonical/go-dqlite/v2 v2.0.1 h1:C5A+MioYkjew5rG8apjVYwGYIpKKkkC1FlnL4cBLGaE=
12+
github.com/canonical/go-dqlite/v2 v2.0.1/go.mod h1:IaIC8u4Z1UmPjuAqPzA2r83YMaMHRLoKZdHKI5uHCJI=
13+
github.com/canonical/lxd v0.0.0-20250624133916-8079534cf291 h1:pjAvVXNMqYxV0FulodnT5HL0NdUxJvhhxvvcLVlSpHY=
14+
github.com/canonical/lxd v0.0.0-20250624133916-8079534cf291/go.mod h1:RJUPpezQbDX5APLrGSXotQXcQNshv8s4ZiElxf4zrn4=
15+
github.com/canonical/microceph/microceph v0.0.0-20250620092923-64d02d9538a8 h1:WJi+xVY9fd28VqDFZk4yUskVzAtSNAs2tGxKjdQjCZw=
16+
github.com/canonical/microceph/microceph v0.0.0-20250620092923-64d02d9538a8/go.mod h1:xM3IgZAWK6KCOvKEc2CDpZ6KwOooaHwxZ3DYFtTU2o4=
17+
github.com/canonical/microcluster/v2 v2.2.0 h1:JxTnohcJjLLrF8qzTimxvmeCLEgYSSqEu/1giMAWZcA=
18+
github.com/canonical/microcluster/v2 v2.2.0/go.mod h1:q43ij5d2LziK9Pf07NdA7/82FIsnIzKSGcpEzCEAUAA=
19+
github.com/canonical/microovn/microovn v0.0.0-20250114100905-d990fee49400 h1:t4qkq1AgBlEDiqRPBFxQuS7ZwLlVc/WIoD5OF48/OdI=
20+
github.com/canonical/microovn/microovn v0.0.0-20250114100905-d990fee49400/go.mod h1:Z641vwo0yEELl9vqvl6eT37ngl03eo9eeE906HTVqZk=
2121
github.com/charmbracelet/bubbletea v1.3.5 h1:JAMNLTbqMOhSwoELIr0qyP4VidFq72/6E9j7HHmRKQc=
2222
github.com/charmbracelet/bubbletea v1.3.5/go.mod h1:TkCnmH+aBd4LrXhXcqrKiYwRs7qyQx5rBgH5fVY3v54=
23-
github.com/charmbracelet/colorprofile v0.3.0 h1:KtLh9uuu1RCt+Hml4s6Hz+kB1PfV3wi++1h5ia65yKQ=
24-
github.com/charmbracelet/colorprofile v0.3.0/go.mod h1:oHJ340RS2nmG1zRGPmhJKJ/jf4FPNNk0P39/wBPA1G0=
23+
github.com/charmbracelet/colorprofile v0.3.1 h1:k8dTHMd7fgw4bnFd7jXTLZrSU/CQrKnL3m+AxCzDz40=
24+
github.com/charmbracelet/colorprofile v0.3.1/go.mod h1:/GkGusxNs8VB/RSOh3fu0TJmQ4ICMMPApIIVn0KszZ0=
2525
github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
2626
github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
2727
github.com/charmbracelet/x/ansi v0.9.3 h1:BXt5DHS/MKF+LjuK4huWrC6NCvHtexww7dMayh6GXd0=
@@ -42,17 +42,17 @@ github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6
4242
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
4343
github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 h1:fmFk0Wt3bBxxwZnu48jqMdaOR/IZ4vdtJFuaFV8MpIE=
4444
github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3/go.mod h1:bJWSKrZyQvfTnb2OudyUjurSG4/edverV7n82+K3JiM=
45-
github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
46-
github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
45+
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
46+
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
4747
github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQmYw=
4848
github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
49-
github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
50-
github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
51-
github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
52-
github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
49+
github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618=
50+
github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
51+
github.com/go-jose/go-jose/v4 v4.1.0 h1:cYSYxd3pw5zd2FSXk2vGdn9igQU2PS8MuxrCOCl0FdY=
52+
github.com/go-jose/go-jose/v4 v4.1.0/go.mod h1:GG/vqmYm3Von2nYiB2vGTXzdoNKE5tix5tuc6iAd+sw=
5353
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
54-
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
55-
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
54+
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
55+
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
5656
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
5757
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
5858
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -100,8 +100,8 @@ github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh
100100
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
101101
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
102102
github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
103-
github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
104-
github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
103+
github.com/mattn/go-sqlite3 v1.14.28 h1:ThEiQrnbtumT+QMknw63Befp/ce/nUPgBPMlRFEum7A=
104+
github.com/mattn/go-sqlite3 v1.14.28/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
105105
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
106106
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
107107
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
@@ -122,8 +122,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
122122
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
123123
github.com/pkg/sftp v1.13.9 h1:4NGkvGudBL7GteO3m6qnaQ4pC0Kvf0onSVc9gR3EWBw=
124124
github.com/pkg/sftp v1.13.9/go.mod h1:OBN7bVXdstkFFN/gdnHPUb5TE8eb8G1Rp9wCItqjkkA=
125-
github.com/pkg/xattr v0.4.10 h1:Qe0mtiNFHQZ296vRgUjRCoPHPqH7VdTOrZx3g0T+pGA=
126-
github.com/pkg/xattr v0.4.10/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU=
125+
github.com/pkg/xattr v0.4.11 h1:DA7usy0rTMNMGvm06b5LhZUwiPj708D89S8DkXpMB1E=
126+
github.com/pkg/xattr v0.4.11/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU=
127127
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
128128
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
129129
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -158,18 +158,18 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJu
158158
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
159159
github.com/zitadel/logging v0.6.2 h1:MW2kDDR0ieQynPZ0KIZPrh9ote2WkxfBif5QoARDQcU=
160160
github.com/zitadel/logging v0.6.2/go.mod h1:z6VWLWUkJpnNVDSLzrPSQSQyttysKZ6bCRongw0ROK4=
161-
github.com/zitadel/oidc/v3 v3.37.0 h1:nYATWlnP7f18XiAbw6upUruBaqfB1kUrXrSTf1EYGO8=
162-
github.com/zitadel/oidc/v3 v3.37.0/go.mod h1:/xDan4OUQhguJ4Ur73OOJrtugvR164OMnidXP9xfVNw=
161+
github.com/zitadel/oidc/v3 v3.39.0 h1:WK3eNqmgshiYo1oEqONfXXbPbve+Qzgjl8KhKDFUvxc=
162+
github.com/zitadel/oidc/v3 v3.39.0/go.mod h1:JwdgdU/WxkmBtWuE8/pEjAbDTWXxJGqBix/gUoeEig4=
163163
github.com/zitadel/schema v1.3.1 h1:QT3kwiRIRXXLVAs6gCK/u044WmUVh6IlbLXUsn6yRQU=
164164
github.com/zitadel/schema v1.3.1/go.mod h1:071u7D2LQacy1HAN+YnMd/mx1qVE2isb0Mjeqg46xnU=
165165
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
166166
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
167-
go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
168-
go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
169-
go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
170-
go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
171-
go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
172-
go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
167+
go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
168+
go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
169+
go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
170+
go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
171+
go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
172+
go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
173173
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
174174
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
175175
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
@@ -178,8 +178,8 @@ golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v
178178
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
179179
golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
180180
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
181-
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
182-
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
181+
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o=
182+
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8=
183183
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
184184
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
185185
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -197,8 +197,8 @@ golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
197197
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
198198
golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
199199
golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
200-
golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
201-
golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
200+
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
201+
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
202202
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
203203
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
204204
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

‎service/lxd.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"net"
99
"net/http"
1010
"net/url"
11+
"slices"
1112
"time"
1213

1314
"github.com/canonical/lxd/client"
1415
"github.com/canonical/lxd/lxd/util"
15-
"github.com/canonical/lxd/shared"
1616
"github.com/canonical/lxd/shared/api"
1717
"github.com/canonical/microcluster/v2/microcluster"
1818
microTypes "github.com/canonical/microcluster/v2/rest/types"
@@ -513,7 +513,7 @@ func defaultNetworkInterfacesFilter(network api.Network, state *api.NetworkState
513513
// ovnNetworkInterfacesFilter filters a network based on OVN specific rules and returns whether it should be skipped.
514514
func ovnNetworkInterfacesFilter(network api.Network, state *api.NetworkState) bool {
515515
// OpenVswitch only supports physical ethernet or VLAN interfaces, LXD also supports plugging in bridges.
516-
if !shared.ValueInSlice(network.Type, []string{"physical", "bridge", "bond", "vlan"}) {
516+
if !slices.Contains([]string{"physical", "bridge", "bond", "vlan"}, network.Type) {
517517
return false
518518
}
519519

@@ -826,5 +826,5 @@ func (s LXDService) SupportsFeature(ctx context.Context, feature string) (bool,
826826
return false, fmt.Errorf("API extensions not available when checking for a LXD feature")
827827
}
828828

829-
return shared.ValueInSlice(feature, server.APIExtensions), nil
829+
return slices.Contains(server.APIExtensions, feature), nil
830830
}

0 commit comments

Comments
 (0)