Skip to content

Commit d6ed1cd

Browse files
wagnerd3wagnerd3
committed
use yq for modifying test fixture files
1 parent 591c7a5 commit d6ed1cd

Some content is hidden

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

63 files changed

+13015
-271
lines changed

‎REUSE.toml‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ SPDX-License-Identifier = "Apache-2.0"
2929
path = [
3030
".github/PULL_REQUEST_TEMPLATE",
3131
"internal/**/fixtures/*.json",
32-
"internal/**/fixtures/*.prom",
33-
"internal/**/fixtures/*.sql",
32+
"internal/*/fixtures/*.prom",
33+
"internal/*/fixtures/*.sql",
3434
"docs/*.json",
3535
]
3636
SPDX-FileCopyrightText = "SAP SE or an SAP affiliate company"
@@ -84,6 +84,14 @@ precedence = "override"
8484
SPDX-FileCopyrightText = "Other"
8585
SPDX-License-Identifier = "BSD-3-Clause"
8686

87+
[[annotations]]
88+
path = [
89+
"vendor/github.com/itchyny/gojq/**",
90+
]
91+
precedence = "override"
92+
SPDX-FileCopyrightText = "Other"
93+
SPDX-License-Identifier = "MIT"
94+
8795
[[annotations]]
8896
path = [
8997
"vendor/github.com/lib/pq/**",
@@ -148,6 +156,14 @@ precedence = "override"
148156
SPDX-FileCopyrightText = "Other"
149157
SPDX-License-Identifier = "Apache-2.0"
150158

159+
[[annotations]]
160+
path = [
161+
"vendor/gopkg.in/op/go-logging.v1/**",
162+
]
163+
precedence = "override"
164+
SPDX-FileCopyrightText = "Other"
165+
SPDX-License-Identifier = "BSD-3-Clause"
166+
151167
[[annotations]]
152168
path = [
153169
"vendor/github.com/Azure/go-ansiterm/**",
@@ -324,6 +340,14 @@ precedence = "override"
324340
SPDX-FileCopyrightText = "Other"
325341
SPDX-License-Identifier = "MPL-2.0"
326342

343+
[[annotations]]
344+
path = [
345+
"vendor/github.com/itchyny/timefmt-go/**",
346+
]
347+
precedence = "override"
348+
SPDX-FileCopyrightText = "Other"
349+
SPDX-License-Identifier = "MIT"
350+
327351
[[annotations]]
328352
path = [
329353
"vendor/github.com/jpillora/backoff/**",

‎go.mod‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ require (
99
github.com/gofrs/uuid/v5 v5.4.0
1010
github.com/gophercloud/gophercloud/v2 v2.11.1
1111
github.com/gorilla/mux v1.8.1
12+
github.com/itchyny/gojq v0.12.18
1213
github.com/lib/pq v1.12.1
1314
github.com/majewsky/gg v1.6.0
1415
github.com/majewsky/schwift/v2 v2.0.0
@@ -25,6 +26,7 @@ require (
2526
github.com/golang-migrate/migrate/v4 v4.19.1 // indirect
2627
github.com/google/go-cmp v0.7.0 // indirect
2728
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
29+
github.com/itchyny/timefmt-go v0.1.7 // indirect
2830
github.com/jpillora/longestcommon v0.0.0-20161227235612-adb9d91ee629 // indirect
2931
github.com/json-iterator/go v1.1.12 // indirect
3032
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -35,6 +37,7 @@ require (
3537
github.com/rabbitmq/amqp091-go v1.10.0 // indirect
3638
github.com/sergi/go-diff v1.4.0 // indirect
3739
go.yaml.in/yaml/v2 v2.4.3 // indirect
38-
golang.org/x/sys v0.39.0 // indirect
40+
golang.org/x/net v0.52.0 // indirect
41+
golang.org/x/sys v0.42.0 // indirect
3942
google.golang.org/protobuf v1.36.11 // indirect
4043
)

‎go.sum‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
7474
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
7575
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
7676
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
77+
github.com/itchyny/gojq v0.12.18 h1:gFGHyt/MLbG9n6dqnvlliiya2TaMMh6FFaR2b1H6Drc=
78+
github.com/itchyny/gojq v0.12.18/go.mod h1:4hPoZ/3lN9fDL1D+aK7DY1f39XZpY9+1Xpjz8atrEkg=
79+
github.com/itchyny/timefmt-go v0.1.7 h1:xyftit9Tbw+Dc/huSSPJaEmX1TVL8lw5vxjJLK4GMMA=
80+
github.com/itchyny/timefmt-go v0.1.7/go.mod h1:5E46Q+zj7vbTgWY8o5YkMeYb4I6GeWLFnetPy5oBrAI=
7781
github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
7882
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
7983
github.com/jpillora/longestcommon v0.0.0-20161227235612-adb9d91ee629 h1:1dSBUfGlorLAua2CRx0zFN7kQsTpE2DQSmr7rrTNgY8=
@@ -194,8 +198,8 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
194198
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
195199
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
196200
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
197-
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
198-
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
201+
golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
202+
golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
199203
golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw=
200204
golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
201205
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -206,11 +210,11 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h
206210
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
207211
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
208212
golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
209-
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
210-
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
213+
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
214+
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
211215
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
212-
golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
213-
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
216+
golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
217+
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
214218
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
215219
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
216220
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=

‎internal/api/api_v2/core.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (p *v2Provider) AddTo(r *mux.Router) {
8383
})
8484

8585
r.Methods("GET").Path("/resources/v2/info").HandlerFunc(p.GetResourcesInfo)
86-
r.Methods("GET").Path("/rates/v2/info").HandlerFunc(p.GetResourcesInfo)
86+
r.Methods("GET").Path("/rates/v2/info").HandlerFunc(p.GetRatesInfo)
8787
}
8888

8989
// Path is a local helper to assemble api paths.

‎internal/api/api_v2/fixtures/rate-info.json‎

Lines changed: 5 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,9 @@
55
"first": {
66
"version": 1,
77
"display_name": "First",
8-
"categories": {
9-
"default": {
10-
"display_name": "Default",
11-
"resources": {
12-
"things": {
13-
"display_name": "Things",
14-
"topology": "flat",
15-
"has_capacity": false,
16-
"has_quota": true
17-
}
18-
}
19-
},
20-
"foo_category": {
21-
"display_name": "Foo Category",
22-
"resources": {
23-
"capacity": {
24-
"display_name": "Capacity",
25-
"unit": "B",
26-
"topology": "az-aware",
27-
"has_capacity": true,
28-
"has_quota": true
29-
}
30-
}
31-
}
32-
},
338
"rates": {
349
"objects:create": {
35-
"display_name": "",
10+
"display_name": "Object Creations",
3611
"topology": "flat",
3712
"has_usage": true,
3813
"limits": {
@@ -41,19 +16,19 @@
4116
}
4217
},
4318
"objects:delete": {
44-
"display_name": "",
19+
"display_name": "Object Deletions",
4520
"unit": "MiB",
4621
"topology": "flat",
4722
"has_usage": true
4823
},
4924
"objects:unlimited": {
50-
"display_name": "",
25+
"display_name": "Object Unlimited Operations",
5126
"unit": "KiB",
5227
"topology": "flat",
5328
"has_usage": true
5429
},
5530
"objects:update": {
56-
"display_name": "",
31+
"display_name": "Object Updates",
5732
"topology": "flat",
5833
"has_usage": true
5934
}
@@ -65,37 +40,7 @@
6540
"services": {
6641
"second": {
6742
"version": 1,
68-
"display_name": "",
69-
"categories": {
70-
"capacity": {
71-
"resources": {
72-
"capacity": {
73-
"display_name": "",
74-
"unit": "B",
75-
"topology": "az-aware",
76-
"has_capacity": true,
77-
"has_quota": true,
78-
"commitment_config": {
79-
"durations": [
80-
"1 hour",
81-
"2 hours"
82-
],
83-
"min_confirm_by": 604800
84-
}
85-
}
86-
}
87-
},
88-
"things": {
89-
"resources": {
90-
"things": {
91-
"display_name": "",
92-
"topology": "flat",
93-
"has_capacity": false,
94-
"has_quota": true
95-
}
96-
}
97-
}
98-
},
43+
"display_name": "Second",
9944
"rates": {}
10045
}
10146
}

0 commit comments

Comments
 (0)