cybercyst/drone
1
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-05 15:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: [AH-1197]: implement delete image for non oci flow (#3700)

Browse Source 
* feat: [AH-1197]: implement delete image for non oci flow
This commit is contained in:
Shivanand Sonnad 2025-04-22 09:34:32 +00:00 committed by Harness
parent d361fc3f5a
commit 646cb57578
2 changed files with 99 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
registry/app/api/controller/metadata/delete_artifact.go
View File

@ -23,7 +23,7 @@ import (
"github.com/harness/gitness/app/api/request"
"github.com/harness/gitness/audit"
"github.com/harness/gitness/registry/app/api/openapi/contracts/artifact"
registryTypes "github.com/harness/gitness/registry/types"
"github.com/harness/gitness/registry/app/api/utils"
"github.com/harness/gitness/types/enum"
"github.com/rs/zerolog/log"
@ -65,84 +65,127 @@ func (c *APIController) DeleteArtifact(ctx context.Context, r artifact.DeleteArt
}
repoEntity, err := c.RegistryRepository.GetByParentIDAndName(ctx, regInfo.parentID, regInfo.RegistryIdentifier)
if len(repoEntity.Name) == 0 {
if err != nil {
//nolint:nilerr
return artifact.DeleteArtifact404JSONResponse{
NotFoundJSONResponse: artifact.NotFoundJSONResponse(
*GetErrorResponse(http.StatusNotFound, "registry doesn't exist with this key"),
),
}, nil
}
if err != nil {
return throwDeleteArtifact500Error(err), err
}
artifactName := string(r.Artifact)
artifactDetails, err := c.ImageStore.GetByName(ctx, regInfo.RegistryID, artifactName)
if err != nil || artifactDetails == nil {
_, err = c.ImageStore.GetByName(ctx, regInfo.RegistryID, artifactName)
if err != nil {
//nolint:nilerr
return artifact.DeleteArtifact404JSONResponse{
NotFoundJSONResponse: artifact.NotFoundJSONResponse(
*GetErrorResponse(http.StatusNotFound, "artifact doesn't exist with this key"),
),
}, err
}
if !artifactDetails.Enabled {
return artifact.DeleteArtifact404JSONResponse{
NotFoundJSONResponse: artifact.NotFoundJSONResponse(
*GetErrorResponse(http.StatusNotFound, "artifact is already deleted"),
),
}, nil
}
err = c.tx.WithTx(
ctx, func(ctx context.Context) error {
err = c.disableImageStatus(
ctx, regInfo, artifactName,
)
if err != nil {
return fmt.Errorf("failed to delete artifact: %w", err)
}
err := c.TagStore.DeleteTagsByImageName(ctx, regInfo.RegistryID, artifactName)
if err != nil {
return fmt.Errorf("failed to delete artifact: %w", err)
}
auditErr := c.AuditService.Log(
ctx,
session.Principal,
audit.NewResource(audit.ResourceTypeRegistryArtifact, string(r.Artifact)),
audit.ActionDeleted,
regInfo.ParentRef,
audit.WithData("registry name", repoEntity.Name),
audit.WithData("artifact name", string(r.Artifact)),
)
if auditErr != nil {
log.Ctx(ctx).Warn().Msgf("failed to insert audit log for delete tag operation: %s", auditErr)
}
return nil
},
)
switch regInfo.PackageType {
case artifact.PackageTypeDOCKER:
err = c.deleteOCIImage(ctx, regInfo, artifactName)
case artifact.PackageTypeHELM:
err = c.deleteOCIImage(ctx, regInfo, artifactName)
case artifact.PackageTypeGENERIC:
err = c.deleteGenericImage(ctx, regInfo, artifactName)
case artifact.PackageTypeMAVEN:
err = c.deleteGenericImage(ctx, regInfo, artifactName)
case artifact.PackageTypePYTHON:
err = c.deleteGenericImage(ctx, regInfo, artifactName)
case artifact.PackageTypeNPM:
err = c.deleteGenericImage(ctx, regInfo, artifactName)
case artifact.PackageTypeNUGET:
err = fmt.Errorf("delete artifact not supported for nuget")
case artifact.PackageTypeRPM:
err = fmt.Errorf("delete artifact not supported for rpm")
default:
err = fmt.Errorf("unsupported package type: %s", regInfo.PackageType)
}
if err != nil {
return throwDeleteArtifact500Error(err), err
}
auditErr := c.AuditService.Log(
ctx,
session.Principal,
audit.NewResource(audit.ResourceTypeRegistryArtifact, string(r.Artifact)),
audit.ActionDeleted,
regInfo.ParentRef,
audit.WithData("registry name", repoEntity.Name),
audit.WithData("artifact name", string(r.Artifact)),
)
if auditErr != nil {
log.Ctx(ctx).Warn().Msgf("failed to insert audit log for delete tag operation: %s", auditErr)
}
return artifact.DeleteArtifact200JSONResponse{
SuccessJSONResponse: artifact.SuccessJSONResponse(*GetSuccessResponse()),
}, nil
}
func (c *APIController) disableImageStatus(
func (c *APIController) deleteOCIImage(
ctx context.Context,
regInfo *RegistryRequestBaseInfo, artifactName string,
regInfo *RegistryRequestBaseInfo,
artifactName string,
) error {
image := &registryTypes.Image{
Name: artifactName,
RegistryID: regInfo.RegistryID,
Enabled: false,
}
err := c.ImageStore.UpdateStatus(ctx, image)
err := c.tx.WithTx(
ctx, func(ctx context.Context) error {
// Delete tags linked to the image
err := c.TagStore.DeleteTagsByImageName(ctx, regInfo.RegistryID, artifactName)
if err != nil {
return fmt.Errorf("failed to delete artifact: %w", err)
}
// Delete image
err = c.ImageStore.DeleteByImageNameAndRegID(
ctx, regInfo.RegistryID, artifactName,
)
if err != nil {
return fmt.Errorf("failed to delete artifact: %w", err)
}
return nil
},
)
return err
}
func (c *APIController) deleteGenericImage(
ctx context.Context,
regInfo *RegistryRequestBaseInfo,
artifactName string,
) error {
err := c.tx.WithTx(
ctx, func(ctx context.Context) error {
// Get File Path
filePath, err := utils.GetFilePath(regInfo.PackageType, artifactName, "")
if err != nil {
return fmt.Errorf("failed to get file path: %w", err)
}
// Delete Artifact Files
err = c.fileManager.DeleteNode(ctx, regInfo.RegistryID, filePath)
if err != nil {
return fmt.Errorf("failed to delete artifact files: %w", err)
}
// Delete Artifacts
err = c.ArtifactStore.DeleteByImageNameAndRegistryID(ctx, regInfo.RegistryID, artifactName)
if err != nil {
return fmt.Errorf("failed to delete versions: %w", err)
}
// Delete image
err = c.ImageStore.DeleteByImageNameAndRegID(
ctx, regInfo.RegistryID, artifactName,
)
if err != nil {
return fmt.Errorf("failed to delete artifact: %w", err)
}
return nil
},
)
return err
}

18
registry/app/api/controller/metadata/delete_registry.go
View File

@ -70,16 +70,14 @@ func (c *APIController) DeleteRegistry(
}
repoEntity, err := c.RegistryRepository.GetByParentIDAndName(ctx, regInfo.parentID, regInfo.RegistryIdentifier)
if len(repoEntity.Name) == 0 {
if err != nil {
//nolint:nilerr
return artifact.DeleteRegistry404JSONResponse{
NotFoundJSONResponse: artifact.NotFoundJSONResponse(
*GetErrorResponse(http.StatusNotFound, "registry doesn't exist with this key"),
),
}, nil
}
if err != nil {
return throwDeleteRegistry500Error(err), err
}
if string(repoEntity.Type) == string(artifact.RegistryTypeVIRTUAL) {
err = c.tx.WithTx(
@ -196,17 +194,7 @@ func (c *APIController) deleteRegistryWithAudit(
ctx context.Context, regInfo *RegistryRequestBaseInfo,
registry *registrytypes.Registry, principal types.Principal, parentRef string,
) error {
err := c.ImageStore.DeleteDownloadStatByRegistryID(ctx, regInfo.RegistryID)
if err != nil {
return err
}
err = c.ImageStore.DeleteBandwidthStatByRegistryID(ctx, regInfo.RegistryID)
if err != nil {
return err
}
err = c.ImageStore.DeleteByRegistryID(ctx, regInfo.RegistryID)
err := c.ImageStore.DeleteByRegistryID(ctx, regInfo.RegistryID)
if err != nil {
return err
}