fix(release): upload before deleting on --clobber; show repo view to readers without code access

Signed-off-by: bircni <bircni@icloud.com>
This commit is contained in:
bircni committed 2026-10-18 17:19:54 +02:00
1 parent 3d10badb8b
commit 08ba777f2b
3 files changed
+13 -7

No files matched your search

+10 -5
View File
@@ -129,24 +129,29 @@ $ tea release upload v1.0.0 dist/tea-linux --clobber`,
if err != nil { if err != nil {
return err return err
} }
replaced := map[string]services.ReleaseAsset{} replaced := map[string][]services.ReleaseAsset{}
for _, file := range files { for _, file := range files {
for _, asset := range release.Assets { for _, asset := range release.Assets {
if asset.Name == filename(file) { if asset.Name == filename(file) {
if !clobber { if !clobber {
return clierr.Wrap(clierr.Usage, fmt.Errorf("asset %s already exists in release %s; pass --clobber to replace it", asset.Name, release.Tag)) return clierr.Wrap(clierr.Usage, fmt.Errorf("asset %s already exists in release %s; pass --clobber to replace it", asset.Name, release.Tag))
} }
replaced[asset.Name] = asset replaced[asset.Name] = append(replaced[asset.Name], asset)
} }
} }
} }
return batchDone(a, cmd, files, func(file *os.File) string { return "upload asset " + filename(file) }, func(file *os.File) (services.ReleaseAsset, error) { return batchDone(a, cmd, files, func(file *os.File) string { return "upload asset " + filename(file) }, func(file *os.File) (services.ReleaseAsset, error) {
if old, ok := replaced[filename(file)]; ok { // Upload first: a failed upload must not leave the release without the old asset.
uploaded, err := service.UploadAsset(cmd.Context(), release.ID, filename(file), file)
if err != nil {
return services.ReleaseAsset{}, err
}
for _, old := range replaced[filename(file)] {
if err := service.DeleteAsset(cmd.Context(), release.ID, old.ID); err != nil { if err := service.DeleteAsset(cmd.Context(), release.ID, old.ID); err != nil {
return services.ReleaseAsset{}, fmt.Errorf("replace asset %s: %w", old.Name, err) return uploaded, fmt.Errorf("uploaded %s, but could not delete the replaced asset %d: %w", old.Name, old.ID, err)
} }
} }
return service.UploadAsset(cmd.Context(), release.ID, filename(file), file) return uploaded, nil
}, func(asset services.ReleaseAsset) string { }, func(asset services.ReleaseAsset) string {
return fmt.Sprintf("Uploaded %s (%s) to release %s", asset.Name, terminal.Bytes(asset.Size), release.Tag) return fmt.Sprintf("Uploaded %s (%s) to release %s", asset.Name, terminal.Bytes(asset.Size), release.Tag)
}) })
+1 -1
View File
@@ -66,7 +66,7 @@ func TestReleaseUploadRefusesDuplicateNamesWithoutClobber(t *testing.T) {
require.Equal(t, []string{"GET /api/v1/repos/owner/repo/releases/tags/v1"}, requests) require.Equal(t, []string{"GET /api/v1/repos/owner/repo/releases/tags/v1"}, requests)
requests = nil requests = nil
require.NoError(t, Execute(context.Background(), deps, []string{"release", "upload", "v1", file, "--clobber", "-R", "owner/repo"})) require.NoError(t, Execute(context.Background(), deps, []string{"release", "upload", "v1", file, "--clobber", "-R", "owner/repo"}))
require.Equal(t, []string{"GET /api/v1/repos/owner/repo/releases/tags/v1", "DELETE /api/v1/repos/owner/repo/releases/1/assets/7", "POST /api/v1/repos/owner/repo/releases/1/assets"}, requests) require.Equal(t, []string{"GET /api/v1/repos/owner/repo/releases/tags/v1", "POST /api/v1/repos/owner/repo/releases/1/assets", "DELETE /api/v1/repos/owner/repo/releases/1/assets/7"}, requests)
require.Equal(t, "✓ Uploaded hello.txt (5 B) to release v1\n", diagnostics.String()) require.Equal(t, "✓ Uploaded hello.txt (5 B) to release v1\n", diagnostics.String())
} }
+2 -1
View File
@@ -109,7 +109,8 @@ func (s Repositories) Readme(ctx context.Context, repo, ref string) (name, conte
return c.Repositories.ListContents(ctx, owner, name, ref, "") return c.Repositories.ListContents(ctx, owner, name, ref, "")
}) })
if err != nil { if err != nil {
if IsNotFound(err) { // A reader without code access sees the repository but not its files.
if IsNotFound(err) || IsForbidden(err) {
return "", "", nil return "", "", nil
} }
return "", "", err return "", "", err