MCLOUD-5735: Add support for auto_increment option #195 (#200)

Author: shiftedreality

src/Command/BuildCompose.php

@@ -226,6 +226,16 @@ protected function configure(): void
             null,
             InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
             'Environment variable for elasticsearch service'
+        )->addOption(
+            Source\CliSource::OPTION_DB_INCREMENT_INCREMENT,
+            null,
+            InputOption::VALUE_REQUIRED,
+            '"auto_increment_increment" database variable'
+        )->addOption(
+            Source\CliSource::OPTION_DB_INCREMENT_OFFSET,
+            null,
+            InputOption::VALUE_REQUIRED,
+            '"auto_increment_offset" database variable'
         );
 
         parent::configure();

src/Compose/ProductionBuilder.php

@@ -464,6 +464,7 @@ private function addDbService(
     ): void {
         $volumePrefix = $config->getNameWithPrefix();
         $mounts[] = $volumePrefix . self::VOLUME_MARIADB_CONF . ':/etc/mysql/mariadb.conf.d';
+        $commands = [];
 
         switch ($service) {
             case self::SERVICE_DB:
@@ -478,6 +479,15 @@ private function addDbService(
                 $mounts[] = $volumePrefix . self::VOLUME_MAGENTO_DB . ':/var/lib/mysql';
                 $mounts[] = self::VOLUME_DOCKER_ETRYPOINT . ':/docker-entrypoint-initdb.d';
                 $serviceType = ServiceInterface::SERVICE_DB;
+
+                if ($config->getDbIncrementIncrement() > 1) {
+                    $commands[] = '--auto_increment_increment=' . $config->getDbIncrementIncrement();
+                }
+
+                if ($config->getDbIncrementOffset() > 1) {
+                    $commands[] = '--auto_increment_offset=' . $config->getDbIncrementOffset();
+                }
+
                 break;
             case self::SERVICE_DB_QUOTE:
                 $port = $config->getDbQuotePortsExpose();
@@ -511,15 +521,21 @@ private function addDbService(
                 throw new GenericException(sprintf('Configuration for %s service not exist', $service));
         }
 
+        $dbConfig = [
+            'ports' => [$port ? "$port:3306" : '3306'],
+            'volumes' => $mounts,
+        ];
+
+        if ($commands) {
+            $dbConfig['command'] = implode(' ', $commands);
+        }
+
         $manager->addService(
             $service,
             $this->serviceFactory->create(
                 $serviceType,
                 $version,
-                [
-                    'ports' => [$port ? "$port:3306" : '3306'],
-                    'volumes' => $mounts,
-                ]
+                $dbConfig
             ),
             [self::NETWORK_MAGENTO],
             []

src/Config/Config.php

@@ -388,4 +388,28 @@ public function getMagentoVersion(): ?string
     {
         return $this->all()->get(SourceInterface::MAGENTO_VERSION);
     }
+
+    /**
+     * @return int
+     * @throws ConfigurationMismatchException
+     */
+    public function getDbIncrementIncrement(): int
+    {
+        return max(
+            (int)$this->all()->get(SourceInterface::SYSTEM_DB_INCREMENT_INCREMENT, 1),
+            1
+        );
+    }
+
+    /**
+     * @return int
+     * @throws ConfigurationMismatchException
+     */
+    public function getDbIncrementOffset(): int
+    {
+        return max(
+            (int)$this->all()->get(SourceInterface::SYSTEM_DB_INCREMENT_OFFSET, 1),
+            1
+        );
+    }
 }

src/Config/Source/CliSource.php

@@ -55,6 +55,9 @@ class CliSource implements SourceInterface
     public const OPTION_HOST = 'host';
     public const OPTION_PORT = 'port';
 
+    public const OPTION_DB_INCREMENT_INCREMENT = 'db-increment-increment';
+    public const OPTION_DB_INCREMENT_OFFSET = 'db-increment-offset';
+
     /**
      * Environment variable for elasticsearch service.
      */
@@ -213,6 +216,14 @@ public function read(): Repository
             $repository->set(self::SERVICES_ES_VARS, $esEnvVars);
         }
 
+        if ($incrementIncrement = $this->input->getOption(self::OPTION_DB_INCREMENT_INCREMENT)) {
+            $repository->set(SourceInterface::SYSTEM_DB_INCREMENT_INCREMENT, $incrementIncrement);
+        }
+
+        if ($incrementOffset = $this->input->getOption(self::OPTION_DB_INCREMENT_OFFSET)) {
+            $repository->set(SourceInterface::SYSTEM_DB_INCREMENT_OFFSET, $incrementOffset);
+        }
+
         return $repository;
     }
 }

src/Config/Source/SourceInterface.php

@@ -120,6 +120,9 @@ interface SourceInterface
     public const SYSTEM_EXPOSE_DB_QUOTE_PORTS = 'system.expose_db_quote_ports';
     public const SYSTEM_EXPOSE_DB_SALES_PORTS = 'system.expose_db_sales_ports';
 
+    public const SYSTEM_DB_INCREMENT_INCREMENT = 'system.db.increment_increment';
+    public const SYSTEM_DB_INCREMENT_OFFSET = 'system.db.increment_offset';
+
     public const VARIABLES = 'variables';
 
     public const HOOKS = 'hooks';

src/Test/Integration/BuildComposeTest.php

@@ -85,7 +85,9 @@ public function buildDataProvider(): array
                     [CliSource::OPTION_WITH_CRON, true],
                     [CliSource::OPTION_WITH_XDEBUG, true],
                     [CliSource::OPTION_ES, '5.2'],
-                    [CliSource::OPTION_NO_ES, true]
+                    [CliSource::OPTION_NO_ES, true],
+                    [CliSource::OPTION_DB_INCREMENT_INCREMENT, 3],
+                    [CliSource::OPTION_DB_INCREMENT_OFFSET, 2],
                 ]
             ]
         ];

src/Test/Integration/BuildCustomComposeTest.php

@@ -81,7 +81,11 @@ public function buildDataProvider(): array
                             'system' => [
                                 'mode' => 'production',
                                 'host' => 'magento2.test',
-                                'port' => '8080'
+                                'port' => '8080',
+                                'db' => [
+                                    'increment_increment' => 3,
+                                    'increment_offset' => 2
+                                ]
                             ],
                             'services' => [
                                 'php' => [
@@ -97,9 +101,9 @@ public function buildDataProvider(): array
                                 ],
                             ],
                             'hooks' => [
-                                'build' => 'set -e
-php ./vendor/bin/ece-tools run scenario/build/generate.xml
-php ./vendor/bin/ece-tools run scenario/build/transfer.xml',
+                                'build' => 'set -e' . PHP_EOL
+                                    . 'php ./vendor/bin/ece-tools run scenario/build/generate.xml' . PHP_EOL
+                                    . 'php ./vendor/bin/ece-tools run scenario/build/transfer.xml',
                                 'deploy' => 'php ./vendor/bin/ece-tools run scenario/deploy.xml',
                                 'post_deploy' => 'php ./vendor/bin/ece-tools run scenario/post-deploy.xml'
                             ],

src/Test/Integration/_files/cloud_base_mftf/docker-compose.exp.yml

@@ -15,6 +15,7 @@ services:
       - 'mymagento-mariadb-conf:/etc/mysql/mariadb.conf.d'
       - 'mymagento-magento-db:/var/lib/mysql'
       - 'docker-entrypoint:/docker-entrypoint-initdb.d'
+    command: '--auto_increment_increment=3 --auto_increment_offset=2'
     networks:
       magento:
         aliases:

src/Test/Integration/_files/custom_cloud_base/docker-compose.exp.yml

@@ -15,6 +15,7 @@ services:
       - 'magento-mariadb-conf:/etc/mysql/mariadb.conf.d'
       - 'magento-magento-db:/var/lib/mysql'
       - 'docker-entrypoint:/docker-entrypoint-initdb.d'
+    command: '--auto_increment_increment=3 --auto_increment_offset=2'
     networks:
       magento:
         aliases: