MAGECLOUD-1369: Unified environment configs (#132)

Author: shiftedreality

composer.json

@@ -48,7 +48,8 @@
       "phpmd src xml tests/static/phpmd-ruleset.xml",
       "phpunit --configuration tests/unit/phpunit.xml.dist"
     ],
-    "test-coverage": "phpunit --configuration tests/unit/phpunit.xml.dist --coverage-html tests/unit/tmp/coverage"
+    "test-coverage": "phpunit --configuration tests/unit/phpunit.xml.dist --coverage-clover tests/unit/tmp/clover.xml && php tests/unit/code-coverage.php tests/unit/tmp/clover.xml 85",
+    "test-coverage-generate": "phpunit --configuration tests/unit/phpunit.xml.dist --coverage-html tests/unit/tmp/coverage"
   },
   "prefer-stable": true
 }

src/App/Container.php

@@ -98,8 +98,7 @@ function () {
             \Magento\MagentoCloud\DB\Dump::class
         );
         $this->container->singleton(\Magento\MagentoCloud\Config\Environment::class);
-        $this->container->singleton(\Magento\MagentoCloud\Config\Build::class);
-        $this->container->singleton(\Magento\MagentoCloud\Config\Deploy::class);
+        $this->container->singleton(\Magento\MagentoCloud\Config\State::class);
         $this->container->singleton(\Psr\Log\LoggerInterface::class, \Magento\MagentoCloud\App\Logger::class);
         $this->container->singleton(\Magento\MagentoCloud\Package\Manager::class);
         $this->container->singleton(\Magento\MagentoCloud\Package\MagentoVersion::class);
@@ -115,6 +114,14 @@ function () {
         $this->container->singleton(\Magento\MagentoCloud\Config\Stage\Build::class);
         $this->container->singleton(\Magento\MagentoCloud\Config\Stage\Deploy::class);
         $this->container->singleton(\Magento\MagentoCloud\Config\RepositoryFactory::class);
+        $this->container->singleton(
+            \Magento\MagentoCloud\Config\Stage\BuildInterface::class,
+            \Magento\MagentoCloud\Config\Stage\Build::class
+        );
+        $this->container->singleton(
+            \Magento\MagentoCloud\Config\Stage\DeployInterface::class,
+            \Magento\MagentoCloud\Config\Stage\Deploy::class
+        );
         /**
          * Contextual binding.
          */
@@ -304,9 +311,6 @@ function () {
                     ],
                 ]);
             });
-        $this->container->when(\Magento\MagentoCloud\Config\Build::class)
-            ->needs(\Magento\MagentoCloud\Filesystem\Reader\ReaderInterface::class)
-            ->give(\Magento\MagentoCloud\Config\Build\Reader::class);
         $this->container->when(BuildProcess\DeployStaticContent::class)
             ->needs(ProcessInterface::class)
             ->give(function () {
@@ -338,18 +342,6 @@ function () {
                     ],
                 ]);
             });
-        $this->container->when(BuildProcess\DeployStaticContent::class)
-            ->needs(StageConfigInterface::class)
-            ->give(BuildConfig::class);
-        $this->container->when(\Magento\MagentoCloud\StaticContent\Build\Option::class)
-            ->needs(StageConfigInterface::class)
-            ->give(BuildConfig::class);
-        $this->container->when(\Magento\MagentoCloud\StaticContent\Deploy\Option::class)
-            ->needs(StageConfigInterface::class)
-            ->give(DeployConfig::class);
-        $this->container->when(\Magento\MagentoCloud\StaticContent\Prestart\Option::class)
-            ->needs(StageConfigInterface::class)
-            ->give(BuildConfig::class);
     }
 
     /**

src/Config/Build.php

@@ -31,14 +31,6 @@ class Environment
     const DEFAULT_ADMIN_FIRSTNAME = 'Admin';
     const DEFAULT_ADMIN_LASTNAME = 'Username';
 
-    /**
-     * Variables.
-     */
-    const VAR_QUEUE_CONFIGURATION = 'QUEUE_CONFIGURATION';
-    const VAR_SEARCH_CONFIGURATION = 'SEARCH_CONFIGURATION';
-    const VAR_REDIS_SESSION_DISABLE_LOCKING = 'REDIS_SESSION_DISABLE_LOCKING';
-    const VAR_SCD_COMPRESSION_LEVEL = Build::OPT_SCD_COMPRESSION_LEVEL;
-
     /**
      * @var LoggerInterface
      */
@@ -159,31 +151,6 @@ public function getVariable($name, $default = null)
         return $this->getVariables()[$name] ?? $default;
     }
 
-    /**
-     * Checks that static content symlink is on.
-     *
-     * If STATIC_CONTENT_SYMLINK == disabled return false
-     * Returns true by default
-     *
-     * @return bool
-     */
-    public function isStaticContentSymlinkOn(): bool
-    {
-        $var = $this->getVariables();
-
-        return isset($var['STATIC_CONTENT_SYMLINK']) && $var['STATIC_CONTENT_SYMLINK'] == 'disabled' ? false : true;
-    }
-
-    /**
-     * @return string
-     */
-    public function getVerbosityLevel(): string
-    {
-        $var = $this->getVariables();
-
-        return isset($var['VERBOSE_COMMANDS']) && $var['VERBOSE_COMMANDS'] == 'enabled' ? ' -vvv ' : '';
-    }
-
     /**
      * @return string
      */
@@ -212,43 +179,7 @@ public function getWritableDirectories(): array
      */
     public function isDeployStaticContent(): bool
     {
-        $var = $this->getVariables();
-
-        /**
-         * Can use environment variable to always disable.
-         * Default is to deploy static content if it was not deployed in the build step.
-         */
-        if (isset($var['DO_DEPLOY_STATIC_CONTENT']) && $var['DO_DEPLOY_STATIC_CONTENT'] == 'disabled') {
-            $flag = false;
-        } else {
-            $flag = !$this->flagFilePool->getFlag(StaticContentDeployFlag::KEY)->exists();
-        }
-
-        $this->logger->info('Flag DO_DEPLOY_STATIC_CONTENT is set to ' . ($flag ? 'enabled' : 'disabled'));
-
-        return $flag;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStaticDeployThreadsCount(): int
-    {
-        /**
-         * Use 1 for PAAS environment.
-         */
-        $staticDeployThreads = 1;
-        $var = $this->getVariables();
-
-        if (isset($var['STATIC_CONTENT_THREADS'])) {
-            $staticDeployThreads = (int)$var['STATIC_CONTENT_THREADS'];
-        } elseif (isset($_ENV['STATIC_CONTENT_THREADS'])) {
-            $staticDeployThreads = (int)$_ENV['STATIC_CONTENT_THREADS'];
-        } elseif (isset($_ENV['MAGENTO_CLOUD_MODE']) && $_ENV['MAGENTO_CLOUD_MODE'] === static::CLOUD_MODE_ENTERPRISE) {
-            $staticDeployThreads = 3;
-        }
-
-        return $staticDeployThreads;
+        return !$this->flagFilePool->getFlag(StaticContentDeployFlag::KEY)->exists();
     }
 
     /**
@@ -259,24 +190,6 @@ public function getAdminLocale(): string
         return $this->getVariables()['ADMIN_LOCALE'] ?? 'en_US';
     }
 
-    /**
-     * @return bool
-     */
-    public function doCleanStaticFiles(): bool
-    {
-        $var = $this->getVariables();
-
-        return !(isset($var['CLEAN_STATIC_FILES']) && $var['CLEAN_STATIC_FILES'] === static::VAL_DISABLED);
-    }
-
-    /**
-     * @return string
-     */
-    public function getStaticDeployExcludeThemes(): string
-    {
-        return $this->getVariable('STATIC_CONTENT_EXCLUDE_THEMES', '');
-    }
-
     /**
      * @return string|float
      */
@@ -357,24 +270,6 @@ public function getAdminUrl(): string
         return $this->getVariables()['ADMIN_URL'] ?? '';
     }
 
-    /**
-     * @return array
-     */
-    public function getCronConsumersRunner(): array
-    {
-        return $this->getJsonVariable('CRON_CONSUMERS_RUNNER');
-    }
-
-    /**
-     * @return bool
-     */
-    public function isUpdateUrlsEnabled(): bool
-    {
-        $var = $this->getVariables();
-
-        return isset($var['UPDATE_URLS']) && $var['UPDATE_URLS'] == 'disabled' ? false : true;
-    }
-
     /**
      * @return string
      */
@@ -391,21 +286,4 @@ public function isMasterBranch(): bool
         return isset($_ENV['MAGENTO_CLOUD_ENVIRONMENT'])
             && preg_match(self::GIT_MASTER_BRANCH_RE, $_ENV['MAGENTO_CLOUD_ENVIRONMENT']);
     }
-
-    /**
-     * Returns variable that was set in json format.
-     *
-     * @param string $name
-     * @return array
-     */
-    public function getJsonVariable(string $name): array
-    {
-        $config = $this->getVariable($name, []);
-
-        if (!is_array($config)) {
-            $config = (array)json_decode($config, true);
-        }
-
-        return $config;
-    }
 }