MAGETWO-87047: Manufacturer attribute not appearing in Configurable Products on the backend

Author: viktym

app/code/Magento/ConfigurableProduct/Setup/InstallData.php

@@ -44,6 +44,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
         $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
         $attributes = [
             'country_of_manufacture',
+            'manufacturer',
             'minimal_price',
             'msrp',
             'msrp_display_actual_price_type',

app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\ConfigurableProduct\Setup;
 
+use Magento\Catalog\Model\Product;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
@@ -41,25 +42,59 @@ public function __construct(EavSetupFactory $eavSetupFactory)
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
         $setup->startSetup();
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
+
         if (version_compare($context->getVersion(), '2.2.0') < 0) {
-            /** @var EavSetup $eavSetup */
-            $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-            $relatedProductTypes = explode(
-                ',',
-                $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'tier_price', 'apply_to')
-            );
+            $relatedProductTypes = $this->getRelatedProductTypes('tier_price', $eavSetup);
             $key = array_search(Configurable::TYPE_CODE, $relatedProductTypes);
             if ($key !== false) {
                 unset($relatedProductTypes[$key]);
-                $eavSetup->updateAttribute(
-                    \Magento\Catalog\Model\Product::ENTITY,
-                    'tier_price',
-                    'apply_to',
-                    implode(',', $relatedProductTypes)
-                );
+                $this->updateRelatedProductTypes('tier_price', $relatedProductTypes, $eavSetup);
+            }
+        }
+
+        if (version_compare($context->getVersion(), '2.2.1') < 0) {
+            $relatedProductTypes = $this->getRelatedProductTypes('manufacturer', $eavSetup);
+            if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
+                $relatedProductTypes[] = Configurable::TYPE_CODE;
+                $this->updateRelatedProductTypes('manufacturer', $relatedProductTypes, $eavSetup);
             }
         }
 
         $setup->endSetup();
     }
+
+    /**
+     * Get related product types for attribute.
+     *
+     * @param string $attributeId
+     * @param EavSetup $eavSetup
+     * @return array
+     */
+    private function getRelatedProductTypes(string $attributeId, EavSetup $eavSetup)
+    {
+        return explode(
+            ',',
+            $eavSetup->getAttribute(Product::ENTITY, $attributeId, 'apply_to')
+        );
+    }
+
+    /**
+     * Update related product types for attribute.
+     *
+     * @param string $attributeId
+     * @param array $relatedProductTypes
+     * @param EavSetup $eavSetup
+     * @return void
+     */
+    private function updateRelatedProductTypes(string $attributeId, array $relatedProductTypes, EavSetup $eavSetup)
+    {
+        $eavSetup->updateAttribute(
+            Product::ENTITY,
+            $attributeId,
+            'apply_to',
+            implode(',', $relatedProductTypes)
+        );
+    }
 }

app/code/Magento/ConfigurableProduct/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_ConfigurableProduct" setup_version="2.2.0">
+    <module name="Magento_ConfigurableProduct" setup_version="2.2.1">
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_Msrp"/>