Fix opensearch versions based on container support (#289)

* Fix opensearch versions based on wardenenv container support

* opensearchproject/opensearch:2.19.1

* Disable opensearch security

* spawn separate opensearch service when needed

* fix opensearch flags; fix PackageMatrixVersion type and test

* Try mysql:8.4 over mariadb:11.4

* updated dist/index.js

* Allow trigger creation during integration tests

Author: rhoerr

.github/workflows/integration.yaml

@@ -64,7 +64,7 @@ jobs:
       matrix: ${{ fromJSON(inputs.matrix) }}
     services:
       elasticsearch:
-        image: ${{ matrix.elasticsearch }}
+        image: ${{ matrix.elasticsearch || '' }}
         env:
           # By default, ElasticSearch refuses to spawn in single node configuration, as it expects redundancy.
           # This is a dev environment, so redundancy is just wasteful.
@@ -83,6 +83,24 @@ jobs:
         ports:
           - 9200:9200
 
+      opensearch:
+        image: ${{ matrix.opensearch || '' }}
+        env:
+          # By default, ElasticSearch refuses to spawn in single node configuration, as it expects redundancy.
+          # This is a dev environment, so redundancy is just wasteful.
+          discovery.type: single-node
+          # Disable HTTPS and password authentication
+          DISABLE_INSTALL_DEMO_CONFIG: true
+          DISABLE_SECURITY_PLUGIN: true
+
+        options: >-
+          --health-cmd "curl http://localhost:9200/_cluster/health"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+        ports:
+          - 9200:9200
+
       mysql:
         image: ${{ matrix.mysql }}
         env:
@@ -110,6 +128,10 @@ jobs:
         tools: composer:v${{ matrix.composer }}
         coverage: none
 
+    - name: Allow SQL triggers
+      run: |
+        mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports['3306'] }} -u root -prootpassword -e "set global log_bin_trust_function_creators=1;"
+
     - run: composer create-project --repository-url="${{ inputs.magento_repository }}" "${{ matrix.magento }}" ${{ inputs.magento_directory }} --no-install
       shell: bash
       env:

supported-version/dist/index.js

@@ -4,9 +4,11 @@ export interface PackageMatrixVersion {
     composer: string | number,
     mysql: string,
     elasticsearch: string,
+    opensearch: string,
     rabbitmq: string,
     redis: string,
     varnish: string,
+    valkey: string,
     nginx: string,
     os: string,
     release: string,

supported-version/src/matrix/matrix-type.ts

@@ -12,8 +12,10 @@ describe('amendMatrixForNext', () => {
                             "composer": "2",
                             "mysql": "mysql:8.0",
                             "elasticsearch": "elasticsearch:8.5.3",
+                            "opensearch": "",
                             "rabbitmq": "rabbitmq:3.11-management",
                             "redis": "redis:7.0",
+                            "valkey": "",
                             "varnish": "varnish:7.3",
                             "nginx": "nginx:1.22",
                             "os": "ubuntu-latest",
@@ -35,8 +37,10 @@ describe('amendMatrixForNext', () => {
                         "composer": "2",
                         "mysql": "mysql:8.0",
                         "elasticsearch": "elasticsearch:8.5.3",
+                        "opensearch": "",
                         "rabbitmq": "rabbitmq:3.11-management",
                         "redis": "redis:7.0",
+                        "valkey": "",
                         "varnish": "varnish:7.3",
                         "nginx": "nginx:1.22",
                         "os": "ubuntu-latest",
@@ -60,8 +64,10 @@ describe('amendMatrixForNext', () => {
                             "composer": "2",
                             "mysql": "mysql:8.0",
                             "elasticsearch": "elasticsearch:8.5.3",
+                            "opensearch": "",
                             "rabbitmq": "rabbitmq:3.11-management",
                             "redis": "redis:7.0",
+                            "valkey": "",
                             "varnish": "varnish:7.3",
                             "nginx": "nginx:1.22",
                             "os": "ubuntu-latest",
@@ -83,8 +89,10 @@ describe('amendMatrixForNext', () => {
                         "composer": "2",
                         "mysql": "mysql:8.0",
                         "elasticsearch": "elasticsearch:8.5.3",
+                        "opensearch": "",
                         "rabbitmq": "rabbitmq:3.11-management",
                         "redis": "redis:7.0",
+                        "valkey": "",
                         "varnish": "varnish:7.3",
                         "nginx": "nginx:1.22",
                         "os": "ubuntu-latest",
@@ -108,8 +116,10 @@ describe('amendMatrixForNext', () => {
                             "composer": "2",
                             "mysql": "mysql:8.0",
                             "elasticsearch": "elasticsearch:8.5.3",
+                            "opensearch": "",
                             "rabbitmq": "rabbitmq:3.11-management",
                             "redis": "redis:7.0",
+                            "valkey": "",
                             "varnish": "varnish:7.3",
                             "nginx": "nginx:1.22",
                             "os": "ubuntu-latest",
@@ -122,8 +132,10 @@ describe('amendMatrixForNext', () => {
                             "composer": "2",
                             "mysql": "mysql:8.0",
                             "elasticsearch": "elasticsearch:8.5.3",
+                            "opensearch": "",
                             "rabbitmq": "rabbitmq:3.11-management",
                             "redis": "redis:7.0",
+                            "valkey": "",
                             "varnish": "varnish:7.3",
                             "nginx": "nginx:1.22",
                             "os": "ubuntu-latest",
@@ -145,8 +157,10 @@ describe('amendMatrixForNext', () => {
                         "composer": "2",
                         "mysql": "mysql:8.0",
                         "elasticsearch": "elasticsearch:8.5.3",
+                        "opensearch": "",
                         "rabbitmq": "rabbitmq:3.11-management",
                         "redis": "redis:7.0",
+                        "valkey": "",
                         "varnish": "varnish:7.3",
                         "nginx": "nginx:1.22",
                         "os": "ubuntu-latest",
@@ -159,8 +173,10 @@ describe('amendMatrixForNext', () => {
                         "composer": "2",
                         "mysql": "mysql:8.0",
                         "elasticsearch": "elasticsearch:8.5.3",
+                        "opensearch": "",
                         "rabbitmq": "rabbitmq:3.11-management",
                         "redis": "redis:7.0",
+                        "valkey": "",
                         "varnish": "varnish:7.3",
                         "nginx": "nginx:1.22",
                         "os": "ubuntu-latest",
@@ -184,8 +200,10 @@ describe('amendMatrixForNext', () => {
                             "composer": "2",
                             "mysql": "mysql:8.0",
                             "elasticsearch": "elasticsearch:8.5.3",
+                            "opensearch": "",
                             "rabbitmq": "rabbitmq:3.11-management",
                             "redis": "redis:7.0",
+                            "valkey": "",
                             "varnish": "varnish:7.3",
                             "nginx": "nginx:1.22",
                             "os": "ubuntu-latest",
@@ -207,8 +225,10 @@ describe('amendMatrixForNext', () => {
                         "composer": "2",
                         "mysql": "mysql:8.0",
                         "elasticsearch": "elasticsearch:8.5.3",
+                        "opensearch": "",
                         "rabbitmq": "rabbitmq:3.11-management",
                         "redis": "redis:7.0",
+                        "valkey": "",
                         "varnish": "varnish:7.3",
                         "nginx": "nginx:1.22",
                         "os": "ubuntu-latest",

supported-version/src/nightly/amend-matrix-for-next.spec.ts

@@ -17,8 +17,8 @@
     "magento": "mage-os/project-community-edition:>=1.1 <1.2",
     "php": 8.4,
     "composer": "2.8.8",
-    "mysql": "mariadb:11.4",
-    "elasticsearch": "opensearch:2.19.1",
+    "mysql": "mysql:8.4",
+    "opensearch": "opensearchproject/opensearch:2.19.1",
     "rabbitmq": "rabbitmq:4.0-management",
     "redis": "redis:7.2",
     "varnish": "varnish:7.6",
@@ -31,8 +31,8 @@
     "magento": "mage-os/project-community-edition",
     "php": 8.4,
     "composer": "2.8.8",
-    "mysql": "mariadb:11.4",
-    "elasticsearch": "opensearch:2.19.1",
+    "mysql": "mysql:8.4",
+    "opensearch": "opensearchproject/opensearch:2.19.1",
     "rabbitmq": "rabbitmq:4.0-management",
     "redis": "redis:7.2",
     "varnish": "varnish:7.6",
@@ -45,8 +45,8 @@
     "magento": "mage-os/project-community-edition:next",
     "php": 8.4,
     "composer": "2.8.8",
-    "mysql": "mariadb:11.4",
-    "elasticsearch": "opensearch:2.19.1",
+    "mysql": "mysql:8.4",
+    "opensearch": "opensearchproject/opensearch:2.19.1",
     "rabbitmq": "rabbitmq:4.0-management",
     "redis": "redis:7.2",
     "varnish": "varnish:7.6",

supported-version/src/versions/mage-os/composite.json

@@ -101,8 +101,8 @@
         "magento": "mage-os/project-community-edition:1.1.0",
         "php": 8.4,
         "composer": "2.8.8",
-        "mysql": "mariadb:11.4",
-        "elasticsearch": "opensearch:2.19.1",
+        "mysql": "mysql:8.4",
+        "opensearch": "opensearchproject/opensearch:2.19.1",
         "rabbitmq": "rabbitmq:4.0-management",
         "redis": "redis:7.2",
         "varnish": "varnish:7.6",

supported-version/src/versions/mage-os/individual.json

@@ -129,8 +129,8 @@
         "magento": "magento/project-community-edition:>=2.4.8 <2.4.9",
         "php": 8.4,
         "composer": "2.8.8",
-        "mysql": "mariadb:11.4",
-        "elasticsearch": "opensearch:2.19.1",
+        "mysql": "mysql:8.4",
+        "opensearch": "opensearchproject/opensearch:2.19.1",
         "rabbitmq": "rabbitmq:4.0-management",
         "redis": "redis:7.2",
         "varnish": "varnish:7.6",
@@ -143,8 +143,8 @@
         "magento": "magento/project-community-edition:>=2.4.8 <2.4.9",
         "php": 8.4,
         "composer": "2.8.8",
-        "mysql": "mariadb:11.4",
-        "elasticsearch": "opensearch:2.19.1",
+        "mysql": "mysql:8.4",
+        "opensearch": "opensearchproject/opensearch:2.19.1",
         "rabbitmq": "rabbitmq:4.0-management",
         "redis": "redis:7.2",
         "varnish": "varnish:7.6",
@@ -157,9 +157,10 @@
         "magento": "magento/project-community-edition:next",
         "php": 8.4,
         "composer": "2.8.8",
-        "mysql": "mariadb:11.4",
-        "elasticsearch": "opensearch:2.19.1",
+        "mysql": "mysql:8.4",
+        "opensearch": "opensearchproject/opensearch:2.19.1",
         "rabbitmq": "rabbitmq:4.0-management",
+        "redis": "redis:7.2",
         "varnish": "varnish:7.6",
         "nginx": "nginx:1.26",
         "os": "ubuntu-latest",

supported-version/src/versions/magento-open-source/composite.json

@@ -801,8 +801,8 @@
         "magento": "magento/project-community-edition:2.4.8",
         "php": 8.4,
         "composer": "2.8.8",
-        "mysql": "mariadb:11.4",
-        "elasticsearch": "opensearch:2.19.1",
+        "mysql": "mysql:8.4",
+        "opensearch": "opensearchproject/opensearch:2.19.1",
         "rabbitmq": "rabbitmq:4.0-management",
         "redis": "redis:7.2",
         "varnish": "varnish:7.6",