Skip to content

Commit ce2471f

Browse files
majewskymajewsky
authored
Merge pull request #172 from sapcc/renovate/external-dependencies
Renovate: Update module github.com/gophercloud/gophercloud/v2 to v2.11.0
2 parents 37af6e7 + c46c0eb commit ce2471f

File tree

7 files changed

+60
-73
lines changed

7 files changed

+60
-73
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/sapcc/gophercloud-sapcc/v2
22

3-
go 1.24
3+
go 1.26
44

55
require (
6-
github.com/gophercloud/gophercloud/v2 v2.10.0
6+
github.com/gophercloud/gophercloud/v2 v2.11.0
77
github.com/gophercloud/utils/v2 v2.0.0-20260107124036-1d7954eb9711
88
github.com/sapcc/go-api-declarations v1.19.0
99
)

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/gofrs/uuid/v5 v5.4.0 h1:EfbpCTjqMuGyq5ZJwxqzn3Cbr2d0rUZU7v5ycAk/e/0=
22
github.com/gofrs/uuid/v5 v5.4.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
3-
github.com/gophercloud/gophercloud/v2 v2.10.0 h1:NRadC0aHNvy4iMoFXj5AFiPmut/Sj3hAPAo9B59VMGc=
4-
github.com/gophercloud/gophercloud/v2 v2.10.0/go.mod h1:Ki/ILhYZr/5EPebrPL9Ej+tUg4lqx71/YH2JWVeU+Qk=
3+
github.com/gophercloud/gophercloud/v2 v2.11.0 h1:S0Dp8wPE4mSyv7D0/kWGHnkbuKbzHYm4lQh+FcRRDFM=
4+
github.com/gophercloud/gophercloud/v2 v2.11.0/go.mod h1:fai1ZgWxmROxYcEN3SKY0tQF3Uh0DDCAXU9q/xSQK6I=
55
github.com/gophercloud/utils/v2 v2.0.0-20260107124036-1d7954eb9711 h1:LgYkb/jttJKwFwZHZjaT8zA/Ef4HMtrosABO/pnSaJI=
66
github.com/gophercloud/utils/v2 v2.0.0-20260107124036-1d7954eb9711/go.mod h1:X6Plvu4Iot+ebr3g7tmw439sin+eGzDbO3tdjUOOP2I=
77
github.com/majewsky/gg v1.5.0 h1:b4LNLhfbjHgMEjIrBgMiLz2BO73yDsVC84O7h31K+R4=

‎internal/acceptance/clients/http.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"encoding/json"
1111
"fmt"
1212
"io"
13-
"io/ioutil"
1413
"log"
1514
"net/http"
1615
"sort"
@@ -80,7 +79,7 @@ func (lrt *LogRoundTripper) logRequest(original io.ReadCloser, contentType strin
8079
log.Printf("[DEBUG] OpenStack Request Body: %s", debugInfo)
8180
}
8281

83-
return ioutil.NopCloser(strings.NewReader(bs.String())), nil
82+
return io.NopCloser(strings.NewReader(bs.String())), nil
8483
}
8584

8685
// logResponse will log the HTTP Response details.
@@ -97,7 +96,7 @@ func (lrt *LogRoundTripper) logResponse(original io.ReadCloser, contentType stri
9796
if debugInfo != "" {
9897
log.Printf("[DEBUG] OpenStack Response Body: %s", debugInfo)
9998
}
100-
return ioutil.NopCloser(strings.NewReader(bs.String())), nil
99+
return io.NopCloser(strings.NewReader(bs.String())), nil
101100
}
102101

103102
log.Printf("[DEBUG] Not logging because OpenStack response body isn't JSON")

‎internal/acceptance/masterdata/billing/projects.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func getIntField(v any, field string) int {
1818
r := reflect.ValueOf(v)
1919
f := reflect.Indirect(r).FieldByName(field)
2020

21-
if f.Kind() == reflect.Ptr {
21+
if f.Kind() == reflect.Pointer {
2222
return int(f.Elem().Int())
2323
}
2424

@@ -29,7 +29,7 @@ func getStrField(v any, field string) string {
2929
r := reflect.ValueOf(v)
3030
f := reflect.Indirect(r).FieldByName(field)
3131

32-
if f.Kind() == reflect.Ptr {
32+
if f.Kind() == reflect.Pointer {
3333
return f.Elem().String()
3434
}
3535

‎resources/v1/clusters/testing/requests_test.go‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ func TestGetCluster(t *testing.T) {
4343
Unit: limes.UnitBytes,
4444
},
4545
Capacity: &capacity,
46-
DomainsQuota: p2ui64(5),
46+
DomainsQuota: new(uint64(5)),
4747
Usage: 2,
4848
},
4949
"things": &limesresources.ClusterResourceReport{
5050
ResourceInfo: limesresources.ResourceInfo{
5151
Name: "things",
5252
},
5353
Capacity: &capacity,
54-
DomainsQuota: p2ui64(5),
54+
DomainsQuota: new(uint64(5)),
5555
Usage: 2,
5656
},
5757
},
@@ -70,15 +70,15 @@ func TestGetCluster(t *testing.T) {
7070
Unit: limes.UnitBytes,
7171
},
7272
Capacity: &capacity,
73-
DomainsQuota: p2ui64(5),
73+
DomainsQuota: new(uint64(5)),
7474
Usage: 2,
7575
},
7676
"things": &limesresources.ClusterResourceReport{
7777
ResourceInfo: limesresources.ResourceInfo{
7878
Name: "things",
7979
},
8080
Capacity: &capacity,
81-
DomainsQuota: p2ui64(5),
81+
DomainsQuota: new(uint64(5)),
8282
Usage: 2,
8383
},
8484
},
@@ -123,7 +123,7 @@ func TestGetFilteredCluster(t *testing.T) {
123123
Unit: limes.UnitBytes,
124124
},
125125
Capacity: &capacity,
126-
DomainsQuota: p2ui64(4),
126+
DomainsQuota: new(uint64(4)),
127127
Usage: 2,
128128
Subcapacities: json.RawMessage(`[{"cores":200,"hypervisor":"cluster-1"},{"cores":800,"hypervisor":"cluster-2"}]`),
129129
},
@@ -142,7 +142,3 @@ func p2time(timestamp int64) *limes.UnixEncodedTime {
142142
t := limes.UnixEncodedTime{Time: time.Unix(timestamp, 0).UTC()}
143143
return &t
144144
}
145-
146-
func p2ui64(x uint64) *uint64 {
147-
return &x
148-
}

‎resources/v1/domains/testing/requests_test.go‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ func TestListDomain(t *testing.T) {
4343
Name: "capacity",
4444
Unit: limes.UnitBytes,
4545
},
46-
DomainQuota: p2ui64(10),
47-
ProjectsQuota: p2ui64(5),
46+
DomainQuota: new(uint64(10)),
47+
ProjectsQuota: new(uint64(5)),
4848
Usage: 2,
4949
},
5050
"things": &limesresources.DomainResourceReport{
5151
ResourceInfo: limesresources.ResourceInfo{
5252
Name: "things",
5353
},
54-
DomainQuota: p2ui64(10),
55-
ProjectsQuota: p2ui64(5),
54+
DomainQuota: new(uint64(10)),
55+
ProjectsQuota: new(uint64(5)),
5656
Usage: 2,
5757
},
5858
},
@@ -70,16 +70,16 @@ func TestListDomain(t *testing.T) {
7070
Name: "capacity",
7171
Unit: limes.UnitBytes,
7272
},
73-
DomainQuota: p2ui64(55),
74-
ProjectsQuota: p2ui64(25),
73+
DomainQuota: new(uint64(55)),
74+
ProjectsQuota: new(uint64(25)),
7575
Usage: 10,
7676
},
7777
"things": &limesresources.DomainResourceReport{
7878
ResourceInfo: limesresources.ResourceInfo{
7979
Name: "things",
8080
},
81-
DomainQuota: p2ui64(55),
82-
ProjectsQuota: p2ui64(25),
81+
DomainQuota: new(uint64(55)),
82+
ProjectsQuota: new(uint64(25)),
8383
Usage: 10,
8484
},
8585
},
@@ -105,16 +105,16 @@ func TestListDomain(t *testing.T) {
105105
Name: "capacity",
106106
Unit: limes.UnitBytes,
107107
},
108-
DomainQuota: p2ui64(10),
109-
ProjectsQuota: p2ui64(5),
108+
DomainQuota: new(uint64(10)),
109+
ProjectsQuota: new(uint64(5)),
110110
Usage: 2,
111111
},
112112
"things": &limesresources.DomainResourceReport{
113113
ResourceInfo: limesresources.ResourceInfo{
114114
Name: "things",
115115
},
116-
DomainQuota: p2ui64(10),
117-
ProjectsQuota: p2ui64(5),
116+
DomainQuota: new(uint64(10)),
117+
ProjectsQuota: new(uint64(5)),
118118
Usage: 2,
119119
},
120120
},
@@ -132,8 +132,8 @@ func TestListDomain(t *testing.T) {
132132
Name: "capacity",
133133
Unit: limes.UnitBytes,
134134
},
135-
DomainQuota: p2ui64(55),
136-
ProjectsQuota: p2ui64(25),
135+
DomainQuota: new(uint64(55)),
136+
ProjectsQuota: new(uint64(25)),
137137
Usage: 10,
138138
BackendQuota: &backendQ,
139139
InfiniteBackendQuota: &infiniteBackendQ,
@@ -142,8 +142,8 @@ func TestListDomain(t *testing.T) {
142142
ResourceInfo: limesresources.ResourceInfo{
143143
Name: "things",
144144
},
145-
DomainQuota: p2ui64(55),
146-
ProjectsQuota: p2ui64(25),
145+
DomainQuota: new(uint64(55)),
146+
ProjectsQuota: new(uint64(25)),
147147
Usage: 10,
148148
},
149149
},
@@ -184,8 +184,8 @@ func TestListFilteredDomain(t *testing.T) {
184184
ResourceInfo: limesresources.ResourceInfo{
185185
Name: "things",
186186
},
187-
DomainQuota: p2ui64(10),
188-
ProjectsQuota: p2ui64(5),
187+
DomainQuota: new(uint64(10)),
188+
ProjectsQuota: new(uint64(5)),
189189
Usage: 2,
190190
},
191191
},
@@ -210,8 +210,8 @@ func TestListFilteredDomain(t *testing.T) {
210210
ResourceInfo: limesresources.ResourceInfo{
211211
Name: "things",
212212
},
213-
DomainQuota: p2ui64(10),
214-
ProjectsQuota: p2ui64(5),
213+
DomainQuota: new(uint64(10)),
214+
ProjectsQuota: new(uint64(5)),
215215
Usage: 2,
216216
},
217217
},
@@ -249,16 +249,16 @@ func TestGetDomain(t *testing.T) {
249249
Name: "capacity",
250250
Unit: limes.UnitBytes,
251251
},
252-
DomainQuota: p2ui64(10),
253-
ProjectsQuota: p2ui64(5),
252+
DomainQuota: new(uint64(10)),
253+
ProjectsQuota: new(uint64(5)),
254254
Usage: 2,
255255
},
256256
"things": &limesresources.DomainResourceReport{
257257
ResourceInfo: limesresources.ResourceInfo{
258258
Name: "things",
259259
},
260-
DomainQuota: p2ui64(10),
261-
ProjectsQuota: p2ui64(5),
260+
DomainQuota: new(uint64(10)),
261+
ProjectsQuota: new(uint64(5)),
262262
Usage: 2,
263263
},
264264
},
@@ -276,16 +276,16 @@ func TestGetDomain(t *testing.T) {
276276
Name: "capacity",
277277
Unit: limes.UnitBytes,
278278
},
279-
DomainQuota: p2ui64(55),
280-
ProjectsQuota: p2ui64(25),
279+
DomainQuota: new(uint64(55)),
280+
ProjectsQuota: new(uint64(25)),
281281
Usage: 10,
282282
},
283283
"things": &limesresources.DomainResourceReport{
284284
ResourceInfo: limesresources.ResourceInfo{
285285
Name: "things",
286286
},
287-
DomainQuota: p2ui64(55),
288-
ProjectsQuota: p2ui64(25),
287+
DomainQuota: new(uint64(55)),
288+
ProjectsQuota: new(uint64(25)),
289289
Usage: 10,
290290
},
291291
},
@@ -324,8 +324,8 @@ func TestGetDomainFiltered(t *testing.T) {
324324
ResourceInfo: limesresources.ResourceInfo{
325325
Name: "things",
326326
},
327-
DomainQuota: p2ui64(10),
328-
ProjectsQuota: p2ui64(5),
327+
DomainQuota: new(uint64(10)),
328+
ProjectsQuota: new(uint64(5)),
329329
Usage: 2,
330330
},
331331
},
@@ -341,7 +341,3 @@ func p2time(timestamp int64) *limes.UnixEncodedTime {
341341
t := limes.UnixEncodedTime{Time: time.Unix(timestamp, 0).UTC()}
342342
return &t
343343
}
344-
345-
func p2ui64(x uint64) *uint64 {
346-
return &x
347-
}

0 commit comments

Comments
 (0)