From 842d0241ed636ff71a90eb9af56836d7d95b837b Mon Sep 17 00:00:00 2001
From: Praveen raj Mani <praveen@minio.io>
Date: Mon, 16 Dec 2019 12:41:49 +0530
Subject: [PATCH] Fix aws-sdk-php functional test cases for GCS gateway (#8613)

Fixes #8570
---
 mint/run/core/aws-sdk-php/quick-tests.php | 29 ++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/mint/run/core/aws-sdk-php/quick-tests.php b/mint/run/core/aws-sdk-php/quick-tests.php
index 754d6dcd6..dc5d074f4 100644
--- a/mint/run/core/aws-sdk-php/quick-tests.php
+++ b/mint/run/core/aws-sdk-php/quick-tests.php
@@ -818,6 +818,28 @@ function testAnonDeleteObjects($s3Client, $params) {
     }
 }
 
+// Check if the policy statements are equal
+function are_statements_equal($expected, $got) {   
+    $expected = json_decode($expected, TRUE);
+    $got = json_decode($got, TRUE);
+
+    function are_actions_equal($action1, $action2) {
+        return (
+            is_array($action1) 
+            && is_array($action2) 
+            && count($action1) == count($action2) 
+            && array_diff($action1, $action2) === array_diff($action2, $action1)
+        );
+    }
+
+    foreach ($expected['Statement'] as $index => $value) {
+        if (!are_actions_equal($value['Action'], $got['Statement'][$index]['Action']))
+            return FALSE;
+    }
+
+    return TRUE;
+    
+}
  /**
   *  testBucketPolicy tests GET/PUT Bucket policy S3 APIs
   *
@@ -830,8 +852,7 @@ function testAnonDeleteObjects($s3Client, $params) {
 function testBucketPolicy($s3Client, $params) {
     $bucket = $params['Bucket'];
 
-    // Taken from policy set using `mc policy download`
-    $downloadPolicy = sprintf('{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"AWS":["*"]},"Action":["s3:GetObject"],"Resource":["arn:aws:s3:::%s/*"]}]}', $bucket);
+    $downloadPolicy = sprintf('{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"AWS":["*"]},"Action":["s3:GetBucketLocation","s3:ListBucket","s3:GetObject"],"Resource":["arn:aws:s3:::%s","arn:aws:s3:::%s/*"]}]}', $bucket, $bucket);
 
     $result = $s3Client->putBucketPolicy([
         'Bucket' => $bucket,
@@ -846,7 +867,9 @@ function testBucketPolicy($s3Client, $params) {
                             $bucket);
 
     if ($result['Policy'] != $downloadPolicy)
-        throw new Exception('bucket policy we got is not we set');
+        if (!are_statements_equal($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