github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-21 03:20:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: [AH-790] Improve error handling for duplicate Artifact Registry | Gitness (#3170)

Browse Source 
* fix: [AH-790] Improve error handling for duplicate Artifact Registry
This commit is contained in:
Ritek Rounak 2024-12-17 12:58:28 +00:00 committed by Harness
parent bcd96cef21
commit c73014bc83
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
registry/app/api/controller/metadata/create_registry.go
View File

@ -108,8 +108,14 @@ func (c *APIController) CreateRegistry(
)
if err != nil {
if isDuplicateKeyError(err) {
if err2 := c.handleDuplicateRegistryError(ctx, registry); err2 != nil {
return throwCreateRegistry400Error(err2), nil //nolint:nilerr
}
}
return throwCreateRegistry400Error(err), nil //nolint:nilerr
}
upstreamproxyEntity, err := c.UpstreamProxyStore.Get(ctx, registryID)
if err != nil {
return throwCreateRegistry400Error(err), nil //nolint:nilerr
@ -134,6 +140,11 @@ func (c *APIController) createVirtualRegistry(
}
id, err := c.createRegistryWithAudit(ctx, registry, session.Principal, string(parentRef))
if err != nil {
if isDuplicateKeyError(err) {
if err2 := c.handleDuplicateRegistryError(ctx, registry); err2 != nil {
return throwCreateRegistry400Error(err2), nil //nolint:nilerr
}
}
return throwCreateRegistry400Error(err), nil
}
repoEntity, err := c.RegistryRepository.Get(ctx, id)
@ -197,9 +208,6 @@ func (c *APIController) createRegistryWithAudit(
) (int64, error) {
id, err := c.RegistryRepository.Create(ctx, registry)
if err != nil {
if isDuplicateKeyError(err) {
return -1, c.handleDuplicateRegistryError(ctx, registry)
}
return id, err
}
auditErr := c.AuditService.Log(