Fix IP Filter implementation and test suite formatting

Author: salilg-eng

Storage/tests/System/ManageBucketsTest.php

@@ -627,20 +627,26 @@ public function testCreateBucketWithIpFilterDisabled()
      * @depends testCreateBucketWithIpFilterDisabled
      * @group storage-ipfilter
      */
-    public function testDeleteBucketIpFilter(Bucket $bucket)
+    public function testUpdateIpFilterDisabled(Bucket $bucket)
     {
         $ipFilterConfig = [
             'mode' => 'Disabled',
             'publicNetworkSource' => [
-                'allowedIpCidrRanges' => [] 
+                'allowedIpCidrRanges' => ['1.2.3.0/24', '5.6.7.0/24']
             ],
-            'allowAllServiceAgentAccess' => true
+            'allowAllServiceAgentAccess' => false
         ];
 
         $bucket->update(['ipFilter' => $ipFilterConfig]);
         $info = $bucket->reload();
 
-        $this->assertArrayNotHasKey('allowedIpCidrRanges', $info['ipFilter']['publicNetworkSource']);
+        $this->assertArrayHasKey('ipFilter', $info);
+        $this->assertEquals('Disabled', $info['ipFilter']['mode']);
+        $this->assertEquals(
+            ['1.2.3.0/24', '5.6.7.0/24'],
+            $info['ipFilter']['publicNetworkSource']['allowedIpCidrRanges']
+        );
+        $this->assertFalse($info['ipFilter']['allowAllServiceAgentAccess']);
     }
 
     /**
@@ -721,6 +727,28 @@ public function testGetBucketWithIpFilter()
         );
     }
 
+    /**
+     * @group storage-ipfilter
+     * @depends testCreateBucketWithIpFilterDisabled
+     */
+    public function testDeleteBucketIpFilter(Bucket $bucket)
+    {
+        $ipFilterConfig = [
+            'mode' => 'Disabled',
+            'publicNetworkSource' => [
+                'allowedIpCidrRanges' => []
+            ],
+            'allowAllServiceAgentAccess' => true
+        ];
+
+        $bucket->update(['ipFilter' => $ipFilterConfig]);
+        $info = $bucket->reload();
+
+        $this->assertArrayHasKey('ipFilter', $info);
+        $this->assertEquals('Disabled', $info['ipFilter']['mode']);
+        $this->assertArrayNotHasKey('allowedIpCidrRanges', $info['ipFilter']['publicNetworkSource']);
+    }
+
     /**
      * @group storage-ipfilter
      */
@@ -766,8 +794,5 @@ public function testBucketAccessWhenEnforced()
             $this->assertEquals(403, $e->getCode());
             $this->assertStringContainsString('IP filtering', $e->getMessage());
         }
-
-        $object->delete();
-        $bucket->delete();
     }
 }

Storage/tests/Unit/BucketTest.php

@@ -765,30 +765,22 @@ public function testDisableBucketIpFilter()
 
     public function testDeleteBucketIpFilter()
     {
-        $ipFilterConfig = [
-            'mode' => 'Disabled',
-            'publicNetworkSource' => [
-                'allowedIpCidrRanges' => ['1.2.3.0/24'] // Simulating deletion of an IP range
-            ],
-            'allowAllServiceAgentAccess' => true
-        ];
-
         $bucketInfo = [
-            'name' => self::BUCKET_NAME,
-            'ipFilter' => $ipFilterConfig
+            'name' => self::BUCKET_NAME
         ];
 
-        $this->connection->patchBucket(Argument::withEntry('ipFilter', $ipFilterConfig))
+        $this->connection->patchBucket(Argument::withEntry('ipFilter', [
+            'publicNetworkSource' => [
+                'allowedIpCidrRanges' => []
+            ]
+        ]))
             ->shouldBeCalled()
             ->willReturn($bucketInfo);
 
         $bucket = $this->getBucket();
-        $info = $bucket->update(['ipFilter' => $ipFilterConfig]);
+        $info = $bucket->update(['ipFilter' => ['publicNetworkSource' => ['allowedIpCidrRanges' => []]]]);
 
-        $this->assertEquals(
-            ['1.2.3.0/24'],
-            $info['ipFilter']['publicNetworkSource']['allowedIpCidrRanges']
-        );
+        $this->assertArrayNotHasKey('ipFilter', $info);
     }
 
     public function testGetsInfo()

Storage/tests/Unit/StorageClientTest.php

@@ -130,6 +130,35 @@ public function testGetsBucketsWithoutToken()
         $this->assertEquals('bucket1', $buckets[0]->name());
     }
 
+    public function testGetsBucketsWithIpFilter()
+    {
+        $ipFilterConfig = [
+            'mode' => 'Enabled',
+            'publicNetworkSource' => [
+                'allowedIpCidrRanges' => ['1.2.3.4/32']
+            ]
+        ];
+
+        $this->connection->listBuckets(Argument::any())->willReturn([
+            'items' => [
+                ['name' => 'bucket1', 'ipFilter' => $ipFilterConfig]
+            ]
+        ]);
+        $this->connection->projectId()
+            ->willReturn(self::PROJECT);
+
+        $this->client->___setProperty('connection', $this->connection->reveal());
+        $buckets = iterator_to_array($this->client->buckets());
+
+        $this->assertEquals('bucket1', $buckets[0]->name());
+        $this->assertArrayHasKey('ipFilter', $buckets[0]->info());
+        $this->assertEquals('Enabled', $buckets[0]->info()['ipFilter']['mode']);
+        $this->assertEquals(
+            ['1.2.3.4/32'],
+            $buckets[0]->info()['ipFilter']['publicNetworkSource']['allowedIpCidrRanges']
+        );
+    }
+
     public function testGetsBucketsWithToken()
     {
         $this->connection->listBuckets(Argument::any())