From be46f58dfc650cc4b28a05f84f7c7341d41a856d Mon Sep 17 00:00:00 2001
From: Daniel Jones <daniel.jones@engineerbetter.com>
Date: Mon, 5 Aug 2019 10:58:53 +0100
Subject: [PATCH] fix cleanup to delete versioned GCP buckets

---
 ci/tasks/ruby-lib/gcp.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ci/tasks/ruby-lib/gcp.rb b/ci/tasks/ruby-lib/gcp.rb
index cdb2dca5c..c10e14145 100755
--- a/ci/tasks/ruby-lib/gcp.rb
+++ b/ci/tasks/ruby-lib/gcp.rb
@@ -39,7 +39,7 @@ def new_orphan(bucket_name)
   def cleanup(orphan)
     bucket = orphan.bucket
     if bucket.contents.empty?
-      bucket.delete_empty
+      bucket.delete
     else
       found_components = 0
       found_components += delete_components('compute instances', "labels.deployment:bosh AND labels.control-tower-project:#{orphan.project}", 'name')
@@ -127,8 +127,4 @@ def key_files?
   def delete
     `gsutil rm -r gs://#{name}`
   end
-
-  def delete_empty
-    `gsutil rb gs://#{name}`
-  end
 end