From a0a3e69a141fb7134425e689d93cd6da63533563 Mon Sep 17 00:00:00 2001 From: Michal Zander <mzander@syncad.com> Date: Fri, 28 Mar 2025 15:45:30 +0000 Subject: [PATCH] Adjust scripts --- scripts/install_app.sh | 10 ++-------- scripts/openapi_rewrite.sh | 1 + scripts/uninstall_app.sh | 13 ------------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/scripts/install_app.sh b/scripts/install_app.sh index 84d2619..4b8c348 100755 --- a/scripts/install_app.sh +++ b/scripts/install_app.sh @@ -77,11 +77,6 @@ done POSTGRES_ACCESS=${POSTGRES_URL:-"postgresql://$POSTGRES_USER@$POSTGRES_HOST:$POSTGRES_PORT/haf_block_log?application_name=${POSTGRES_APP_NAME}"} -#pushd "$reptracker_dir" -#./scripts/generate_version_sql.sh "$reptracker_dir" -#popd - - echo "Installing app..." psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -f "$SRCPATH/db/builtin_roles.sql" psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c "SET ROLE reptracker_owner;CREATE SCHEMA IF NOT EXISTS ${REPTRACKER_SCHEMA} AUTHORIZATION reptracker_owner;" @@ -93,13 +88,12 @@ POSTGRES_ACCESS=${POSTGRES_URL:-"postgresql://$POSTGRES_USER@$POSTGRES_HOST:$POS psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c "SET custom.swagger_url = '$SWAGGER_URL'; SET SEARCH_PATH TO ${REPTRACKER_SCHEMA};" -f "$SRCPATH/endpoints/endpoint_schema.sql" psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c "SET SEARCH_PATH TO ${REPTRACKER_SCHEMA};" -f "$SRCPATH/endpoints/get_reputation.sql" psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c "SET SEARCH_PATH TO ${REPTRACKER_SCHEMA};" -f "$SRCPATH/endpoints/get_rep_last_synced_block.sql" + psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c "SET SEARCH_PATH TO ${REPTRACKER_SCHEMA};" -f "$SRCPATH/endpoints/get_rep_version.sql" psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c "SET SEARCH_PATH TO ${REPTRACKER_SCHEMA};" -f "$SRCPATH/account_dump/account_rep_stats.sql" psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c "SET SEARCH_PATH TO ${REPTRACKER_SCHEMA};" -f "$SRCPATH/account_dump/compare_accounts.sql" - #psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c "SET SEARCH_PATH TO ${REPTRACKER_SCHEMA};" -f "$SRCPATH/scripts/set_version_in_sql.pgsql" + psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c "SET SEARCH_PATH TO ${REPTRACKER_SCHEMA};" -f "$SRCPATH/scripts/set_version_in_sql.pgsql" psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c "SET ROLE reptracker_owner;GRANT USAGE ON SCHEMA ${REPTRACKER_SCHEMA} to reptracker_user;" psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c "SET ROLE reptracker_owner;GRANT USAGE ON SCHEMA reptracker_endpoints to reptracker_user;" psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c "SET ROLE reptracker_owner;GRANT SELECT ON ALL TABLES IN SCHEMA ${REPTRACKER_SCHEMA} TO reptracker_user;" psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c "SET ROLE reptracker_owner;GRANT SELECT ON ALL TABLES IN SCHEMA reptracker_endpoints TO reptracker_user;" - #register indexes - #psql "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c "SET SEARCH_PATH TO ${REPTRACKER_SCHEMA};" -f "$SRCPATH/db/rep_indexes.sql" diff --git a/scripts/openapi_rewrite.sh b/scripts/openapi_rewrite.sh index 4114835..7636ce5 100755 --- a/scripts/openapi_rewrite.sh +++ b/scripts/openapi_rewrite.sh @@ -16,6 +16,7 @@ OUTPUT="$SCRIPTDIR/output" ENDPOINTS_IN_ORDER=" ../$endpoints/endpoint_schema.sql ../$endpoints/get_reputation.sql +../$endpoints/get_rep_version.sql ../$endpoints/get_rep_last_synced_block.sql" # Function to reverse the lines diff --git a/scripts/uninstall_app.sh b/scripts/uninstall_app.sh index 07d2cbe..c6d7b10 100755 --- a/scripts/uninstall_app.sh +++ b/scripts/uninstall_app.sh @@ -23,7 +23,6 @@ POSTGRES_HOST=${POSTGRES_HOST:-"localhost"} POSTGRES_PORT=${POSTGRES_PORT:-5432} POSTGRES_URL=${POSTGRES_URL:-""} REPTRACKER_SCHEMA=${REPTRACKER_SCHEMA:-"reptracker_app"} -DROP_INDEXES=${DROP_INDEXES:-0} while [ $# -gt 0 ]; do case "$1" in @@ -39,9 +38,6 @@ while [ $# -gt 0 ]; do --postgres-url=*) POSTGRES_URL="${1#*=}" ;; - --drop-indexes*) - DROP_INDEXES=1 - ;; --schema=*) REPTRACKER_SCHEMA="${1#*=}" ;; @@ -97,15 +93,6 @@ EOF psql "$POSTGRES_ACCESS" -v "ON_ERROR_STOP=OFF" -c "DROP SCHEMA IF EXISTS ${REPTRACKER_SCHEMA} CASCADE;" psql "$POSTGRES_ACCESS" -c "${drop_users_sql}" || true - - if [ "${DROP_INDEXES}" -eq 1 ]; then - echo "Attempting to drop indexes built by application" - - psql -aw "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c 'DROP INDEX IF EXISTS hafd.effective_comment_vote_idx;' - psql -aw "$POSTGRES_ACCESS" -v ON_ERROR_STOP=on -c 'DROP INDEX IF EXISTS hafd.delete_comment_op_idx;' - else - echo "Indexes created by application have been preserved" - fi } uninstall_app -- GitLab