Skip to content

Commit eecfe2e

Browse files
al1imgal1img
committed
[vendor] Update vendor
Signed-off-by: Oleksandr Grytsov <oleksandr_grytsov@epam.com>
1 parent 2ca231e commit eecfe2e

File tree

671 files changed

+53668
-34269
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

671 files changed

+53668
-34269
lines changed

‎go.mod

+30-28
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/aosedge/aos_servicemanager
22

3-
go 1.21
3+
go 1.22.0
44

55
replace github.com/ThalesIgnite/crypto11 => github.com/aosedge/crypto11 v1.0.3-0.20220217163524-ddd0ace39e6f
66

@@ -9,57 +9,59 @@ replace github.com/coreos/go-iptables => github.com/aosedge/go-iptables v0.0.0-2
99
replace github.com/anexia-it/fsquota => github.com/aosedge/fsquota v0.0.0-20231127111317-842d831105a7
1010

1111
require (
12-
github.com/aosedge/aos_common v0.0.0-20241028191531-828ef3ba589e
12+
github.com/aosedge/aos_common v0.0.0-20241219152119-60f5c44d6b01
1313
github.com/containernetworking/cni v1.1.2
1414
github.com/containernetworking/plugins v1.3.0
15-
github.com/coreos/go-iptables v0.6.0
15+
github.com/coreos/go-iptables v0.8.0
1616
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
1717
github.com/coreos/go-systemd/v22 v22.5.0
18-
github.com/golang/protobuf v1.5.3
19-
github.com/google/uuid v1.4.0
20-
github.com/hashicorp/go-version v1.6.0
21-
github.com/mattn/go-sqlite3 v1.14.18
18+
github.com/golang/protobuf v1.5.4
19+
github.com/google/uuid v1.6.0
20+
github.com/hashicorp/go-version v1.7.0
21+
github.com/mattn/go-sqlite3 v1.14.24
2222
github.com/opencontainers/go-digest v1.0.0
23-
github.com/opencontainers/image-spec v1.0.2
24-
github.com/opencontainers/runc v1.1.12
25-
github.com/opencontainers/runtime-spec v1.1.0
23+
github.com/opencontainers/image-spec v1.1.0
24+
github.com/opencontainers/runc v1.2.3
25+
github.com/opencontainers/runtime-spec v1.2.0
2626
github.com/pkg/errors v0.9.1
2727
github.com/sirupsen/logrus v1.9.3
28-
github.com/vishvananda/netlink v1.2.1-beta.2
29-
github.com/vishvananda/netns v0.0.4
28+
github.com/vishvananda/netlink v1.3.0
29+
github.com/vishvananda/netns v0.0.5
3030
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0
31-
golang.org/x/mod v0.10.0
32-
golang.org/x/sys v0.18.0
33-
google.golang.org/grpc v1.59.0
34-
google.golang.org/protobuf v1.33.0
31+
golang.org/x/mod v0.21.0
32+
golang.org/x/sys v0.28.0
33+
google.golang.org/grpc v1.69.0
34+
google.golang.org/protobuf v1.36.0
35+
3536
)
3637

3738
require (
3839
github.com/ThalesIgnite/crypto11 v0.0.0-00010101000000-000000000000 // indirect
3940
github.com/anexia-it/fsquota v0.0.0-00010101000000-000000000000 // indirect
4041
github.com/cavaliergopher/grab/v3 v3.0.1 // indirect
41-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
42+
github.com/cyphar/filepath-securejoin v0.3.5 // indirect
4243
github.com/go-ole/go-ole v1.2.6 // indirect
4344
github.com/godbus/dbus/v5 v5.1.0 // indirect
44-
github.com/golang-migrate/migrate/v4 v4.16.2 // indirect
45-
github.com/google/go-tpm v0.9.0 // indirect
45+
github.com/golang-migrate/migrate/v4 v4.18.1 // indirect
46+
github.com/google/go-tpm v0.9.3 // indirect
4647
github.com/hashicorp/errwrap v1.1.0 // indirect
4748
github.com/hashicorp/go-multierror v1.1.1 // indirect
4849
github.com/lib/pq v1.10.9 // indirect
4950
github.com/miekg/pkcs11 v1.0.3-0.20190429190417-a667d056470f // indirect
5051
github.com/moby/sys/mountinfo v0.7.1 // indirect
51-
github.com/safchain/ethtool v0.3.0 // indirect
52-
github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect
52+
github.com/moby/sys/userns v0.1.0 // indirect
53+
github.com/safchain/ethtool v0.5.9 // indirect
54+
github.com/seccomp/libseccomp-golang v0.10.0 // indirect
5355
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
5456
github.com/speijnik/go-errortree v1.0.1 // indirect
5557
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
5658
github.com/thales-e-security/pool v0.0.2 // indirect
57-
github.com/tklauser/go-sysconf v0.3.12 // indirect
58-
github.com/tklauser/numcpus v0.6.1 // indirect
59-
github.com/yusufpapurcu/wmi v1.2.3 // indirect
59+
github.com/tklauser/go-sysconf v0.3.14 // indirect
60+
github.com/tklauser/numcpus v0.8.0 // indirect
61+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
6062
go.uber.org/atomic v1.7.0 // indirect
61-
golang.org/x/crypto v0.21.0 // indirect
62-
golang.org/x/net v0.23.0 // indirect
63-
golang.org/x/text v0.14.0 // indirect
64-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
63+
golang.org/x/crypto v0.31.0 // indirect
64+
golang.org/x/net v0.30.0 // indirect
65+
golang.org/x/text v0.21.0 // indirect
66+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
6567
)

‎go.sum

+77-65
Large diffs are not rendered by default.

‎launcher/launcher_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ func TestRuntimeSpec(t *testing.T) {
606606
ServiceInfo: aostypes.ServiceInfo{ServiceID: "service0"},
607607
gid: 3456,
608608
imageConfig: &imagespec.Image{
609-
OS: "linux",
609+
Platform: imagespec.Platform{OS: "linux"},
610610
Config: imagespec.ImageConfig{
611611
Entrypoint: []string{"entry1", "entry2", "entry3"},
612612
Cmd: []string{"cmd1", "cmd2", "cmd3"},
@@ -1109,7 +1109,7 @@ func TestRuntimeEnvironment(t *testing.T) {
11091109
gid: 3456,
11101110
layerDigests: []string{layerDigest1, layerDigest2, layerDigest3, layerDigest4},
11111111
imageConfig: &imagespec.Image{
1112-
OS: "linux",
1112+
Platform: imagespec.Platform{OS: "linux"},
11131113
Config: imagespec.ImageConfig{
11141114
ExposedPorts: map[string]struct{}{"port0": {}, "port1": {}, "port2": {}},
11151115
},
@@ -2524,7 +2524,7 @@ func (provider *testServiceProvider) installServices(services []serviceInfo) err
25242524
return aoserrors.Wrap(err)
25252525
}
25262526

2527-
imageConfig := &imagespec.Image{OS: "linux"}
2527+
imageConfig := &imagespec.Image{Platform: imagespec.Platform{OS: "linux"}}
25282528

25292529
if service.imageConfig != nil {
25302530
imageConfig = service.imageConfig

‎smclient/smclient.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ import (
4848
**********************************************************************************************************************/
4949

5050
const (
51-
cmRequestTimeout = 30 * time.Second
5251
cmReconnectTimeout = 10 * time.Second
5352
)
5453

@@ -283,7 +282,7 @@ func (client *SMClient) openGRPCConnection(config *config.Config, provider Certi
283282
log.Debug("Connecting to CM...")
284283

285284
if client.connection, err = grpchelpers.CreateProtectedConnection(
286-
config.CertStorage, config.CMServerURL, cmRequestTimeout, cryptcoxontext, provider, insecureConn); err != nil {
285+
config.CertStorage, config.CMServerURL, cryptcoxontext, provider, insecureConn); err != nil {
287286
return aoserrors.Wrap(err)
288287
}
289288

‎vendor/github.com/aosedge/aos_common/aostypes/aostypes.go

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/aosedge/aos_common/resourcemonitor/resourcemonitor.go

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/aosedge/aos_common/utils/grpchelpers/grpcclient.go

+4-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/aosedge/aos_common/utils/grpchelpers/grpcserver.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)