particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmd/osbuild-service-maintenance: GCP deletes by image name

Browse source
This commit is contained in:
Sanne Raymaekers 2022-02-11 10:24:39 +01:00 • committed by Tomáš Hozza
parent 1273ef7b35
commit d492e8f702
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/osbuild-service-maintenance/gcp.go
View file

@ -57,9 +57,9 @@ func GCPCleanup(creds []byte, maxConcurrentRequests int, dryRun bool, cutoff tim
defer sem.Release(1) defer sem.Release(1)
defer wg.Done() defer wg.Done()
err = g.ComputeImageDelete(context.Background(), id) err = g.ComputeImageDelete(context.Background(), image.GetName())
if err != nil { if err != nil {
logrus.Errorf("Error deleting image %s created at %v", id, created) logrus.Errorf("Error deleting image %s created at %v: %v", image.GetName(), created, err)
} }
}(fmt.Sprintf("%d", image.Id)) }(fmt.Sprintf("%d", image.Id))
} }

4
internal/cloud/gcp/compute.go
View file

@ -277,7 +277,7 @@ func (g *GCP) ComputeImageShare(ctx context.Context, imageName string, shareWith
// //
// Uses: // Uses:
// - Compute Engine API // - Compute Engine API
func (g *GCP) ComputeImageDelete(ctx context.Context, resourceId string) error { func (g *GCP) ComputeImageDelete(ctx context.Context, name string) error {
imagesClient, err := compute.NewImagesRESTClient(ctx, option.WithCredentials(g.creds)) imagesClient, err := compute.NewImagesRESTClient(ctx, option.WithCredentials(g.creds))
if err != nil { if err != nil {
return fmt.Errorf("failed to get Compute Engine Images client: %v", err) return fmt.Errorf("failed to get Compute Engine Images client: %v", err)
@ -286,7 +286,7 @@ func (g *GCP) ComputeImageDelete(ctx context.Context, resourceId string) error {
req := &computepb.DeleteImageRequest{ req := &computepb.DeleteImageRequest{
Project: g.GetProjectID(), Project: g.GetProjectID(),
Image: resourceId, Image: name,
} }
_, err = imagesClient.Delete(ctx, req) _, err = imagesClient.Delete(ctx, req)