Add test for re-created bucket and bucket policy

Author: Krishnan Parthasarathi

run/core/aws-sdk-php/quick-tests.php

@@ -373,6 +373,12 @@ function initSetup(S3Client $s3Client, $objects) {
                 $stream->close();
         }
     }
+
+    // Create an empty bucket for bucket policy + delete tests
+    $result = $s3Client->createBucket(['Bucket' => $GLOBALS['emptyBucket']]);
+    if (getStatusCode($result) != HTTP_OK)
+        throw new Exception("createBucket API failed for " . $bucket);
+
 }
 
 
@@ -756,6 +762,22 @@ function testBucketPolicy($s3Client, $bucket) {
 
     if ($result['Policy'] != $downloadPolicy)
         throw new Exception('bucket policy we got is not we set');
+
+    // Delete the bucket, make the bucket (again) and check if policy is none
+    // Ref: https://github.com/minio/minio/issues/4714
+    $result = $s3Client->deleteBucket(['Bucket' => $bucket]);
+    if (getstatuscode($result) != HTTP_NOCONTENT)
+        throw new Exception('deleteBucket API failed for ' .
+                            $bucket);
+
+    $result = $s3Client->createBucket(['Bucket' => $bucket]);
+    if (getstatuscode($result) != HTTP_OK)
+        throw new Exception('createBucket API failed for ' .
+                            $bucket);
+    $params = [
+        '404' => ['Bucket' => $bucket]
+    ];
+    runExceptionalTests($s3Client, 'getBucketPolicy', 'getStatusCode', $params);
 }
 
  /**
@@ -774,8 +796,10 @@ function cleanupSetup($s3Client, $objects) {
         $s3Client->deleteObject(['Bucket' => $bucket, 'Key' => $object]);
     }
 
-    // Delete the buckets
-    foreach (array_keys($objects) as $bucket) {
+    // Delete the buckets incl. emptyBucket
+    $allBuckets = array_keys($objects);
+    array_push($allBuckets, $GLOBALS['emptyBucket']);
+    foreach ($allBuckets as $bucket) {
         // Delete the bucket
         $s3Client->deleteBucket(['Bucket' => $bucket]);
 
@@ -837,6 +861,8 @@ function runTestFunction($myfunc, ...$args) {
     'version' => '2006-03-01'
 ]);
 
+// Used by initSetup
+$emptyBucket = randomName();
 $objects =  [
     randomName() => 'obj1',
     randomName() => 'obj2',
@@ -858,7 +884,7 @@ function runTestFunction($myfunc, ...$args) {
     runTestFunction('testMultipartUpload', $s3Client, $firstBucket, $firstObject);
     runTestFunction('testMultipartUploadFailure', $s3Client, $firstBucket, $firstObject);
     runTestFunction('testAbortMultipartUpload', $s3Client, $firstBucket, $firstObject);
-    runTestFunction('testBucketPolicy', $s3Client, $firstBucket);
+    runTestFunction('testBucketPolicy', $s3Client, $emptyBucket);
 }
 finally {
     cleanupSetup($s3Client, $objects);