Skip to content

Commit de46c7b

Browse files
acabarbayeacabarbaye
authored
⬆️ Update dependencies (#14)
<!-- Copyright (C) 2020-2022 Arm Limited or its affiliates and Contributors. All rights reserved. SPDX-License-Identifier: Proprietary --> ### Description Update dependencies ### Test Coverage <!-- Please put an `x` in the correct box e.g. `[x]` to indicate the testing coverage of this change. --> - [x] This change is covered by existing or additional automated tests. - [ ] Manual testing has been performed (and evidence provided) as automated testing was not feasible. - [ ] Additional tests are not required for this change (e.g. documentation update).
1 parent f4ef52f commit de46c7b

File tree

8 files changed

+30
-32
lines changed

8 files changed

+30
-32
lines changed

‎changes/20230118200409.bugfix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update `golang-utils` to `1.24.0`

‎changes/20230118200444.bugfix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update `embedded-development-services-client` to `v1.20.0`

‎utils/go.mod‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/ARM-software/embedded-development-services-client-utils/utils
33
go 1.19
44

55
require (
6-
github.com/ARM-software/embedded-development-services-client/client v1.17.0
7-
github.com/ARM-software/golang-utils/utils v1.23.0
6+
github.com/ARM-software/embedded-development-services-client/client v1.20.0
7+
github.com/ARM-software/golang-utils/utils v1.24.0
88
github.com/bxcodec/faker/v3 v3.8.1
99
github.com/go-logr/logr v0.4.0
1010
github.com/golang/mock v1.6.0
@@ -21,6 +21,7 @@ require (
2121
github.com/bombsimon/logrusr v1.1.0 // indirect
2222
github.com/davecgh/go-spew v1.1.1 // indirect
2323
github.com/djherbis/times v1.5.0 // indirect
24+
github.com/dolmen-go/contextio v0.0.0-20220904134943-e50796217f5f // indirect
2425
github.com/fsnotify/fsnotify v1.6.0 // indirect
2526
github.com/go-logr/stdr v0.4.0 // indirect
2627
github.com/go-ole/go-ole v1.2.6 // indirect
@@ -42,7 +43,7 @@ require (
4243
github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 // indirect
4344
github.com/rs/zerolog v1.28.0 // indirect
4445
github.com/sasha-s/go-deadlock v0.3.1 // indirect
45-
github.com/shirou/gopsutil/v3 v3.22.11 // indirect
46+
github.com/shirou/gopsutil/v3 v3.22.12 // indirect
4647
github.com/sirupsen/logrus v1.9.0 // indirect
4748
github.com/spaolacci/murmur3 v1.1.0 // indirect
4849
github.com/spf13/afero v1.9.3 // indirect
@@ -54,10 +55,10 @@ require (
5455
github.com/tklauser/go-sysconf v0.3.11 // indirect
5556
github.com/tklauser/numcpus v0.6.0 // indirect
5657
github.com/yusufpapurcu/wmi v1.2.2 // indirect
57-
golang.org/x/net v0.4.0 // indirect
58+
golang.org/x/net v0.5.0 // indirect
5859
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
59-
golang.org/x/sys v0.3.0 // indirect
60-
golang.org/x/text v0.5.0 // indirect
60+
golang.org/x/sys v0.4.0 // indirect
61+
golang.org/x/text v0.6.0 // indirect
6162
google.golang.org/appengine v1.6.7 // indirect
6263
google.golang.org/protobuf v1.28.1 // indirect
6364
gopkg.in/ini.v1 v1.67.0 // indirect

‎utils/go.sum‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
3636
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
3737
cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
3838
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
39-
github.com/ARM-software/embedded-development-services-client/client v1.17.0 h1:WYLNQ6173mnJtGG0kX0LsFEw0acQ4SsP2TG/3Xmh5kI=
40-
github.com/ARM-software/embedded-development-services-client/client v1.17.0/go.mod h1:0QCu7cmtoJ2LXh7Ydu6Uh1Hmk2grKkgmFRNCpG5Sq8M=
41-
github.com/ARM-software/golang-utils/utils v1.23.0 h1:sDKtW+nm0QV+/NzhQFzIDHpL7zgwopO8kbQdDkOZLjE=
42-
github.com/ARM-software/golang-utils/utils v1.23.0/go.mod h1:n4gb8bx3dQEFIb2m0CI2fLuIfQHNGaZ2x9pPLC2cKvo=
39+
github.com/ARM-software/embedded-development-services-client/client v1.20.0 h1:gz9ZzB9roP/r6GWcFq9lI4EnPj/FDSJGXVBF+jrqKU0=
40+
github.com/ARM-software/embedded-development-services-client/client v1.20.0/go.mod h1:0QCu7cmtoJ2LXh7Ydu6Uh1Hmk2grKkgmFRNCpG5Sq8M=
41+
github.com/ARM-software/golang-utils/utils v1.24.0 h1:BQxn3ZdtalySPOVS4OxQym/BaTFlrXndS/IHM5tJHY0=
42+
github.com/ARM-software/golang-utils/utils v1.24.0/go.mod h1:uby5MxQP/iEbZYTsKHDVd8C99mdBFx67XQBdp651yfg=
4343
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
4444
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
4545
github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
@@ -68,6 +68,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
6868
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6969
github.com/djherbis/times v1.5.0 h1:79myA211VwPhFTqUk8xehWrsEO+zcIZj0zT8mXPVARU=
7070
github.com/djherbis/times v1.5.0/go.mod h1:5q7FDLvbNg1L/KaBmPcWlVR9NmoKo3+ucqUA3ijQhA0=
71+
github.com/dolmen-go/contextio v0.0.0-20220904134943-e50796217f5f h1:ORMUh1YgoSZoBGaO/i1rGDNeEavjhSnDBQTH9OG8H+o=
72+
github.com/dolmen-go/contextio v0.0.0-20220904134943-e50796217f5f/go.mod h1:cxc20xI7fOgsFHWgt+PenlDDnMcrvh7Ocuj5hEFIdEk=
7173
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
7274
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
7375
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -208,8 +210,8 @@ github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY=
208210
github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
209211
github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
210212
github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
211-
github.com/shirou/gopsutil/v3 v3.22.11 h1:kxsPKS+Eeo+VnEQ2XCaGJepeP6KY53QoRTETx3+1ndM=
212-
github.com/shirou/gopsutil/v3 v3.22.11/go.mod h1:xl0EeL4vXJ+hQMAGN8B9VFpxukEMA0XdevQOe5MZ1oY=
213+
github.com/shirou/gopsutil/v3 v3.22.12 h1:oG0ns6poeUSxf78JtOsfygNWuEHYYz8hnnNg7P04TJs=
214+
github.com/shirou/gopsutil/v3 v3.22.12/go.mod h1:Xd7P1kwZcp5VW52+9XsirIKd/BROzbb2wdX3Kqlz9uI=
213215
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
214216
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
215217
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
@@ -334,8 +336,8 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v
334336
golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
335337
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
336338
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
337-
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
338-
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
339+
golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
340+
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
339341
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
340342
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
341343
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -405,17 +407,18 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc
405407
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
406408
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
407409
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
408-
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
409410
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
411+
golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
412+
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
410413
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
411414
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
412415
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
413416
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
414417
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
415418
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
416419
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
417-
golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
418-
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
420+
golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
421+
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
419422
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
420423
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
421424
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎utils/messages/logger.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func (l *Logger) LogMessagesCollection(ctx context.Context, messagePaginator pag
9898
}
9999
messageItem, err := convertRawMessageIntoIMessage(m)
100100
if err != nil {
101-
l.LogMarshallingError(m)
101+
l.LogMarshallingError(&m)
102102
} else {
103103
l.LogMessage(messageItem)
104104
}

‎utils/messages/mapping.go‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,15 @@
66
package messages
77

88
import (
9-
"github.com/ARM-software/embedded-development-services-client/client"
109
"github.com/ARM-software/golang-utils/utils/commonerrors"
1110
"github.com/ARM-software/golang-utils/utils/reflection"
1211
)
1312

14-
func convertRawMessageIntoIMessage(m *interface{}) (IMessage, error) {
13+
func convertRawMessageIntoIMessage(m interface{}) (IMessage, error) {
1514
if reflection.IsEmpty(m) {
1615
return nil, commonerrors.ErrEmpty
1716
}
18-
raw := *m
19-
if messageItem, ok := raw.(client.NotificationMessageObject); ok {
20-
return &messageItem, nil
21-
}
22-
if messageItem, ok := raw.(client.MessageObject); ok {
23-
return &messageItem, nil
24-
}
25-
if messageItem, ok := raw.(IMessage); ok {
17+
if messageItem, ok := m.(IMessage); ok {
2618
return messageItem, nil
2719
}
2820
return nil, commonerrors.ErrMarshalling

‎utils/messages/mapping_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ func Test_convertRawMessageIntoIMessage(t *testing.T) {
1919
message any
2020
}{
2121
{
22-
message: *client.NewMessageObject(faker.Sentence()),
22+
message: client.NewMessageObject(faker.Sentence()),
2323
},
2424
{
25-
message: *client.NewNotificationMessageObject(faker.Sentence()),
25+
message: client.NewNotificationMessageObject(faker.Sentence()),
2626
},
2727
}
2828
for i := range tests {
2929
test := tests[i]
3030
t.Run(fmt.Sprintf("#%v", i), func(t *testing.T) {
3131
require.NotNil(t, test.message)
32-
_, err := convertRawMessageIntoIMessage(&test.message)
32+
_, err := convertRawMessageIntoIMessage(test.message)
3333
require.NoError(t, err)
3434
})
3535
}

‎utils/pagination/iterator.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func (i *iteratorMapper) HasNext() bool {
2424
return i.iterator.HasNext()
2525
}
2626

27-
func (i *iteratorMapper) GetNext() (*interface{}, error) {
27+
func (i *iteratorMapper) GetNext() (interface{}, error) {
2828
return i.iterator.GetNext()
2929
}
3030

0 commit comments

Comments
 (0)