test(storage): address reviewer feedback for ip filter deletion and get assertions

Author: salilg-eng

Storage/tests/System/ManageBucketsTest.php

@@ -706,7 +706,8 @@ public function testGetBucketWithIpFilter()
             'mode' => 'Disabled',
             'publicNetworkSource' => [
                 'allowedIpCidrRanges' => ['1.2.3.0/24']
-            ]
+            ],
+            'allowAllServiceAgentAccess' => true
         ];
 
         self::createBucket(
@@ -720,60 +721,15 @@ public function testGetBucketWithIpFilter()
 
         $this->assertArrayHasKey('ipFilter', $info);
         $this->assertEquals('Disabled', $info['ipFilter']['mode']);
-    }
-
-    /**
-     * @group storage-ipfilter
-     */
-    public function testDisableBucketIpFilter()
-    {
-        $bucketName = uniqid(self::TESTING_PREFIX);
-        $ipFilterConfig = [
-            'mode' => 'Enabled',
-            'publicNetworkSource' => [
-                'allowedIpCidrRanges' => ['1.2.3.0/24']
-            ]
-        ];
-
-        $bucket = self::createBucket(
-            self::$client,
-            $bucketName,
-            ['ipFilter' => $ipFilterConfig]
+        $this->assertEquals(
+            ['1.2.3.0/24'],
+            $info['ipFilter']['publicNetworkSource']['allowedIpCidrRanges']
         );
-
-        $bucket->update([
-            'ipFilter' => [
-                'mode' => 'Disabled'
-            ]
-        ]);
-
-        $info = $bucket->reload();
-        $this->assertEquals('Disabled', $info['ipFilter']['mode']);
     }
 
-    /**
-     * @group storage-ipfilter
-     */
-    public function testDeleteBucketWithIpFilter()
-    {
-        $bucketName = uniqid(self::TESTING_PREFIX);
-        $ipFilterConfig = [
-            'mode' => 'Disabled',
-            'publicNetworkSource' => [
-                'allowedIpCidrRanges' => ['1.2.3.0/24']
-            ]
-        ];
 
-        $bucket = self::createBucket(
-            self::$client,
-            $bucketName,
-            ['ipFilter' => $ipFilterConfig]
-        );
 
-        $this->assertTrue($bucket->exists());
-        $bucket->delete();
-        $this->assertFalse($bucket->exists());
-    }
+
 
     /**
      * @group storage-ipfilter

Storage/tests/Unit/BucketTest.php

@@ -713,7 +713,8 @@ public function testGetBucketWithIpFilter()
             'mode' => 'Disabled',
             'publicNetworkSource' => [
                 'allowedIpCidrRanges' => ['1.2.3.0/24']
-            ]
+            ],
+            'allowAllServiceAgentAccess' => true
         ];
 
         $bucketInfo = [
@@ -730,12 +731,20 @@ public function testGetBucketWithIpFilter()
 
         $this->assertArrayHasKey('ipFilter', $info);
         $this->assertEquals('Disabled', $info['ipFilter']['mode']);
+        $this->assertEquals(
+            ['1.2.3.0/24'],
+            $info['ipFilter']['publicNetworkSource']['allowedIpCidrRanges']
+        );
     }
 
     public function testDisableBucketIpFilter()
     {
         $ipFilterConfig = [
-            'mode' => 'Disabled'
+            'mode' => 'Disabled',
+            'publicNetworkSource' => [
+                'allowedIpCidrRanges' => ['1.2.3.0/24']
+            ],
+            'allowAllServiceAgentAccess' => true
         ];
 
         $bucketInfo = [
@@ -754,14 +763,20 @@ public function testDisableBucketIpFilter()
         $this->assertEquals('Disabled', $info['ipFilter']['mode']);
     }
 
-    public function testDeleteBucketWithIpFilter()
+    public function testDeleteBucketIpFilter()
     {
-        $this->connection->deleteBucket(Argument::any())
+        $bucketInfo = [
+            'name' => self::BUCKET_NAME
+        ];
+
+        $this->connection->patchBucket(Argument::withEntry('ipFilter', null))
             ->shouldBeCalled()
-            ->willReturn([]);
+            ->willReturn($bucketInfo);
 
         $bucket = $this->getBucket();
-        $this->assertNull($bucket->delete());
+        $info = $bucket->update(['ipFilter' => null]);
+
+        $this->assertArrayNotHasKey('ipFilter', $info);
     }
 
     public function testGetsInfo()