Skip to content

Revert "Sync major improvements: service fixes, test coverage, and dependency updates" #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revert "Sync major improvements: service fixes, test coverage, and dependency updates" #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 47 additions & 1 deletion .devcontainer/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,50 @@ echo "🔧 Available commands:"
echo " ./startup.sh - Start all services"
echo " ./health-check.sh - Check service health"

echo "✅ Setup completed successfully!"
# Setup Jira MCP server
echo "🚀 Setting up Jira MCP server..."

# Create config directory
mkdir -p ~/.config/gitpod

# Clone and build Jira MCP if not already present
if [ ! -d "/home/node/jira-mcp" ]; then
echo "📦 Cloning Jira MCP repository..."
cd /home/node
git clone https://github.com/MankowskiNick/jira-mcp.git
cd jira-mcp
echo "📦 Installing dependencies..."
npm install
echo "🔨 Building project..."
npm run build
else
echo "✓ Jira MCP already installed"
fi

# Create MCP configuration file
echo "⚙️ Creating MCP configuration..."
cat > ~/.config/gitpod/mcp-config.json << EOF
{
"mcpServers": {
"jira-mcp": {
"command": "node",
"args": ["/home/node/jira-mcp/build/index.js"],
"env": {
"JIRA_HOST": "${JIRA_HOST:-coakley.atlassian.net}",
"JIRA_USERNAME": "${JIRA_USERNAME:[email protected]}",
"JIRA_API_TOKEN": "${JIRA_API_TOKEN:-your_api_token_here}",
"JIRA_PROJECT_KEY": "${JIRA_PROJECT_KEY:-MBA}",
"AUTO_CREATE_TEST_TICKETS": "true",
"JIRA_ACCEPTANCE_CRITERIA_FIELD": "customfield_10429",
"JIRA_STORY_POINTS_FIELD": "customfield_10040",
"JIRA_EPIC_LINK_FIELD": "customfield_10014"
}
}
}
}
EOF

echo "✅ Jira MCP server setup complete!"
echo "📍 Configuration: ~/.config/gitpod/mcp-config.json"
echo "📍 Server location: /home/node/jira-mcp/"
echo "🎯 Project: MBA (coakley.atlassian.net)"
264 changes: 164 additions & 100 deletions .gitpod/automations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,59 @@
services:
jira-mcp:
name: "Jira MCP Server"
description: "Model Context Protocol server for Jira integration"
triggeredBy:
- postDevcontainerStart
- postEnvironmentStart
commands:
start: |
echo "Setting up Jira MCP server..."

# Clone and build Jira MCP if not already present
if [ ! -d "/home/node/jira-mcp" ]; then
echo "Cloning Jira MCP repository..."
cd /home/node
git clone https://github.com/MankowskiNick/jira-mcp.git
cd jira-mcp
echo "Installing dependencies..."
npm install
echo "Building project..."
npm run build
else
echo "Jira MCP already installed"
fi

# Test MCP server connection if credentials are available
if [ -n "\$JIRA_API_TOKEN" ] && [ "\$JIRA_API_TOKEN" != "your_api_token_here" ]; then
echo "Testing MCP server connection..."
cd /home/node/jira-mcp

# Test server initialization
if echo '{"jsonrpc": "2.0", "id": 1, "method": "initialize", "params": {"protocolVersion": "2024-11-05", "capabilities": {"roots": {"listChanged": true}}, "clientInfo": {"name": "test-client", "version": "1.0.0"}}}' | timeout 10 node build/index.js >/dev/null 2>&1; then
echo "MCP server connection test successful"
else
echo "MCP server connection test failed - check credentials"
fi
fi

echo "Jira MCP server setup complete"
echo "Server location: /home/node/jira-mcp/"
echo "Configuration: Uses standardized MCP config files (.mcp/config.json, mcp.json, .mcp.yaml)"
echo "Project: MBA (coakley.atlassian.net)"
echo "Available tools: create-ticket, get-ticket, search-tickets, update-ticket, link-tickets, get-test-steps, add-test-steps"

ready: |
if [ -f "/home/node/jira-mcp/build/index.js" ]; then
echo "Jira MCP server is ready"
exit 0
else
echo "Jira MCP server not ready"
exit 1
fi

stop: |
echo "Jira MCP server stopped (no persistent process)"

postgres:
name: "PostgreSQL Database"
description: "PostgreSQL database for Gitpod Flix (Port: 5432)"
Expand Down Expand Up @@ -62,8 +117,6 @@ services:
triggeredBy:
- postDevcontainerStart
- postEnvironmentStart
dependsOn:
- postgres
commands:
start: |
cd /workspaces/gitpodflix-demo/backend/catalog
Expand Down Expand Up @@ -100,9 +153,7 @@ services:
break
fi
if [ $i -eq 60 ]; then
echo "Timeout waiting for PostgreSQL. Checking service status..."
gitpod automations service status postgres || true
gitpod automations service logs postgres || true
echo "Timeout waiting for PostgreSQL"
exit 1
fi
echo "Waiting for PostgreSQL... attempt $i/60"
Expand Down Expand Up @@ -131,8 +182,6 @@ services:
triggeredBy:
- postDevcontainerStart
- postEnvironmentStart
dependsOn:
- catalog
commands:
start: |
cd /workspaces/gitpodflix-demo/frontend
Expand All @@ -156,9 +205,7 @@ services:
break
fi
if [ $i -eq 60 ]; then
echo "Timeout waiting for backend API. Checking service status..."
gitpod automations service status catalog || true
gitpod automations service logs catalog || true
echo "Timeout waiting for backend API"
exit 1
fi
echo "Waiting for backend... attempt $i/60"
Expand All @@ -183,15 +230,119 @@ services:
pkill -f "vite" || true

tasks:
setupJiraMCP:
name: "Setup Jira MCP"
description: "Install and configure Jira MCP server for AI integration"
triggeredBy:
- manual
- postEnvironmentStart
command: |
echo "Setting up Jira MCP server..."

# Create config directory
mkdir -p ~/.config/gitpod

# Clone and build Jira MCP if not already present
if [ ! -d "/home/node/jira-mcp" ]; then
echo "Cloning Jira MCP repository..."
cd /home/node
git clone https://github.com/MankowskiNick/jira-mcp.git
cd jira-mcp
echo "Installing dependencies..."
npm install
echo "Building project..."
npm run build
else
echo "Jira MCP already installed"
fi

# Create MCP configuration file
echo "Creating MCP configuration..."
cat > ~/.config/gitpod/mcp-config.json << EOF
{
"mcpServers": {
"jira-mcp": {
"command": "node",
"args": ["/home/node/jira-mcp/build/index.js"],
"env": {
"JIRA_HOST": "\${JIRA_HOST:-coakley.atlassian.net}",
"JIRA_USERNAME": "\${JIRA_USERNAME:[email protected]}",
"JIRA_API_TOKEN": "\${JIRA_API_TOKEN:-your_api_token_here}",
"JIRA_PROJECT_KEY": "\${JIRA_PROJECT_KEY:-MBA}",
"AUTO_CREATE_TEST_TICKETS": "true",
"JIRA_ACCEPTANCE_CRITERIA_FIELD": "customfield_10429",
"JIRA_STORY_POINTS_FIELD": "customfield_10040",
"JIRA_EPIC_LINK_FIELD": "customfield_10014"
}
}
}
}
EOF

# Configure generic MCP client connection
echo "Configuring MCP client connection..."

# Create generic MCP client config
MCP_CLIENT_CONFIG="$HOME/.config/mcp/client-config.json"
mkdir -p "$HOME/.config/mcp"
cat > "$MCP_CLIENT_CONFIG" << EOF
{
"mcpServers": {
"jira-mcp": {
"command": "node",
"args": ["/home/node/jira-mcp/build/index.js"],
"env": {
"JIRA_HOST": "\${JIRA_HOST:-coakley.atlassian.net}",
"JIRA_USERNAME": "\${JIRA_USERNAME:[email protected]}",
"JIRA_API_TOKEN": "\${JIRA_API_TOKEN:-your_api_token_here}",
"JIRA_PROJECT_KEY": "\${JIRA_PROJECT_KEY:-MBA}",
"AUTO_CREATE_TEST_TICKETS": "true",
"JIRA_ACCEPTANCE_CRITERIA_FIELD": "customfield_10429",
"JIRA_STORY_POINTS_FIELD": "customfield_10040",
"JIRA_EPIC_LINK_FIELD": "customfield_10014"
}
}
}
}
EOF

# Test the MCP server if credentials are available
if [ -n "\$JIRA_API_TOKEN" ] && [ "\$JIRA_API_TOKEN" != "your_api_token_here" ]; then
echo "Testing MCP server connection..."
cd /home/node/jira-mcp

# Test server initialization
if echo '{"jsonrpc": "2.0", "id": 1, "method": "initialize", "params": {"protocolVersion": "2024-11-05", "capabilities": {"roots": {"listChanged": true}}, "clientInfo": {"name": "test-client", "version": "1.0.0"}}}' | timeout 10 node build/index.js >/dev/null 2>&1; then
echo "MCP server connection test successful"
else
echo "MCP server connection test failed - check credentials"
fi
fi

# Create a simple verification script
echo '#!/bin/bash' > /tmp/verify-mcp-connection.sh
echo 'echo "Verifying MCP configuration..."' >> /tmp/verify-mcp-connection.sh
echo 'echo "Server config: $([ -f ~/.config/gitpod/mcp-config.json ] && echo \"Found\" || echo \"Missing\")"' >> /tmp/verify-mcp-connection.sh
echo 'echo "Generic client config: $([ -f ~/.config/mcp/client-config.json ] && echo \"Found\" || echo \"Missing\")"' >> /tmp/verify-mcp-connection.sh
echo 'echo "MCP server binary: $([ -f /home/node/jira-mcp/build/index.js ] && echo \"Found\" || echo \"Missing\")"' >> /tmp/verify-mcp-connection.sh
chmod +x /tmp/verify-mcp-connection.sh

echo "Jira MCP server and client setup complete"
echo "Server config: ~/.config/gitpod/mcp-config.json"
echo "Generic client config: ~/.config/mcp/client-config.json"
echo "Server location: /home/node/jira-mcp/"
echo "Project: MBA (coakley.atlassian.net)"
echo "Available tools: create-ticket, get-ticket, search-tickets, update-ticket, link-tickets, get-test-steps, add-test-steps"
echo ""
echo "Run '/tmp/verify-mcp-connection.sh' to verify the setup"
echo "AI assistants may need to restart to pick up the new MCP configuration"

seedDatabase:
name: "Seed Database"
description: "Seed the database with sample movies in a dramatic sequence"
triggeredBy:
- manual
- postEnvironmentStart
dependsOn:
- postgres
command: |
cd /workspaces/gitpodflix-demo/database/main

Expand All @@ -203,9 +354,7 @@ tasks:
break
fi
if [ $i -eq 30 ]; then
echo "Timeout waiting for PostgreSQL. Checking service status..."
gitpod automations service status postgres || true
gitpod automations service logs postgres || true
echo "Timeout waiting for PostgreSQL"
exit 1
fi
echo "Waiting for PostgreSQL... attempt $i/30"
Expand Down Expand Up @@ -242,97 +391,12 @@ tasks:
triggeredBy:
- postEnvironmentStart
- manual
dependsOn:
- gitpod-flix
command: |
# Wait for services to be ready before opening ports
echo "Waiting for services to be ready before opening ports..."

# Wait for frontend to be ready
for i in {1..30}; do
if gitpod automations service status gitpod-flix | grep -q "ready"; then
echo "Frontend service is ready"
break
fi
if [ $i -eq 30 ]; then
echo "Warning: Frontend service not ready, opening ports anyway"
break
fi
echo "Waiting for frontend service... attempt $i/30"
sleep 2
done

echo "Opening demo ports..."
gitpod environment port open 3000 --name "Gitpod Flix"
gitpod environment port open 3001 --name "Catalog Service"
echo "Demo ports opened successfully!"

checkSystemStatus:
name: "Check System Status"
description: "Check the status of all services and provide troubleshooting info"
triggeredBy:
- manual
command: |
echo "=== GitpodFlix System Status Check ==="
echo ""

echo "1. Service Status:"
echo " PostgreSQL Database:"
gitpod automations service status postgres || echo " ❌ Not running"
echo " Catalog Service:"
gitpod automations service status catalog || echo " ❌ Not running"
echo " Frontend Service:"
gitpod automations service status gitpod-flix || echo " ❌ Not running"
echo ""

echo "2. Port Status:"
echo " Port 5432 (PostgreSQL):"
if lsof -Pi :5432 -sTCP:LISTEN > /dev/null 2>&1; then
echo " ✅ Active"
else
echo " ❌ Not listening"
fi
echo " Port 3001 (Catalog API):"
if lsof -Pi :3001 -sTCP:LISTEN > /dev/null 2>&1; then
echo " ✅ Active"
else
echo " ❌ Not listening"
fi
echo " Port 3000 (Frontend):"
if lsof -Pi :3000 -sTCP:LISTEN > /dev/null 2>&1; then
echo " ✅ Active"
else
echo " ❌ Not listening"
fi
echo ""

echo "3. Health Checks:"
echo " Database Connection:"
if PGPASSWORD=gitpod psql -h localhost -U gitpod -d gitpodflix -c "SELECT 1" > /dev/null 2>&1; then
echo " ✅ Connected"
else
echo " ❌ Cannot connect"
fi
echo " Catalog API Health:"
if curl -s http://localhost:3001/health > /dev/null 2>&1; then
echo " ✅ Healthy"
else
echo " ❌ Not responding"
fi
echo " Frontend Health:"
if curl -s http://localhost:3000 > /dev/null 2>&1; then
echo " ✅ Healthy"
else
echo " ❌ Not responding"
fi
echo ""

echo "4. Troubleshooting Commands:"
echo " Restart all services: gitpod automations service restart postgres catalog gitpod-flix"
echo " View service logs: gitpod automations service logs <service-name>"
echo " Seed database: gitpod automations task start seedDatabase"
echo " Open ports: gitpod automations task start openDemoPorts"

RMRF:
name: "rm -rf demo"
description: "⚠️ Destructive task to show the sandboxing of Gitpod environments"
Expand Down
Loading