From 60f7ac7501cbe30df8c819284309d9c8190ac6f2 Mon Sep 17 00:00:00 2001 From: Satya Patel Date: Fri, 28 Nov 2025 21:37:45 -0800 Subject: [PATCH] fix: correct setup and teardown scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix setup script to properly parse pooled URL from connection_parameters - Fix teardown script (was accidentally overwritten with setup content) ๐Ÿค– Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- superset-setup.sh | 10 +++++++--- superset-teardown.sh | 47 +++++++++----------------------------------- 2 files changed, 16 insertions(+), 41 deletions(-) diff --git a/superset-setup.sh b/superset-setup.sh index 5110432e533..58441d6554a 100755 --- a/superset-setup.sh +++ b/superset-setup.sh @@ -36,11 +36,15 @@ WORKSPACE_NAME="${SUPERSET_WORKSPACE_NAME:-$(basename "$PWD")}" NEON_OUTPUT=$(neonctl branches create \ --project-id tiny-cherry-82420694 \ --name "$WORKSPACE_NAME" \ - --output json) + --output json 2>&1 | grep -v "^WARNING:") -# Parse connection strings and create .env +# Parse connection strings from create output DATABASE_URL=$(echo "$NEON_OUTPUT" | jq -r '.connection_uris[0].connection_uri') -DATABASE_POOLED_URL=$(echo "$NEON_OUTPUT" | jq -r '.connection_uris[1].connection_uri // empty') +POOLER_HOST=$(echo "$NEON_OUTPUT" | jq -r '.connection_uris[0].connection_parameters.pooler_host') +PASSWORD=$(echo "$NEON_OUTPUT" | jq -r '.connection_uris[0].connection_parameters.password') +ROLE=$(echo "$NEON_OUTPUT" | jq -r '.connection_uris[0].connection_parameters.role') +DATABASE=$(echo "$NEON_OUTPUT" | jq -r '.connection_uris[0].connection_parameters.database') +DATABASE_POOLED_URL="postgresql://${ROLE}:${PASSWORD}@${POOLER_HOST}/${DATABASE}?sslmode=require" cat > .env << EOF DATABASE_URL=$DATABASE_URL diff --git a/superset-teardown.sh b/superset-teardown.sh index 58441d6554a..063fd74aab6 100755 --- a/superset-teardown.sh +++ b/superset-teardown.sh @@ -8,48 +8,19 @@ NC='\033[0m' error() { echo -e "${RED}โœ—${NC} $1"; exit 1; } success() { echo -e "${GREEN}โœ“${NC} $1"; } -echo "๐Ÿš€ Setting up Superset workspace..." +echo "๐Ÿงน Tearing down Superset workspace..." # Check dependencies -command -v bun &> /dev/null || error "Bun not installed. Install from https://bun.sh" command -v neonctl &> /dev/null || error "Neon CLI not installed. Run: npm install -g neonctl" -command -v jq &> /dev/null || error "jq not installed. Run: brew install jq" -# Install dependencies -echo "๐Ÿ“ฅ Installing dependencies..." -bun install -success "Dependencies installed" - -# Link direnv config from root repo if it exists -if [ -n "$SUPERSET_ROOT_PATH" ] && [ -f "$SUPERSET_ROOT_PATH/.envrc" ]; then - echo "๐Ÿ”ง Linking .envrc..." - ln -sf "$SUPERSET_ROOT_PATH/.envrc" .envrc - if command -v direnv &> /dev/null; then - direnv allow - fi - success "direnv configured" -fi - -# Create Neon branch for this workspace -echo "๐Ÿ—„๏ธ Creating Neon branch..." +# Delete Neon branch for this workspace WORKSPACE_NAME="${SUPERSET_WORKSPACE_NAME:-$(basename "$PWD")}" -NEON_OUTPUT=$(neonctl branches create \ - --project-id tiny-cherry-82420694 \ - --name "$WORKSPACE_NAME" \ - --output json 2>&1 | grep -v "^WARNING:") -# Parse connection strings from create output -DATABASE_URL=$(echo "$NEON_OUTPUT" | jq -r '.connection_uris[0].connection_uri') -POOLER_HOST=$(echo "$NEON_OUTPUT" | jq -r '.connection_uris[0].connection_parameters.pooler_host') -PASSWORD=$(echo "$NEON_OUTPUT" | jq -r '.connection_uris[0].connection_parameters.password') -ROLE=$(echo "$NEON_OUTPUT" | jq -r '.connection_uris[0].connection_parameters.role') -DATABASE=$(echo "$NEON_OUTPUT" | jq -r '.connection_uris[0].connection_parameters.database') -DATABASE_POOLED_URL="postgresql://${ROLE}:${PASSWORD}@${POOLER_HOST}/${DATABASE}?sslmode=require" - -cat > .env << EOF -DATABASE_URL=$DATABASE_URL -DATABASE_POOLED_URL=$DATABASE_POOLED_URL -EOF +echo "๐Ÿ—„๏ธ Deleting Neon branch: $WORKSPACE_NAME" +if neonctl branches delete "$WORKSPACE_NAME" --project-id tiny-cherry-82420694 --force 2>/dev/null; then + success "Neon branch deleted: $WORKSPACE_NAME" +else + echo "โš ๏ธ Neon branch '$WORKSPACE_NAME' not found or already deleted" +fi -success "Neon branch created: $WORKSPACE_NAME" -echo "โœจ Done!" +echo "โœจ Teardown complete!"