Fix removing some packages will result dirty data #34709
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| // Copyright 2025 The Gitea Authors. All rights reserved. | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| package common | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| packages_model "code.gitea.io/gitea/models/packages" | ||
| user_model "code.gitea.io/gitea/models/user" | ||
| packages_service "code.gitea.io/gitea/services/packages" | ||
| alpine_service "code.gitea.io/gitea/services/packages/alpine" | ||
| cargo_service "code.gitea.io/gitea/services/packages/cargo" | ||
| debian_service "code.gitea.io/gitea/services/packages/debian" | ||
| rpm_service "code.gitea.io/gitea/services/packages/rpm" | ||
| ) | ||
|
|
||
| // RemovePackageVersionByNameAndVersion deletes a package version and all associated files | ||
| func RemovePackageVersionByNameAndVersion(ctx context.Context, doer *user_model.User, pvi *packages_service.PackageInfo) error { | ||
| pv, err := packages_model.GetVersionByNameAndVersion(ctx, pvi.Owner.ID, pvi.PackageType, pvi.Name, pvi.Version) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return RemovePackageVersion(ctx, doer, pv) | ||
| } | ||
|
|
||
| func RemovePackageVersion(ctx context.Context, doer *user_model.User, pv *packages_model.PackageVersion) error { | ||
| pd, err := packages_model.GetPackageDescriptor(ctx, pv) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| switch pd.Package.Type { | ||
| case packages_model.TypeAlpine: | ||
| return alpine_service.RemovePackageVersion(ctx, doer, pv) | ||
| case packages_model.TypeCargo: | ||
| return cargo_service.RemovePackageVersion(ctx, doer, pv) | ||
| case packages_model.TypeDebian: | ||
| return debian_service.RemovePackageVersion(ctx, doer, pv) | ||
| case packages_model.TypeRpm: | ||
| return rpm_service.RemovePackageVersion(ctx, doer, pv) | ||
| default: | ||
| return packages_service.RemovePackageVersion(ctx, doer, pv) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // Copyright 2025 The Gitea Authors. All rights reserved. | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| package alpine | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "code.gitea.io/gitea/models/db" | ||
| packages_model "code.gitea.io/gitea/models/packages" | ||
| user_model "code.gitea.io/gitea/models/user" | ||
| notify_service "code.gitea.io/gitea/services/notify" | ||
| packages_service "code.gitea.io/gitea/services/packages" | ||
| ) | ||
|
|
||
| func RemovePackageVersion(ctx context.Context, doer *user_model.User, pv *packages_model.PackageVersion) error { | ||
| pd, err := packages_model.GetPackageDescriptor(ctx, pv) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := db.WithTx(ctx, func(ctx context.Context) error { | ||
| if err := packages_service.DeletePackageVersionAndReferences(ctx, pv); err != nil { | ||
| return err | ||
| } | ||
| if err := BuildAllRepositoryFiles(ctx, pd.Owner.ID); err != nil { | ||
| return fmt.Errorf("alpine.BuildAllRepositoryFiles failed: %w", err) | ||
| } | ||
| return nil | ||
| }); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| notify_service.PackageDelete(ctx, doer, pd) | ||
| return nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // Copyright 2025 The Gitea Authors. All rights reserved. | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| package cargo | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "code.gitea.io/gitea/models/db" | ||
| packages_model "code.gitea.io/gitea/models/packages" | ||
| user_model "code.gitea.io/gitea/models/user" | ||
| notify_service "code.gitea.io/gitea/services/notify" | ||
| packages_service "code.gitea.io/gitea/services/packages" | ||
| ) | ||
|
|
||
| func RemovePackageVersion(ctx context.Context, doer *user_model.User, pv *packages_model.PackageVersion) error { | ||
| pd, err := packages_model.GetPackageDescriptor(ctx, pv) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := db.WithTx(ctx, func(ctx context.Context) error { | ||
| if err := packages_service.DeletePackageVersionAndReferences(ctx, pv); err != nil { | ||
| return err | ||
| } | ||
| if err := UpdatePackageIndexIfExists(ctx, doer, pd.Owner, pd.Package.ID); err != nil { | ||
| return fmt.Errorf("alpine.BuildAllRepositoryFiles failed: %w", err) | ||
| } | ||
| return nil | ||
| }); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| notify_service.PackageDelete(ctx, doer, pd) | ||
| return nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // Copyright 2025 The Gitea Authors. All rights reserved. | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| package debian | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "code.gitea.io/gitea/models/db" | ||
| packages_model "code.gitea.io/gitea/models/packages" | ||
| user_model "code.gitea.io/gitea/models/user" | ||
| notify_service "code.gitea.io/gitea/services/notify" | ||
| packages_service "code.gitea.io/gitea/services/packages" | ||
| ) | ||
|
|
||
| func RemovePackageVersion(ctx context.Context, doer *user_model.User, pv *packages_model.PackageVersion) error { | ||
| pd, err := packages_model.GetPackageDescriptor(ctx, pv) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := db.WithTx(ctx, func(ctx context.Context) error { | ||
| if err := packages_service.DeletePackageVersionAndReferences(ctx, pv); err != nil { | ||
| return err | ||
| } | ||
| if err := BuildAllRepositoryFiles(ctx, pd.Owner.ID); err != nil { | ||
| return fmt.Errorf("alpine.BuildAllRepositoryFiles failed: %w", err) | ||
| } | ||
| return nil | ||
| }); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| notify_service.PackageDelete(ctx, doer, pd) | ||
| return nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // Copyright 2025 The Gitea Authors. All rights reserved. | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| package rpm | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "code.gitea.io/gitea/models/db" | ||
| packages_model "code.gitea.io/gitea/models/packages" | ||
| user_model "code.gitea.io/gitea/models/user" | ||
| notify_service "code.gitea.io/gitea/services/notify" | ||
| packages_service "code.gitea.io/gitea/services/packages" | ||
| ) | ||
|
|
||
| func RemovePackageVersion(ctx context.Context, doer *user_model.User, pv *packages_model.PackageVersion) error { | ||
| pd, err := packages_model.GetPackageDescriptor(ctx, pv) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := db.WithTx(ctx, func(ctx context.Context) error { | ||
| if err := packages_service.DeletePackageVersionAndReferences(ctx, pv); err != nil { | ||
| return err | ||
| } | ||
| if err := BuildAllRepositoryFiles(ctx, pd.Owner.ID); err != nil { | ||
| return fmt.Errorf("alpine.BuildAllRepositoryFiles failed: %w", err) | ||
| } | ||
| return nil | ||
| }); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| notify_service.PackageDelete(ctx, doer, pd) | ||
| return nil | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It calls
RemovePackageVersionmutiple times and "build" again and again. It doesn't seem right.It should introduce a final step to rebuild when the removal finishes.