From d08cedf73ba47148e074dce4a9c995236ded18f2 Mon Sep 17 00:00:00 2001
From: Sanne Raymaekers <sanne.raymaekers@gmail.com>
Date: Fri, 14 Mar 2025 12:08:16 +0100
Subject: [PATCH] test/cases/api: add modules

---
 test/cases/api.sh               | 16 ++++++++++++++++
 test/cases/api/aws.sh           |  3 ++-
 test/cases/api/azure.sh         |  3 ++-
 test/cases/api/common/common.sh |  7 +++++++
 test/cases/api/gcp.sh           |  3 ++-
 test/cases/api/oci.sh           |  3 ++-
 6 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/test/cases/api.sh b/test/cases/api.sh
index 072431a89..77f5dfb0b 100755
--- a/test/cases/api.sh
+++ b/test/cases/api.sh
@@ -529,6 +529,22 @@ fi
 export EXTRA_PAYLOAD_REPOS_BLOCK
 export EXTRA_PACKAGES_BLOCK
 
+ENABLED_MODULES_BLOCK=
+# Only test modularity on rhel 8 and 9
+if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} -lt 10 ]]; then
+  ENABLED_MODULES_BLOCK=$(cat <<EndOfMessage
+,
+    "enabled_modules": [
+      {
+        "name": "nodejs",
+        "stream" :"20"
+      }
+    ]
+EndOfMessage
+)
+fi
+export ENABLED_MODULES_BLOCK
+
 # generate a temp key for user tests
 ssh-keygen -t rsa-sha2-512 -f "${WORKDIR}/usertest" -C "usertest" -N ""
 
diff --git a/test/cases/api/aws.sh b/test/cases/api/aws.sh
index d8f7d9a39..e8ff365ca 100644
--- a/test/cases/api/aws.sh
+++ b/test/cases/api/aws.sh
@@ -50,6 +50,7 @@ function createReqFile() {
       }${EXTRA_PAYLOAD_REPOS_BLOCK}
     ],
     "packages": [
+      "nodejs",
       "postgresql",
       "dummy"${EXTRA_PACKAGES_BLOCK}
     ],
@@ -64,7 +65,7 @@ function createReqFile() {
         "key": "$(cat "${WORKDIR}/usertest.pub")"
       }
     ]${SUBSCRIPTION_BLOCK}${DIR_FILES_CUSTOMIZATION_BLOCK}${REPOSITORY_CUSTOMIZATION_BLOCK}${OPENSCAP_CUSTOMIZATION_BLOCK}
-${TIMEZONE_CUSTOMIZATION_BLOCK}${RPM_CUSTOMIZATION_BLOCK}${RHSM_CUSTOMIZATION_BLOCK}${CACERTS_CUSTOMIZATION_BLOCK}
+${TIMEZONE_CUSTOMIZATION_BLOCK}${RPM_CUSTOMIZATION_BLOCK}${RHSM_CUSTOMIZATION_BLOCK}${CACERTS_CUSTOMIZATION_BLOCK}${ENABLED_MODULES_BLOCK}
   },
   "image_request": {
       "architecture": "$ARCH",
diff --git a/test/cases/api/azure.sh b/test/cases/api/azure.sh
index baea1cc62..b18a751b5 100644
--- a/test/cases/api/azure.sh
+++ b/test/cases/api/azure.sh
@@ -82,10 +82,11 @@ function createReqFile() {
       }
     ],
     "packages": [
+      "nodejs",
       "postgresql",
       "dummy"
     ]${SUBSCRIPTION_BLOCK}${DIR_FILES_CUSTOMIZATION_BLOCK}${REPOSITORY_CUSTOMIZATION_BLOCK}${OPENSCAP_CUSTOMIZATION_BLOCK}
-${TIMEZONE_CUSTOMIZATION_BLOCK}${FIREWALL_CUSTOMIZATION_BLOCK}${RPM_CUSTOMIZATION_BLOCK}${RHSM_CUSTOMIZATION_BLOCK}${CACERTS_CUSTOMIZATION_BLOCK}
+${TIMEZONE_CUSTOMIZATION_BLOCK}${FIREWALL_CUSTOMIZATION_BLOCK}${RPM_CUSTOMIZATION_BLOCK}${RHSM_CUSTOMIZATION_BLOCK}${CACERTS_CUSTOMIZATION_BLOCK}${ENABLED_MODULES_BLOCK}
   },
   "image_request": {
     "architecture": "$ARCH",
diff --git a/test/cases/api/common/common.sh b/test/cases/api/common/common.sh
index 29cd4ab0f..f0d173151 100644
--- a/test/cases/api/common/common.sh
+++ b/test/cases/api/common/common.sh
@@ -37,6 +37,13 @@ function _instanceCheck() {
   # Check if postgres is installed
   $_ssh rpm -q postgresql dummy
 
+
+  MODULE=$(cat "$REQUEST_FILE" | jq -r .customizations.enabled_modules[0])
+  if [ "$MODULE" = "nodejs:20" ]; then
+      echo "checking if nodejs 20 is installed: $($_ssh rpm -q nodejs)"
+      $_ssh rpm -q nodejs | grep -q nodejs-20
+  fi
+
   # Verify subscribe status. Loop check since the system may not be registered such early(RHEL only)
   if [[ "$ID" == "rhel" ]]; then
     set +eu
diff --git a/test/cases/api/gcp.sh b/test/cases/api/gcp.sh
index 07cb3a986..3fc1be4e0 100644
--- a/test/cases/api/gcp.sh
+++ b/test/cases/api/gcp.sh
@@ -69,10 +69,11 @@ function createReqFile() {
       }
     ],
     "packages": [
+      "nodejs",
       "postgresql",
       "dummy"
     ]${SUBSCRIPTION_BLOCK}${DIR_FILES_CUSTOMIZATION_BLOCK}${REPOSITORY_CUSTOMIZATION_BLOCK}${OPENSCAP_CUSTOMIZATION_BLOCK}
-${TIMEZONE_CUSTOMIZATION_BLOCK}${FIREWALL_CUSTOMIZATION_BLOCK}${RPM_CUSTOMIZATION_BLOCK}${RHSM_CUSTOMIZATION_BLOCK}${CACERTS_CUSTOMIZATION_BLOCK}
+${TIMEZONE_CUSTOMIZATION_BLOCK}${FIREWALL_CUSTOMIZATION_BLOCK}${RPM_CUSTOMIZATION_BLOCK}${RHSM_CUSTOMIZATION_BLOCK}${CACERTS_CUSTOMIZATION_BLOCK}${ENABLED_MODULES_BLOCK}
   },
   "image_request": {
     "architecture": "$ARCH",
diff --git a/test/cases/api/oci.sh b/test/cases/api/oci.sh
index 870de570f..432c48cf8 100644
--- a/test/cases/api/oci.sh
+++ b/test/cases/api/oci.sh
@@ -74,10 +74,11 @@ function createReqFile() {
       }
     ],
     "packages": [
+      "nodejs",
       "postgresql",
       "dummy"
     ]${SUBSCRIPTION_BLOCK}${DIR_FILES_CUSTOMIZATION_BLOCK}${REPOSITORY_CUSTOMIZATION_BLOCK}${OPENSCAP_CUSTOMIZATION_BLOCK}
-${TIMEZONE_CUSTOMIZATION_BLOCK}${CACERTS_CUSTOMIZATION_BLOCK}
+${TIMEZONE_CUSTOMIZATION_BLOCK}${CACERTS_CUSTOMIZATION_BLOCK}${ENABLED_MODULES_BLOCK}
   },
   "image_request": {
       "architecture": "$ARCH",