Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tools install script PoC #284

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -223,3 +223,4 @@ $RECYCLE.BIN/
dist/
**/aem/home/
!pkg/instance/resource
/var
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ Supported project types:
Run command below to install the AEM Compose tool in your project:

```shell
curl https://raw.githubusercontent.com/wttech/aemc/main/project-install.sh | sh
curl https://raw.githubusercontent.com/wttech/aemc/main/scripts/project-install.sh | sh
```

After successful installation, remember to always use the tool via wrapper script in the following way:
Expand Down
2 changes: 2 additions & 0 deletions examples/docker/src/local.env
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# Variables shared to both AEM Compose and Task tool

AEM_AUTHOR_ACTIVE=true
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove these flags added

AEM_AUTHOR_USER=admin
AEM_AUTHOR_PASSWORD=admin
AEM_AUTHOR_HTTP_URL=http://localhost:4502
AEM_AUTHOR_DEBUG_ADDR=0.0.0.0:14502

AEM_PUBLISH_ACTIVE=true
AEM_PUBLISH_USER=admin
AEM_PUBLISH_PASSWORD=admin
AEM_PUBLISH_HTTP_URL=http://localhost:4503
Expand Down
2 changes: 2 additions & 0 deletions pkg/project/app_classic/local.env
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# Variables shared to both AEM Compose and Task tool

AEM_AUTHOR_ACTIVE=true
AEM_AUTHOR_USER=admin
AEM_AUTHOR_PASSWORD=admin
AEM_AUTHOR_HTTP_URL=http://localhost:4502
AEM_AUTHOR_DEBUG_ADDR=0.0.0.0:14502

AEM_PUBLISH_ACTIVE=true
AEM_PUBLISH_USER=admin
AEM_PUBLISH_PASSWORD=admin
AEM_PUBLISH_HTTP_URL=http://localhost:4503
Expand Down
1 change: 0 additions & 1 deletion pkg/project/app_cloud/Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ tasks:
desc: tail logs of AEM publish instance
cmd: tail -f aem/home/var/instance/publish/crx-quickstart/logs/{stdout,error}.log


aem:provision:
desc: provision AEM instances by installing packages and applying configurations
aliases: [ aem:configure ]
Expand Down
2 changes: 2 additions & 0 deletions pkg/project/app_cloud/local.env
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# Variables shared to both AEM Compose and Task tool

AEM_AUTHOR_ACTIVE=true
AEM_AUTHOR_USER=admin
AEM_AUTHOR_PASSWORD=admin
AEM_AUTHOR_HTTP_URL=http://localhost:4502
AEM_AUTHOR_DEBUG_ADDR=0.0.0.0:14502

AEM_PUBLISH_ACTIVE=true
AEM_PUBLISH_USER=admin
AEM_PUBLISH_PASSWORD=admin
AEM_PUBLISH_HTTP_URL=http://localhost:4503
Expand Down
3 changes: 2 additions & 1 deletion pkg/project/common/aemw
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,5 @@ export MSYS2_ENV_CONV_EXCL="*"
# Execute AEM Compose CLI
# =======================

aem "$@"
AEM=$(whereis aem | awk '{print $2}')
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In tf aemc this is run without issues. In vscode ext it also is doable to run it without amendment. Please revert this

${AEM} "$@"
2 changes: 2 additions & 0 deletions pkg/project/instance/local.env
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# Variables shared to both AEM Compose and Task tool

AEM_AUTHOR_ACTIVE=true
AEM_AUTHOR_USER=admin
AEM_AUTHOR_PASSWORD=admin
AEM_AUTHOR_HTTP_URL=http://localhost:4502
AEM_AUTHOR_DEBUG_ADDR=0.0.0.0:14502

AEM_PUBLISH_ACTIVE=true
AEM_PUBLISH_USER=admin
AEM_PUBLISH_PASSWORD=admin
AEM_PUBLISH_HTTP_URL=http://localhost:4503
Expand Down
File renamed without changes.
176 changes: 176 additions & 0 deletions scripts/tools-install-idea.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
# Check if Taskfile.yml exists
if [ ! -f "Taskfile.yml" ]; then
echo "Taskfile.yml not found in the current directory."
exit 1
fi

# Define content to be appended to 'Taskfile.yml'
TASKS_YML_CONTENT=$(cat <<'EOF'

groovy:execute:
desc: execute Groovy script on AEM instance
cmd: |
INSTANCE="{{.CLI_ARGS | splitArgs | first }}"
if [ "$INSTANCE" = "author" ]; then
INSTANCE_URL="{{.AEM_AUTHOR_HTTP_URL}}"
INSTANCE_CREDENTIALS="{{.AEM_AUTHOR_USER}}:{{.AEM_AUTHOR_PASSWORD}}"
elif [ "$INSTANCE" = "publish" ]; then
INSTANCE_URL="{{.AEM_PUBLISH_HTTP_URL}}"
INSTANCE_CREDENTIALS="{{.AEM_PUBLISH_USER}}:{{.AEM_PUBLISH_PASSWORD}}"
else
echo "Instance type supported are 'author' or 'publish' but got '$INSTANCE'"
exit 1
fi

SCRIPT="{{.CLI_ARGS | splitArgs | last }}"
if [[ ! -f "${SCRIPT}" ]] || [[ "${SCRIPT: -7}" != ".groovy" ]]; then
echo "Groovy script not found or the file is not a Groovy script: '${SCRIPT}'"
exit 1
fi

RESPONSE=$(curl -u "${INSTANCE_CREDENTIALS}" -k -F "script=@${SCRIPT}" -X POST "${INSTANCE_URL}/bin/groovyconsole/post.json")
EXCEPTION=$(echo "$RESPONSE" | jq -r '.exceptionStackTrace')
if [[ $EXCEPTION != "" ]]; then
echo ""
echo "Groovy script exception:"
echo -e "${EXCEPTION}"
echo ""
fi
echo ""
echo "Groovy script output:"
OUTPUT=$(echo "${RESPONSE}" | jq -r '.output')
echo -e "${OUTPUT}"
echo ""

crxde:open:
desc: open CRX/DE on AEM instance
cmd: |
INSTANCE="{{.CLI_ARGS | splitArgs | first }}"
if [ "$INSTANCE" = "author" ]; then
INSTANCE_URL="{{.AEM_AUTHOR_HTTP_URL}}"
elif [ "$INSTANCE" = "publish" ]; then
INSTANCE_URL="{{.AEM_PUBLISH_HTTP_URL}}"
else
echo "Instance type supported are 'author' or 'publish' but got '$INSTANCE'"
exit 1
fi

FILE_PATH="{{.CLI_ARGS | splitArgs | last }}"
if [ ! -e "$FILE_PATH" ]; then
echo "File not found: $FILE_PATH"
exit 1
fi
if [[ "$FILE_PATH" != *"/jcr_root/"* ]]; then
echo "Path must contain '/jcr_root/' but got '$FILE_PATH'"
exit 1
fi
FILE_PATH="${FILE_PATH/.content.xml/jcr:content}"
FILE_PATH="${FILE_PATH%.xml}"
REPO_PATH="${FILE_PATH#*jcr_root}"
REPO_PATH=$(echo "$REPO_PATH" | sed 's/ /%20/g; s/:/%3A/g')

CRXDE_URL="${INSTANCE_URL}/crx/de#${REPO_PATH}"
if [ "{{OS}}" = "windows" ]; then
start "" "$CRXDE_URL"
elif [ "{{OS}}" = "darwin" ]; then
open "$CRXDE_URL"
else
xdg-open "$CRXDE_URL"
fi
EOF
)

# Define IDEA's 'tools/AEMC.xml' content
AEMC_XML_CONTENT=$(cat <<'EOF'
<toolSet name="AEMC">
<tool name="Content Clean" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
<exec>
<option name="COMMAND" value="$ProjectFileDir$/aemw" />
<option name="PARAMETERS" value="content clean --path $FilePath$" />
<option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
</exec>
</tool>
<tool name="Content Pull [author]" description="Content Pull [author]" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
<exec>
<option name="COMMAND" value="$ProjectFileDir$/aemw" />
<option name="PARAMETERS" value="content pull -A --path $FilePath$ --clean" />
<option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
</exec>
</tool>
<tool name="Content Pull [publish]" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
<exec>
<option name="COMMAND" value="$ProjectFileDir$/aemw" />
<option name="PARAMETERS" value="content pull -P --path $FilePath$ --clean" />
<option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
</exec>
</tool>
<tool name="Content Push [author]" description="Content Push [author]" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
<exec>
<option name="COMMAND" value="$ProjectFileDir$/aemw" />
<option name="PARAMETERS" value="content push -A --path $FilePath$" />
<option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
</exec>
</tool>
<tool name="Content Push [publish]" description="Content Push [publish]" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
<exec>
<option name="COMMAND" value="$ProjectFileDir$/aemw" />
<option name="PARAMETERS" value="content push -P --path $FilePath$" />
<option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
</exec>
</tool>
<tool name="CRXDE Open [author]" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
<exec>
<option name="COMMAND" value="$ProjectFileDir$/taskw" />
<option name="PARAMETERS" value="crxde:open -- author $FilePath$" />
<option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
</exec>
</tool>
<tool name="CRXDE Open [publish]" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
<exec>
<option name="COMMAND" value="$ProjectFileDir$/taskw" />
<option name="PARAMETERS" value="crxde:open -- publish $FilePath$" />
<option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
</exec>
</tool>
<tool name="Groovy Console [author]" description="Run currently opened Groovy Script in editor on author instance" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
<exec>
<option name="COMMAND" value="$ProjectFileDir$/taskw" />
<option name="PARAMETERS" value="groovy:execute -- author $FilePath$" />
<option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
</exec>
</tool>
<tool name="Groovy Console [publish]" description="Run currently opened Groovy Script in editor on publish instance" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
<exec>
<option name="COMMAND" value="$ProjectFileDir$/taskw" />
<option name="PARAMETERS" value="groovy:execute -- publish $FilePath$" />
<option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
</exec>
</tool>
</toolSet>
EOF
)

# Function to create 'tools/AEMC.xml' in IntelliJ installations
create_aemc_xml() {
local intellij_dirs=(
"$HOME/Library/Application Support/JetBrains/IntelliJIdea"*/tools
)

for dir in "${intellij_dirs[@]}"; do
if [ -d "$dir" ]; then
local aem_file="$dir/AEMC.xml"
echo "Creating AEMC.xml in $aem_file"
echo "$AEMC_XML_CONTENT" > "$aem_file"
fi
done
}

# Create AEMC.xml in IntelliJ installations
create_aemc_xml

# Append tasks.yml content to Taskfile.yml
echo "Appending tasks.yml content to Taskfile.yml"
echo "$TASKS_YML_CONTENT" >> "Taskfile.yml"

echo "Script execution completed."
echo "Please restart IntelliJ IDEA to see the changes."
Loading