From 3cbdb37216642e2bdb303c2449cb53613b68ea99 Mon Sep 17 00:00:00 2001
From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>
Date: Wed, 1 Apr 2020 20:55:10 -0700
Subject: [PATCH] fix: clean s3 buckets after integration test is run (#1069)

---
 features/extra/cleanup.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/features/extra/cleanup.js b/features/extra/cleanup.js
index 3b268e85c016..973d634e4213 100644
--- a/features/extra/cleanup.js
+++ b/features/extra/cleanup.js
@@ -1,3 +1,5 @@
+var { S3 } = require("../../clients/client-s3");
+
 module.exports = function() {
   /**
    * Cleanup fixtures and resources. The world does not exist when
@@ -71,7 +73,7 @@ module.exports = function() {
    * Delete bucket
    */
   var deleteBucket = function(bucket, callback) {
-    var s3 = new AWS.S3({ maxRetries: 100 });
+    var s3 = new S3({ maxRetries: 100 });
     s3.deleteBucket({ Bucket: bucket }, function(err, data) {
       callback(err);
     });
@@ -81,14 +83,14 @@ module.exports = function() {
    * Delete objects.
    */
   var deleteObjects = function(bucket, callback) {
-    var s3 = new AWS.S3({ maxRetries: 100 });
+    var s3 = new S3({ maxRetries: 100 });
     var params = {
       Bucket: bucket
     };
 
     s3.listObjects(params, function(err, data) {
       if (err) return callback(err);
-      if (data.Contents.length > 0) {
+      if (data.Contents && data.Contents.length > 0) {
         params.Delete = { Objects: [] };
         data.Contents.forEach(function(item) {
           params.Delete.Objects.push({ Key: item.Key });