Merge pull request #9 from juan-ayala/feature/aem-sdk-change-sdks-dir

[aem-sdk] change sdks dir

src/aem-sdk/bin/_globals.sh

@@ -19,22 +19,26 @@ function get_runmode_jar()
     echo "aem-${runmode}-p${port}.jar"
 }
 
-function get_sdk_directory()
+function get_aem_sdk_zip()
 {
-    local directory="$(pwd)/${AEM_SDK_SDKS_DIRECTORY}"
-    if [ -d ${directory} ]; then
-        echo ${directory}
-    else
-        echo "$(pwd)/.devcontainer"
+    local sdks_dir="${AEM_SDK_SDKS_DIRECTORY}"
+    if [ ! -d ${sdks_dir} ]; then
+        sdks_dir="$(pwd)"
     fi
-}
 
-function get_aem_sdk_zip()
-{
-    local sdks_dir=$(get_sdk_directory)
+    local sdk="${sdks_dir}/aem-sdk-${AEM_SDK_VERSION}.zip"
     if [ "${AEM_SDK_VERSION}" = "automatic" ]; then
-        echo "$(find ${sdks_dir}/aem-sdk-*.zip -maxdepth 0 -type f | sort -V | tail -n1)"
+        sdk="$(find ${sdks_dir}/aem-sdk-*.zip -maxdepth 0 -type f | sort -V | tail -n1)"        
+    fi
+
+    if [ ! -f "${sdk}" ]; then
+        cat <<EOM
+No AEM SDK found.
+Search Path: ${sdks_dir}
+Search Version: ${AEM_SDK_VERSION}
+EOM
+        exit 1
     else
-        echo "${sdks_dir}/aem-sdk-${AEM_SDK_VERSION}.zip"
+        echo "${sdk}"
     fi
 }

src/aem-sdk/bin/aem-sdk-setup-dispatcher.sh

@@ -4,7 +4,6 @@ source "$(dirname $0)/_globals.sh"
 
 # extract the dispatcher install script
 sdkzip=$(get_aem_sdk_zip)
-[ -z ${sdkzip} ] && exit
 
 sudo unzip -d ${AEM_SDK_FEATURE_DIR} ${sdkzip} 'aem-sdk-dispatcher-tools-*-unix.sh'
 installscript="$(find ${AEM_SDK_FEATURE_DIR}/aem-sdk-dispatcher-tools-*-unix.sh -maxdepth 0 -type f | tail -n1)"

src/aem-sdk/bin/aem-sdk-setup-service.sh

@@ -7,7 +7,6 @@ runmode="${1}"
 
 # extract and rename the quickstart jar
 sdkzip=$(get_aem_sdk_zip)
-[ -z ${sdkzip} ] && exit
 
 runmodedir="${AEM_SDK_FEATURE_DIR}/${runmode}"
 sudo unzip -d ${runmodedir} ${sdkzip} 'aem-sdk-quickstart-*.jar'

src/aem-sdk/bin/enable-replication.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+source "$(dirname $0)/_globals.sh"
+
+curl -u admin:admin --output /dev/null --silent \
+     -X POST \
+     -F enabled='true' \
+     -F userId='' \
+     -F transportUri="http://localhost:${AEM_SDK_PUBLISH_PORT}/bin/receive?sling:authRequestLogin=1" \
+     -F transportUser='admin' \
+     -F transportPassword='admin' \
+     http://localhost:${AEM_SDK_AUTHOR_PORT}/etc/replication/agents.author/publish/jcr:content
+
+curl -u admin:admin \
+     -X GET \
+     http://localhost:${AEM_SDK_AUTHOR_PORT}/etc/replication/agents.author/publish.test.html

src/aem-sdk/devcontainer-feature.json

@@ -1,13 +1,13 @@
 {
     "id": "aem-sdk",
-    "version": "1.1.1",
+    "version": "1.2.0",
     "name": "Adobe Experience Manager SDK",
     "description": "Setup author and publish services. And the dispatcher tools. Requires the AEM as a Cloud Service SDK.",
     "options": {
         "sdksDirectory": {
             "type": "string",
-            "description": "Path to directory that contains one or more SDKs. This should be relative to the container workspace folder.",
-            "default": ".devcontainer"
+            "description": "Path to directory that contains one or more SDKs.",
+            "default": ""
         },
         "sdkVersion": {
             "type": "string",

src/aem-sdk/install.sh

@@ -5,8 +5,8 @@ mkdir -p ${AEM_SDK_FEATURE_DIR}
 
 # save feature properties
 propertiesFile="${AEM_SDK_FEATURE_DIR}/options.sh"
+echo "AEM_SDK_SDKS_DIRECTORY=\"${SDKSDIRECTORY}\"" >> ${propertiesFile}
 echo "AEM_SDK_VERSION=\"${SDKVERSION:-'automatic'}\"" >> ${propertiesFile}
-echo "AEM_SDK_SDKS_DIRECTORY=\"${SDKSDIRECTORY:-'.devcontainer'}\"" >> ${propertiesFile}
 echo "AEM_SDK_AUTHOR_PORT=\"${AUTHORPORT:-'4502'}\"" >> ${propertiesFile}
 echo "AEM_SDK_PUBLISH_PORT=\"${PUBLISHPORT:-'4503'}\"" >> ${propertiesFile}
 echo "AEM_SDK_DISPATCHER_PORT=\"${DISPATCHERPORT:-'8080'}\"" >> ${propertiesFile}

test/aem-sdk/defaults-with-sdk.sh

@@ -6,10 +6,10 @@ source dev-container-features-test-lib
 
 # Check options file created with defaults
 source ${AEM_SDK_FEATURE_DIR}/options.sh
+check "sdks directory default" \
+    echo "${AEM_SDK_SDKS_DIRECTORY}" | grep -E "^/workspaces/[0-9]+/.devcontainer$"
 check "sdk version default" \
     [ "${AEM_SDK_VERSION}" = "automatic" ]
-check "sdks directory default" \
-    [ "${AEM_SDK_SDKS_DIRECTORY}" = ".devcontainer" ]
 check "author port default" \
     [ "${AEM_SDK_AUTHOR_PORT}" = "4502" ]
 check "publish port default" \

test/aem-sdk/options-with-sdk.sh

@@ -6,10 +6,10 @@ source dev-container-features-test-lib
 
 # Check options file created with defaults
 source ${AEM_SDK_FEATURE_DIR}/options.sh
+check "sdks directory default" \
+    echo "${AEM_SDK_SDKS_DIRECTORY}" | grep -E "^/workspaces/[0-9]+/.devcontainer/sdksfolder$"
 check "sdk version default" \
     [ "${AEM_SDK_VERSION}" = "mock-2024.02.01" ]
-check "sdks directory default" \
-    [ "${AEM_SDK_SDKS_DIRECTORY}" = ".devcontainer/sdksfolder" ]
 check "author port default" \
     [ "${AEM_SDK_AUTHOR_PORT}" = "3001" ]
 check "publish port default" \

test/aem-sdk/scenarios.json

@@ -3,15 +3,17 @@
         "image": "mcr.microsoft.com/devcontainers/base:debian",
         "features": {
             "ghcr.io/devcontainers/features/java:1": {},
-            "aem-sdk": {}
+            "aem-sdk": {
+                "sdksDirectory": "${containerWorkspaceFolder}/.devcontainer"
+            }
         }
     },
     "options-with-sdk": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
         "features": {
             "ghcr.io/devcontainers/features/java:1": {},
             "aem-sdk": {
-                "sdksDirectory": ".devcontainer/sdksfolder",
+                "sdksDirectory": "${containerWorkspaceFolder}/.devcontainer/sdksfolder",
                 "sdkVersion": "mock-2024.02.01",
                 "authorPort": "3001",
                 "publishPort": "3002",

test/aem-sdk/test.sh

@@ -18,10 +18,10 @@ source dev-container-features-test-lib
 
 # Check options file created with defaults
 source ${AEM_SDK_FEATURE_DIR}/options.sh
+check "sdks directory default" \
+    [ -z "${AEM_SDK_SDKS_DIRECTORY}" ]
 check "sdk version default" \
     [ "${AEM_SDK_VERSION}" = "automatic" ]
-check "sdks directory default" \
-    [ "${AEM_SDK_SDKS_DIRECTORY}" = ".devcontainer" ]
 check "author port default" \
     [ "${AEM_SDK_AUTHOR_PORT}" = "4502" ]
 check "publish port default" \