Skip to content

Update dependencies #659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
majst01 merged 2 commits into from
Oct 21, 2026
Merged

Update dependencies #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71eed99
Update dependencies, update to go-1.27
majst01 Oct 21, 2026
70dfe3b
Run go fix
majst01 Oct 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions cmd/metal-api/internal/datastore/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ func (rs *RethinkStore) ProvisioningEventForMachine(ctx context.Context, log *sl

if ec == nil {
ec = &metal.ProvisioningEventContainer{
Base: metal.Base{
ID: machineID,
},
ID: machineID,
Liveliness: metal.MachineLivelinessAlive,
}
}
Expand Down
116 changes: 58 additions & 58 deletions cmd/metal-api/internal/datastore/image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@ import (

func Test_getMostRecentImageFor(t *testing.T) {
valid := time.Now().Add(time.Hour)
ubuntu14_1 := metal.Image{Base: metal.Base{ID: "ubuntu-14.1"}, OS: "ubuntu", Version: "14.1", ExpirationDate: valid}
ubuntu14_04 := metal.Image{Base: metal.Base{ID: "ubuntu-14.4"}, OS: "ubuntu", Version: "14.4", ExpirationDate: valid}
ubuntu17_04 := metal.Image{Base: metal.Base{ID: "ubuntu-17.4"}, OS: "ubuntu", Version: "17.4", ExpirationDate: valid}
ubuntu17_10 := metal.Image{Base: metal.Base{ID: "ubuntu-17.10"}, OS: "ubuntu", Version: "17.10", ExpirationDate: valid}
ubuntu18_04 := metal.Image{Base: metal.Base{ID: "ubuntu-18.4"}, OS: "ubuntu", Version: "18.4", ExpirationDate: valid}
ubuntu19_04 := metal.Image{Base: metal.Base{ID: "ubuntu-19.4"}, OS: "ubuntu", Version: "19.4", ExpirationDate: valid}
ubuntu19_10 := metal.Image{Base: metal.Base{ID: "ubuntu-19.10"}, OS: "ubuntu", Version: "19.10", ExpirationDate: valid}
ubuntu20_04_20200401 := metal.Image{Base: metal.Base{ID: "ubuntu-20.4.20200401"}, OS: "ubuntu", Version: "20.4.20200401", ExpirationDate: valid}
ubuntu20_04_20200501 := metal.Image{Base: metal.Base{ID: "ubuntu-20.4.20200501"}, OS: "ubuntu", Version: "20.4.20200501", ExpirationDate: valid}
ubuntu20_04_20200502 := metal.Image{Base: metal.Base{ID: "ubuntu-20.4.20200502"}, OS: "ubuntu", Version: "20.4.20200502", ExpirationDate: valid}
ubuntu20_04_20200603 := metal.Image{Base: metal.Base{ID: "ubuntu-20.4.20200603"}, OS: "ubuntu", Version: "20.4.20200603", ExpirationDate: valid}
ubuntu14_1 := metal.Image{ID: "ubuntu-14.1", OS: "ubuntu", Version: "14.1", ExpirationDate: valid}
ubuntu14_04 := metal.Image{ID: "ubuntu-14.4", OS: "ubuntu", Version: "14.4", ExpirationDate: valid}
ubuntu17_04 := metal.Image{ID: "ubuntu-17.4", OS: "ubuntu", Version: "17.4", ExpirationDate: valid}
ubuntu17_10 := metal.Image{ID: "ubuntu-17.10", OS: "ubuntu", Version: "17.10", ExpirationDate: valid}
ubuntu18_04 := metal.Image{ID: "ubuntu-18.4", OS: "ubuntu", Version: "18.4", ExpirationDate: valid}
ubuntu19_04 := metal.Image{ID: "ubuntu-19.4", OS: "ubuntu", Version: "19.4", ExpirationDate: valid}
ubuntu19_10 := metal.Image{ID: "ubuntu-19.10", OS: "ubuntu", Version: "19.10", ExpirationDate: valid}
ubuntu20_04_20200401 := metal.Image{ID: "ubuntu-20.4.20200401", OS: "ubuntu", Version: "20.4.20200401", ExpirationDate: valid}
ubuntu20_04_20200501 := metal.Image{ID: "ubuntu-20.4.20200501", OS: "ubuntu", Version: "20.4.20200501", ExpirationDate: valid}
ubuntu20_04_20200502 := metal.Image{ID: "ubuntu-20.4.20200502", OS: "ubuntu", Version: "20.4.20200502", ExpirationDate: valid}
ubuntu20_04_20200603 := metal.Image{ID: "ubuntu-20.4.20200603", OS: "ubuntu", Version: "20.4.20200603", ExpirationDate: valid}

alpine3_9 := metal.Image{Base: metal.Base{ID: "alpine-3.9"}, OS: "alpine", Version: "3.9", ExpirationDate: valid}
alpine3_9_20191012 := metal.Image{Base: metal.Base{ID: "alpine-3.9.20191012"}, OS: "alpine", Version: "3.9.20191012", ExpirationDate: valid}
alpine3_10 := metal.Image{Base: metal.Base{ID: "alpine-3.10"}, OS: "alpine", Version: "3.10", ExpirationDate: valid}
alpine3_10_20191012 := metal.Image{Base: metal.Base{ID: "alpine-3.10.20191012"}, OS: "alpine", Version: "3.10.20191012", ExpirationDate: valid}
alpine3_9 := metal.Image{ID: "alpine-3.9", OS: "alpine", Version: "3.9", ExpirationDate: valid}
alpine3_9_20191012 := metal.Image{ID: "alpine-3.9.20191012", OS: "alpine", Version: "3.9.20191012", ExpirationDate: valid}
alpine3_10 := metal.Image{ID: "alpine-3.10", OS: "alpine", Version: "3.10", ExpirationDate: valid}
alpine3_10_20191012 := metal.Image{ID: "alpine-3.10.20191012", OS: "alpine", Version: "3.10.20191012", ExpirationDate: valid}
tests := []struct {
name string
id string
Expand Down Expand Up @@ -101,8 +101,8 @@ func Test_getMostRecentImageFor(t *testing.T) {

func Test_getMostRecentImageForFirewall(t *testing.T) {
valid := time.Now().Add(time.Hour)
firewall2 := metal.Image{Base: metal.Base{ID: "firewall-2.0.20200331"}, OS: "firewall", Version: "2.0.20200331", ExpirationDate: valid}
firewallubuntu2 := metal.Image{Base: metal.Base{ID: "firewall-ubuntu-2.0.20200331"}, OS: "firewall-ubuntu", Version: "2.0.20200331", ExpirationDate: valid}
firewall2 := metal.Image{ID: "firewall-2.0.20200331", OS: "firewall", Version: "2.0.20200331", ExpirationDate: valid}
firewallubuntu2 := metal.Image{ID: "firewall-ubuntu-2.0.20200331", OS: "firewall-ubuntu", Version: "2.0.20200331", ExpirationDate: valid}
tests := []struct {
name string
id string
Expand Down Expand Up @@ -144,22 +144,22 @@ func Test_getMostRecentImageForFirewall(t *testing.T) {

func Test_getImagesFor(t *testing.T) {
valid := time.Now().Add(time.Hour)
ubuntu14_1 := metal.Image{Base: metal.Base{ID: "ubuntu-14.1"}, OS: "ubuntu", Version: "14.1", ExpirationDate: valid}
ubuntu14_04 := metal.Image{Base: metal.Base{ID: "ubuntu-14.4"}, OS: "ubuntu", Version: "14.4", ExpirationDate: valid}
ubuntu17_04 := metal.Image{Base: metal.Base{ID: "ubuntu-17.4"}, OS: "ubuntu", Version: "17.4", ExpirationDate: valid}
ubuntu17_10 := metal.Image{Base: metal.Base{ID: "ubuntu-17.10"}, OS: "ubuntu", Version: "17.10", ExpirationDate: valid}
ubuntu18_04 := metal.Image{Base: metal.Base{ID: "ubuntu-18.4"}, OS: "ubuntu", Version: "18.4", ExpirationDate: valid}
ubuntu19_04 := metal.Image{Base: metal.Base{ID: "ubuntu-19.4"}, OS: "ubuntu", Version: "19.4", ExpirationDate: valid}
ubuntu19_10 := metal.Image{Base: metal.Base{ID: "ubuntu-19.10"}, OS: "ubuntu", Version: "19.10", ExpirationDate: valid}
ubuntu20_04_20200401 := metal.Image{Base: metal.Base{ID: "ubuntu-20.4.20200401"}, OS: "ubuntu", Version: "20.4.20200401", ExpirationDate: valid}
ubuntu20_04_20200501 := metal.Image{Base: metal.Base{ID: "ubuntu-20.4.20200501"}, OS: "ubuntu", Version: "20.4.20200501", ExpirationDate: valid}
ubuntu20_04_20200502 := metal.Image{Base: metal.Base{ID: "ubuntu-20.4.20200502"}, OS: "ubuntu", Version: "20.4.20200502", ExpirationDate: valid}
ubuntu20_04_20200603 := metal.Image{Base: metal.Base{ID: "ubuntu-20.4.20200603"}, OS: "ubuntu", Version: "20.4.20200603", ExpirationDate: valid}
ubuntu14_1 := metal.Image{ID: "ubuntu-14.1", OS: "ubuntu", Version: "14.1", ExpirationDate: valid}
ubuntu14_04 := metal.Image{ID: "ubuntu-14.4", OS: "ubuntu", Version: "14.4", ExpirationDate: valid}
ubuntu17_04 := metal.Image{ID: "ubuntu-17.4", OS: "ubuntu", Version: "17.4", ExpirationDate: valid}
ubuntu17_10 := metal.Image{ID: "ubuntu-17.10", OS: "ubuntu", Version: "17.10", ExpirationDate: valid}
ubuntu18_04 := metal.Image{ID: "ubuntu-18.4", OS: "ubuntu", Version: "18.4", ExpirationDate: valid}
ubuntu19_04 := metal.Image{ID: "ubuntu-19.4", OS: "ubuntu", Version: "19.4", ExpirationDate: valid}
ubuntu19_10 := metal.Image{ID: "ubuntu-19.10", OS: "ubuntu", Version: "19.10", ExpirationDate: valid}
ubuntu20_04_20200401 := metal.Image{ID: "ubuntu-20.4.20200401", OS: "ubuntu", Version: "20.4.20200401", ExpirationDate: valid}
ubuntu20_04_20200501 := metal.Image{ID: "ubuntu-20.4.20200501", OS: "ubuntu", Version: "20.4.20200501", ExpirationDate: valid}
ubuntu20_04_20200502 := metal.Image{ID: "ubuntu-20.4.20200502", OS: "ubuntu", Version: "20.4.20200502", ExpirationDate: valid}
ubuntu20_04_20200603 := metal.Image{ID: "ubuntu-20.4.20200603", OS: "ubuntu", Version: "20.4.20200603", ExpirationDate: valid}

alpine3_9 := metal.Image{Base: metal.Base{ID: "alpine-3.9"}, OS: "alpine", Version: "3.9", ExpirationDate: valid}
alpine3_9_20191012 := metal.Image{Base: metal.Base{ID: "alpine-3.9.20191012"}, OS: "alpine", Version: "3.9.20191012", ExpirationDate: valid}
alpine3_10 := metal.Image{Base: metal.Base{ID: "alpine-3.10"}, OS: "alpine", Version: "3.10", ExpirationDate: valid}
alpine3_10_20191012 := metal.Image{Base: metal.Base{ID: "alpine-3.10.20191012"}, OS: "alpine", Version: "3.10.20191012", ExpirationDate: valid}
alpine3_9 := metal.Image{ID: "alpine-3.9", OS: "alpine", Version: "3.9", ExpirationDate: valid}
alpine3_9_20191012 := metal.Image{ID: "alpine-3.9.20191012", OS: "alpine", Version: "3.9.20191012", ExpirationDate: valid}
alpine3_10 := metal.Image{ID: "alpine-3.10", OS: "alpine", Version: "3.10", ExpirationDate: valid}
alpine3_10_20191012 := metal.Image{ID: "alpine-3.10.20191012", OS: "alpine", Version: "3.10.20191012", ExpirationDate: valid}
tests := []struct {
name string
id string
Expand Down Expand Up @@ -220,25 +220,25 @@ func Test_getImagesFor(t *testing.T) {
}

func Test_sortImages(t *testing.T) {
firewall2 := metal.Image{Base: metal.Base{ID: "firewall-2.0.20200331"}, OS: "firewall", Version: "2.0.20200331"}
firewallubuntu2 := metal.Image{Base: metal.Base{ID: "firewall-ubuntu-2.0.20200331"}, OS: "firewall-ubuntu", Version: "2.0.20200331"}
ubuntu14_1 := metal.Image{Base: metal.Base{ID: "ubuntu-14.1"}, OS: "ubuntu", Version: "14.1"}
ubuntu14_04 := metal.Image{Base: metal.Base{ID: "ubuntu-14.4"}, OS: "ubuntu", Version: "14.4"}
ubuntu17_04 := metal.Image{Base: metal.Base{ID: "ubuntu-17.4"}, OS: "ubuntu", Version: "17.4"}
ubuntu17_10 := metal.Image{Base: metal.Base{ID: "ubuntu-17.10"}, OS: "ubuntu", Version: "17.10"}
ubuntu18_04 := metal.Image{Base: metal.Base{ID: "ubuntu-18.4"}, OS: "ubuntu", Version: "18.4"}
ubuntu19_04 := metal.Image{Base: metal.Base{ID: "ubuntu-19.4"}, OS: "ubuntu", Version: "19.4"}
ubuntu19_10 := metal.Image{Base: metal.Base{ID: "ubuntu-19.10"}, OS: "ubuntu", Version: "19.10"}
ubuntu20_04_20200401 := metal.Image{Base: metal.Base{ID: "ubuntu-20.4.20200401"}, OS: "ubuntu", Version: "20.4.20200401"}
ubuntu20_04_20200501 := metal.Image{Base: metal.Base{ID: "ubuntu-20.4.20200501"}, OS: "ubuntu", Version: "20.4.20200501"}
ubuntu20_04_20200502 := metal.Image{Base: metal.Base{ID: "ubuntu-20.4.20200502"}, OS: "ubuntu", Version: "20.4.20200502"}
ubuntu20_04_20200603 := metal.Image{Base: metal.Base{ID: "ubuntu-20.4.20200603"}, OS: "ubuntu", Version: "20.4.20200603"}
firewall2 := metal.Image{ID: "firewall-2.0.20200331", OS: "firewall", Version: "2.0.20200331"}
firewallubuntu2 := metal.Image{ID: "firewall-ubuntu-2.0.20200331", OS: "firewall-ubuntu", Version: "2.0.20200331"}
ubuntu14_1 := metal.Image{ID: "ubuntu-14.1", OS: "ubuntu", Version: "14.1"}
ubuntu14_04 := metal.Image{ID: "ubuntu-14.4", OS: "ubuntu", Version: "14.4"}
ubuntu17_04 := metal.Image{ID: "ubuntu-17.4", OS: "ubuntu", Version: "17.4"}
ubuntu17_10 := metal.Image{ID: "ubuntu-17.10", OS: "ubuntu", Version: "17.10"}
ubuntu18_04 := metal.Image{ID: "ubuntu-18.4", OS: "ubuntu", Version: "18.4"}
ubuntu19_04 := metal.Image{ID: "ubuntu-19.4", OS: "ubuntu", Version: "19.4"}
ubuntu19_10 := metal.Image{ID: "ubuntu-19.10", OS: "ubuntu", Version: "19.10"}
ubuntu20_04_20200401 := metal.Image{ID: "ubuntu-20.4.20200401", OS: "ubuntu", Version: "20.4.20200401"}
ubuntu20_04_20200501 := metal.Image{ID: "ubuntu-20.4.20200501", OS: "ubuntu", Version: "20.4.20200501"}
ubuntu20_04_20200502 := metal.Image{ID: "ubuntu-20.4.20200502", OS: "ubuntu", Version: "20.4.20200502"}
ubuntu20_04_20200603 := metal.Image{ID: "ubuntu-20.4.20200603", OS: "ubuntu", Version: "20.4.20200603"}

alpine3_9 := metal.Image{Base: metal.Base{ID: "alpine-3.9"}, OS: "alpine", Version: "3.9"}
alpine3_10 := metal.Image{Base: metal.Base{ID: "alpine-3.10"}, OS: "alpine", Version: "3.10"}
alpine3_9 := metal.Image{ID: "alpine-3.9", OS: "alpine", Version: "3.9"}
alpine3_10 := metal.Image{ID: "alpine-3.10", OS: "alpine", Version: "3.10"}

debian17_04 := metal.Image{Base: metal.Base{ID: "debian-17.4"}, OS: "debian", Version: "17.4"}
debian17_10 := metal.Image{Base: metal.Base{ID: "debian-17.10"}, OS: "debian", Version: "17.10"}
debian17_04 := metal.Image{ID: "debian-17.4", OS: "debian", Version: "17.4"}
debian17_10 := metal.Image{ID: "debian-17.10", OS: "debian", Version: "17.10"}

tests := []struct {
name string
Expand Down Expand Up @@ -301,15 +301,15 @@ func TestRethinkStore_DeleteOrphanImages(t *testing.T) {

invalid := time.Now().Add(time.Hour * -1)
valid := time.Now().Add(time.Hour)
ubuntu14_1 := metal.Image{Base: metal.Base{ID: "ubuntu-14.1"}, OS: "ubuntu", Version: "14.1", ExpirationDate: valid}
ubuntu14_04 := metal.Image{Base: metal.Base{ID: "ubuntu-14.4"}, OS: "ubuntu", Version: "14.4", ExpirationDate: valid}
ubuntu17_04 := metal.Image{Base: metal.Base{ID: "ubuntu-17.4"}, OS: "ubuntu", Version: "17.4", ExpirationDate: valid}
ubuntu17_10 := metal.Image{Base: metal.Base{ID: "ubuntu-17.10"}, OS: "ubuntu", Version: "17.10", ExpirationDate: valid}
ubuntu18_04 := metal.Image{Base: metal.Base{ID: "ubuntu-18.4"}, OS: "ubuntu", Version: "18.4", ExpirationDate: valid}
ubuntu19_04 := metal.Image{Base: metal.Base{ID: "ubuntu-19.4"}, OS: "ubuntu", Version: "19.4", ExpirationDate: invalid} // not allocated
ubuntu19_10 := metal.Image{Base: metal.Base{ID: "ubuntu-19.10"}, OS: "ubuntu", Version: "19.10", ExpirationDate: invalid} // allocated
alpine3_9 := metal.Image{Base: metal.Base{ID: "alpine-3.9"}, OS: "alpine", Version: "3.9", ExpirationDate: invalid} // not allocated
alpine3_10 := metal.Image{Base: metal.Base{ID: "alpine-3.10"}, OS: "alpine", Version: "3.10", ExpirationDate: invalid} // not allocated but kept because last from that os
ubuntu14_1 := metal.Image{ID: "ubuntu-14.1", OS: "ubuntu", Version: "14.1", ExpirationDate: valid}
ubuntu14_04 := metal.Image{ID: "ubuntu-14.4", OS: "ubuntu", Version: "14.4", ExpirationDate: valid}
ubuntu17_04 := metal.Image{ID: "ubuntu-17.4", OS: "ubuntu", Version: "17.4", ExpirationDate: valid}
ubuntu17_10 := metal.Image{ID: "ubuntu-17.10", OS: "ubuntu", Version: "17.10", ExpirationDate: valid}
ubuntu18_04 := metal.Image{ID: "ubuntu-18.4", OS: "ubuntu", Version: "18.4", ExpirationDate: valid}
ubuntu19_04 := metal.Image{ID: "ubuntu-19.4", OS: "ubuntu", Version: "19.4", ExpirationDate: invalid} // not allocated
ubuntu19_10 := metal.Image{ID: "ubuntu-19.10", OS: "ubuntu", Version: "19.10", ExpirationDate: invalid} // allocated
alpine3_9 := metal.Image{ID: "alpine-3.9", OS: "alpine", Version: "3.9", ExpirationDate: invalid} // not allocated
alpine3_10 := metal.Image{ID: "alpine-3.10", OS: "alpine", Version: "3.10", ExpirationDate: invalid} // not allocated but kept because last from that os
tests := []struct {
name string
images metal.Images
Expand Down
62 changes: 31 additions & 31 deletions cmd/metal-api/internal/datastore/machine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,11 +723,11 @@ func getTestMachines(numPerRack int, rackids []string, tags []string) metal.Mach
func Test_checkSizeReservations(t *testing.T) {
var (
available = metal.Machines{
{Base: metal.Base{ID: "1"}},
{Base: metal.Base{ID: "2"}},
{Base: metal.Base{ID: "3"}},
{Base: metal.Base{ID: "4"}},
{Base: metal.Base{ID: "5"}},
{ID: "1"},
{ID: "2"},
{ID: "3"},
{ID: "4"},
{ID: "5"},
}

partitionA = "a"
Expand Down Expand Up @@ -756,7 +756,7 @@ func Test_checkSizeReservations(t *testing.T) {
available = slices.DeleteFunc(available, func(m metal.Machine) bool {
return m.ID == id
})
projectMachines[project] = append(projectMachines[project], metal.Machine{Base: metal.Base{ID: id}})
projectMachines[project] = append(projectMachines[project], metal.Machine{ID: id})
}
)

Expand All @@ -766,14 +766,14 @@ func Test_checkSizeReservations(t *testing.T) {
allocate(available[0].ID, p0)

require.Equal(t, metal.Machines{
{Base: metal.Base{ID: "2"}},
{Base: metal.Base{ID: "3"}},
{Base: metal.Base{ID: "4"}},
{Base: metal.Base{ID: "5"}},
{ID: "2"},
{ID: "3"},
{ID: "4"},
{ID: "5"},
}, available)
require.Equal(t, map[string]metal.Machines{
p0: {
{Base: metal.Base{ID: "1"}},
{ID: "1"},
},
}, projectMachines)

Expand All @@ -783,16 +783,16 @@ func Test_checkSizeReservations(t *testing.T) {
allocate(available[0].ID, p2)

require.Equal(t, metal.Machines{
{Base: metal.Base{ID: "3"}},
{Base: metal.Base{ID: "4"}},
{Base: metal.Base{ID: "5"}},
{ID: "3"},
{ID: "4"},
{ID: "5"},
}, available)
require.Equal(t, map[string]metal.Machines{
p0: {
{Base: metal.Base{ID: "1"}},
{ID: "1"},
},
p2: {
{Base: metal.Base{ID: "2"}},
{ID: "2"},
},
}, projectMachines)

Expand All @@ -802,16 +802,16 @@ func Test_checkSizeReservations(t *testing.T) {
allocate(available[0].ID, p0)

require.Equal(t, metal.Machines{
{Base: metal.Base{ID: "4"}},
{Base: metal.Base{ID: "5"}},
{ID: "4"},
{ID: "5"},
}, available)
require.Equal(t, map[string]metal.Machines{
p0: {
{Base: metal.Base{ID: "1"}},
{Base: metal.Base{ID: "3"}},
{ID: "1"},
{ID: "3"},
},
p2: {
{Base: metal.Base{ID: "2"}},
{ID: "2"},
},
}, projectMachines)

Expand All @@ -825,16 +825,16 @@ func Test_checkSizeReservations(t *testing.T) {
allocate(available[0].ID, p2)

require.Equal(t, metal.Machines{
{Base: metal.Base{ID: "5"}},
{ID: "5"},
}, available)
require.Equal(t, map[string]metal.Machines{
p0: {
{Base: metal.Base{ID: "1"}},
{Base: metal.Base{ID: "3"}},
{ID: "1"},
{ID: "3"},
},
p2: {
{Base: metal.Base{ID: "2"}},
{Base: metal.Base{ID: "4"}},
{ID: "2"},
{ID: "4"},
},
}, projectMachines)

Expand All @@ -852,15 +852,15 @@ func Test_checkSizeReservations(t *testing.T) {
require.Equal(t, metal.Machines{}, available)
require.Equal(t, map[string]metal.Machines{
p0: {
{Base: metal.Base{ID: "1"}},
{Base: metal.Base{ID: "3"}},
{ID: "1"},
{ID: "3"},
},
p1: {
{Base: metal.Base{ID: "5"}},
{ID: "5"},
},
p2: {
{Base: metal.Base{ID: "2"}},
{Base: metal.Base{ID: "4"}},
{ID: "2"},
{ID: "4"},
},
}, projectMachines)
}
8 changes: 3 additions & 5 deletions cmd/metal-api/internal/datastore/migrations/07_size_reservations_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,9 @@ func init() {
for _, old := range oldSizes {
for _, rv := range old.Reservations {
err = rs.CreateSizeReservation(&metal.SizeReservation{
Base: metal.Base{
ID: "",
Name: "",
Description: rv.Description,
},
ID: "",
Name: "",
Description: rv.Description,
SizeID: old.ID,
Amount: rv.Amount,
ProjectID: rv.ProjectID,
Expand Down
2 changes: 1 addition & 1 deletion cmd/metal-api/internal/eventbus/nsq_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func TestNSQ_WaitForPublisher(t *testing.T) {
func TestNSQ_WaitForTopicsCreated(t *testing.T) {
topic := metal.NSQTopic{Name: "gopher"}
partition := metal.Partition{
Base: metal.Base{ID: "partition-id"},
ID: "partition-id",
}
publisher := NopPublisher{
T: t,
Expand Down
6 changes: 2 additions & 4 deletions cmd/metal-api/internal/grpc/boot-service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,7 @@ func (b *BootService) Register(ctx context.Context, req *v1.BootServiceRegisterR
if m == nil {
// machine is not in the database, create it
m = &metal.Machine{
Base: metal.Base{
ID: req.Uuid,
},
ID: req.Uuid,
Allocation: nil,
SizeID: size.ID,
Hardware: machineHardware,
Expand Down Expand Up @@ -259,7 +257,7 @@ func (b *BootService) Register(ctx context.Context, req *v1.BootServiceRegisterR

if ec == nil {
err = b.ds.CreateProvisioningEventContainer(&metal.ProvisioningEventContainer{
Base: metal.Base{ID: m.ID},
ID: m.ID,
Liveliness: metal.MachineLivelinessAlive,
},
)
Expand Down
4 changes: 1 addition & 3 deletions cmd/metal-api/internal/grpc/event-service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ func (e *EventService) Send(ctx context.Context, req *v1.EventServiceSendRequest
// in a machine lifecycle
if m == nil {
m = &metal.Machine{
Base: metal.Base{
ID: machineID,
},
ID: machineID,
}
err = e.ds.CreateMachine(m)
if err != nil {
Expand Down
3 changes: 1 addition & 2 deletions cmd/metal-api/internal/ipam/ipam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ func (i *ipam) ReleaseIP(ctx context.Context, ip metal.IP) error {
PrefixCidr: ip.ParentPrefixCidr,
Ip: ip.IPAddress,
})
var connectErr *connect.Error
if errors.As(err, &connectErr) {
if connectErr, ok := errors.AsType[*connect.Error](err); ok {
if connectErr.Code() == connect.CodeNotFound {
return metal.NotFound("ip not found")
}
Expand Down
Loading
Loading