Implement EC2 client (#2064)

GrahamCampbell · web-flow · commit 64140673e23a · 2026-04-17T10:03:45.000+02:00
* Implement EC2 client

* Applied corrections

* Bump aliases
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## NOT RELEASED
 
+### Added
+
+- AwsClientFactory: add `ec2()` method for the new `async-aws/ec2` client
+- XmlAwsErrorFactory: parse EC2-style error envelopes (`<Response><Errors><Error>...`)
+
 ## 1.28.1
 
 ### Changed
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.28-dev"
+            "dev-master": "1.29-dev"
         }
     }
 }
diff --git a/src/AwsClientFactory.php b/src/AwsClientFactory.php
@@ -24,6 +24,7 @@
 use AsyncAws\Core\Exception\MissingDependency;
 use AsyncAws\Core\Sts\StsClient;
 use AsyncAws\DynamoDb\DynamoDbClient;
+use AsyncAws\Ec2\Ec2Client;
 use AsyncAws\Ecr\EcrClient;
 use AsyncAws\ElastiCache\ElastiCacheClient;
 use AsyncAws\EventBridge\EventBridgeClient;
@@ -264,6 +265,19 @@ public function dynamoDb(): DynamoDbClient
         return $this->serviceCache[__METHOD__];
     }
 
+    public function ec2(): Ec2Client
+    {
+        if (!class_exists(Ec2Client::class)) {
+            throw MissingDependency::create('async-aws/ec2', 'EC2');
+        }
+
+        if (!isset($this->serviceCache[__METHOD__])) {
+            $this->serviceCache[__METHOD__] = new Ec2Client($this->configuration, $this->credentialProvider, $this->httpClient, $this->logger);
+        }
+
+        return $this->serviceCache[__METHOD__];
+    }
+
     public function ecr(): EcrClient
     {
         if (!class_exists(EcrClient::class)) {
diff --git a/src/AwsError/XmlAwsErrorFactory.php b/src/AwsError/XmlAwsErrorFactory.php
@@ -40,6 +40,16 @@ private static function parseXml(\SimpleXMLElement $xml): AwsError
             );
         }
 
+        // EC2 error envelope: <Response><Errors><Error><Code/><Message/></Error></Errors><RequestID/></Response>
+        if (0 < $xml->Errors->count() && 0 < $xml->Errors->Error->count()) {
+            return new AwsError(
+                $xml->Errors->Error->Code->__toString(),
+                $xml->Errors->Error->Message->__toString(),
+                null,
+                null
+            );
+        }
+
         if (1 === $xml->Code->count() && 1 === $xml->Message->count()) {
             return new AwsError(
                 $xml->Code->__toString(),

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`},`
`43`	`43`	`"extra": {`
`44`	`44`	`"branch-alias": {`
`45`		`- "dev-master": "1.28-dev"`
	`45`	`+ "dev-master": "1.29-dev"`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`