Skip to content

Commit 8015617

Browse files
committed
yoke: add all labels to stow output
1 parent 133a07f commit 8015617

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/charmbracelet/lipgloss v1.1.0
1111
github.com/davidmdm/ansi v0.0.7
1212
github.com/davidmdm/conf v0.0.10
13-
github.com/davidmdm/x/xcontainer v0.0.2
13+
github.com/davidmdm/x/xcontainer v0.0.3
1414
github.com/davidmdm/x/xcontext v0.0.3
1515
github.com/davidmdm/x/xerr v0.0.5
1616
github.com/davidmdm/x/xruntime v0.0.5

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ github.com/davidmdm/ansi v0.0.7 h1:x59My+oKSQdGOnwKNKJRbqTLN98kz4fUXPxlw/emINQ=
7575
github.com/davidmdm/ansi v0.0.7/go.mod h1:En92c514AKUGa+HLY43mQfVImaVtBtAr5fako6mQa6w=
7676
github.com/davidmdm/conf v0.0.10 h1:Q6N7207o+cM66PZM6m4dnVQ2J2c9rPH/voBpaahRGrU=
7777
github.com/davidmdm/conf v0.0.10/go.mod h1:6j/z/ejCbH0cgrdFErvat4h1wg3Sfxhh3ikyVJYbtzs=
78-
github.com/davidmdm/x/xcontainer v0.0.2 h1:sHjuH1tva2Pl5oTmcJYtWSuc0amQj9kCUiUQA/R2/is=
79-
github.com/davidmdm/x/xcontainer v0.0.2/go.mod h1:x2GWf+20spxXCAqCYF3nZVKoJPxS8xfXKQYi+0wAsEU=
78+
github.com/davidmdm/x/xcontainer v0.0.3 h1:qlgNNZISslOATp5rW4M5ocWFK8mNfF3ag4SVL3sX/W8=
79+
github.com/davidmdm/x/xcontainer v0.0.3/go.mod h1:x2GWf+20spxXCAqCYF3nZVKoJPxS8xfXKQYi+0wAsEU=
8080
github.com/davidmdm/x/xcontext v0.0.3 h1:PuqBczX15qx/4128vRVyK+xbLi2ffCWG6JT8rCKJY+U=
8181
github.com/davidmdm/x/xcontext v0.0.3/go.mod h1:ER3jrDtsl/eNmxrGpbO0/7Ep+0waYnohBR1vKznub1U=
8282
github.com/davidmdm/x/xerr v0.0.5 h1:ujuZnokjAfD1bJvnfj31lV3c0QnJ0BEyr01ah5JK++Y=

pkg/yoke/yoke.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ import (
55
"context"
66
"fmt"
77
"io"
8+
"path"
89
"reflect"
910
"slices"
11+
"strings"
1012
"time"
1113

1214
"github.com/davidmdm/x/xcontainer"
@@ -290,13 +292,18 @@ func Stow(ctx context.Context, params StowParams) error {
290292

291293
sha256 := internal.SHA256HexString(wasm)
292294

293-
tags := slices.Sorted(xcontainer.ToSet(append(params.Tags, "sha256_"+sha256)).All())
295+
tags := xcontainer.ToSet(params.Tags)
296+
tags.Add("sha256_"+sha256, "latest")
297+
298+
if _, tag, _ := strings.Cut(path.Base(params.URL), ":"); tag != "" {
299+
tags.Add(tag)
300+
}
294301

295302
digestURL, err := oci.PushArtifact(ctx, oci.PushArtifactParams{
296303
Data: wasm,
297304
URL: params.URL,
298305
Insecure: params.Insecure,
299-
Tags: tags,
306+
Tags: tags.Collect(),
300307
})
301308
if err != nil {
302309
return fmt.Errorf("failed to stow wasm artifact: %w", err)
@@ -306,7 +313,7 @@ func Stow(ctx context.Context, params StowParams) error {
306313
DigestURL string `yaml:"digestUrl"`
307314
ModuleSHA string `yaml:"moduleSHA"`
308315
Tags []string `yaml:"tags"`
309-
}{digestURL, sha256, tags})
316+
}{digestURL, sha256, slices.Sorted(tags.All())})
310317
}
311318

312319
type UnlockParams struct {

pkg/yoke/yoke_takeoff.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func (commander Commander) Takeoff(ctx context.Context, params TakeoffParams) (e
192192
return ""
193193
}
194194
}()
195-
if params.Checksum != actual {
195+
if expected != actual {
196196
return fmt.Errorf("cannot verify module against expected checksum: wanted %q but got %q", expected, actual)
197197
}
198198
}

0 commit comments

Comments
 (0)