rocky-linux
/
peridot
mirror of https://github.com/rocky-linux/peridot.git
4
0
Fork 0
Code Issues Projects Releases Activity

Merge pull request #68 from mstg/active-in-repo-fix 

Peridot: Fix MakeActiveInRepo - Only set for current project
This commit is contained in:
resf-prow[bot] 2022-11-07 13:42:46 +00:00 committed by GitHub
parent 850c4b93bb a143c18b94
commit 4e9db547f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
peridot/builder/v1/workflow/yumrepofs.go
View File

@ -1477,7 +1477,7 @@ func (c *Controller) makeRepoChanges(tx peridotdb.Access, req *UpdateRepoRequest
}
if !req.DisableSetActive {
err = tx.MakeActiveInRepoForPackageVersion(build.PackageVersionId, build.PackageId)
err = tx.MakeActiveInRepoForPackageVersion(build.PackageVersionId, build.PackageId, build.ProjectId)
if err != nil {
c.log.Errorf("failed to set active build for project %s, package %s: %s", project.ID.String(), packageName, err)
return nil, err

2
peridot/db/db.go
View File

@ -93,7 +93,7 @@ type Access interface {
AttachPackageVersion(projectId string, packageId string, packageVersionId string, active bool) error
GetProjectPackageVersionFromPackageVersionId(packageVersionId string, projectId string) (string, error)
DeactivateProjectPackageVersionByPackageIdAndProjectId(packageId string, projectId string) error
MakeActiveInRepoForPackageVersion(packageVersionId string, packageId string) error
MakeActiveInRepoForPackageVersion(packageVersionId string, packageId string, projectId string) error
CreatePackage(name string, packageType peridotpb.PackageType) (*models.Package, error)
AddPackageToProject(projectId string, packageId string, packageTypeOverride peridotpb.PackageType) error
GetPackageID(name string) (string, error)

6
peridot/db/psql/package.go
View File

@ -242,18 +242,18 @@ func (a *Access) DeactivateProjectPackageVersionByPackageIdAndProjectId(packageI
return err
}
func (a *Access) MakeActiveInRepoForPackageVersion(packageVersionId string, packageId string) error {
func (a *Access) MakeActiveInRepoForPackageVersion(packageVersionId string, packageId string, projectId string) error {
tx, err := a.Begin()
if err != nil {
return err
}
_, err = tx.Exec("update project_package_versions set active_in_repo = false where package_id = $1", packageId)
_, err = tx.Exec("update project_package_versions set active_in_repo = false where package_id = $1 and project_id = $2", packageId, projectId)
if err != nil {
return err
}
_, err = tx.Exec("update project_package_versions set active_in_repo = true where package_version_id = $1", packageVersionId)
_, err = tx.Exec("update project_package_versions set active_in_repo = true where package_version_id = $1 and project_id = $2", packageVersionId, projectId)
if err != nil {
return err
}