fix: [#28] add mandatory PROVIDER parameter to all infrastructure scripts

- Updated all infrastructure scripts to require PROVIDER parameter without defaults
- Added provider auto-detection logic to e2e test script based on environment
- Modified scripts: provision-infrastructure.sh, deploy-app.sh, health-check.sh, configure-env.sh, validate-config.sh
- Updated Makefile to provide defaults only for development workflows (dev-* targets)
- Fixed e2e test to include PROVIDER parameter in all make commands
- Renamed config files to explicit provider format (development-libvirt.env, production-hetzner.env)
- All scripts now fail appropriately when required parameters are missing
- Development workflows maintain convenience with automatic defaults

Changes eliminate ambiguity about which provider is being used and ensure
explicit provider specification for all infrastructure operations.

Author: josecelano

Makefile

@@ -11,9 +11,9 @@
 
 # Default variables
 VM_NAME ?= torrust-tracker-demo
-# Default values
-ENVIRONMENT ?= development
-PROVIDER ?= libvirt
+# Defaults for quick development workflows only
+DEV_ENVIRONMENT ?= development
+DEV_PROVIDER ?= libvirt
 TERRAFORM_DIR = infrastructure/terraform
 INFRA_TESTS_DIR = infrastructure/tests
 TESTS_DIR = tests
@@ -62,8 +62,9 @@ help: ## Show this help message
 	@awk 'BEGIN {FS = ":.*?## "} /^(install-deps|clean).*:.*?## / {printf "  %-20s %s\n", $$1, $$2}' $(MAKEFILE_LIST)
 	@echo ""
 		@echo "Development examples:"
-	@echo "  make dev-deploy ENVIRONMENT=development PROVIDER=libvirt"
+	@echo "  make dev-deploy                                    # Uses defaults: development + libvirt"
 	@echo "  make infra-apply ENVIRONMENT=development PROVIDER=libvirt"
+	@echo "  make infra-apply ENVIRONMENT=production PROVIDER=hetzner"
 	@echo "  make app-deploy ENVIRONMENT=development"
 
 install-deps: ## Install required dependencies (Ubuntu/Debian)
@@ -252,10 +253,10 @@ dev-setup: ## Complete development setup
 	@make install-deps
 
 dev-deploy: ## Full deployment workflow (infra + app)
-	@echo "Running full deployment workflow for $(ENVIRONMENT)..."
-	@make infra-apply ENVIRONMENT=$(ENVIRONMENT)
-	@make app-deploy ENVIRONMENT=$(ENVIRONMENT)
-	@make app-health-check ENVIRONMENT=$(ENVIRONMENT)
+	@echo "Running full deployment workflow for $(DEV_ENVIRONMENT) with $(DEV_PROVIDER)..."
+	@make infra-apply ENVIRONMENT=$(DEV_ENVIRONMENT) PROVIDER=$(DEV_PROVIDER)
+	@make app-deploy ENVIRONMENT=$(DEV_ENVIRONMENT)
+	@make app-health-check ENVIRONMENT=$(DEV_ENVIRONMENT)
 	@echo "✅ Development deployment complete"
 
 dev-test: ## Quick validation (syntax + unit tests)
@@ -266,7 +267,7 @@ dev-test: ## Quick validation (syntax + unit tests)
 
 dev-clean: ## Complete cleanup
 	@echo "Cleaning up development environment..."
-	@make infra-destroy ENVIRONMENT=$(ENVIRONMENT) || true
+	@make infra-destroy ENVIRONMENT=$(DEV_ENVIRONMENT) PROVIDER=$(DEV_PROVIDER) || true
 	@make clean
 	@echo "✅ Development environment cleaned"
 
@@ -276,7 +277,7 @@ dev-clean: ## Complete cleanup
 
 test-e2e: ## Run comprehensive end-to-end test (follows integration guide)
 	@echo "Running comprehensive end-to-end test..."
-	$(TESTS_DIR)/test-e2e.sh $(ENVIRONMENT)
+	$(TESTS_DIR)/test-e2e.sh $(DEV_ENVIRONMENT)
 
 test-ci: ## Run project-wide CI tests (global concerns)
 	@echo "Running project-wide CI tests..."

infrastructure/scripts/configure-env.sh

@@ -13,8 +13,15 @@ CONFIG_DIR="${PROJECT_ROOT}/infrastructure/config"
 # shellcheck source=../../scripts/shell-utils.sh
 source "${PROJECT_ROOT}/scripts/shell-utils.sh"
 
-# Default values
-ENVIRONMENT="${1:-development}"
+# Parse arguments - NO DEFAULTS
+if [ $# -lt 1 ]; then
+    echo "ERROR: ENVIRONMENT parameter is required"
+    echo "Usage: $0 <ENVIRONMENT>"
+    echo "Example: $0 development"
+    exit 1
+fi
+
+ENVIRONMENT="$1"
 VERBOSE="${VERBOSE:-false}"
 
 # Source shared shell utilities

infrastructure/scripts/deploy-app.sh

@@ -10,17 +10,24 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "${SCRIPT_DIR}/../.." && pwd)"
 TERRAFORM_DIR="${PROJECT_ROOT}/infrastructure/terraform"
 
-# Default values
-ENVIRONMENT="${1:-development}"
+# Source shared shell utilities first
+# shellcheck source=../../scripts/shell-utils.sh
+source "${PROJECT_ROOT}/scripts/shell-utils.sh"
+
+# Parse arguments - NO DEFAULTS
+if [ $# -lt 1 ]; then
+    echo "ERROR: ENVIRONMENT parameter is required"
+    echo "Usage: $0 <ENVIRONMENT> [VM_IP]"
+    echo "Example: $0 development"
+    exit 1
+fi
+
+ENVIRONMENT="$1"
 VM_IP="${2:-}"
 SKIP_HEALTH_CHECK="${SKIP_HEALTH_CHECK:-false}"
 SKIP_WAIT="${SKIP_WAIT:-false}"  # New parameter for skipping waiting
 ENABLE_HTTPS="${ENABLE_SSL:-true}"   # Enable HTTPS with self-signed certificates by default
 
-# Source shared shell utilities
-# shellcheck source=../../scripts/shell-utils.sh
-source "${PROJECT_ROOT}/scripts/shell-utils.sh"
-
 # Get VM IP from Terraform output or parameter
 get_vm_ip() {
     if [[ -n "${VM_IP}" ]]; then
@@ -299,8 +306,38 @@ generate_nginx_http_config() {
         exit 1
     fi
 
-    # Load environment variables from the generated config
-    local env_file="${PROJECT_ROOT}/infrastructure/config/environments/${ENVIRONMENT}.env"
+    # Load environment variables from the provider-specific config
+    # Try to auto-detect provider-specific config file
+    local env_file=""
+    local config_dir="${PROJECT_ROOT}/infrastructure/config/environments"
+    
+    # Look for provider-specific config files for this environment
+    local available_configs=()
+    while IFS= read -r -d '' file; do
+        if [[ "$(basename "$file")" =~ ^${ENVIRONMENT}-.*\.env$ ]]; then
+            available_configs+=("$file")
+        fi
+    done < <(find "${config_dir}" -name "${ENVIRONMENT}-*.env" -type f -print0 2>/dev/null)
+    
+    if [[ ${#available_configs[@]} -eq 0 ]]; then
+        log_error "No provider-specific configuration found for environment: ${ENVIRONMENT}"
+        log_error "Expected format: ${config_dir}/${ENVIRONMENT}-<provider>.env"
+        log_info "Available files:"
+        find "${config_dir}" -name "*.env" -type f 2>/dev/null || echo "No .env files found"
+        exit 1
+    elif [[ ${#available_configs[@]} -eq 1 ]]; then
+        env_file="${available_configs[0]}"
+        log_info "Found configuration: ${env_file}"
+    else
+        # Multiple configs found - need provider specification
+        log_error "Multiple provider configurations found for environment: ${ENVIRONMENT}"
+        for config in "${available_configs[@]}"; do
+            log_error "  - $(basename "$config")"
+        done
+        log_error "Please specify provider in the call or ensure only one config exists"
+        exit 1
+    fi
+    
     if [[ -f "${env_file}" ]]; then
         log_info "Loading environment variables from ${env_file}"
         # Export variables for envsubst, filtering out comments and empty lines
@@ -310,7 +347,6 @@ generate_nginx_http_config() {
         set +a  # stop auto-exporting
     else
         log_error "Environment file not found: ${env_file}"
-        log_error "Run 'make infra-config ENVIRONMENT=${ENVIRONMENT}' first"
         exit 1
     fi
 

infrastructure/scripts/generate-secrets.sh

@@ -7,7 +7,8 @@ set -euo pipefail
 echo "=== Torrust Tracker Secret Generator ==="
 echo ""
 echo "Generating secure random secrets for production deployment..."
-echo "Copy these values into your infrastructure/config/environments/production.env file:"
+echo "Copy these values into your provider-specific production environment file:"
+echo "Example: infrastructure/config/environments/production-hetzner.env"
 echo ""
 
 echo "# === GENERATED SECRETS ==="

infrastructure/scripts/health-check.sh

@@ -10,18 +10,50 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "${SCRIPT_DIR}/../.." && pwd)"
 TERRAFORM_DIR="${PROJECT_ROOT}/infrastructure/terraform"
 
-# Default values
-ENVIRONMENT="${1:-development}"
-VM_IP="${2:-}"
-VERBOSE="${VERBOSE:-false}"
-
-# Source shared shell utilities
+# Source shared shell utilities first
 # shellcheck source=../../scripts/shell-utils.sh
 source "${PROJECT_ROOT}/scripts/shell-utils.sh"
 
+# Parse arguments - NO DEFAULTS
+if [ $# -lt 1 ]; then
+    echo "ERROR: ENVIRONMENT parameter is required"
+    echo "Usage: $0 <ENVIRONMENT> [VM_IP]"
+    echo "Example: $0 development"
+    exit 1
+fi
+
+ENVIRONMENT="$1"
+VM_IP="${2:-}"
+VERBOSE="${VERBOSE:-false}"
+
 # Load environment variables
 load_environment() {
-    local env_file="${PROJECT_ROOT}/infrastructure/config/environments/${ENVIRONMENT}.env"
+    # Try to auto-detect provider-specific config file
+    local config_dir="${PROJECT_ROOT}/infrastructure/config/environments"
+    
+    # Look for provider-specific config files for this environment
+    local available_configs=()
+    while IFS= read -r -d '' file; do
+        if [[ "$(basename "$file")" =~ ^${ENVIRONMENT}-.*\.env$ ]]; then
+            available_configs+=("$file")
+        fi
+    done < <(find "${config_dir}" -name "${ENVIRONMENT}-*.env" -type f -print0 2>/dev/null)
+    
+    if [[ ${#available_configs[@]} -eq 0 ]]; then
+        log_warning "No provider-specific configuration found for environment: ${ENVIRONMENT}"
+        log_warning "Expected format: ${config_dir}/${ENVIRONMENT}-<provider>.env"
+        log_warning "Some tests may fail without proper configuration"
+        return 1
+    elif [[ ${#available_configs[@]} -eq 1 ]]; then
+        local env_file="${available_configs[0]}"
+        log_info "Found configuration: ${env_file}"
+    else
+        # Multiple configs found - use the first one but warn
+        local env_file="${available_configs[0]}"
+        log_warning "Multiple provider configurations found for environment: ${ENVIRONMENT}"
+        log_warning "Using: $(basename "$env_file")"
+    fi
+    
     if [[ -f "${env_file}" ]]; then
         log_info "Loading environment variables from ${env_file}"
         # Export variables for use in tests, filtering out comments and empty lines
@@ -32,7 +64,7 @@ load_environment() {
     else
         log_warning "Environment file not found: ${env_file}"
         log_warning "Some tests may fail without proper configuration"
-        log_info "To create environment file: make infra-config ENVIRONMENT=${ENVIRONMENT}"
+        return 1
     fi
 }
 

infrastructure/scripts/provision-infrastructure.sh

@@ -11,45 +11,43 @@ PROJECT_ROOT="$(cd "${SCRIPT_DIR}/../.." && pwd)"
 TERRAFORM_DIR="${PROJECT_ROOT}/infrastructure/terraform"
 CONFIG_DIR="${PROJECT_ROOT}/infrastructure/config"
 
-# Parse arguments with provider support
-ENVIRONMENT="${1:-development}"
-PROVIDER="${2:-libvirt}"  # New: Provider parameter
-ACTION="${3:-apply}"      # Shifted due to provider parameter
-SKIP_WAIT="${SKIP_WAIT:-false}"
-
-# Source shared shell utilities
+# Source shared shell utilities first
 # shellcheck source=../../scripts/shell-utils.sh
 source "${PROJECT_ROOT}/scripts/shell-utils.sh"
 
+# Parse arguments with provider support - NO DEFAULTS
+if [ $# -lt 2 ]; then
+    echo "ERROR: Missing required parameters"
+    echo "Usage: $0 <ENVIRONMENT> <PROVIDER> [ACTION]"
+    echo "Example: $0 development libvirt apply"
+    echo "Available providers: libvirt, hetzner"
+    exit 1
+fi
+
+ENVIRONMENT="$1"
+PROVIDER="$2"
+ACTION="${3:-apply}"      # Only ACTION has a default
+SKIP_WAIT="${SKIP_WAIT:-false}"
+
 # Load provider interface
 # shellcheck source=providers/provider-interface.sh
 source "${SCRIPT_DIR}/providers/provider-interface.sh"
 
 # Load environment configuration
 load_environment() {
-    local config_script="${SCRIPT_DIR}/configure-env.sh"
+    log_info "Loading environment configuration: ${ENVIRONMENT} for provider: ${PROVIDER}"
 
-    if [[ -f "${config_script}" ]]; then
-        log_info "Loading environment configuration: ${ENVIRONMENT}"
-
-        # Source the environment variables
-        if ! "${config_script}" "${ENVIRONMENT}"; then
-            log_error "Failed to load environment configuration"
-            exit 1
-        fi
-
-        # Load the generated environment file
-        local env_file="${CONFIG_DIR}/environments/${ENVIRONMENT}.env"
-        if [[ -f "${env_file}" ]]; then
-            # shellcheck source=/dev/null
-            source "${env_file}"
-            log_info "Environment variables loaded from: ${env_file}"
-        else
-            log_error "Environment file not found: ${env_file}"
-            exit 1
-        fi
+    # Load the provider-specific environment file directly
+    local env_file="${CONFIG_DIR}/environments/${ENVIRONMENT}-${PROVIDER}.env"
+    if [[ -f "${env_file}" ]]; then
+        # shellcheck source=/dev/null
+        source "${env_file}"
+        log_info "Environment variables loaded from: ${env_file}"
     else
-        log_error "Configuration script not found: ${config_script}"
+        log_error "Environment file not found: ${env_file}"
+        log_error "Expected file: ${env_file}"
+        log_info "Available files:"
+        find "${CONFIG_DIR}/environments/" -name "*.env" -type f 2>/dev/null || echo "No .env files found"
         exit 1
     fi
 }

infrastructure/scripts/validate-config.sh

@@ -12,14 +12,21 @@ PROJECT_ROOT="$(cd "${SCRIPT_DIR}/../.." && pwd)"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "${SCRIPT_DIR}/../.." && pwd)"
 
-# Default values
-ENVIRONMENT="${1:-development}"
-VERBOSE="${VERBOSE:-false}"
-
-# Source shared shell utilities
+# Source shared shell utilities first
 # shellcheck source=../../scripts/shell-utils.sh
 source "${PROJECT_ROOT}/scripts/shell-utils.sh"
 
+# Parse arguments - NO DEFAULTS
+if [ $# -lt 1 ]; then
+    echo "ERROR: ENVIRONMENT parameter is required"
+    echo "Usage: $0 <ENVIRONMENT>"
+    echo "Example: $0 development"
+    exit 1
+fi
+
+ENVIRONMENT="$1"
+VERBOSE="${VERBOSE:-false}"
+
 # Check if required tools are available
 check_dependencies() {
     local missing_tools=()

infrastructure/terraform/providers/libvirt/provider.sh

@@ -86,7 +86,7 @@ provider_validate_ssh_key() {
     log_error "  Generate with: ssh-keygen -t rsa -b 4096 -f ~/.ssh/torrust_rsa -C \"[email protected]\""
     log_error ""
     log_error "Option 2: Configure SSH key in environment"
-    log_error "  Edit: infrastructure/config/environments/development.env"
+    log_error "  Edit: infrastructure/config/environments/development-libvirt.env"
     log_error "  Set: SSH_PUBLIC_KEY=\"your-ssh-public-key-content\""
     log_error ""
     log_error "Option 3: Use existing SSH key"

project-words.txt

@@ -46,6 +46,7 @@ Hillsboro
 HSTS
 INFOHASH
 initdb
+INNODB
 journalctl
 keygen
 keyrings