Skip to content

Commit 5b5af7b

Browse files
majst01majst01
authored
Go 1.26 (#642)
1 parent 97a4746 commit 5b5af7b

Some content is hidden

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

69 files changed

+267
-391
lines changed

‎.github/workflows/docker.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
3030

3131
- name: Checkout
32-
uses: actions/checkout@v5
32+
uses: actions/checkout@v6
3333

3434
- name: Setup Go
3535
uses: actions/setup-go@v6
@@ -38,7 +38,7 @@ jobs:
3838
cache: false
3939

4040
- name: Lint
41-
uses: golangci/golangci-lint-action@v8
41+
uses: golangci/golangci-lint-action@v9
4242
with:
4343
args: --build-tags integration -D protogetter --timeout=5m
4444

@@ -67,7 +67,7 @@ jobs:
6767
runs-on: ubuntu-latest
6868
steps:
6969
- name: Checkout
70-
uses: actions/checkout@v5
70+
uses: actions/checkout@v6
7171

7272
- name: Setup Go
7373
uses: actions/setup-go@v6

‎cmd/metal-api/internal/datastore/health_integration_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build integration
2-
// +build integration
32

43
package datastore
54

‎cmd/metal-api/internal/datastore/image_integration_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build integration
2-
// +build integration
32

43
package datastore
54

‎cmd/metal-api/internal/datastore/integer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ func (ip *IntegerPool) genericAcquire(term *r.Term) (uint, error) {
217217
return 0, metal.Conflict("integer is already acquired by another")
218218
}
219219

220-
result := uint(res.Changes[0].OldValue.(map[string]interface{})["id"].(float64))
220+
result := uint(res.Changes[0].OldValue.(map[string]any)["id"].(float64))
221221
return result, nil
222222
}
223223

‎cmd/metal-api/internal/datastore/integer_integration_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build integration
2-
// +build integration
32

43
package datastore
54

‎cmd/metal-api/internal/datastore/integer_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func TestRethinkStore_ReleaseUniqueInteger(t *testing.T) {
9292
mock.On(r.DB("mockdb").Table(ip.String()).Insert(integer{ID: tt.value}, r.InsertOpts{Conflict: "replace"})).Return(nil, tt.err)
9393
} else {
9494
mock.On(r.DB("mockdb").Table(ip.String()).Insert(integer{ID: tt.value}, r.InsertOpts{Conflict: "replace"})).Return(r.
95-
WriteResponse{Changes: []r.ChangeResponse{{OldValue: map[string]interface{}{"id": float64(
95+
WriteResponse{Changes: []r.ChangeResponse{{OldValue: map[string]any{"id": float64(
9696
tt.value)}}}}, tt.err)
9797
}
9898
}
@@ -114,7 +114,7 @@ func TestRethinkStore_ReleaseUniqueInteger(t *testing.T) {
114114
func TestRethinkStore_AcquireRandomUniqueInteger(t *testing.T) {
115115
rs, mock := InitMockDB(t)
116116
ip := rs.GetVRFPool()
117-
changes := []r.ChangeResponse{{OldValue: map[string]interface{}{"id": float64(rs.VRFPoolRangeMin)}}}
117+
changes := []r.ChangeResponse{{OldValue: map[string]any{"id": float64(rs.VRFPoolRangeMin)}}}
118118
mock.On(r.DB("mockdb").Table(ip.String()).Limit(1).Delete(r.
119119
DeleteOpts{ReturnChanges: true})).Return(r.WriteResponse{Changes: changes}, nil)
120120

@@ -153,7 +153,7 @@ func TestRethinkStore_AcquireUniqueInteger(t *testing.T) {
153153
ip := rs.GetVRFPool()
154154

155155
if tt.requiresMock {
156-
changes := []r.ChangeResponse{{OldValue: map[string]interface{}{"id": float64(
156+
changes := []r.ChangeResponse{{OldValue: map[string]any{"id": float64(
157157
tt.value)}}}
158158
mock.On(r.DB("mockdb").Table(ip.String()).Get(tt.value).Delete(r.
159159
DeleteOpts{ReturnChanges: true})).Return(r.WriteResponse{Changes: changes}, tt.err)
@@ -223,7 +223,7 @@ func TestRethinkStore_genericAcquire(t *testing.T) {
223223
if tt.requiresMock {
224224
var changes []r.ChangeResponse
225225
if tt.tableChanges {
226-
changes = []r.ChangeResponse{{OldValue: map[string]interface{}{"id": float64(
226+
changes = []r.ChangeResponse{{OldValue: map[string]any{"id": float64(
227227
tt.value)}}}
228228
}
229229
mock.On(term.Delete(r.DeleteOpts{ReturnChanges: true})).Return(r.WriteResponse{Changes: changes},

‎cmd/metal-api/internal/datastore/ip.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ func (p *IPSearchQuery) generateTerm(rs *RethinkStore) (*r.Term, error) {
6868
}
6969

7070
for _, t := range p.Tags {
71-
t := t
7271
q = q.Filter(func(row r.Term) r.Term {
7372
return row.Field("tags").Contains(r.Expr(t))
7473
})

‎cmd/metal-api/internal/datastore/machine.go‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
108108
}
109109

110110
for _, tag := range p.Tags {
111-
tag := tag
112111
q = q.Filter(func(row r.Term) r.Term {
113112
return row.Field("tags").Contains(r.Expr(tag))
114113
})
@@ -151,7 +150,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
151150
}
152151

153152
for _, id := range p.NetworkIDs {
154-
id := id
155153
q = q.Filter(func(row r.Term) r.Term {
156154
return row.Field("allocation").Field("networks").Map(func(nw r.Term) r.Term {
157155
return nw.Field("networkid")
@@ -160,7 +158,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
160158
}
161159

162160
for _, prefix := range p.NetworkPrefixes {
163-
prefix := prefix
164161
q = q.Filter(func(row r.Term) r.Term {
165162
return row.Field("allocation").Field("networks").Contains(func(nw r.Term) r.Term {
166163
return nw.Field("prefixes").Contains(r.Expr(prefix))
@@ -169,7 +166,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
169166
}
170167

171168
for _, ip := range p.NetworkIPs {
172-
ip := ip
173169
q = q.Filter(func(row r.Term) r.Term {
174170
return row.Field("allocation").Field("networks").Contains(func(nw r.Term) r.Term {
175171
return nw.Field("ips").Contains(r.Expr(ip))
@@ -178,7 +174,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
178174
}
179175

180176
for _, destPrefix := range p.NetworkDestinationPrefixes {
181-
destPrefix := destPrefix
182177
q = q.Filter(func(row r.Term) r.Term {
183178
return row.Field("allocation").Field("networks").Contains(func(nw r.Term) r.Term {
184179
return nw.Field("destinationprefixes").Contains(r.Expr(destPrefix))
@@ -187,7 +182,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
187182
}
188183

189184
for _, vrf := range p.NetworkVrfs {
190-
vrf := vrf
191185
q = q.Filter(func(row r.Term) r.Term {
192186
return row.Field("allocation").Field("networks").Contains(func(nw r.Term) r.Term {
193187
return nw.Field("vrf").Eq(r.Expr(vrf))
@@ -196,7 +190,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
196190
}
197191

198192
for _, asn := range p.NetworkASNs {
199-
asn := asn
200193
q = q.Filter(func(row r.Term) r.Term {
201194
return row.Field("allocation").Field("networks").Map(func(nw r.Term) r.Term {
202195
return nw.Field("asn")
@@ -211,7 +204,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
211204
}
212205

213206
for _, mac := range p.NicsMacAddresses {
214-
mac := mac
215207
q = q.Filter(func(row r.Term) r.Term {
216208
return row.Field("hardware").Field("network_interfaces").Map(func(nic r.Term) r.Term {
217209
return nic.Field("macAddress")
@@ -220,7 +212,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
220212
}
221213

222214
for _, name := range p.NicsNames {
223-
name := name
224215
q = q.Filter(func(row r.Term) r.Term {
225216
return row.Field("hardware").Field("network_interfaces").Map(func(nic r.Term) r.Term {
226217
return nic.Field("name")
@@ -229,7 +220,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
229220
}
230221

231222
for _, vrf := range p.NicsVrfs {
232-
vrf := vrf
233223
q = q.Filter(func(row r.Term) r.Term {
234224
return row.Field("hardware").Field("network_interfaces").Map(func(nic r.Term) r.Term {
235225
return nic.Field("vrf")
@@ -238,7 +228,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
238228
}
239229

240230
for _, mac := range p.NicsNeighborMacAddresses {
241-
mac := mac
242231
q = q.Filter(func(row r.Term) r.Term {
243232
return row.Field("hardware").Field("network_interfaces").Contains(func(nic r.Term) r.Term {
244233
return nic.Field("neighbors").Contains(func(neigh r.Term) r.Term {
@@ -249,7 +238,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
249238
}
250239

251240
for _, name := range p.NicsNeighborNames {
252-
name := name
253241
q = q.Filter(func(row r.Term) r.Term {
254242
return row.Field("hardware").Field("network_interfaces").Contains(func(nic r.Term) r.Term {
255243
return nic.Field("neighbors").Contains(func(neigh r.Term) r.Term {
@@ -260,7 +248,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
260248
}
261249

262250
for _, vrf := range p.NicsNeighborVrfs {
263-
vrf := vrf
264251
q = q.Filter(func(row r.Term) r.Term {
265252
return row.Field("hardware").Field("network_interfaces").Contains(func(nic r.Term) r.Term {
266253
return nic.Field("neighbors").Contains(func(neigh r.Term) r.Term {
@@ -271,7 +258,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
271258
}
272259

273260
for _, name := range p.DiskNames {
274-
name := name
275261
q = q.Filter(func(row r.Term) r.Term {
276262
return row.Field("hardware").Field("block_devices").Map(func(bd r.Term) r.Term {
277263
return bd.Field("name")
@@ -280,7 +266,6 @@ func (p *MachineSearchQuery) generateTerm(rs *RethinkStore) *r.Term {
280266
}
281267

282268
for _, size := range p.DiskSizes {
283-
size := size
284269
q = q.Filter(func(row r.Term) r.Term {
285270
return row.Field("hardware").Field("block_devices").Map(func(bd r.Term) r.Term {
286271
return bd.Field("size")
@@ -424,7 +409,7 @@ func (rs *RethinkStore) UpdateMachine(oldMachine *metal.Machine, newMachine *met
424409
// but current implementation should have a slightly better readability.
425410
func (rs *RethinkStore) FindWaitingMachine(ctx context.Context, projectid, partitionid string, size metal.Size, placementTags []string, role metal.Role) (*metal.Machine, error) {
426411
q := *rs.machineTable()
427-
q = q.Filter(map[string]interface{}{
412+
q = q.Filter(map[string]any{
428413
"allocation": nil,
429414
"partitionid": partitionid,
430415
"sizeid": size.ID,

‎cmd/metal-api/internal/datastore/machine_integration_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build integration
2-
// +build integration
32

43
package datastore
54

‎cmd/metal-api/internal/datastore/migrate.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var (
3737
// MustRegisterMigration registers a migration and panics when a problem occurs
3838
func MustRegisterMigration(m Migration) {
3939
if m.Version < 1 {
40-
panic(fmt.Sprintf("migrations should start from version number '1', but found version %q", m.Version))
40+
panic(fmt.Sprintf("migrations should start from version number '1', but found version %d", m.Version))
4141
}
4242
migrationRegisterLock.Lock()
4343
defer migrationRegisterLock.Unlock()
@@ -127,13 +127,13 @@ func (rs *RethinkStore) Migrate(targetVersion *int, dry bool) error {
127127
}
128128

129129
rs.log.Info("setting demoted runtime user to read only", "user", DemotedUser)
130-
_, err = rs.db().Grant(DemotedUser, map[string]interface{}{"read": true, "write": false}).RunWrite(rs.session)
130+
_, err = rs.db().Grant(DemotedUser, map[string]any{"read": true, "write": false}).RunWrite(rs.session)
131131
if err != nil {
132132
return err
133133
}
134134
defer func() {
135135
rs.log.Info("removing read only", "user", DemotedUser)
136-
_, err = rs.db().Grant(DemotedUser, map[string]interface{}{"read": true, "write": true}).RunWrite(rs.session)
136+
_, err = rs.db().Grant(DemotedUser, map[string]any{"read": true, "write": true}).RunWrite(rs.session)
137137
if err != nil {
138138
rs.log.Error("error giving back write permissions", "user", DemotedUser)
139139
}

0 commit comments

Comments
 (0)