Some cleanup.

Author: pantierra

scripts/lib/common.sh

@@ -225,10 +225,7 @@ preflight_test() {
             validate_tools kubectl python3 || return 1
             validate_cluster || return 1
             ;;
-        observability)
-            validate_tools kubectl python3 || return 1
-            validate_cluster || return 1
-            ;;
+
         *)
             log_error "Unknown test type: $test_type"
             return 1

scripts/test.sh

@@ -23,76 +23,31 @@ fi
 # Show help message
 show_help() {
     cat << EOF
-eoAPI Test Suite - Helm and Integration Testing
+eoAPI Test Suite - Combined Helm and Integration Testing
 
 USAGE: $(basename "$0") [COMMAND] [OPTIONS]
 
 COMMANDS:
-    helm              Run Helm tests (lint, unit tests, template validation)
+    helm              Run Helm tests (lint, template validation)
     integration       Run integration tests (requires deployed eoAPI)
     all               Run both Helm and integration tests [default]
-    check-deps        Check and install dependencies only
-    check-deployment  Check eoAPI deployment status only
-
+    check-deps        Check dependencies only
+    check-deployment  Debug deployment state
 OPTIONS:
-    --debug           Enable debug mode with enhanced logging and diagnostics
-    --help, -h        Show this help message
-
-DESCRIPTION:
-    This script provides comprehensive testing for eoAPI:
-
-    Helm Tests:
-    - Chart linting with strict validation
-    - Helm unit tests (if test files exist)
-    - Template validation and rendering
-    - Kubernetes manifest validation (if kubeval available)
-
-    Integration Tests:
-    - Deployment verification
-    - Service readiness checks
-
-    Observability Tests:
-    - Monitoring stack deployment verification (Prometheus, Grafana, metrics-server)
-    - HPA (Horizontal Pod Autoscaler) configuration validation
-    - Metrics collection and custom metrics API testing
-    - Autoscaling behavior validation
-    - API endpoint testing
-    - Comprehensive failure debugging
-
-REQUIREMENTS:
-    Helm Tests: helm, helm unittest plugin
-    Integration Tests: kubectl, python/pytest, deployed eoAPI instance
-    Observability Tests: kubectl, python/pytest, deployed eoAPI with monitoring enabled
-
+    --debug           Enable debug mode
+    --help, -h        Show this help
 
 ENVIRONMENT VARIABLES:
-    RELEASE_NAME             Override release name detection
-    STAC_ENDPOINT            Override STAC API endpoint
-    RASTER_ENDPOINT          Override Raster API endpoint
-    VECTOR_ENDPOINT          Override Vector API endpoint
-
-    CI                       Auto-enables debug mode if set
-
-EXAMPLES:
-    $(basename "$0")                    # Run all tests
-    $(basename "$0") helm               # Run only Helm tests
-    $(basename "$0") integration        # Run only integration tests
-    $(basename "$0") observability      # Run only observability tests
-    $(basename "$0") check-deps         # Check dependencies only
-    $(basename "$0") check-deployment   # Check deployment status only
-    $(basename "$0") all --debug        # Run all tests with debug output
-    $(basename "$0") integration --debug # Run integration tests with enhanced logging
-    $(basename "$0") observability --debug # Run observability tests with debug output
-    $(basename "$0") --help             # Show this help
+    RELEASE_NAME      Helm release name (auto-generated in CI)
+    NAMESPACE         Target namespace (default: eoapi)
 
 EOF
 }
 
-# Parse command line arguments
 parse_args() {
     while [[ $# -gt 0 ]]; do
         case $1 in
-            helm|integration|observability|all|check-deps|check-deployment)
+            helm|integration|all|check-deps|check-deployment)
                 COMMAND="$1"; shift ;;
             --debug)
                 DEBUG_MODE=true; shift ;;
@@ -105,29 +60,19 @@ parse_args() {
     done
 }
 
-# Check dependencies for helm tests
 check_helm_dependencies() {
     preflight_test "helm" || exit 1
 
-    # Install unittest plugin if needed
     if ! helm plugin list | grep -q unittest; then
         log_info "Installing helm unittest plugin..."
         helm plugin install https://github.com/helm-unittest/helm-unittest
     fi
 }
 
-# Check dependencies for integration tests
 check_integration_dependencies() {
     preflight_test "integration" || exit 1
 }
 
-# Check dependencies for observability tests
-check_observability_dependencies() {
-    preflight_test "observability" || exit 1
-}
-
-
-# Install Python test dependencies
 install_test_deps() {
     log_info "Installing Python test dependencies..."
 
@@ -145,7 +90,6 @@ install_test_deps() {
     log_info "Test dependencies installed."
 }
 
-# Detect deployment and set environment variables
 detect_deployment() {
     if [ -z "${NAMESPACE:-}" ]; then
         NAMESPACE=$(detect_namespace)
@@ -158,7 +102,6 @@ detect_deployment() {
     log_info "Using namespace: $NAMESPACE, release: $RELEASE_NAME"
 }
 
-# Check if eoAPI deployment is healthy
 check_eoapi_deployment() {
     validate_eoapi_deployment "$NAMESPACE" "$RELEASE_NAME" || {
         log_error "eoAPI deployment validation failed"
@@ -167,7 +110,6 @@ check_eoapi_deployment() {
     }
 }
 
-# Wait for all eoAPI services to be ready
 wait_for_services() {
     log_info "Waiting for eoAPI services to be ready..."
 
@@ -183,9 +125,7 @@ wait_for_services() {
     log_info "✅ All eoAPI services are ready"
 }
 
-# Setup test environment variables
 setup_test_environment() {
-    # Auto-detect service endpoints
     local ingress_host
     ingress_host=$(kubectl get ingress -n "$NAMESPACE" -o jsonpath='{.items[0].spec.rules[0].host}' 2>/dev/null || echo "localhost")
 
@@ -199,7 +139,6 @@ setup_test_environment() {
     log_info "  Vector: $VECTOR_ENDPOINT"
 }
 
-# Show debug information about the deployment
 show_debug_info() {
     log_info "=== Debug Information ==="
 
@@ -338,6 +277,7 @@ run_integration_tests() {
         log_error "Observability tests not found - required for autoscaling validation"
         exit 1
     fi
+
     # Wait for Knative services to be ready if they exist
     if kubectl get ksvc -n "$NAMESPACE" >/dev/null 2>&1; then
         if kubectl get ksvc eoapi-cloudevents-sink -n "$NAMESPACE" >/dev/null 2>&1; then
@@ -349,49 +289,22 @@ run_integration_tests() {
         fi
     fi
 
-
-
     log_info "✅ Integration tests completed"
 }
 
-# Run observability checks (simplified helper)
-run_observability_checks() {
-    log_info "Checking monitoring stack status..."
-
-    # Check for monitoring components (required for autoscaling)
-    kubectl get pods -n "$NAMESPACE" | grep -E "(prometheus|grafana|metrics-server)" || {
-        log_error "No monitoring components found - required for autoscaling"
-        return 1
-    }
-
-    # Check HPA resources
-    kubectl get hpa -n "$NAMESPACE" || {
-        log_error "No HPA resources found - autoscaling not configured"
-        return 1
-    }
-
-    return 0
-}
-
-
-# Main function
 main() {
     parse_args "$@"
 
-    # Default command
     if [ -z "$COMMAND" ]; then
         COMMAND="all"
     fi
 
-    log_info "eoAPI Test Suite - Command: $COMMAND | Debug: $DEBUG_MODE | Release: $RELEASE_NAME"
-
     if [ "$DEBUG_MODE" = true ]; then
-        log_info "Starting eoAPI test suite (DEBUG MODE) - Command: $COMMAND"
+        log_info "eoAPI Test Suite (DEBUG) - Command: $COMMAND | Release: $RELEASE_NAME"
     else
-        log_info "Starting eoAPI test suite - Command: $COMMAND"
+        log_info "eoAPI Test Suite - Command: $COMMAND | Release: $RELEASE_NAME"
     fi
 
-    # Run tests based on command
     case $COMMAND in
         helm)
             check_helm_dependencies
@@ -431,19 +344,16 @@ main() {
         all)
             log_info "Running comprehensive test suite (Helm + Integration tests)"
 
-            # Run Helm tests first
             log_info "=== Phase 1: Helm Tests ==="
             check_helm_dependencies
             run_helm_tests
 
-            # Run Integration tests
             log_info "=== Phase 2: Integration Tests ==="
             check_integration_dependencies
             validate_cluster
             install_test_deps
             detect_deployment
 
-            # Show enhanced debugging in debug mode
             if [ "$DEBUG_MODE" = true ]; then
                 show_debug_info
             fi
@@ -462,20 +372,7 @@ main() {
             ;;
     esac
 
-    # Clean up port forwarding if it was set up
-    if [ -f /tmp/eoapi-port-forward-pids ]; then
-        log_info "Cleaning up port forwarding..."
-        while read -r pid; do
-            kill "$pid" 2>/dev/null || true
-        done < /tmp/eoapi-port-forward-pids
-        rm -f /tmp/eoapi-port-forward-pids
-    fi
-
-    if [ "$DEBUG_MODE" = true ]; then
-        log_info "eoAPI test suite complete (DEBUG MODE)!"
-    else
-        log_info "eoAPI test suite complete!"
-    fi
+    log_info "✅ Test suite complete"
 }
 
 # Run main function