fix: delete desktop release oss objects

2026-06-25 00:40:08 +08:00
parent ed48674ab5
commit febfd65b45
3 changed files with 279 additions and 2 deletions
@@ -14,6 +14,7 @@ import (
 	"time"

 	"github.com/geo-platform/tenant-api/internal/ops/domain"
+	"github.com/geo-platform/tenant-api/internal/ops/repository"
 	"github.com/geo-platform/tenant-api/internal/shared/objectstorage"
 	"github.com/stretchr/testify/require"
 )
@@ -247,6 +248,110 @@ func TestBuildDesktopClientReleaseObjectKeyReusesContentAddress(t *testing.T) {
 	require.Equal(t, "desktop-client/releases/blobs/"+sum+".exe", first)
 }

+func TestDesktopClientReleaseOSSObjectKeysIncludesInstallerAndUpdater(t *testing.T) {
+	t.Parallel()
+
+	installerKey := "desktop-client/releases/blobs/installer.dmg"
+	updaterKey := "desktop-client/releases/blobs/updater.zip"
+	ossSource := DesktopClientDownloadSourceOSS
+
+	require.Equal(t, []string{installerKey, updaterKey}, desktopClientReleaseOSSObjectKeys(&domain.DesktopClientRelease{
+		DownloadSource:        DesktopClientDownloadSourceOSS,
+		OSSObjectKey:          &installerKey,
+		UpdaterDownloadSource: &ossSource,
+		UpdaterOSSObjectKey:   &updaterKey,
+	}))
+}
+
+func TestDesktopClientReleaseOSSObjectKeysDedupesSharedInstallerUpdater(t *testing.T) {
+	t.Parallel()
+
+	objectKey := "desktop-client/releases/blobs/shared.zip"
+	ossSource := DesktopClientDownloadSourceOSS
+
+	require.Equal(t, []string{objectKey}, desktopClientReleaseOSSObjectKeys(&domain.DesktopClientRelease{
+		DownloadSource:        DesktopClientDownloadSourceOSS,
+		OSSObjectKey:          &objectKey,
+		UpdaterDownloadSource: &ossSource,
+		UpdaterOSSObjectKey:   &objectKey,
+	}))
+}
+
+func TestDesktopClientReleaseDeleteRemovesUnreferencedOSSObjects(t *testing.T) {
+	t.Parallel()
+
+	installerKey := "desktop-client/releases/blobs/installer.dmg"
+	updaterKey := "desktop-client/releases/blobs/updater.zip"
+	ossSource := DesktopClientDownloadSourceOSS
+	store := &desktopClientReleaseStoreFake{
+		items: map[int64]*domain.DesktopClientRelease{
+			42: {
+				ID:                    42,
+				DownloadSource:        DesktopClientDownloadSourceOSS,
+				OSSObjectKey:          &installerKey,
+				UpdaterDownloadSource: &ossSource,
+				UpdaterOSSObjectKey:   &updaterKey,
+			},
+		},
+	}
+	storage := &desktopReleaseDownloadURLStorage{
+		existsByKey: map[string]bool{
+			installerKey: true,
+			updaterKey:   true,
+		},
+		objects: map[string][]byte{
+			installerKey: []byte("installer"),
+			updaterKey:   []byte("updater"),
+		},
+	}
+	svc := NewDesktopClientReleaseService(nil, storage, nil)
+	svc.releases = store
+
+	err := svc.Delete(context.Background(), nil, 42)
+
+	require.NoError(t, err)
+	require.Equal(t, []string{installerKey, updaterKey}, storage.deleteCalls)
+	require.Equal(t, []int64{42}, store.deletedIDs)
+}
+
+func TestDesktopClientReleaseDeleteKeepsOSSObjectReferencedByAnotherRelease(t *testing.T) {
+	t.Parallel()
+
+	installerKey := "desktop-client/releases/blobs/installer.dmg"
+	updaterKey := "desktop-client/releases/blobs/updater.zip"
+	ossSource := DesktopClientDownloadSourceOSS
+	store := &desktopClientReleaseStoreFake{
+		items: map[int64]*domain.DesktopClientRelease{
+			42: {
+				ID:                    42,
+				DownloadSource:        DesktopClientDownloadSourceOSS,
+				OSSObjectKey:          &installerKey,
+				UpdaterDownloadSource: &ossSource,
+				UpdaterOSSObjectKey:   &updaterKey,
+			},
+		},
+		references: map[string]bool{installerKey: true},
+	}
+	storage := &desktopReleaseDownloadURLStorage{
+		existsByKey: map[string]bool{
+			installerKey: true,
+			updaterKey:   true,
+		},
+		objects: map[string][]byte{
+			installerKey: []byte("installer"),
+			updaterKey:   []byte("updater"),
+		},
+	}
+	svc := NewDesktopClientReleaseService(nil, storage, nil)
+	svc.releases = store
+
+	err := svc.Delete(context.Background(), nil, 42)
+
+	require.NoError(t, err)
+	require.Equal(t, []string{updaterKey}, storage.deleteCalls)
+	require.Equal(t, []int64{42}, store.deletedIDs)
+}
+
 func TestResolveDownloadURLResultUsesSignedDownloadURL(t *testing.T) {
 	t.Parallel()

@@ -462,6 +567,7 @@ func TestDesktopClientReleaseDirectUploadCompleteJobReportsStatus(t *testing.T)
 type desktopReleaseDownloadURLStorage struct {
 	publicURLCalls    []string
 	downloadURLCalls  []string
+	deleteCalls       []string
 	existsByKey       map[string]bool
 	objects           map[string][]byte
 	objectSizes       map[string]int64
@@ -544,7 +650,17 @@ func (s *desktopReleaseDownloadURLStorage) PresignedPutURL(
 	}, nil
 }

-func (s *desktopReleaseDownloadURLStorage) Delete(context.Context, string) error {
+func (s *desktopReleaseDownloadURLStorage) Delete(_ context.Context, objectKey string) error {
+	s.deleteCalls = append(s.deleteCalls, objectKey)
+	if s.objects != nil {
+		delete(s.objects, objectKey)
+	}
+	if s.existsByKey != nil {
+		s.existsByKey[objectKey] = false
+	}
+	if s.objectSizes != nil {
+		delete(s.objectSizes, objectKey)
+	}
 	return nil
 }

@@ -579,3 +695,59 @@ func (s *desktopReleaseDownloadURLStorage) Stat(_ context.Context, objectKey str
 func (s *desktopReleaseDownloadURLStorage) Copy(context.Context, string, string) error {
 	return nil
 }
+
+type desktopClientReleaseStoreFake struct {
+	items      map[int64]*domain.DesktopClientRelease
+	references map[string]bool
+	deletedIDs []int64
+}
+
+func (s *desktopClientReleaseStoreFake) List(context.Context, repository.DesktopClientReleaseFilter) ([]domain.DesktopClientRelease, int64, error) {
+	items := make([]domain.DesktopClientRelease, 0, len(s.items))
+	for _, item := range s.items {
+		items = append(items, *item)
+	}
+	return items, int64(len(items)), nil
+}
+
+func (s *desktopClientReleaseStoreFake) ListEnabledByChannel(context.Context, string) ([]domain.DesktopClientRelease, error) {
+	return nil, nil
+}
+
+func (s *desktopClientReleaseStoreFake) Create(context.Context, repository.UpsertDesktopClientReleaseInput) (*domain.DesktopClientRelease, error) {
+	return nil, errors.New("unexpected create call")
+}
+
+func (s *desktopClientReleaseStoreFake) Update(context.Context, int64, repository.UpsertDesktopClientReleaseInput) (*domain.DesktopClientRelease, error) {
+	return nil, errors.New("unexpected update call")
+}
+
+func (s *desktopClientReleaseStoreFake) SetEnabled(context.Context, int64, bool, *int64) (*domain.DesktopClientRelease, error) {
+	return nil, errors.New("unexpected set enabled call")
+}
+
+func (s *desktopClientReleaseStoreFake) GetByID(_ context.Context, id int64) (*domain.DesktopClientRelease, error) {
+	item, ok := s.items[id]
+	if !ok {
+		return nil, repository.ErrDesktopClientReleaseNotFound
+	}
+	copied := *item
+	return &copied, nil
+}
+
+func (s *desktopClientReleaseStoreFake) ListEnabledByTarget(context.Context, repository.DesktopClientReleaseTarget) ([]domain.DesktopClientRelease, error) {
+	return nil, nil
+}
+
+func (s *desktopClientReleaseStoreFake) HasObjectReference(_ context.Context, objectKey string, _ int64) (bool, error) {
+	return s.references[objectKey], nil
+}
+
+func (s *desktopClientReleaseStoreFake) Delete(_ context.Context, id int64) error {
+	if _, ok := s.items[id]; !ok {
+		return repository.ErrDesktopClientReleaseNotFound
+	}
+	s.deletedIDs = append(s.deletedIDs, id)
+	delete(s.items, id)
+	return nil
+}