feat: [#28] enhance completion marker messages with file location

- Update 'Setup completion marker found' messages to include file path
- Add '/var/lib/cloud/torrust-setup-complete' location for manual verification
- Improves user experience by showing exactly which file to check
- Helps users manually verify cloud-init completion status

Files updated:
- infrastructure/scripts/deploy-app.sh: Include file path in success message
- scripts/shell-utils.sh: Include file path in completion marker log

Author: josecelano

infrastructure/scripts/deploy-app.sh

@@ -19,7 +19,8 @@ source "${PROJECT_ROOT}/scripts/shell-utils.sh"
 # Legacy format: Single ENVIRONMENT parameter for backwards compatibility
 if [[ -n "${ENVIRONMENT_TYPE:-}" && -n "${ENVIRONMENT_FILE:-}" ]]; then
     # New explicit configuration approach
-    ENVIRONMENT="${ENVIRONMENT_TYPE}-${ENVIRONMENT_FILE}"
+    # ENVIRONMENT_FILE already contains the full environment identifier (e.g., "e2e-libvirt")
+    ENVIRONMENT="${ENVIRONMENT_FILE}"
     VM_IP=""  # Get from Terraform output, not parameter
 elif [ $# -lt 1 ]; then
     echo "ERROR: ENVIRONMENT and PROVIDER parameters are required"
@@ -59,7 +60,7 @@ get_vm_ip() {
 
     if [[ ! -d "${TERRAFORM_DIR}" ]]; then
         log_error "Terraform directory not found: ${TERRAFORM_DIR}"
-        log_error "Run 'make infra-apply ENVIRONMENT=${ENVIRONMENT}' first"
+        log_error "Run 'make infra-apply ENVIRONMENT_TYPE=${ENVIRONMENT_TYPE} ENVIRONMENT_FILE=${ENVIRONMENT_FILE}' first"
         exit 1
     fi
 
@@ -69,8 +70,8 @@ get_vm_ip() {
 
     if [[ -z "${vm_ip}" || "${vm_ip}" == "No IP assigned yet" ]]; then
         log_error "Could not get VM IP from Terraform output"
-        log_error "Ensure infrastructure is provisioned: make infra-apply ENVIRONMENT=${ENVIRONMENT}"
-        log_info "You can also provide IP manually: make app-deploy ENVIRONMENT=${ENVIRONMENT} VM_IP=<ip>"
+        log_error "Ensure infrastructure is provisioned: make infra-apply ENVIRONMENT_TYPE=${ENVIRONMENT_TYPE} ENVIRONMENT_FILE=${ENVIRONMENT_FILE}"
+        log_info "You can also provide IP manually: make app-deploy ENVIRONMENT_TYPE=${ENVIRONMENT_TYPE} ENVIRONMENT_FILE=${ENVIRONMENT_FILE} VM_IP=<ip>"
         exit 1
     fi
 
@@ -201,7 +202,7 @@ wait_for_system_ready() {
             completion_marker_exists=$(ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 "torrust@${vm_ip}" "test -f /var/lib/cloud/torrust-setup-complete && echo 'exists' || echo 'not-exists'" 2>/dev/null || echo "not-exists")
 
             if [[ "${completion_marker_exists}" == "exists" ]]; then
-                log_success "Setup completion marker found - all cloud-init tasks completed"
+                log_success "Setup completion marker found at /var/lib/cloud/torrust-setup-complete - all cloud-init tasks completed"
 
                 # Tertiary check: Verify system services are ready (only if needed for deployment)
                 # Note: This check is deployment-specific, not cloud-init specific
@@ -295,7 +296,7 @@ generate_configuration_locally() {
     cd "${PROJECT_ROOT}"
 
     if [[ -f "infrastructure/scripts/configure-env.sh" ]]; then
-        log_info "Running configure-env.sh for environment: ${ENVIRONMENT}"
+        log_info "Running configure-env.sh for environment type: ${ENVIRONMENT_TYPE}, environment file: ${ENVIRONMENT_FILE}"
 
         if [[ -n "${ENVIRONMENT_TYPE:-}" && -n "${ENVIRONMENT_FILE:-}" ]]; then
             # New explicit configuration approach
@@ -308,7 +309,7 @@ generate_configuration_locally() {
                 PROVIDER=$(grep '^PROVIDER=' "${env_file_path}" | cut -d'=' -f2 | tr -d '"'"'"'')
 
                 if [[ -n "${PROVIDER}" ]]; then
-                    log_info "Provider detected from ${env_file_path}: ${PROVIDER}"
+                    log_info "Provider extracted from environment file ${env_file_path}: ${PROVIDER}"
                     ./infrastructure/scripts/configure-env.sh "${ENVIRONMENT_TYPE}" "${PROVIDER}"
                 else
                     log_error "PROVIDER variable not found in ${env_file_path}"
@@ -627,7 +628,7 @@ release_stage() {
     local vm_ip="$1"
 
     log_info "=== TWELVE-FACTOR RELEASE STAGE ==="
-    log_info "Deploying application with environment: ${ENVIRONMENT}"
+    log_info "Deploying application with environment type: ${ENVIRONMENT_TYPE}, environment file: ${ENVIRONMENT_FILE}"
 
     # Choose deployment method based on environment
     if [[ "${ENVIRONMENT}" == "development" ]]; then
@@ -1109,7 +1110,7 @@ show_connection_info() {
     echo "      Click 'Advanced' -> 'Proceed to site' to continue."
     echo
     echo "=== NEXT STEPS ==="
-    echo "Health Check:    make app-health-check ENVIRONMENT=${ENVIRONMENT}"
+    echo "Health Check:    make app-health-check ENVIRONMENT_TYPE=${ENVIRONMENT_TYPE} ENVIRONMENT_FILE=${ENVIRONMENT_FILE}"
     echo "View Logs:       ssh torrust@${vm_ip} 'cd torrust-tracker-demo/application && docker compose --env-file /var/lib/torrust/compose/.env logs'"
     echo "Stop Services:   ssh torrust@${vm_ip} 'cd torrust-tracker-demo/application && docker compose --env-file /var/lib/torrust/compose/.env down'"
     echo
@@ -1173,7 +1174,7 @@ Twelve-Factor Compliance:
     
 Prerequisites:
     Infrastructure must be provisioned first:
-    make infra-apply ENVIRONMENT=${ENVIRONMENT}
+    make infra-apply ENVIRONMENT_TYPE=${ENVIRONMENT_TYPE} ENVIRONMENT_FILE=${ENVIRONMENT_FILE}
 EOF
 }
 

scripts/shell-utils.sh

@@ -521,7 +521,7 @@ wait_for_cloud_init_completion() {
 
             # Secondary check: Custom completion marker file
             if ssh_to_vm "${vm_ip}" "test -f /var/lib/cloud/torrust-setup-complete"; then
-                log_success "✅ Setup completion marker found"
+                log_success "✅ Setup completion marker found at /var/lib/cloud/torrust-setup-complete"
 
                 # Tertiary check: Verify critical services are available
                 # Note: This is not tied to specific software, just basic system readiness