Skip to content

Commit

Permalink
Notify on container image create (#22806) (#22965)
Browse files Browse the repository at this point in the history
Backport #22806

Fixes #22791

---------

Signed-off-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
  • Loading branch information
3 people committed Feb 18, 2023
1 parent 98b7714 commit b2e58ed
Showing 1 changed file with 22 additions and 4 deletions.
26 changes: 22 additions & 4 deletions routers/api/packages/container/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/notification"
packages_module "code.gitea.io/gitea/modules/packages"
container_module "code.gitea.io/gitea/modules/packages/container"
"code.gitea.io/gitea/modules/util"
Expand Down Expand Up @@ -72,11 +73,9 @@ func processManifest(mci *manifestCreationInfo, buf *packages_module.HashedBuffe
}

if isImageManifestMediaType(mci.MediaType) {
d, err := processImageManifest(mci, buf)
return d, err
return processImageManifest(mci, buf)
} else if isImageIndexMediaType(mci.MediaType) {
d, err := processImageManifestIndex(mci, buf)
return d, err
return processImageManifestIndex(mci, buf)
}
return "", errManifestInvalid
}
Expand Down Expand Up @@ -183,6 +182,10 @@ func processImageManifest(mci *manifestCreationInfo, buf *packages_module.Hashed
return err
}

if err := notifyPackageCreate(mci.Creator, pv); err != nil {
return err
}

manifestDigest = digest

return nil
Expand Down Expand Up @@ -272,6 +275,10 @@ func processImageManifestIndex(mci *manifestCreationInfo, buf *packages_module.H
return err
}

if err := notifyPackageCreate(mci.Creator, pv); err != nil {
return err
}

manifestDigest = digest

return nil
Expand All @@ -283,6 +290,17 @@ func processImageManifestIndex(mci *manifestCreationInfo, buf *packages_module.H
return manifestDigest, nil
}

func notifyPackageCreate(doer *user_model.User, pv *packages_model.PackageVersion) error {
pd, err := packages_model.GetPackageDescriptor(db.DefaultContext, pv)
if err != nil {
return err
}

notification.NotifyPackageCreate(doer, pd)

return nil
}

func createPackageAndVersion(ctx context.Context, mci *manifestCreationInfo, metadata *container_module.Metadata) (*packages_model.PackageVersion, error) {
created := true
p := &packages_model.Package{
Expand Down

0 comments on commit b2e58ed

Please sign in to comment.