E2E bug fixes

Author: smaddock

src/ResourceDetectors/DigitalOcean/src/DigitalOceanDetector.php

@@ -34,7 +34,7 @@ public function getResource(): ResourceInfo
     {
         $client = Discovery::find();
         $requestFactory = MessageFactoryResolver::create()->resolveRequestFactory();
-        $token = $_ENV[self::ENV_DO_API_TOKEN] ?? '';
+        $token = $_SERVER[self::ENV_DO_API_TOKEN] ?? '';
 
         /** Bail early if wrong environment */
         if (!self::isDigitalOcean()) {
@@ -57,6 +57,9 @@ public function getResource(): ResourceInfo
             /** Attributes available without authentication via the link-local IP API */
             $metadataRequest = $requestFactory->createRequest('GET', self::DO_METADATA_ENDPOINT_URL);
             $metadataResponse = $client->sendRequest($metadataRequest);
+            if ($metadataResponse->getStatusCode() !== 200) {
+                throw new UnexpectedValueException('Failed to read the DigitalOcean metadata API.');
+            }
             $metadata = json_decode($metadataResponse->getBody()->getContents(), flags: JSON_THROW_ON_ERROR);
 
             $attributes[ResourceAttributes::CLOUD_REGION] = $metadata->region;
@@ -78,14 +81,15 @@ public function getResource(): ResourceInfo
                     )
                     ->withHeader('Authorization', sprintf('Bearer %s', $token));
                 $accountResponse = $client->sendRequest($accountRequest);
+                if ($accountResponse->getStatusCode() !== 200) {
+                    throw new UnexpectedValueException('Failed to read the account endpoint on the DigitalOcean API.');
+                }
                 $account = json_decode($accountResponse->getBody()->getContents(), flags: JSON_THROW_ON_ERROR)->account;
 
                 $attributes[ResourceAttributes::CLOUD_ACCOUNT_ID] = $account->team->uuid;
-            } catch (Throwable $t) {
-                self::logNotice(
-                    'DigitalOcean Access Token found, but unable to get account info',
-                    ['exception' => $t]
-                );
+                self::logInfo('DigitalOcean Access Token found; setting DigitalOcean account ID in resource attributes');
+            } catch (Throwable) {
+                // The token being available and scoped is the abnormal state, so logging the reverse of this catch
             }
 
             try {
@@ -96,17 +100,18 @@ public function getResource(): ResourceInfo
                     )
                     ->withHeader('Authorization', sprintf('Bearer %s', $token));
                 $dropletResponse = $client->sendRequest($dropletRequest);
+                if ($dropletResponse->getStatusCode() !== 200) {
+                    throw new UnexpectedValueException('Failed to read the droplet endpoint on the DigitalOcean API.');
+                }
                 $droplet = json_decode($dropletResponse->getBody()->getContents(), flags: JSON_THROW_ON_ERROR)->droplet;
 
                 $attributes[ResourceAttributes::HOST_IMAGE_ID] = (string) $droplet->image->id;
                 $attributes[ResourceAttributes::HOST_IMAGE_NAME] = $droplet->image->name;
                 $attributes[ResourceAttributes::HOST_TYPE] = $droplet->size_slug;
                 $attributes[ResourceAttributes::OS_NAME] = $droplet->image->distribution;
-            } catch (Throwable $t) {
-                self::logNotice(
-                    'DigitalOcean Access Token found, but unable to get Droplet info',
-                    ['exception' => $t]
-                );
+                self::logInfo('DigitalOcean Access Token found; setting additional Droplet info in resource attributes');
+            } catch (Throwable) {
+                // The token being available and scoped is the abnormal state, so logging the reverse of this catch
             }
         }
 
@@ -134,6 +139,6 @@ private static function readSMBIOS(string $dmiKeyword): string
             throw new UnexpectedValueException('Failed to read SMBIOS value from sysfs.');
         }
 
-        return strtolower($dmiValue);
+        return strtolower(trim($dmiValue));
     }
 }

src/ResourceDetectors/DigitalOcean/tests/Unit/DigitalOceanDetectorTest.php

@@ -17,16 +17,16 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
-use Zalas\PHPUnit\Globals\Attribute\Env;
+use Zalas\PHPUnit\Globals\Attribute\Server;
 
 function file_get_contents(string $filename)
 {
-    if (($_ENV['FAIL_IO'] ?? 'false') === 'true') {
+    if (($_SERVER['FAIL_IO'] ?? 'false') === 'true') {
         return false;
     }
     if (str_starts_with($filename, '/sys/devices/virtual/dmi/id')) {
         return match (substr($filename, 28)) {
-            'sys_vendor' => (($_ENV['WRONG_VENDOR'] ?? 'false') === 'true') ? 'AWS' : 'DigitalOcean',
+            'sys_vendor' => (($_SERVER['WRONG_VENDOR'] ?? 'false') === 'true') ? 'AWS' : 'DigitalOcean',
             'product_family' => 'DigitalOcean_Droplet',
             'board_asset_tag' => '10000000',
             default => 'unknown'
@@ -56,8 +56,8 @@ public function setUp(): void
         $client = $this->createStub(Psr18Client::class);
         $client->method('sendRequest')->willReturnCallback(function (RequestInterface $request) use ($responseFactory) {
             if ((string) $request->getUri() === 'http://169.254.169.254/metadata/v1.json') {
-                if (($_ENV['FAIL_METADATA'] ?? 'false') === 'true') {
-                    throw new Exception();
+                if (($_SERVER['FAIL_METADATA'] ?? 'false') === 'true') {
+                    return $responseFactory->createResponse(500);
                 }
 
                 /** @psalm-suppress PossiblyFalseArgument */
@@ -107,7 +107,7 @@ public function test_droplet_attributes_with_no_authz()
         );
     }
 
-    #[Env('DIGITALOCEAN_ACCESS_TOKEN', 'scoped-for-account')]
+    #[Server('DIGITALOCEAN_ACCESS_TOKEN', 'scoped-for-account')]
     public function test_droplet_attributes_with_account_only_authz()
     {
         $this->assertEquals(
@@ -126,12 +126,12 @@ public function test_droplet_attributes_with_account_only_authz()
         );
         /** @psalm-suppress PossiblyFalseArgument */
         $this->assertStringContainsString(
-            'DigitalOcean Access Token found, but unable to get Droplet info',
+            'DigitalOcean Access Token found; setting DigitalOcean account ID in resource attributes',
             stream_get_contents($this->errorLog)
         );
     }
 
-    #[Env('DIGITALOCEAN_ACCESS_TOKEN', 'scoped-for-droplet')]
+    #[Server('DIGITALOCEAN_ACCESS_TOKEN', 'scoped-for-droplet')]
     public function test_droplet_attributes_with_droplet_only_authz()
     {
         $this->assertEquals(
@@ -153,12 +153,12 @@ public function test_droplet_attributes_with_droplet_only_authz()
         );
         /** @psalm-suppress PossiblyFalseArgument */
         $this->assertStringContainsString(
-            'DigitalOcean Access Token found, but unable to get account info',
+            'DigitalOcean Access Token found; setting additional Droplet info in resource attributes',
             stream_get_contents($this->errorLog)
         );
     }
 
-    #[Env('FAIL_METADATA', 'true')]
+    #[Server('FAIL_METADATA', 'true')]
     public function test_no_droplet_attributes()
     {
         $this->assertEquals(
@@ -172,7 +172,7 @@ public function test_no_droplet_attributes()
         );
     }
 
-    #[Env('WRONG_VENDOR', 'true')]
+    #[Server('WRONG_VENDOR', 'true')]
     public function test_not_digitalocean_environment()
     {
         $this->assertEquals(
@@ -186,7 +186,7 @@ public function test_not_digitalocean_environment()
         );
     }
 
-    #[Env('FAIL_IO', 'true')]
+    #[Server('FAIL_IO', 'true')]
     public function test_not_linux()
     {
         $this->assertEquals(