Exclude CMS pages by URL key not config value

Author: fredden

app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php

@@ -103,7 +103,17 @@ public function getCollection($storeId)
             'main_table.is_active = 1'
         )->where(
             'main_table.identifier NOT IN (?)',
-            $this->getUtilityPageIdentifiers->execute()
+            array_map(
+                // When two CMS pages have the same URL key (in different
+                // stores), the value stored in configuration is 'url-key|ID'.
+                // This function strips the trailing '|ID' so that this where()
+                // matches the url-key configured.
+                // See https://github.com/magento/magento2/issues/35001
+                static function ($urlKey) {
+                    return explode('|', $urlKey, 2)[0];
+                },
+                $this->getUtilityPageIdentifiers->execute()
+            )
         )->where(
             'store_table.store_id IN(?)',
             [0, $storeId]

app/code/Magento/Sitemap/Test/Unit/Model/ResourceModel/Cms/PageTest.php

@@ -104,7 +104,11 @@ public function testGetCollection()
         $pageId = 'testPageId';
         $url = 'testUrl';
         $updatedAt = 'testUpdatedAt';
-        $pageIdentifiers = ['testCmsHomePage', 'testCmsNoRoute', 'testCmsNoCookies'];
+        $pageIdentifiers = [
+            'testCmsHomePage|ID' => 'testCmsHomePage',
+            'testCmsNoRoute' => 'testCmsNoRoute',
+            'testCmsNoCookies' => 'testCmsNoCookies',
+        ];
         $storeId = 1;
         $linkField = 'testLinkField';
         $expectedPage = new DataObject();
@@ -147,7 +151,7 @@ public function testGetCollection()
             ->method('where')
             ->withConsecutive(
                 [$this->identicalTo('main_table.is_active = 1')],
-                [$this->identicalTo('main_table.identifier NOT IN (?)'), $this->identicalTo($pageIdentifiers)],
+                [$this->identicalTo('main_table.identifier NOT IN (?)'), $this->identicalTo(array_values($pageIdentifiers))],
                 [$this->identicalTo('store_table.store_id IN(?)'), $this->identicalTo([0, $storeId])]
             )->willReturnSelf();
 
@@ -176,7 +180,7 @@ public function testGetCollection()
 
         $this->getUtilityPageIdentifiers->expects($this->once())
             ->method('execute')
-            ->willReturn($pageIdentifiers);
+            ->willReturn(array_keys($pageIdentifiers));
 
         $this->resource->expects($this->exactly(2))
             ->method('getTableName')