[content-service] Return ErrNotFound if bucket object does not exists

[aledbf]

fixes #3772

[geropl]

LGTM

Thx! 🚀

[aledbf]

/werft run

👍 started the job as gitpod-build-aledbf-contenterr.1

[geropl]

@aledbf I just checked the client code: It seems we do not properly check for ErrNotFound. What about going fixing that as well and move on without this today? :-)

[aledbf]

I just checked the client code

Where exactly? (I read WorkspaceService and the code checks the error)

[geropl]

@aledbf You're absolutely right, I got lost in the WithError noise here:

gitpod/components/content-service/pkg/service/workspace-service.go

Lines 70 to 107 in e56ed09

	if req.IncludeSnapshots {
	prefix := cs.s.BackupObject(req.WorkspaceId, "")
	if !strings.HasSuffix(prefix, "/") {
	prefix = prefix + "/"
	}
	err = cs.s.DeleteObject(ctx, cs.s.Bucket(req.OwnerId), &storage.DeleteObjectQuery{Prefix: prefix})
	if err != nil {
	if err == storage.ErrNotFound {
	log.WithError(err).Error("deleting workspace backup: NotFound")
	return &api.DeleteWorkspaceResponse{}, nil
	}
	log.WithError(err).Error("error deleting workspace backup")
	return nil, status.Error(codes.Unknown, err.Error())
	}
	return &api.DeleteWorkspaceResponse{}, nil
	}
	blobName := cs.s.BackupObject(req.WorkspaceId, storage.DefaultBackup)
	err = cs.s.DeleteObject(ctx, cs.s.Bucket(req.OwnerId), &storage.DeleteObjectQuery{Name: blobName})
	if err != nil {
	if err == storage.ErrNotFound {
	log.WithError(err).Error("deleting workspace backup: NotFound, ", blobName)
	return &api.DeleteWorkspaceResponse{}, nil
	}
	log.WithError(err).Error("error deleting workspace backup: ", blobName)
	return nil, status.Error(codes.Unknown, err.Error())
	}
	trailPrefix := cs.s.BackupObject(req.WorkspaceId, "trail-")
	err = cs.s.DeleteObject(ctx, cs.s.Bucket(req.OwnerId), &storage.DeleteObjectQuery{Prefix: trailPrefix})
	if err != nil {
	if err == storage.ErrNotFound {
	log.WithError(err).Error("deleting workspace backup: NotFound, ", trailPrefix)
	return &api.DeleteWorkspaceResponse{}, nil
	}
	log.WithError(err).Error("error deleting workspace backup: ", trailPrefix)
	return nil, status.Error(codes.Unknown, err.Error())
	}

In case of ErrNotFound we should default to Debug() and not Error().

[aledbf]

In case of ErrNotFound we should default to Debug() and not Error().

Done

[geropl]

Awesome, thank you! 🙏