Drazen Urch
af9f6e5ca0
* feat(db): add SQL query wrapper for PostgreSQL placeholder conversion - Created query_wrapper module with functions to automatically convert SQLite ? placeholders to PostgreSQL $1, $2, ... format - Updated build.rs to handle mutually exclusive feature flags - Modified one query in mixnodes.rs as proof of concept - Added type conversions for PostgreSQL compatibility (u32->i64, u16->i32) This is a checkpoint commit before converting all queries to use the wrapper. * feat(nym-node-status-api): add PostgreSQL database support via feature flags Implement dual database support for SQLite and PostgreSQL through Cargo feature flags. The implementation uses a query wrapper that automatically converts SQLite-style ? placeholders to PostgreSQL-style $1, $2, ... placeholders at runtime. Key changes: - Add query wrapper functions that handle placeholder conversion - Convert all sqlx::query\! macros to use wrapper functions - Handle type conversions between databases (i64 vs i32) - Add feature-gated implementations for database-specific SQL syntax - Update Makefile with clippy targets for both database features - Document database support in README * feat(nym-node-status-agent): add multi-API support with random selection Agents can now connect to multiple APIs and randomly select one for each testrun: - Accept multiple --server arguments in format "address:port:auth_key" - Randomly shuffle server list before attempting connections - Try each server until a testrun is obtained - Submit results back only to the API that provided the testrun - Continue to next server if one is down or has no testruns available * feat(nym-node-status): implement primary/secondary server architecture - Agent now requests testruns only from primary server (first in list) - Results are submitted to all configured servers in parallel - Secondary servers accept external testruns via new v2 endpoint - Added auto-creation of gateway and testrun records on secondary servers - New database queries: get_or_create_gateway, insert_external_testrun - Client library enhanced with submit_results_with_context method * Bump Node status API version * Fix build workdir * Bump to 3.1.4 * Fix types and queries * 3.1.6 * Fix gateway perf, bump 3.1.7 * NodeId -> i32, 3.1.8 * Bump agent version * i64 -> i32 * Use image yq * Migration and more types * Update remaining JSONB columns * Simplify server config * Update build path * Change delimiter * bump agent * Split up pg and sqlite builds * More typing fixes, build-and-push script * Fix Dockerfile-pg * Bump node-status-api * TYping * Agent build script * More logging around testruns * Fail loudly on read errors * Cleanup * Debug get gateways query * Fix get_gateways query * Use pg cert, 3.1.16 * Submit regular results to primary server * Bump freshenss cutoff * Update Cargo.lock * fix: resolve rebase conflicts and compilation errors After rebasing onto develop, fixed several issues: - Fixed borrowed data escapes error by using sqlx::query directly in transaction functions - Removed unused imports and cleaned up code - Maintained database-specific implementations for transaction functions * fmt * Make PG default to make lives easier * Performance improvements for Explorer v2 * Fix sqlite build * Fix PG migration * Tests round 1 * DB tests * More tests * And some more tests * And some more, more tests * cargo fmt * Fix some failing lints * Fix lioness version problems * Clippy in tests --------- Co-authored-by: dynco-nym <173912580+dynco-nym@users.noreply.github.com>
81 lines
2.2 KiB
Bash
Executable File
81 lines
2.2 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# Build and push Node Status API container to harbor.nymte.ch
|
|
|
|
set -e
|
|
|
|
# Configuration
|
|
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
|
WORKING_DIRECTORY="${SCRIPT_DIR}"
|
|
CONTAINER_NAME="node-status-api"
|
|
REGISTRY="harbor.nymte.ch"
|
|
NAMESPACE="nym"
|
|
|
|
# Colors for output
|
|
RED='\033[0;31m'
|
|
GREEN='\033[0;32m'
|
|
YELLOW='\033[1;33m'
|
|
NC='\033[0m' # No Color
|
|
|
|
# Function to display usage
|
|
usage() {
|
|
echo "Usage: $0 [pg|sqlite|both]"
|
|
echo " pg - Build and push PostgreSQL version"
|
|
echo " sqlite - Build and push SQLite version"
|
|
echo " both - Build and push both versions (default)"
|
|
exit 1
|
|
}
|
|
|
|
# Parse arguments
|
|
DB_TYPE="${1:-both}"
|
|
|
|
if [[ ! "$DB_TYPE" =~ ^(pg|sqlite|both)$ ]]; then
|
|
usage
|
|
fi
|
|
|
|
# Get version from Cargo.toml
|
|
VERSION=$(grep "^version = " "${WORKING_DIRECTORY}/Cargo.toml" | sed -E 's/version = "(.*)"/\1/')
|
|
if [ -z "$VERSION" ]; then
|
|
echo -e "${RED}Error: Could not extract version from Cargo.toml${NC}"
|
|
exit 1
|
|
fi
|
|
echo -e "${YELLOW}Version: ${VERSION}${NC}"
|
|
|
|
# Login to Harbor
|
|
echo -e "${GREEN}Logging into Harbor...${NC}"
|
|
docker login "${REGISTRY}"
|
|
|
|
# Function to build and push
|
|
build_and_push() {
|
|
local db_type=$1
|
|
local dockerfile="Dockerfile-${db_type}"
|
|
|
|
echo -e "${GREEN}Building ${db_type} container...${NC}"
|
|
# Build from repository root (two levels up from script location)
|
|
docker build -f "${WORKING_DIRECTORY}/${dockerfile}" "${SCRIPT_DIR}/../.." \
|
|
-t "${REGISTRY}/${NAMESPACE}/${CONTAINER_NAME}:${VERSION}-${db_type}" \
|
|
-t "${REGISTRY}/${NAMESPACE}/${CONTAINER_NAME}:latest-${db_type}"
|
|
|
|
echo -e "${GREEN}Pushing ${db_type} container to Harbor...${NC}"
|
|
docker push "${REGISTRY}/${NAMESPACE}/${CONTAINER_NAME}:${VERSION}-${db_type}"
|
|
docker push "${REGISTRY}/${NAMESPACE}/${CONTAINER_NAME}:latest-${db_type}"
|
|
|
|
echo -e "${GREEN}Successfully built and pushed ${CONTAINER_NAME}:${VERSION}-${db_type}${NC}"
|
|
}
|
|
|
|
# Build based on selection
|
|
case "$DB_TYPE" in
|
|
pg)
|
|
build_and_push "pg"
|
|
;;
|
|
sqlite)
|
|
build_and_push "sqlite"
|
|
;;
|
|
both)
|
|
build_and_push "pg"
|
|
echo ""
|
|
build_and_push "sqlite"
|
|
;;
|
|
esac
|
|
|
|
echo -e "${GREEN}All builds completed successfully!${NC}" |