bug #36370 Update Connection.php (infinitely-young)

fabpot · fabpot · commit 168574db2961 · 2020-04-08T08:10:19.000+02:00
This PR was squashed before being merged into the 5.1-dev branch. Discussion ---------- Update Connection.php Get `region` from `host` to prevent error "Credential should be scoped to a valid region, not '...'" and make it easier to setup DSN | Q | A | ------------- | --- | Branch? | master for features / 3.4, 4.4 or 5.0 for bug fixes  | Bug fix? | yes/no | New feature? | yes/no  | Deprecations? | no  | Tickets | Fix #...  | License | MIT | Doc PR | symfony/symfony-docs#...   Commits ------- af68048 Update Connection.php
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php
@@ -105,6 +105,9 @@ public static function fromDsn(string $dsn, array $options = [], HttpClientInter
             $configuration['endpoint'] = sprintf('https://sqs.%s.amazonaws.com', $configuration['region']);
         } else {
             $configuration['endpoint'] = sprintf('%s://%s%s', ($query['sslmode'] ?? null) === 'disable' ? 'http' : 'https', $parsedUrl['host'], ($parsedUrl['port'] ?? null) ? ':'.$parsedUrl['port'] : '');
+            if (preg_match(';sqs.(.+).amazonaws.com;', $parsedUrl['host'], $matches)) {
+                $configuration['region'] = $matches[1];
+            }
             unset($query['sslmode']);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,9 @@ public static function fromDsn(string $dsn, array $options = [], HttpClientInter`
`105`	`105`	`$configuration['endpoint'] = sprintf('https://sqs.%s.amazonaws.com', $configuration['region']);`
`106`	`106`	`} else {`
`107`	`107`	`$configuration['endpoint'] = sprintf('%s://%s%s', ($query['sslmode'] ?? null) === 'disable' ? 'http' : 'https', $parsedUrl['host'], ($parsedUrl['port'] ?? null) ? ':'.$parsedUrl['port'] : '');`
	`108`	`+ if (preg_match(';sqs.(.+).amazonaws.com;', $parsedUrl['host'], $matches)) {`
	`109`	`+ $configuration['region'] = $matches[1];`
	`110`	`+ }`
`108`	`111`	`unset($query['sslmode']);`
`109`	`112`	`}`
`110`	`113`