Remove deploy user

composer.json

@@ -55,6 +55,7 @@
         "webmozart/assert": "^1.12.1"
     },
     "require-dev": {
+        "ext-pdo": "*",
         "behat/behat": "^3.27",
         "behat/mink": "^1.13",
         "behat/mink-browserkit-driver": "^2.3",

config/openconext/parameters.yaml.dist

@@ -35,9 +35,6 @@ parameters:
     database_gateway_user:     gateway_user
     database_gateway_password: gateway_secret
 
-    database_deploy_user: gw_deploy_user
-    database_deploy_password: gw_deploy_secret
-
     mailer_transport:  smtp
     mailer_host:       mailcatcher
     mailer_user:       ~

config/packages/doctrine.yaml

@@ -11,15 +11,6 @@ doctrine:
         password: "%database_gateway_password%"
         server_version: "%database_server_version%"
         charset:  UTF8
-      deploy:
-        driver:   "%database_driver%"
-        host:     "%database_host%"
-        port:     "%database_port%"
-        dbname:   "%database_gateway_name%"
-        user:     "%database_deploy_user%"
-        password: "%database_deploy_password%"
-        server_version: "%database_server_version%"
-        charset:  UTF8
   orm:
     default_entity_manager: gateway
     auto_generate_proxy_classes: "%kernel.debug%"
@@ -36,11 +27,6 @@ doctrine:
             mapping: true
             type: attribute
             is_bundle: true
-      deploy:
-        report_fields_where_declared: true
-        connection: deploy
-        naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
-        mappings: []
 
 when@smoketest:
   doctrine:
@@ -49,9 +35,6 @@ when@smoketest:
       connections:
         gateway:
           dbname: gateway_test
-          host: mariadb
-          password: gw_deploy_secret
-          user: gw_deploy_user
 
 when@test:
   doctrine:

config/services_test.yaml

@@ -7,35 +7,33 @@ services:
   gateway.service.gateway_api_sms:
     class: Surfnet\StepupGateway\ApiBundle\Tests\TestDouble\Service\SmsService
 
+  Surfnet\StepupGateway\Behat\ValueObject\SmoketestPdoFactory:
+    class: Surfnet\StepupGateway\Behat\ValueObject\SmoketestPdoFactory
+    arguments:
+      - '%database_host%'
+      - 'gw_deploy_user'
+      - 'gw_deploy_secret'
+      - 'gateway_test'
+
   Surfnet\StepupGateway\Behat\Repository\SecondFactorRepository:
     class: Surfnet\StepupGateway\Behat\Repository\SecondFactorRepository
     arguments:
-      - '@Surfnet\StepupGateway\Behat\Repository\Connection'
+      - '@Surfnet\StepupGateway\Behat\ValueObject\SmoketestPdoFactory'
 
   Surfnet\StepupGateway\Behat\Repository\SamlEntityRepository:
     class: Surfnet\StepupGateway\Behat\Repository\SamlEntityRepository
     arguments:
-      - '@Surfnet\StepupGateway\Behat\Repository\Connection'
+      - '@Surfnet\StepupGateway\Behat\ValueObject\SmoketestPdoFactory'
 
   Surfnet\StepupGateway\Behat\Repository\WhitelistRepository:
     class: Surfnet\StepupGateway\Behat\Repository\WhitelistRepository
     arguments:
-      - '@Surfnet\StepupGateway\Behat\Repository\Connection'
+      - '@Surfnet\StepupGateway\Behat\ValueObject\SmoketestPdoFactory'
 
   Surfnet\StepupGateway\Behat\Repository\InstitutionConfigurationRepository:
     class: Surfnet\StepupGateway\Behat\Repository\InstitutionConfigurationRepository
     arguments:
-      - '@Surfnet\StepupGateway\Behat\Repository\Connection'
-
-  Surfnet\StepupGateway\Behat\Repository\Connection:
-    class: Surfnet\StepupGateway\Behat\Repository\Connection
-    arguments:
-      - '%env(APP_ENV)%'
-      - '%database_deploy_user%'
-      - '%database_deploy_password%'
-      - 'gateway_test'
-      - '%database_host%'
-
+      - '@Surfnet\StepupGateway\Behat\ValueObject\SmoketestPdoFactory'
 
   Surfnet\StepupGateway\Behat\Controller\ServiceProviderController:
     class: Surfnet\StepupGateway\Behat\Controller\ServiceProviderController
@@ -69,6 +67,13 @@ services:
       - "@logger"
     public: false
 
+  Surfnet\StepupGateway\Behat\Service\DatabaseSchemaService:
+    class: Surfnet\StepupGateway\Behat\Service\DatabaseSchemaService
+    public: true
+    arguments:
+      - '@doctrine.orm.gateway_entity_manager'
+      - '@Surfnet\StepupGateway\Behat\ValueObject\SmoketestPdoFactory'
+
   Surfnet\StepupGateway\Behat\Service\FixtureService:
     class: Surfnet\StepupGateway\Behat\Service\FixtureService
     public: true
@@ -82,6 +87,7 @@ services:
     public: true
     arguments:
       $fixtureService: '@Surfnet\StepupGateway\Behat\Service\FixtureService'
+      $databaseSchemaService: '@Surfnet\StepupGateway\Behat\Service\DatabaseSchemaService'
       $logger: '@logger'
 
   Surfnet\StepupGateway\Behat\ServiceProviderContext:

tests/features/bootstrap/FeatureContext.php

@@ -28,6 +28,7 @@
 use RuntimeException;
 use SAML2\Compat\ContainerSingleton;
 use Surfnet\SamlBundle\Tests\TestSaml2Container;
+use Surfnet\StepupGateway\Behat\Service\DatabaseSchemaService;
 use Surfnet\StepupGateway\Behat\Service\FixtureService;
 
 class FeatureContext implements Context
@@ -37,6 +38,11 @@ class FeatureContext implements Context
      */
     private $fixtureService;
 
+    /**
+     * @var DatabaseSchemaService
+     */
+    private static $databaseSchemaService;
+
     private $whitelistedInstitutions = [];
 
     /**
@@ -66,9 +72,13 @@ class FeatureContext implements Context
      */
     private $cookieDomain;
 
-    public function __construct(FixtureService $fixtureService, LoggerInterface $logger)
-    {
+    public function __construct(
+        FixtureService $fixtureService,
+        DatabaseSchemaService $databaseSchemaService,
+        LoggerInterface $logger
+    ) {
         $this->fixtureService = $fixtureService;
+        self::$databaseSchemaService = $databaseSchemaService;
         $this->sso2faCookieName = 'stepup-gateway_sso-on-second-factor-authentication';
         $this->sessCookieName = 'MOCKSESSID';
         $this->cookieDomain = '.gateway.dev.openconext.local';
@@ -80,10 +90,7 @@ public function __construct(FixtureService $fixtureService, LoggerInterface $log
     #[\Behat\Hook\BeforeFeature]
     public static function setupDatabase(BeforeFeatureScope $scope): void
     {
-        // Generate test databases
-        echo "Preparing test schemas\n";
-        shell_exec("/var/www/html/bin/console doctrine:schema:drop --env=smoketest --force");
-        shell_exec("/var/www/html/bin/console doctrine:schema:create --env=smoketest");
+        self::$databaseSchemaService->resetSchema();
     }
 
     #[\Behat\Hook\BeforeScenario]

tests/src/Repository/InstitutionConfigurationRepository.php

@@ -19,22 +19,20 @@
 namespace Surfnet\StepupGateway\Behat\Repository;
 
 use Exception;
+use PDO;
+use Surfnet\StepupGateway\Behat\ValueObject\SmoketestPdoFactory;
 use function error_get_last;
 
 /**
  * A poor-mans repository, a pdo connection to the test database is established in the constructor
  */
 class InstitutionConfigurationRepository
 {
+    private readonly PDO $connection;
 
-    /**
-     * @var Connection
-     */
-    private $connection;
-
-    public function __construct(Connection $connection)
+    public function __construct(SmoketestPdoFactory $factory)
     {
-        $this->connection = $connection;
+        $this->connection = $factory->createConnection();
     }
 
     public function configure(string $institution, string $option, bool $value)

tests/src/Repository/SamlEntityRepository.php

@@ -21,6 +21,7 @@
 use Exception;
 use PDO;
 use Ramsey\Uuid\Uuid;
+use Surfnet\StepupGateway\Behat\ValueObject\SmoketestPdoFactory;
 
 /**
  * A poor mans repository, a pdo connection to the test database is established in the constructor
@@ -31,14 +32,11 @@ class SamlEntityRepository
 
     const SP_ADFS_SSO_LOCATION = 'https://gateway.dev.openconext.local/test/authentication/adfs/sso';
 
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private readonly PDO $connection;
 
-    public function __construct(Connection $connection)
+    public function __construct(SmoketestPdoFactory $factory)
     {
-        $this->connection = $connection;
+        $this->connection = $factory->createConnection();
     }
 
     public function createSpIfNotExists($entityId, $certificate, $sfoEnabled = false)

tests/src/Repository/SecondFactorRepository.php

@@ -22,20 +22,18 @@
 use PDO;
 use Ramsey\Uuid\Uuid;
 use Surfnet\StepupBundle\Value\VettingType;
+use Surfnet\StepupGateway\Behat\ValueObject\SmoketestPdoFactory;
 
 /**
  * A poor mans repository, a pdo connection to the test database is established in the constructor
  */
 class SecondFactorRepository
 {
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private readonly PDO $connection;
 
-    public function __construct(Connection $connection)
+    public function __construct(SmoketestPdoFactory $factory)
     {
-        $this->connection = $connection;
+        $this->connection = $factory->createConnection();
     }
 
     public function create($nameId, $tokenType, $institution, bool $selfAsserted = false, $identifier = null)

tests/src/Repository/WhitelistRepository.php

@@ -20,20 +20,18 @@
 
 use Exception;
 use PDO;
+use Surfnet\StepupGateway\Behat\ValueObject\SmoketestPdoFactory;
 
 /**
  * A poor mans repository, a pdo connection to the test database is established in the constructor
  */
 class WhitelistRepository
 {
-    /**
-     * @var Connection
-     */
-    private $connection;
+    private readonly PDO $connection;
 
-    public function __construct(Connection $connection)
+    public function __construct(SmoketestPdoFactory $factory)
     {
-        $this->connection = $connection;
+        $this->connection = $factory->createConnection();
     }
 
     /**