Merge remote-tracking branch 'origin/MC-25176' into 2.4-develop-pr1

Author: zakdma

app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php

@@ -62,6 +62,11 @@ class StaticField implements FieldProviderInterface
      */
     private $fieldNameResolver;
 
+    /**
+     * @var array
+     */
+    private $excludedAttributes;
+
     /**
      * @param Config $eavConfig
      * @param FieldTypeConverterInterface $fieldTypeConverter
@@ -70,6 +75,7 @@ class StaticField implements FieldProviderInterface
      * @param FieldIndexResolver $fieldIndexResolver
      * @param AttributeProvider $attributeAdapterProvider
      * @param FieldName\ResolverInterface|null $fieldNameResolver
+     * @param array $excludedAttributes
      */
     public function __construct(
         Config $eavConfig,
@@ -78,7 +84,8 @@ public function __construct(
         FieldTypeResolver $fieldTypeResolver,
         FieldIndexResolver $fieldIndexResolver,
         AttributeProvider $attributeAdapterProvider,
-        FieldName\ResolverInterface $fieldNameResolver = null
+        FieldName\ResolverInterface $fieldNameResolver = null,
+        array $excludedAttributes = []
     ) {
         $this->eavConfig = $eavConfig;
         $this->fieldTypeConverter = $fieldTypeConverter;
@@ -88,6 +95,7 @@ public function __construct(
         $this->attributeAdapterProvider = $attributeAdapterProvider;
         $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
             ->get(FieldName\ResolverInterface::class);
+        $this->excludedAttributes = $excludedAttributes;
     }
 
     /**
@@ -103,6 +111,9 @@ public function getFields(array $context = []): array
         $allAttributes = [];
 
         foreach ($attributes as $attribute) {
+            if (in_array($attribute->getAttributeCode(), $this->excludedAttributes, true)) {
+                continue;
+            }
             $attributeAdapter = $this->attributeAdapterProvider->getByAttributeCode($attribute->getAttributeCode());
             $fieldName = $this->fieldNameResolver->getFieldName($attributeAdapter);