B2B-2259: customAttributeMetadata GraphQl query has no cache identity

Author: rganin

app/code/Magento/EavGraphQl/Model/Resolver/Cache/CustomAttributeMetadataIdentity.php

@@ -20,7 +20,7 @@ class CustomAttributeMetadataIdentity implements IdentityInterface
      */
     public function getIdentities(array $resolvedData): array
     {
-        $identities = [EavAttribute::CACHE_TAG];
+        $identities = [];
         if (isset($resolvedData['items']) && !empty($resolvedData['items'])) {
             foreach ($resolvedData['items'] as $item) {
                 if (is_array($item)) {

dev/tests/api-functional/testsuite/Magento/GraphQl/Eav/CustomAttributesMetadataCacheTest.php

@@ -11,6 +11,7 @@
 use Magento\GraphQl\PageCache\GraphQLPageCacheAbstract;
 use Magento\Store\Model\StoreRepository;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
 
 class CustomAttributesMetadataCacheTest extends GraphQLPageCacheAbstract
 {
@@ -176,6 +177,55 @@ public function testCacheInvalidation()
         );
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/dropdown_attribute.php
+     * @magentoConfigFixture default/system/full_page_cache/caching_application 2
+     *
+     * @return void
+     */
+    public function testCacheInvalidationOnAttributeDelete()
+    {
+        $query = $this->getAttributeQuery("dropdown_attribute", "catalog_product");
+        // check cache missed on first query
+        $response = $this->assertCacheMissAndReturnResponse($query, []);
+        $this->assertResponseFields(
+            $response['body']['customAttributeMetadata']['items'][0],
+            [
+                'attribute_code' => 'dropdown_attribute',
+                'attribute_type' => 'String',
+                'entity_type' => 'catalog_product',
+                'input_type' => 'select',
+            ]
+        );
+        // assert cache hit on second query
+        $this->assertCacheHitAndReturnResponse($query, []);
+        /** @var AttributeRepository $eavAttributeRepo */
+        $eavAttributeRepo = $this->objectManager->get(AttributeRepository::class);
+        $attribute = $eavAttributeRepo->get("catalog_product", "dropdown_attribute");
+        $eavAttributeRepo->delete($attribute);
+        $caughtException = null;
+        try {
+            // get response
+            $response = $this->graphQlQuery($query, []);
+        } catch (ResponseContainsErrorsException $exception) {
+            $caughtException = $exception;
+        }
+        $this->assertInstanceOf(
+            ResponseContainsErrorsException::class,
+            $caughtException
+        );
+        // cannot use expectException because need to assert the headers
+        $this->assertStringContainsString(
+            "GraphQL response contains errors: Internal server error",
+            $caughtException->getMessage()
+        );
+        // assert that it's a miss after deletion
+        $this->assertEquals(
+            $response['headers']['X-Magento-Cache-Debug'],
+            'MISS'
+        );
+    }
+
     /**
      * Test cache invalidation when queried for attribute data of different entity types.
      * Required for GraphQL FPC use-case since there is no attribute ID provided in the result.

dev/tests/integration/testsuite/Magento/Catalog/_files/dropdown_attribute_rollback.php

@@ -12,7 +12,9 @@
     'Magento\Catalog\Model\ResourceModel\Eav\Attribute'
 );
 $attribute->load('dropdown_attribute', 'attribute_code');
-$attribute->delete();
+if ($attribute->getAttributeId()) {
+    $attribute->delete();
+}
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);