Merge branch 'Adyen:main' into issue/2867-use-async-pos-payments

Author: pmzandbergen

.github/Dockerfile

@@ -9,10 +9,10 @@ DB_NAME=magento \
 DB_USER=magento \
 DB_PASSWORD=magento \
 DB_PREFIX=m2_ \
-ELASTICSEARCH_SERVER="<will be defined>" \
-ELASTICSEARCH_PORT=9200 \
-ELASTICSEARCH_INDEX_PREFIX=magento2 \
-ELASTICSEARCH_TIMEOUT=15 \
+OPENSEARCH_SERVER="<will be defined>" \
+OPENSEARCH_PORT=9200 \
+OPENSEARCH_INDEX_PREFIX=magento2 \
+OPENSEARCH_TIMEOUT=15 \
 ADMIN_NAME=admin \
 ADMIN_LASTNAME=admin \
 ADMIN_EMAIL=admin@example.com \

.github/Makefile

@@ -41,10 +41,10 @@ configure: n98-magerun2.phar
 	bin/magento config:set payment/adyen_abstract/merchant_account "${ADYEN_MERCHANT}"
 	bin/magento config:set payment/adyen_abstract/notifications_ip_check 0
 	bin/magento config:set payment/adyen_abstract/payment_authorized 'processing'
-	bin/magento config:set payment/adyen_abstract/payment_pre_authorized 'pending_payment'
+	bin/magento config:set payment/adyen_abstract/payment_pre_authorized 'adyen_authorized'
 	bin/magento config:set payment/adyen_abstract/capture_mode 'manual'
 	bin/magento config:set payment/adyen_abstract/paypal_capture_mode 0
-	bin/magento config:set payment/adyen_abstract/recurring_configuration '{"adyen_cc":{"name":"Credit Card","enabled":"1","recurringProcessingModel":"CardOnFile"}}'
+	bin/magento config:set payment/adyen_abstract/recurring_configuration '{"adyen_cc":{"name":"Cards","enabled":"1","recurringProcessingModel":"CardOnFile"},"adyen_sepadirectdebit":{"name":"SEPA Direct Debit","enabled":"1","recurringProcessingModel":"CardOnFile"}}'
 	bin/magento config:set payment/adyen_cc_vault/require_cvc 1
 	bin/magento config:set payment/adyen_abstract/client_key_test "${ADYEN_CLIENT_KEY}"
 	bin/magento config:set payment/adyen_abstract/notification_username 'admin'
@@ -60,8 +60,9 @@ flush:
 enable-express:
 	bin/magento module:enable Adyen_ExpressCheckout
 	bin/magento setup:upgrade
-	bin/magento config:set payment/adyen_express/show_google_pay_on "1,2,3"
-	bin/magento config:set payment/adyen_express/show_apple_pay_on "1,2,3"
+	bin/magento config:set payment/adyen_googlepay/express_show_on "1,2,3"
+	bin/magento config:set payment/adyen_applepay/express_show_on "1,2,3"
+	bin/magento config:set payment/adyen_paypal_express/express_show_on "1,2,3"
 	bin/magento cache:clean
 
 # Full plugin setup
@@ -115,7 +116,6 @@ setup-mftf:
 		--MAGENTO_BASE_URL "https://${MAGENTO_HOST}/" \
 		--MAGENTO_BACKEND_NAME "${ADMIN_URLEXT}" \
 		--MAGENTO_ADMIN_USERNAME "${ADMIN_USERNAME}" \
-		--MAGENTO_ADMIN_PASSWORD "${ADMIN_PASSWORD}" \
 		--BROWSER chrome \
 		--ELASTICSEARCH_VERSION 7;
 	echo 'SELENIUM_HOST=selenium' >> dev/tests/acceptance/.env;

.github/docker-compose.e2e.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   playwright:
-    image: mcr.microsoft.com/playwright:v1.40.1
+    image: mcr.microsoft.com/playwright:v1.50.0
     shm_size: 1gb
     ipc: host
     cap_add:
@@ -20,8 +20,11 @@ services:
       - ADYEN_MERCHANT
       - GOOGLE_USERNAME
       - GOOGLE_PASSWORD
+      - AMAZON_USERNAME
+      - AMAZON_PASSWORD
       - WEBHOOK_USERNAME
       - WEBHOOK_PASSWORD
+      - CI
     volumes:
       - ./scripts/e2e.sh:/e2e.sh
       - ../test-report:/tmp/test-report

.github/docker-compose.yml

@@ -11,9 +11,9 @@ services:
       MARIADB_DATABASE: magento
       MARIADB_USER: magento
       MARIADB_PASSWORD: magento
-  elastic:
-    image: elasticsearch:7.17.13
-    container_name: elasticsearch
+  opensearch:
+    image: bitnami/opensearch:2
+    container_name: opensearch-container
     networks:
       - backend
     ports:
@@ -37,7 +37,7 @@ services:
           - magento2.test.com
     environment:
       DB_SERVER: mariadb
-      ELASTICSEARCH_SERVER: elasticsearch
+      OPENSEARCH_SERVER: opensearch-container
       MAGENTO_HOST: magento2.test.com
       VIRTUAL_HOST: magento2.test.com
       COMPOSER_MEMORY_LIMIT: -1
@@ -52,7 +52,7 @@ services:
       MAGENTO_VERSION:
     depends_on:
       - db
-      - elastic
+      - opensearch
     volumes:
       - ../:/data/extensions/workdir
       - ./Makefile:/var/www/html/Makefile

.github/scripts/install_magento.sh

@@ -20,29 +20,25 @@ else
 	exit 1
 fi
 
-USE_ELASTICSEARCH='1'
-if [[ "$MAGENTO_VERSION" =~ ^2\.3 ]]; then
-	USE_ELASTICSEARCH='0'
-fi
-
-if [ "$USE_ELASTICSEARCH" == '1' ] && [ "$ELASTICSEARCH_SERVER" != "<will be defined>" ]; then
+if [ "$OPENSEARCH_SERVER" != "<will be defined>" ]; then
 	MAGENTO_INSTALL_ARGS=$(echo \
-		--elasticsearch-host="$ELASTICSEARCH_SERVER" \
-		--elasticsearch-port="$ELASTICSEARCH_PORT" \
-		--elasticsearch-index-prefix="$ELASTICSEARCH_INDEX_PREFIX" \
-		--elasticsearch-timeout="$ELASTICSEARCH_TIMEOUT")
+	    --search-engine="opensearch" \
+		--opensearch-host="$OPENSEARCH_SERVER" \
+		--opensearch-port="$OPENSEARCH_PORT" \
+		--opensearch-index-prefix="$OPENSEARCH_INDEX_PREFIX" \
+		--opensearch-timeout="$OPENSEARCH_TIMEOUT")
 	RET=1
 	while [ $RET -ne 0 ]; do
-		echo "Checking if $ELASTICSEARCH_SERVER is available."
-		curl -XGET "$ELASTICSEARCH_SERVER:$ELASTICSEARCH_PORT/_cat/health?v&pretty" >/dev/null 2>&1
+		echo "Checking if $OPENSEARCH_SERVER is available."
+		curl -XGET "$OPENSEARCH_SERVER:$OPENSEARCH_PORT/_cat/health?v&pretty" >/dev/null 2>&1
 		RET=$?
 
 		if [ $RET -ne 0 ]; then
-			echo "Connection to Elasticsearch is pending."
+			echo "Connection to OpenSearch is pending."
 			sleep 5
 		fi
 	done
-	echo "Elasticsearch server $ELASTICSEARCH_SERVER is available."
+	echo "OpenSearch server $OPENSEARCH_SERVER is available."
 fi
 
 if [[ -e /tmp/magento.tar.gz ]]; then

.github/workflows/codeql.yml

@@ -1,14 +1,9 @@
 name: "CodeQL"
 
 on:
-  push:
-    branches: [ "develop", "develop-6", "develop-7", "develop-8", "main", "main-6", "main-7", "main-8" ]
   pull_request:
-    branches: [ "develop", "main" ]
     paths-ignore:
-      - 'view/base/web/js/*'
-  schedule:
-    - cron: "6 1 * * 0"
+      - 'view/base/web/js/**'
 
 jobs:
   analyze:

.github/workflows/create-release.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Prepare the next main release
         uses: Adyen/release-automation-action@v1.3.1
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.ADYEN_RELEASE_AUTOMATION_USER_TOKEN }}
           develop-branch: main
           version-files: composer.json
           release-title: Adyen Magento-2 Plugin