fix cleanup to delete versioned GCP buckets

EngineerBetter · Aug 5, 2019 · be46f58 · be46f58
1 parent 378c87a
commit be46f58
Showing 1 changed file with 1 addition and 5 deletions.
diff --git 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