From d492e8f70283bb82eb0c8a12251267f4fcd6f296 Mon Sep 17 00:00:00 2001 From: Sanne Raymaekers Date: Fri, 11 Feb 2022 10:24:39 +0100 Subject: [PATCH] cmd/osbuild-service-maintenance: GCP deletes by image name --- cmd/osbuild-service-maintenance/gcp.go | 4 ++-- internal/cloud/gcp/compute.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/osbuild-service-maintenance/gcp.go b/cmd/osbuild-service-maintenance/gcp.go index 236a7658d..eb9d3e217 100644 --- a/cmd/osbuild-service-maintenance/gcp.go +++ b/cmd/osbuild-service-maintenance/gcp.go @@ -57,9 +57,9 @@ func GCPCleanup(creds []byte, maxConcurrentRequests int, dryRun bool, cutoff tim defer sem.Release(1) defer wg.Done() - err = g.ComputeImageDelete(context.Background(), id) + err = g.ComputeImageDelete(context.Background(), image.GetName()) 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)) } diff --git a/internal/cloud/gcp/compute.go b/internal/cloud/gcp/compute.go index 1da8ab4f9..c4661272e 100644 --- a/internal/cloud/gcp/compute.go +++ b/internal/cloud/gcp/compute.go @@ -277,7 +277,7 @@ func (g *GCP) ComputeImageShare(ctx context.Context, imageName string, shareWith // // Uses: // - 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)) if err != nil { 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{ Project: g.GetProjectID(), - Image: resourceId, + Image: name, } _, err = imagesClient.Delete(ctx, req)