fix: [#28] improve environment variable handling and terminology clarity

Environment Variable Construction Fixes:
- Fix ENVIRONMENT variable construction in health-check.sh
- Change from ${ENVIRONMENT_TYPE}-${ENVIRONMENT_FILE} to ${ENVIRONMENT_FILE}
- ENVIRONMENT_FILE already contains full identifier (e.g., 'e2e-libvirt')
- Prevents problematic patterns like 'e2e-e2e-libvirt'

Command Suggestion Updates:
- Update make command suggestions to use new ENVIRONMENT_TYPE/ENVIRONMENT_FILE format
- Replace legacy ENVIRONMENT= format in error messages and help text
- Provide clear guidance for infrastructure and application commands

Terminology Improvements:
- Change 'Environment:' to 'Environment type:' for clarity in logs
- Update Makefile help text to be more descriptive
- Improve user understanding of environment configuration structure

Files updated:
- Makefile: Update app-health-check help text for clarity
- infrastructure/scripts/configure-env.sh: Improve logging terminology
- infrastructure/scripts/health-check.sh: Fix environment variable construction and command suggestions

Author: josecelano

Makefile

@@ -271,7 +271,7 @@ app-redeploy: ## Redeploy application without infrastructure changes
 	ENVIRONMENT_TYPE=$(ENVIRONMENT_TYPE) ENVIRONMENT_FILE=$(ENVIRONMENT_FILE) $(SCRIPTS_DIR)/deploy-app.sh $(ENVIRONMENT_TYPE)-$(ENVIRONMENT_FILE)
 
 app-health-check: ## Validate deployment health
-	@echo "Running health check for $(ENVIRONMENT_TYPE)-$(ENVIRONMENT_FILE)..."
+	@echo "Running health check for environment type: $(ENVIRONMENT_TYPE), environment file: $(ENVIRONMENT_FILE)..."
 	ENVIRONMENT_TYPE=$(ENVIRONMENT_TYPE) ENVIRONMENT_FILE=$(ENVIRONMENT_FILE) $(SCRIPTS_DIR)/health-check.sh $(ENVIRONMENT_TYPE)-$(ENVIRONMENT_FILE)
 
 app-test-config: ## Test application configuration

infrastructure/scripts/configure-env.sh

@@ -90,7 +90,7 @@ generate_environment_config() {
     fi
 
     log_info "Generating ${output_name}.env from base template..."
-    log_info "Environment: ${environment}, Provider: ${provider}"
+    log_info "Environment type: ${environment}, Provider: ${provider}"
 
     # Generate environment-specific variables
     case "${environment}" in
@@ -510,7 +510,7 @@ generate_docker_env() {
 
 # Main execution
 main() {
-    log_info "Starting configuration generation for environment: ${ENVIRONMENT} with provider: ${PROVIDER}"
+    log_info "Starting configuration generation for environment type: ${ENVIRONMENT} with provider: ${PROVIDER}"
 
     # Validate inputs
     validate_environment_type "${ENVIRONMENT}"

infrastructure/scripts/health-check.sh

@@ -17,7 +17,8 @@ source "${PROJECT_ROOT}/scripts/shell-utils.sh"
 # Parse arguments - Support both new and legacy parameter formats
 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, not parameter
 elif [ $# -lt 1 ]; then
     echo "ERROR: Environment argument required"
@@ -125,7 +126,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
 
@@ -382,7 +383,7 @@ generate_health_report() {
         echo "=== TROUBLESHOOTING SUGGESTIONS ==="
         echo "1. Check service logs: ssh torrust@${vm_ip} 'cd torrust-tracker-demo/application && docker compose logs'"
         echo "2. Restart services: ssh torrust@${vm_ip} 'cd torrust-tracker-demo/application && docker compose restart'"
-        echo "3. Redeploy application: make app-deploy ENVIRONMENT=${ENVIRONMENT}"
+        echo "3. Redeploy application: make app-deploy ENVIRONMENT_TYPE=${ENVIRONMENT_TYPE} ENVIRONMENT_FILE=${ENVIRONMENT_FILE}"
         echo
         return 1
     fi
@@ -446,7 +447,7 @@ Health Checks Performed:
 
 Prerequisites:
     Application must be deployed first:
-    make app-deploy ENVIRONMENT=${ENVIRONMENT}
+    make app-deploy ENVIRONMENT_TYPE=${ENVIRONMENT_TYPE} ENVIRONMENT_FILE=${ENVIRONMENT_FILE}
 EOF
 }