Skip to content

controlplane: add flavor field for instance #302

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
freggy merged 11 commits into from
May 14, 2026
Merged

controlplane: add flavor field for instance #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7dc5eb5
add flavor field for instance
freggy May 14, 2026
b87535b
fmt
freggy May 14, 2026
c37fdae
add ordered by
freggy May 14, 2026
6a78586
add flavor to instance fixture
freggy May 14, 2026
47047e8
add pod log dir again
freggy May 14, 2026
d656b72
also return flavors for other calls
freggy May 14, 2026
48f1266
adjust tests
freggy May 14, 2026
f3626a9
fix db tests
freggy May 14, 2026
ac6ac7b
fmt
freggy May 14, 2026
2ca75c5
adjsut
freggy May 14, 2026
a63fcea
fix functests
freggy May 14, 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
29 changes: 21 additions & 8 deletions api/instance/v1alpha1/types.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions api/instance/v1alpha1/types.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ message Instance {
// that ordered the creation this instance. ordered_by and
// owner of the instance are not necessarily the same.
string ordered_by = 8;

chunk.v1alpha1.Flavor flavor = 9;
}

message InstanceStatusReport {
Expand Down
198 changes: 107 additions & 91 deletions controlplane/postgres/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ func (db *DB) ListInstances(ctx context.Context, pageSize int, afterID *string)
m := make(map[string][]query.ListInstancesWithPaginationRow)
order := make([]string, 0)
for _, r := range rows {
if _, ok := m[r.ID]; !ok {
order = append(order, r.ID)
if _, ok := m[r.Instance.ID]; !ok {
order = append(order, r.Instance.ID)
}
m[r.ID] = append(m[r.ID], r)
m[r.Instance.ID] = append(m[r.Instance.ID], r)
}

ret = make([]resource.Instance, 0, len(m))
Expand All @@ -99,57 +99,61 @@ func (db *DB) ListInstances(ctx context.Context, pageSize int, afterID *string)
// instance port is intentionally left out, because it will not be
// known beforehand atm, thus it will always be nil when creating.
i := resource.Instance{
ID: row.ID,
Address: row.Address,
State: resource.InstanceState(row.State),
CreatedAt: row.CreatedAt.UTC(),
UpdatedAt: row.UpdatedAt.UTC(),
OrderedBy: row.OrderedBy,
ID: row.Instance.ID,
Address: row.Node.Address,
State: resource.InstanceState(row.Instance.State),
CreatedAt: row.Instance.CreatedAt.UTC(),
UpdatedAt: row.Instance.UpdatedAt.UTC(),
OrderedBy: row.Instance.OrderedBy,
Chunk: resource.Chunk{
ID: row.ID_3,
Name: row.Name,
Description: row.Description,
Tags: row.Tags,
CreatedAt: row.CreatedAt_3.UTC(),
UpdatedAt: row.UpdatedAt_2.UTC(),
ID: row.Chunk.ID,
Name: row.Chunk.Name,
Description: row.Chunk.Description,
Tags: row.Chunk.Tags,
CreatedAt: row.Chunk.CreatedAt.UTC(),
UpdatedAt: row.Chunk.UpdatedAt.UTC(),

// FIXME: for now this is not needed anywhere, so it is not included in the query
Thumbnail: resource.Thumbnail{
Hash: "",
},
},
FlavorVersion: resource.FlavorVersion{
ID: row.ID_2,
Version: row.Version,
MinecraftVersion: row.MinecraftVersion,
Hash: row.Hash,
ChangeHash: row.ChangeHash,
ID: row.FlavorVersion.ID,
Version: row.FlavorVersion.Version,
MinecraftVersion: row.FlavorVersion.MinecraftVersion,
Hash: row.FlavorVersion.Hash,
ChangeHash: row.FlavorVersion.ChangeHash,

// FIXME: for now those are not needed anywhere, so they are not included in the query
FileHashes: nil,

FilesUploaded: row.FilesUploaded,
BuildStatus: resource.FlavorVersionBuildStatus(row.BuildStatus),
CreatedAt: row.CreatedAt_2.UTC(),
FilesUploaded: row.FlavorVersion.FilesUploaded,
BuildStatus: resource.FlavorVersionBuildStatus(row.FlavorVersion.BuildStatus),
CreatedAt: row.FlavorVersion.CreatedAt.UTC(),
},
Owner: resource.User{
ID: row.ID_6,
Nickname: row.Nickname,
Email: row.Email,
CreatedAt: row.CreatedAt_6,
UpdatedAt: row.UpdatedAt_4,
ID: row.User.ID,
Nickname: row.User.Nickname,
Email: "", // do not return
CreatedAt: row.User.CreatedAt,
UpdatedAt: row.User.UpdatedAt,
},
}

flavors := make([]resource.Flavor, 0, len(rows))
for _, instanceRow := range v {
f := resource.Flavor{
ID: instanceRow.ID_4,
Name: instanceRow.Name_2,
CreatedAt: instanceRow.CreatedAt_4.UTC(),
UpdatedAt: instanceRow.UpdatedAt_3.UTC(),
ID: instanceRow.Flavor.ID,
Name: instanceRow.Flavor.Name,
CreatedAt: instanceRow.Flavor.CreatedAt.UTC(),
UpdatedAt: instanceRow.Flavor.UpdatedAt.UTC(),
}
flavors = append(flavors, f)

if f.ID == instanceRow.FlavorVersion.FlavorID {
i.Flavor = f
}
}

sort.Slice(flavors, func(i, j int) bool {
Expand Down Expand Up @@ -199,44 +203,53 @@ func (db *DB) GetInstancesByNodeID(ctx context.Context, nodeID string) ([]resour

for _, row := range rows {
var port *uint16
if row.Port != nil {
port = ptr.Pointer(uint16(*row.Port))
if row.Instance.Port != nil {
port = ptr.Pointer(uint16(*row.Instance.Port))
}

ret = append(ret, resource.Instance{
ID: row.ID,
ID: row.Instance.ID,
Chunk: resource.Chunk{
ID: row.ID_3,
Name: row.Name,
Description: row.Description,
Tags: row.Tags,
CreatedAt: row.CreatedAt_3.UTC(),
UpdatedAt: row.UpdatedAt_2.UTC(),
ID: row.Chunk.ID,
Name: row.Chunk.Name,
Description: row.Chunk.Description,
Tags: row.Chunk.Tags,
CreatedAt: row.Chunk.CreatedAt.UTC(),
UpdatedAt: row.Chunk.UpdatedAt.UTC(),
DeletedAt: nil, // not needed atm
},
Flavor: resource.Flavor{
ID: row.Flavor.ID,
Name: row.Flavor.Name,
Versions: nil, // not needed atm
CreatedAt: row.Flavor.CreatedAt.UTC(),
UpdatedAt: row.Flavor.UpdatedAt.UTC(),
DeletedAt: nil, // not needed atm
},
FlavorVersion: resource.FlavorVersion{
ID: row.ID_2,
Version: row.Version,
MinecraftVersion: row.MinecraftVersion,
Hash: row.Hash,
ChangeHash: row.ChangeHash,
ID: row.FlavorVersion.ID,
Version: row.FlavorVersion.Version,
MinecraftVersion: row.FlavorVersion.MinecraftVersion,
Hash: row.FlavorVersion.Hash,
ChangeHash: row.FlavorVersion.ChangeHash,
FileHashes: nil,
FilesUploaded: row.FilesUploaded,
BuildStatus: resource.FlavorVersionBuildStatus(row.BuildStatus),
CreatedAt: row.CreatedAt_2.UTC(),
FilesUploaded: row.FlavorVersion.FilesUploaded,
BuildStatus: resource.FlavorVersionBuildStatus(row.FlavorVersion.BuildStatus),
CreatedAt: row.FlavorVersion.CreatedAt.UTC(),
},
Owner: resource.User{
ID: row.ID_5,
Nickname: row.Nickname,
Email: row.Email,
CreatedAt: row.CreatedAt_5,
UpdatedAt: row.UpdatedAt_3,
ID: row.User.ID,
Nickname: row.User.Nickname,
Email: "", // we don't want to leak emails in calls everyone can do
CreatedAt: row.User.CreatedAt,
UpdatedAt: row.User.UpdatedAt,
},
Address: row.Address,
State: resource.InstanceState(row.State),
Address: row.Node.Address,
State: resource.InstanceState(row.Instance.State),
Port: port,
CreatedAt: row.CreatedAt.UTC(),
UpdatedAt: row.UpdatedAt.UTC(),
OrderedBy: row.OrderedBy,
CreatedAt: row.Instance.CreatedAt.UTC(),
UpdatedAt: row.Instance.UpdatedAt.UTC(),
OrderedBy: row.Instance.OrderedBy,
})
}

Expand Down Expand Up @@ -330,57 +343,60 @@ func (db *DB) getInstanceByID(ctx context.Context, q *query.Queries, id string)
// instance port is intentionally left out, because it will not be
// known beforehand atm, thus it will always be nil when creating.
ret := resource.Instance{
ID: row.ID,
Address: row.Address,
State: resource.InstanceState(row.State),
CreatedAt: row.CreatedAt.UTC(),
UpdatedAt: row.UpdatedAt.UTC(),
OrderedBy: row.OrderedBy,
ID: row.Instance.ID,
Address: row.Node.Address,
State: resource.InstanceState(row.Instance.State),
CreatedAt: row.Instance.CreatedAt.UTC(),
UpdatedAt: row.Instance.UpdatedAt.UTC(),
OrderedBy: row.Instance.OrderedBy,
Chunk: resource.Chunk{
ID: row.ID_3,
Name: row.Name,
Description: row.Description,
Tags: row.Tags,
CreatedAt: row.CreatedAt_3.UTC(),
UpdatedAt: row.UpdatedAt_2.UTC(),
ID: row.Chunk.ID,
Name: row.Chunk.Name,
Description: row.Chunk.Description,
Tags: row.Chunk.Tags,
CreatedAt: row.Chunk.CreatedAt.UTC(),
UpdatedAt: row.Chunk.UpdatedAt.UTC(),
},
FlavorVersion: resource.FlavorVersion{
ID: row.ID_2,
Version: row.Version,
MinecraftVersion: row.MinecraftVersion,
Hash: row.Hash,
ChangeHash: row.ChangeHash,
ID: row.FlavorVersion.ID,
Version: row.FlavorVersion.Version,
MinecraftVersion: row.FlavorVersion.MinecraftVersion,
Hash: row.FlavorVersion.Hash,
ChangeHash: row.FlavorVersion.ChangeHash,
FileHashes: nil,
FilesUploaded: row.FilesUploaded,
BuildStatus: resource.FlavorVersionBuildStatus(row.BuildStatus),
CreatedAt: row.CreatedAt_2.UTC(),
FilesUploaded: row.FlavorVersion.FilesUploaded,
BuildStatus: resource.FlavorVersionBuildStatus(row.FlavorVersion.BuildStatus),
CreatedAt: row.FlavorVersion.CreatedAt.UTC(),
},
Owner: resource.User{
ID: row.ID_6,
Nickname: row.Nickname,
Email: row.Email,
CreatedAt: row.CreatedAt_5,
UpdatedAt: row.UpdatedAt_3,
ID: row.User.ID,
Nickname: row.User.Nickname,
Email: "", // dont return email
CreatedAt: row.User.CreatedAt,
UpdatedAt: row.User.UpdatedAt,
},
}

var port *uint16
if row.Port != nil {
port = ptr.Pointer(uint16(*row.Port))
if row.Instance.Port != nil {
port = ptr.Pointer(uint16(*row.Instance.Port))
}

ret.Port = port

flavors := make([]resource.Flavor, 0, len(rows))
for _, instanceRow := range rows {
f := resource.Flavor{
ID: instanceRow.ID_2,
Name: instanceRow.Name_2,
CreatedAt: instanceRow.CreatedAt_2.UTC(),
UpdatedAt: instanceRow.UpdatedAt_2.UTC(),
ID: instanceRow.Flavor.ID,
Name: instanceRow.Flavor.Name,
CreatedAt: instanceRow.Flavor.CreatedAt.UTC(),
UpdatedAt: instanceRow.Flavor.UpdatedAt.UTC(),
}

flavors = append(flavors, f)

if f.ID == instanceRow.FlavorVersion.FlavorID {
ret.Flavor = f
}
}

sort.Slice(flavors, func(i, j int) bool {
Expand Down
Loading