Skip to content

Commit f75b833

Browse files
committed
let's try a simpler MR to clean this up
1 parent de293b8 commit f75b833

File tree

7 files changed

+407
-14
lines changed

7 files changed

+407
-14
lines changed

packages/orchestrator/internal/template/build/hash_index.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ func saveLayerMeta(ctx context.Context, s storage.StorageProvider, cacheScope st
6363
return fmt.Errorf("error marshalling layer metadata: %w", err)
6464
}
6565

66-
buf := bytes.NewBuffer(marshaled)
67-
_, err = obj.ReadFrom(buf)
66+
_, err = obj.ReadFrom(marshaled)
6867
if err != nil {
6968
return fmt.Errorf("error writing layer metadata to object: %w", err)
7069
}

packages/orchestrator/internal/template/build/template_metadata.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ func saveTemplateMetadata(ctx context.Context, s storage.StorageProvider, buildI
7777
return fmt.Errorf("error marshalling template metadata: %w", err)
7878
}
7979

80-
buf := bytes.NewBuffer(marshaled)
81-
_, err = obj.ReadFrom(buf)
80+
_, err = obj.ReadFrom(marshaled)
8281
if err != nil {
8382
return fmt.Errorf("error writing template metadata to object: %w", err)
8483
}

packages/shared/pkg/storage/header/serialization.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (m *Metadata) NextGeneration(buildID uuid.UUID) *Metadata {
4141
}
4242
}
4343

44-
func Serialize(metadata *Metadata, mappings []*BuildMap) (io.Reader, error) {
44+
func Serialize(metadata *Metadata, mappings []*BuildMap) ([]byte, error) {
4545
var buf bytes.Buffer
4646

4747
err := binary.Write(&buf, binary.LittleEndian, metadata)
@@ -56,7 +56,7 @@ func Serialize(metadata *Metadata, mappings []*BuildMap) (io.Reader, error) {
5656
}
5757
}
5858

59-
return &buf, nil
59+
return buf.Bytes(), nil
6060
}
6161

6262
func Deserialize(in io.WriterTo) (*Header, error) {

packages/shared/pkg/storage/storage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ type StorageObjectProvider interface {
3737
WriteTo(dst io.Writer) (int64, error)
3838
WriteFromFileSystem(path string) error
3939

40-
ReadFrom(src io.Reader) (int64, error)
40+
ReadFrom(data []byte) (int64, error)
4141
ReadAt(buff []byte, off int64) (n int, err error)
4242

4343
Size() (int64, error)

0 commit comments

Comments
 (0)