Merge pull request php-enqueue#1216 from eortiz-tracktik/issue-1213

makasim · web-flow · commit 6031520200fd · 2021-11-19T08:36:35.000+02:00
feat(snsqs): allow client http configuration for sns and sqs
diff --git a/pkg/sns/SnsConnectionFactory.php b/pkg/sns/SnsConnectionFactory.php
@@ -105,6 +105,10 @@ private function establishConnection(): SnsClient
             }
         }
 
+        if (isset($this->config['http'])) {
+            $config['http'] = $this->config['http'];
+        }
+
         $establishConnection = function () use ($config) {
             return (new Sdk(['Sns' => $config]))->createMultiRegionSns();
         };
@@ -134,6 +138,7 @@ private function parseDsn(string $dsn): array
             'lazy' => $dsn->getBool('lazy'),
             'endpoint' => $dsn->getString('endpoint'),
             'topic_arns' => $dsn->getArray('topic_arns', [])->toArray(),
+            'http' => $dsn->getArray('http', [])->toArray(),
         ]), function ($value) { return null !== $value; });
     }
 
@@ -148,6 +153,7 @@ private function defaultConfig(): array
             'lazy' => true,
             'endpoint' => null,
             'topic_arns' => [],
+            'http' => [],
         ];
     }
 }
diff --git a/pkg/sns/Tests/SnsConnectionFactoryConfigTest.php b/pkg/sns/Tests/SnsConnectionFactoryConfigTest.php
@@ -65,6 +65,7 @@ public static function provideConfigs()
                 'lazy' => true,
                 'endpoint' => null,
                 'topic_arns' => [],
+                'http' => [],
             ],
         ];
 
@@ -79,6 +80,7 @@ public static function provideConfigs()
                 'lazy' => true,
                 'endpoint' => null,
                 'topic_arns' => [],
+                'http' => [],
             ],
         ];
 
@@ -93,6 +95,7 @@ public static function provideConfigs()
                 'lazy' => true,
                 'endpoint' => null,
                 'topic_arns' => [],
+                'http' => [],
             ],
         ];
 
@@ -107,6 +110,7 @@ public static function provideConfigs()
                 'lazy' => false,
                 'endpoint' => null,
                 'topic_arns' => [],
+                'http' => [],
             ],
         ];
 
@@ -121,6 +125,7 @@ public static function provideConfigs()
                 'lazy' => false,
                 'endpoint' => null,
                 'topic_arns' => [],
+                'http' => [],
             ],
         ];
 
@@ -135,6 +140,7 @@ public static function provideConfigs()
                 'lazy' => false,
                 'endpoint' => null,
                 'topic_arns' => [],
+                'http' => [],
             ],
         ];
 
@@ -155,6 +161,7 @@ public static function provideConfigs()
                 'lazy' => false,
                 'endpoint' => 'http://localstack:1111',
                 'topic_arns' => [],
+                'http' => [],
             ],
         ];
 
@@ -172,6 +179,25 @@ public static function provideConfigs()
                     'topic1' => 'arn:aws:sns:us-east-1:123456789012:topic1',
                     'topic2' => 'arn:aws:sns:us-west-2:123456789012:topic2',
                 ],
+                'http' => [],
+            ],
+        ];
+
+        yield [
+            ['dsn' => 'sns:?http[timeout]=5&http[connect_timeout]=2'],
+            [
+                'key' => null,
+                'secret' => null,
+                'token' => null,
+                'region' => null,
+                'version' => '2010-03-31',
+                'lazy' => true,
+                'endpoint' => null,
+                'topic_arns' => [],
+                'http' => [
+                    'timeout' => '5',
+                    'connect_timeout' => '2',
+                ],
             ],
         ];
     }
diff --git a/pkg/sns/Tests/SnsConnectionFactoryTest.php b/pkg/sns/Tests/SnsConnectionFactoryTest.php
@@ -33,7 +33,8 @@ public function testCouldBeConstructedWithEmptyConfiguration()
             'region' => null,
             'version' => '2010-03-31',
             'endpoint' => null,
-             'topic_arns' => [],
+            'topic_arns' => [],
+            'http' => [],
         ], 'config', $factory);
     }
 
@@ -49,7 +50,8 @@ public function testCouldBeConstructedWithCustomConfiguration()
             'region' => null,
             'version' => '2010-03-31',
             'endpoint' => null,
-             'topic_arns' => [],
+            'topic_arns' => [],
+            'http' => [],
         ], 'config', $factory);
     }
 
diff --git a/pkg/sqs/SqsConnectionFactory.php b/pkg/sqs/SqsConnectionFactory.php
@@ -108,6 +108,10 @@ private function establishConnection(): SqsClient
             }
         }
 
+        if (isset($this->config['http'])) {
+            $config['http'] = $this->config['http'];
+        }
+
         $establishConnection = function () use ($config) {
             return (new Sdk(['Sqs' => $config]))->createMultiRegionSqs();
         };
@@ -139,6 +143,7 @@ private function parseDsn(string $dsn): array
             'endpoint' => $dsn->getString('endpoint'),
             'profile' => $dsn->getString('profile'),
             'queue_owner_aws_account_id' => $dsn->getString('queue_owner_aws_account_id'),
+            'http' => $dsn->getArray('http', [])->toArray(),
         ]), function ($value) { return null !== $value; });
     }
 
@@ -155,6 +160,7 @@ private function defaultConfig(): array
             'endpoint' => null,
             'profile' => null,
             'queue_owner_aws_account_id' => null,
+            'http' => [],
         ];
     }
 }
diff --git a/pkg/sqs/Tests/SqsConnectionFactoryConfigTest.php b/pkg/sqs/Tests/SqsConnectionFactoryConfigTest.php
@@ -67,6 +67,7 @@ public static function provideConfigs()
                 'endpoint' => null,
                 'profile' => null,
                 'queue_owner_aws_account_id' => null,
+                'http' => [],
             ],
         ];
 
@@ -83,6 +84,7 @@ public static function provideConfigs()
                 'endpoint' => null,
                 'profile' => null,
                 'queue_owner_aws_account_id' => null,
+                'http' => [],
             ],
         ];
 
@@ -99,6 +101,7 @@ public static function provideConfigs()
                 'endpoint' => null,
                 'profile' => null,
                 'queue_owner_aws_account_id' => null,
+                'http' => [],
             ],
         ];
 
@@ -115,6 +118,7 @@ public static function provideConfigs()
                 'endpoint' => null,
                 'profile' => null,
                 'queue_owner_aws_account_id' => null,
+                'http' => [],
             ],
         ];
 
@@ -131,6 +135,7 @@ public static function provideConfigs()
                 'endpoint' => null,
                 'profile' => null,
                 'queue_owner_aws_account_id' => null,
+                'http' => [],
             ],
         ];
 
@@ -147,6 +152,7 @@ public static function provideConfigs()
                 'endpoint' => null,
                 'profile' => 'staging',
                 'queue_owner_aws_account_id' => null,
+                'http' => [],
             ],
         ];
 
@@ -163,6 +169,7 @@ public static function provideConfigs()
                 'endpoint' => null,
                 'profile' => null,
                 'queue_owner_aws_account_id' => null,
+                'http' => [],
             ],
         ];
 
@@ -185,6 +192,7 @@ public static function provideConfigs()
                 'endpoint' => 'http://localstack:1111',
                 'profile' => null,
                 'queue_owner_aws_account_id' => null,
+                'http' => [],
             ],
         ];
 
@@ -203,6 +211,27 @@ public static function provideConfigs()
                 'endpoint' => null,
                 'profile' => 'staging',
                 'queue_owner_aws_account_id' => null,
+                'http' => [],
+            ],
+        ];
+
+        yield [
+            ['dsn' => 'sqs:?http[timeout]=5&http[connect_timeout]=2'],
+            [
+                'key' => null,
+                'secret' => null,
+                'token' => null,
+                'region' => null,
+                'retries' => 3,
+                'version' => '2012-11-05',
+                'lazy' => true,
+                'endpoint' => null,
+                'profile' => null,
+                'queue_owner_aws_account_id' => null,
+                'http' => [
+                    'timeout' => '5',
+                    'connect_timeout' => '2',
+                ],
             ],
         ];
     }
diff --git a/pkg/sqs/Tests/SqsConnectionFactoryTest.php b/pkg/sqs/Tests/SqsConnectionFactoryTest.php
@@ -36,6 +36,7 @@ public function testCouldBeConstructedWithEmptyConfiguration()
             'endpoint' => null,
             'profile' => null,
             'queue_owner_aws_account_id' => null,
+            'http' => [],
         ], 'config', $factory);
     }
 
@@ -54,6 +55,7 @@ public function testCouldBeConstructedWithCustomConfiguration()
             'endpoint' => null,
             'profile' => null,
             'queue_owner_aws_account_id' => null,
+            'http' => [],
         ], 'config', $factory);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,10 @@ private function establishConnection(): SnsClient`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
	`108`	`+ if (isset($this->config['http'])) {`
	`109`	`+ $config['http'] = $this->config['http'];`
	`110`	`+ }`
	`111`	`+`
`108`	`112`	`$establishConnection = function () use ($config) {`
`109`	`113`	`return (new Sdk(['Sns' => $config]))->createMultiRegionSns();`
`110`	`114`	`};`
`@@ -134,6 +138,7 @@ private function parseDsn(string $dsn): array`
`134`	`138`	`'lazy' => $dsn->getBool('lazy'),`
`135`	`139`	`'endpoint' => $dsn->getString('endpoint'),`
`136`	`140`	`'topic_arns' => $dsn->getArray('topic_arns', [])->toArray(),`
	`141`	`+ 'http' => $dsn->getArray('http', [])->toArray(),`
`137`	`142`	`]), function ($value) { return null !== $value; });`
`138`	`143`	`}`
`139`	`144`
`@@ -148,6 +153,7 @@ private function defaultConfig(): array`
`148`	`153`	`'lazy' => true,`
`149`	`154`	`'endpoint' => null,`
`150`	`155`	`'topic_arns' => [],`
	`156`	`+ 'http' => [],`
`151`	`157`	`];`
`152`	`158`	`}`
`153`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,10 @@ private function establishConnection(): SqsClient`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
	`111`	`+ if (isset($this->config['http'])) {`
	`112`	`+ $config['http'] = $this->config['http'];`
	`113`	`+ }`
	`114`	`+`
`111`	`115`	`$establishConnection = function () use ($config) {`
`112`	`116`	`return (new Sdk(['Sqs' => $config]))->createMultiRegionSqs();`
`113`	`117`	`};`
`@@ -139,6 +143,7 @@ private function parseDsn(string $dsn): array`
`139`	`143`	`'endpoint' => $dsn->getString('endpoint'),`
`140`	`144`	`'profile' => $dsn->getString('profile'),`
`141`	`145`	`'queue_owner_aws_account_id' => $dsn->getString('queue_owner_aws_account_id'),`
	`146`	`+ 'http' => $dsn->getArray('http', [])->toArray(),`
`142`	`147`	`]), function ($value) { return null !== $value; });`
`143`	`148`	`}`
`144`	`149`
`@@ -155,6 +160,7 @@ private function defaultConfig(): array`
`155`	`160`	`'endpoint' => null,`
`156`	`161`	`'profile' => null,`
`157`	`162`	`'queue_owner_aws_account_id' => null,`
	`163`	`+ 'http' => [],`
`158`	`164`	`];`
`159`	`165`	`}`
`160`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ public function testCouldBeConstructedWithEmptyConfiguration()`
`36`	`36`	`'endpoint' => null,`
`37`	`37`	`'profile' => null,`
`38`	`38`	`'queue_owner_aws_account_id' => null,`
	`39`	`+ 'http' => [],`
`39`	`40`	`], 'config', $factory);`
`40`	`41`	`}`
`41`	`42`
`@@ -54,6 +55,7 @@ public function testCouldBeConstructedWithCustomConfiguration()`
`54`	`55`	`'endpoint' => null,`
`55`	`56`	`'profile' => null,`
`56`	`57`	`'queue_owner_aws_account_id' => null,`
	`58`	`+ 'http' => [],`
`57`	`59`	`], 'config', $factory);`
`58`	`60`	`}`
`59`	`61`