Feature/postgres support

.github/workflows/test-integration.yml

@@ -78,6 +78,20 @@ jobs:
                         echo -e "\nBehat tests (with headless Chrome)\n" && \
                         ./vendor/bin/behat -c ./tests/behat.yml --suite functional -vv --format pretty --strict
                     '
+            -   name: Run acceptance tests - PostgreSQL
+                if: always()
+                run: |
+                    cd docker && docker compose exec -e APP_ENV=postgres -T --user www-data engine.dev.openconext.local bash -c '
+                        echo -e "\nInstalling database fixtures...\n" && \
+                        ./bin/console doctrine:schema:drop --force --env=postgres && \
+                        ./bin/console doctrine:migrations:migrate --env=postgres --no-interaction && \
+                        echo -e "\nPreparing frontend assets\n" && \
+                        EB_THEME=skeune ./theme/scripts/prepare-test.js > /dev/null && \
+                        echo -e "\nRun the Behat tests\n" && \
+                        ./vendor/bin/behat -c ./tests/behat.yml --suite default -vv --format pretty --strict && \
+                        echo -e "\nBehat tests (with headless Chrome)\n" && \
+                        ./vendor/bin/behat -c ./tests/behat.yml --suite functional -vv --format pretty --strict
+                    '
             -   name: Run linting tests
                 if: always()
                 run: |

composer.json

@@ -112,7 +112,7 @@
         },
         "psr-4": {
             "OpenConext\\": "src/OpenConext",
-            "OpenConext\\EngineBlock\\Doctrine\\Migrations\\": "migrations/DoctrineMigrations"
+            "OpenConext\\EngineBlock\\Doctrine\\Migrations\\": "migrations/MariaMigrations"
         },
         "classmap": [
             "src/Kernel.php"

config/bundles.php

@@ -10,8 +10,8 @@
     OpenConext\MonitorBundle\OpenConextMonitorBundle::class => ['all' => true],
     OpenConext\EngineBlockBundle\OpenConextEngineBlockBundle::class => ['all' => true],
     Liip\FunctionalTestBundle\LiipFunctionalTestBundle::class => ['test' => true],
-    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'ci' => true],
-    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'ci' => true],
-    OpenConext\EngineBlockFunctionalTestingBundle\OpenConextEngineBlockFunctionalTestingBundle::class => ['test' => true, 'ci' => true],
-    FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['ci' => true],
+    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'ci' => true, 'postgres' => true],
+    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'ci' => true, 'postgres' => true],
+    OpenConext\EngineBlockFunctionalTestingBundle\OpenConextEngineBlockFunctionalTestingBundle::class => ['test' => true, 'ci' => true, 'postgres' => true],
+    FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['ci' => true, 'postgres' => true],
 ];

config/packages/ci/doctrine.yaml

@@ -3,16 +3,16 @@ doctrine:
         default_connection: engineblock_test
         connections:
             engineblock:
-                driver:   pdo_mysql         # This must be PDO until all database interaction runs through doctrine
-                server_version: '10.6.0-MariaDB'
+                driver:   "%database.test.driver%"
+                server_version: "%database.test.server_version%"
                 dbname:   "%database.dbname%"
                 host:     "%database.test.host%"
-                port:     "%database.port%"
-                user:     "%database.user%"
+                port: "%database.port%"
+                user: "%database.user%"
                 password: "%database.password%"
             engineblock_test:
-                driver:   pdo_mysql         # This must be PDO until all database interaction runs through doctrine
-                server_version: '10.6.0-MariaDB'
+                driver:   "%database.test.driver%"
+                server_version: "%database.test.server_version%"
                 dbname:   "%database.test.dbname%"
                 host:     "%database.test.host%"
                 port:     "%database.test.port%"

config/packages/ci/parameters.yml

@@ -12,3 +12,23 @@ parameters:
         rollover:
             publicFile: '%kernel.project_dir%/src/OpenConext/EngineBlockFunctionalTestingBundle/Resources/keys/rolled-over.crt'
             privateFile: '%kernel.project_dir%/src/OpenConext/EngineBlockFunctionalTestingBundle/Resources/keys/rolled-over.key'
+
+    database.test.driver: pdo_mysql
+    database.test.server_version: 10.11.13-MariaDB
+
+#   For postgres database
+#parameters:
+#    database.driver: pdo_pgsql
+#    database.server_version: '17'
+#    database.host: postgres
+#    database.port: '5432'
+#    database.user: ebrw
+#    database.password: secret
+#    database.dbname: eb
+#    database.test.driver: pdo_pgsql
+#    database.test.server_version: '17'
+#    database.test.host: postgres
+#    database.test.port: '5432'
+#    database.test.user: eb_testrw
+#    database.test.password: secret
+#    database.test.dbname: eb_test

config/packages/dev/monolog.yaml

@@ -8,6 +8,12 @@ monolog:
             handler: nested
             level:     debug
             channels: ["!authentication"]
+        critical:
+            type: stream
+            level: error
+            path: "%kernel.logs_dir%/error.log"
+            formatter: monolog.formatter.line
+            channels: [ "!event" ]
         nested:
             type:      stream
             level:     debug

config/packages/dev/parameters.yml

@@ -9,3 +9,14 @@ parameters:
         rollover:
             publicFile: '%kernel.project_dir%/src/OpenConext/EngineBlockFunctionalTestingBundle/Resources/keys/rolled-over.crt'
             privateFile: '%kernel.project_dir%/src/OpenConext/EngineBlockFunctionalTestingBundle/Resources/keys/rolled-over.key'
+
+#   For postgres database
+#parameters:
+#    database.driver: pdo_pgsql
+#    database.server_version: '17'
+#    database.host: postgres
+#    database.port: '5432'
+#    database.user: ebrw
+#    database.password: secret
+#    database.dbname: eb
+

config/packages/doctrine.yaml

@@ -5,7 +5,7 @@ doctrine:
         connections:
             engineblock:
                 #                schema_filter: ~^(?!group_|virtual_|service_provider_|saml_persistent_id|sso_provider_roles|log_logins|db_changelog|consent)~
-                driver:   pdo_mysql         # This must be PDO until all database interaction runs through doctrine
+                driver:   "%database.driver%"
                 dbname:   "%database.dbname%"
                 host:     "%database.host%"
                 port:     "%database.port%"
@@ -15,14 +15,24 @@ doctrine:
                 # when true, queries are logged to a 'doctrine' monolog channel
                 logging: '%kernel.debug%'
                 profiling: '%kernel.debug%'
-                server_version: '10.11.13-MariaDB'
+                server_version: "%database.server_version%"
                 mapping_types:
                     enum: string
         types:
             engineblock_collab_person_id: OpenConext\EngineBlockBundle\Doctrine\Type\CollabPersonIdType
             engineblock_collab_person_uuid: OpenConext\EngineBlockBundle\Doctrine\Type\CollabPersonUuidType
             engineblock_metadata_coins: OpenConext\EngineBlockBundle\Doctrine\Type\MetadataCoinType
             engineblock_metadata_mdui: OpenConext\EngineBlockBundle\Doctrine\Type\MetadataMduiType
+            engineblock_certificate_array: OpenConext\EngineBlockBundle\Doctrine\Type\CertificateArrayType
+            engineblock_attribute_release_policy: OpenConext\EngineBlockBundle\Doctrine\Type\AttributeReleasePolicyType
+            engineblock_contact_person_array: OpenConext\EngineBlockBundle\Doctrine\Type\ContactPersonArrayType
+            engineblock_indexed_service_array: OpenConext\EngineBlockBundle\Doctrine\Type\IndexedServiceArrayType
+            engineblock_logo: OpenConext\EngineBlockBundle\Doctrine\Type\LogoType
+            engineblock_organization: OpenConext\EngineBlockBundle\Doctrine\Type\OrganizationType
+            engineblock_requested_attribute_array: OpenConext\EngineBlockBundle\Doctrine\Type\RequestedAttributeArrayType
+            engineblock_service: OpenConext\EngineBlockBundle\Doctrine\Type\ServiceType
+            engineblock_service_array: OpenConext\EngineBlockBundle\Doctrine\Type\ServiceArrayType
+            engineblock_shib_md_scope_array: OpenConext\EngineBlockBundle\Doctrine\Type\ShibMdScopeArrayType
 
             array: OpenConext\EngineBlockBundle\Doctrine\Type\SerializedArrayType
             object: OpenConext\EngineBlockBundle\Doctrine\Type\SerializedObjectType

config/packages/doctrine_migrations.yaml

@@ -1,6 +1,7 @@
 doctrine_migrations:
     migrations_paths:
-        OpenConext\EngineBlock\Doctrine\Migrations: '%kernel.project_dir%/migrations/DoctrineMigrations'
+        OpenConext\EngineBlock\Doctrine\Migrations:
+            '%kernel.project_dir%/migrations/MariaMigrations'
     storage:
         table_storage:
             table_name: 'migration_versions'

config/packages/parameters.yml.dist

@@ -126,6 +126,8 @@ parameters:
     ##########################################################################################
     ## DATABASE SETTINGS
     ##########################################################################################
+    database.driver: pdo_mysql
+    database.server_version: '10.11.13-MariaDB'
     database.host: mariadb
     database.port: '3306'
     database.user: ebrw

config/packages/postgres/doctrine.yaml

@@ -0,0 +1,12 @@
+doctrine:
+    dbal:
+        default_connection: engineblock_test
+        connections:
+            engineblock_test:
+                driver:   "%database.test.driver%"
+                server_version: "%database.test.server_version%"
+                dbname:   "%database.test.dbname%"
+                host:     "%database.test.host%"
+                port:     "%database.test.port%"
+                user:     "%database.test.user%"
+                password: "%database.test.password%"

config/packages/postgres/doctrine_migrations.yaml

@@ -0,0 +1,4 @@
+doctrine_migrations:
+    migrations_paths:
+        OpenConext\EngineBlock\Doctrine\Migrations:
+            '%kernel.project_dir%/migrations/PostgresMigrations'

config/packages/postgres/framework.yaml

@@ -0,0 +1,9 @@
+framework:
+    test: true
+
+parameters:
+    router.request_context.host: engine.%domain%
+    router.request_context.scheme: https
+    idp_fixture_file: /tmp/eb-fixtures/db/idp.states.php.serialized
+    sp_fixture_file: /tmp/eb-fixtures/db/sp.states.php.serialized
+    stepup.sfo.override_engine_entityid: 'https://engine.dev.openconext.local/new/stepup/metadata'

config/packages/postgres/monolog.yaml

@@ -0,0 +1,7 @@
+monolog:
+    handlers:
+        test_log_file:
+            type: stream
+            path: '/tmp/eb-fixtures/log-records.ndjson'
+            level: debug
+            formatter: monolog.formatter.json

config/packages/postgres/parameters.yml

@@ -0,0 +1,28 @@
+parameters:
+    api.users.nameidlookup.username: nameid
+    api.users.nameidlookup.password: secret
+    feature_api_users_nameid_lookup: true
+    feature_hide_bookmarkable_url: true
+    auth.log.attributes:
+        uid: 'urn:mace:dir:attribute-def:uid'
+    encryption_keys:
+        default:
+            publicFile: /config/engine/engineblock.crt
+            privateFile: /config/engine/engineblock.pem
+        rollover:
+            publicFile: '%kernel.project_dir%/src/OpenConext/EngineBlockFunctionalTestingBundle/Resources/keys/rolled-over.crt'
+            privateFile: '%kernel.project_dir%/src/OpenConext/EngineBlockFunctionalTestingBundle/Resources/keys/rolled-over.key'
+    database.driver: pdo_pgsql
+    database.server_version: '17'
+    database.host: postgres
+    database.port: '5432'
+    database.user: ebrw
+    database.password: secret
+    database.dbname: eb
+    database.test.driver: pdo_pgsql
+    database.test.server_version: '17'
+    database.test.host: postgres
+    database.test.port: '5432'
+    database.test.user: eb_testrw
+    database.test.password: secret
+    database.test.dbname: eb_test

config/packages/postgres/web_profiler.yaml

@@ -0,0 +1,6 @@
+web_profiler:
+    toolbar: false
+    intercept_redirects: false
+
+framework:
+    profiler: { collect: false }

config/packages/test/doctrine.yaml

@@ -3,13 +3,15 @@ doctrine:
         default_connection: engineblock_test
         connections:
             engineblock_test:
-                driver:   pdo_mysql         # This must be PDO until all database interaction runs through doctrine
-                server_version: '10.6.0-MariaDB'
+                driver:   "%database.test.driver%"
+                server_version: "%database.test.server_version%"
                 dbname:   "%database.test.dbname%"
                 host:     "%database.test.host%"
                 port:     "%database.test.port%"
                 user:     "%database.test.user%"
                 password: "%database.test.password%"
 #
-#parameters:
+parameters:
+    database.test.driver: pdo_mysql
+    database.test.server_version: 10.11.13-MariaDB
 #    database.test.host: 127.0.0.1