Skip to content

controlplane: remove change hash from flavor version #328

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 2 commits into from
May 25, 2026
Merged

controlplane: remove change hash from flavor version #328

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
6d7eeca
remove change hash from flavor version
freggy May 25, 2026
b4f43ee
make fmt
freggy May 25, 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
6 changes: 0 additions & 6 deletions controlplane/chunk/flavor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,6 @@ func (s *svc) CreateFlavorVersion(

sortByPath(all)

changesTree, err := file.HashTree(changes)
if err != nil {
return resource.FlavorVersion{}, resource.FlavorVersionDiff{}, fmt.Errorf("changes tree: %w", err)
}

version.ChangeHash = file.HashTreeRootString(changesTree)
version.FileHashes = all

created, err := s.repo.CreateFlavorVersion(ctx, flavorID, version, prevVersion.ID)
Expand Down
2 changes: 0 additions & 2 deletions controlplane/chunk/flavor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ func TestCreateFlavorVersion(t *testing.T) {
Hash: "hash1",
},
}
v.ChangeHash = "68df46974f6dc5fe"
})
}

Expand Down Expand Up @@ -198,7 +197,6 @@ func TestCreateFlavorVersion(t *testing.T) {
Hash: "hash1",
},
}
v.ChangeHash = "68df46974f6dc5fe"
}),
expectedDiff: resource.FlavorVersionDiff{
Added: []file.Hash{
Expand Down
4 changes: 0 additions & 4 deletions controlplane/postgres/chunk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ func (db *DB) ListChunks(ctx context.Context, pageSize int, afterID *string) ([]
MinecraftVersion: r.MinecraftVersion.String,
Hash: r.Hash.String,
BuildStatus: string(r.BuildStatus.BuildStatus),
ChangeHash: r.ChangeHash.String,
FilesUploaded: r.FilesUploaded.Bool,
FlavorVersionCreatedAt: r.CreatedAt_3.Time,

Expand Down Expand Up @@ -340,7 +339,6 @@ func (db *DB) getChunkByID(ctx context.Context, q *query.Queries, id string) (re
MinecraftVersion: r.MinecraftVersion.String,
Hash: r.Hash.String,
BuildStatus: string(r.BuildStatus.BuildStatus),
ChangeHash: r.ChangeHash.String,
FilesUploaded: r.FilesUploaded.Bool,
FlavorVersionCreatedAt: r.CreatedAt_3.Time.UTC(),

Expand Down Expand Up @@ -414,7 +412,6 @@ type chunkRelationsRow struct {
MinecraftVersion string
Hash string
BuildStatus string
ChangeHash string
FilesUploaded bool
FlavorVersionCreatedAt time.Time
PresingedURLExpiryDate *time.Time
Expand Down Expand Up @@ -491,7 +488,6 @@ func collectChunks(rows []chunkRelationsRow) resource.Chunk {
MinecraftVersion: r.MinecraftVersion,
Hash: r.Hash,
BuildStatus: resource.FlavorVersionBuildStatus(r.BuildStatus),
ChangeHash: r.ChangeHash,
FilesUploaded: r.FilesUploaded,
CreatedAt: r.FlavorVersionCreatedAt,
PresignedURLExpiryDate: r.PresingedURLExpiryDate,
Expand Down
3 changes: 0 additions & 3 deletions controlplane/postgres/flavor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ func (db *DB) CreateFlavorVersion(
Hash: version.Hash,
Version: version.Version,
MinecraftVersion: version.MinecraftVersion,
ChangeHash: version.ChangeHash,
CreatedAt: now,
}

Expand Down Expand Up @@ -257,7 +256,6 @@ func (db *DB) FlavorVersionByID(ctx context.Context, id string) (resource.Flavor
Version: row.Version,
MinecraftVersion: row.MinecraftVersion,
Hash: row.Hash,
ChangeHash: row.ChangeHash,
BuildStatus: resource.FlavorVersionBuildStatus(row.BuildStatus),
FilesUploaded: row.FilesUploaded,
CreatedAt: row.CreatedAt,
Expand Down Expand Up @@ -422,7 +420,6 @@ func (db *DB) FlavorByID(ctx context.Context, id string) (resource.Flavor, error
Version: r.Version.String,
MinecraftVersion: r.MinecraftVersion.String,
Hash: r.Hash.String,
ChangeHash: r.ChangeHash.String,
FilesUploaded: r.FilesUploaded.Bool,
BuildStatus: resource.FlavorVersionBuildStatus(r.BuildStatus.BuildStatus),
CreatedAt: r.CreatedAt_2.Time.UTC(),
Expand Down
3 changes: 0 additions & 3 deletions controlplane/postgres/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ func (db *DB) ListInstances(ctx context.Context, pageSize int, afterID *string)
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,
Expand Down Expand Up @@ -231,7 +230,6 @@ func (db *DB) GetInstancesByNodeID(ctx context.Context, nodeID string) ([]resour
Version: row.FlavorVersion.Version,
MinecraftVersion: row.FlavorVersion.MinecraftVersion,
Hash: row.FlavorVersion.Hash,
ChangeHash: row.FlavorVersion.ChangeHash,
FileHashes: nil,
FilesUploaded: row.FlavorVersion.FilesUploaded,
BuildStatus: resource.FlavorVersionBuildStatus(row.FlavorVersion.BuildStatus),
Expand Down Expand Up @@ -362,7 +360,6 @@ func (db *DB) getInstanceByID(ctx context.Context, q *query.Queries, id string)
Version: row.FlavorVersion.Version,
MinecraftVersion: row.FlavorVersion.MinecraftVersion,
Hash: row.FlavorVersion.Hash,
ChangeHash: row.FlavorVersion.ChangeHash,
FileHashes: nil,
FilesUploaded: row.FlavorVersion.FilesUploaded,
BuildStatus: resource.FlavorVersionBuildStatus(row.FlavorVersion.BuildStatus),
Expand Down
5 changes: 5 additions & 0 deletions controlplane/postgres/migrations/20260525101218_remove_change_hash.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- migrate:up
ALTER TABLE flavor_versions DROP COLUMN change_hash;

-- migrate:down

4 changes: 2 additions & 2 deletions controlplane/postgres/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ SELECT * FROM flavor_version_files WHERE flavor_version_id = $1;

-- name: CreateFlavorVersion :exec
INSERT INTO flavor_versions
(id, flavor_id, hash, change_hash, version, prev_version_id, minecraft_version, created_at)
(id, flavor_id, hash, version, prev_version_id, minecraft_version, created_at)
VALUES
($1, $2, $3, $4, $5, $6, $7, $8);
($1, $2, $3, $4, $5, $6, $7);

-- name: BulkInsertFlavorFileHashes :batchexec
INSERT INTO flavor_version_files
Expand Down
1 change: 0 additions & 1 deletion controlplane/postgres/query/models.go
View file
Open in desktop

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

Loading