Add support for configuring a custom error factory for a service (#1485)

Author: stof

src/CodeGenerator/src/Command/GenerateCommand.php

@@ -278,6 +278,7 @@ private function generateService(SymfonyStyle $io, InputInterface $input, array
         $paginationArray = $this->loadFile($manifest['services'][$serviceName]['pagination'], "$serviceName-pagination", $manifest['services'][$serviceName]['patches']['pagination'] ?? []);
         $waiterArray = isset($manifest['services'][$serviceName]['waiter']) ? $this->loadFile($manifest['services'][$serviceName]['waiter'], "$serviceName-waiter", $manifest['services'][$serviceName]['patches']['waiter'] ?? []) : ['waiters' => []];
         $exampleArray = isset($manifest['services'][$serviceName]['example']) ? $this->loadFile($manifest['services'][$serviceName]['example'], "$serviceName-example", $manifest['services'][$serviceName]['patches']['example'] ?? []) : ['examples' => []];
+        $customErrorFactory = $manifest['services'][$serviceName]['error-factory'] ?? null;
 
         $operationNames = $this->getOperationNames($input->getArgument('operation'), $input->getOption('all'), $io, $definitionArray, $waiterArray, $manifest['services'][$serviceName]);
         if (\is_int($operationNames)) {
@@ -288,7 +289,7 @@ private function generateService(SymfonyStyle $io, InputInterface $input, array
         $definition = new ServiceDefinition($serviceName, $endpoints, $definitionArray, $documentationArray, $paginationArray, $waiterArray, $exampleArray, $manifest['services'][$serviceName]['hooks'] ?? [], $manifest['services'][$serviceName]['api-reference'] ?? null);
         $serviceGenerator = $this->generator->service($namespace = $manifest['services'][$serviceName]['namespace'] ?? sprintf('AsyncAws\\%s', $serviceName), $managedOperations);
 
-        $clientClass = $serviceGenerator->client()->generate($definition);
+        $clientClass = $serviceGenerator->client()->generate($definition, $customErrorFactory);
 
         foreach ($operationNames as $operationName) {
             if (null !== $operation = $definition->getOperation($operationName)) {

src/CodeGenerator/src/Generator/ClientGenerator.php

@@ -51,7 +51,7 @@ public function __construct(ClassRegistry $classRegistry, NamespaceRegistry $nam
     /**
      * Update the API client with a constants function call.
      */
-    public function generate(ServiceDefinition $definition): ClassName
+    public function generate(ServiceDefinition $definition, ?string $customErrorFactory): ClassName
     {
         $className = $this->namespaceRegistry->getClient($definition);
         if (0 !== strpos($className->getFqdn(), 'AsyncAws\Core\\')) {
@@ -259,22 +259,26 @@ public function getVersion() {
                 ->setNullable(true)
         ;
 
-        switch ($definition->getProtocol()) {
-            case 'query':
-            case 'rest-xml':
-                $errorFactory = XmlAwsErrorFactory::class;
-
-                break;
-            case 'rest-json':
-                $errorFactory = JsonRestAwsErrorFactory::class;
-
-                break;
-            case 'json':
-                $errorFactory = JsonRpcAwsErrorFactory::class;
-
-                break;
-            default:
-                throw new \LogicException(sprintf('Parser for "%s" is not implemented yet', $definition->getProtocol()));
+        if (null !== $customErrorFactory) {
+            $errorFactory = $customErrorFactory;
+        } else {
+            switch ($definition->getProtocol()) {
+                case 'query':
+                case 'rest-xml':
+                    $errorFactory = XmlAwsErrorFactory::class;
+
+                    break;
+                case 'rest-json':
+                    $errorFactory = JsonRestAwsErrorFactory::class;
+
+                    break;
+                case 'json':
+                    $errorFactory = JsonRpcAwsErrorFactory::class;
+
+                    break;
+                default:
+                    throw new \LogicException(sprintf('Parser for "%s" is not implemented yet', $definition->getProtocol()));
+            }
         }
 
         $classBuilder->addUse(AwsErrorFactoryInterface::class);