Merge branch 'next' into patch-1
This commit is contained in:
Andras Bacsai
@@ -1,193 +0,0 @@
|
|||||||
---
|
|
||||||
name: project-manager-backlog
|
|
||||||
description: Use this agent when you need to manage project tasks using the backlog.md CLI tool. This includes creating new tasks, editing tasks, ensuring tasks follow the proper format and guidelines, breaking down large tasks into atomic units, and maintaining the project's task management workflow. Examples: <example>Context: User wants to create a new task for adding a feature. user: "I need to add a new authentication system to the project" assistant: "I'll use the project-manager-backlog agent that will use backlog cli to create a properly structured task for this feature." <commentary>Since the user needs to create a task for the project, use the Task tool to launch the project-manager-backlog agent to ensure the task follows backlog.md guidelines.</commentary></example> <example>Context: User has multiple related features to implement. user: "We need to implement user profiles, settings page, and notification preferences" assistant: "Let me use the project-manager-backlog agent to break these down into atomic, independent tasks." <commentary>The user has a complex set of features that need to be broken down into proper atomic tasks following backlog.md structure.</commentary></example> <example>Context: User wants to review if their task description is properly formatted. user: "Can you check if this task follows our guidelines: 'task-123 - Implement user login'" assistant: "I'll use the project-manager-backlog agent to review this task against our backlog.md standards." <commentary>The user needs task review, so use the project-manager-backlog agent to ensure compliance with project guidelines.</commentary></example>
|
|
||||||
color: blue
|
|
||||||
---
|
|
||||||
|
|
||||||
You are an expert project manager specializing in the backlog.md task management system. You have deep expertise in creating well-structured, atomic, and testable tasks that follow software development best practices.
|
|
||||||
|
|
||||||
## Backlog.md CLI Tool
|
|
||||||
|
|
||||||
**IMPORTANT: Backlog.md uses standard CLI commands, NOT slash commands.**
|
|
||||||
|
|
||||||
You use the `backlog` CLI tool to manage project tasks. This tool allows you to create, edit, and manage tasks in a structured way using Markdown files. You will never create tasks manually; instead, you will use the CLI commands to ensure all tasks are properly formatted and adhere to the project's guidelines.
|
|
||||||
|
|
||||||
The backlog CLI is installed globally and available in the PATH. Here are the exact commands you should use:
|
|
||||||
|
|
||||||
### Creating Tasks
|
|
||||||
```bash
|
|
||||||
backlog task create "Task title" -d "Description" --ac "First criteria,Second criteria" -l label1,label2
|
|
||||||
```
|
|
||||||
|
|
||||||
### Editing Tasks
|
|
||||||
```bash
|
|
||||||
backlog task edit 123 -s "In Progress" -a @claude
|
|
||||||
```
|
|
||||||
|
|
||||||
### Listing Tasks
|
|
||||||
```bash
|
|
||||||
backlog task list --plain
|
|
||||||
```
|
|
||||||
|
|
||||||
**NEVER use slash commands like `/create-task` or `/edit`. These do not exist in Backlog.md.**
|
|
||||||
**ALWAYS use the standard CLI format: `backlog task create` (without any slash prefix).**
|
|
||||||
|
|
||||||
### Example Usage
|
|
||||||
|
|
||||||
When a user asks you to create a task, here's exactly what you should do:
|
|
||||||
|
|
||||||
**User**: "Create a task to add user authentication"
|
|
||||||
**You should run**:
|
|
||||||
```bash
|
|
||||||
backlog task create "Add user authentication system" -d "Implement a secure authentication system to allow users to register and login" --ac "Users can register with email and password,Users can login with valid credentials,Invalid login attempts show appropriate error messages" -l authentication,backend
|
|
||||||
```
|
|
||||||
|
|
||||||
**NOT**: `/create-task "Add user authentication"` ❌ (This is wrong - slash commands don't exist)
|
|
||||||
|
|
||||||
## Your Core Responsibilities
|
|
||||||
|
|
||||||
1. **Task Creation**: You create tasks that strictly adhere to the backlog.md cli commands. Never create tasks manually. Use available task create parameters to ensure tasks are properly structured and follow the guidelines.
|
|
||||||
2. **Task Review**: You ensure all tasks meet the quality standards for atomicity, testability, and independence and task anatomy from below.
|
|
||||||
3. **Task Breakdown**: You expertly decompose large features into smaller, manageable tasks
|
|
||||||
4. **Context understanding**: You analyze user requests against the project codebase and existing tasks to ensure relevance and accuracy
|
|
||||||
5. **Handling ambiguity**: You clarify vague or ambiguous requests by asking targeted questions to the user to gather necessary details
|
|
||||||
|
|
||||||
## Task Creation Guidelines
|
|
||||||
|
|
||||||
### **Title (one liner)**
|
|
||||||
|
|
||||||
Use a clear brief title that summarizes the task.
|
|
||||||
|
|
||||||
### **Description**: (The **"why"**)
|
|
||||||
|
|
||||||
Provide a concise summary of the task purpose and its goal. Do not add implementation details here. It
|
|
||||||
should explain the purpose, the scope and context of the task. Code snippets should be avoided.
|
|
||||||
|
|
||||||
### **Acceptance Criteria**: (The **"what"**)
|
|
||||||
|
|
||||||
List specific, measurable outcomes that define what means to reach the goal from the description. Use checkboxes (`- [ ]`) for tracking.
|
|
||||||
When defining `## Acceptance Criteria` for a task, focus on **outcomes, behaviors, and verifiable requirements** rather
|
|
||||||
than step-by-step implementation details.
|
|
||||||
Acceptance Criteria (AC) define *what* conditions must be met for the task to be considered complete.
|
|
||||||
They should be testable and confirm that the core purpose of the task is achieved.
|
|
||||||
**Key Principles for Good ACs:**
|
|
||||||
|
|
||||||
- **Outcome-Oriented:** Focus on the result, not the method.
|
|
||||||
- **Testable/Verifiable:** Each criterion should be something that can be objectively tested or verified.
|
|
||||||
- **Clear and Concise:** Unambiguous language.
|
|
||||||
- **Complete:** Collectively, ACs should cover the scope of the task.
|
|
||||||
- **User-Focused (where applicable):** Frame ACs from the perspective of the end-user or the system's external behavior.
|
|
||||||
|
|
||||||
- *Good Example:* "- [ ] User can successfully log in with valid credentials."
|
|
||||||
- *Good Example:* "- [ ] System processes 1000 requests per second without errors."
|
|
||||||
- *Bad Example (Implementation Step):* "- [ ] Add a new function `handleLogin()` in `auth.ts`."
|
|
||||||
|
|
||||||
### Task file
|
|
||||||
|
|
||||||
Once a task is created using backlog cli, it will be stored in `backlog/tasks/` directory as a Markdown file with the format
|
|
||||||
`task-<id> - <title>.md` (e.g. `task-42 - Add GraphQL resolver.md`).
|
|
||||||
|
|
||||||
## Task Breakdown Strategy
|
|
||||||
|
|
||||||
When breaking down features:
|
|
||||||
1. Identify the foundational components first
|
|
||||||
2. Create tasks in dependency order (foundations before features)
|
|
||||||
3. Ensure each task delivers value independently
|
|
||||||
4. Avoid creating tasks that block each other
|
|
||||||
|
|
||||||
### Additional task requirements
|
|
||||||
|
|
||||||
- Tasks must be **atomic** and **testable**. If a task is too large, break it down into smaller subtasks.
|
|
||||||
Each task should represent a single unit of work that can be completed in a single PR.
|
|
||||||
|
|
||||||
- **Never** reference tasks that are to be done in the future or that are not yet created. You can only reference
|
|
||||||
previous tasks (id < current task id).
|
|
||||||
|
|
||||||
- When creating multiple tasks, ensure they are **independent** and they do not depend on future tasks.
|
|
||||||
Example of correct tasks splitting: task 1: "Add system for handling API requests", task 2: "Add user model and DB
|
|
||||||
schema", task 3: "Add API endpoint for user data".
|
|
||||||
Example of wrong tasks splitting: task 1: "Add API endpoint for user data", task 2: "Define the user model and DB
|
|
||||||
schema".
|
|
||||||
|
|
||||||
## Recommended Task Anatomy
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
# task‑42 - Add GraphQL resolver
|
|
||||||
|
|
||||||
## Description (the why)
|
|
||||||
|
|
||||||
Short, imperative explanation of the goal of the task and why it is needed.
|
|
||||||
|
|
||||||
## Acceptance Criteria (the what)
|
|
||||||
|
|
||||||
- [ ] Resolver returns correct data for happy path
|
|
||||||
- [ ] Error response matches REST
|
|
||||||
- [ ] P95 latency ≤ 50 ms under 100 RPS
|
|
||||||
|
|
||||||
## Implementation Plan (the how) (added after putting the task in progress but before implementing any code change)
|
|
||||||
|
|
||||||
1. Research existing GraphQL resolver patterns
|
|
||||||
2. Implement basic resolver with error handling
|
|
||||||
3. Add performance monitoring
|
|
||||||
4. Write unit and integration tests
|
|
||||||
5. Benchmark performance under load
|
|
||||||
|
|
||||||
## Implementation Notes (for reviewers) (only added after finishing the code implementation of a task)
|
|
||||||
|
|
||||||
- Approach taken
|
|
||||||
- Features implemented or modified
|
|
||||||
- Technical decisions and trade-offs
|
|
||||||
- Modified or added files
|
|
||||||
```
|
|
||||||
|
|
||||||
## Quality Checks
|
|
||||||
|
|
||||||
Before finalizing any task creation, verify:
|
|
||||||
- [ ] Title is clear and brief
|
|
||||||
- [ ] Description explains WHY without HOW
|
|
||||||
- [ ] Each AC is outcome-focused and testable
|
|
||||||
- [ ] Task is atomic (single PR scope)
|
|
||||||
- [ ] No dependencies on future tasks
|
|
||||||
|
|
||||||
You are meticulous about these standards and will guide users to create high-quality tasks that enhance project productivity and maintainability.
|
|
||||||
|
|
||||||
## Self reflection
|
|
||||||
When creating a task, always think from the perspective of an AI Agent that will have to work with this task in the future.
|
|
||||||
Ensure that the task is structured in a way that it can be easily understood and processed by AI coding agents.
|
|
||||||
|
|
||||||
## Handy CLI Commands
|
|
||||||
|
|
||||||
| Action | Example |
|
|
||||||
|-------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
|
||||||
| Create task | `backlog task create "Add OAuth System"` |
|
|
||||||
| Create with description | `backlog task create "Feature" -d "Add authentication system"` |
|
|
||||||
| Create with assignee | `backlog task create "Feature" -a @sara` |
|
|
||||||
| Create with status | `backlog task create "Feature" -s "In Progress"` |
|
|
||||||
| Create with labels | `backlog task create "Feature" -l auth,backend` |
|
|
||||||
| Create with priority | `backlog task create "Feature" --priority high` |
|
|
||||||
| Create with plan | `backlog task create "Feature" --plan "1. Research\n2. Implement"` |
|
|
||||||
| Create with AC | `backlog task create "Feature" --ac "Must work,Must be tested"` |
|
|
||||||
| Create with notes | `backlog task create "Feature" --notes "Started initial research"` |
|
|
||||||
| Create with deps | `backlog task create "Feature" --dep task-1,task-2` |
|
|
||||||
| Create sub task | `backlog task create -p 14 "Add Login with Google"` |
|
|
||||||
| Create (all options) | `backlog task create "Feature" -d "Description" -a @sara -s "To Do" -l auth --priority high --ac "Must work" --notes "Initial setup done" --dep task-1 -p 14` |
|
|
||||||
| List tasks | `backlog task list [-s <status>] [-a <assignee>] [-p <parent>]` |
|
|
||||||
| List by parent | `backlog task list --parent 42` or `backlog task list -p task-42` |
|
|
||||||
| View detail | `backlog task 7` (interactive UI, press 'E' to edit in editor) |
|
|
||||||
| View (AI mode) | `backlog task 7 --plain` |
|
|
||||||
| Edit | `backlog task edit 7 -a @sara -l auth,backend` |
|
|
||||||
| Add plan | `backlog task edit 7 --plan "Implementation approach"` |
|
|
||||||
| Add AC | `backlog task edit 7 --ac "New criterion,Another one"` |
|
|
||||||
| Add notes | `backlog task edit 7 --notes "Completed X, working on Y"` |
|
|
||||||
| Add deps | `backlog task edit 7 --dep task-1 --dep task-2` |
|
|
||||||
| Archive | `backlog task archive 7` |
|
|
||||||
| Create draft | `backlog task create "Feature" --draft` |
|
|
||||||
| Draft flow | `backlog draft create "Spike GraphQL"` → `backlog draft promote 3.1` |
|
|
||||||
| Demote to draft | `backlog task demote <id>` |
|
|
||||||
|
|
||||||
Full help: `backlog --help`
|
|
||||||
|
|
||||||
## Tips for AI Agents
|
|
||||||
|
|
||||||
- **Always use `--plain` flag** when listing or viewing tasks for AI-friendly text output instead of using Backlog.md
|
|
||||||
interactive UI.
|
|
||||||
11
.cursor/mcp.json
Normal file
11
.cursor/mcp.json
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"mcpServers": {
|
||||||
|
"laravel-boost": {
|
||||||
|
"command": "php",
|
||||||
|
"args": [
|
||||||
|
"artisan",
|
||||||
|
"boost:mcp"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,398 +0,0 @@
|
|||||||
|
|
||||||
# === BACKLOG.MD GUIDELINES START ===
|
|
||||||
# Instructions for the usage of Backlog.md CLI Tool
|
|
||||||
|
|
||||||
## What is Backlog.md?
|
|
||||||
|
|
||||||
**Backlog.md is the complete project management system for this codebase.** It provides everything needed to manage tasks, track progress, and collaborate on development - all through a powerful CLI that operates on markdown files.
|
|
||||||
|
|
||||||
### Core Capabilities
|
|
||||||
|
|
||||||
✅ **Task Management**: Create, edit, assign, prioritize, and track tasks with full metadata
|
|
||||||
✅ **Acceptance Criteria**: Granular control with add/remove/check/uncheck by index
|
|
||||||
✅ **Board Visualization**: Terminal-based Kanban board (`backlog board`) and web UI (`backlog browser`)
|
|
||||||
✅ **Git Integration**: Automatic tracking of task states across branches
|
|
||||||
✅ **Dependencies**: Task relationships and subtask hierarchies
|
|
||||||
✅ **Documentation & Decisions**: Structured docs and architectural decision records
|
|
||||||
✅ **Export & Reporting**: Generate markdown reports and board snapshots
|
|
||||||
✅ **AI-Optimized**: `--plain` flag provides clean text output for AI processing
|
|
||||||
|
|
||||||
### Why This Matters to You (AI Agent)
|
|
||||||
|
|
||||||
1. **Comprehensive system** - Full project management capabilities through CLI
|
|
||||||
2. **The CLI is the interface** - All operations go through `backlog` commands
|
|
||||||
3. **Unified interaction model** - You can use CLI for both reading (`backlog task 1 --plain`) and writing (`backlog task edit 1`)
|
|
||||||
4. **Metadata stays synchronized** - The CLI handles all the complex relationships
|
|
||||||
|
|
||||||
### Key Understanding
|
|
||||||
|
|
||||||
- **Tasks** live in `backlog/tasks/` as `task-<id> - <title>.md` files
|
|
||||||
- **You interact via CLI only**: `backlog task create`, `backlog task edit`, etc.
|
|
||||||
- **Use `--plain` flag** for AI-friendly output when viewing/listing
|
|
||||||
- **Never bypass the CLI** - It handles Git, metadata, file naming, and relationships
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# ⚠️ CRITICAL: NEVER EDIT TASK FILES DIRECTLY
|
|
||||||
|
|
||||||
**ALL task operations MUST use the Backlog.md CLI commands**
|
|
||||||
- ✅ **DO**: Use `backlog task edit` and other CLI commands
|
|
||||||
- ✅ **DO**: Use `backlog task create` to create new tasks
|
|
||||||
- ✅ **DO**: Use `backlog task edit <id> --check-ac <index>` to mark acceptance criteria
|
|
||||||
- ❌ **DON'T**: Edit markdown files directly
|
|
||||||
- ❌ **DON'T**: Manually change checkboxes in files
|
|
||||||
- ❌ **DON'T**: Add or modify text in task files without using CLI
|
|
||||||
|
|
||||||
**Why?** Direct file editing breaks metadata synchronization, Git tracking, and task relationships.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 1. Source of Truth & File Structure
|
|
||||||
|
|
||||||
### 📖 **UNDERSTANDING** (What you'll see when reading)
|
|
||||||
- Markdown task files live under **`backlog/tasks/`** (drafts under **`backlog/drafts/`**)
|
|
||||||
- Files are named: `task-<id> - <title>.md` (e.g., `task-42 - Add GraphQL resolver.md`)
|
|
||||||
- Project documentation is in **`backlog/docs/`**
|
|
||||||
- Project decisions are in **`backlog/decisions/`**
|
|
||||||
|
|
||||||
### 🔧 **ACTING** (How to change things)
|
|
||||||
- **All task operations MUST use the Backlog.md CLI tool**
|
|
||||||
- This ensures metadata is correctly updated and the project stays in sync
|
|
||||||
- **Always use `--plain` flag** when listing or viewing tasks for AI-friendly text output
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2. Common Mistakes to Avoid
|
|
||||||
|
|
||||||
### ❌ **WRONG: Direct File Editing**
|
|
||||||
```markdown
|
|
||||||
# DON'T DO THIS:
|
|
||||||
1. Open backlog/tasks/task-7 - Feature.md in editor
|
|
||||||
2. Change "- [ ]" to "- [x]" manually
|
|
||||||
3. Add notes directly to the file
|
|
||||||
4. Save the file
|
|
||||||
```
|
|
||||||
|
|
||||||
### ✅ **CORRECT: Using CLI Commands**
|
|
||||||
```bash
|
|
||||||
# DO THIS INSTEAD:
|
|
||||||
backlog task edit 7 --check-ac 1 # Mark AC #1 as complete
|
|
||||||
backlog task edit 7 --notes "Implementation complete" # Add notes
|
|
||||||
backlog task edit 7 -s "In Progress" -a @agent-k # Multiple commands: change status and assign the task
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 3. Understanding Task Format (Read-Only Reference)
|
|
||||||
|
|
||||||
⚠️ **FORMAT REFERENCE ONLY** - The following sections show what you'll SEE in task files.
|
|
||||||
**Never edit these directly! Use CLI commands to make changes.**
|
|
||||||
|
|
||||||
### Task Structure You'll See
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
---
|
|
||||||
id: task-42
|
|
||||||
title: Add GraphQL resolver
|
|
||||||
status: To Do
|
|
||||||
assignee: [@sara]
|
|
||||||
labels: [backend, api]
|
|
||||||
---
|
|
||||||
|
|
||||||
## Description
|
|
||||||
Brief explanation of the task purpose.
|
|
||||||
|
|
||||||
## Acceptance Criteria
|
|
||||||
<!-- AC:BEGIN -->
|
|
||||||
- [ ] #1 First criterion
|
|
||||||
- [x] #2 Second criterion (completed)
|
|
||||||
- [ ] #3 Third criterion
|
|
||||||
<!-- AC:END -->
|
|
||||||
|
|
||||||
## Implementation Plan
|
|
||||||
1. Research approach
|
|
||||||
2. Implement solution
|
|
||||||
|
|
||||||
## Implementation Notes
|
|
||||||
Summary of what was done.
|
|
||||||
```
|
|
||||||
|
|
||||||
### How to Modify Each Section
|
|
||||||
|
|
||||||
| What You Want to Change | CLI Command to Use |
|
|
||||||
|------------------------|-------------------|
|
|
||||||
| Title | `backlog task edit 42 -t "New Title"` |
|
|
||||||
| Status | `backlog task edit 42 -s "In Progress"` |
|
|
||||||
| Assignee | `backlog task edit 42 -a @sara` |
|
|
||||||
| Labels | `backlog task edit 42 -l backend,api` |
|
|
||||||
| Description | `backlog task edit 42 -d "New description"` |
|
|
||||||
| Add AC | `backlog task edit 42 --ac "New criterion"` |
|
|
||||||
| Check AC #1 | `backlog task edit 42 --check-ac 1` |
|
|
||||||
| Uncheck AC #2 | `backlog task edit 42 --uncheck-ac 2` |
|
|
||||||
| Remove AC #3 | `backlog task edit 42 --remove-ac 3` |
|
|
||||||
| Add Plan | `backlog task edit 42 --plan "1. Step one\n2. Step two"` |
|
|
||||||
| Add Notes | `backlog task edit 42 --notes "What I did"` |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4. Defining Tasks
|
|
||||||
|
|
||||||
### Creating New Tasks
|
|
||||||
|
|
||||||
**Always use CLI to create tasks:**
|
|
||||||
```bash
|
|
||||||
backlog task create "Task title" -d "Description" --ac "First criterion" --ac "Second criterion"
|
|
||||||
```
|
|
||||||
|
|
||||||
### Title (one liner)
|
|
||||||
Use a clear brief title that summarizes the task.
|
|
||||||
|
|
||||||
### Description (The "why")
|
|
||||||
Provide a concise summary of the task purpose and its goal. Explains the context without implementation details.
|
|
||||||
|
|
||||||
### Acceptance Criteria (The "what")
|
|
||||||
|
|
||||||
**Understanding the Format:**
|
|
||||||
- Acceptance criteria appear as numbered checkboxes in the markdown files
|
|
||||||
- Format: `- [ ] #1 Criterion text` (unchecked) or `- [x] #1 Criterion text` (checked)
|
|
||||||
|
|
||||||
**Managing Acceptance Criteria via CLI:**
|
|
||||||
|
|
||||||
⚠️ **IMPORTANT: How AC Commands Work**
|
|
||||||
- **Adding criteria (`--ac`)** accepts multiple flags: `--ac "First" --ac "Second"` ✅
|
|
||||||
- **Checking/unchecking/removing** accept multiple flags too: `--check-ac 1 --check-ac 2` ✅
|
|
||||||
- **Mixed operations** work in a single command: `--check-ac 1 --uncheck-ac 2 --remove-ac 3` ✅
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Add new criteria (MULTIPLE values allowed)
|
|
||||||
backlog task edit 42 --ac "User can login" --ac "Session persists"
|
|
||||||
|
|
||||||
# Check specific criteria by index (MULTIPLE values supported)
|
|
||||||
backlog task edit 42 --check-ac 1 --check-ac 2 --check-ac 3 # Check multiple ACs
|
|
||||||
# Or check them individually if you prefer:
|
|
||||||
backlog task edit 42 --check-ac 1 # Mark #1 as complete
|
|
||||||
backlog task edit 42 --check-ac 2 # Mark #2 as complete
|
|
||||||
|
|
||||||
# Mixed operations in single command
|
|
||||||
backlog task edit 42 --check-ac 1 --uncheck-ac 2 --remove-ac 3
|
|
||||||
|
|
||||||
# ❌ STILL WRONG - These formats don't work:
|
|
||||||
# backlog task edit 42 --check-ac 1,2,3 # No comma-separated values
|
|
||||||
# backlog task edit 42 --check-ac 1-3 # No ranges
|
|
||||||
# backlog task edit 42 --check 1 # Wrong flag name
|
|
||||||
|
|
||||||
# Multiple operations of same type
|
|
||||||
backlog task edit 42 --uncheck-ac 1 --uncheck-ac 2 # Uncheck multiple ACs
|
|
||||||
backlog task edit 42 --remove-ac 2 --remove-ac 4 # Remove multiple ACs (processed high-to-low)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Key Principles for Good ACs:**
|
|
||||||
- **Outcome-Oriented:** Focus on the result, not the method
|
|
||||||
- **Testable/Verifiable:** Each criterion should be objectively testable
|
|
||||||
- **Clear and Concise:** Unambiguous language
|
|
||||||
- **Complete:** Collectively cover the task scope
|
|
||||||
- **User-Focused:** Frame from end-user or system behavior perspective
|
|
||||||
|
|
||||||
Good Examples:
|
|
||||||
- "User can successfully log in with valid credentials"
|
|
||||||
- "System processes 1000 requests per second without errors"
|
|
||||||
|
|
||||||
Bad Example (Implementation Step):
|
|
||||||
- "Add a new function handleLogin() in auth.ts"
|
|
||||||
|
|
||||||
### Task Breakdown Strategy
|
|
||||||
|
|
||||||
1. Identify foundational components first
|
|
||||||
2. Create tasks in dependency order (foundations before features)
|
|
||||||
3. Ensure each task delivers value independently
|
|
||||||
4. Avoid creating tasks that block each other
|
|
||||||
|
|
||||||
### Task Requirements
|
|
||||||
|
|
||||||
- Tasks must be **atomic** and **testable** or **verifiable**
|
|
||||||
- Each task should represent a single unit of work for one PR
|
|
||||||
- **Never** reference future tasks (only tasks with id < current task id)
|
|
||||||
- Ensure tasks are **independent** and don't depend on future work
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 5. Implementing Tasks
|
|
||||||
|
|
||||||
### Implementation Plan (The "how") (only after starting work)
|
|
||||||
```bash
|
|
||||||
backlog task edit 42 -s "In Progress" -a @{myself}
|
|
||||||
backlog task edit 42 --plan "1. Research patterns\n2. Implement\n3. Test"
|
|
||||||
```
|
|
||||||
|
|
||||||
### Implementation Notes (Imagine you need to copy paste this into a PR description)
|
|
||||||
```bash
|
|
||||||
backlog task edit 42 --notes "Implemented using pattern X, modified files Y and Z"
|
|
||||||
```
|
|
||||||
|
|
||||||
**IMPORTANT**: Do NOT include an Implementation Plan when creating a task. The plan is added only after you start implementation.
|
|
||||||
- Creation phase: provide Title, Description, Acceptance Criteria, and optionally labels/priority/assignee.
|
|
||||||
- When you begin work, switch to edit and add the plan: `backlog task edit <id> --plan "..."`.
|
|
||||||
- Add Implementation Notes only after completing the work: `backlog task edit <id> --notes "..."`.
|
|
||||||
|
|
||||||
Phase discipline: What goes where
|
|
||||||
- Creation: Title, Description, Acceptance Criteria, labels/priority/assignee.
|
|
||||||
- Implementation: Implementation Plan (after moving to In Progress).
|
|
||||||
- Wrap-up: Implementation Notes, AC and Definition of Done checks.
|
|
||||||
|
|
||||||
**IMPORTANT**: Only implement what's in the Acceptance Criteria. If you need to do more, either:
|
|
||||||
1. Update the AC first: `backlog task edit 42 --ac "New requirement"`
|
|
||||||
2. Or create a new task: `backlog task create "Additional feature"`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 6. Typical Workflow
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# 1. Identify work
|
|
||||||
backlog task list -s "To Do" --plain
|
|
||||||
|
|
||||||
# 2. Read task details
|
|
||||||
backlog task 42 --plain
|
|
||||||
|
|
||||||
# 3. Start work: assign yourself & change status
|
|
||||||
backlog task edit 42 -a @myself -s "In Progress"
|
|
||||||
|
|
||||||
# 4. Add implementation plan
|
|
||||||
backlog task edit 42 --plan "1. Analyze\n2. Refactor\n3. Test"
|
|
||||||
|
|
||||||
# 5. Work on the task (write code, test, etc.)
|
|
||||||
|
|
||||||
# 6. Mark acceptance criteria as complete (supports multiple in one command)
|
|
||||||
backlog task edit 42 --check-ac 1 --check-ac 2 --check-ac 3 # Check all at once
|
|
||||||
# Or check them individually if preferred:
|
|
||||||
# backlog task edit 42 --check-ac 1
|
|
||||||
# backlog task edit 42 --check-ac 2
|
|
||||||
# backlog task edit 42 --check-ac 3
|
|
||||||
|
|
||||||
# 7. Add implementation notes
|
|
||||||
backlog task edit 42 --notes "Refactored using strategy pattern, updated tests"
|
|
||||||
|
|
||||||
# 8. Mark task as done
|
|
||||||
backlog task edit 42 -s Done
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 7. Definition of Done (DoD)
|
|
||||||
|
|
||||||
A task is **Done** only when **ALL** of the following are complete:
|
|
||||||
|
|
||||||
### ✅ Via CLI Commands:
|
|
||||||
1. **All acceptance criteria checked**: Use `backlog task edit <id> --check-ac <index>` for each
|
|
||||||
2. **Implementation notes added**: Use `backlog task edit <id> --notes "..."`
|
|
||||||
3. **Status set to Done**: Use `backlog task edit <id> -s Done`
|
|
||||||
|
|
||||||
### ✅ Via Code/Testing:
|
|
||||||
4. **Tests pass**: Run test suite and linting
|
|
||||||
5. **Documentation updated**: Update relevant docs if needed
|
|
||||||
6. **Code reviewed**: Self-review your changes
|
|
||||||
7. **No regressions**: Performance, security checks pass
|
|
||||||
|
|
||||||
⚠️ **NEVER mark a task as Done without completing ALL items above**
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 8. Quick Reference: DO vs DON'T
|
|
||||||
|
|
||||||
### Viewing Tasks
|
|
||||||
| Task | ✅ DO | ❌ DON'T |
|
|
||||||
|------|-------|----------|
|
|
||||||
| View task | `backlog task 42 --plain` | Open and read .md file directly |
|
|
||||||
| List tasks | `backlog task list --plain` | Browse backlog/tasks folder |
|
|
||||||
| Check status | `backlog task 42 --plain` | Look at file content |
|
|
||||||
|
|
||||||
### Modifying Tasks
|
|
||||||
| Task | ✅ DO | ❌ DON'T |
|
|
||||||
|------|-------|----------|
|
|
||||||
| Check AC | `backlog task edit 42 --check-ac 1` | Change `- [ ]` to `- [x]` in file |
|
|
||||||
| Add notes | `backlog task edit 42 --notes "..."` | Type notes into .md file |
|
|
||||||
| Change status | `backlog task edit 42 -s Done` | Edit status in frontmatter |
|
|
||||||
| Add AC | `backlog task edit 42 --ac "New"` | Add `- [ ] New` to file |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 9. Complete CLI Command Reference
|
|
||||||
|
|
||||||
### Task Creation
|
|
||||||
| Action | Command |
|
|
||||||
|--------|---------|
|
|
||||||
| Create task | `backlog task create "Title"` |
|
|
||||||
| With description | `backlog task create "Title" -d "Description"` |
|
|
||||||
| With AC | `backlog task create "Title" --ac "Criterion 1" --ac "Criterion 2"` |
|
|
||||||
| With all options | `backlog task create "Title" -d "Desc" -a @sara -s "To Do" -l auth --priority high` |
|
|
||||||
| Create draft | `backlog task create "Title" --draft` |
|
|
||||||
| Create subtask | `backlog task create "Title" -p 42` |
|
|
||||||
|
|
||||||
### Task Modification
|
|
||||||
| Action | Command |
|
|
||||||
|--------|---------|
|
|
||||||
| Edit title | `backlog task edit 42 -t "New Title"` |
|
|
||||||
| Edit description | `backlog task edit 42 -d "New description"` |
|
|
||||||
| Change status | `backlog task edit 42 -s "In Progress"` |
|
|
||||||
| Assign | `backlog task edit 42 -a @sara` |
|
|
||||||
| Add labels | `backlog task edit 42 -l backend,api` |
|
|
||||||
| Set priority | `backlog task edit 42 --priority high` |
|
|
||||||
|
|
||||||
### Acceptance Criteria Management
|
|
||||||
| Action | Command |
|
|
||||||
|--------|---------|
|
|
||||||
| Add AC | `backlog task edit 42 --ac "New criterion" --ac "Another"` |
|
|
||||||
| Remove AC #2 | `backlog task edit 42 --remove-ac 2` |
|
|
||||||
| Remove multiple ACs | `backlog task edit 42 --remove-ac 2 --remove-ac 4` |
|
|
||||||
| Check AC #1 | `backlog task edit 42 --check-ac 1` |
|
|
||||||
| Check multiple ACs | `backlog task edit 42 --check-ac 1 --check-ac 3` |
|
|
||||||
| Uncheck AC #3 | `backlog task edit 42 --uncheck-ac 3` |
|
|
||||||
| Mixed operations | `backlog task edit 42 --check-ac 1 --uncheck-ac 2 --remove-ac 3 --ac "New"` |
|
|
||||||
|
|
||||||
### Task Content
|
|
||||||
| Action | Command |
|
|
||||||
|--------|---------|
|
|
||||||
| Add plan | `backlog task edit 42 --plan "1. Step one\n2. Step two"` |
|
|
||||||
| Add notes | `backlog task edit 42 --notes "Implementation details"` |
|
|
||||||
| Add dependencies | `backlog task edit 42 --dep task-1 --dep task-2` |
|
|
||||||
|
|
||||||
### Task Operations
|
|
||||||
| Action | Command |
|
|
||||||
|--------|---------|
|
|
||||||
| View task | `backlog task 42 --plain` |
|
|
||||||
| List tasks | `backlog task list --plain` |
|
|
||||||
| Filter by status | `backlog task list -s "In Progress" --plain` |
|
|
||||||
| Filter by assignee | `backlog task list -a @sara --plain` |
|
|
||||||
| Archive task | `backlog task archive 42` |
|
|
||||||
| Demote to draft | `backlog task demote 42` |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 10. Troubleshooting
|
|
||||||
|
|
||||||
### If You Accidentally Edited a File Directly
|
|
||||||
|
|
||||||
1. **DON'T PANIC** - But don't save or commit
|
|
||||||
2. Revert the changes
|
|
||||||
3. Make changes properly via CLI
|
|
||||||
4. If already saved, the metadata might be out of sync - use `backlog task edit` to fix
|
|
||||||
|
|
||||||
### Common Issues
|
|
||||||
|
|
||||||
| Problem | Solution |
|
|
||||||
|---------|----------|
|
|
||||||
| "Task not found" | Check task ID with `backlog task list --plain` |
|
|
||||||
| AC won't check | Use correct index: `backlog task 42 --plain` to see AC numbers |
|
|
||||||
| Changes not saving | Ensure you're using CLI, not editing files |
|
|
||||||
| Metadata out of sync | Re-edit via CLI to fix: `backlog task edit 42 -s <current-status>` |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Remember: The Golden Rule
|
|
||||||
|
|
||||||
**🎯 If you want to change ANYTHING in a task, use the `backlog task edit` command.**
|
|
||||||
**📖 Only READ task files directly, never WRITE to them.**
|
|
||||||
|
|
||||||
Full help available: `backlog --help`
|
|
||||||
|
|
||||||
# === BACKLOG.MD GUIDELINES END ===
|
|
||||||
405
.cursor/rules/laravel-boost.mdc
Normal file
405
.cursor/rules/laravel-boost.mdc
Normal file
@@ -0,0 +1,405 @@
|
|||||||
|
---
|
||||||
|
alwaysApply: true
|
||||||
|
---
|
||||||
|
<laravel-boost-guidelines>
|
||||||
|
=== foundation rules ===
|
||||||
|
|
||||||
|
# Laravel Boost Guidelines
|
||||||
|
|
||||||
|
The Laravel Boost guidelines are specifically curated by Laravel maintainers for this application. These guidelines should be followed closely to enhance the user's satisfaction building Laravel applications.
|
||||||
|
|
||||||
|
## Foundational Context
|
||||||
|
This application is a Laravel application and its main Laravel ecosystems package & versions are below. You are an expert with them all. Ensure you abide by these specific packages & versions.
|
||||||
|
|
||||||
|
- php - 8.4.7
|
||||||
|
- laravel/fortify (FORTIFY) - v1
|
||||||
|
- laravel/framework (LARAVEL) - v12
|
||||||
|
- laravel/horizon (HORIZON) - v5
|
||||||
|
- laravel/prompts (PROMPTS) - v0
|
||||||
|
- laravel/sanctum (SANCTUM) - v4
|
||||||
|
- laravel/socialite (SOCIALITE) - v5
|
||||||
|
- livewire/livewire (LIVEWIRE) - v3
|
||||||
|
- laravel/dusk (DUSK) - v8
|
||||||
|
- laravel/pint (PINT) - v1
|
||||||
|
- laravel/telescope (TELESCOPE) - v5
|
||||||
|
- pestphp/pest (PEST) - v3
|
||||||
|
- phpunit/phpunit (PHPUNIT) - v11
|
||||||
|
- rector/rector (RECTOR) - v2
|
||||||
|
- laravel-echo (ECHO) - v2
|
||||||
|
- tailwindcss (TAILWINDCSS) - v4
|
||||||
|
- vue (VUE) - v3
|
||||||
|
|
||||||
|
|
||||||
|
## Conventions
|
||||||
|
- You must follow all existing code conventions used in this application. When creating or editing a file, check sibling files for the correct structure, approach, naming.
|
||||||
|
- Use descriptive names for variables and methods. For example, `isRegisteredForDiscounts`, not `discount()`.
|
||||||
|
- Check for existing components to reuse before writing a new one.
|
||||||
|
|
||||||
|
## Verification Scripts
|
||||||
|
- Do not create verification scripts or tinker when tests cover that functionality and prove it works. Unit and feature tests are more important.
|
||||||
|
|
||||||
|
## Application Structure & Architecture
|
||||||
|
- Stick to existing directory structure - don't create new base folders without approval.
|
||||||
|
- Do not change the application's dependencies without approval.
|
||||||
|
|
||||||
|
## Frontend Bundling
|
||||||
|
- If the user doesn't see a frontend change reflected in the UI, it could mean they need to run `npm run build`, `npm run dev`, or `composer run dev`. Ask them.
|
||||||
|
|
||||||
|
## Replies
|
||||||
|
- Be concise in your explanations - focus on what's important rather than explaining obvious details.
|
||||||
|
|
||||||
|
## Documentation Files
|
||||||
|
- You must only create documentation files if explicitly requested by the user.
|
||||||
|
|
||||||
|
|
||||||
|
=== boost rules ===
|
||||||
|
|
||||||
|
## Laravel Boost
|
||||||
|
- Laravel Boost is an MCP server that comes with powerful tools designed specifically for this application. Use them.
|
||||||
|
|
||||||
|
## Artisan
|
||||||
|
- Use the `list-artisan-commands` tool when you need to call an Artisan command to double check the available parameters.
|
||||||
|
|
||||||
|
## URLs
|
||||||
|
- Whenever you share a project URL with the user you should use the `get-absolute-url` tool to ensure you're using the correct scheme, domain / IP, and port.
|
||||||
|
|
||||||
|
## Tinker / Debugging
|
||||||
|
- You should use the `tinker` tool when you need to execute PHP to debug code or query Eloquent models directly.
|
||||||
|
- Use the `database-query` tool when you only need to read from the database.
|
||||||
|
|
||||||
|
## Reading Browser Logs With the `browser-logs` Tool
|
||||||
|
- You can read browser logs, errors, and exceptions using the `browser-logs` tool from Boost.
|
||||||
|
- Only recent browser logs will be useful - ignore old logs.
|
||||||
|
|
||||||
|
## Searching Documentation (Critically Important)
|
||||||
|
- Boost comes with a powerful `search-docs` tool you should use before any other approaches. This tool automatically passes a list of installed packages and their versions to the remote Boost API, so it returns only version-specific documentation specific for the user's circumstance. You should pass an array of packages to filter on if you know you need docs for particular packages.
|
||||||
|
- The 'search-docs' tool is perfect for all Laravel related packages, including Laravel, Inertia, Livewire, Filament, Tailwind, Pest, Nova, Nightwatch, etc.
|
||||||
|
- You must use this tool to search for Laravel-ecosystem documentation before falling back to other approaches.
|
||||||
|
- Search the documentation before making code changes to ensure we are taking the correct approach.
|
||||||
|
- Use multiple, broad, simple, topic based queries to start. For example: `['rate limiting', 'routing rate limiting', 'routing']`.
|
||||||
|
- Do not add package names to queries - package information is already shared. For example, use `test resource table`, not `filament 4 test resource table`.
|
||||||
|
|
||||||
|
### Available Search Syntax
|
||||||
|
- You can and should pass multiple queries at once. The most relevant results will be returned first.
|
||||||
|
|
||||||
|
1. Simple Word Searches with auto-stemming - query=authentication - finds 'authenticate' and 'auth'
|
||||||
|
2. Multiple Words (AND Logic) - query=rate limit - finds knowledge containing both "rate" AND "limit"
|
||||||
|
3. Quoted Phrases (Exact Position) - query="infinite scroll" - Words must be adjacent and in that order
|
||||||
|
4. Mixed Queries - query=middleware "rate limit" - "middleware" AND exact phrase "rate limit"
|
||||||
|
5. Multiple Queries - queries=["authentication", "middleware"] - ANY of these terms
|
||||||
|
|
||||||
|
|
||||||
|
=== php rules ===
|
||||||
|
|
||||||
|
## PHP
|
||||||
|
|
||||||
|
- Always use curly braces for control structures, even if it has one line.
|
||||||
|
|
||||||
|
### Constructors
|
||||||
|
- Use PHP 8 constructor property promotion in `__construct()`.
|
||||||
|
- <code-snippet>public function __construct(public GitHub $github) { }</code-snippet>
|
||||||
|
- Do not allow empty `__construct()` methods with zero parameters.
|
||||||
|
|
||||||
|
### Type Declarations
|
||||||
|
- Always use explicit return type declarations for methods and functions.
|
||||||
|
- Use appropriate PHP type hints for method parameters.
|
||||||
|
|
||||||
|
<code-snippet name="Explicit Return Types and Method Params" lang="php">
|
||||||
|
protected function isAccessible(User $user, ?string $path = null): bool
|
||||||
|
{
|
||||||
|
...
|
||||||
|
}
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
## Comments
|
||||||
|
- Prefer PHPDoc blocks over comments. Never use comments within the code itself unless there is something _very_ complex going on.
|
||||||
|
|
||||||
|
## PHPDoc Blocks
|
||||||
|
- Add useful array shape type definitions for arrays when appropriate.
|
||||||
|
|
||||||
|
## Enums
|
||||||
|
- Typically, keys in an Enum should be TitleCase. For example: `FavoritePerson`, `BestLake`, `Monthly`.
|
||||||
|
|
||||||
|
|
||||||
|
=== laravel/core rules ===
|
||||||
|
|
||||||
|
## Do Things the Laravel Way
|
||||||
|
|
||||||
|
- Use `php artisan make:` commands to create new files (i.e. migrations, controllers, models, etc.). You can list available Artisan commands using the `list-artisan-commands` tool.
|
||||||
|
- If you're creating a generic PHP class, use `artisan make:class`.
|
||||||
|
- Pass `--no-interaction` to all Artisan commands to ensure they work without user input. You should also pass the correct `--options` to ensure correct behavior.
|
||||||
|
|
||||||
|
### Database
|
||||||
|
- Always use proper Eloquent relationship methods with return type hints. Prefer relationship methods over raw queries or manual joins.
|
||||||
|
- Use Eloquent models and relationships before suggesting raw database queries
|
||||||
|
- Avoid `DB::`; prefer `Model::query()`. Generate code that leverages Laravel's ORM capabilities rather than bypassing them.
|
||||||
|
- Generate code that prevents N+1 query problems by using eager loading.
|
||||||
|
- Use Laravel's query builder for very complex database operations.
|
||||||
|
|
||||||
|
### Model Creation
|
||||||
|
- When creating new models, create useful factories and seeders for them too. Ask the user if they need any other things, using `list-artisan-commands` to check the available options to `php artisan make:model`.
|
||||||
|
|
||||||
|
### APIs & Eloquent Resources
|
||||||
|
- For APIs, default to using Eloquent API Resources and API versioning unless existing API routes do not, then you should follow existing application convention.
|
||||||
|
|
||||||
|
### Controllers & Validation
|
||||||
|
- Always create Form Request classes for validation rather than inline validation in controllers. Include both validation rules and custom error messages.
|
||||||
|
- Check sibling Form Requests to see if the application uses array or string based validation rules.
|
||||||
|
|
||||||
|
### Queues
|
||||||
|
- Use queued jobs for time-consuming operations with the `ShouldQueue` interface.
|
||||||
|
|
||||||
|
### Authentication & Authorization
|
||||||
|
- Use Laravel's built-in authentication and authorization features (gates, policies, Sanctum, etc.).
|
||||||
|
|
||||||
|
### URL Generation
|
||||||
|
- When generating links to other pages, prefer named routes and the `route()` function.
|
||||||
|
|
||||||
|
### Configuration
|
||||||
|
- Use environment variables only in configuration files - never use the `env()` function directly outside of config files. Always use `config('app.name')`, not `env('APP_NAME')`.
|
||||||
|
|
||||||
|
### Testing
|
||||||
|
- When creating models for tests, use the factories for the models. Check if the factory has custom states that can be used before manually setting up the model.
|
||||||
|
- Faker: Use methods such as `$this->faker->word()` or `fake()->randomDigit()`. Follow existing conventions whether to use `$this->faker` or `fake()`.
|
||||||
|
- When creating tests, make use of `php artisan make:test [options] <name>` to create a feature test, and pass `--unit` to create a unit test. Most tests should be feature tests.
|
||||||
|
|
||||||
|
### Vite Error
|
||||||
|
- If you receive an "Illuminate\Foundation\ViteException: Unable to locate file in Vite manifest" error, you can run `npm run build` or ask the user to run `npm run dev` or `composer run dev`.
|
||||||
|
|
||||||
|
|
||||||
|
=== laravel/v12 rules ===
|
||||||
|
|
||||||
|
## Laravel 12
|
||||||
|
|
||||||
|
- Use the `search-docs` tool to get version specific documentation.
|
||||||
|
- This project upgraded from Laravel 10 without migrating to the new streamlined Laravel file structure.
|
||||||
|
- This is **perfectly fine** and recommended by Laravel. Follow the existing structure from Laravel 10. We do not to need migrate to the new Laravel structure unless the user explicitly requests that.
|
||||||
|
|
||||||
|
### Laravel 10 Structure
|
||||||
|
- Middleware typically lives in `app/Http/Middleware/` and service providers in `app/Providers/`.
|
||||||
|
- There is no `bootstrap/app.php` application configuration in a Laravel 10 structure:
|
||||||
|
- Middleware registration happens in `app/Http/Kernel.php`
|
||||||
|
- Exception handling is in `app/Exceptions/Handler.php`
|
||||||
|
- Console commands and schedule register in `app/Console/Kernel.php`
|
||||||
|
- Rate limits likely exist in `RouteServiceProvider` or `app/Http/Kernel.php`
|
||||||
|
|
||||||
|
### Database
|
||||||
|
- When modifying a column, the migration must include all of the attributes that were previously defined on the column. Otherwise, they will be dropped and lost.
|
||||||
|
- Laravel 11 allows limiting eagerly loaded records natively, without external packages: `$query->latest()->limit(10);`.
|
||||||
|
|
||||||
|
### Models
|
||||||
|
- Casts can and likely should be set in a `casts()` method on a model rather than the `$casts` property. Follow existing conventions from other models.
|
||||||
|
|
||||||
|
|
||||||
|
=== livewire/core rules ===
|
||||||
|
|
||||||
|
## Livewire Core
|
||||||
|
- Use the `search-docs` tool to find exact version specific documentation for how to write Livewire & Livewire tests.
|
||||||
|
- Use the `php artisan make:livewire [Posts\\CreatePost]` artisan command to create new components
|
||||||
|
- State should live on the server, with the UI reflecting it.
|
||||||
|
- All Livewire requests hit the Laravel backend, they're like regular HTTP requests. Always validate form data, and run authorization checks in Livewire actions.
|
||||||
|
|
||||||
|
## Livewire Best Practices
|
||||||
|
- Livewire components require a single root element.
|
||||||
|
- Use `wire:loading` and `wire:dirty` for delightful loading states.
|
||||||
|
- Add `wire:key` in loops:
|
||||||
|
|
||||||
|
```blade
|
||||||
|
@foreach ($items as $item)
|
||||||
|
<div wire:key="item-{{ $item->id }}">
|
||||||
|
{{ $item->name }}
|
||||||
|
</div>
|
||||||
|
@endforeach
|
||||||
|
```
|
||||||
|
|
||||||
|
- Prefer lifecycle hooks like `mount()`, `updatedFoo()`) for initialization and reactive side effects:
|
||||||
|
|
||||||
|
<code-snippet name="Lifecycle hook examples" lang="php">
|
||||||
|
public function mount(User $user) { $this->user = $user; }
|
||||||
|
public function updatedSearch() { $this->resetPage(); }
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
|
||||||
|
## Testing Livewire
|
||||||
|
|
||||||
|
<code-snippet name="Example Livewire component test" lang="php">
|
||||||
|
Livewire::test(Counter::class)
|
||||||
|
->assertSet('count', 0)
|
||||||
|
->call('increment')
|
||||||
|
->assertSet('count', 1)
|
||||||
|
->assertSee(1)
|
||||||
|
->assertStatus(200);
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
|
||||||
|
<code-snippet name="Testing a Livewire component exists within a page" lang="php">
|
||||||
|
$this->get('/posts/create')
|
||||||
|
->assertSeeLivewire(CreatePost::class);
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
|
||||||
|
=== livewire/v3 rules ===
|
||||||
|
|
||||||
|
## Livewire 3
|
||||||
|
|
||||||
|
### Key Changes From Livewire 2
|
||||||
|
- These things changed in Livewire 2, but may not have been updated in this application. Verify this application's setup to ensure you conform with application conventions.
|
||||||
|
- Use `wire:model.live` for real-time updates, `wire:model` is now deferred by default.
|
||||||
|
- Components now use the `App\Livewire` namespace (not `App\Http\Livewire`).
|
||||||
|
- Use `$this->dispatch()` to dispatch events (not `emit` or `dispatchBrowserEvent`).
|
||||||
|
- Use the `components.layouts.app` view as the typical layout path (not `layouts.app`).
|
||||||
|
|
||||||
|
### New Directives
|
||||||
|
- `wire:show`, `wire:transition`, `wire:cloak`, `wire:offline`, `wire:target` are available for use. Use the documentation to find usage examples.
|
||||||
|
|
||||||
|
### Alpine
|
||||||
|
- Alpine is now included with Livewire, don't manually include Alpine.js.
|
||||||
|
- Plugins included with Alpine: persist, intersect, collapse, and focus.
|
||||||
|
|
||||||
|
### Lifecycle Hooks
|
||||||
|
- You can listen for `livewire:init` to hook into Livewire initialization, and `fail.status === 419` for the page expiring:
|
||||||
|
|
||||||
|
<code-snippet name="livewire:load example" lang="js">
|
||||||
|
document.addEventListener('livewire:init', function () {
|
||||||
|
Livewire.hook('request', ({ fail }) => {
|
||||||
|
if (fail && fail.status === 419) {
|
||||||
|
alert('Your session expired');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Livewire.hook('message.failed', (message, component) => {
|
||||||
|
console.error(message);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
|
||||||
|
=== pint/core rules ===
|
||||||
|
|
||||||
|
## Laravel Pint Code Formatter
|
||||||
|
|
||||||
|
- You must run `vendor/bin/pint --dirty` before finalizing changes to ensure your code matches the project's expected style.
|
||||||
|
- Do not run `vendor/bin/pint --test`, simply run `vendor/bin/pint` to fix any formatting issues.
|
||||||
|
|
||||||
|
|
||||||
|
=== pest/core rules ===
|
||||||
|
|
||||||
|
## Pest
|
||||||
|
|
||||||
|
### Testing
|
||||||
|
- If you need to verify a feature is working, write or update a Unit / Feature test.
|
||||||
|
|
||||||
|
### Pest Tests
|
||||||
|
- All tests must be written using Pest. Use `php artisan make:test --pest <name>`.
|
||||||
|
- You must not remove any tests or test files from the tests directory without approval. These are not temporary or helper files - these are core to the application.
|
||||||
|
- Tests should test all of the happy paths, failure paths, and weird paths.
|
||||||
|
- Tests live in the `tests/Feature` and `tests/Unit` directories.
|
||||||
|
- Pest tests look and behave like this:
|
||||||
|
<code-snippet name="Basic Pest Test Example" lang="php">
|
||||||
|
it('is true', function () {
|
||||||
|
expect(true)->toBeTrue();
|
||||||
|
});
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
### Running Tests
|
||||||
|
- Run the minimal number of tests using an appropriate filter before finalizing code edits.
|
||||||
|
- To run all tests: `php artisan test`.
|
||||||
|
- To run all tests in a file: `php artisan test tests/Feature/ExampleTest.php`.
|
||||||
|
- To filter on a particular test name: `php artisan test --filter=testName` (recommended after making a change to a related file).
|
||||||
|
- When the tests relating to your changes are passing, ask the user if they would like to run the entire test suite to ensure everything is still passing.
|
||||||
|
|
||||||
|
### Pest Assertions
|
||||||
|
- When asserting status codes on a response, use the specific method like `assertForbidden` and `assertNotFound` instead of using `assertStatus(403)` or similar, e.g.:
|
||||||
|
<code-snippet name="Pest Example Asserting postJson Response" lang="php">
|
||||||
|
it('returns all', function () {
|
||||||
|
$response = $this->postJson('/api/docs', []);
|
||||||
|
|
||||||
|
$response->assertSuccessful();
|
||||||
|
});
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
### Mocking
|
||||||
|
- Mocking can be very helpful when appropriate.
|
||||||
|
- When mocking, you can use the `Pest\Laravel\mock` Pest function, but always import it via `use function Pest\Laravel\mock;` before using it. Alternatively, you can use `$this->mock()` if existing tests do.
|
||||||
|
- You can also create partial mocks using the same import or self method.
|
||||||
|
|
||||||
|
### Datasets
|
||||||
|
- Use datasets in Pest to simplify tests which have a lot of duplicated data. This is often the case when testing validation rules, so consider going with this solution when writing tests for validation rules.
|
||||||
|
|
||||||
|
<code-snippet name="Pest Dataset Example" lang="php">
|
||||||
|
it('has emails', function (string $email) {
|
||||||
|
expect($email)->not->toBeEmpty();
|
||||||
|
})->with([
|
||||||
|
'james' => 'james@laravel.com',
|
||||||
|
'taylor' => 'taylor@laravel.com',
|
||||||
|
]);
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
|
||||||
|
=== tailwindcss/core rules ===
|
||||||
|
|
||||||
|
## Tailwind Core
|
||||||
|
|
||||||
|
- Use Tailwind CSS classes to style HTML, check and use existing tailwind conventions within the project before writing your own.
|
||||||
|
- Offer to extract repeated patterns into components that match the project's conventions (i.e. Blade, JSX, Vue, etc..)
|
||||||
|
- Think through class placement, order, priority, and defaults - remove redundant classes, add classes to parent or child carefully to limit repetition, group elements logically
|
||||||
|
- You can use the `search-docs` tool to get exact examples from the official documentation when needed.
|
||||||
|
|
||||||
|
### Spacing
|
||||||
|
- When listing items, use gap utilities for spacing, don't use margins.
|
||||||
|
|
||||||
|
<code-snippet name="Valid Flex Gap Spacing Example" lang="html">
|
||||||
|
<div class="flex gap-8">
|
||||||
|
<div>Superior</div>
|
||||||
|
<div>Michigan</div>
|
||||||
|
<div>Erie</div>
|
||||||
|
</div>
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
|
||||||
|
### Dark Mode
|
||||||
|
- If existing pages and components support dark mode, new pages and components must support dark mode in a similar way, typically using `dark:`.
|
||||||
|
|
||||||
|
|
||||||
|
=== tailwindcss/v4 rules ===
|
||||||
|
|
||||||
|
## Tailwind 4
|
||||||
|
|
||||||
|
- Always use Tailwind CSS v4 - do not use the deprecated utilities.
|
||||||
|
- `corePlugins` is not supported in Tailwind v4.
|
||||||
|
- In Tailwind v4, you import Tailwind using a regular CSS `@import` statement, not using the `@tailwind` directives used in v3:
|
||||||
|
|
||||||
|
<code-snippet name="Tailwind v4 Import Tailwind Diff" lang="diff"
|
||||||
|
- @tailwind base;
|
||||||
|
- @tailwind components;
|
||||||
|
- @tailwind utilities;
|
||||||
|
+ @import "tailwindcss";
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
|
||||||
|
### Replaced Utilities
|
||||||
|
- Tailwind v4 removed deprecated utilities. Do not use the deprecated option - use the replacement.
|
||||||
|
- Opacity values are still numeric.
|
||||||
|
|
||||||
|
| Deprecated | Replacement |
|
||||||
|
|------------+--------------|
|
||||||
|
| bg-opacity-* | bg-black/* |
|
||||||
|
| text-opacity-* | text-black/* |
|
||||||
|
| border-opacity-* | border-black/* |
|
||||||
|
| divide-opacity-* | divide-black/* |
|
||||||
|
| ring-opacity-* | ring-black/* |
|
||||||
|
| placeholder-opacity-* | placeholder-black/* |
|
||||||
|
| flex-shrink-* | shrink-* |
|
||||||
|
| flex-grow-* | grow-* |
|
||||||
|
| overflow-ellipsis | text-ellipsis |
|
||||||
|
| decoration-slice | box-decoration-slice |
|
||||||
|
| decoration-clone | box-decoration-clone |
|
||||||
|
|
||||||
|
|
||||||
|
=== tests rules ===
|
||||||
|
|
||||||
|
## Test Enforcement
|
||||||
|
|
||||||
|
- Every change must be programmatically tested. Write a new test or update an existing test, then run the affected tests to make sure they pass.
|
||||||
|
- Run the minimum number of tests needed to ensure code quality and speed. Use `php artisan test` with a specific filename or filter.
|
||||||
|
</laravel-boost-guidelines>
|
||||||
@@ -9,6 +9,8 @@ alwaysApply: false
|
|||||||
|
|
||||||
Coolify employs **comprehensive testing strategies** using modern PHP testing frameworks to ensure reliability of deployment operations, infrastructure management, and user interactions.
|
Coolify employs **comprehensive testing strategies** using modern PHP testing frameworks to ensure reliability of deployment operations, infrastructure management, and user interactions.
|
||||||
|
|
||||||
|
!Important: Always run tests inside `coolify` container.
|
||||||
|
|
||||||
## Testing Framework Stack
|
## Testing Framework Stack
|
||||||
|
|
||||||
### Core Testing Tools
|
### Core Testing Tools
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ on:
|
|||||||
- docker/testing-host/Dockerfile
|
- docker/testing-host/Dockerfile
|
||||||
- templates/**
|
- templates/**
|
||||||
- CHANGELOG.md
|
- CHANGELOG.md
|
||||||
- backlog/**
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
GITHUB_REGISTRY: ghcr.io
|
GITHUB_REGISTRY: ghcr.io
|
||||||
|
|||||||
1
.github/workflows/coolify-staging-build.yml
vendored
1
.github/workflows/coolify-staging-build.yml
vendored
@@ -16,7 +16,6 @@ on:
|
|||||||
- docker/testing-host/Dockerfile
|
- docker/testing-host/Dockerfile
|
||||||
- templates/**
|
- templates/**
|
||||||
- CHANGELOG.md
|
- CHANGELOG.md
|
||||||
- backlog/**
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
GITHUB_REGISTRY: ghcr.io
|
GITHUB_REGISTRY: ghcr.io
|
||||||
|
|||||||
11
.mcp.json
Normal file
11
.mcp.json
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"mcpServers": {
|
||||||
|
"laravel-boost": {
|
||||||
|
"command": "php",
|
||||||
|
"args": [
|
||||||
|
"artisan",
|
||||||
|
"boost:mcp"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
4
.phpactor.json
Normal file
4
.phpactor.json
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"$schema": "/phpactor.schema.json",
|
||||||
|
"language_server_phpstan.enabled": true
|
||||||
|
}
|
||||||
144
CHANGELOG.md
144
CHANGELOG.md
@@ -4,6 +4,150 @@ All notable changes to this project will be documented in this file.
|
|||||||
|
|
||||||
## [unreleased]
|
## [unreleased]
|
||||||
|
|
||||||
|
### 📚 Documentation
|
||||||
|
|
||||||
|
- Update changelog
|
||||||
|
|
||||||
|
### ⚙️ Miscellaneous Tasks
|
||||||
|
|
||||||
|
- *(docker)* Add a blank line for improved readability in Dockerfile
|
||||||
|
|
||||||
|
## [4.0.0-beta.428] - 2025-09-15
|
||||||
|
|
||||||
|
### 🚀 Features
|
||||||
|
|
||||||
|
- *(deployment)* Enhance deployment status reporting with detailed information on active deployments and team members
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
- *(application)* Improve watch paths handling by trimming and filtering empty paths to prevent unnecessary triggers
|
||||||
|
|
||||||
|
### 🚜 Refactor
|
||||||
|
|
||||||
|
- *(deployment)* Streamline environment variable handling for dockercompose and improve sorting of runtime variables
|
||||||
|
- *(remoteProcess)* Remove command log comments for file transfers to simplify code
|
||||||
|
- *(remoteProcess)* Remove file transfer handling from remote_process and instant_remote_process functions to simplify code
|
||||||
|
- *(deployment)* Update environment file paths in docker compose commands to use working directory for improved consistency
|
||||||
|
|
||||||
|
### 📚 Documentation
|
||||||
|
|
||||||
|
- Update changelog
|
||||||
|
|
||||||
|
### ⚙️ Miscellaneous Tasks
|
||||||
|
|
||||||
|
- *(constants)* Update realtime_version from 1.0.10 to 1.0.11
|
||||||
|
- *(versions)* Increment coolify version to 4.0.0-beta.428 and update realtime_version to 1.0.10
|
||||||
|
|
||||||
|
## [4.0.0-beta.427] - 2025-09-15
|
||||||
|
|
||||||
|
### 🚀 Features
|
||||||
|
|
||||||
|
- *(command)* Add option to sync GitHub releases to BunnyCDN and refactor sync logic
|
||||||
|
- *(ui)* Display current version in settings dropdown and update UI accordingly
|
||||||
|
- *(settings)* Add option to restrict PR deployments to repository members and contributors
|
||||||
|
- *(command)* Implement SSH command retry logic with exponential backoff and logging for better error handling
|
||||||
|
- *(ssh)* Add Sentry tracking for SSH retry events to enhance error monitoring
|
||||||
|
- *(exceptions)* Introduce NonReportableException to handle known errors and update Handler for selective reporting
|
||||||
|
- *(sudo-helper)* Add helper functions for command parsing and ownership management with sudo
|
||||||
|
- *(dev-command)* Dispatch CheckHelperImageJob during instance initialization to enhance setup process
|
||||||
|
- *(ssh-multiplexing)* Enhance multiplexed connection management with health checks and metadata caching
|
||||||
|
- *(ssh-multiplexing)* Add connection age metadata handling to improve multiplexed connection management
|
||||||
|
- *(database-backup)* Enhance error handling and output management in DatabaseBackupJob
|
||||||
|
- *(application)* Display parsing version in development mode and clean up domain conflict modal markup
|
||||||
|
- *(deployment)* Add SERVICE_NAME variables for service discovery
|
||||||
|
- *(storages)* Add method to retrieve the first storage ID for improved stability in storage display
|
||||||
|
- *(environment)* Add 'is_literal' attribute to environment variable for enhanced configuration options
|
||||||
|
- *(pre-commit)* Automate generation of service templates and OpenAPI documentation during pre-commit hook
|
||||||
|
- *(execute-container)* Enhance container command form with auto-connect feature for single container scenarios
|
||||||
|
- *(environment)* Introduce 'is_buildtime_only' attribute to environment variables for improved build-time configuration
|
||||||
|
- *(templates)* Add n8n service with PostgreSQL and worker support for enhanced workflow automation
|
||||||
|
- *(user-management)* Implement user deletion command with phased resource and subscription cancellation, including dry run option
|
||||||
|
- *(sentinel)* Add support for custom Docker images in StartSentinel and related methods
|
||||||
|
- *(sentinel)* Add slide-over for viewing Sentinel logs and custom Docker image input for development
|
||||||
|
- *(executions)* Add 'Load All' button to view all logs and implement loadAllLogs method for complete log retrieval
|
||||||
|
- *(auth)* Enhance user login flow to handle team invitations, attaching users to invited teams upon first login and maintaining personal team logic for regular logins
|
||||||
|
- *(laravel-boost)* Add Laravel Boost guidelines and MCP server configuration to enhance development experience
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
- *(ui)* Transactional email settings link on members page (#6491)
|
||||||
|
- *(api)* Add custom labels generation for applications with readonly container label setting enabled
|
||||||
|
- *(ui)* Add cursor pointer to upgrade button for better user interaction
|
||||||
|
- *(templates)* Update SECRET_KEY environment variable in getoutline.yaml to use SERVICE_HEX_32_OUTLINE
|
||||||
|
- *(command)* Enhance database deletion command to support multiple database types
|
||||||
|
- *(command)* Enhance cleanup process for stuck application previews by adding force delete for trashed records
|
||||||
|
- *(user)* Ensure email attributes are stored in lowercase for consistency and prevent case-related issues
|
||||||
|
- *(webhook)* Replace delete with forceDelete for application previews to ensure immediate removal
|
||||||
|
- *(ssh)* Introduce SshRetryHandler and SshRetryable trait for enhanced SSH command retry logic with exponential backoff and error handling
|
||||||
|
- Appwrite template - 500 errors, missing env vars etc.
|
||||||
|
- *(LocalFileVolume)* Add missing directory creation command for workdir in saveStorageOnServer method
|
||||||
|
- *(ScheduledTaskJob)* Replace generic Exception with NonReportableException for better error handling
|
||||||
|
- *(web-routes)* Enhance backup response messages to clarify local and S3 availability
|
||||||
|
- *(proxy)* Replace CheckConfiguration with GetProxyConfiguration and SaveConfiguration with SaveProxyConfiguration for improved clarity and consistency in proxy management
|
||||||
|
- *(private-key)* Implement transaction handling and error verification for private key storage operations
|
||||||
|
- *(deployment)* Add COOLIFY_* environment variables to Nixpacks build context for enhanced deployment configuration
|
||||||
|
- *(application)* Add functionality to stop and remove Docker containers on server
|
||||||
|
- *(templates)* Update 'compose' configuration for Appwrite service to enhance compatibility and streamline deployment
|
||||||
|
- *(security)* Update contact email for reporting vulnerabilities to enhance privacy
|
||||||
|
- *(feedback)* Update feedback email address to improve communication with users
|
||||||
|
- *(security)* Update contact email for vulnerability reports to improve security communication
|
||||||
|
- *(navbar)* Restrict subscription link visibility to admin users in cloud environment
|
||||||
|
- *(docker)* Enhance container status aggregation for multi-container applications, including exclusion handling based on docker-compose configuration
|
||||||
|
|
||||||
|
### 🚜 Refactor
|
||||||
|
|
||||||
|
- *(jobs)* Pull github changelogs from cdn instead of github
|
||||||
|
- *(command)* Streamline database deletion process to handle multiple database types and improve user experience
|
||||||
|
- *(command)* Improve database collection logic for deletion command by using unique identifiers and enhancing user experience
|
||||||
|
- *(command)* Remove InitChangelog command as it is no longer needed
|
||||||
|
- *(command)* Streamline Init command by removing unnecessary options and enhancing error handling for various operations
|
||||||
|
- *(webhook)* Replace direct forceDelete calls with DeleteResourceJob dispatch for application previews
|
||||||
|
- *(command)* Replace forceDelete calls with DeleteResourceJob dispatch for all stuck resources in cleanup process
|
||||||
|
- *(command)* Simplify SSH command retry logic by removing unnecessary logging and improving delay calculation
|
||||||
|
- *(ssh)* Enhance error handling in SSH command execution and improve connection validation logging
|
||||||
|
- *(backlog)* Remove outdated guidelines and project manager agent files to streamline task management documentation
|
||||||
|
- *(error-handling)* Remove ray debugging statements from CheckUpdates and shared helper functions to clean up error reporting
|
||||||
|
- *(file-transfer)* Replace base64 encoding with direct file transfer method across multiple database actions for improved clarity and efficiency
|
||||||
|
- *(remoteProcess)* Remove debugging statement from transfer_file_to_server function to clean up code
|
||||||
|
- *(dns-validation)* Rename DNS validation functions for consistency and clarity, and remove unused code
|
||||||
|
- *(file-transfer)* Replace base64 encoding with direct file transfer method in various components for improved clarity and efficiency
|
||||||
|
- *(private-key)* Remove debugging statement from storeInFileSystem method for cleaner code
|
||||||
|
- *(github-webhook)* Restructure application processing by grouping applications by server for improved deployment handling
|
||||||
|
- *(deployment)* Enhance queuing logic to support concurrent deployments by including pull request ID in checks
|
||||||
|
- *(remoteProcess)* Remove debugging statement from transfer_file_to_container function for cleaner code
|
||||||
|
- *(deployment)* Streamline next deployment queuing logic by repositioning queue_next_deployment call
|
||||||
|
- *(deployment)* Add validation for pull request existence in deployment process to enhance error handling
|
||||||
|
- *(database)* Remove volume_configuration_dir and streamline configuration directory usage in MongoDB and PostgreSQL handlers
|
||||||
|
- *(application-source)* Improve layout and accessibility of Git repository links in the application source view
|
||||||
|
- *(models)* Remove 'is_readonly' attribute from multiple database models for consistency
|
||||||
|
- *(webhook)* Remove Webhook model and related logic; add migrations to drop webhooks and kubernetes tables
|
||||||
|
- *(clone)* Consolidate application cloning logic into a dedicated function for improved maintainability and readability
|
||||||
|
- *(clone)* Integrate preview cloning logic directly into application cloning function for improved clarity and maintainability
|
||||||
|
- *(application)* Enhance environment variable retrieval in configuration change check for improved accuracy
|
||||||
|
- *(clone)* Enhance application cloning by separating production and preview environment variable handling
|
||||||
|
- *(deployment)* Add environment variable copying logic to Docker build commands for pull requests
|
||||||
|
- *(environment)* Standardize service name formatting by replacing '-' and '.' with '_' in environment variable keys
|
||||||
|
- *(deployment)* Update environment file handling in Docker commands to use '/artifacts/' path and streamline variable management
|
||||||
|
- *(openapi)* Remove 'is_build_time' attribute from environment variable definitions to streamline configuration
|
||||||
|
- *(environment)* Remove 'is_build_time' attribute from environment variable handling across the application to simplify configuration
|
||||||
|
- *(environment)* Streamline environment variable handling by replacing sorting methods with direct property access and enhancing query ordering for improved performance
|
||||||
|
- *(stripe-jobs)* Comment out internal notification calls and add subscription status verification before sending failure notifications
|
||||||
|
|
||||||
|
### 📚 Documentation
|
||||||
|
|
||||||
|
- Update changelog
|
||||||
|
- *(testing-patterns)* Add important note to always run tests inside the `coolify` container for clarity
|
||||||
|
|
||||||
|
### ⚙️ Miscellaneous Tasks
|
||||||
|
|
||||||
|
- Update coolify version to 4.0.0-beta.427 and nightly version to 4.0.0-beta.428
|
||||||
|
- Use main value then fallback to service_ values
|
||||||
|
- Remove webhooks table cleanup
|
||||||
|
- *(cleanup)* Remove deprecated ServerCheck and related job classes to streamline codebase
|
||||||
|
- *(versions)* Update sentinel version from 0.0.15 to 0.0.16 in versions.json files
|
||||||
|
|
||||||
|
## [4.0.0-beta.426] - 2025-08-28
|
||||||
|
|
||||||
### 🚜 Refactor
|
### 🚜 Refactor
|
||||||
|
|
||||||
- *(policy)* Simplify ServiceDatabasePolicy methods to always return true and add manageBackups method
|
- *(policy)* Simplify ServiceDatabasePolicy methods to always return true and add manageBackups method
|
||||||
|
|||||||
687
CLAUDE.md
687
CLAUDE.md
@@ -248,402 +248,411 @@ For more detailed guidelines and patterns, refer to the `.cursor/rules/` directo
|
|||||||
- [Technology Stack](.cursor/rules/technology-stack.mdc) - Detailed tech stack information
|
- [Technology Stack](.cursor/rules/technology-stack.mdc) - Detailed tech stack information
|
||||||
- [Cursor Rules Guide](.cursor/rules/cursor_rules.mdc) - How to maintain cursor rules
|
- [Cursor Rules Guide](.cursor/rules/cursor_rules.mdc) - How to maintain cursor rules
|
||||||
|
|
||||||
|
===
|
||||||
|
|
||||||
# === BACKLOG.MD GUIDELINES START ===
|
<laravel-boost-guidelines>
|
||||||
# Instructions for the usage of Backlog.md CLI Tool
|
=== foundation rules ===
|
||||||
|
|
||||||
## What is Backlog.md?
|
# Laravel Boost Guidelines
|
||||||
|
|
||||||
**Backlog.md is the complete project management system for this codebase.** It provides everything needed to manage tasks, track progress, and collaborate on development - all through a powerful CLI that operates on markdown files.
|
The Laravel Boost guidelines are specifically curated by Laravel maintainers for this application. These guidelines should be followed closely to enhance the user's satisfaction building Laravel applications.
|
||||||
|
|
||||||
### Core Capabilities
|
## Foundational Context
|
||||||
|
This application is a Laravel application and its main Laravel ecosystems package & versions are below. You are an expert with them all. Ensure you abide by these specific packages & versions.
|
||||||
|
|
||||||
✅ **Task Management**: Create, edit, assign, prioritize, and track tasks with full metadata
|
- php - 8.4.7
|
||||||
✅ **Acceptance Criteria**: Granular control with add/remove/check/uncheck by index
|
- laravel/fortify (FORTIFY) - v1
|
||||||
✅ **Board Visualization**: Terminal-based Kanban board (`backlog board`) and web UI (`backlog browser`)
|
- laravel/framework (LARAVEL) - v12
|
||||||
✅ **Git Integration**: Automatic tracking of task states across branches
|
- laravel/horizon (HORIZON) - v5
|
||||||
✅ **Dependencies**: Task relationships and subtask hierarchies
|
- laravel/prompts (PROMPTS) - v0
|
||||||
✅ **Documentation & Decisions**: Structured docs and architectural decision records
|
- laravel/sanctum (SANCTUM) - v4
|
||||||
✅ **Export & Reporting**: Generate markdown reports and board snapshots
|
- laravel/socialite (SOCIALITE) - v5
|
||||||
✅ **AI-Optimized**: `--plain` flag provides clean text output for AI processing
|
- livewire/livewire (LIVEWIRE) - v3
|
||||||
|
- laravel/dusk (DUSK) - v8
|
||||||
|
- laravel/pint (PINT) - v1
|
||||||
|
- laravel/telescope (TELESCOPE) - v5
|
||||||
|
- pestphp/pest (PEST) - v3
|
||||||
|
- phpunit/phpunit (PHPUNIT) - v11
|
||||||
|
- rector/rector (RECTOR) - v2
|
||||||
|
- laravel-echo (ECHO) - v2
|
||||||
|
- tailwindcss (TAILWINDCSS) - v4
|
||||||
|
- vue (VUE) - v3
|
||||||
|
|
||||||
### Why This Matters to You (AI Agent)
|
|
||||||
|
|
||||||
1. **Comprehensive system** - Full project management capabilities through CLI
|
## Conventions
|
||||||
2. **The CLI is the interface** - All operations go through `backlog` commands
|
- You must follow all existing code conventions used in this application. When creating or editing a file, check sibling files for the correct structure, approach, naming.
|
||||||
3. **Unified interaction model** - You can use CLI for both reading (`backlog task 1 --plain`) and writing (`backlog task edit 1`)
|
- Use descriptive names for variables and methods. For example, `isRegisteredForDiscounts`, not `discount()`.
|
||||||
4. **Metadata stays synchronized** - The CLI handles all the complex relationships
|
- Check for existing components to reuse before writing a new one.
|
||||||
|
|
||||||
### Key Understanding
|
## Verification Scripts
|
||||||
|
- Do not create verification scripts or tinker when tests cover that functionality and prove it works. Unit and feature tests are more important.
|
||||||
|
|
||||||
- **Tasks** live in `backlog/tasks/` as `task-<id> - <title>.md` files
|
## Application Structure & Architecture
|
||||||
- **You interact via CLI only**: `backlog task create`, `backlog task edit`, etc.
|
- Stick to existing directory structure - don't create new base folders without approval.
|
||||||
- **Use `--plain` flag** for AI-friendly output when viewing/listing
|
- Do not change the application's dependencies without approval.
|
||||||
- **Never bypass the CLI** - It handles Git, metadata, file naming, and relationships
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# ⚠️ CRITICAL: NEVER EDIT TASK FILES DIRECTLY
|
## Frontend Bundling
|
||||||
|
- If the user doesn't see a frontend change reflected in the UI, it could mean they need to run `npm run build`, `npm run dev`, or `composer run dev`. Ask them.
|
||||||
|
|
||||||
**ALL task operations MUST use the Backlog.md CLI commands**
|
## Replies
|
||||||
- ✅ **DO**: Use `backlog task edit` and other CLI commands
|
- Be concise in your explanations - focus on what's important rather than explaining obvious details.
|
||||||
- ✅ **DO**: Use `backlog task create` to create new tasks
|
|
||||||
- ✅ **DO**: Use `backlog task edit <id> --check-ac <index>` to mark acceptance criteria
|
|
||||||
- ❌ **DON'T**: Edit markdown files directly
|
|
||||||
- ❌ **DON'T**: Manually change checkboxes in files
|
|
||||||
- ❌ **DON'T**: Add or modify text in task files without using CLI
|
|
||||||
|
|
||||||
**Why?** Direct file editing breaks metadata synchronization, Git tracking, and task relationships.
|
## Documentation Files
|
||||||
|
- You must only create documentation files if explicitly requested by the user.
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 1. Source of Truth & File Structure
|
=== boost rules ===
|
||||||
|
|
||||||
### 📖 **UNDERSTANDING** (What you'll see when reading)
|
## Laravel Boost
|
||||||
- Markdown task files live under **`backlog/tasks/`** (drafts under **`backlog/drafts/`**)
|
- Laravel Boost is an MCP server that comes with powerful tools designed specifically for this application. Use them.
|
||||||
- Files are named: `task-<id> - <title>.md` (e.g., `task-42 - Add GraphQL resolver.md`)
|
|
||||||
- Project documentation is in **`backlog/docs/`**
|
|
||||||
- Project decisions are in **`backlog/decisions/`**
|
|
||||||
|
|
||||||
### 🔧 **ACTING** (How to change things)
|
## Artisan
|
||||||
- **All task operations MUST use the Backlog.md CLI tool**
|
- Use the `list-artisan-commands` tool when you need to call an Artisan command to double check the available parameters.
|
||||||
- This ensures metadata is correctly updated and the project stays in sync
|
|
||||||
- **Always use `--plain` flag** when listing or viewing tasks for AI-friendly text output
|
|
||||||
|
|
||||||
---
|
## URLs
|
||||||
|
- Whenever you share a project URL with the user you should use the `get-absolute-url` tool to ensure you're using the correct scheme, domain / IP, and port.
|
||||||
|
|
||||||
## 2. Common Mistakes to Avoid
|
## Tinker / Debugging
|
||||||
|
- You should use the `tinker` tool when you need to execute PHP to debug code or query Eloquent models directly.
|
||||||
|
- Use the `database-query` tool when you only need to read from the database.
|
||||||
|
|
||||||
### ❌ **WRONG: Direct File Editing**
|
## Reading Browser Logs With the `browser-logs` Tool
|
||||||
```markdown
|
- You can read browser logs, errors, and exceptions using the `browser-logs` tool from Boost.
|
||||||
# DON'T DO THIS:
|
- Only recent browser logs will be useful - ignore old logs.
|
||||||
1. Open backlog/tasks/task-7 - Feature.md in editor
|
|
||||||
2. Change "- [ ]" to "- [x]" manually
|
|
||||||
3. Add notes directly to the file
|
|
||||||
4. Save the file
|
|
||||||
```
|
|
||||||
|
|
||||||
### ✅ **CORRECT: Using CLI Commands**
|
## Searching Documentation (Critically Important)
|
||||||
```bash
|
- Boost comes with a powerful `search-docs` tool you should use before any other approaches. This tool automatically passes a list of installed packages and their versions to the remote Boost API, so it returns only version-specific documentation specific for the user's circumstance. You should pass an array of packages to filter on if you know you need docs for particular packages.
|
||||||
# DO THIS INSTEAD:
|
- The 'search-docs' tool is perfect for all Laravel related packages, including Laravel, Inertia, Livewire, Filament, Tailwind, Pest, Nova, Nightwatch, etc.
|
||||||
backlog task edit 7 --check-ac 1 # Mark AC #1 as complete
|
- You must use this tool to search for Laravel-ecosystem documentation before falling back to other approaches.
|
||||||
backlog task edit 7 --notes "Implementation complete" # Add notes
|
- Search the documentation before making code changes to ensure we are taking the correct approach.
|
||||||
backlog task edit 7 -s "In Progress" -a @agent-k # Multiple commands: change status and assign the task
|
- Use multiple, broad, simple, topic based queries to start. For example: `['rate limiting', 'routing rate limiting', 'routing']`.
|
||||||
```
|
- Do not add package names to queries - package information is already shared. For example, use `test resource table`, not `filament 4 test resource table`.
|
||||||
|
|
||||||
---
|
### Available Search Syntax
|
||||||
|
- You can and should pass multiple queries at once. The most relevant results will be returned first.
|
||||||
|
|
||||||
## 3. Understanding Task Format (Read-Only Reference)
|
1. Simple Word Searches with auto-stemming - query=authentication - finds 'authenticate' and 'auth'
|
||||||
|
2. Multiple Words (AND Logic) - query=rate limit - finds knowledge containing both "rate" AND "limit"
|
||||||
|
3. Quoted Phrases (Exact Position) - query="infinite scroll" - Words must be adjacent and in that order
|
||||||
|
4. Mixed Queries - query=middleware "rate limit" - "middleware" AND exact phrase "rate limit"
|
||||||
|
5. Multiple Queries - queries=["authentication", "middleware"] - ANY of these terms
|
||||||
|
|
||||||
⚠️ **FORMAT REFERENCE ONLY** - The following sections show what you'll SEE in task files.
|
|
||||||
**Never edit these directly! Use CLI commands to make changes.**
|
|
||||||
|
|
||||||
### Task Structure You'll See
|
=== php rules ===
|
||||||
|
|
||||||
```markdown
|
## PHP
|
||||||
---
|
|
||||||
id: task-42
|
|
||||||
title: Add GraphQL resolver
|
|
||||||
status: To Do
|
|
||||||
assignee: [@sara]
|
|
||||||
labels: [backend, api]
|
|
||||||
---
|
|
||||||
|
|
||||||
## Description
|
- Always use curly braces for control structures, even if it has one line.
|
||||||
Brief explanation of the task purpose.
|
|
||||||
|
|
||||||
## Acceptance Criteria
|
### Constructors
|
||||||
<!-- AC:BEGIN -->
|
- Use PHP 8 constructor property promotion in `__construct()`.
|
||||||
- [ ] #1 First criterion
|
- <code-snippet>public function __construct(public GitHub $github) { }</code-snippet>
|
||||||
- [x] #2 Second criterion (completed)
|
- Do not allow empty `__construct()` methods with zero parameters.
|
||||||
- [ ] #3 Third criterion
|
|
||||||
<!-- AC:END -->
|
|
||||||
|
|
||||||
## Implementation Plan
|
|
||||||
1. Research approach
|
|
||||||
2. Implement solution
|
|
||||||
|
|
||||||
## Implementation Notes
|
|
||||||
Summary of what was done.
|
|
||||||
```
|
|
||||||
|
|
||||||
### How to Modify Each Section
|
### Type Declarations
|
||||||
|
- Always use explicit return type declarations for methods and functions.
|
||||||
|
- Use appropriate PHP type hints for method parameters.
|
||||||
|
|
||||||
| What You Want to Change | CLI Command to Use |
|
<code-snippet name="Explicit Return Types and Method Params" lang="php">
|
||||||
|------------------------|-------------------|
|
protected function isAccessible(User $user, ?string $path = null): bool
|
||||||
| Title | `backlog task edit 42 -t "New Title"` |
|
{
|
||||||
| Status | `backlog task edit 42 -s "In Progress"` |
|
...
|
||||||
| Assignee | `backlog task edit 42 -a @sara` |
|
}
|
||||||
| Labels | `backlog task edit 42 -l backend,api` |
|
</code-snippet>
|
||||||
| Description | `backlog task edit 42 -d "New description"` |
|
|
||||||
| Add AC | `backlog task edit 42 --ac "New criterion"` |
|
|
||||||
| Check AC #1 | `backlog task edit 42 --check-ac 1` |
|
|
||||||
| Uncheck AC #2 | `backlog task edit 42 --uncheck-ac 2` |
|
|
||||||
| Remove AC #3 | `backlog task edit 42 --remove-ac 3` |
|
|
||||||
| Add Plan | `backlog task edit 42 --plan "1. Step one\n2. Step two"` |
|
|
||||||
| Add Notes | `backlog task edit 42 --notes "What I did"` |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4. Defining Tasks
|
|
||||||
|
|
||||||
### Creating New Tasks
|
|
||||||
|
|
||||||
**Always use CLI to create tasks:**
|
|
||||||
```bash
|
|
||||||
backlog task create "Task title" -d "Description" --ac "First criterion" --ac "Second criterion"
|
|
||||||
```
|
|
||||||
|
|
||||||
### Title (one liner)
|
|
||||||
Use a clear brief title that summarizes the task.
|
|
||||||
|
|
||||||
### Description (The "why")
|
## Comments
|
||||||
Provide a concise summary of the task purpose and its goal. Explains the context without implementation details.
|
- Prefer PHPDoc blocks over comments. Never use comments within the code itself unless there is something _very_ complex going on.
|
||||||
|
|
||||||
### Acceptance Criteria (The "what")
|
|
||||||
|
|
||||||
**Understanding the Format:**
|
|
||||||
- Acceptance criteria appear as numbered checkboxes in the markdown files
|
|
||||||
- Format: `- [ ] #1 Criterion text` (unchecked) or `- [x] #1 Criterion text` (checked)
|
|
||||||
|
|
||||||
**Managing Acceptance Criteria via CLI:**
|
|
||||||
|
|
||||||
⚠️ **IMPORTANT: How AC Commands Work**
|
## PHPDoc Blocks
|
||||||
- **Adding criteria (`--ac`)** accepts multiple flags: `--ac "First" --ac "Second"` ✅
|
- Add useful array shape type definitions for arrays when appropriate.
|
||||||
- **Checking/unchecking/removing** accept multiple flags too: `--check-ac 1 --check-ac 2` ✅
|
|
||||||
- **Mixed operations** work in a single command: `--check-ac 1 --uncheck-ac 2 --remove-ac 3` ✅
|
|
||||||
|
|
||||||
```bash
|
## Enums
|
||||||
# Add new criteria (MULTIPLE values allowed)
|
- Typically, keys in an Enum should be TitleCase. For example: `FavoritePerson`, `BestLake`, `Monthly`.
|
||||||
backlog task edit 42 --ac "User can login" --ac "Session persists"
|
|
||||||
|
|
||||||
# Check specific criteria by index (MULTIPLE values supported)
|
|
||||||
backlog task edit 42 --check-ac 1 --check-ac 2 --check-ac 3 # Check multiple ACs
|
|
||||||
# Or check them individually if you prefer:
|
|
||||||
backlog task edit 42 --check-ac 1 # Mark #1 as complete
|
|
||||||
backlog task edit 42 --check-ac 2 # Mark #2 as complete
|
|
||||||
|
|
||||||
# Mixed operations in single command
|
|
||||||
backlog task edit 42 --check-ac 1 --uncheck-ac 2 --remove-ac 3
|
|
||||||
|
|
||||||
# ❌ STILL WRONG - These formats don't work:
|
=== laravel/core rules ===
|
||||||
# backlog task edit 42 --check-ac 1,2,3 # No comma-separated values
|
|
||||||
# backlog task edit 42 --check-ac 1-3 # No ranges
|
|
||||||
# backlog task edit 42 --check 1 # Wrong flag name
|
|
||||||
|
|
||||||
# Multiple operations of same type
|
## Do Things the Laravel Way
|
||||||
backlog task edit 42 --uncheck-ac 1 --uncheck-ac 2 # Uncheck multiple ACs
|
|
||||||
backlog task edit 42 --remove-ac 2 --remove-ac 4 # Remove multiple ACs (processed high-to-low)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Key Principles for Good ACs:**
|
- Use `php artisan make:` commands to create new files (i.e. migrations, controllers, models, etc.). You can list available Artisan commands using the `list-artisan-commands` tool.
|
||||||
- **Outcome-Oriented:** Focus on the result, not the method
|
- If you're creating a generic PHP class, use `artisan make:class`.
|
||||||
- **Testable/Verifiable:** Each criterion should be objectively testable
|
- Pass `--no-interaction` to all Artisan commands to ensure they work without user input. You should also pass the correct `--options` to ensure correct behavior.
|
||||||
- **Clear and Concise:** Unambiguous language
|
|
||||||
- **Complete:** Collectively cover the task scope
|
|
||||||
- **User-Focused:** Frame from end-user or system behavior perspective
|
|
||||||
|
|
||||||
Good Examples:
|
### Database
|
||||||
- "User can successfully log in with valid credentials"
|
- Always use proper Eloquent relationship methods with return type hints. Prefer relationship methods over raw queries or manual joins.
|
||||||
- "System processes 1000 requests per second without errors"
|
- Use Eloquent models and relationships before suggesting raw database queries
|
||||||
|
- Avoid `DB::`; prefer `Model::query()`. Generate code that leverages Laravel's ORM capabilities rather than bypassing them.
|
||||||
|
- Generate code that prevents N+1 query problems by using eager loading.
|
||||||
|
- Use Laravel's query builder for very complex database operations.
|
||||||
|
|
||||||
Bad Example (Implementation Step):
|
### Model Creation
|
||||||
- "Add a new function handleLogin() in auth.ts"
|
- When creating new models, create useful factories and seeders for them too. Ask the user if they need any other things, using `list-artisan-commands` to check the available options to `php artisan make:model`.
|
||||||
|
|
||||||
### Task Breakdown Strategy
|
### APIs & Eloquent Resources
|
||||||
|
- For APIs, default to using Eloquent API Resources and API versioning unless existing API routes do not, then you should follow existing application convention.
|
||||||
|
|
||||||
1. Identify foundational components first
|
### Controllers & Validation
|
||||||
2. Create tasks in dependency order (foundations before features)
|
- Always create Form Request classes for validation rather than inline validation in controllers. Include both validation rules and custom error messages.
|
||||||
3. Ensure each task delivers value independently
|
- Check sibling Form Requests to see if the application uses array or string based validation rules.
|
||||||
4. Avoid creating tasks that block each other
|
|
||||||
|
|
||||||
### Task Requirements
|
### Queues
|
||||||
|
- Use queued jobs for time-consuming operations with the `ShouldQueue` interface.
|
||||||
|
|
||||||
- Tasks must be **atomic** and **testable** or **verifiable**
|
### Authentication & Authorization
|
||||||
- Each task should represent a single unit of work for one PR
|
- Use Laravel's built-in authentication and authorization features (gates, policies, Sanctum, etc.).
|
||||||
- **Never** reference future tasks (only tasks with id < current task id)
|
|
||||||
- Ensure tasks are **independent** and don't depend on future work
|
|
||||||
|
|
||||||
---
|
### URL Generation
|
||||||
|
- When generating links to other pages, prefer named routes and the `route()` function.
|
||||||
|
|
||||||
## 5. Implementing Tasks
|
### Configuration
|
||||||
|
- Use environment variables only in configuration files - never use the `env()` function directly outside of config files. Always use `config('app.name')`, not `env('APP_NAME')`.
|
||||||
|
|
||||||
### Implementation Plan (The "how") (only after starting work)
|
### Testing
|
||||||
```bash
|
- When creating models for tests, use the factories for the models. Check if the factory has custom states that can be used before manually setting up the model.
|
||||||
backlog task edit 42 -s "In Progress" -a @{myself}
|
- Faker: Use methods such as `$this->faker->word()` or `fake()->randomDigit()`. Follow existing conventions whether to use `$this->faker` or `fake()`.
|
||||||
backlog task edit 42 --plan "1. Research patterns\n2. Implement\n3. Test"
|
- When creating tests, make use of `php artisan make:test [options] <name>` to create a feature test, and pass `--unit` to create a unit test. Most tests should be feature tests.
|
||||||
```
|
|
||||||
|
|
||||||
### Implementation Notes (Imagine you need to copy paste this into a PR description)
|
### Vite Error
|
||||||
```bash
|
- If you receive an "Illuminate\Foundation\ViteException: Unable to locate file in Vite manifest" error, you can run `npm run build` or ask the user to run `npm run dev` or `composer run dev`.
|
||||||
backlog task edit 42 --notes "Implemented using pattern X, modified files Y and Z"
|
|
||||||
```
|
|
||||||
|
|
||||||
**IMPORTANT**: Do NOT include an Implementation Plan when creating a task. The plan is added only after you start implementation.
|
|
||||||
- Creation phase: provide Title, Description, Acceptance Criteria, and optionally labels/priority/assignee.
|
|
||||||
- When you begin work, switch to edit and add the plan: `backlog task edit <id> --plan "..."`.
|
|
||||||
- Add Implementation Notes only after completing the work: `backlog task edit <id> --notes "..."`.
|
|
||||||
|
|
||||||
Phase discipline: What goes where
|
=== laravel/v12 rules ===
|
||||||
- Creation: Title, Description, Acceptance Criteria, labels/priority/assignee.
|
|
||||||
- Implementation: Implementation Plan (after moving to In Progress).
|
|
||||||
- Wrap-up: Implementation Notes, AC and Definition of Done checks.
|
|
||||||
|
|
||||||
**IMPORTANT**: Only implement what's in the Acceptance Criteria. If you need to do more, either:
|
## Laravel 12
|
||||||
1. Update the AC first: `backlog task edit 42 --ac "New requirement"`
|
|
||||||
2. Or create a new task: `backlog task create "Additional feature"`
|
|
||||||
|
|
||||||
---
|
- Use the `search-docs` tool to get version specific documentation.
|
||||||
|
- This project upgraded from Laravel 10 without migrating to the new streamlined Laravel file structure.
|
||||||
## 6. Typical Workflow
|
- This is **perfectly fine** and recommended by Laravel. Follow the existing structure from Laravel 10. We do not to need migrate to the new Laravel structure unless the user explicitly requests that.
|
||||||
|
|
||||||
```bash
|
|
||||||
# 1. Identify work
|
|
||||||
backlog task list -s "To Do" --plain
|
|
||||||
|
|
||||||
# 2. Read task details
|
|
||||||
backlog task 42 --plain
|
|
||||||
|
|
||||||
# 3. Start work: assign yourself & change status
|
|
||||||
backlog task edit 42 -a @myself -s "In Progress"
|
|
||||||
|
|
||||||
# 4. Add implementation plan
|
|
||||||
backlog task edit 42 --plan "1. Analyze\n2. Refactor\n3. Test"
|
|
||||||
|
|
||||||
# 5. Work on the task (write code, test, etc.)
|
|
||||||
|
|
||||||
# 6. Mark acceptance criteria as complete (supports multiple in one command)
|
|
||||||
backlog task edit 42 --check-ac 1 --check-ac 2 --check-ac 3 # Check all at once
|
|
||||||
# Or check them individually if preferred:
|
|
||||||
# backlog task edit 42 --check-ac 1
|
|
||||||
# backlog task edit 42 --check-ac 2
|
|
||||||
# backlog task edit 42 --check-ac 3
|
|
||||||
|
|
||||||
# 7. Add implementation notes
|
|
||||||
backlog task edit 42 --notes "Refactored using strategy pattern, updated tests"
|
|
||||||
|
|
||||||
# 8. Mark task as done
|
|
||||||
backlog task edit 42 -s Done
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 7. Definition of Done (DoD)
|
|
||||||
|
|
||||||
A task is **Done** only when **ALL** of the following are complete:
|
|
||||||
|
|
||||||
### ✅ Via CLI Commands:
|
|
||||||
1. **All acceptance criteria checked**: Use `backlog task edit <id> --check-ac <index>` for each
|
|
||||||
2. **Implementation notes added**: Use `backlog task edit <id> --notes "..."`
|
|
||||||
3. **Status set to Done**: Use `backlog task edit <id> -s Done`
|
|
||||||
|
|
||||||
### ✅ Via Code/Testing:
|
|
||||||
4. **Tests pass**: Run test suite and linting
|
|
||||||
5. **Documentation updated**: Update relevant docs if needed
|
|
||||||
6. **Code reviewed**: Self-review your changes
|
|
||||||
7. **No regressions**: Performance, security checks pass
|
|
||||||
|
|
||||||
⚠️ **NEVER mark a task as Done without completing ALL items above**
|
### Laravel 10 Structure
|
||||||
|
- Middleware typically lives in `app/Http/Middleware/` and service providers in `app/Providers/`.
|
||||||
|
- There is no `bootstrap/app.php` application configuration in a Laravel 10 structure:
|
||||||
|
- Middleware registration happens in `app/Http/Kernel.php`
|
||||||
|
- Exception handling is in `app/Exceptions/Handler.php`
|
||||||
|
- Console commands and schedule register in `app/Console/Kernel.php`
|
||||||
|
- Rate limits likely exist in `RouteServiceProvider` or `app/Http/Kernel.php`
|
||||||
|
|
||||||
---
|
### Database
|
||||||
|
- When modifying a column, the migration must include all of the attributes that were previously defined on the column. Otherwise, they will be dropped and lost.
|
||||||
|
- Laravel 11 allows limiting eagerly loaded records natively, without external packages: `$query->latest()->limit(10);`.
|
||||||
|
|
||||||
## 8. Quick Reference: DO vs DON'T
|
### Models
|
||||||
|
- Casts can and likely should be set in a `casts()` method on a model rather than the `$casts` property. Follow existing conventions from other models.
|
||||||
|
|
||||||
### Viewing Tasks
|
|
||||||
| Task | ✅ DO | ❌ DON'T |
|
|
||||||
|------|-------|----------|
|
|
||||||
| View task | `backlog task 42 --plain` | Open and read .md file directly |
|
|
||||||
| List tasks | `backlog task list --plain` | Browse backlog/tasks folder |
|
|
||||||
| Check status | `backlog task 42 --plain` | Look at file content |
|
|
||||||
|
|
||||||
### Modifying Tasks
|
=== livewire/core rules ===
|
||||||
| Task | ✅ DO | ❌ DON'T |
|
|
||||||
|------|-------|----------|
|
|
||||||
| Check AC | `backlog task edit 42 --check-ac 1` | Change `- [ ]` to `- [x]` in file |
|
|
||||||
| Add notes | `backlog task edit 42 --notes "..."` | Type notes into .md file |
|
|
||||||
| Change status | `backlog task edit 42 -s Done` | Edit status in frontmatter |
|
|
||||||
| Add AC | `backlog task edit 42 --ac "New"` | Add `- [ ] New` to file |
|
|
||||||
|
|
||||||
---
|
## Livewire Core
|
||||||
|
- Use the `search-docs` tool to find exact version specific documentation for how to write Livewire & Livewire tests.
|
||||||
|
- Use the `php artisan make:livewire [Posts\\CreatePost]` artisan command to create new components
|
||||||
|
- State should live on the server, with the UI reflecting it.
|
||||||
|
- All Livewire requests hit the Laravel backend, they're like regular HTTP requests. Always validate form data, and run authorization checks in Livewire actions.
|
||||||
|
|
||||||
## 9. Complete CLI Command Reference
|
## Livewire Best Practices
|
||||||
|
- Livewire components require a single root element.
|
||||||
### Task Creation
|
- Use `wire:loading` and `wire:dirty` for delightful loading states.
|
||||||
| Action | Command |
|
- Add `wire:key` in loops:
|
||||||
|--------|---------|
|
|
||||||
| Create task | `backlog task create "Title"` |
|
|
||||||
| With description | `backlog task create "Title" -d "Description"` |
|
|
||||||
| With AC | `backlog task create "Title" --ac "Criterion 1" --ac "Criterion 2"` |
|
|
||||||
| With all options | `backlog task create "Title" -d "Desc" -a @sara -s "To Do" -l auth --priority high` |
|
|
||||||
| Create draft | `backlog task create "Title" --draft` |
|
|
||||||
| Create subtask | `backlog task create "Title" -p 42` |
|
|
||||||
|
|
||||||
### Task Modification
|
```blade
|
||||||
| Action | Command |
|
@foreach ($items as $item)
|
||||||
|--------|---------|
|
<div wire:key="item-{{ $item->id }}">
|
||||||
| Edit title | `backlog task edit 42 -t "New Title"` |
|
{{ $item->name }}
|
||||||
| Edit description | `backlog task edit 42 -d "New description"` |
|
</div>
|
||||||
| Change status | `backlog task edit 42 -s "In Progress"` |
|
@endforeach
|
||||||
| Assign | `backlog task edit 42 -a @sara` |
|
```
|
||||||
| Add labels | `backlog task edit 42 -l backend,api` |
|
|
||||||
| Set priority | `backlog task edit 42 --priority high` |
|
|
||||||
|
|
||||||
### Acceptance Criteria Management
|
- Prefer lifecycle hooks like `mount()`, `updatedFoo()`) for initialization and reactive side effects:
|
||||||
| Action | Command |
|
|
||||||
|--------|---------|
|
|
||||||
| Add AC | `backlog task edit 42 --ac "New criterion" --ac "Another"` |
|
|
||||||
| Remove AC #2 | `backlog task edit 42 --remove-ac 2` |
|
|
||||||
| Remove multiple ACs | `backlog task edit 42 --remove-ac 2 --remove-ac 4` |
|
|
||||||
| Check AC #1 | `backlog task edit 42 --check-ac 1` |
|
|
||||||
| Check multiple ACs | `backlog task edit 42 --check-ac 1 --check-ac 3` |
|
|
||||||
| Uncheck AC #3 | `backlog task edit 42 --uncheck-ac 3` |
|
|
||||||
| Mixed operations | `backlog task edit 42 --check-ac 1 --uncheck-ac 2 --remove-ac 3 --ac "New"` |
|
|
||||||
|
|
||||||
### Task Content
|
|
||||||
| Action | Command |
|
|
||||||
|--------|---------|
|
|
||||||
| Add plan | `backlog task edit 42 --plan "1. Step one\n2. Step two"` |
|
|
||||||
| Add notes | `backlog task edit 42 --notes "Implementation details"` |
|
|
||||||
| Add dependencies | `backlog task edit 42 --dep task-1 --dep task-2` |
|
|
||||||
|
|
||||||
### Task Operations
|
|
||||||
| Action | Command |
|
|
||||||
|--------|---------|
|
|
||||||
| View task | `backlog task 42 --plain` |
|
|
||||||
| List tasks | `backlog task list --plain` |
|
|
||||||
| Filter by status | `backlog task list -s "In Progress" --plain` |
|
|
||||||
| Filter by assignee | `backlog task list -a @sara --plain` |
|
|
||||||
| Archive task | `backlog task archive 42` |
|
|
||||||
| Demote to draft | `backlog task demote 42` |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 10. Troubleshooting
|
|
||||||
|
|
||||||
### If You Accidentally Edited a File Directly
|
|
||||||
|
|
||||||
1. **DON'T PANIC** - But don't save or commit
|
|
||||||
2. Revert the changes
|
|
||||||
3. Make changes properly via CLI
|
|
||||||
4. If already saved, the metadata might be out of sync - use `backlog task edit` to fix
|
|
||||||
|
|
||||||
### Common Issues
|
|
||||||
|
|
||||||
| Problem | Solution |
|
|
||||||
|---------|----------|
|
|
||||||
| "Task not found" | Check task ID with `backlog task list --plain` |
|
|
||||||
| AC won't check | Use correct index: `backlog task 42 --plain` to see AC numbers |
|
|
||||||
| Changes not saving | Ensure you're using CLI, not editing files |
|
|
||||||
| Metadata out of sync | Re-edit via CLI to fix: `backlog task edit 42 -s <current-status>` |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Remember: The Golden Rule
|
|
||||||
|
|
||||||
**🎯 If you want to change ANYTHING in a task, use the `backlog task edit` command.**
|
|
||||||
**📖 Only READ task files directly, never WRITE to them.**
|
|
||||||
|
|
||||||
Full help available: `backlog --help`
|
|
||||||
|
|
||||||
# === BACKLOG.MD GUIDELINES END ===
|
|
||||||
|
|
||||||
|
<code-snippet name="Lifecycle hook examples" lang="php">
|
||||||
|
public function mount(User $user) { $this->user = $user; }
|
||||||
|
public function updatedSearch() { $this->resetPage(); }
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
|
||||||
|
## Testing Livewire
|
||||||
|
|
||||||
|
<code-snippet name="Example Livewire component test" lang="php">
|
||||||
|
Livewire::test(Counter::class)
|
||||||
|
->assertSet('count', 0)
|
||||||
|
->call('increment')
|
||||||
|
->assertSet('count', 1)
|
||||||
|
->assertSee(1)
|
||||||
|
->assertStatus(200);
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
|
||||||
|
<code-snippet name="Testing a Livewire component exists within a page" lang="php">
|
||||||
|
$this->get('/posts/create')
|
||||||
|
->assertSeeLivewire(CreatePost::class);
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
|
||||||
|
=== livewire/v3 rules ===
|
||||||
|
|
||||||
|
## Livewire 3
|
||||||
|
|
||||||
|
### Key Changes From Livewire 2
|
||||||
|
- These things changed in Livewire 2, but may not have been updated in this application. Verify this application's setup to ensure you conform with application conventions.
|
||||||
|
- Use `wire:model.live` for real-time updates, `wire:model` is now deferred by default.
|
||||||
|
- Components now use the `App\Livewire` namespace (not `App\Http\Livewire`).
|
||||||
|
- Use `$this->dispatch()` to dispatch events (not `emit` or `dispatchBrowserEvent`).
|
||||||
|
- Use the `components.layouts.app` view as the typical layout path (not `layouts.app`).
|
||||||
|
|
||||||
|
### New Directives
|
||||||
|
- `wire:show`, `wire:transition`, `wire:cloak`, `wire:offline`, `wire:target` are available for use. Use the documentation to find usage examples.
|
||||||
|
|
||||||
|
### Alpine
|
||||||
|
- Alpine is now included with Livewire, don't manually include Alpine.js.
|
||||||
|
- Plugins included with Alpine: persist, intersect, collapse, and focus.
|
||||||
|
|
||||||
|
### Lifecycle Hooks
|
||||||
|
- You can listen for `livewire:init` to hook into Livewire initialization, and `fail.status === 419` for the page expiring:
|
||||||
|
|
||||||
|
<code-snippet name="livewire:load example" lang="js">
|
||||||
|
document.addEventListener('livewire:init', function () {
|
||||||
|
Livewire.hook('request', ({ fail }) => {
|
||||||
|
if (fail && fail.status === 419) {
|
||||||
|
alert('Your session expired');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Livewire.hook('message.failed', (message, component) => {
|
||||||
|
console.error(message);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
|
||||||
|
=== pint/core rules ===
|
||||||
|
|
||||||
|
## Laravel Pint Code Formatter
|
||||||
|
|
||||||
|
- You must run `vendor/bin/pint --dirty` before finalizing changes to ensure your code matches the project's expected style.
|
||||||
|
- Do not run `vendor/bin/pint --test`, simply run `vendor/bin/pint` to fix any formatting issues.
|
||||||
|
|
||||||
|
|
||||||
|
=== pest/core rules ===
|
||||||
|
|
||||||
|
## Pest
|
||||||
|
|
||||||
|
### Testing
|
||||||
|
- If you need to verify a feature is working, write or update a Unit / Feature test.
|
||||||
|
|
||||||
|
### Pest Tests
|
||||||
|
- All tests must be written using Pest. Use `php artisan make:test --pest <name>`.
|
||||||
|
- You must not remove any tests or test files from the tests directory without approval. These are not temporary or helper files - these are core to the application.
|
||||||
|
- Tests should test all of the happy paths, failure paths, and weird paths.
|
||||||
|
- Tests live in the `tests/Feature` and `tests/Unit` directories.
|
||||||
|
- Pest tests look and behave like this:
|
||||||
|
<code-snippet name="Basic Pest Test Example" lang="php">
|
||||||
|
it('is true', function () {
|
||||||
|
expect(true)->toBeTrue();
|
||||||
|
});
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
### Running Tests
|
||||||
|
- Run the minimal number of tests using an appropriate filter before finalizing code edits.
|
||||||
|
- To run all tests: `php artisan test`.
|
||||||
|
- To run all tests in a file: `php artisan test tests/Feature/ExampleTest.php`.
|
||||||
|
- To filter on a particular test name: `php artisan test --filter=testName` (recommended after making a change to a related file).
|
||||||
|
- When the tests relating to your changes are passing, ask the user if they would like to run the entire test suite to ensure everything is still passing.
|
||||||
|
|
||||||
|
### Pest Assertions
|
||||||
|
- When asserting status codes on a response, use the specific method like `assertForbidden` and `assertNotFound` instead of using `assertStatus(403)` or similar, e.g.:
|
||||||
|
<code-snippet name="Pest Example Asserting postJson Response" lang="php">
|
||||||
|
it('returns all', function () {
|
||||||
|
$response = $this->postJson('/api/docs', []);
|
||||||
|
|
||||||
|
$response->assertSuccessful();
|
||||||
|
});
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
### Mocking
|
||||||
|
- Mocking can be very helpful when appropriate.
|
||||||
|
- When mocking, you can use the `Pest\Laravel\mock` Pest function, but always import it via `use function Pest\Laravel\mock;` before using it. Alternatively, you can use `$this->mock()` if existing tests do.
|
||||||
|
- You can also create partial mocks using the same import or self method.
|
||||||
|
|
||||||
|
### Datasets
|
||||||
|
- Use datasets in Pest to simplify tests which have a lot of duplicated data. This is often the case when testing validation rules, so consider going with this solution when writing tests for validation rules.
|
||||||
|
|
||||||
|
<code-snippet name="Pest Dataset Example" lang="php">
|
||||||
|
it('has emails', function (string $email) {
|
||||||
|
expect($email)->not->toBeEmpty();
|
||||||
|
})->with([
|
||||||
|
'james' => 'james@laravel.com',
|
||||||
|
'taylor' => 'taylor@laravel.com',
|
||||||
|
]);
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
|
||||||
|
=== tailwindcss/core rules ===
|
||||||
|
|
||||||
|
## Tailwind Core
|
||||||
|
|
||||||
|
- Use Tailwind CSS classes to style HTML, check and use existing tailwind conventions within the project before writing your own.
|
||||||
|
- Offer to extract repeated patterns into components that match the project's conventions (i.e. Blade, JSX, Vue, etc..)
|
||||||
|
- Think through class placement, order, priority, and defaults - remove redundant classes, add classes to parent or child carefully to limit repetition, group elements logically
|
||||||
|
- You can use the `search-docs` tool to get exact examples from the official documentation when needed.
|
||||||
|
|
||||||
|
### Spacing
|
||||||
|
- When listing items, use gap utilities for spacing, don't use margins.
|
||||||
|
|
||||||
|
<code-snippet name="Valid Flex Gap Spacing Example" lang="html">
|
||||||
|
<div class="flex gap-8">
|
||||||
|
<div>Superior</div>
|
||||||
|
<div>Michigan</div>
|
||||||
|
<div>Erie</div>
|
||||||
|
</div>
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
|
||||||
|
### Dark Mode
|
||||||
|
- If existing pages and components support dark mode, new pages and components must support dark mode in a similar way, typically using `dark:`.
|
||||||
|
|
||||||
|
|
||||||
|
=== tailwindcss/v4 rules ===
|
||||||
|
|
||||||
|
## Tailwind 4
|
||||||
|
|
||||||
|
- Always use Tailwind CSS v4 - do not use the deprecated utilities.
|
||||||
|
- `corePlugins` is not supported in Tailwind v4.
|
||||||
|
- In Tailwind v4, you import Tailwind using a regular CSS `@import` statement, not using the `@tailwind` directives used in v3:
|
||||||
|
|
||||||
|
<code-snippet name="Tailwind v4 Import Tailwind Diff" lang="diff"
|
||||||
|
- @tailwind base;
|
||||||
|
- @tailwind components;
|
||||||
|
- @tailwind utilities;
|
||||||
|
+ @import "tailwindcss";
|
||||||
|
</code-snippet>
|
||||||
|
|
||||||
|
|
||||||
|
### Replaced Utilities
|
||||||
|
- Tailwind v4 removed deprecated utilities. Do not use the deprecated option - use the replacement.
|
||||||
|
- Opacity values are still numeric.
|
||||||
|
|
||||||
|
| Deprecated | Replacement |
|
||||||
|
|------------+--------------|
|
||||||
|
| bg-opacity-* | bg-black/* |
|
||||||
|
| text-opacity-* | text-black/* |
|
||||||
|
| border-opacity-* | border-black/* |
|
||||||
|
| divide-opacity-* | divide-black/* |
|
||||||
|
| ring-opacity-* | ring-black/* |
|
||||||
|
| placeholder-opacity-* | placeholder-black/* |
|
||||||
|
| flex-shrink-* | shrink-* |
|
||||||
|
| flex-grow-* | grow-* |
|
||||||
|
| overflow-ellipsis | text-ellipsis |
|
||||||
|
| decoration-slice | box-decoration-slice |
|
||||||
|
| decoration-clone | box-decoration-clone |
|
||||||
|
|
||||||
|
|
||||||
|
=== tests rules ===
|
||||||
|
|
||||||
|
## Test Enforcement
|
||||||
|
|
||||||
|
- Every change must be programmatically tested. Write a new test or update an existing test, then run the affected tests to make sure they pass.
|
||||||
|
- Run the minimum number of tests needed to ensure code quality and speed. Use `php artisan test` with a specific filename or filter.
|
||||||
|
</laravel-boost-guidelines>
|
||||||
|
|
||||||
|
|
||||||
|
Random other things you should remember:
|
||||||
|
- App\Models\Application::team must return a relationship instance., always use team()
|
||||||
@@ -18,7 +18,7 @@ We take security seriously. Security updates are released as soon as possible af
|
|||||||
If you discover a security vulnerability, please follow these steps:
|
If you discover a security vulnerability, please follow these steps:
|
||||||
|
|
||||||
1. **DO NOT** disclose the vulnerability publicly.
|
1. **DO NOT** disclose the vulnerability publicly.
|
||||||
2. Send a detailed report to: `hi@coollabs.io`.
|
2. Send a detailed report to: `security@coollabs.io`.
|
||||||
3. Include in your report:
|
3. Include in your report:
|
||||||
- A description of the vulnerability
|
- A description of the vulnerability
|
||||||
- Steps to reproduce the issue
|
- Steps to reproduce the issue
|
||||||
|
|||||||
@@ -229,6 +229,8 @@ class StartPostgresql
|
|||||||
}
|
}
|
||||||
$this->commands[] = "echo 'Database started.'";
|
$this->commands[] = "echo 'Database started.'";
|
||||||
|
|
||||||
|
ray($this->commands);
|
||||||
|
|
||||||
return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
|
return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ class GetContainersStatus
|
|||||||
|
|
||||||
public $server;
|
public $server;
|
||||||
|
|
||||||
|
protected ?Collection $applicationContainerStatuses;
|
||||||
|
|
||||||
public function handle(Server $server, ?Collection $containers = null, ?Collection $containerReplicates = null)
|
public function handle(Server $server, ?Collection $containers = null, ?Collection $containerReplicates = null)
|
||||||
{
|
{
|
||||||
$this->containers = $containers;
|
$this->containers = $containers;
|
||||||
@@ -94,7 +96,11 @@ class GetContainersStatus
|
|||||||
}
|
}
|
||||||
$containerStatus = data_get($container, 'State.Status');
|
$containerStatus = data_get($container, 'State.Status');
|
||||||
$containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
|
$containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
|
||||||
$containerStatus = "$containerStatus ($containerHealth)";
|
if ($containerStatus === 'restarting') {
|
||||||
|
$containerStatus = "restarting ($containerHealth)";
|
||||||
|
} else {
|
||||||
|
$containerStatus = "$containerStatus ($containerHealth)";
|
||||||
|
}
|
||||||
$labels = Arr::undot(format_docker_labels_to_json($labels));
|
$labels = Arr::undot(format_docker_labels_to_json($labels));
|
||||||
$applicationId = data_get($labels, 'coolify.applicationId');
|
$applicationId = data_get($labels, 'coolify.applicationId');
|
||||||
if ($applicationId) {
|
if ($applicationId) {
|
||||||
@@ -119,11 +125,16 @@ class GetContainersStatus
|
|||||||
$application = $this->applications->where('id', $applicationId)->first();
|
$application = $this->applications->where('id', $applicationId)->first();
|
||||||
if ($application) {
|
if ($application) {
|
||||||
$foundApplications[] = $application->id;
|
$foundApplications[] = $application->id;
|
||||||
$statusFromDb = $application->status;
|
// Store container status for aggregation
|
||||||
if ($statusFromDb !== $containerStatus) {
|
if (! isset($this->applicationContainerStatuses)) {
|
||||||
$application->update(['status' => $containerStatus]);
|
$this->applicationContainerStatuses = collect();
|
||||||
} else {
|
}
|
||||||
$application->update(['last_online_at' => now()]);
|
if (! $this->applicationContainerStatuses->has($applicationId)) {
|
||||||
|
$this->applicationContainerStatuses->put($applicationId, collect());
|
||||||
|
}
|
||||||
|
$containerName = data_get($labels, 'com.docker.compose.service');
|
||||||
|
if ($containerName) {
|
||||||
|
$this->applicationContainerStatuses->get($applicationId)->put($containerName, $containerStatus);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Notify user that this container should not be there.
|
// Notify user that this container should not be there.
|
||||||
@@ -320,6 +331,97 @@ class GetContainersStatus
|
|||||||
}
|
}
|
||||||
// $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
|
// $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Aggregate multi-container application statuses
|
||||||
|
if (isset($this->applicationContainerStatuses) && $this->applicationContainerStatuses->isNotEmpty()) {
|
||||||
|
foreach ($this->applicationContainerStatuses as $applicationId => $containerStatuses) {
|
||||||
|
$application = $this->applications->where('id', $applicationId)->first();
|
||||||
|
if (! $application) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$aggregatedStatus = $this->aggregateApplicationStatus($application, $containerStatuses);
|
||||||
|
if ($aggregatedStatus) {
|
||||||
|
$statusFromDb = $application->status;
|
||||||
|
if ($statusFromDb !== $aggregatedStatus) {
|
||||||
|
$application->update(['status' => $aggregatedStatus]);
|
||||||
|
} else {
|
||||||
|
$application->update(['last_online_at' => now()]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ServiceChecked::dispatch($this->server->team->id);
|
ServiceChecked::dispatch($this->server->team->id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function aggregateApplicationStatus($application, Collection $containerStatuses): ?string
|
||||||
|
{
|
||||||
|
// Parse docker compose to check for excluded containers
|
||||||
|
$dockerComposeRaw = data_get($application, 'docker_compose_raw');
|
||||||
|
$excludedContainers = collect();
|
||||||
|
|
||||||
|
if ($dockerComposeRaw) {
|
||||||
|
try {
|
||||||
|
$dockerCompose = \Symfony\Component\Yaml\Yaml::parse($dockerComposeRaw);
|
||||||
|
$services = data_get($dockerCompose, 'services', []);
|
||||||
|
|
||||||
|
foreach ($services as $serviceName => $serviceConfig) {
|
||||||
|
// Check if container should be excluded
|
||||||
|
$excludeFromHc = data_get($serviceConfig, 'exclude_from_hc', false);
|
||||||
|
$restartPolicy = data_get($serviceConfig, 'restart', 'always');
|
||||||
|
|
||||||
|
if ($excludeFromHc || $restartPolicy === 'no') {
|
||||||
|
$excludedContainers->push($serviceName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
// If we can't parse, treat all containers as included
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Filter out excluded containers
|
||||||
|
$relevantStatuses = $containerStatuses->filter(function ($status, $containerName) use ($excludedContainers) {
|
||||||
|
return ! $excludedContainers->contains($containerName);
|
||||||
|
});
|
||||||
|
|
||||||
|
// If all containers are excluded, don't update status
|
||||||
|
if ($relevantStatuses->isEmpty()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$hasRunning = false;
|
||||||
|
$hasRestarting = false;
|
||||||
|
$hasUnhealthy = false;
|
||||||
|
$hasExited = false;
|
||||||
|
|
||||||
|
foreach ($relevantStatuses as $status) {
|
||||||
|
if (str($status)->contains('restarting')) {
|
||||||
|
$hasRestarting = true;
|
||||||
|
} elseif (str($status)->contains('running')) {
|
||||||
|
$hasRunning = true;
|
||||||
|
if (str($status)->contains('unhealthy')) {
|
||||||
|
$hasUnhealthy = true;
|
||||||
|
}
|
||||||
|
} elseif (str($status)->contains('exited')) {
|
||||||
|
$hasExited = true;
|
||||||
|
$hasUnhealthy = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($hasRestarting) {
|
||||||
|
return 'degraded (unhealthy)';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($hasRunning && $hasExited) {
|
||||||
|
return 'degraded (unhealthy)';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($hasRunning) {
|
||||||
|
return $hasUnhealthy ? 'running (unhealthy)' : 'running (healthy)';
|
||||||
|
}
|
||||||
|
|
||||||
|
// All containers are exited
|
||||||
|
return 'exited (unhealthy)';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ class CreateNewUser implements CreatesNewUsers
|
|||||||
$user = User::create([
|
$user = User::create([
|
||||||
'id' => 0,
|
'id' => 0,
|
||||||
'name' => $input['name'],
|
'name' => $input['name'],
|
||||||
'email' => strtolower($input['email']),
|
'email' => $input['email'],
|
||||||
'password' => Hash::make($input['password']),
|
'password' => Hash::make($input['password']),
|
||||||
]);
|
]);
|
||||||
$team = $user->teams()->first();
|
$team = $user->teams()->first();
|
||||||
@@ -52,7 +52,7 @@ class CreateNewUser implements CreatesNewUsers
|
|||||||
} else {
|
} else {
|
||||||
$user = User::create([
|
$user = User::create([
|
||||||
'name' => $input['name'],
|
'name' => $input['name'],
|
||||||
'email' => strtolower($input['email']),
|
'email' => $input['email'],
|
||||||
'password' => Hash::make($input['password']),
|
'password' => Hash::make($input['password']),
|
||||||
]);
|
]);
|
||||||
$team = $user->teams()->first();
|
$team = $user->teams()->first();
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Actions\Proxy;
|
|
||||||
|
|
||||||
use App\Models\Server;
|
|
||||||
use App\Services\ProxyDashboardCacheService;
|
|
||||||
use Lorisleiva\Actions\Concerns\AsAction;
|
|
||||||
|
|
||||||
class CheckConfiguration
|
|
||||||
{
|
|
||||||
use AsAction;
|
|
||||||
|
|
||||||
public function handle(Server $server, bool $reset = false)
|
|
||||||
{
|
|
||||||
$proxyType = $server->proxyType();
|
|
||||||
if ($proxyType === 'NONE') {
|
|
||||||
return 'OK';
|
|
||||||
}
|
|
||||||
$proxy_path = $server->proxyPath();
|
|
||||||
$payload = [
|
|
||||||
"mkdir -p $proxy_path",
|
|
||||||
"cat $proxy_path/docker-compose.yml",
|
|
||||||
];
|
|
||||||
$proxy_configuration = instant_remote_process($payload, $server, false);
|
|
||||||
if ($reset || ! $proxy_configuration || is_null($proxy_configuration)) {
|
|
||||||
$proxy_configuration = str(generate_default_proxy_configuration($server))->trim()->value();
|
|
||||||
}
|
|
||||||
if (! $proxy_configuration || is_null($proxy_configuration)) {
|
|
||||||
throw new \Exception('Could not generate proxy configuration');
|
|
||||||
}
|
|
||||||
|
|
||||||
ProxyDashboardCacheService::isTraefikDashboardAvailableFromConfiguration($server, $proxy_configuration);
|
|
||||||
|
|
||||||
return $proxy_configuration;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -70,7 +70,7 @@ class CheckProxy
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
if ($server->proxyType() !== ProxyTypes::NONE->value) {
|
if ($server->proxyType() !== ProxyTypes::NONE->value) {
|
||||||
$proxyCompose = CheckConfiguration::run($server);
|
$proxyCompose = GetProxyConfiguration::run($server);
|
||||||
if (isset($proxyCompose)) {
|
if (isset($proxyCompose)) {
|
||||||
$yaml = Yaml::parse($proxyCompose);
|
$yaml = Yaml::parse($proxyCompose);
|
||||||
$configPorts = [];
|
$configPorts = [];
|
||||||
|
|||||||
47
app/Actions/Proxy/GetProxyConfiguration.php
Normal file
47
app/Actions/Proxy/GetProxyConfiguration.php
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Actions\Proxy;
|
||||||
|
|
||||||
|
use App\Models\Server;
|
||||||
|
use App\Services\ProxyDashboardCacheService;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class GetProxyConfiguration
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public function handle(Server $server, bool $forceRegenerate = false): string
|
||||||
|
{
|
||||||
|
$proxyType = $server->proxyType();
|
||||||
|
if ($proxyType === 'NONE') {
|
||||||
|
return 'OK';
|
||||||
|
}
|
||||||
|
|
||||||
|
$proxy_path = $server->proxyPath();
|
||||||
|
$proxy_configuration = null;
|
||||||
|
|
||||||
|
// If not forcing regeneration, try to read existing configuration
|
||||||
|
if (! $forceRegenerate) {
|
||||||
|
$payload = [
|
||||||
|
"mkdir -p $proxy_path",
|
||||||
|
"cat $proxy_path/docker-compose.yml 2>/dev/null",
|
||||||
|
];
|
||||||
|
$proxy_configuration = instant_remote_process($payload, $server, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate default configuration if:
|
||||||
|
// 1. Force regenerate is requested
|
||||||
|
// 2. Configuration file doesn't exist or is empty
|
||||||
|
if ($forceRegenerate || empty(trim($proxy_configuration ?? ''))) {
|
||||||
|
$proxy_configuration = str(generate_default_proxy_configuration($server))->trim()->value();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (empty($proxy_configuration)) {
|
||||||
|
throw new \Exception('Could not get or generate proxy configuration');
|
||||||
|
}
|
||||||
|
|
||||||
|
ProxyDashboardCacheService::isTraefikDashboardAvailableFromConfiguration($server, $proxy_configuration);
|
||||||
|
|
||||||
|
return $proxy_configuration;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,22 +5,21 @@ namespace App\Actions\Proxy;
|
|||||||
use App\Models\Server;
|
use App\Models\Server;
|
||||||
use Lorisleiva\Actions\Concerns\AsAction;
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
class SaveConfiguration
|
class SaveProxyConfiguration
|
||||||
{
|
{
|
||||||
use AsAction;
|
use AsAction;
|
||||||
|
|
||||||
public function handle(Server $server, ?string $proxy_settings = null)
|
public function handle(Server $server, string $configuration): void
|
||||||
{
|
{
|
||||||
if (is_null($proxy_settings)) {
|
|
||||||
$proxy_settings = CheckConfiguration::run($server, true);
|
|
||||||
}
|
|
||||||
$proxy_path = $server->proxyPath();
|
$proxy_path = $server->proxyPath();
|
||||||
$docker_compose_yml_base64 = base64_encode($proxy_settings);
|
$docker_compose_yml_base64 = base64_encode($configuration);
|
||||||
|
|
||||||
|
// Update the saved settings hash
|
||||||
$server->proxy->last_saved_settings = str($docker_compose_yml_base64)->pipe('md5')->value;
|
$server->proxy->last_saved_settings = str($docker_compose_yml_base64)->pipe('md5')->value;
|
||||||
$server->save();
|
$server->save();
|
||||||
|
|
||||||
return instant_remote_process([
|
// Transfer the configuration file to the server
|
||||||
|
instant_remote_process([
|
||||||
"mkdir -p $proxy_path",
|
"mkdir -p $proxy_path",
|
||||||
"echo '$docker_compose_yml_base64' | base64 -d | tee $proxy_path/docker-compose.yml > /dev/null",
|
"echo '$docker_compose_yml_base64' | base64 -d | tee $proxy_path/docker-compose.yml > /dev/null",
|
||||||
], $server);
|
], $server);
|
||||||
@@ -21,11 +21,11 @@ class StartProxy
|
|||||||
}
|
}
|
||||||
$commands = collect([]);
|
$commands = collect([]);
|
||||||
$proxy_path = $server->proxyPath();
|
$proxy_path = $server->proxyPath();
|
||||||
$configuration = CheckConfiguration::run($server);
|
$configuration = GetProxyConfiguration::run($server);
|
||||||
if (! $configuration) {
|
if (! $configuration) {
|
||||||
throw new \Exception('Configuration is not synced');
|
throw new \Exception('Configuration is not synced');
|
||||||
}
|
}
|
||||||
SaveConfiguration::run($server, $configuration);
|
SaveProxyConfiguration::run($server, $configuration);
|
||||||
$docker_compose_yml_base64 = base64_encode($configuration);
|
$docker_compose_yml_base64 = base64_encode($configuration);
|
||||||
$server->proxy->last_applied_settings = str($docker_compose_yml_base64)->pipe('md5')->value();
|
$server->proxy->last_applied_settings = str($docker_compose_yml_base64)->pipe('md5')->value();
|
||||||
$server->save();
|
$server->save();
|
||||||
|
|||||||
@@ -102,7 +102,6 @@ class CheckUpdates
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
ray('Error:', $e->getMessage());
|
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'osId' => $osId,
|
'osId' => $osId,
|
||||||
|
|||||||
@@ -1,268 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Actions\Server;
|
|
||||||
|
|
||||||
use App\Actions\Database\StartDatabaseProxy;
|
|
||||||
use App\Actions\Proxy\CheckProxy;
|
|
||||||
use App\Actions\Proxy\StartProxy;
|
|
||||||
use App\Jobs\CheckAndStartSentinelJob;
|
|
||||||
use App\Jobs\ServerStorageCheckJob;
|
|
||||||
use App\Models\Application;
|
|
||||||
use App\Models\ApplicationPreview;
|
|
||||||
use App\Models\Server;
|
|
||||||
use App\Models\Service;
|
|
||||||
use App\Models\ServiceApplication;
|
|
||||||
use App\Models\ServiceDatabase;
|
|
||||||
use App\Notifications\Container\ContainerRestarted;
|
|
||||||
use Illuminate\Support\Arr;
|
|
||||||
use Lorisleiva\Actions\Concerns\AsAction;
|
|
||||||
|
|
||||||
class ServerCheck
|
|
||||||
{
|
|
||||||
use AsAction;
|
|
||||||
|
|
||||||
public Server $server;
|
|
||||||
|
|
||||||
public bool $isSentinel = false;
|
|
||||||
|
|
||||||
public $containers;
|
|
||||||
|
|
||||||
public $databases;
|
|
||||||
|
|
||||||
public function handle(Server $server, $data = null)
|
|
||||||
{
|
|
||||||
$this->server = $server;
|
|
||||||
try {
|
|
||||||
if ($this->server->isFunctional() === false) {
|
|
||||||
return 'Server is not functional.';
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $this->server->isSwarmWorker() && ! $this->server->isBuildServer()) {
|
|
||||||
|
|
||||||
if (isset($data)) {
|
|
||||||
$data = collect($data);
|
|
||||||
|
|
||||||
$this->server->sentinelHeartbeat();
|
|
||||||
|
|
||||||
$this->containers = collect(data_get($data, 'containers'));
|
|
||||||
|
|
||||||
$filesystemUsageRoot = data_get($data, 'filesystem_usage_root.used_percentage');
|
|
||||||
ServerStorageCheckJob::dispatch($this->server, $filesystemUsageRoot);
|
|
||||||
|
|
||||||
$containerReplicates = null;
|
|
||||||
$this->isSentinel = true;
|
|
||||||
} else {
|
|
||||||
['containers' => $this->containers, 'containerReplicates' => $containerReplicates] = $this->server->getContainers();
|
|
||||||
// ServerStorageCheckJob::dispatch($this->server);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_null($this->containers)) {
|
|
||||||
return 'No containers found.';
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($containerReplicates)) {
|
|
||||||
foreach ($containerReplicates as $containerReplica) {
|
|
||||||
$name = data_get($containerReplica, 'Name');
|
|
||||||
$this->containers = $this->containers->map(function ($container) use ($name, $containerReplica) {
|
|
||||||
if (data_get($container, 'Spec.Name') === $name) {
|
|
||||||
$replicas = data_get($containerReplica, 'Replicas');
|
|
||||||
$running = str($replicas)->explode('/')[0];
|
|
||||||
$total = str($replicas)->explode('/')[1];
|
|
||||||
if ($running === $total) {
|
|
||||||
data_set($container, 'State.Status', 'running');
|
|
||||||
data_set($container, 'State.Health.Status', 'healthy');
|
|
||||||
} else {
|
|
||||||
data_set($container, 'State.Status', 'starting');
|
|
||||||
data_set($container, 'State.Health.Status', 'unhealthy');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $container;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$this->checkContainers();
|
|
||||||
|
|
||||||
if ($this->server->isSentinelEnabled() && $this->isSentinel === false) {
|
|
||||||
CheckAndStartSentinelJob::dispatch($this->server);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->server->isLogDrainEnabled()) {
|
|
||||||
$this->checkLogDrainContainer();
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->server->proxySet() && ! $this->server->proxy->force_stop) {
|
|
||||||
$foundProxyContainer = $this->containers->filter(function ($value, $key) {
|
|
||||||
if ($this->server->isSwarm()) {
|
|
||||||
return data_get($value, 'Spec.Name') === 'coolify-proxy_traefik';
|
|
||||||
} else {
|
|
||||||
return data_get($value, 'Name') === '/coolify-proxy';
|
|
||||||
}
|
|
||||||
})->first();
|
|
||||||
$proxyStatus = data_get($foundProxyContainer, 'State.Status', 'exited');
|
|
||||||
if (! $foundProxyContainer || $proxyStatus !== 'running') {
|
|
||||||
try {
|
|
||||||
$shouldStart = CheckProxy::run($this->server);
|
|
||||||
if ($shouldStart) {
|
|
||||||
StartProxy::run($this->server, async: false);
|
|
||||||
$this->server->team?->notify(new ContainerRestarted('coolify-proxy', $this->server));
|
|
||||||
}
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
|
|
||||||
$this->server->save();
|
|
||||||
$connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
|
|
||||||
instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
return handleError($e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private function checkLogDrainContainer()
|
|
||||||
{
|
|
||||||
$foundLogDrainContainer = $this->containers->filter(function ($value, $key) {
|
|
||||||
return data_get($value, 'Name') === '/coolify-log-drain';
|
|
||||||
})->first();
|
|
||||||
if ($foundLogDrainContainer) {
|
|
||||||
$status = data_get($foundLogDrainContainer, 'State.Status');
|
|
||||||
if ($status !== 'running') {
|
|
||||||
StartLogDrain::dispatch($this->server);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
StartLogDrain::dispatch($this->server);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private function checkContainers()
|
|
||||||
{
|
|
||||||
foreach ($this->containers as $container) {
|
|
||||||
if ($this->isSentinel) {
|
|
||||||
$labels = Arr::undot(data_get($container, 'labels'));
|
|
||||||
} else {
|
|
||||||
if ($this->server->isSwarm()) {
|
|
||||||
$labels = Arr::undot(data_get($container, 'Spec.Labels'));
|
|
||||||
} else {
|
|
||||||
$labels = Arr::undot(data_get($container, 'Config.Labels'));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$managed = data_get($labels, 'coolify.managed');
|
|
||||||
if (! $managed) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$uuid = data_get($labels, 'coolify.name');
|
|
||||||
if (! $uuid) {
|
|
||||||
$uuid = data_get($labels, 'com.docker.compose.service');
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->isSentinel) {
|
|
||||||
$containerStatus = data_get($container, 'state');
|
|
||||||
$containerHealth = data_get($container, 'health_status');
|
|
||||||
} else {
|
|
||||||
$containerStatus = data_get($container, 'State.Status');
|
|
||||||
$containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
|
|
||||||
}
|
|
||||||
$containerStatus = "$containerStatus ($containerHealth)";
|
|
||||||
|
|
||||||
$applicationId = data_get($labels, 'coolify.applicationId');
|
|
||||||
$serviceId = data_get($labels, 'coolify.serviceId');
|
|
||||||
$databaseId = data_get($labels, 'coolify.databaseId');
|
|
||||||
$pullRequestId = data_get($labels, 'coolify.pullRequestId');
|
|
||||||
|
|
||||||
if ($applicationId) {
|
|
||||||
// Application
|
|
||||||
if ($pullRequestId != 0) {
|
|
||||||
if (str($applicationId)->contains('-')) {
|
|
||||||
$applicationId = str($applicationId)->before('-');
|
|
||||||
}
|
|
||||||
$preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $pullRequestId)->first();
|
|
||||||
if ($preview) {
|
|
||||||
$preview->update(['status' => $containerStatus]);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$application = Application::where('id', $applicationId)->first();
|
|
||||||
if ($application) {
|
|
||||||
$application->update([
|
|
||||||
'status' => $containerStatus,
|
|
||||||
'last_online_at' => now(),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} elseif (isset($serviceId)) {
|
|
||||||
// Service
|
|
||||||
$subType = data_get($labels, 'coolify.service.subType');
|
|
||||||
$subId = data_get($labels, 'coolify.service.subId');
|
|
||||||
$service = Service::where('id', $serviceId)->first();
|
|
||||||
if (! $service) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if ($subType === 'application') {
|
|
||||||
$service = ServiceApplication::where('id', $subId)->first();
|
|
||||||
} else {
|
|
||||||
$service = ServiceDatabase::where('id', $subId)->first();
|
|
||||||
}
|
|
||||||
if ($service) {
|
|
||||||
$service->update([
|
|
||||||
'status' => $containerStatus,
|
|
||||||
'last_online_at' => now(),
|
|
||||||
]);
|
|
||||||
if ($subType === 'database') {
|
|
||||||
$isPublic = data_get($service, 'is_public');
|
|
||||||
if ($isPublic) {
|
|
||||||
$foundTcpProxy = $this->containers->filter(function ($value, $key) use ($uuid) {
|
|
||||||
if ($this->isSentinel) {
|
|
||||||
return data_get($value, 'name') === $uuid.'-proxy';
|
|
||||||
} else {
|
|
||||||
|
|
||||||
if ($this->server->isSwarm()) {
|
|
||||||
return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
|
|
||||||
} else {
|
|
||||||
return data_get($value, 'Name') === "/$uuid-proxy";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})->first();
|
|
||||||
if (! $foundTcpProxy) {
|
|
||||||
StartDatabaseProxy::run($service);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Database
|
|
||||||
if (is_null($this->databases)) {
|
|
||||||
$this->databases = $this->server->databases();
|
|
||||||
}
|
|
||||||
$database = $this->databases->where('uuid', $uuid)->first();
|
|
||||||
if ($database) {
|
|
||||||
$database->update([
|
|
||||||
'status' => $containerStatus,
|
|
||||||
'last_online_at' => now(),
|
|
||||||
]);
|
|
||||||
|
|
||||||
$isPublic = data_get($database, 'is_public');
|
|
||||||
if ($isPublic) {
|
|
||||||
$foundTcpProxy = $this->containers->filter(function ($value, $key) use ($uuid) {
|
|
||||||
if ($this->isSentinel) {
|
|
||||||
return data_get($value, 'name') === $uuid.'-proxy';
|
|
||||||
} else {
|
|
||||||
if ($this->server->isSwarm()) {
|
|
||||||
return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
|
|
||||||
} else {
|
|
||||||
|
|
||||||
return data_get($value, 'Name') === "/$uuid-proxy";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})->first();
|
|
||||||
if (! $foundTcpProxy) {
|
|
||||||
StartDatabaseProxy::run($database);
|
|
||||||
// $this->server->team?->notify(new ContainerRestarted("TCP Proxy for database", $this->server));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -10,7 +10,7 @@ class StartSentinel
|
|||||||
{
|
{
|
||||||
use AsAction;
|
use AsAction;
|
||||||
|
|
||||||
public function handle(Server $server, bool $restart = false, ?string $latestVersion = null)
|
public function handle(Server $server, bool $restart = false, ?string $latestVersion = null, ?string $customImage = null)
|
||||||
{
|
{
|
||||||
if ($server->isSwarm() || $server->isBuildServer()) {
|
if ($server->isSwarm() || $server->isBuildServer()) {
|
||||||
return;
|
return;
|
||||||
@@ -44,7 +44,9 @@ class StartSentinel
|
|||||||
];
|
];
|
||||||
if (isDev()) {
|
if (isDev()) {
|
||||||
// data_set($environments, 'DEBUG', 'true');
|
// data_set($environments, 'DEBUG', 'true');
|
||||||
// $image = 'sentinel';
|
if ($customImage && ! empty($customImage)) {
|
||||||
|
$image = $customImage;
|
||||||
|
}
|
||||||
$mountDir = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/sentinel';
|
$mountDir = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/sentinel';
|
||||||
}
|
}
|
||||||
$dockerEnvironments = '-e "'.implode('" -e "', array_map(fn ($key, $value) => "$key=$value", array_keys($environments), $environments)).'"';
|
$dockerEnvironments = '-e "'.implode('" -e "', array_map(fn ($key, $value) => "$key=$value", array_keys($environments), $environments)).'"';
|
||||||
|
|||||||
@@ -26,22 +26,22 @@ class ComplexStatusCheck
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$container = instant_remote_process(["docker container inspect $(docker container ls -q --filter 'label=coolify.applicationId={$application->id}' --filter 'label=coolify.pullRequestId=0') --format '{{json .}}'"], $server, false);
|
$containers = instant_remote_process(["docker container inspect $(docker container ls -q --filter 'label=coolify.applicationId={$application->id}' --filter 'label=coolify.pullRequestId=0') --format '{{json .}}'"], $server, false);
|
||||||
$container = format_docker_command_output_to_json($container);
|
$containers = format_docker_command_output_to_json($containers);
|
||||||
if ($container->count() === 1) {
|
|
||||||
$container = $container->first();
|
if ($containers->count() > 0) {
|
||||||
$containerStatus = data_get($container, 'State.Status');
|
$statusToSet = $this->aggregateContainerStatuses($application, $containers);
|
||||||
$containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
|
|
||||||
if ($is_main_server) {
|
if ($is_main_server) {
|
||||||
$statusFromDb = $application->status;
|
$statusFromDb = $application->status;
|
||||||
if ($statusFromDb !== $containerStatus) {
|
if ($statusFromDb !== $statusToSet) {
|
||||||
$application->update(['status' => "$containerStatus:$containerHealth"]);
|
$application->update(['status' => $statusToSet]);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$additional_server = $application->additional_servers()->wherePivot('server_id', $server->id);
|
$additional_server = $application->additional_servers()->wherePivot('server_id', $server->id);
|
||||||
$statusFromDb = $additional_server->first()->pivot->status;
|
$statusFromDb = $additional_server->first()->pivot->status;
|
||||||
if ($statusFromDb !== $containerStatus) {
|
if ($statusFromDb !== $statusToSet) {
|
||||||
$additional_server->updateExistingPivot($server->id, ['status' => "$containerStatus:$containerHealth"]);
|
$additional_server->updateExistingPivot($server->id, ['status' => $statusToSet]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -57,4 +57,78 @@ class ComplexStatusCheck
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function aggregateContainerStatuses($application, $containers)
|
||||||
|
{
|
||||||
|
$dockerComposeRaw = data_get($application, 'docker_compose_raw');
|
||||||
|
$excludedContainers = collect();
|
||||||
|
|
||||||
|
if ($dockerComposeRaw) {
|
||||||
|
try {
|
||||||
|
$dockerCompose = \Symfony\Component\Yaml\Yaml::parse($dockerComposeRaw);
|
||||||
|
$services = data_get($dockerCompose, 'services', []);
|
||||||
|
|
||||||
|
foreach ($services as $serviceName => $serviceConfig) {
|
||||||
|
$excludeFromHc = data_get($serviceConfig, 'exclude_from_hc', false);
|
||||||
|
$restartPolicy = data_get($serviceConfig, 'restart', 'always');
|
||||||
|
|
||||||
|
if ($excludeFromHc || $restartPolicy === 'no') {
|
||||||
|
$excludedContainers->push($serviceName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
// If we can't parse, treat all containers as included
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$hasRunning = false;
|
||||||
|
$hasRestarting = false;
|
||||||
|
$hasUnhealthy = false;
|
||||||
|
$hasExited = false;
|
||||||
|
$relevantContainerCount = 0;
|
||||||
|
|
||||||
|
foreach ($containers as $container) {
|
||||||
|
$labels = data_get($container, 'Config.Labels', []);
|
||||||
|
$serviceName = data_get($labels, 'com.docker.compose.service');
|
||||||
|
|
||||||
|
if ($serviceName && $excludedContainers->contains($serviceName)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$relevantContainerCount++;
|
||||||
|
$containerStatus = data_get($container, 'State.Status');
|
||||||
|
$containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
|
||||||
|
|
||||||
|
if ($containerStatus === 'restarting') {
|
||||||
|
$hasRestarting = true;
|
||||||
|
$hasUnhealthy = true;
|
||||||
|
} elseif ($containerStatus === 'running') {
|
||||||
|
$hasRunning = true;
|
||||||
|
if ($containerHealth === 'unhealthy') {
|
||||||
|
$hasUnhealthy = true;
|
||||||
|
}
|
||||||
|
} elseif ($containerStatus === 'exited') {
|
||||||
|
$hasExited = true;
|
||||||
|
$hasUnhealthy = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($relevantContainerCount === 0) {
|
||||||
|
return 'running:healthy';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($hasRestarting) {
|
||||||
|
return 'degraded:unhealthy';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($hasRunning && $hasExited) {
|
||||||
|
return 'degraded:unhealthy';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($hasRunning) {
|
||||||
|
return $hasUnhealthy ? 'running:unhealthy' : 'running:healthy';
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'exited:unhealthy';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
151
app/Actions/Stripe/CancelSubscription.php
Normal file
151
app/Actions/Stripe/CancelSubscription.php
Normal file
@@ -0,0 +1,151 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Actions\Stripe;
|
||||||
|
|
||||||
|
use App\Models\Subscription;
|
||||||
|
use App\Models\User;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Stripe\StripeClient;
|
||||||
|
|
||||||
|
class CancelSubscription
|
||||||
|
{
|
||||||
|
private User $user;
|
||||||
|
|
||||||
|
private bool $isDryRun;
|
||||||
|
|
||||||
|
private ?StripeClient $stripe = null;
|
||||||
|
|
||||||
|
public function __construct(User $user, bool $isDryRun = false)
|
||||||
|
{
|
||||||
|
$this->user = $user;
|
||||||
|
$this->isDryRun = $isDryRun;
|
||||||
|
|
||||||
|
if (! $isDryRun && isCloud()) {
|
||||||
|
$this->stripe = new StripeClient(config('subscription.stripe_api_key'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getSubscriptionsPreview(): Collection
|
||||||
|
{
|
||||||
|
$subscriptions = collect();
|
||||||
|
|
||||||
|
// Get all teams the user belongs to
|
||||||
|
$teams = $this->user->teams;
|
||||||
|
|
||||||
|
foreach ($teams as $team) {
|
||||||
|
// Only include subscriptions from teams where user is owner
|
||||||
|
$userRole = $team->pivot->role;
|
||||||
|
if ($userRole === 'owner' && $team->subscription) {
|
||||||
|
$subscription = $team->subscription;
|
||||||
|
|
||||||
|
// Only include active subscriptions
|
||||||
|
if ($subscription->stripe_subscription_id &&
|
||||||
|
$subscription->stripe_invoice_paid) {
|
||||||
|
$subscriptions->push($subscription);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $subscriptions;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute(): array
|
||||||
|
{
|
||||||
|
if ($this->isDryRun) {
|
||||||
|
return [
|
||||||
|
'cancelled' => 0,
|
||||||
|
'failed' => 0,
|
||||||
|
'errors' => [],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
$cancelledCount = 0;
|
||||||
|
$failedCount = 0;
|
||||||
|
$errors = [];
|
||||||
|
|
||||||
|
$subscriptions = $this->getSubscriptionsPreview();
|
||||||
|
|
||||||
|
foreach ($subscriptions as $subscription) {
|
||||||
|
try {
|
||||||
|
$this->cancelSingleSubscription($subscription);
|
||||||
|
$cancelledCount++;
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
$failedCount++;
|
||||||
|
$errorMessage = "Failed to cancel subscription {$subscription->stripe_subscription_id}: ".$e->getMessage();
|
||||||
|
$errors[] = $errorMessage;
|
||||||
|
\Log::error($errorMessage);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
'cancelled' => $cancelledCount,
|
||||||
|
'failed' => $failedCount,
|
||||||
|
'errors' => $errors,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function cancelSingleSubscription(Subscription $subscription): void
|
||||||
|
{
|
||||||
|
if (! $this->stripe) {
|
||||||
|
throw new \Exception('Stripe client not initialized');
|
||||||
|
}
|
||||||
|
|
||||||
|
$subscriptionId = $subscription->stripe_subscription_id;
|
||||||
|
|
||||||
|
// Cancel the subscription immediately (not at period end)
|
||||||
|
$this->stripe->subscriptions->cancel($subscriptionId, []);
|
||||||
|
|
||||||
|
// Update local database
|
||||||
|
$subscription->update([
|
||||||
|
'stripe_cancel_at_period_end' => false,
|
||||||
|
'stripe_invoice_paid' => false,
|
||||||
|
'stripe_trial_already_ended' => false,
|
||||||
|
'stripe_past_due' => false,
|
||||||
|
'stripe_feedback' => 'User account deleted',
|
||||||
|
'stripe_comment' => 'Subscription cancelled due to user account deletion at '.now()->toDateTimeString(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Call the team's subscription ended method to handle cleanup
|
||||||
|
if ($subscription->team) {
|
||||||
|
$subscription->team->subscriptionEnded();
|
||||||
|
}
|
||||||
|
|
||||||
|
\Log::info("Cancelled Stripe subscription: {$subscriptionId} for team: {$subscription->team->name}");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cancel a single subscription by ID (helper method for external use)
|
||||||
|
*/
|
||||||
|
public static function cancelById(string $subscriptionId): bool
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
if (! isCloud()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$stripe = new StripeClient(config('subscription.stripe_api_key'));
|
||||||
|
$stripe->subscriptions->cancel($subscriptionId, []);
|
||||||
|
|
||||||
|
// Update local record if exists
|
||||||
|
$subscription = Subscription::where('stripe_subscription_id', $subscriptionId)->first();
|
||||||
|
if ($subscription) {
|
||||||
|
$subscription->update([
|
||||||
|
'stripe_cancel_at_period_end' => false,
|
||||||
|
'stripe_invoice_paid' => false,
|
||||||
|
'stripe_trial_already_ended' => false,
|
||||||
|
'stripe_past_due' => false,
|
||||||
|
]);
|
||||||
|
|
||||||
|
if ($subscription->team) {
|
||||||
|
$subscription->team->subscriptionEnded();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
\Log::error("Failed to cancel subscription {$subscriptionId}: ".$e->getMessage());
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
125
app/Actions/User/DeleteUserResources.php
Normal file
125
app/Actions/User/DeleteUserResources.php
Normal file
@@ -0,0 +1,125 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Actions\User;
|
||||||
|
|
||||||
|
use App\Models\User;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
class DeleteUserResources
|
||||||
|
{
|
||||||
|
private User $user;
|
||||||
|
|
||||||
|
private bool $isDryRun;
|
||||||
|
|
||||||
|
public function __construct(User $user, bool $isDryRun = false)
|
||||||
|
{
|
||||||
|
$this->user = $user;
|
||||||
|
$this->isDryRun = $isDryRun;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getResourcesPreview(): array
|
||||||
|
{
|
||||||
|
$applications = collect();
|
||||||
|
$databases = collect();
|
||||||
|
$services = collect();
|
||||||
|
|
||||||
|
// Get all teams the user belongs to
|
||||||
|
$teams = $this->user->teams;
|
||||||
|
|
||||||
|
foreach ($teams as $team) {
|
||||||
|
// Get all servers for this team
|
||||||
|
$servers = $team->servers;
|
||||||
|
|
||||||
|
foreach ($servers as $server) {
|
||||||
|
// Get applications
|
||||||
|
$serverApplications = $server->applications;
|
||||||
|
$applications = $applications->merge($serverApplications);
|
||||||
|
|
||||||
|
// Get databases
|
||||||
|
$serverDatabases = $this->getAllDatabasesForServer($server);
|
||||||
|
$databases = $databases->merge($serverDatabases);
|
||||||
|
|
||||||
|
// Get services
|
||||||
|
$serverServices = $server->services;
|
||||||
|
$services = $services->merge($serverServices);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
'applications' => $applications->unique('id'),
|
||||||
|
'databases' => $databases->unique('id'),
|
||||||
|
'services' => $services->unique('id'),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute(): array
|
||||||
|
{
|
||||||
|
if ($this->isDryRun) {
|
||||||
|
return [
|
||||||
|
'applications' => 0,
|
||||||
|
'databases' => 0,
|
||||||
|
'services' => 0,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
$deletedCounts = [
|
||||||
|
'applications' => 0,
|
||||||
|
'databases' => 0,
|
||||||
|
'services' => 0,
|
||||||
|
];
|
||||||
|
|
||||||
|
$resources = $this->getResourcesPreview();
|
||||||
|
|
||||||
|
// Delete applications
|
||||||
|
foreach ($resources['applications'] as $application) {
|
||||||
|
try {
|
||||||
|
$application->forceDelete();
|
||||||
|
$deletedCounts['applications']++;
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
\Log::error("Failed to delete application {$application->id}: ".$e->getMessage());
|
||||||
|
throw $e; // Re-throw to trigger rollback
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete databases
|
||||||
|
foreach ($resources['databases'] as $database) {
|
||||||
|
try {
|
||||||
|
$database->forceDelete();
|
||||||
|
$deletedCounts['databases']++;
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
\Log::error("Failed to delete database {$database->id}: ".$e->getMessage());
|
||||||
|
throw $e; // Re-throw to trigger rollback
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete services
|
||||||
|
foreach ($resources['services'] as $service) {
|
||||||
|
try {
|
||||||
|
$service->forceDelete();
|
||||||
|
$deletedCounts['services']++;
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
\Log::error("Failed to delete service {$service->id}: ".$e->getMessage());
|
||||||
|
throw $e; // Re-throw to trigger rollback
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $deletedCounts;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getAllDatabasesForServer($server): Collection
|
||||||
|
{
|
||||||
|
$databases = collect();
|
||||||
|
|
||||||
|
// Get all standalone database types
|
||||||
|
$databases = $databases->merge($server->postgresqls);
|
||||||
|
$databases = $databases->merge($server->mysqls);
|
||||||
|
$databases = $databases->merge($server->mariadbs);
|
||||||
|
$databases = $databases->merge($server->mongodbs);
|
||||||
|
$databases = $databases->merge($server->redis);
|
||||||
|
$databases = $databases->merge($server->keydbs);
|
||||||
|
$databases = $databases->merge($server->dragonflies);
|
||||||
|
$databases = $databases->merge($server->clickhouses);
|
||||||
|
|
||||||
|
return $databases;
|
||||||
|
}
|
||||||
|
}
|
||||||
77
app/Actions/User/DeleteUserServers.php
Normal file
77
app/Actions/User/DeleteUserServers.php
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Actions\User;
|
||||||
|
|
||||||
|
use App\Models\Server;
|
||||||
|
use App\Models\User;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
class DeleteUserServers
|
||||||
|
{
|
||||||
|
private User $user;
|
||||||
|
|
||||||
|
private bool $isDryRun;
|
||||||
|
|
||||||
|
public function __construct(User $user, bool $isDryRun = false)
|
||||||
|
{
|
||||||
|
$this->user = $user;
|
||||||
|
$this->isDryRun = $isDryRun;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getServersPreview(): Collection
|
||||||
|
{
|
||||||
|
$servers = collect();
|
||||||
|
|
||||||
|
// Get all teams the user belongs to
|
||||||
|
$teams = $this->user->teams;
|
||||||
|
|
||||||
|
foreach ($teams as $team) {
|
||||||
|
// Only include servers from teams where user is owner or admin
|
||||||
|
$userRole = $team->pivot->role;
|
||||||
|
if ($userRole === 'owner' || $userRole === 'admin') {
|
||||||
|
$teamServers = $team->servers;
|
||||||
|
$servers = $servers->merge($teamServers);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return unique servers (in case same server is in multiple teams)
|
||||||
|
return $servers->unique('id');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute(): array
|
||||||
|
{
|
||||||
|
if ($this->isDryRun) {
|
||||||
|
return [
|
||||||
|
'servers' => 0,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
$deletedCount = 0;
|
||||||
|
|
||||||
|
$servers = $this->getServersPreview();
|
||||||
|
|
||||||
|
foreach ($servers as $server) {
|
||||||
|
try {
|
||||||
|
// Skip the default server (ID 0) which is the Coolify host
|
||||||
|
if ($server->id === 0) {
|
||||||
|
\Log::info('Skipping deletion of Coolify host server (ID: 0)');
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The Server model's forceDeleting event will handle cleanup of:
|
||||||
|
// - destinations
|
||||||
|
// - settings
|
||||||
|
$server->forceDelete();
|
||||||
|
$deletedCount++;
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
\Log::error("Failed to delete server {$server->id}: ".$e->getMessage());
|
||||||
|
throw $e; // Re-throw to trigger rollback
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
'servers' => $deletedCount,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
202
app/Actions/User/DeleteUserTeams.php
Normal file
202
app/Actions/User/DeleteUserTeams.php
Normal file
@@ -0,0 +1,202 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Actions\User;
|
||||||
|
|
||||||
|
use App\Models\Team;
|
||||||
|
use App\Models\User;
|
||||||
|
|
||||||
|
class DeleteUserTeams
|
||||||
|
{
|
||||||
|
private User $user;
|
||||||
|
|
||||||
|
private bool $isDryRun;
|
||||||
|
|
||||||
|
public function __construct(User $user, bool $isDryRun = false)
|
||||||
|
{
|
||||||
|
$this->user = $user;
|
||||||
|
$this->isDryRun = $isDryRun;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getTeamsPreview(): array
|
||||||
|
{
|
||||||
|
$teamsToDelete = collect();
|
||||||
|
$teamsToTransfer = collect();
|
||||||
|
$teamsToLeave = collect();
|
||||||
|
$edgeCases = collect();
|
||||||
|
|
||||||
|
$teams = $this->user->teams;
|
||||||
|
|
||||||
|
foreach ($teams as $team) {
|
||||||
|
// Skip root team (ID 0)
|
||||||
|
if ($team->id === 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$userRole = $team->pivot->role;
|
||||||
|
$memberCount = $team->members->count();
|
||||||
|
|
||||||
|
if ($memberCount === 1) {
|
||||||
|
// User is alone in the team - delete it
|
||||||
|
$teamsToDelete->push($team);
|
||||||
|
} elseif ($userRole === 'owner') {
|
||||||
|
// Check if there are other owners
|
||||||
|
$otherOwners = $team->members
|
||||||
|
->where('id', '!=', $this->user->id)
|
||||||
|
->filter(function ($member) {
|
||||||
|
return $member->pivot->role === 'owner';
|
||||||
|
});
|
||||||
|
|
||||||
|
if ($otherOwners->isNotEmpty()) {
|
||||||
|
// There are other owners, but check if this user is paying for the subscription
|
||||||
|
if ($this->isUserPayingForTeamSubscription($team)) {
|
||||||
|
// User is paying for the subscription - this is an edge case
|
||||||
|
$edgeCases->push([
|
||||||
|
'team' => $team,
|
||||||
|
'reason' => 'User is paying for the team\'s Stripe subscription but there are other owners. The subscription needs to be cancelled or transferred to another owner\'s payment method.',
|
||||||
|
]);
|
||||||
|
} else {
|
||||||
|
// There are other owners and user is not paying, just remove this user
|
||||||
|
$teamsToLeave->push($team);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// User is the only owner, check for replacement
|
||||||
|
$newOwner = $this->findNewOwner($team);
|
||||||
|
if ($newOwner) {
|
||||||
|
$teamsToTransfer->push([
|
||||||
|
'team' => $team,
|
||||||
|
'new_owner' => $newOwner,
|
||||||
|
]);
|
||||||
|
} else {
|
||||||
|
// No suitable replacement found - this is an edge case
|
||||||
|
$edgeCases->push([
|
||||||
|
'team' => $team,
|
||||||
|
'reason' => 'No suitable owner replacement found. Team has only regular members without admin privileges.',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// User is just a member - remove them from the team
|
||||||
|
$teamsToLeave->push($team);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
'to_delete' => $teamsToDelete,
|
||||||
|
'to_transfer' => $teamsToTransfer,
|
||||||
|
'to_leave' => $teamsToLeave,
|
||||||
|
'edge_cases' => $edgeCases,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execute(): array
|
||||||
|
{
|
||||||
|
if ($this->isDryRun) {
|
||||||
|
return [
|
||||||
|
'deleted' => 0,
|
||||||
|
'transferred' => 0,
|
||||||
|
'left' => 0,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
$counts = [
|
||||||
|
'deleted' => 0,
|
||||||
|
'transferred' => 0,
|
||||||
|
'left' => 0,
|
||||||
|
];
|
||||||
|
|
||||||
|
$preview = $this->getTeamsPreview();
|
||||||
|
|
||||||
|
// Check for edge cases - should not happen here as we check earlier, but be safe
|
||||||
|
if ($preview['edge_cases']->isNotEmpty()) {
|
||||||
|
throw new \Exception('Edge cases detected during execution. This should not happen.');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete teams where user is alone
|
||||||
|
foreach ($preview['to_delete'] as $team) {
|
||||||
|
try {
|
||||||
|
// The Team model's deleting event will handle cleanup of:
|
||||||
|
// - private keys
|
||||||
|
// - sources
|
||||||
|
// - tags
|
||||||
|
// - environment variables
|
||||||
|
// - s3 storages
|
||||||
|
// - notification settings
|
||||||
|
$team->delete();
|
||||||
|
$counts['deleted']++;
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
\Log::error("Failed to delete team {$team->id}: ".$e->getMessage());
|
||||||
|
throw $e; // Re-throw to trigger rollback
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Transfer ownership for teams where user is owner but not alone
|
||||||
|
foreach ($preview['to_transfer'] as $item) {
|
||||||
|
try {
|
||||||
|
$team = $item['team'];
|
||||||
|
$newOwner = $item['new_owner'];
|
||||||
|
|
||||||
|
// Update the new owner's role to owner
|
||||||
|
$team->members()->updateExistingPivot($newOwner->id, ['role' => 'owner']);
|
||||||
|
|
||||||
|
// Remove the current user from the team
|
||||||
|
$team->members()->detach($this->user->id);
|
||||||
|
|
||||||
|
$counts['transferred']++;
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
\Log::error("Failed to transfer ownership of team {$item['team']->id}: ".$e->getMessage());
|
||||||
|
throw $e; // Re-throw to trigger rollback
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove user from teams where they're just a member
|
||||||
|
foreach ($preview['to_leave'] as $team) {
|
||||||
|
try {
|
||||||
|
$team->members()->detach($this->user->id);
|
||||||
|
$counts['left']++;
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
\Log::error("Failed to remove user from team {$team->id}: ".$e->getMessage());
|
||||||
|
throw $e; // Re-throw to trigger rollback
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $counts;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function findNewOwner(Team $team): ?User
|
||||||
|
{
|
||||||
|
// Only look for admins as potential new owners
|
||||||
|
// We don't promote regular members automatically
|
||||||
|
$otherAdmin = $team->members
|
||||||
|
->where('id', '!=', $this->user->id)
|
||||||
|
->filter(function ($member) {
|
||||||
|
return $member->pivot->role === 'admin';
|
||||||
|
})
|
||||||
|
->first();
|
||||||
|
|
||||||
|
return $otherAdmin;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function isUserPayingForTeamSubscription(Team $team): bool
|
||||||
|
{
|
||||||
|
if (! $team->subscription || ! $team->subscription->stripe_customer_id) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// In Stripe, we need to check if the customer email matches the user's email
|
||||||
|
// This would require a Stripe API call to get customer details
|
||||||
|
// For now, we'll check if the subscription was created by this user
|
||||||
|
|
||||||
|
// Alternative approach: Check if user is the one who initiated the subscription
|
||||||
|
// We could store this information when the subscription is created
|
||||||
|
// For safety, we'll assume if there's an active subscription and multiple owners,
|
||||||
|
// we should treat it as an edge case that needs manual review
|
||||||
|
|
||||||
|
if ($team->subscription->stripe_subscription_id &&
|
||||||
|
$team->subscription->stripe_invoice_paid) {
|
||||||
|
// Active subscription exists - we should be cautious
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -64,13 +64,5 @@ class CleanupDatabase extends Command
|
|||||||
if ($this->option('yes')) {
|
if ($this->option('yes')) {
|
||||||
$scheduled_task_executions->delete();
|
$scheduled_task_executions->delete();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Cleanup webhooks table
|
|
||||||
$webhooks = DB::table('webhooks')->where('created_at', '<', now()->subDays($keep_days));
|
|
||||||
$count = $webhooks->count();
|
|
||||||
echo "Delete $count entries from webhooks.\n";
|
|
||||||
if ($this->option('yes')) {
|
|
||||||
$webhooks->delete();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
namespace App\Console\Commands;
|
namespace App\Console\Commands;
|
||||||
|
|
||||||
use App\Jobs\CleanupHelperContainersJob;
|
use App\Jobs\CleanupHelperContainersJob;
|
||||||
|
use App\Jobs\DeleteResourceJob;
|
||||||
use App\Models\Application;
|
use App\Models\Application;
|
||||||
use App\Models\ApplicationDeploymentQueue;
|
use App\Models\ApplicationDeploymentQueue;
|
||||||
use App\Models\ApplicationPreview;
|
use App\Models\ApplicationPreview;
|
||||||
@@ -72,7 +73,7 @@ class CleanupStuckedResources extends Command
|
|||||||
$applications = Application::withTrashed()->whereNotNull('deleted_at')->get();
|
$applications = Application::withTrashed()->whereNotNull('deleted_at')->get();
|
||||||
foreach ($applications as $application) {
|
foreach ($applications as $application) {
|
||||||
echo "Deleting stuck application: {$application->name}\n";
|
echo "Deleting stuck application: {$application->name}\n";
|
||||||
$application->forceDelete();
|
DeleteResourceJob::dispatch($application);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Error in cleaning stuck application: {$e->getMessage()}\n";
|
echo "Error in cleaning stuck application: {$e->getMessage()}\n";
|
||||||
@@ -82,26 +83,35 @@ class CleanupStuckedResources extends Command
|
|||||||
foreach ($applicationsPreviews as $applicationPreview) {
|
foreach ($applicationsPreviews as $applicationPreview) {
|
||||||
if (! data_get($applicationPreview, 'application')) {
|
if (! data_get($applicationPreview, 'application')) {
|
||||||
echo "Deleting stuck application preview: {$applicationPreview->uuid}\n";
|
echo "Deleting stuck application preview: {$applicationPreview->uuid}\n";
|
||||||
$applicationPreview->delete();
|
DeleteResourceJob::dispatch($applicationPreview);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Error in cleaning stuck application: {$e->getMessage()}\n";
|
echo "Error in cleaning stuck application: {$e->getMessage()}\n";
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
|
$applicationsPreviews = ApplicationPreview::withTrashed()->whereNotNull('deleted_at')->get();
|
||||||
|
foreach ($applicationsPreviews as $applicationPreview) {
|
||||||
|
echo "Deleting stuck application preview: {$applicationPreview->fqdn}\n";
|
||||||
|
DeleteResourceJob::dispatch($applicationPreview);
|
||||||
|
}
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
echo "Error in cleaning stuck application: {$e->getMessage()}\n";
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
$postgresqls = StandalonePostgresql::withTrashed()->whereNotNull('deleted_at')->get();
|
$postgresqls = StandalonePostgresql::withTrashed()->whereNotNull('deleted_at')->get();
|
||||||
foreach ($postgresqls as $postgresql) {
|
foreach ($postgresqls as $postgresql) {
|
||||||
echo "Deleting stuck postgresql: {$postgresql->name}\n";
|
echo "Deleting stuck postgresql: {$postgresql->name}\n";
|
||||||
$postgresql->forceDelete();
|
DeleteResourceJob::dispatch($postgresql);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Error in cleaning stuck postgresql: {$e->getMessage()}\n";
|
echo "Error in cleaning stuck postgresql: {$e->getMessage()}\n";
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
$redis = StandaloneRedis::withTrashed()->whereNotNull('deleted_at')->get();
|
$rediss = StandaloneRedis::withTrashed()->whereNotNull('deleted_at')->get();
|
||||||
foreach ($redis as $redis) {
|
foreach ($rediss as $redis) {
|
||||||
echo "Deleting stuck redis: {$redis->name}\n";
|
echo "Deleting stuck redis: {$redis->name}\n";
|
||||||
$redis->forceDelete();
|
DeleteResourceJob::dispatch($redis);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Error in cleaning stuck redis: {$e->getMessage()}\n";
|
echo "Error in cleaning stuck redis: {$e->getMessage()}\n";
|
||||||
@@ -110,7 +120,7 @@ class CleanupStuckedResources extends Command
|
|||||||
$keydbs = StandaloneKeydb::withTrashed()->whereNotNull('deleted_at')->get();
|
$keydbs = StandaloneKeydb::withTrashed()->whereNotNull('deleted_at')->get();
|
||||||
foreach ($keydbs as $keydb) {
|
foreach ($keydbs as $keydb) {
|
||||||
echo "Deleting stuck keydb: {$keydb->name}\n";
|
echo "Deleting stuck keydb: {$keydb->name}\n";
|
||||||
$keydb->forceDelete();
|
DeleteResourceJob::dispatch($keydb);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Error in cleaning stuck keydb: {$e->getMessage()}\n";
|
echo "Error in cleaning stuck keydb: {$e->getMessage()}\n";
|
||||||
@@ -119,7 +129,7 @@ class CleanupStuckedResources extends Command
|
|||||||
$dragonflies = StandaloneDragonfly::withTrashed()->whereNotNull('deleted_at')->get();
|
$dragonflies = StandaloneDragonfly::withTrashed()->whereNotNull('deleted_at')->get();
|
||||||
foreach ($dragonflies as $dragonfly) {
|
foreach ($dragonflies as $dragonfly) {
|
||||||
echo "Deleting stuck dragonfly: {$dragonfly->name}\n";
|
echo "Deleting stuck dragonfly: {$dragonfly->name}\n";
|
||||||
$dragonfly->forceDelete();
|
DeleteResourceJob::dispatch($dragonfly);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Error in cleaning stuck dragonfly: {$e->getMessage()}\n";
|
echo "Error in cleaning stuck dragonfly: {$e->getMessage()}\n";
|
||||||
@@ -128,7 +138,7 @@ class CleanupStuckedResources extends Command
|
|||||||
$clickhouses = StandaloneClickhouse::withTrashed()->whereNotNull('deleted_at')->get();
|
$clickhouses = StandaloneClickhouse::withTrashed()->whereNotNull('deleted_at')->get();
|
||||||
foreach ($clickhouses as $clickhouse) {
|
foreach ($clickhouses as $clickhouse) {
|
||||||
echo "Deleting stuck clickhouse: {$clickhouse->name}\n";
|
echo "Deleting stuck clickhouse: {$clickhouse->name}\n";
|
||||||
$clickhouse->forceDelete();
|
DeleteResourceJob::dispatch($clickhouse);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Error in cleaning stuck clickhouse: {$e->getMessage()}\n";
|
echo "Error in cleaning stuck clickhouse: {$e->getMessage()}\n";
|
||||||
@@ -137,7 +147,7 @@ class CleanupStuckedResources extends Command
|
|||||||
$mongodbs = StandaloneMongodb::withTrashed()->whereNotNull('deleted_at')->get();
|
$mongodbs = StandaloneMongodb::withTrashed()->whereNotNull('deleted_at')->get();
|
||||||
foreach ($mongodbs as $mongodb) {
|
foreach ($mongodbs as $mongodb) {
|
||||||
echo "Deleting stuck mongodb: {$mongodb->name}\n";
|
echo "Deleting stuck mongodb: {$mongodb->name}\n";
|
||||||
$mongodb->forceDelete();
|
DeleteResourceJob::dispatch($mongodb);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Error in cleaning stuck mongodb: {$e->getMessage()}\n";
|
echo "Error in cleaning stuck mongodb: {$e->getMessage()}\n";
|
||||||
@@ -146,7 +156,7 @@ class CleanupStuckedResources extends Command
|
|||||||
$mysqls = StandaloneMysql::withTrashed()->whereNotNull('deleted_at')->get();
|
$mysqls = StandaloneMysql::withTrashed()->whereNotNull('deleted_at')->get();
|
||||||
foreach ($mysqls as $mysql) {
|
foreach ($mysqls as $mysql) {
|
||||||
echo "Deleting stuck mysql: {$mysql->name}\n";
|
echo "Deleting stuck mysql: {$mysql->name}\n";
|
||||||
$mysql->forceDelete();
|
DeleteResourceJob::dispatch($mysql);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Error in cleaning stuck mysql: {$e->getMessage()}\n";
|
echo "Error in cleaning stuck mysql: {$e->getMessage()}\n";
|
||||||
@@ -155,7 +165,7 @@ class CleanupStuckedResources extends Command
|
|||||||
$mariadbs = StandaloneMariadb::withTrashed()->whereNotNull('deleted_at')->get();
|
$mariadbs = StandaloneMariadb::withTrashed()->whereNotNull('deleted_at')->get();
|
||||||
foreach ($mariadbs as $mariadb) {
|
foreach ($mariadbs as $mariadb) {
|
||||||
echo "Deleting stuck mariadb: {$mariadb->name}\n";
|
echo "Deleting stuck mariadb: {$mariadb->name}\n";
|
||||||
$mariadb->forceDelete();
|
DeleteResourceJob::dispatch($mariadb);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Error in cleaning stuck mariadb: {$e->getMessage()}\n";
|
echo "Error in cleaning stuck mariadb: {$e->getMessage()}\n";
|
||||||
@@ -164,7 +174,7 @@ class CleanupStuckedResources extends Command
|
|||||||
$services = Service::withTrashed()->whereNotNull('deleted_at')->get();
|
$services = Service::withTrashed()->whereNotNull('deleted_at')->get();
|
||||||
foreach ($services as $service) {
|
foreach ($services as $service) {
|
||||||
echo "Deleting stuck service: {$service->name}\n";
|
echo "Deleting stuck service: {$service->name}\n";
|
||||||
$service->forceDelete();
|
DeleteResourceJob::dispatch($service);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Error in cleaning stuck service: {$e->getMessage()}\n";
|
echo "Error in cleaning stuck service: {$e->getMessage()}\n";
|
||||||
@@ -217,19 +227,19 @@ class CleanupStuckedResources extends Command
|
|||||||
foreach ($applications as $application) {
|
foreach ($applications as $application) {
|
||||||
if (! data_get($application, 'environment')) {
|
if (! data_get($application, 'environment')) {
|
||||||
echo 'Application without environment: '.$application->name.'\n';
|
echo 'Application without environment: '.$application->name.'\n';
|
||||||
$application->forceDelete();
|
DeleteResourceJob::dispatch($application);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (! $application->destination()) {
|
if (! $application->destination()) {
|
||||||
echo 'Application without destination: '.$application->name.'\n';
|
echo 'Application without destination: '.$application->name.'\n';
|
||||||
$application->forceDelete();
|
DeleteResourceJob::dispatch($application);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (! data_get($application, 'destination.server')) {
|
if (! data_get($application, 'destination.server')) {
|
||||||
echo 'Application without server: '.$application->name.'\n';
|
echo 'Application without server: '.$application->name.'\n';
|
||||||
$application->forceDelete();
|
DeleteResourceJob::dispatch($application);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -242,19 +252,19 @@ class CleanupStuckedResources extends Command
|
|||||||
foreach ($postgresqls as $postgresql) {
|
foreach ($postgresqls as $postgresql) {
|
||||||
if (! data_get($postgresql, 'environment')) {
|
if (! data_get($postgresql, 'environment')) {
|
||||||
echo 'Postgresql without environment: '.$postgresql->name.'\n';
|
echo 'Postgresql without environment: '.$postgresql->name.'\n';
|
||||||
$postgresql->forceDelete();
|
DeleteResourceJob::dispatch($postgresql);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (! $postgresql->destination()) {
|
if (! $postgresql->destination()) {
|
||||||
echo 'Postgresql without destination: '.$postgresql->name.'\n';
|
echo 'Postgresql without destination: '.$postgresql->name.'\n';
|
||||||
$postgresql->forceDelete();
|
DeleteResourceJob::dispatch($postgresql);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (! data_get($postgresql, 'destination.server')) {
|
if (! data_get($postgresql, 'destination.server')) {
|
||||||
echo 'Postgresql without server: '.$postgresql->name.'\n';
|
echo 'Postgresql without server: '.$postgresql->name.'\n';
|
||||||
$postgresql->forceDelete();
|
DeleteResourceJob::dispatch($postgresql);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -267,19 +277,19 @@ class CleanupStuckedResources extends Command
|
|||||||
foreach ($redis as $redis) {
|
foreach ($redis as $redis) {
|
||||||
if (! data_get($redis, 'environment')) {
|
if (! data_get($redis, 'environment')) {
|
||||||
echo 'Redis without environment: '.$redis->name.'\n';
|
echo 'Redis without environment: '.$redis->name.'\n';
|
||||||
$redis->forceDelete();
|
DeleteResourceJob::dispatch($redis);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (! $redis->destination()) {
|
if (! $redis->destination()) {
|
||||||
echo 'Redis without destination: '.$redis->name.'\n';
|
echo 'Redis without destination: '.$redis->name.'\n';
|
||||||
$redis->forceDelete();
|
DeleteResourceJob::dispatch($redis);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (! data_get($redis, 'destination.server')) {
|
if (! data_get($redis, 'destination.server')) {
|
||||||
echo 'Redis without server: '.$redis->name.'\n';
|
echo 'Redis without server: '.$redis->name.'\n';
|
||||||
$redis->forceDelete();
|
DeleteResourceJob::dispatch($redis);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -293,19 +303,19 @@ class CleanupStuckedResources extends Command
|
|||||||
foreach ($mongodbs as $mongodb) {
|
foreach ($mongodbs as $mongodb) {
|
||||||
if (! data_get($mongodb, 'environment')) {
|
if (! data_get($mongodb, 'environment')) {
|
||||||
echo 'Mongodb without environment: '.$mongodb->name.'\n';
|
echo 'Mongodb without environment: '.$mongodb->name.'\n';
|
||||||
$mongodb->forceDelete();
|
DeleteResourceJob::dispatch($mongodb);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (! $mongodb->destination()) {
|
if (! $mongodb->destination()) {
|
||||||
echo 'Mongodb without destination: '.$mongodb->name.'\n';
|
echo 'Mongodb without destination: '.$mongodb->name.'\n';
|
||||||
$mongodb->forceDelete();
|
DeleteResourceJob::dispatch($mongodb);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (! data_get($mongodb, 'destination.server')) {
|
if (! data_get($mongodb, 'destination.server')) {
|
||||||
echo 'Mongodb without server: '.$mongodb->name.'\n';
|
echo 'Mongodb without server: '.$mongodb->name.'\n';
|
||||||
$mongodb->forceDelete();
|
DeleteResourceJob::dispatch($mongodb);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -319,19 +329,19 @@ class CleanupStuckedResources extends Command
|
|||||||
foreach ($mysqls as $mysql) {
|
foreach ($mysqls as $mysql) {
|
||||||
if (! data_get($mysql, 'environment')) {
|
if (! data_get($mysql, 'environment')) {
|
||||||
echo 'Mysql without environment: '.$mysql->name.'\n';
|
echo 'Mysql without environment: '.$mysql->name.'\n';
|
||||||
$mysql->forceDelete();
|
DeleteResourceJob::dispatch($mysql);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (! $mysql->destination()) {
|
if (! $mysql->destination()) {
|
||||||
echo 'Mysql without destination: '.$mysql->name.'\n';
|
echo 'Mysql without destination: '.$mysql->name.'\n';
|
||||||
$mysql->forceDelete();
|
DeleteResourceJob::dispatch($mysql);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (! data_get($mysql, 'destination.server')) {
|
if (! data_get($mysql, 'destination.server')) {
|
||||||
echo 'Mysql without server: '.$mysql->name.'\n';
|
echo 'Mysql without server: '.$mysql->name.'\n';
|
||||||
$mysql->forceDelete();
|
DeleteResourceJob::dispatch($mysql);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -345,19 +355,19 @@ class CleanupStuckedResources extends Command
|
|||||||
foreach ($mariadbs as $mariadb) {
|
foreach ($mariadbs as $mariadb) {
|
||||||
if (! data_get($mariadb, 'environment')) {
|
if (! data_get($mariadb, 'environment')) {
|
||||||
echo 'Mariadb without environment: '.$mariadb->name.'\n';
|
echo 'Mariadb without environment: '.$mariadb->name.'\n';
|
||||||
$mariadb->forceDelete();
|
DeleteResourceJob::dispatch($mariadb);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (! $mariadb->destination()) {
|
if (! $mariadb->destination()) {
|
||||||
echo 'Mariadb without destination: '.$mariadb->name.'\n';
|
echo 'Mariadb without destination: '.$mariadb->name.'\n';
|
||||||
$mariadb->forceDelete();
|
DeleteResourceJob::dispatch($mariadb);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (! data_get($mariadb, 'destination.server')) {
|
if (! data_get($mariadb, 'destination.server')) {
|
||||||
echo 'Mariadb without server: '.$mariadb->name.'\n';
|
echo 'Mariadb without server: '.$mariadb->name.'\n';
|
||||||
$mariadb->forceDelete();
|
DeleteResourceJob::dispatch($mariadb);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -371,19 +381,19 @@ class CleanupStuckedResources extends Command
|
|||||||
foreach ($services as $service) {
|
foreach ($services as $service) {
|
||||||
if (! data_get($service, 'environment')) {
|
if (! data_get($service, 'environment')) {
|
||||||
echo 'Service without environment: '.$service->name.'\n';
|
echo 'Service without environment: '.$service->name.'\n';
|
||||||
$service->forceDelete();
|
DeleteResourceJob::dispatch($service);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (! $service->destination()) {
|
if (! $service->destination()) {
|
||||||
echo 'Service without destination: '.$service->name.'\n';
|
echo 'Service without destination: '.$service->name.'\n';
|
||||||
$service->forceDelete();
|
DeleteResourceJob::dispatch($service);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (! data_get($service, 'server')) {
|
if (! data_get($service, 'server')) {
|
||||||
echo 'Service without server: '.$service->name.'\n';
|
echo 'Service without server: '.$service->name.'\n';
|
||||||
$service->forceDelete();
|
DeleteResourceJob::dispatch($service);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -396,7 +406,7 @@ class CleanupStuckedResources extends Command
|
|||||||
foreach ($serviceApplications as $service) {
|
foreach ($serviceApplications as $service) {
|
||||||
if (! data_get($service, 'service')) {
|
if (! data_get($service, 'service')) {
|
||||||
echo 'ServiceApplication without service: '.$service->name.'\n';
|
echo 'ServiceApplication without service: '.$service->name.'\n';
|
||||||
$service->forceDelete();
|
DeleteResourceJob::dispatch($service);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -409,7 +419,7 @@ class CleanupStuckedResources extends Command
|
|||||||
foreach ($serviceDatabases as $service) {
|
foreach ($serviceDatabases as $service) {
|
||||||
if (! data_get($service, 'service')) {
|
if (! data_get($service, 'service')) {
|
||||||
echo 'ServiceDatabase without service: '.$service->name.'\n';
|
echo 'ServiceDatabase without service: '.$service->name.'\n';
|
||||||
$service->forceDelete();
|
DeleteResourceJob::dispatch($service);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
722
app/Console/Commands/CloudDeleteUser.php
Normal file
722
app/Console/Commands/CloudDeleteUser.php
Normal file
@@ -0,0 +1,722 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Console\Commands;
|
||||||
|
|
||||||
|
use App\Actions\Stripe\CancelSubscription;
|
||||||
|
use App\Actions\User\DeleteUserResources;
|
||||||
|
use App\Actions\User\DeleteUserServers;
|
||||||
|
use App\Actions\User\DeleteUserTeams;
|
||||||
|
use App\Models\User;
|
||||||
|
use Illuminate\Console\Command;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
|
|
||||||
|
class CloudDeleteUser extends Command
|
||||||
|
{
|
||||||
|
protected $signature = 'cloud:delete-user {email}
|
||||||
|
{--dry-run : Preview what will be deleted without actually deleting}
|
||||||
|
{--skip-stripe : Skip Stripe subscription cancellation}
|
||||||
|
{--skip-resources : Skip resource deletion}';
|
||||||
|
|
||||||
|
protected $description = 'Delete a user from the cloud instance with phase-by-phase confirmation';
|
||||||
|
|
||||||
|
private bool $isDryRun = false;
|
||||||
|
|
||||||
|
private bool $skipStripe = false;
|
||||||
|
|
||||||
|
private bool $skipResources = false;
|
||||||
|
|
||||||
|
private User $user;
|
||||||
|
|
||||||
|
public function handle()
|
||||||
|
{
|
||||||
|
if (! isCloud()) {
|
||||||
|
$this->error('This command is only available on cloud instances.');
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
$email = $this->argument('email');
|
||||||
|
$this->isDryRun = $this->option('dry-run');
|
||||||
|
$this->skipStripe = $this->option('skip-stripe');
|
||||||
|
$this->skipResources = $this->option('skip-resources');
|
||||||
|
|
||||||
|
if ($this->isDryRun) {
|
||||||
|
$this->info('🔍 DRY RUN MODE - No data will be deleted');
|
||||||
|
$this->newLine();
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$this->user = User::whereEmail($email)->firstOrFail();
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
$this->error("User with email '{$email}' not found.");
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->logAction("Starting user deletion process for: {$email}");
|
||||||
|
|
||||||
|
// Phase 1: Show User Overview (outside transaction)
|
||||||
|
if (! $this->showUserOverview()) {
|
||||||
|
$this->info('User deletion cancelled.');
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If not dry run, wrap everything in a transaction
|
||||||
|
if (! $this->isDryRun) {
|
||||||
|
try {
|
||||||
|
DB::beginTransaction();
|
||||||
|
|
||||||
|
// Phase 2: Delete Resources
|
||||||
|
if (! $this->skipResources) {
|
||||||
|
if (! $this->deleteResources()) {
|
||||||
|
DB::rollBack();
|
||||||
|
$this->error('User deletion failed at resource deletion phase. All changes rolled back.');
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Phase 3: Delete Servers
|
||||||
|
if (! $this->deleteServers()) {
|
||||||
|
DB::rollBack();
|
||||||
|
$this->error('User deletion failed at server deletion phase. All changes rolled back.');
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Phase 4: Handle Teams
|
||||||
|
if (! $this->handleTeams()) {
|
||||||
|
DB::rollBack();
|
||||||
|
$this->error('User deletion failed at team handling phase. All changes rolled back.');
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Phase 5: Cancel Stripe Subscriptions
|
||||||
|
if (! $this->skipStripe && isCloud()) {
|
||||||
|
if (! $this->cancelStripeSubscriptions()) {
|
||||||
|
DB::rollBack();
|
||||||
|
$this->error('User deletion failed at Stripe cancellation phase. All changes rolled back.');
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Phase 6: Delete User Profile
|
||||||
|
if (! $this->deleteUserProfile()) {
|
||||||
|
DB::rollBack();
|
||||||
|
$this->error('User deletion failed at final phase. All changes rolled back.');
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Commit the transaction
|
||||||
|
DB::commit();
|
||||||
|
|
||||||
|
$this->newLine();
|
||||||
|
$this->info('✅ User deletion completed successfully!');
|
||||||
|
$this->logAction("User deletion completed for: {$email}");
|
||||||
|
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
DB::rollBack();
|
||||||
|
$this->error('An error occurred during user deletion: '.$e->getMessage());
|
||||||
|
$this->logAction("User deletion failed for {$email}: ".$e->getMessage());
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Dry run mode - just run through the phases without transaction
|
||||||
|
// Phase 2: Delete Resources
|
||||||
|
if (! $this->skipResources) {
|
||||||
|
if (! $this->deleteResources()) {
|
||||||
|
$this->info('User deletion would be cancelled at resource deletion phase.');
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Phase 3: Delete Servers
|
||||||
|
if (! $this->deleteServers()) {
|
||||||
|
$this->info('User deletion would be cancelled at server deletion phase.');
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Phase 4: Handle Teams
|
||||||
|
if (! $this->handleTeams()) {
|
||||||
|
$this->info('User deletion would be cancelled at team handling phase.');
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Phase 5: Cancel Stripe Subscriptions
|
||||||
|
if (! $this->skipStripe && isCloud()) {
|
||||||
|
if (! $this->cancelStripeSubscriptions()) {
|
||||||
|
$this->info('User deletion would be cancelled at Stripe cancellation phase.');
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Phase 6: Delete User Profile
|
||||||
|
if (! $this->deleteUserProfile()) {
|
||||||
|
$this->info('User deletion would be cancelled at final phase.');
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->newLine();
|
||||||
|
$this->info('✅ DRY RUN completed successfully! No data was deleted.');
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function showUserOverview(): bool
|
||||||
|
{
|
||||||
|
$this->info('═══════════════════════════════════════');
|
||||||
|
$this->info('PHASE 1: USER OVERVIEW');
|
||||||
|
$this->info('═══════════════════════════════════════');
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
$teams = $this->user->teams;
|
||||||
|
$ownedTeams = $teams->filter(fn ($team) => $team->pivot->role === 'owner');
|
||||||
|
$memberTeams = $teams->filter(fn ($team) => $team->pivot->role !== 'owner');
|
||||||
|
|
||||||
|
// Collect all servers from all teams
|
||||||
|
$allServers = collect();
|
||||||
|
$allApplications = collect();
|
||||||
|
$allDatabases = collect();
|
||||||
|
$allServices = collect();
|
||||||
|
$activeSubscriptions = collect();
|
||||||
|
|
||||||
|
foreach ($teams as $team) {
|
||||||
|
$servers = $team->servers;
|
||||||
|
$allServers = $allServers->merge($servers);
|
||||||
|
|
||||||
|
foreach ($servers as $server) {
|
||||||
|
$resources = $server->definedResources();
|
||||||
|
foreach ($resources as $resource) {
|
||||||
|
if ($resource instanceof \App\Models\Application) {
|
||||||
|
$allApplications->push($resource);
|
||||||
|
} elseif ($resource instanceof \App\Models\Service) {
|
||||||
|
$allServices->push($resource);
|
||||||
|
} else {
|
||||||
|
$allDatabases->push($resource);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($team->subscription && $team->subscription->stripe_subscription_id) {
|
||||||
|
$activeSubscriptions->push($team->subscription);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->table(
|
||||||
|
['Property', 'Value'],
|
||||||
|
[
|
||||||
|
['User', $this->user->email],
|
||||||
|
['User ID', $this->user->id],
|
||||||
|
['Created', $this->user->created_at->format('Y-m-d H:i:s')],
|
||||||
|
['Last Login', $this->user->updated_at->format('Y-m-d H:i:s')],
|
||||||
|
['Teams (Total)', $teams->count()],
|
||||||
|
['Teams (Owner)', $ownedTeams->count()],
|
||||||
|
['Teams (Member)', $memberTeams->count()],
|
||||||
|
['Servers', $allServers->unique('id')->count()],
|
||||||
|
['Applications', $allApplications->count()],
|
||||||
|
['Databases', $allDatabases->count()],
|
||||||
|
['Services', $allServices->count()],
|
||||||
|
['Active Stripe Subscriptions', $activeSubscriptions->count()],
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
$this->warn('⚠️ WARNING: This will permanently delete the user and all associated data!');
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
if (! $this->confirm('Do you want to continue with the deletion process?', false)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function deleteResources(): bool
|
||||||
|
{
|
||||||
|
$this->newLine();
|
||||||
|
$this->info('═══════════════════════════════════════');
|
||||||
|
$this->info('PHASE 2: DELETE RESOURCES');
|
||||||
|
$this->info('═══════════════════════════════════════');
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
$action = new DeleteUserResources($this->user, $this->isDryRun);
|
||||||
|
$resources = $action->getResourcesPreview();
|
||||||
|
|
||||||
|
if ($resources['applications']->isEmpty() &&
|
||||||
|
$resources['databases']->isEmpty() &&
|
||||||
|
$resources['services']->isEmpty()) {
|
||||||
|
$this->info('No resources to delete.');
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->info('Resources to be deleted:');
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
if ($resources['applications']->isNotEmpty()) {
|
||||||
|
$this->warn("Applications to be deleted ({$resources['applications']->count()}):");
|
||||||
|
$this->table(
|
||||||
|
['Name', 'UUID', 'Server', 'Status'],
|
||||||
|
$resources['applications']->map(function ($app) {
|
||||||
|
return [
|
||||||
|
$app->name,
|
||||||
|
$app->uuid,
|
||||||
|
$app->destination->server->name,
|
||||||
|
$app->status ?? 'unknown',
|
||||||
|
];
|
||||||
|
})->toArray()
|
||||||
|
);
|
||||||
|
$this->newLine();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($resources['databases']->isNotEmpty()) {
|
||||||
|
$this->warn("Databases to be deleted ({$resources['databases']->count()}):");
|
||||||
|
$this->table(
|
||||||
|
['Name', 'Type', 'UUID', 'Server'],
|
||||||
|
$resources['databases']->map(function ($db) {
|
||||||
|
return [
|
||||||
|
$db->name,
|
||||||
|
class_basename($db),
|
||||||
|
$db->uuid,
|
||||||
|
$db->destination->server->name,
|
||||||
|
];
|
||||||
|
})->toArray()
|
||||||
|
);
|
||||||
|
$this->newLine();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($resources['services']->isNotEmpty()) {
|
||||||
|
$this->warn("Services to be deleted ({$resources['services']->count()}):");
|
||||||
|
$this->table(
|
||||||
|
['Name', 'UUID', 'Server'],
|
||||||
|
$resources['services']->map(function ($service) {
|
||||||
|
return [
|
||||||
|
$service->name,
|
||||||
|
$service->uuid,
|
||||||
|
$service->server->name,
|
||||||
|
];
|
||||||
|
})->toArray()
|
||||||
|
);
|
||||||
|
$this->newLine();
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->error('⚠️ THIS ACTION CANNOT BE UNDONE!');
|
||||||
|
if (! $this->confirm('Are you sure you want to delete all these resources?', false)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! $this->isDryRun) {
|
||||||
|
$this->info('Deleting resources...');
|
||||||
|
$result = $action->execute();
|
||||||
|
$this->info("Deleted: {$result['applications']} applications, {$result['databases']} databases, {$result['services']} services");
|
||||||
|
$this->logAction("Deleted resources for user {$this->user->email}: {$result['applications']} apps, {$result['databases']} databases, {$result['services']} services");
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function deleteServers(): bool
|
||||||
|
{
|
||||||
|
$this->newLine();
|
||||||
|
$this->info('═══════════════════════════════════════');
|
||||||
|
$this->info('PHASE 3: DELETE SERVERS');
|
||||||
|
$this->info('═══════════════════════════════════════');
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
$action = new DeleteUserServers($this->user, $this->isDryRun);
|
||||||
|
$servers = $action->getServersPreview();
|
||||||
|
|
||||||
|
if ($servers->isEmpty()) {
|
||||||
|
$this->info('No servers to delete.');
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->warn("Servers to be deleted ({$servers->count()}):");
|
||||||
|
$this->table(
|
||||||
|
['ID', 'Name', 'IP', 'Description', 'Resources Count'],
|
||||||
|
$servers->map(function ($server) {
|
||||||
|
$resourceCount = $server->definedResources()->count();
|
||||||
|
|
||||||
|
return [
|
||||||
|
$server->id,
|
||||||
|
$server->name,
|
||||||
|
$server->ip,
|
||||||
|
$server->description ?? '-',
|
||||||
|
$resourceCount,
|
||||||
|
];
|
||||||
|
})->toArray()
|
||||||
|
);
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
$this->error('⚠️ WARNING: Deleting servers will remove all server configurations!');
|
||||||
|
if (! $this->confirm('Are you sure you want to delete all these servers?', false)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! $this->isDryRun) {
|
||||||
|
$this->info('Deleting servers...');
|
||||||
|
$result = $action->execute();
|
||||||
|
$this->info("Deleted {$result['servers']} servers");
|
||||||
|
$this->logAction("Deleted {$result['servers']} servers for user {$this->user->email}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function handleTeams(): bool
|
||||||
|
{
|
||||||
|
$this->newLine();
|
||||||
|
$this->info('═══════════════════════════════════════');
|
||||||
|
$this->info('PHASE 4: HANDLE TEAMS');
|
||||||
|
$this->info('═══════════════════════════════════════');
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
$action = new DeleteUserTeams($this->user, $this->isDryRun);
|
||||||
|
$preview = $action->getTeamsPreview();
|
||||||
|
|
||||||
|
// Check for edge cases first - EXIT IMMEDIATELY if found
|
||||||
|
if ($preview['edge_cases']->isNotEmpty()) {
|
||||||
|
$this->error('═══════════════════════════════════════');
|
||||||
|
$this->error('⚠️ EDGE CASES DETECTED - CANNOT PROCEED');
|
||||||
|
$this->error('═══════════════════════════════════════');
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
foreach ($preview['edge_cases'] as $edgeCase) {
|
||||||
|
$team = $edgeCase['team'];
|
||||||
|
$reason = $edgeCase['reason'];
|
||||||
|
$this->error("Team: {$team->name} (ID: {$team->id})");
|
||||||
|
$this->error("Issue: {$reason}");
|
||||||
|
|
||||||
|
// Show team members for context
|
||||||
|
$this->info('Current members:');
|
||||||
|
foreach ($team->members as $member) {
|
||||||
|
$role = $member->pivot->role;
|
||||||
|
$this->line(" - {$member->name} ({$member->email}) - Role: {$role}");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for active resources
|
||||||
|
$resourceCount = 0;
|
||||||
|
foreach ($team->servers as $server) {
|
||||||
|
$resources = $server->definedResources();
|
||||||
|
$resourceCount += $resources->count();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($resourceCount > 0) {
|
||||||
|
$this->warn(" ⚠️ This team has {$resourceCount} active resources!");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show subscription details if relevant
|
||||||
|
if ($team->subscription && $team->subscription->stripe_subscription_id) {
|
||||||
|
$this->warn(' ⚠️ Active Stripe subscription details:');
|
||||||
|
$this->warn(" Subscription ID: {$team->subscription->stripe_subscription_id}");
|
||||||
|
$this->warn(" Customer ID: {$team->subscription->stripe_customer_id}");
|
||||||
|
|
||||||
|
// Show other owners who could potentially take over
|
||||||
|
$otherOwners = $team->members
|
||||||
|
->where('id', '!=', $this->user->id)
|
||||||
|
->filter(function ($member) {
|
||||||
|
return $member->pivot->role === 'owner';
|
||||||
|
});
|
||||||
|
|
||||||
|
if ($otherOwners->isNotEmpty()) {
|
||||||
|
$this->info(' Other owners who could take over billing:');
|
||||||
|
foreach ($otherOwners as $owner) {
|
||||||
|
$this->line(" - {$owner->name} ({$owner->email})");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->newLine();
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->error('Please resolve these issues manually before retrying:');
|
||||||
|
|
||||||
|
// Check if any edge case involves subscription payment issues
|
||||||
|
$hasSubscriptionIssue = $preview['edge_cases']->contains(function ($edgeCase) {
|
||||||
|
return str_contains($edgeCase['reason'], 'Stripe subscription');
|
||||||
|
});
|
||||||
|
|
||||||
|
if ($hasSubscriptionIssue) {
|
||||||
|
$this->info('For teams with subscription payment issues:');
|
||||||
|
$this->info('1. Cancel the subscription through Stripe dashboard, OR');
|
||||||
|
$this->info('2. Transfer the subscription to another owner\'s payment method, OR');
|
||||||
|
$this->info('3. Have the other owner create a new subscription after cancelling this one');
|
||||||
|
$this->newLine();
|
||||||
|
}
|
||||||
|
|
||||||
|
$hasNoOwnerReplacement = $preview['edge_cases']->contains(function ($edgeCase) {
|
||||||
|
return str_contains($edgeCase['reason'], 'No suitable owner replacement');
|
||||||
|
});
|
||||||
|
|
||||||
|
if ($hasNoOwnerReplacement) {
|
||||||
|
$this->info('For teams with no suitable owner replacement:');
|
||||||
|
$this->info('1. Assign an admin role to a trusted member, OR');
|
||||||
|
$this->info('2. Transfer team resources to another team, OR');
|
||||||
|
$this->info('3. Delete the team manually if no longer needed');
|
||||||
|
$this->newLine();
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->error('USER DELETION ABORTED DUE TO EDGE CASES');
|
||||||
|
$this->logAction("User deletion aborted for {$this->user->email}: Edge cases in team handling");
|
||||||
|
|
||||||
|
// Exit immediately - don't proceed with deletion
|
||||||
|
if (! $this->isDryRun) {
|
||||||
|
DB::rollBack();
|
||||||
|
}
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($preview['to_delete']->isEmpty() &&
|
||||||
|
$preview['to_transfer']->isEmpty() &&
|
||||||
|
$preview['to_leave']->isEmpty()) {
|
||||||
|
$this->info('No team changes needed.');
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($preview['to_delete']->isNotEmpty()) {
|
||||||
|
$this->warn('Teams to be DELETED (user is the only member):');
|
||||||
|
$this->table(
|
||||||
|
['ID', 'Name', 'Resources', 'Subscription'],
|
||||||
|
$preview['to_delete']->map(function ($team) {
|
||||||
|
$resourceCount = 0;
|
||||||
|
foreach ($team->servers as $server) {
|
||||||
|
$resourceCount += $server->definedResources()->count();
|
||||||
|
}
|
||||||
|
$hasSubscription = $team->subscription && $team->subscription->stripe_subscription_id
|
||||||
|
? '⚠️ YES - '.$team->subscription->stripe_subscription_id
|
||||||
|
: 'No';
|
||||||
|
|
||||||
|
return [
|
||||||
|
$team->id,
|
||||||
|
$team->name,
|
||||||
|
$resourceCount,
|
||||||
|
$hasSubscription,
|
||||||
|
];
|
||||||
|
})->toArray()
|
||||||
|
);
|
||||||
|
$this->newLine();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($preview['to_transfer']->isNotEmpty()) {
|
||||||
|
$this->warn('Teams where ownership will be TRANSFERRED:');
|
||||||
|
$this->table(
|
||||||
|
['Team ID', 'Team Name', 'New Owner', 'New Owner Email'],
|
||||||
|
$preview['to_transfer']->map(function ($item) {
|
||||||
|
return [
|
||||||
|
$item['team']->id,
|
||||||
|
$item['team']->name,
|
||||||
|
$item['new_owner']->name,
|
||||||
|
$item['new_owner']->email,
|
||||||
|
];
|
||||||
|
})->toArray()
|
||||||
|
);
|
||||||
|
$this->newLine();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($preview['to_leave']->isNotEmpty()) {
|
||||||
|
$this->warn('Teams where user will be REMOVED (other owners/admins exist):');
|
||||||
|
$userId = $this->user->id;
|
||||||
|
$this->table(
|
||||||
|
['ID', 'Name', 'User Role', 'Other Members'],
|
||||||
|
$preview['to_leave']->map(function ($team) use ($userId) {
|
||||||
|
$userRole = $team->members->where('id', $userId)->first()->pivot->role;
|
||||||
|
$otherMembers = $team->members->count() - 1;
|
||||||
|
|
||||||
|
return [
|
||||||
|
$team->id,
|
||||||
|
$team->name,
|
||||||
|
$userRole,
|
||||||
|
$otherMembers,
|
||||||
|
];
|
||||||
|
})->toArray()
|
||||||
|
);
|
||||||
|
$this->newLine();
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->error('⚠️ WARNING: Team changes affect access control and ownership!');
|
||||||
|
if (! $this->confirm('Are you sure you want to proceed with these team changes?', false)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! $this->isDryRun) {
|
||||||
|
$this->info('Processing team changes...');
|
||||||
|
$result = $action->execute();
|
||||||
|
$this->info("Teams deleted: {$result['deleted']}, ownership transferred: {$result['transferred']}, left: {$result['left']}");
|
||||||
|
$this->logAction("Team changes for user {$this->user->email}: deleted {$result['deleted']}, transferred {$result['transferred']}, left {$result['left']}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function cancelStripeSubscriptions(): bool
|
||||||
|
{
|
||||||
|
$this->newLine();
|
||||||
|
$this->info('═══════════════════════════════════════');
|
||||||
|
$this->info('PHASE 5: CANCEL STRIPE SUBSCRIPTIONS');
|
||||||
|
$this->info('═══════════════════════════════════════');
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
$action = new CancelSubscription($this->user, $this->isDryRun);
|
||||||
|
$subscriptions = $action->getSubscriptionsPreview();
|
||||||
|
|
||||||
|
if ($subscriptions->isEmpty()) {
|
||||||
|
$this->info('No Stripe subscriptions to cancel.');
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->info('Stripe subscriptions to cancel:');
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
$totalMonthlyValue = 0;
|
||||||
|
foreach ($subscriptions as $subscription) {
|
||||||
|
$team = $subscription->team;
|
||||||
|
$planId = $subscription->stripe_plan_id;
|
||||||
|
|
||||||
|
// Try to get the price from config
|
||||||
|
$monthlyValue = $this->getSubscriptionMonthlyValue($planId);
|
||||||
|
$totalMonthlyValue += $monthlyValue;
|
||||||
|
|
||||||
|
$this->line(" - {$subscription->stripe_subscription_id} (Team: {$team->name})");
|
||||||
|
if ($monthlyValue > 0) {
|
||||||
|
$this->line(" Monthly value: \${$monthlyValue}");
|
||||||
|
}
|
||||||
|
if ($subscription->stripe_cancel_at_period_end) {
|
||||||
|
$this->line(' ⚠️ Already set to cancel at period end');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($totalMonthlyValue > 0) {
|
||||||
|
$this->newLine();
|
||||||
|
$this->warn("Total monthly value: \${$totalMonthlyValue}");
|
||||||
|
}
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
$this->error('⚠️ WARNING: Subscriptions will be cancelled IMMEDIATELY (not at period end)!');
|
||||||
|
if (! $this->confirm('Are you sure you want to cancel all these subscriptions immediately?', false)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! $this->isDryRun) {
|
||||||
|
$this->info('Cancelling subscriptions...');
|
||||||
|
$result = $action->execute();
|
||||||
|
$this->info("Cancelled {$result['cancelled']} subscriptions, {$result['failed']} failed");
|
||||||
|
if ($result['failed'] > 0 && ! empty($result['errors'])) {
|
||||||
|
$this->error('Failed subscriptions:');
|
||||||
|
foreach ($result['errors'] as $error) {
|
||||||
|
$this->error(" - {$error}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$this->logAction("Cancelled {$result['cancelled']} Stripe subscriptions for user {$this->user->email}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function deleteUserProfile(): bool
|
||||||
|
{
|
||||||
|
$this->newLine();
|
||||||
|
$this->info('═══════════════════════════════════════');
|
||||||
|
$this->info('PHASE 6: DELETE USER PROFILE');
|
||||||
|
$this->info('═══════════════════════════════════════');
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
$this->warn('⚠️ FINAL STEP - This action is IRREVERSIBLE!');
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
$this->info('User profile to be deleted:');
|
||||||
|
$this->table(
|
||||||
|
['Property', 'Value'],
|
||||||
|
[
|
||||||
|
['Email', $this->user->email],
|
||||||
|
['Name', $this->user->name],
|
||||||
|
['User ID', $this->user->id],
|
||||||
|
['Created', $this->user->created_at->format('Y-m-d H:i:s')],
|
||||||
|
['Email Verified', $this->user->email_verified_at ? 'Yes' : 'No'],
|
||||||
|
['2FA Enabled', $this->user->two_factor_confirmed_at ? 'Yes' : 'No'],
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->newLine();
|
||||||
|
|
||||||
|
$this->warn("Type 'DELETE {$this->user->email}' to confirm final deletion:");
|
||||||
|
$confirmation = $this->ask('Confirmation');
|
||||||
|
|
||||||
|
if ($confirmation !== "DELETE {$this->user->email}") {
|
||||||
|
$this->error('Confirmation text does not match. Deletion cancelled.');
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! $this->isDryRun) {
|
||||||
|
$this->info('Deleting user profile...');
|
||||||
|
|
||||||
|
try {
|
||||||
|
$this->user->delete();
|
||||||
|
$this->info('User profile deleted successfully.');
|
||||||
|
$this->logAction("User profile deleted: {$this->user->email}");
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
$this->error('Failed to delete user profile: '.$e->getMessage());
|
||||||
|
$this->logAction("Failed to delete user profile {$this->user->email}: ".$e->getMessage());
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getSubscriptionMonthlyValue(string $planId): int
|
||||||
|
{
|
||||||
|
// Map plan IDs to monthly values based on config
|
||||||
|
$subscriptionConfigs = config('subscription');
|
||||||
|
|
||||||
|
foreach ($subscriptionConfigs as $key => $value) {
|
||||||
|
if ($value === $planId && str_contains($key, 'stripe_price_id_')) {
|
||||||
|
// Extract price from key pattern: stripe_price_id_basic_monthly -> basic
|
||||||
|
$planType = str($key)->after('stripe_price_id_')->before('_')->toString();
|
||||||
|
|
||||||
|
// Map to known prices (you may need to adjust these based on your actual pricing)
|
||||||
|
return match ($planType) {
|
||||||
|
'basic' => 29,
|
||||||
|
'pro' => 49,
|
||||||
|
'ultimate' => 99,
|
||||||
|
default => 0
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function logAction(string $message): void
|
||||||
|
{
|
||||||
|
$logMessage = "[CloudDeleteUser] {$message}";
|
||||||
|
|
||||||
|
if ($this->isDryRun) {
|
||||||
|
$logMessage = "[DRY RUN] {$logMessage}";
|
||||||
|
}
|
||||||
|
|
||||||
|
Log::channel('single')->info($logMessage);
|
||||||
|
|
||||||
|
// Also log to a dedicated user deletion log file
|
||||||
|
$logFile = storage_path('logs/user-deletions.log');
|
||||||
|
$timestamp = now()->format('Y-m-d H:i:s');
|
||||||
|
file_put_contents($logFile, "[{$timestamp}] {$logMessage}\n", FILE_APPEND | LOCK_EX);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Console\Commands;
|
namespace App\Console\Commands;
|
||||||
|
|
||||||
|
use App\Jobs\CheckHelperImageJob;
|
||||||
use App\Models\InstanceSettings;
|
use App\Models\InstanceSettings;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Illuminate\Support\Facades\Artisan;
|
use Illuminate\Support\Facades\Artisan;
|
||||||
@@ -44,5 +45,6 @@ class Dev extends Command
|
|||||||
} else {
|
} else {
|
||||||
echo "Instance already initialized.\n";
|
echo "Instance already initialized.\n";
|
||||||
}
|
}
|
||||||
|
CheckHelperImageJob::dispatch();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,9 +5,10 @@ namespace App\Console\Commands;
|
|||||||
use App\Enums\ActivityTypes;
|
use App\Enums\ActivityTypes;
|
||||||
use App\Enums\ApplicationDeploymentStatus;
|
use App\Enums\ApplicationDeploymentStatus;
|
||||||
use App\Jobs\CheckHelperImageJob;
|
use App\Jobs\CheckHelperImageJob;
|
||||||
use App\Jobs\PullChangelogFromGitHub;
|
use App\Jobs\PullChangelog;
|
||||||
use App\Models\ApplicationDeploymentQueue;
|
use App\Models\ApplicationDeploymentQueue;
|
||||||
use App\Models\Environment;
|
use App\Models\Environment;
|
||||||
|
use App\Models\InstanceSettings;
|
||||||
use App\Models\ScheduledDatabaseBackup;
|
use App\Models\ScheduledDatabaseBackup;
|
||||||
use App\Models\Server;
|
use App\Models\Server;
|
||||||
use App\Models\StandalonePostgresql;
|
use App\Models\StandalonePostgresql;
|
||||||
@@ -19,80 +20,18 @@ use Illuminate\Support\Facades\Http;
|
|||||||
|
|
||||||
class Init extends Command
|
class Init extends Command
|
||||||
{
|
{
|
||||||
protected $signature = 'app:init {--force-cloud}';
|
protected $signature = 'app:init';
|
||||||
|
|
||||||
protected $description = 'Cleanup instance related stuffs';
|
protected $description = 'Cleanup instance related stuffs';
|
||||||
|
|
||||||
public $servers = null;
|
public $servers = null;
|
||||||
|
|
||||||
|
public InstanceSettings $settings;
|
||||||
|
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
$this->optimize();
|
Artisan::call('optimize:clear');
|
||||||
|
Artisan::call('optimize');
|
||||||
if (isCloud() && ! $this->option('force-cloud')) {
|
|
||||||
echo "Skipping init as we are on cloud and --force-cloud option is not set\n";
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->servers = Server::all();
|
|
||||||
if (! isCloud()) {
|
|
||||||
$this->sendAliveSignal();
|
|
||||||
get_public_ips();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Backward compatibility
|
|
||||||
$this->replaceSlashInEnvironmentName();
|
|
||||||
$this->restoreCoolifyDbBackup();
|
|
||||||
$this->updateUserEmails();
|
|
||||||
//
|
|
||||||
$this->updateTraefikLabels();
|
|
||||||
if (! isCloud() || $this->option('force-cloud')) {
|
|
||||||
$this->cleanupUnusedNetworkFromCoolifyProxy();
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->call('cleanup:redis');
|
|
||||||
|
|
||||||
try {
|
|
||||||
$this->call('cleanup:names');
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
echo "Error in cleanup:names command: {$e->getMessage()}\n";
|
|
||||||
}
|
|
||||||
$this->call('cleanup:stucked-resources');
|
|
||||||
|
|
||||||
try {
|
|
||||||
$this->pullHelperImage();
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
//
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isCloud()) {
|
|
||||||
try {
|
|
||||||
$this->cleanupInProgressApplicationDeployments();
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
echo "Could not cleanup inprogress deployments: {$e->getMessage()}\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$this->pullTemplatesFromCDN();
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
echo "Could not pull templates from CDN: {$e->getMessage()}\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$this->pullChangelogFromGitHub();
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
echo "Could not changelogs from github: {$e->getMessage()}\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$this->cleanupInProgressApplicationDeployments();
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
echo "Could not cleanup inprogress deployments: {$e->getMessage()}\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$this->pullTemplatesFromCDN();
|
$this->pullTemplatesFromCDN();
|
||||||
@@ -105,20 +44,80 @@ class Init extends Command
|
|||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Could not changelogs from github: {$e->getMessage()}\n";
|
echo "Could not changelogs from github: {$e->getMessage()}\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$this->pullHelperImage();
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
echo "Error in pullHelperImage command: {$e->getMessage()}\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isCloud()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->settings = instanceSettings();
|
||||||
|
$this->servers = Server::all();
|
||||||
|
|
||||||
|
$do_not_track = data_get($this->settings, 'do_not_track', true);
|
||||||
|
if ($do_not_track == false) {
|
||||||
|
$this->sendAliveSignal();
|
||||||
|
}
|
||||||
|
get_public_ips();
|
||||||
|
|
||||||
|
// Backward compatibility
|
||||||
|
$this->replaceSlashInEnvironmentName();
|
||||||
|
$this->restoreCoolifyDbBackup();
|
||||||
|
$this->updateUserEmails();
|
||||||
|
//
|
||||||
|
$this->updateTraefikLabels();
|
||||||
|
$this->cleanupUnusedNetworkFromCoolifyProxy();
|
||||||
|
|
||||||
|
try {
|
||||||
|
$this->call('cleanup:redis');
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
echo "Error in cleanup:redis command: {$e->getMessage()}\n";
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
$this->call('cleanup:names');
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
echo "Error in cleanup:names command: {$e->getMessage()}\n";
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
$this->call('cleanup:stucked-resources');
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
echo "Error in cleanup:stucked-resources command: {$e->getMessage()}\n";
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
$updatedCount = ApplicationDeploymentQueue::whereIn('status', [
|
||||||
|
ApplicationDeploymentStatus::IN_PROGRESS->value,
|
||||||
|
ApplicationDeploymentStatus::QUEUED->value,
|
||||||
|
])->update([
|
||||||
|
'status' => ApplicationDeploymentStatus::FAILED->value,
|
||||||
|
]);
|
||||||
|
|
||||||
|
if ($updatedCount > 0) {
|
||||||
|
echo "Marked {$updatedCount} stuck deployments as failed\n";
|
||||||
|
}
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
echo "Could not cleanup inprogress deployments: {$e->getMessage()}\n";
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$localhost = $this->servers->where('id', 0)->first();
|
$localhost = $this->servers->where('id', 0)->first();
|
||||||
$localhost->setupDynamicProxyConfiguration();
|
if ($localhost) {
|
||||||
|
$localhost->setupDynamicProxyConfiguration();
|
||||||
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
|
echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
|
||||||
}
|
}
|
||||||
$settings = instanceSettings();
|
|
||||||
if (! is_null(config('constants.coolify.autoupdate', null))) {
|
if (! is_null(config('constants.coolify.autoupdate', null))) {
|
||||||
if (config('constants.coolify.autoupdate') == true) {
|
if (config('constants.coolify.autoupdate') == true) {
|
||||||
echo "Enabling auto-update\n";
|
echo "Enabling auto-update\n";
|
||||||
$settings->update(['is_auto_update_enabled' => true]);
|
$this->settings->update(['is_auto_update_enabled' => true]);
|
||||||
} else {
|
} else {
|
||||||
echo "Disabling auto-update\n";
|
echo "Disabling auto-update\n";
|
||||||
$settings->update(['is_auto_update_enabled' => false]);
|
$this->settings->update(['is_auto_update_enabled' => false]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -140,24 +139,18 @@ class Init extends Command
|
|||||||
private function pullChangelogFromGitHub()
|
private function pullChangelogFromGitHub()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
PullChangelogFromGitHub::dispatch();
|
PullChangelog::dispatch();
|
||||||
echo "Changelog fetch initiated\n";
|
echo "Changelog fetch initiated\n";
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Could not fetch changelog from GitHub: {$e->getMessage()}\n";
|
echo "Could not fetch changelog from GitHub: {$e->getMessage()}\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function optimize()
|
|
||||||
{
|
|
||||||
Artisan::call('optimize:clear');
|
|
||||||
Artisan::call('optimize');
|
|
||||||
}
|
|
||||||
|
|
||||||
private function updateUserEmails()
|
private function updateUserEmails()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
User::whereRaw('email ~ \'[A-Z]\'')->get()->each(function (User $user) {
|
User::whereRaw('email ~ \'[A-Z]\'')->get()->each(function (User $user) {
|
||||||
$user->update(['email' => strtolower($user->email)]);
|
$user->update(['email' => $user->email]);
|
||||||
});
|
});
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
echo "Error in updating user emails: {$e->getMessage()}\n";
|
echo "Error in updating user emails: {$e->getMessage()}\n";
|
||||||
@@ -173,27 +166,6 @@ class Init extends Command
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function cleanupUnnecessaryDynamicProxyConfiguration()
|
|
||||||
{
|
|
||||||
foreach ($this->servers as $server) {
|
|
||||||
try {
|
|
||||||
if (! $server->isFunctional()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if ($server->id === 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$file = $server->proxyPath().'/dynamic/coolify.yaml';
|
|
||||||
|
|
||||||
return instant_remote_process([
|
|
||||||
"rm -f $file",
|
|
||||||
], $server, false);
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
echo "Error in cleaning up unnecessary dynamic proxy configuration: {$e->getMessage()}\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private function cleanupUnusedNetworkFromCoolifyProxy()
|
private function cleanupUnusedNetworkFromCoolifyProxy()
|
||||||
{
|
{
|
||||||
foreach ($this->servers as $server) {
|
foreach ($this->servers as $server) {
|
||||||
@@ -263,13 +235,6 @@ class Init extends Command
|
|||||||
{
|
{
|
||||||
$id = config('app.id');
|
$id = config('app.id');
|
||||||
$version = config('constants.coolify.version');
|
$version = config('constants.coolify.version');
|
||||||
$settings = instanceSettings();
|
|
||||||
$do_not_track = data_get($settings, 'do_not_track');
|
|
||||||
if ($do_not_track == true) {
|
|
||||||
echo "Do_not_track is enabled\n";
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
Http::get("https://undead.coolify.io/v4/alive?appId=$id&version=$version");
|
Http::get("https://undead.coolify.io/v4/alive?appId=$id&version=$version");
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
@@ -277,23 +242,6 @@ class Init extends Command
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function cleanupInProgressApplicationDeployments()
|
|
||||||
{
|
|
||||||
// Cleanup any failed deployments
|
|
||||||
try {
|
|
||||||
if (isCloud()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$queued_inprogress_deployments = ApplicationDeploymentQueue::whereIn('status', [ApplicationDeploymentStatus::IN_PROGRESS->value, ApplicationDeploymentStatus::QUEUED->value])->get();
|
|
||||||
foreach ($queued_inprogress_deployments as $deployment) {
|
|
||||||
$deployment->status = ApplicationDeploymentStatus::FAILED->value;
|
|
||||||
$deployment->save();
|
|
||||||
}
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
echo "Error: {$e->getMessage()}\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private function replaceSlashInEnvironmentName()
|
private function replaceSlashInEnvironmentName()
|
||||||
{
|
{
|
||||||
if (version_compare('4.0.0-beta.298', config('constants.coolify.version'), '<=')) {
|
if (version_compare('4.0.0-beta.298', config('constants.coolify.version'), '<=')) {
|
||||||
|
|||||||
@@ -1,98 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Console\Commands;
|
|
||||||
|
|
||||||
use Carbon\Carbon;
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
|
|
||||||
class InitChangelog extends Command
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The name and signature of the console command.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $signature = 'changelog:init {month? : Month in YYYY-MM format (defaults to current month)}';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The console command description.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $description = 'Initialize a new monthly changelog file with example structure';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Execute the console command.
|
|
||||||
*/
|
|
||||||
public function handle()
|
|
||||||
{
|
|
||||||
$month = $this->argument('month') ?: Carbon::now()->format('Y-m');
|
|
||||||
|
|
||||||
// Validate month format
|
|
||||||
if (! preg_match('/^\d{4}-(0[1-9]|1[0-2])$/', $month)) {
|
|
||||||
$this->error('Invalid month format. Use YYYY-MM format with valid months 01-12 (e.g., 2025-08)');
|
|
||||||
|
|
||||||
return self::FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
$changelogsDir = base_path('changelogs');
|
|
||||||
$filePath = $changelogsDir."/{$month}.json";
|
|
||||||
|
|
||||||
// Create changelogs directory if it doesn't exist
|
|
||||||
if (! is_dir($changelogsDir)) {
|
|
||||||
mkdir($changelogsDir, 0755, true);
|
|
||||||
$this->info("Created changelogs directory: {$changelogsDir}");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if file already exists
|
|
||||||
if (file_exists($filePath)) {
|
|
||||||
if (! $this->confirm("File {$month}.json already exists. Overwrite?")) {
|
|
||||||
$this->info('Operation cancelled');
|
|
||||||
|
|
||||||
return self::SUCCESS;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parse the month for example data
|
|
||||||
$carbonMonth = Carbon::createFromFormat('Y-m', $month);
|
|
||||||
$monthName = $carbonMonth->format('F Y');
|
|
||||||
$sampleDate = $carbonMonth->addDays(14)->toISOString(); // Mid-month
|
|
||||||
|
|
||||||
// Get version from config
|
|
||||||
$version = 'v'.config('constants.coolify.version');
|
|
||||||
|
|
||||||
// Create example changelog structure
|
|
||||||
$exampleData = [
|
|
||||||
'entries' => [
|
|
||||||
[
|
|
||||||
'version' => $version,
|
|
||||||
'title' => 'Example Feature Release',
|
|
||||||
'content' => "This is an example changelog entry for {$monthName}. Replace this with your actual release notes. Include details about new features, improvements, bug fixes, and any breaking changes.",
|
|
||||||
'published_at' => $sampleDate,
|
|
||||||
],
|
|
||||||
],
|
|
||||||
];
|
|
||||||
|
|
||||||
// Write the file
|
|
||||||
$jsonContent = json_encode($exampleData, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
|
|
||||||
|
|
||||||
if (file_put_contents($filePath, $jsonContent) === false) {
|
|
||||||
$this->error("Failed to create changelog file: {$filePath}");
|
|
||||||
|
|
||||||
return self::FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->info("✅ Created changelog file: changelogs/{$month}.json");
|
|
||||||
$this->line(" Example entry created for {$monthName}");
|
|
||||||
$this->line(' Edit the file to add your actual changelog entries');
|
|
||||||
|
|
||||||
// Show the file contents
|
|
||||||
if ($this->option('verbose')) {
|
|
||||||
$this->newLine();
|
|
||||||
$this->line('File contents:');
|
|
||||||
$this->line($jsonContent);
|
|
||||||
}
|
|
||||||
|
|
||||||
return self::SUCCESS;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -6,7 +6,14 @@ use App\Jobs\DeleteResourceJob;
|
|||||||
use App\Models\Application;
|
use App\Models\Application;
|
||||||
use App\Models\Server;
|
use App\Models\Server;
|
||||||
use App\Models\Service;
|
use App\Models\Service;
|
||||||
|
use App\Models\StandaloneClickhouse;
|
||||||
|
use App\Models\StandaloneDragonfly;
|
||||||
|
use App\Models\StandaloneKeydb;
|
||||||
|
use App\Models\StandaloneMariadb;
|
||||||
|
use App\Models\StandaloneMongodb;
|
||||||
|
use App\Models\StandaloneMysql;
|
||||||
use App\Models\StandalonePostgresql;
|
use App\Models\StandalonePostgresql;
|
||||||
|
use App\Models\StandaloneRedis;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
|
|
||||||
use function Laravel\Prompts\confirm;
|
use function Laravel\Prompts\confirm;
|
||||||
@@ -103,19 +110,79 @@ class ServicesDelete extends Command
|
|||||||
|
|
||||||
private function deleteDatabase()
|
private function deleteDatabase()
|
||||||
{
|
{
|
||||||
$databases = StandalonePostgresql::all();
|
// Collect all databases from all types with unique identifiers
|
||||||
if ($databases->count() === 0) {
|
$allDatabases = collect();
|
||||||
|
$databaseOptions = collect();
|
||||||
|
|
||||||
|
// Add PostgreSQL databases
|
||||||
|
foreach (StandalonePostgresql::all() as $db) {
|
||||||
|
$key = "postgresql_{$db->id}";
|
||||||
|
$allDatabases->put($key, $db);
|
||||||
|
$databaseOptions->put($key, "{$db->name} (PostgreSQL)");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add MySQL databases
|
||||||
|
foreach (StandaloneMysql::all() as $db) {
|
||||||
|
$key = "mysql_{$db->id}";
|
||||||
|
$allDatabases->put($key, $db);
|
||||||
|
$databaseOptions->put($key, "{$db->name} (MySQL)");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add MariaDB databases
|
||||||
|
foreach (StandaloneMariadb::all() as $db) {
|
||||||
|
$key = "mariadb_{$db->id}";
|
||||||
|
$allDatabases->put($key, $db);
|
||||||
|
$databaseOptions->put($key, "{$db->name} (MariaDB)");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add MongoDB databases
|
||||||
|
foreach (StandaloneMongodb::all() as $db) {
|
||||||
|
$key = "mongodb_{$db->id}";
|
||||||
|
$allDatabases->put($key, $db);
|
||||||
|
$databaseOptions->put($key, "{$db->name} (MongoDB)");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add Redis databases
|
||||||
|
foreach (StandaloneRedis::all() as $db) {
|
||||||
|
$key = "redis_{$db->id}";
|
||||||
|
$allDatabases->put($key, $db);
|
||||||
|
$databaseOptions->put($key, "{$db->name} (Redis)");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add KeyDB databases
|
||||||
|
foreach (StandaloneKeydb::all() as $db) {
|
||||||
|
$key = "keydb_{$db->id}";
|
||||||
|
$allDatabases->put($key, $db);
|
||||||
|
$databaseOptions->put($key, "{$db->name} (KeyDB)");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add Dragonfly databases
|
||||||
|
foreach (StandaloneDragonfly::all() as $db) {
|
||||||
|
$key = "dragonfly_{$db->id}";
|
||||||
|
$allDatabases->put($key, $db);
|
||||||
|
$databaseOptions->put($key, "{$db->name} (Dragonfly)");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add ClickHouse databases
|
||||||
|
foreach (StandaloneClickhouse::all() as $db) {
|
||||||
|
$key = "clickhouse_{$db->id}";
|
||||||
|
$allDatabases->put($key, $db);
|
||||||
|
$databaseOptions->put($key, "{$db->name} (ClickHouse)");
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($allDatabases->count() === 0) {
|
||||||
$this->error('There are no databases to delete.');
|
$this->error('There are no databases to delete.');
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$databasesToDelete = multiselect(
|
$databasesToDelete = multiselect(
|
||||||
'What database do you want to delete?',
|
'What database do you want to delete?',
|
||||||
$databases->pluck('name', 'id')->sortKeys(),
|
$databaseOptions->sortKeys(),
|
||||||
);
|
);
|
||||||
|
|
||||||
foreach ($databasesToDelete as $database) {
|
foreach ($databasesToDelete as $databaseKey) {
|
||||||
$toDelete = $databases->where('id', $database)->first();
|
$toDelete = $allDatabases->get($databaseKey);
|
||||||
if ($toDelete) {
|
if ($toDelete) {
|
||||||
$this->info($toDelete);
|
$this->info($toDelete);
|
||||||
$confirmed = confirm('Are you sure you want to delete all selected resources?');
|
$confirmed = confirm('Are you sure you want to delete all selected resources?');
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ class SyncBunny extends Command
|
|||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
protected $signature = 'sync:bunny {--templates} {--release} {--nightly}';
|
protected $signature = 'sync:bunny {--templates} {--release} {--github-releases} {--nightly}';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The console command description.
|
* The console command description.
|
||||||
@@ -25,6 +25,50 @@ class SyncBunny extends Command
|
|||||||
*/
|
*/
|
||||||
protected $description = 'Sync files to BunnyCDN';
|
protected $description = 'Sync files to BunnyCDN';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch GitHub releases and sync to CDN
|
||||||
|
*/
|
||||||
|
private function syncGitHubReleases($parent_dir, $bunny_cdn_storage_name, $bunny_cdn_path, $bunny_cdn)
|
||||||
|
{
|
||||||
|
$this->info('Fetching releases from GitHub...');
|
||||||
|
try {
|
||||||
|
$response = Http::timeout(30)
|
||||||
|
->get('https://api.github.com/repos/coollabsio/coolify/releases', [
|
||||||
|
'per_page' => 30, // Fetch more releases for better changelog
|
||||||
|
]);
|
||||||
|
|
||||||
|
if ($response->successful()) {
|
||||||
|
$releases = $response->json();
|
||||||
|
|
||||||
|
// Save releases to a temporary file
|
||||||
|
$releases_file = "$parent_dir/releases.json";
|
||||||
|
file_put_contents($releases_file, json_encode($releases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
|
||||||
|
|
||||||
|
// Upload to CDN
|
||||||
|
Http::pool(fn (Pool $pool) => [
|
||||||
|
$pool->storage(fileName: $releases_file)->put("/$bunny_cdn_storage_name/$bunny_cdn_path/releases.json"),
|
||||||
|
$pool->purge("$bunny_cdn/coolify/releases.json"),
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Clean up temporary file
|
||||||
|
unlink($releases_file);
|
||||||
|
|
||||||
|
$this->info('releases.json uploaded & purged...');
|
||||||
|
$this->info('Total releases synced: '.count($releases));
|
||||||
|
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
$this->error('Failed to fetch releases from GitHub: '.$response->status());
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
$this->error('Error fetching releases: '.$e->getMessage());
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Execute the console command.
|
* Execute the console command.
|
||||||
*/
|
*/
|
||||||
@@ -33,6 +77,7 @@ class SyncBunny extends Command
|
|||||||
$that = $this;
|
$that = $this;
|
||||||
$only_template = $this->option('templates');
|
$only_template = $this->option('templates');
|
||||||
$only_version = $this->option('release');
|
$only_version = $this->option('release');
|
||||||
|
$only_github_releases = $this->option('github-releases');
|
||||||
$nightly = $this->option('nightly');
|
$nightly = $this->option('nightly');
|
||||||
$bunny_cdn = 'https://cdn.coollabs.io';
|
$bunny_cdn = 'https://cdn.coollabs.io';
|
||||||
$bunny_cdn_path = 'coolify';
|
$bunny_cdn_path = 'coolify';
|
||||||
@@ -90,7 +135,7 @@ class SyncBunny extends Command
|
|||||||
$install_script_location = "$parent_dir/other/nightly/$install_script";
|
$install_script_location = "$parent_dir/other/nightly/$install_script";
|
||||||
$versions_location = "$parent_dir/other/nightly/$versions";
|
$versions_location = "$parent_dir/other/nightly/$versions";
|
||||||
}
|
}
|
||||||
if (! $only_template && ! $only_version) {
|
if (! $only_template && ! $only_version && ! $only_github_releases) {
|
||||||
if ($nightly) {
|
if ($nightly) {
|
||||||
$this->info('About to sync files NIGHTLY (docker-compose.prod.yaml, upgrade.sh, install.sh, etc) to BunnyCDN.');
|
$this->info('About to sync files NIGHTLY (docker-compose.prod.yaml, upgrade.sh, install.sh, etc) to BunnyCDN.');
|
||||||
} else {
|
} else {
|
||||||
@@ -128,12 +173,29 @@ class SyncBunny extends Command
|
|||||||
if (! $confirmed) {
|
if (! $confirmed) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// First sync GitHub releases
|
||||||
|
$this->info('Syncing GitHub releases first...');
|
||||||
|
$this->syncGitHubReleases($parent_dir, $bunny_cdn_storage_name, $bunny_cdn_path, $bunny_cdn);
|
||||||
|
|
||||||
|
// Then sync versions.json
|
||||||
Http::pool(fn (Pool $pool) => [
|
Http::pool(fn (Pool $pool) => [
|
||||||
$pool->storage(fileName: $versions_location)->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$versions"),
|
$pool->storage(fileName: $versions_location)->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$versions"),
|
||||||
$pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
|
$pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
|
||||||
]);
|
]);
|
||||||
$this->info('versions.json uploaded & purged...');
|
$this->info('versions.json uploaded & purged...');
|
||||||
|
|
||||||
|
return;
|
||||||
|
} elseif ($only_github_releases) {
|
||||||
|
$this->info('About to sync GitHub releases to BunnyCDN.');
|
||||||
|
$confirmed = confirm('Are you sure you want to sync GitHub releases?');
|
||||||
|
if (! $confirmed) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use the reusable function
|
||||||
|
$this->syncGitHubReleases($parent_dir, $bunny_cdn_storage_name, $bunny_cdn_path, $bunny_cdn);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use App\Jobs\CheckAndStartSentinelJob;
|
|||||||
use App\Jobs\CheckForUpdatesJob;
|
use App\Jobs\CheckForUpdatesJob;
|
||||||
use App\Jobs\CheckHelperImageJob;
|
use App\Jobs\CheckHelperImageJob;
|
||||||
use App\Jobs\CleanupInstanceStuffsJob;
|
use App\Jobs\CleanupInstanceStuffsJob;
|
||||||
use App\Jobs\PullChangelogFromGitHub;
|
use App\Jobs\PullChangelog;
|
||||||
use App\Jobs\PullTemplatesFromCDN;
|
use App\Jobs\PullTemplatesFromCDN;
|
||||||
use App\Jobs\RegenerateSslCertJob;
|
use App\Jobs\RegenerateSslCertJob;
|
||||||
use App\Jobs\ScheduledJobManager;
|
use App\Jobs\ScheduledJobManager;
|
||||||
@@ -68,7 +68,7 @@ class Kernel extends ConsoleKernel
|
|||||||
$this->scheduleInstance->command('cleanup:unreachable-servers')->daily()->onOneServer();
|
$this->scheduleInstance->command('cleanup:unreachable-servers')->daily()->onOneServer();
|
||||||
|
|
||||||
$this->scheduleInstance->job(new PullTemplatesFromCDN)->cron($this->updateCheckFrequency)->timezone($this->instanceTimezone)->onOneServer();
|
$this->scheduleInstance->job(new PullTemplatesFromCDN)->cron($this->updateCheckFrequency)->timezone($this->instanceTimezone)->onOneServer();
|
||||||
$this->scheduleInstance->job(new PullChangelogFromGitHub)->cron($this->updateCheckFrequency)->timezone($this->instanceTimezone)->onOneServer();
|
$this->scheduleInstance->job(new PullChangelog)->cron($this->updateCheckFrequency)->timezone($this->instanceTimezone)->onOneServer();
|
||||||
|
|
||||||
$this->scheduleInstance->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
|
$this->scheduleInstance->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
|
||||||
$this->scheduleUpdates();
|
$this->scheduleUpdates();
|
||||||
|
|||||||
35
app/Events/ApplicationConfigurationChanged.php
Normal file
35
app/Events/ApplicationConfigurationChanged.php
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Events;
|
||||||
|
|
||||||
|
use Illuminate\Broadcasting\InteractsWithSockets;
|
||||||
|
use Illuminate\Broadcasting\PrivateChannel;
|
||||||
|
use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
|
||||||
|
use Illuminate\Foundation\Events\Dispatchable;
|
||||||
|
use Illuminate\Queue\SerializesModels;
|
||||||
|
|
||||||
|
class ApplicationConfigurationChanged implements ShouldBroadcast
|
||||||
|
{
|
||||||
|
use Dispatchable, InteractsWithSockets, SerializesModels;
|
||||||
|
|
||||||
|
public ?int $teamId = null;
|
||||||
|
|
||||||
|
public function __construct($teamId = null)
|
||||||
|
{
|
||||||
|
if (is_null($teamId) && auth()->check() && auth()->user()->currentTeam()) {
|
||||||
|
$teamId = auth()->user()->currentTeam()->id;
|
||||||
|
}
|
||||||
|
$this->teamId = $teamId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function broadcastOn(): array
|
||||||
|
{
|
||||||
|
if (is_null($this->teamId)) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
new PrivateChannel("team.{$this->teamId}"),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -29,6 +29,7 @@ class Handler extends ExceptionHandler
|
|||||||
*/
|
*/
|
||||||
protected $dontReport = [
|
protected $dontReport = [
|
||||||
ProcessException::class,
|
ProcessException::class,
|
||||||
|
NonReportableException::class,
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -110,9 +111,14 @@ class Handler extends ExceptionHandler
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
// Check for errors that should not be reported to Sentry
|
||||||
if (str($e->getMessage())->contains('No space left on device')) {
|
if (str($e->getMessage())->contains('No space left on device')) {
|
||||||
|
// Log locally but don't send to Sentry
|
||||||
|
logger()->warning('Disk space error: '.$e->getMessage());
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Integration::captureUnhandledException($e);
|
Integration::captureUnhandledException($e);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
31
app/Exceptions/NonReportableException.php
Normal file
31
app/Exceptions/NonReportableException.php
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Exceptions;
|
||||||
|
|
||||||
|
use Exception;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Exception that should not be reported to Sentry or other error tracking services.
|
||||||
|
* Use this for known, expected errors that don't require external tracking.
|
||||||
|
*/
|
||||||
|
class NonReportableException extends Exception
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Create a new non-reportable exception instance.
|
||||||
|
*
|
||||||
|
* @param string $message
|
||||||
|
* @param int $code
|
||||||
|
*/
|
||||||
|
public function __construct($message = '', $code = 0, ?\Throwable $previous = null)
|
||||||
|
{
|
||||||
|
parent::__construct($message, $code, $previous);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create from another exception, preserving its message and stack trace.
|
||||||
|
*/
|
||||||
|
public static function fromException(\Throwable $exception): static
|
||||||
|
{
|
||||||
|
return new static($exception->getMessage(), $exception->getCode(), $exception);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,7 +4,9 @@ namespace App\Helpers;
|
|||||||
|
|
||||||
use App\Models\PrivateKey;
|
use App\Models\PrivateKey;
|
||||||
use App\Models\Server;
|
use App\Models\Server;
|
||||||
|
use Illuminate\Support\Facades\Cache;
|
||||||
use Illuminate\Support\Facades\Hash;
|
use Illuminate\Support\Facades\Hash;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
use Illuminate\Support\Facades\Process;
|
use Illuminate\Support\Facades\Process;
|
||||||
|
|
||||||
class SshMultiplexingHelper
|
class SshMultiplexingHelper
|
||||||
@@ -30,6 +32,7 @@ class SshMultiplexingHelper
|
|||||||
$sshConfig = self::serverSshConfiguration($server);
|
$sshConfig = self::serverSshConfiguration($server);
|
||||||
$muxSocket = $sshConfig['muxFilename'];
|
$muxSocket = $sshConfig['muxFilename'];
|
||||||
|
|
||||||
|
// Check if connection exists
|
||||||
$checkCommand = "ssh -O check -o ControlPath=$muxSocket ";
|
$checkCommand = "ssh -O check -o ControlPath=$muxSocket ";
|
||||||
if (data_get($server, 'settings.is_cloudflare_tunnel')) {
|
if (data_get($server, 'settings.is_cloudflare_tunnel')) {
|
||||||
$checkCommand .= '-o ProxyCommand="cloudflared access ssh --hostname %h" ';
|
$checkCommand .= '-o ProxyCommand="cloudflared access ssh --hostname %h" ';
|
||||||
@@ -41,6 +44,24 @@ class SshMultiplexingHelper
|
|||||||
return self::establishNewMultiplexedConnection($server);
|
return self::establishNewMultiplexedConnection($server);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Connection exists, ensure we have metadata for age tracking
|
||||||
|
if (self::getConnectionAge($server) === null) {
|
||||||
|
// Existing connection but no metadata, store current time as fallback
|
||||||
|
self::storeConnectionMetadata($server);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Connection exists, check if it needs refresh due to age
|
||||||
|
if (self::isConnectionExpired($server)) {
|
||||||
|
return self::refreshMultiplexedConnection($server);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Perform health check if enabled
|
||||||
|
if (config('constants.ssh.mux_health_check_enabled')) {
|
||||||
|
if (! self::isConnectionHealthy($server)) {
|
||||||
|
return self::refreshMultiplexedConnection($server);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,6 +86,9 @@ class SshMultiplexingHelper
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Store connection metadata for tracking
|
||||||
|
self::storeConnectionMetadata($server);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,6 +103,9 @@ class SshMultiplexingHelper
|
|||||||
}
|
}
|
||||||
$closeCommand .= "{$server->user}@{$server->ip}";
|
$closeCommand .= "{$server->user}@{$server->ip}";
|
||||||
Process::run($closeCommand);
|
Process::run($closeCommand);
|
||||||
|
|
||||||
|
// Clear connection metadata from cache
|
||||||
|
self::clearConnectionMetadata($server);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function generateScpCommand(Server $server, string $source, string $dest)
|
public static function generateScpCommand(Server $server, string $source, string $dest)
|
||||||
@@ -94,8 +121,18 @@ class SshMultiplexingHelper
|
|||||||
if ($server->isIpv6()) {
|
if ($server->isIpv6()) {
|
||||||
$scp_command .= '-6 ';
|
$scp_command .= '-6 ';
|
||||||
}
|
}
|
||||||
if (self::isMultiplexingEnabled() && self::ensureMultiplexedConnection($server)) {
|
if (self::isMultiplexingEnabled()) {
|
||||||
$scp_command .= "-o ControlMaster=auto -o ControlPath=$muxSocket -o ControlPersist={$muxPersistTime} ";
|
try {
|
||||||
|
if (self::ensureMultiplexedConnection($server)) {
|
||||||
|
$scp_command .= "-o ControlMaster=auto -o ControlPath=$muxSocket -o ControlPersist={$muxPersistTime} ";
|
||||||
|
}
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
Log::warning('SSH multiplexing failed for SCP, falling back to non-multiplexed connection', [
|
||||||
|
'server' => $server->name ?? $server->ip,
|
||||||
|
'error' => $e->getMessage(),
|
||||||
|
]);
|
||||||
|
// Continue without multiplexing
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data_get($server, 'settings.is_cloudflare_tunnel')) {
|
if (data_get($server, 'settings.is_cloudflare_tunnel')) {
|
||||||
@@ -130,8 +167,16 @@ class SshMultiplexingHelper
|
|||||||
|
|
||||||
$ssh_command = "timeout $timeout ssh ";
|
$ssh_command = "timeout $timeout ssh ";
|
||||||
|
|
||||||
if (self::isMultiplexingEnabled() && self::ensureMultiplexedConnection($server)) {
|
$multiplexingSuccessful = false;
|
||||||
$ssh_command .= "-o ControlMaster=auto -o ControlPath=$muxSocket -o ControlPersist={$muxPersistTime} ";
|
if (self::isMultiplexingEnabled()) {
|
||||||
|
try {
|
||||||
|
$multiplexingSuccessful = self::ensureMultiplexedConnection($server);
|
||||||
|
if ($multiplexingSuccessful) {
|
||||||
|
$ssh_command .= "-o ControlMaster=auto -o ControlPath=$muxSocket -o ControlPersist={$muxPersistTime} ";
|
||||||
|
}
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
// Continue without multiplexing
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data_get($server, 'settings.is_cloudflare_tunnel')) {
|
if (data_get($server, 'settings.is_cloudflare_tunnel')) {
|
||||||
@@ -186,4 +231,81 @@ class SshMultiplexingHelper
|
|||||||
|
|
||||||
return $options;
|
return $options;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the multiplexed connection is healthy by running a test command
|
||||||
|
*/
|
||||||
|
public static function isConnectionHealthy(Server $server): bool
|
||||||
|
{
|
||||||
|
$sshConfig = self::serverSshConfiguration($server);
|
||||||
|
$muxSocket = $sshConfig['muxFilename'];
|
||||||
|
$healthCheckTimeout = config('constants.ssh.mux_health_check_timeout');
|
||||||
|
|
||||||
|
$healthCommand = "timeout $healthCheckTimeout ssh -o ControlMaster=auto -o ControlPath=$muxSocket ";
|
||||||
|
if (data_get($server, 'settings.is_cloudflare_tunnel')) {
|
||||||
|
$healthCommand .= '-o ProxyCommand="cloudflared access ssh --hostname %h" ';
|
||||||
|
}
|
||||||
|
$healthCommand .= "{$server->user}@{$server->ip} 'echo \"health_check_ok\"'";
|
||||||
|
|
||||||
|
$process = Process::run($healthCommand);
|
||||||
|
$isHealthy = $process->exitCode() === 0 && str_contains($process->output(), 'health_check_ok');
|
||||||
|
|
||||||
|
return $isHealthy;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the connection has exceeded its maximum age
|
||||||
|
*/
|
||||||
|
public static function isConnectionExpired(Server $server): bool
|
||||||
|
{
|
||||||
|
$connectionAge = self::getConnectionAge($server);
|
||||||
|
$maxAge = config('constants.ssh.mux_max_age');
|
||||||
|
|
||||||
|
return $connectionAge !== null && $connectionAge > $maxAge;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the age of the current connection in seconds
|
||||||
|
*/
|
||||||
|
public static function getConnectionAge(Server $server): ?int
|
||||||
|
{
|
||||||
|
$cacheKey = "ssh_mux_connection_time_{$server->uuid}";
|
||||||
|
$connectionTime = Cache::get($cacheKey);
|
||||||
|
|
||||||
|
if ($connectionTime === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return time() - $connectionTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Refresh a multiplexed connection by closing and re-establishing it
|
||||||
|
*/
|
||||||
|
public static function refreshMultiplexedConnection(Server $server): bool
|
||||||
|
{
|
||||||
|
// Close existing connection
|
||||||
|
self::removeMuxFile($server);
|
||||||
|
|
||||||
|
// Establish new connection
|
||||||
|
return self::establishNewMultiplexedConnection($server);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Store connection metadata when a new connection is established
|
||||||
|
*/
|
||||||
|
private static function storeConnectionMetadata(Server $server): void
|
||||||
|
{
|
||||||
|
$cacheKey = "ssh_mux_connection_time_{$server->uuid}";
|
||||||
|
Cache::put($cacheKey, time(), config('constants.ssh.mux_persist_time') + 300); // Cache slightly longer than persist time
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear connection metadata from cache
|
||||||
|
*/
|
||||||
|
private static function clearConnectionMetadata(Server $server): void
|
||||||
|
{
|
||||||
|
$cacheKey = "ssh_mux_connection_time_{$server->uuid}";
|
||||||
|
Cache::forget($cacheKey);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
34
app/Helpers/SshRetryHandler.php
Normal file
34
app/Helpers/SshRetryHandler.php
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Helpers;
|
||||||
|
|
||||||
|
use App\Traits\SshRetryable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper class to use SshRetryable trait in non-class contexts
|
||||||
|
*/
|
||||||
|
class SshRetryHandler
|
||||||
|
{
|
||||||
|
use SshRetryable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Static method to get a singleton instance
|
||||||
|
*/
|
||||||
|
public static function instance(): self
|
||||||
|
{
|
||||||
|
static $instance = null;
|
||||||
|
if ($instance === null) {
|
||||||
|
$instance = new self;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convenience static method for retry execution
|
||||||
|
*/
|
||||||
|
public static function retry(callable $callback, array $context = [], bool $throwError = true)
|
||||||
|
{
|
||||||
|
return self::instance()->executeWithSshRetry($callback, $context, $throwError);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2429,7 +2429,6 @@ class ApplicationsController extends Controller
|
|||||||
'key' => ['type' => 'string', 'description' => 'The key of the environment variable.'],
|
'key' => ['type' => 'string', 'description' => 'The key of the environment variable.'],
|
||||||
'value' => ['type' => 'string', 'description' => 'The value of the environment variable.'],
|
'value' => ['type' => 'string', 'description' => 'The value of the environment variable.'],
|
||||||
'is_preview' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in preview deployments.'],
|
'is_preview' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in preview deployments.'],
|
||||||
'is_build_time' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in build time.'],
|
|
||||||
'is_literal' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is a literal, nothing espaced.'],
|
'is_literal' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is a literal, nothing espaced.'],
|
||||||
'is_multiline' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is multiline.'],
|
'is_multiline' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is multiline.'],
|
||||||
'is_shown_once' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable\'s value is shown on the UI.'],
|
'is_shown_once' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable\'s value is shown on the UI.'],
|
||||||
@@ -2470,7 +2469,7 @@ class ApplicationsController extends Controller
|
|||||||
)]
|
)]
|
||||||
public function update_env_by_uuid(Request $request)
|
public function update_env_by_uuid(Request $request)
|
||||||
{
|
{
|
||||||
$allowedFields = ['key', 'value', 'is_preview', 'is_build_time', 'is_literal'];
|
$allowedFields = ['key', 'value', 'is_preview', 'is_literal'];
|
||||||
$teamId = getTeamIdFromToken();
|
$teamId = getTeamIdFromToken();
|
||||||
|
|
||||||
if (is_null($teamId)) {
|
if (is_null($teamId)) {
|
||||||
@@ -2495,7 +2494,6 @@ class ApplicationsController extends Controller
|
|||||||
'key' => 'string|required',
|
'key' => 'string|required',
|
||||||
'value' => 'string|nullable',
|
'value' => 'string|nullable',
|
||||||
'is_preview' => 'boolean',
|
'is_preview' => 'boolean',
|
||||||
'is_build_time' => 'boolean',
|
|
||||||
'is_literal' => 'boolean',
|
'is_literal' => 'boolean',
|
||||||
'is_multiline' => 'boolean',
|
'is_multiline' => 'boolean',
|
||||||
'is_shown_once' => 'boolean',
|
'is_shown_once' => 'boolean',
|
||||||
@@ -2516,16 +2514,12 @@ class ApplicationsController extends Controller
|
|||||||
], 422);
|
], 422);
|
||||||
}
|
}
|
||||||
$is_preview = $request->is_preview ?? false;
|
$is_preview = $request->is_preview ?? false;
|
||||||
$is_build_time = $request->is_build_time ?? false;
|
|
||||||
$is_literal = $request->is_literal ?? false;
|
$is_literal = $request->is_literal ?? false;
|
||||||
$key = str($request->key)->trim()->replace(' ', '_')->value;
|
$key = str($request->key)->trim()->replace(' ', '_')->value;
|
||||||
if ($is_preview) {
|
if ($is_preview) {
|
||||||
$env = $application->environment_variables_preview->where('key', $key)->first();
|
$env = $application->environment_variables_preview->where('key', $key)->first();
|
||||||
if ($env) {
|
if ($env) {
|
||||||
$env->value = $request->value;
|
$env->value = $request->value;
|
||||||
if ($env->is_build_time != $is_build_time) {
|
|
||||||
$env->is_build_time = $is_build_time;
|
|
||||||
}
|
|
||||||
if ($env->is_literal != $is_literal) {
|
if ($env->is_literal != $is_literal) {
|
||||||
$env->is_literal = $is_literal;
|
$env->is_literal = $is_literal;
|
||||||
}
|
}
|
||||||
@@ -2538,6 +2532,12 @@ class ApplicationsController extends Controller
|
|||||||
if ($env->is_shown_once != $request->is_shown_once) {
|
if ($env->is_shown_once != $request->is_shown_once) {
|
||||||
$env->is_shown_once = $request->is_shown_once;
|
$env->is_shown_once = $request->is_shown_once;
|
||||||
}
|
}
|
||||||
|
if ($request->has('is_runtime') && $env->is_runtime != $request->is_runtime) {
|
||||||
|
$env->is_runtime = $request->is_runtime;
|
||||||
|
}
|
||||||
|
if ($request->has('is_buildtime') && $env->is_buildtime != $request->is_buildtime) {
|
||||||
|
$env->is_buildtime = $request->is_buildtime;
|
||||||
|
}
|
||||||
$env->save();
|
$env->save();
|
||||||
|
|
||||||
return response()->json($this->removeSensitiveData($env))->setStatusCode(201);
|
return response()->json($this->removeSensitiveData($env))->setStatusCode(201);
|
||||||
@@ -2550,9 +2550,6 @@ class ApplicationsController extends Controller
|
|||||||
$env = $application->environment_variables->where('key', $key)->first();
|
$env = $application->environment_variables->where('key', $key)->first();
|
||||||
if ($env) {
|
if ($env) {
|
||||||
$env->value = $request->value;
|
$env->value = $request->value;
|
||||||
if ($env->is_build_time != $is_build_time) {
|
|
||||||
$env->is_build_time = $is_build_time;
|
|
||||||
}
|
|
||||||
if ($env->is_literal != $is_literal) {
|
if ($env->is_literal != $is_literal) {
|
||||||
$env->is_literal = $is_literal;
|
$env->is_literal = $is_literal;
|
||||||
}
|
}
|
||||||
@@ -2565,6 +2562,12 @@ class ApplicationsController extends Controller
|
|||||||
if ($env->is_shown_once != $request->is_shown_once) {
|
if ($env->is_shown_once != $request->is_shown_once) {
|
||||||
$env->is_shown_once = $request->is_shown_once;
|
$env->is_shown_once = $request->is_shown_once;
|
||||||
}
|
}
|
||||||
|
if ($request->has('is_runtime') && $env->is_runtime != $request->is_runtime) {
|
||||||
|
$env->is_runtime = $request->is_runtime;
|
||||||
|
}
|
||||||
|
if ($request->has('is_buildtime') && $env->is_buildtime != $request->is_buildtime) {
|
||||||
|
$env->is_buildtime = $request->is_buildtime;
|
||||||
|
}
|
||||||
$env->save();
|
$env->save();
|
||||||
|
|
||||||
return response()->json($this->removeSensitiveData($env))->setStatusCode(201);
|
return response()->json($this->removeSensitiveData($env))->setStatusCode(201);
|
||||||
@@ -2619,7 +2622,6 @@ class ApplicationsController extends Controller
|
|||||||
'key' => ['type' => 'string', 'description' => 'The key of the environment variable.'],
|
'key' => ['type' => 'string', 'description' => 'The key of the environment variable.'],
|
||||||
'value' => ['type' => 'string', 'description' => 'The value of the environment variable.'],
|
'value' => ['type' => 'string', 'description' => 'The value of the environment variable.'],
|
||||||
'is_preview' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in preview deployments.'],
|
'is_preview' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in preview deployments.'],
|
||||||
'is_build_time' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in build time.'],
|
|
||||||
'is_literal' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is a literal, nothing espaced.'],
|
'is_literal' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is a literal, nothing espaced.'],
|
||||||
'is_multiline' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is multiline.'],
|
'is_multiline' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is multiline.'],
|
||||||
'is_shown_once' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable\'s value is shown on the UI.'],
|
'is_shown_once' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable\'s value is shown on the UI.'],
|
||||||
@@ -2690,7 +2692,7 @@ class ApplicationsController extends Controller
|
|||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
$bulk_data = collect($bulk_data)->map(function ($item) {
|
$bulk_data = collect($bulk_data)->map(function ($item) {
|
||||||
return collect($item)->only(['key', 'value', 'is_preview', 'is_build_time', 'is_literal']);
|
return collect($item)->only(['key', 'value', 'is_preview', 'is_literal']);
|
||||||
});
|
});
|
||||||
$returnedEnvs = collect();
|
$returnedEnvs = collect();
|
||||||
foreach ($bulk_data as $item) {
|
foreach ($bulk_data as $item) {
|
||||||
@@ -2698,7 +2700,6 @@ class ApplicationsController extends Controller
|
|||||||
'key' => 'string|required',
|
'key' => 'string|required',
|
||||||
'value' => 'string|nullable',
|
'value' => 'string|nullable',
|
||||||
'is_preview' => 'boolean',
|
'is_preview' => 'boolean',
|
||||||
'is_build_time' => 'boolean',
|
|
||||||
'is_literal' => 'boolean',
|
'is_literal' => 'boolean',
|
||||||
'is_multiline' => 'boolean',
|
'is_multiline' => 'boolean',
|
||||||
'is_shown_once' => 'boolean',
|
'is_shown_once' => 'boolean',
|
||||||
@@ -2710,7 +2711,6 @@ class ApplicationsController extends Controller
|
|||||||
], 422);
|
], 422);
|
||||||
}
|
}
|
||||||
$is_preview = $item->get('is_preview') ?? false;
|
$is_preview = $item->get('is_preview') ?? false;
|
||||||
$is_build_time = $item->get('is_build_time') ?? false;
|
|
||||||
$is_literal = $item->get('is_literal') ?? false;
|
$is_literal = $item->get('is_literal') ?? false;
|
||||||
$is_multi_line = $item->get('is_multiline') ?? false;
|
$is_multi_line = $item->get('is_multiline') ?? false;
|
||||||
$is_shown_once = $item->get('is_shown_once') ?? false;
|
$is_shown_once = $item->get('is_shown_once') ?? false;
|
||||||
@@ -2719,9 +2719,7 @@ class ApplicationsController extends Controller
|
|||||||
$env = $application->environment_variables_preview->where('key', $key)->first();
|
$env = $application->environment_variables_preview->where('key', $key)->first();
|
||||||
if ($env) {
|
if ($env) {
|
||||||
$env->value = $item->get('value');
|
$env->value = $item->get('value');
|
||||||
if ($env->is_build_time != $is_build_time) {
|
|
||||||
$env->is_build_time = $is_build_time;
|
|
||||||
}
|
|
||||||
if ($env->is_literal != $is_literal) {
|
if ($env->is_literal != $is_literal) {
|
||||||
$env->is_literal = $is_literal;
|
$env->is_literal = $is_literal;
|
||||||
}
|
}
|
||||||
@@ -2731,16 +2729,23 @@ class ApplicationsController extends Controller
|
|||||||
if ($env->is_shown_once != $item->get('is_shown_once')) {
|
if ($env->is_shown_once != $item->get('is_shown_once')) {
|
||||||
$env->is_shown_once = $item->get('is_shown_once');
|
$env->is_shown_once = $item->get('is_shown_once');
|
||||||
}
|
}
|
||||||
|
if ($item->has('is_runtime') && $env->is_runtime != $item->get('is_runtime')) {
|
||||||
|
$env->is_runtime = $item->get('is_runtime');
|
||||||
|
}
|
||||||
|
if ($item->has('is_buildtime') && $env->is_buildtime != $item->get('is_buildtime')) {
|
||||||
|
$env->is_buildtime = $item->get('is_buildtime');
|
||||||
|
}
|
||||||
$env->save();
|
$env->save();
|
||||||
} else {
|
} else {
|
||||||
$env = $application->environment_variables()->create([
|
$env = $application->environment_variables()->create([
|
||||||
'key' => $item->get('key'),
|
'key' => $item->get('key'),
|
||||||
'value' => $item->get('value'),
|
'value' => $item->get('value'),
|
||||||
'is_preview' => $is_preview,
|
'is_preview' => $is_preview,
|
||||||
'is_build_time' => $is_build_time,
|
|
||||||
'is_literal' => $is_literal,
|
'is_literal' => $is_literal,
|
||||||
'is_multiline' => $is_multi_line,
|
'is_multiline' => $is_multi_line,
|
||||||
'is_shown_once' => $is_shown_once,
|
'is_shown_once' => $is_shown_once,
|
||||||
|
'is_runtime' => $item->get('is_runtime', true),
|
||||||
|
'is_buildtime' => $item->get('is_buildtime', true),
|
||||||
'resourceable_type' => get_class($application),
|
'resourceable_type' => get_class($application),
|
||||||
'resourceable_id' => $application->id,
|
'resourceable_id' => $application->id,
|
||||||
]);
|
]);
|
||||||
@@ -2749,9 +2754,6 @@ class ApplicationsController extends Controller
|
|||||||
$env = $application->environment_variables->where('key', $key)->first();
|
$env = $application->environment_variables->where('key', $key)->first();
|
||||||
if ($env) {
|
if ($env) {
|
||||||
$env->value = $item->get('value');
|
$env->value = $item->get('value');
|
||||||
if ($env->is_build_time != $is_build_time) {
|
|
||||||
$env->is_build_time = $is_build_time;
|
|
||||||
}
|
|
||||||
if ($env->is_literal != $is_literal) {
|
if ($env->is_literal != $is_literal) {
|
||||||
$env->is_literal = $is_literal;
|
$env->is_literal = $is_literal;
|
||||||
}
|
}
|
||||||
@@ -2761,16 +2763,23 @@ class ApplicationsController extends Controller
|
|||||||
if ($env->is_shown_once != $item->get('is_shown_once')) {
|
if ($env->is_shown_once != $item->get('is_shown_once')) {
|
||||||
$env->is_shown_once = $item->get('is_shown_once');
|
$env->is_shown_once = $item->get('is_shown_once');
|
||||||
}
|
}
|
||||||
|
if ($item->has('is_runtime') && $env->is_runtime != $item->get('is_runtime')) {
|
||||||
|
$env->is_runtime = $item->get('is_runtime');
|
||||||
|
}
|
||||||
|
if ($item->has('is_buildtime') && $env->is_buildtime != $item->get('is_buildtime')) {
|
||||||
|
$env->is_buildtime = $item->get('is_buildtime');
|
||||||
|
}
|
||||||
$env->save();
|
$env->save();
|
||||||
} else {
|
} else {
|
||||||
$env = $application->environment_variables()->create([
|
$env = $application->environment_variables()->create([
|
||||||
'key' => $item->get('key'),
|
'key' => $item->get('key'),
|
||||||
'value' => $item->get('value'),
|
'value' => $item->get('value'),
|
||||||
'is_preview' => $is_preview,
|
'is_preview' => $is_preview,
|
||||||
'is_build_time' => $is_build_time,
|
|
||||||
'is_literal' => $is_literal,
|
'is_literal' => $is_literal,
|
||||||
'is_multiline' => $is_multi_line,
|
'is_multiline' => $is_multi_line,
|
||||||
'is_shown_once' => $is_shown_once,
|
'is_shown_once' => $is_shown_once,
|
||||||
|
'is_runtime' => $item->get('is_runtime', true),
|
||||||
|
'is_buildtime' => $item->get('is_buildtime', true),
|
||||||
'resourceable_type' => get_class($application),
|
'resourceable_type' => get_class($application),
|
||||||
'resourceable_id' => $application->id,
|
'resourceable_id' => $application->id,
|
||||||
]);
|
]);
|
||||||
@@ -2814,7 +2823,6 @@ class ApplicationsController extends Controller
|
|||||||
'key' => ['type' => 'string', 'description' => 'The key of the environment variable.'],
|
'key' => ['type' => 'string', 'description' => 'The key of the environment variable.'],
|
||||||
'value' => ['type' => 'string', 'description' => 'The value of the environment variable.'],
|
'value' => ['type' => 'string', 'description' => 'The value of the environment variable.'],
|
||||||
'is_preview' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in preview deployments.'],
|
'is_preview' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in preview deployments.'],
|
||||||
'is_build_time' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in build time.'],
|
|
||||||
'is_literal' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is a literal, nothing espaced.'],
|
'is_literal' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is a literal, nothing espaced.'],
|
||||||
'is_multiline' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is multiline.'],
|
'is_multiline' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is multiline.'],
|
||||||
'is_shown_once' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable\'s value is shown on the UI.'],
|
'is_shown_once' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable\'s value is shown on the UI.'],
|
||||||
@@ -2854,7 +2862,7 @@ class ApplicationsController extends Controller
|
|||||||
)]
|
)]
|
||||||
public function create_env(Request $request)
|
public function create_env(Request $request)
|
||||||
{
|
{
|
||||||
$allowedFields = ['key', 'value', 'is_preview', 'is_build_time', 'is_literal'];
|
$allowedFields = ['key', 'value', 'is_preview', 'is_literal'];
|
||||||
$teamId = getTeamIdFromToken();
|
$teamId = getTeamIdFromToken();
|
||||||
|
|
||||||
if (is_null($teamId)) {
|
if (is_null($teamId)) {
|
||||||
@@ -2874,7 +2882,6 @@ class ApplicationsController extends Controller
|
|||||||
'key' => 'string|required',
|
'key' => 'string|required',
|
||||||
'value' => 'string|nullable',
|
'value' => 'string|nullable',
|
||||||
'is_preview' => 'boolean',
|
'is_preview' => 'boolean',
|
||||||
'is_build_time' => 'boolean',
|
|
||||||
'is_literal' => 'boolean',
|
'is_literal' => 'boolean',
|
||||||
'is_multiline' => 'boolean',
|
'is_multiline' => 'boolean',
|
||||||
'is_shown_once' => 'boolean',
|
'is_shown_once' => 'boolean',
|
||||||
@@ -2908,10 +2915,11 @@ class ApplicationsController extends Controller
|
|||||||
'key' => $request->key,
|
'key' => $request->key,
|
||||||
'value' => $request->value,
|
'value' => $request->value,
|
||||||
'is_preview' => $request->is_preview ?? false,
|
'is_preview' => $request->is_preview ?? false,
|
||||||
'is_build_time' => $request->is_build_time ?? false,
|
|
||||||
'is_literal' => $request->is_literal ?? false,
|
'is_literal' => $request->is_literal ?? false,
|
||||||
'is_multiline' => $request->is_multiline ?? false,
|
'is_multiline' => $request->is_multiline ?? false,
|
||||||
'is_shown_once' => $request->is_shown_once ?? false,
|
'is_shown_once' => $request->is_shown_once ?? false,
|
||||||
|
'is_runtime' => $request->is_runtime ?? true,
|
||||||
|
'is_buildtime' => $request->is_buildtime ?? true,
|
||||||
'resourceable_type' => get_class($application),
|
'resourceable_type' => get_class($application),
|
||||||
'resourceable_id' => $application->id,
|
'resourceable_id' => $application->id,
|
||||||
]);
|
]);
|
||||||
@@ -2931,10 +2939,11 @@ class ApplicationsController extends Controller
|
|||||||
'key' => $request->key,
|
'key' => $request->key,
|
||||||
'value' => $request->value,
|
'value' => $request->value,
|
||||||
'is_preview' => $request->is_preview ?? false,
|
'is_preview' => $request->is_preview ?? false,
|
||||||
'is_build_time' => $request->is_build_time ?? false,
|
|
||||||
'is_literal' => $request->is_literal ?? false,
|
'is_literal' => $request->is_literal ?? false,
|
||||||
'is_multiline' => $request->is_multiline ?? false,
|
'is_multiline' => $request->is_multiline ?? false,
|
||||||
'is_shown_once' => $request->is_shown_once ?? false,
|
'is_shown_once' => $request->is_shown_once ?? false,
|
||||||
|
'is_runtime' => $request->is_runtime ?? true,
|
||||||
|
'is_buildtime' => $request->is_buildtime ?? true,
|
||||||
'resourceable_type' => get_class($application),
|
'resourceable_type' => get_class($application),
|
||||||
'resourceable_id' => $application->id,
|
'resourceable_id' => $application->id,
|
||||||
]);
|
]);
|
||||||
|
|||||||
@@ -225,6 +225,14 @@ class DeployController extends Controller
|
|||||||
foreach ($uuids as $uuid) {
|
foreach ($uuids as $uuid) {
|
||||||
$resource = getResourceByUuid($uuid, $teamId);
|
$resource = getResourceByUuid($uuid, $teamId);
|
||||||
if ($resource) {
|
if ($resource) {
|
||||||
|
if ($pr !== 0) {
|
||||||
|
$preview = $resource->previews()->where('pull_request_id', $pr)->first();
|
||||||
|
if (! $preview) {
|
||||||
|
$deployments->push(['message' => "Pull request {$pr} not found for this resource.", 'resource_uuid' => $uuid]);
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
['message' => $return_message, 'deployment_uuid' => $deployment_uuid] = $this->deploy_resource($resource, $force, $pr);
|
['message' => $return_message, 'deployment_uuid' => $deployment_uuid] = $this->deploy_resource($resource, $force, $pr);
|
||||||
if ($deployment_uuid) {
|
if ($deployment_uuid) {
|
||||||
$deployments->push(['message' => $return_message, 'resource_uuid' => $uuid, 'deployment_uuid' => $deployment_uuid->toString()]);
|
$deployments->push(['message' => $return_message, 'resource_uuid' => $uuid, 'deployment_uuid' => $deployment_uuid->toString()]);
|
||||||
|
|||||||
@@ -353,7 +353,6 @@ class ServicesController extends Controller
|
|||||||
'value' => $generatedValue,
|
'value' => $generatedValue,
|
||||||
'resourceable_id' => $service->id,
|
'resourceable_id' => $service->id,
|
||||||
'resourceable_type' => $service->getMorphClass(),
|
'resourceable_type' => $service->getMorphClass(),
|
||||||
'is_build_time' => false,
|
|
||||||
'is_preview' => false,
|
'is_preview' => false,
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
@@ -919,7 +918,6 @@ class ServicesController extends Controller
|
|||||||
'key' => ['type' => 'string', 'description' => 'The key of the environment variable.'],
|
'key' => ['type' => 'string', 'description' => 'The key of the environment variable.'],
|
||||||
'value' => ['type' => 'string', 'description' => 'The value of the environment variable.'],
|
'value' => ['type' => 'string', 'description' => 'The value of the environment variable.'],
|
||||||
'is_preview' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in preview deployments.'],
|
'is_preview' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in preview deployments.'],
|
||||||
'is_build_time' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in build time.'],
|
|
||||||
'is_literal' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is a literal, nothing espaced.'],
|
'is_literal' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is a literal, nothing espaced.'],
|
||||||
'is_multiline' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is multiline.'],
|
'is_multiline' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is multiline.'],
|
||||||
'is_shown_once' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable\'s value is shown on the UI.'],
|
'is_shown_once' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable\'s value is shown on the UI.'],
|
||||||
@@ -975,7 +973,6 @@ class ServicesController extends Controller
|
|||||||
$validator = customApiValidator($request->all(), [
|
$validator = customApiValidator($request->all(), [
|
||||||
'key' => 'string|required',
|
'key' => 'string|required',
|
||||||
'value' => 'string|nullable',
|
'value' => 'string|nullable',
|
||||||
'is_build_time' => 'boolean',
|
|
||||||
'is_literal' => 'boolean',
|
'is_literal' => 'boolean',
|
||||||
'is_multiline' => 'boolean',
|
'is_multiline' => 'boolean',
|
||||||
'is_shown_once' => 'boolean',
|
'is_shown_once' => 'boolean',
|
||||||
@@ -1039,7 +1036,6 @@ class ServicesController extends Controller
|
|||||||
'key' => ['type' => 'string', 'description' => 'The key of the environment variable.'],
|
'key' => ['type' => 'string', 'description' => 'The key of the environment variable.'],
|
||||||
'value' => ['type' => 'string', 'description' => 'The value of the environment variable.'],
|
'value' => ['type' => 'string', 'description' => 'The value of the environment variable.'],
|
||||||
'is_preview' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in preview deployments.'],
|
'is_preview' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in preview deployments.'],
|
||||||
'is_build_time' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in build time.'],
|
|
||||||
'is_literal' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is a literal, nothing espaced.'],
|
'is_literal' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is a literal, nothing espaced.'],
|
||||||
'is_multiline' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is multiline.'],
|
'is_multiline' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is multiline.'],
|
||||||
'is_shown_once' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable\'s value is shown on the UI.'],
|
'is_shown_once' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable\'s value is shown on the UI.'],
|
||||||
@@ -1105,7 +1101,6 @@ class ServicesController extends Controller
|
|||||||
$validator = customApiValidator($item, [
|
$validator = customApiValidator($item, [
|
||||||
'key' => 'string|required',
|
'key' => 'string|required',
|
||||||
'value' => 'string|nullable',
|
'value' => 'string|nullable',
|
||||||
'is_build_time' => 'boolean',
|
|
||||||
'is_literal' => 'boolean',
|
'is_literal' => 'boolean',
|
||||||
'is_multiline' => 'boolean',
|
'is_multiline' => 'boolean',
|
||||||
'is_shown_once' => 'boolean',
|
'is_shown_once' => 'boolean',
|
||||||
@@ -1161,7 +1156,6 @@ class ServicesController extends Controller
|
|||||||
'key' => ['type' => 'string', 'description' => 'The key of the environment variable.'],
|
'key' => ['type' => 'string', 'description' => 'The key of the environment variable.'],
|
||||||
'value' => ['type' => 'string', 'description' => 'The value of the environment variable.'],
|
'value' => ['type' => 'string', 'description' => 'The value of the environment variable.'],
|
||||||
'is_preview' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in preview deployments.'],
|
'is_preview' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in preview deployments.'],
|
||||||
'is_build_time' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is used in build time.'],
|
|
||||||
'is_literal' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is a literal, nothing espaced.'],
|
'is_literal' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is a literal, nothing espaced.'],
|
||||||
'is_multiline' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is multiline.'],
|
'is_multiline' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable is multiline.'],
|
||||||
'is_shown_once' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable\'s value is shown on the UI.'],
|
'is_shown_once' => ['type' => 'boolean', 'description' => 'The flag to indicate if the environment variable\'s value is shown on the UI.'],
|
||||||
@@ -1216,7 +1210,6 @@ class ServicesController extends Controller
|
|||||||
$validator = customApiValidator($request->all(), [
|
$validator = customApiValidator($request->all(), [
|
||||||
'key' => 'string|required',
|
'key' => 'string|required',
|
||||||
'value' => 'string|nullable',
|
'value' => 'string|nullable',
|
||||||
'is_build_time' => 'boolean',
|
|
||||||
'is_literal' => 'boolean',
|
'is_literal' => 'boolean',
|
||||||
'is_multiline' => 'boolean',
|
'is_multiline' => 'boolean',
|
||||||
'is_shown_once' => 'boolean',
|
'is_shown_once' => 'boolean',
|
||||||
|
|||||||
@@ -179,6 +179,8 @@ class TeamController extends Controller
|
|||||||
$members = $team->members;
|
$members = $team->members;
|
||||||
$members->makeHidden([
|
$members->makeHidden([
|
||||||
'pivot',
|
'pivot',
|
||||||
|
'email_change_code',
|
||||||
|
'email_change_code_expires_at',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return response()->json(
|
return response()->json(
|
||||||
@@ -264,6 +266,8 @@ class TeamController extends Controller
|
|||||||
$team = auth()->user()->currentTeam();
|
$team = auth()->user()->currentTeam();
|
||||||
$team->members->makeHidden([
|
$team->members->makeHidden([
|
||||||
'pivot',
|
'pivot',
|
||||||
|
'email_change_code',
|
||||||
|
'email_change_code_expires_at',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return response()->json(
|
return response()->json(
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Webhook;
|
|||||||
use App\Enums\ProcessStatus;
|
use App\Enums\ProcessStatus;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use App\Jobs\ApplicationPullRequestUpdateJob;
|
use App\Jobs\ApplicationPullRequestUpdateJob;
|
||||||
|
use App\Jobs\DeleteResourceJob;
|
||||||
use App\Jobs\GithubAppPermissionJob;
|
use App\Jobs\GithubAppPermissionJob;
|
||||||
use App\Models\Application;
|
use App\Models\Application;
|
||||||
use App\Models\ApplicationPreview;
|
use App\Models\ApplicationPreview;
|
||||||
@@ -78,6 +79,7 @@ class Github extends Controller
|
|||||||
$pull_request_html_url = data_get($payload, 'pull_request.html_url');
|
$pull_request_html_url = data_get($payload, 'pull_request.html_url');
|
||||||
$branch = data_get($payload, 'pull_request.head.ref');
|
$branch = data_get($payload, 'pull_request.head.ref');
|
||||||
$base_branch = data_get($payload, 'pull_request.base.ref');
|
$base_branch = data_get($payload, 'pull_request.base.ref');
|
||||||
|
$author_association = data_get($payload, 'pull_request.author_association');
|
||||||
}
|
}
|
||||||
if (! $branch) {
|
if (! $branch) {
|
||||||
return response('Nothing to do. No branch found in the request.');
|
return response('Nothing to do. No branch found in the request.');
|
||||||
@@ -95,151 +97,168 @@ class Github extends Controller
|
|||||||
return response("Nothing to do. No applications found with branch '$base_branch'.");
|
return response("Nothing to do. No applications found with branch '$base_branch'.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
foreach ($applications as $application) {
|
$applicationsByServer = $applications->groupBy(function ($app) {
|
||||||
$webhook_secret = data_get($application, 'manual_webhook_secret_github');
|
return $app->destination->server_id;
|
||||||
$hmac = hash_hmac('sha256', $request->getContent(), $webhook_secret);
|
});
|
||||||
if (! hash_equals($x_hub_signature_256, $hmac) && ! isDev()) {
|
|
||||||
$return_payloads->push([
|
|
||||||
'application' => $application->name,
|
|
||||||
'status' => 'failed',
|
|
||||||
'message' => 'Invalid signature.',
|
|
||||||
]);
|
|
||||||
|
|
||||||
continue;
|
foreach ($applicationsByServer as $serverId => $serverApplications) {
|
||||||
}
|
foreach ($serverApplications as $application) {
|
||||||
$isFunctional = $application->destination->server->isFunctional();
|
$webhook_secret = data_get($application, 'manual_webhook_secret_github');
|
||||||
if (! $isFunctional) {
|
$hmac = hash_hmac('sha256', $request->getContent(), $webhook_secret);
|
||||||
$return_payloads->push([
|
if (! hash_equals($x_hub_signature_256, $hmac) && ! isDev()) {
|
||||||
'application' => $application->name,
|
$return_payloads->push([
|
||||||
'status' => 'failed',
|
'application' => $application->name,
|
||||||
'message' => 'Server is not functional.',
|
'status' => 'failed',
|
||||||
]);
|
'message' => 'Invalid signature.',
|
||||||
|
]);
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if ($x_github_event === 'push') {
|
$isFunctional = $application->destination->server->isFunctional();
|
||||||
if ($application->isDeployable()) {
|
if (! $isFunctional) {
|
||||||
$is_watch_path_triggered = $application->isWatchPathsTriggered($changed_files);
|
$return_payloads->push([
|
||||||
if ($is_watch_path_triggered || is_null($application->watch_paths)) {
|
'application' => $application->name,
|
||||||
$deployment_uuid = new Cuid2;
|
'status' => 'failed',
|
||||||
$result = queue_application_deployment(
|
'message' => 'Server is not functional.',
|
||||||
application: $application,
|
]);
|
||||||
deployment_uuid: $deployment_uuid,
|
|
||||||
force_rebuild: false,
|
continue;
|
||||||
commit: data_get($payload, 'after', 'HEAD'),
|
}
|
||||||
is_webhook: true,
|
if ($x_github_event === 'push') {
|
||||||
);
|
if ($application->isDeployable()) {
|
||||||
if ($result['status'] === 'skipped') {
|
$is_watch_path_triggered = $application->isWatchPathsTriggered($changed_files);
|
||||||
$return_payloads->push([
|
if ($is_watch_path_triggered || is_null($application->watch_paths)) {
|
||||||
'application' => $application->name,
|
$deployment_uuid = new Cuid2;
|
||||||
'status' => 'skipped',
|
$result = queue_application_deployment(
|
||||||
'message' => $result['message'],
|
application: $application,
|
||||||
]);
|
deployment_uuid: $deployment_uuid,
|
||||||
|
force_rebuild: false,
|
||||||
|
commit: data_get($payload, 'after', 'HEAD'),
|
||||||
|
is_webhook: true,
|
||||||
|
);
|
||||||
|
if ($result['status'] === 'skipped') {
|
||||||
|
$return_payloads->push([
|
||||||
|
'application' => $application->name,
|
||||||
|
'status' => 'skipped',
|
||||||
|
'message' => $result['message'],
|
||||||
|
]);
|
||||||
|
} else {
|
||||||
|
$return_payloads->push([
|
||||||
|
'application' => $application->name,
|
||||||
|
'status' => 'success',
|
||||||
|
'message' => 'Deployment queued.',
|
||||||
|
'application_uuid' => $application->uuid,
|
||||||
|
'application_name' => $application->name,
|
||||||
|
'deployment_uuid' => $result['deployment_uuid'],
|
||||||
|
]);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
|
$paths = str($application->watch_paths)->explode("\n");
|
||||||
$return_payloads->push([
|
$return_payloads->push([
|
||||||
'application' => $application->name,
|
'status' => 'failed',
|
||||||
'status' => 'success',
|
'message' => 'Changed files do not match watch paths. Ignoring deployment.',
|
||||||
'message' => 'Deployment queued.',
|
|
||||||
'application_uuid' => $application->uuid,
|
'application_uuid' => $application->uuid,
|
||||||
'application_name' => $application->name,
|
'application_name' => $application->name,
|
||||||
'deployment_uuid' => $result['deployment_uuid'],
|
'details' => [
|
||||||
|
'changed_files' => $changed_files,
|
||||||
|
'watch_paths' => $paths,
|
||||||
|
],
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$paths = str($application->watch_paths)->explode("\n");
|
|
||||||
$return_payloads->push([
|
$return_payloads->push([
|
||||||
'status' => 'failed',
|
'status' => 'failed',
|
||||||
'message' => 'Changed files do not match watch paths. Ignoring deployment.',
|
'message' => 'Deployments disabled.',
|
||||||
'application_uuid' => $application->uuid,
|
'application_uuid' => $application->uuid,
|
||||||
'application_name' => $application->name,
|
'application_name' => $application->name,
|
||||||
'details' => [
|
|
||||||
'changed_files' => $changed_files,
|
|
||||||
'watch_paths' => $paths,
|
|
||||||
],
|
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
$return_payloads->push([
|
|
||||||
'status' => 'failed',
|
|
||||||
'message' => 'Deployments disabled.',
|
|
||||||
'application_uuid' => $application->uuid,
|
|
||||||
'application_name' => $application->name,
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
}
|
if ($x_github_event === 'pull_request') {
|
||||||
if ($x_github_event === 'pull_request') {
|
if ($action === 'opened' || $action === 'synchronize' || $action === 'reopened') {
|
||||||
if ($action === 'opened' || $action === 'synchronize' || $action === 'reopened') {
|
if ($application->isPRDeployable()) {
|
||||||
if ($application->isPRDeployable()) {
|
// Check if PR deployments from public contributors are restricted
|
||||||
$deployment_uuid = new Cuid2;
|
if (! $application->settings->is_pr_deployments_public_enabled) {
|
||||||
$found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
|
$trustedAssociations = ['OWNER', 'MEMBER', 'COLLABORATOR', 'CONTRIBUTOR'];
|
||||||
if (! $found) {
|
if (! in_array($author_association, $trustedAssociations)) {
|
||||||
if ($application->build_pack === 'dockercompose') {
|
$return_payloads->push([
|
||||||
$pr_app = ApplicationPreview::create([
|
'application' => $application->name,
|
||||||
'git_type' => 'github',
|
'status' => 'failed',
|
||||||
'application_id' => $application->id,
|
'message' => 'PR deployments are restricted to repository members and contributors. Author association: '.$author_association,
|
||||||
'pull_request_id' => $pull_request_id,
|
]);
|
||||||
'pull_request_html_url' => $pull_request_html_url,
|
|
||||||
'docker_compose_domains' => $application->docker_compose_domains,
|
|
||||||
]);
|
|
||||||
$pr_app->generate_preview_fqdn_compose();
|
|
||||||
} else {
|
|
||||||
$pr_app = ApplicationPreview::create([
|
|
||||||
'git_type' => 'github',
|
|
||||||
'application_id' => $application->id,
|
|
||||||
'pull_request_id' => $pull_request_id,
|
|
||||||
'pull_request_html_url' => $pull_request_html_url,
|
|
||||||
]);
|
|
||||||
$pr_app->generate_preview_fqdn();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$result = queue_application_deployment(
|
continue;
|
||||||
application: $application,
|
}
|
||||||
pull_request_id: $pull_request_id,
|
}
|
||||||
deployment_uuid: $deployment_uuid,
|
$deployment_uuid = new Cuid2;
|
||||||
force_rebuild: false,
|
$found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
|
||||||
commit: data_get($payload, 'head.sha', 'HEAD'),
|
if (! $found) {
|
||||||
is_webhook: true,
|
if ($application->build_pack === 'dockercompose') {
|
||||||
git_type: 'github'
|
$pr_app = ApplicationPreview::create([
|
||||||
);
|
'git_type' => 'github',
|
||||||
if ($result['status'] === 'skipped') {
|
'application_id' => $application->id,
|
||||||
|
'pull_request_id' => $pull_request_id,
|
||||||
|
'pull_request_html_url' => $pull_request_html_url,
|
||||||
|
'docker_compose_domains' => $application->docker_compose_domains,
|
||||||
|
]);
|
||||||
|
$pr_app->generate_preview_fqdn_compose();
|
||||||
|
} else {
|
||||||
|
$pr_app = ApplicationPreview::create([
|
||||||
|
'git_type' => 'github',
|
||||||
|
'application_id' => $application->id,
|
||||||
|
'pull_request_id' => $pull_request_id,
|
||||||
|
'pull_request_html_url' => $pull_request_html_url,
|
||||||
|
]);
|
||||||
|
$pr_app->generate_preview_fqdn();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = queue_application_deployment(
|
||||||
|
application: $application,
|
||||||
|
pull_request_id: $pull_request_id,
|
||||||
|
deployment_uuid: $deployment_uuid,
|
||||||
|
force_rebuild: false,
|
||||||
|
commit: data_get($payload, 'head.sha', 'HEAD'),
|
||||||
|
is_webhook: true,
|
||||||
|
git_type: 'github'
|
||||||
|
);
|
||||||
|
if ($result['status'] === 'skipped') {
|
||||||
|
$return_payloads->push([
|
||||||
|
'application' => $application->name,
|
||||||
|
'status' => 'skipped',
|
||||||
|
'message' => $result['message'],
|
||||||
|
]);
|
||||||
|
} else {
|
||||||
|
$return_payloads->push([
|
||||||
|
'application' => $application->name,
|
||||||
|
'status' => 'success',
|
||||||
|
'message' => 'Preview deployment queued.',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
$return_payloads->push([
|
$return_payloads->push([
|
||||||
'application' => $application->name,
|
'application' => $application->name,
|
||||||
'status' => 'skipped',
|
'status' => 'failed',
|
||||||
'message' => $result['message'],
|
'message' => 'Preview deployments disabled.',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($action === 'closed') {
|
||||||
|
$found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
|
||||||
|
if ($found) {
|
||||||
|
DeleteResourceJob::dispatch($found);
|
||||||
|
$return_payloads->push([
|
||||||
|
'application' => $application->name,
|
||||||
|
'status' => 'success',
|
||||||
|
'message' => 'Preview deployment closed.',
|
||||||
]);
|
]);
|
||||||
} else {
|
} else {
|
||||||
$return_payloads->push([
|
$return_payloads->push([
|
||||||
'application' => $application->name,
|
'application' => $application->name,
|
||||||
'status' => 'success',
|
'status' => 'failed',
|
||||||
'message' => 'Preview deployment queued.',
|
'message' => 'No preview deployment found.',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
$return_payloads->push([
|
|
||||||
'application' => $application->name,
|
|
||||||
'status' => 'failed',
|
|
||||||
'message' => 'Preview deployments disabled.',
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if ($action === 'closed') {
|
|
||||||
$found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
|
|
||||||
if ($found) {
|
|
||||||
$found->delete();
|
|
||||||
$container_name = generateApplicationContainerName($application, $pull_request_id);
|
|
||||||
instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
|
|
||||||
$return_payloads->push([
|
|
||||||
'application' => $application->name,
|
|
||||||
'status' => 'success',
|
|
||||||
'message' => 'Preview deployment closed.',
|
|
||||||
]);
|
|
||||||
} else {
|
|
||||||
$return_payloads->push([
|
|
||||||
'application' => $application->name,
|
|
||||||
'status' => 'failed',
|
|
||||||
'message' => 'No preview deployment found.',
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -327,6 +346,7 @@ class Github extends Controller
|
|||||||
$pull_request_html_url = data_get($payload, 'pull_request.html_url');
|
$pull_request_html_url = data_get($payload, 'pull_request.html_url');
|
||||||
$branch = data_get($payload, 'pull_request.head.ref');
|
$branch = data_get($payload, 'pull_request.head.ref');
|
||||||
$base_branch = data_get($payload, 'pull_request.base.ref');
|
$base_branch = data_get($payload, 'pull_request.base.ref');
|
||||||
|
$author_association = data_get($payload, 'pull_request.author_association');
|
||||||
}
|
}
|
||||||
if (! $id || ! $branch) {
|
if (! $id || ! $branch) {
|
||||||
return response('Nothing to do. No id or branch found.');
|
return response('Nothing to do. No id or branch found.');
|
||||||
@@ -344,127 +364,147 @@ class Github extends Controller
|
|||||||
return response("Nothing to do. No applications found with branch '$base_branch'.");
|
return response("Nothing to do. No applications found with branch '$base_branch'.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
foreach ($applications as $application) {
|
$applicationsByServer = $applications->groupBy(function ($app) {
|
||||||
$isFunctional = $application->destination->server->isFunctional();
|
return $app->destination->server_id;
|
||||||
if (! $isFunctional) {
|
});
|
||||||
$return_payloads->push([
|
|
||||||
'status' => 'failed',
|
|
||||||
'message' => 'Server is not functional.',
|
|
||||||
'application_uuid' => $application->uuid,
|
|
||||||
'application_name' => $application->name,
|
|
||||||
]);
|
|
||||||
|
|
||||||
continue;
|
foreach ($applicationsByServer as $serverId => $serverApplications) {
|
||||||
}
|
foreach ($serverApplications as $application) {
|
||||||
if ($x_github_event === 'push') {
|
$isFunctional = $application->destination->server->isFunctional();
|
||||||
if ($application->isDeployable()) {
|
if (! $isFunctional) {
|
||||||
$is_watch_path_triggered = $application->isWatchPathsTriggered($changed_files);
|
|
||||||
if ($is_watch_path_triggered || is_null($application->watch_paths)) {
|
|
||||||
$deployment_uuid = new Cuid2;
|
|
||||||
$result = queue_application_deployment(
|
|
||||||
application: $application,
|
|
||||||
deployment_uuid: $deployment_uuid,
|
|
||||||
commit: data_get($payload, 'after', 'HEAD'),
|
|
||||||
force_rebuild: false,
|
|
||||||
is_webhook: true,
|
|
||||||
);
|
|
||||||
$return_payloads->push([
|
|
||||||
'status' => $result['status'],
|
|
||||||
'message' => $result['message'],
|
|
||||||
'application_uuid' => $application->uuid,
|
|
||||||
'application_name' => $application->name,
|
|
||||||
'deployment_uuid' => $result['deployment_uuid'],
|
|
||||||
]);
|
|
||||||
} else {
|
|
||||||
$paths = str($application->watch_paths)->explode("\n");
|
|
||||||
$return_payloads->push([
|
|
||||||
'status' => 'failed',
|
|
||||||
'message' => 'Changed files do not match watch paths. Ignoring deployment.',
|
|
||||||
'application_uuid' => $application->uuid,
|
|
||||||
'application_name' => $application->name,
|
|
||||||
'details' => [
|
|
||||||
'changed_files' => $changed_files,
|
|
||||||
'watch_paths' => $paths,
|
|
||||||
],
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$return_payloads->push([
|
$return_payloads->push([
|
||||||
'status' => 'failed',
|
'status' => 'failed',
|
||||||
'message' => 'Deployments disabled.',
|
'message' => 'Server is not functional.',
|
||||||
'application_uuid' => $application->uuid,
|
'application_uuid' => $application->uuid,
|
||||||
'application_name' => $application->name,
|
'application_name' => $application->name,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
}
|
if ($x_github_event === 'push') {
|
||||||
if ($x_github_event === 'pull_request') {
|
if ($application->isDeployable()) {
|
||||||
if ($action === 'opened' || $action === 'synchronize' || $action === 'reopened') {
|
$is_watch_path_triggered = $application->isWatchPathsTriggered($changed_files);
|
||||||
if ($application->isPRDeployable()) {
|
if ($is_watch_path_triggered || is_null($application->watch_paths)) {
|
||||||
$deployment_uuid = new Cuid2;
|
$deployment_uuid = new Cuid2;
|
||||||
$found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
|
$result = queue_application_deployment(
|
||||||
if (! $found) {
|
application: $application,
|
||||||
ApplicationPreview::create([
|
deployment_uuid: $deployment_uuid,
|
||||||
'git_type' => 'github',
|
commit: data_get($payload, 'after', 'HEAD'),
|
||||||
'application_id' => $application->id,
|
force_rebuild: false,
|
||||||
'pull_request_id' => $pull_request_id,
|
is_webhook: true,
|
||||||
'pull_request_html_url' => $pull_request_html_url,
|
);
|
||||||
|
$return_payloads->push([
|
||||||
|
'status' => $result['status'],
|
||||||
|
'message' => $result['message'],
|
||||||
|
'application_uuid' => $application->uuid,
|
||||||
|
'application_name' => $application->name,
|
||||||
|
'deployment_uuid' => $result['deployment_uuid'],
|
||||||
|
]);
|
||||||
|
} else {
|
||||||
|
$paths = str($application->watch_paths)->explode("\n");
|
||||||
|
$return_payloads->push([
|
||||||
|
'status' => 'failed',
|
||||||
|
'message' => 'Changed files do not match watch paths. Ignoring deployment.',
|
||||||
|
'application_uuid' => $application->uuid,
|
||||||
|
'application_name' => $application->name,
|
||||||
|
'details' => [
|
||||||
|
'changed_files' => $changed_files,
|
||||||
|
'watch_paths' => $paths,
|
||||||
|
],
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
$result = queue_application_deployment(
|
} else {
|
||||||
application: $application,
|
$return_payloads->push([
|
||||||
pull_request_id: $pull_request_id,
|
'status' => 'failed',
|
||||||
deployment_uuid: $deployment_uuid,
|
'message' => 'Deployments disabled.',
|
||||||
force_rebuild: false,
|
'application_uuid' => $application->uuid,
|
||||||
commit: data_get($payload, 'head.sha', 'HEAD'),
|
'application_name' => $application->name,
|
||||||
is_webhook: true,
|
]);
|
||||||
git_type: 'github'
|
}
|
||||||
);
|
}
|
||||||
if ($result['status'] === 'skipped') {
|
if ($x_github_event === 'pull_request') {
|
||||||
|
if ($action === 'opened' || $action === 'synchronize' || $action === 'reopened') {
|
||||||
|
if ($application->isPRDeployable()) {
|
||||||
|
// Check if PR deployments from public contributors are restricted
|
||||||
|
if (! $application->settings->is_pr_deployments_public_enabled) {
|
||||||
|
$trustedAssociations = ['OWNER', 'MEMBER', 'COLLABORATOR', 'CONTRIBUTOR'];
|
||||||
|
if (! in_array($author_association, $trustedAssociations)) {
|
||||||
|
$return_payloads->push([
|
||||||
|
'application' => $application->name,
|
||||||
|
'status' => 'failed',
|
||||||
|
'message' => 'PR deployments are restricted to repository members and contributors. Author association: '.$author_association,
|
||||||
|
]);
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$deployment_uuid = new Cuid2;
|
||||||
|
$found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
|
||||||
|
if (! $found) {
|
||||||
|
ApplicationPreview::create([
|
||||||
|
'git_type' => 'github',
|
||||||
|
'application_id' => $application->id,
|
||||||
|
'pull_request_id' => $pull_request_id,
|
||||||
|
'pull_request_html_url' => $pull_request_html_url,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
$result = queue_application_deployment(
|
||||||
|
application: $application,
|
||||||
|
pull_request_id: $pull_request_id,
|
||||||
|
deployment_uuid: $deployment_uuid,
|
||||||
|
force_rebuild: false,
|
||||||
|
commit: data_get($payload, 'head.sha', 'HEAD'),
|
||||||
|
is_webhook: true,
|
||||||
|
git_type: 'github'
|
||||||
|
);
|
||||||
|
if ($result['status'] === 'skipped') {
|
||||||
|
$return_payloads->push([
|
||||||
|
'application' => $application->name,
|
||||||
|
'status' => 'skipped',
|
||||||
|
'message' => $result['message'],
|
||||||
|
]);
|
||||||
|
} else {
|
||||||
|
$return_payloads->push([
|
||||||
|
'application' => $application->name,
|
||||||
|
'status' => 'success',
|
||||||
|
'message' => 'Preview deployment queued.',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
$return_payloads->push([
|
$return_payloads->push([
|
||||||
'application' => $application->name,
|
'application' => $application->name,
|
||||||
'status' => 'skipped',
|
'status' => 'failed',
|
||||||
'message' => $result['message'],
|
'message' => 'Preview deployments disabled.',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($action === 'closed' || $action === 'close') {
|
||||||
|
$found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
|
||||||
|
if ($found) {
|
||||||
|
$containers = getCurrentApplicationContainerStatus($application->destination->server, $application->id, $pull_request_id);
|
||||||
|
if ($containers->isNotEmpty()) {
|
||||||
|
$containers->each(function ($container) use ($application) {
|
||||||
|
$container_name = data_get($container, 'Names');
|
||||||
|
instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
ApplicationPullRequestUpdateJob::dispatchSync(application: $application, preview: $found, status: ProcessStatus::CLOSED);
|
||||||
|
|
||||||
|
DeleteResourceJob::dispatch($found);
|
||||||
|
|
||||||
|
$return_payloads->push([
|
||||||
|
'application' => $application->name,
|
||||||
|
'status' => 'success',
|
||||||
|
'message' => 'Preview deployment closed.',
|
||||||
]);
|
]);
|
||||||
} else {
|
} else {
|
||||||
$return_payloads->push([
|
$return_payloads->push([
|
||||||
'application' => $application->name,
|
'application' => $application->name,
|
||||||
'status' => 'success',
|
'status' => 'failed',
|
||||||
'message' => 'Preview deployment queued.',
|
'message' => 'No preview deployment found.',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
$return_payloads->push([
|
|
||||||
'application' => $application->name,
|
|
||||||
'status' => 'failed',
|
|
||||||
'message' => 'Preview deployments disabled.',
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if ($action === 'closed' || $action === 'close') {
|
|
||||||
$found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
|
|
||||||
if ($found) {
|
|
||||||
$containers = getCurrentApplicationContainerStatus($application->destination->server, $application->id, $pull_request_id);
|
|
||||||
if ($containers->isNotEmpty()) {
|
|
||||||
$containers->each(function ($container) use ($application) {
|
|
||||||
$container_name = data_get($container, 'Names');
|
|
||||||
instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
ApplicationPullRequestUpdateJob::dispatchSync(application: $application, preview: $found, status: ProcessStatus::CLOSED);
|
|
||||||
$found->delete();
|
|
||||||
|
|
||||||
$return_payloads->push([
|
|
||||||
'application' => $application->name,
|
|
||||||
'status' => 'success',
|
|
||||||
'message' => 'Preview deployment closed.',
|
|
||||||
]);
|
|
||||||
} else {
|
|
||||||
$return_payloads->push([
|
|
||||||
'application' => $application->name,
|
|
||||||
'status' => 'failed',
|
|
||||||
'message' => 'No preview deployment found.',
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,15 +4,12 @@ namespace App\Http\Controllers\Webhook;
|
|||||||
|
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use App\Jobs\StripeProcessJob;
|
use App\Jobs\StripeProcessJob;
|
||||||
use App\Models\Webhook;
|
|
||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
|
||||||
class Stripe extends Controller
|
class Stripe extends Controller
|
||||||
{
|
{
|
||||||
protected $webhook;
|
|
||||||
|
|
||||||
public function events(Request $request)
|
public function events(Request $request)
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
@@ -40,19 +37,10 @@ class Stripe extends Controller
|
|||||||
|
|
||||||
return response('Webhook received. Cool cool cool cool cool.', 200);
|
return response('Webhook received. Cool cool cool cool cool.', 200);
|
||||||
}
|
}
|
||||||
$this->webhook = Webhook::create([
|
|
||||||
'type' => 'stripe',
|
|
||||||
'payload' => $request->getContent(),
|
|
||||||
]);
|
|
||||||
StripeProcessJob::dispatch($event);
|
StripeProcessJob::dispatch($event);
|
||||||
|
|
||||||
return response('Webhook received. Cool cool cool cool cool.', 200);
|
return response('Webhook received. Cool cool cool cool cool.', 200);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
$this->webhook->update([
|
|
||||||
'status' => 'failed',
|
|
||||||
'failure_reason' => $e->getMessage(),
|
|
||||||
]);
|
|
||||||
|
|
||||||
return response($e->getMessage(), 400);
|
return response($e->getMessage(), 400);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ class ApiAllowed
|
|||||||
$allowedIps = array_map('trim', $allowedIps);
|
$allowedIps = array_map('trim', $allowedIps);
|
||||||
$allowedIps = array_filter($allowedIps); // Remove empty entries
|
$allowedIps = array_filter($allowedIps); // Remove empty entries
|
||||||
|
|
||||||
if (! empty($allowedIps) && ! check_ip_against_allowlist($request->ip(), $allowedIps)) {
|
if (! empty($allowedIps) && ! checkIPAgainstAllowlist($request->ip(), $allowedIps)) {
|
||||||
return response()->json(['success' => true, 'message' => 'You are not allowed to access the API.'], 403);
|
return response()->json(['success' => true, 'message' => 'You are not allowed to access the API.'], 403);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,31 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Jobs;
|
|
||||||
|
|
||||||
use App\Actions\Docker\GetContainersStatus;
|
|
||||||
use App\Models\Server;
|
|
||||||
use Illuminate\Bus\Queueable;
|
|
||||||
use Illuminate\Contracts\Queue\ShouldBeEncrypted;
|
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
||||||
use Illuminate\Foundation\Bus\Dispatchable;
|
|
||||||
use Illuminate\Queue\InteractsWithQueue;
|
|
||||||
use Illuminate\Queue\SerializesModels;
|
|
||||||
|
|
||||||
class DEPRECATEDContainerStatusJob implements ShouldBeEncrypted, ShouldQueue
|
|
||||||
{
|
|
||||||
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
||||||
|
|
||||||
public $tries = 4;
|
|
||||||
|
|
||||||
public function backoff(): int
|
|
||||||
{
|
|
||||||
return isDev() ? 1 : 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function __construct(public Server $server) {}
|
|
||||||
|
|
||||||
public function handle()
|
|
||||||
{
|
|
||||||
GetContainersStatus::run($this->server);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Jobs;
|
|
||||||
|
|
||||||
use App\Actions\Server\ResourcesCheck;
|
|
||||||
use App\Actions\Server\ServerCheck;
|
|
||||||
use App\Models\Server;
|
|
||||||
use Illuminate\Bus\Queueable;
|
|
||||||
use Illuminate\Contracts\Queue\ShouldBeEncrypted;
|
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
||||||
use Illuminate\Foundation\Bus\Dispatchable;
|
|
||||||
use Illuminate\Queue\InteractsWithQueue;
|
|
||||||
use Illuminate\Queue\SerializesModels;
|
|
||||||
|
|
||||||
class DEPRECATEDServerCheckNewJob implements ShouldBeEncrypted, ShouldQueue
|
|
||||||
{
|
|
||||||
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
||||||
|
|
||||||
public $tries = 1;
|
|
||||||
|
|
||||||
public $timeout = 60;
|
|
||||||
|
|
||||||
public function __construct(public Server $server) {}
|
|
||||||
|
|
||||||
public function handle()
|
|
||||||
{
|
|
||||||
try {
|
|
||||||
ServerCheck::run($this->server);
|
|
||||||
ResourcesCheck::dispatch($this->server);
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
return handleError($e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,162 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Jobs;
|
|
||||||
|
|
||||||
use App\Models\InstanceSettings;
|
|
||||||
use App\Models\Server;
|
|
||||||
use App\Models\Team;
|
|
||||||
use Cron\CronExpression;
|
|
||||||
use Illuminate\Bus\Queueable;
|
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
||||||
use Illuminate\Foundation\Bus\Dispatchable;
|
|
||||||
use Illuminate\Queue\InteractsWithQueue;
|
|
||||||
use Illuminate\Queue\Middleware\WithoutOverlapping;
|
|
||||||
use Illuminate\Queue\SerializesModels;
|
|
||||||
use Illuminate\Support\Carbon;
|
|
||||||
use Illuminate\Support\Facades\Log;
|
|
||||||
|
|
||||||
class DEPRECATEDServerResourceManager implements ShouldQueue
|
|
||||||
{
|
|
||||||
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The time when this job execution started.
|
|
||||||
*/
|
|
||||||
private ?Carbon $executionTime = null;
|
|
||||||
|
|
||||||
private InstanceSettings $settings;
|
|
||||||
|
|
||||||
private string $instanceTimezone;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new job instance.
|
|
||||||
*/
|
|
||||||
public function __construct()
|
|
||||||
{
|
|
||||||
$this->onQueue('high');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the middleware the job should pass through.
|
|
||||||
*/
|
|
||||||
public function middleware(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
(new WithoutOverlapping('server-resource-manager'))
|
|
||||||
->releaseAfter(60),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
public function handle(): void
|
|
||||||
{
|
|
||||||
// Freeze the execution time at the start of the job
|
|
||||||
$this->executionTime = Carbon::now();
|
|
||||||
|
|
||||||
$this->settings = instanceSettings();
|
|
||||||
$this->instanceTimezone = $this->settings->instance_timezone ?: config('app.timezone');
|
|
||||||
|
|
||||||
if (validate_timezone($this->instanceTimezone) === false) {
|
|
||||||
$this->instanceTimezone = config('app.timezone');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Process server checks - don't let failures stop the job
|
|
||||||
try {
|
|
||||||
$this->processServerChecks();
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
Log::channel('scheduled-errors')->error('Failed to process server checks', [
|
|
||||||
'error' => $e->getMessage(),
|
|
||||||
'trace' => $e->getTraceAsString(),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private function processServerChecks(): void
|
|
||||||
{
|
|
||||||
$servers = $this->getServers();
|
|
||||||
|
|
||||||
foreach ($servers as $server) {
|
|
||||||
try {
|
|
||||||
$this->processServer($server);
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
Log::channel('scheduled-errors')->error('Error processing server', [
|
|
||||||
'server_id' => $server->id,
|
|
||||||
'server_name' => $server->name,
|
|
||||||
'error' => $e->getMessage(),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private function getServers()
|
|
||||||
{
|
|
||||||
$allServers = Server::where('ip', '!=', '1.2.3.4');
|
|
||||||
|
|
||||||
if (isCloud()) {
|
|
||||||
$servers = $allServers->whereRelation('team.subscription', 'stripe_invoice_paid', true)->get();
|
|
||||||
$own = Team::find(0)->servers;
|
|
||||||
|
|
||||||
return $servers->merge($own);
|
|
||||||
} else {
|
|
||||||
return $allServers->get();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private function processServer(Server $server): void
|
|
||||||
{
|
|
||||||
$serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
|
|
||||||
if (validate_timezone($serverTimezone) === false) {
|
|
||||||
$serverTimezone = config('app.timezone');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sentinel check
|
|
||||||
$lastSentinelUpdate = $server->sentinel_updated_at;
|
|
||||||
if (Carbon::parse($lastSentinelUpdate)->isBefore($this->executionTime->subSeconds($server->waitBeforeDoingSshCheck()))) {
|
|
||||||
// Dispatch ServerCheckJob if due
|
|
||||||
$checkFrequency = isCloud() ? '*/5 * * * *' : '* * * * *'; // Every 5 min for cloud, every minute for self-hosted
|
|
||||||
if ($this->shouldRunNow($checkFrequency, $serverTimezone)) {
|
|
||||||
ServerCheckJob::dispatch($server);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dispatch ServerStorageCheckJob if due
|
|
||||||
$serverDiskUsageCheckFrequency = data_get($server->settings, 'server_disk_usage_check_frequency', '0 * * * *');
|
|
||||||
if (isset(VALID_CRON_STRINGS[$serverDiskUsageCheckFrequency])) {
|
|
||||||
$serverDiskUsageCheckFrequency = VALID_CRON_STRINGS[$serverDiskUsageCheckFrequency];
|
|
||||||
}
|
|
||||||
if ($this->shouldRunNow($serverDiskUsageCheckFrequency, $serverTimezone)) {
|
|
||||||
ServerStorageCheckJob::dispatch($server);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dispatch DockerCleanupJob if due
|
|
||||||
$dockerCleanupFrequency = data_get($server->settings, 'docker_cleanup_frequency', '0 * * * *');
|
|
||||||
if (isset(VALID_CRON_STRINGS[$dockerCleanupFrequency])) {
|
|
||||||
$dockerCleanupFrequency = VALID_CRON_STRINGS[$dockerCleanupFrequency];
|
|
||||||
}
|
|
||||||
if ($this->shouldRunNow($dockerCleanupFrequency, $serverTimezone)) {
|
|
||||||
DockerCleanupJob::dispatch($server, false, $server->settings->delete_unused_volumes, $server->settings->delete_unused_networks);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dispatch ServerPatchCheckJob if due (weekly)
|
|
||||||
if ($this->shouldRunNow('0 0 * * 0', $serverTimezone)) { // Weekly on Sunday at midnight
|
|
||||||
ServerPatchCheckJob::dispatch($server);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dispatch Sentinel restart if due (daily for Sentinel-enabled servers)
|
|
||||||
if ($server->isSentinelEnabled() && $this->shouldRunNow('0 0 * * *', $serverTimezone)) {
|
|
||||||
dispatch(function () use ($server) {
|
|
||||||
$server->restartContainer('coolify-sentinel');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private function shouldRunNow(string $frequency, string $timezone): bool
|
|
||||||
{
|
|
||||||
$cron = new CronExpression($frequency);
|
|
||||||
|
|
||||||
// Use the frozen execution time, not the current time
|
|
||||||
$baseTime = $this->executionTime ?? Carbon::now();
|
|
||||||
$executionTime = $baseTime->copy()->setTimezone($timezone);
|
|
||||||
|
|
||||||
return $cron->isDue($executionTime);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -54,6 +54,10 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
|
|||||||
|
|
||||||
public ?string $backup_output = null;
|
public ?string $backup_output = null;
|
||||||
|
|
||||||
|
public ?string $error_output = null;
|
||||||
|
|
||||||
|
public bool $s3_uploaded = false;
|
||||||
|
|
||||||
public ?string $postgres_password = null;
|
public ?string $postgres_password = null;
|
||||||
|
|
||||||
public ?string $mongo_root_username = null;
|
public ?string $mongo_root_username = null;
|
||||||
@@ -355,7 +359,6 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
|
|||||||
// If local backup is disabled, delete the local file immediately after S3 upload
|
// If local backup is disabled, delete the local file immediately after S3 upload
|
||||||
if ($this->backup->disable_local_backup) {
|
if ($this->backup->disable_local_backup) {
|
||||||
deleteBackupsLocally($this->backup_location, $this->server);
|
deleteBackupsLocally($this->backup_location, $this->server);
|
||||||
$this->add_to_backup_output('Local backup file deleted after S3 upload (disable_local_backup enabled).');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -367,15 +370,34 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
|
|||||||
'size' => $size,
|
'size' => $size,
|
||||||
]);
|
]);
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
if ($this->backup_log) {
|
// Check if backup actually failed or if it's just a post-backup issue
|
||||||
$this->backup_log->update([
|
$actualBackupFailed = ! $this->s3_uploaded && $this->backup->save_s3;
|
||||||
'status' => 'failed',
|
|
||||||
'message' => $this->backup_output,
|
if ($actualBackupFailed || $size === 0) {
|
||||||
'size' => $size,
|
// Real backup failure
|
||||||
'filename' => null,
|
if ($this->backup_log) {
|
||||||
]);
|
$this->backup_log->update([
|
||||||
|
'status' => 'failed',
|
||||||
|
'message' => $this->error_output ?? $this->backup_output ?? $e->getMessage(),
|
||||||
|
'size' => $size,
|
||||||
|
'filename' => null,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
$this->team?->notify(new BackupFailed($this->backup, $this->database, $this->error_output ?? $this->backup_output ?? $e->getMessage(), $database));
|
||||||
|
} else {
|
||||||
|
// Backup succeeded but post-processing failed (cleanup, notification, etc.)
|
||||||
|
if ($this->backup_log) {
|
||||||
|
$this->backup_log->update([
|
||||||
|
'status' => 'success',
|
||||||
|
'message' => $this->backup_output ? $this->backup_output."\nWarning: Post-backup cleanup encountered an issue: ".$e->getMessage() : 'Warning: '.$e->getMessage(),
|
||||||
|
'size' => $size,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
// Send success notification since the backup itself succeeded
|
||||||
|
$this->team->notify(new BackupSuccess($this->backup, $this->database, $database));
|
||||||
|
// Log the post-backup issue
|
||||||
|
ray('Post-backup operation failed but backup was successful: '.$e->getMessage());
|
||||||
}
|
}
|
||||||
$this->team?->notify(new BackupFailed($this->backup, $this->database, $this->backup_output, $database));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($this->backup_log && $this->backup_log->status === 'success') {
|
if ($this->backup_log && $this->backup_log->status === 'success') {
|
||||||
@@ -446,7 +468,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
|
|||||||
$this->backup_output = null;
|
$this->backup_output = null;
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
$this->add_to_backup_output($e->getMessage());
|
$this->add_to_error_output($e->getMessage());
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -472,7 +494,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
|
|||||||
$this->backup_output = null;
|
$this->backup_output = null;
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
$this->add_to_backup_output($e->getMessage());
|
$this->add_to_error_output($e->getMessage());
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -492,7 +514,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
|
|||||||
$this->backup_output = null;
|
$this->backup_output = null;
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
$this->add_to_backup_output($e->getMessage());
|
$this->add_to_error_output($e->getMessage());
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -512,7 +534,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
|
|||||||
$this->backup_output = null;
|
$this->backup_output = null;
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
$this->add_to_backup_output($e->getMessage());
|
$this->add_to_error_output($e->getMessage());
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -526,6 +548,15 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function add_to_error_output($output): void
|
||||||
|
{
|
||||||
|
if ($this->error_output) {
|
||||||
|
$this->error_output = $this->error_output."\n".$output;
|
||||||
|
} else {
|
||||||
|
$this->error_output = $output;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private function calculate_size()
|
private function calculate_size()
|
||||||
{
|
{
|
||||||
return instant_remote_process(["du -b $this->backup_location | cut -f1"], $this->server, false);
|
return instant_remote_process(["du -b $this->backup_location | cut -f1"], $this->server, false);
|
||||||
@@ -571,9 +602,10 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
|
|||||||
$commands[] = "docker exec backup-of-{$this->backup->uuid} mc cp $this->backup_location temporary/$bucket{$this->backup_dir}/";
|
$commands[] = "docker exec backup-of-{$this->backup->uuid} mc cp $this->backup_location temporary/$bucket{$this->backup_dir}/";
|
||||||
instant_remote_process($commands, $this->server);
|
instant_remote_process($commands, $this->server);
|
||||||
|
|
||||||
$this->add_to_backup_output('Uploaded to S3.');
|
$this->s3_uploaded = true;
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
$this->add_to_backup_output($e->getMessage());
|
$this->s3_uploaded = false;
|
||||||
|
$this->add_to_error_output($e->getMessage());
|
||||||
throw $e;
|
throw $e;
|
||||||
} finally {
|
} finally {
|
||||||
$command = "docker rm -f backup-of-{$this->backup->uuid}";
|
$command = "docker rm -f backup-of-{$this->backup->uuid}";
|
||||||
|
|||||||
@@ -11,8 +11,9 @@ use Illuminate\Queue\InteractsWithQueue;
|
|||||||
use Illuminate\Queue\SerializesModels;
|
use Illuminate\Queue\SerializesModels;
|
||||||
use Illuminate\Support\Facades\File;
|
use Illuminate\Support\Facades\File;
|
||||||
use Illuminate\Support\Facades\Http;
|
use Illuminate\Support\Facades\Http;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
|
|
||||||
class PullChangelogFromGitHub implements ShouldBeEncrypted, ShouldQueue
|
class PullChangelog implements ShouldBeEncrypted, ShouldQueue
|
||||||
{
|
{
|
||||||
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
||||||
|
|
||||||
@@ -26,21 +27,36 @@ class PullChangelogFromGitHub implements ShouldBeEncrypted, ShouldQueue
|
|||||||
public function handle(): void
|
public function handle(): void
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
// Fetch from CDN instead of GitHub API to avoid rate limits
|
||||||
|
$cdnUrl = config('constants.coolify.releases_url');
|
||||||
|
|
||||||
$response = Http::retry(3, 1000)
|
$response = Http::retry(3, 1000)
|
||||||
->timeout(30)
|
->timeout(30)
|
||||||
->get('https://api.github.com/repos/coollabsio/coolify/releases?per_page=10');
|
->get($cdnUrl);
|
||||||
|
|
||||||
if ($response->successful()) {
|
if ($response->successful()) {
|
||||||
$releases = $response->json();
|
$releases = $response->json();
|
||||||
|
|
||||||
|
// Limit to 10 releases for processing (same as before)
|
||||||
|
$releases = array_slice($releases, 0, 10);
|
||||||
|
|
||||||
$changelog = $this->transformReleasesToChangelog($releases);
|
$changelog = $this->transformReleasesToChangelog($releases);
|
||||||
|
|
||||||
// Group entries by month and save them
|
// Group entries by month and save them
|
||||||
$this->saveChangelogEntries($changelog);
|
$this->saveChangelogEntries($changelog);
|
||||||
} else {
|
} else {
|
||||||
send_internal_notification('PullChangelogFromGitHub failed with: '.$response->status().' '.$response->body());
|
// Log error instead of sending notification
|
||||||
|
Log::error('PullChangelogFromGitHub: Failed to fetch from CDN', [
|
||||||
|
'status' => $response->status(),
|
||||||
|
'url' => $cdnUrl,
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
send_internal_notification('PullChangelogFromGitHub failed with: '.$e->getMessage());
|
// Log error instead of sending notification
|
||||||
|
Log::error('PullChangelogFromGitHub: Exception occurred', [
|
||||||
|
'message' => $e->getMessage(),
|
||||||
|
'trace' => $e->getTraceAsString(),
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,6 +65,8 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
|
|||||||
|
|
||||||
public Collection $foundApplicationPreviewsIds;
|
public Collection $foundApplicationPreviewsIds;
|
||||||
|
|
||||||
|
public Collection $applicationContainerStatuses;
|
||||||
|
|
||||||
public bool $foundProxy = false;
|
public bool $foundProxy = false;
|
||||||
|
|
||||||
public bool $foundLogDrainContainer = false;
|
public bool $foundLogDrainContainer = false;
|
||||||
@@ -87,6 +89,7 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
|
|||||||
$this->foundServiceApplicationIds = collect();
|
$this->foundServiceApplicationIds = collect();
|
||||||
$this->foundApplicationPreviewsIds = collect();
|
$this->foundApplicationPreviewsIds = collect();
|
||||||
$this->foundServiceDatabaseIds = collect();
|
$this->foundServiceDatabaseIds = collect();
|
||||||
|
$this->applicationContainerStatuses = collect();
|
||||||
$this->allApplicationIds = collect();
|
$this->allApplicationIds = collect();
|
||||||
$this->allDatabaseUuids = collect();
|
$this->allDatabaseUuids = collect();
|
||||||
$this->allTcpProxyUuids = collect();
|
$this->allTcpProxyUuids = collect();
|
||||||
@@ -155,7 +158,14 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
|
|||||||
if ($this->allApplicationIds->contains($applicationId) && $this->isRunning($containerStatus)) {
|
if ($this->allApplicationIds->contains($applicationId) && $this->isRunning($containerStatus)) {
|
||||||
$this->foundApplicationIds->push($applicationId);
|
$this->foundApplicationIds->push($applicationId);
|
||||||
}
|
}
|
||||||
$this->updateApplicationStatus($applicationId, $containerStatus);
|
// Store container status for aggregation
|
||||||
|
if (! $this->applicationContainerStatuses->has($applicationId)) {
|
||||||
|
$this->applicationContainerStatuses->put($applicationId, collect());
|
||||||
|
}
|
||||||
|
$containerName = $labels->get('com.docker.compose.service');
|
||||||
|
if ($containerName) {
|
||||||
|
$this->applicationContainerStatuses->get($applicationId)->put($containerName, $containerStatus);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
$previewKey = $applicationId.':'.$pullRequestId;
|
$previewKey = $applicationId.':'.$pullRequestId;
|
||||||
if ($this->allApplicationPreviewsIds->contains($previewKey) && $this->isRunning($containerStatus)) {
|
if ($this->allApplicationPreviewsIds->contains($previewKey) && $this->isRunning($containerStatus)) {
|
||||||
@@ -205,9 +215,86 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
|
|||||||
|
|
||||||
$this->updateAdditionalServersStatus();
|
$this->updateAdditionalServersStatus();
|
||||||
|
|
||||||
|
// Aggregate multi-container application statuses
|
||||||
|
$this->aggregateMultiContainerStatuses();
|
||||||
|
|
||||||
$this->checkLogDrainContainer();
|
$this->checkLogDrainContainer();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function aggregateMultiContainerStatuses()
|
||||||
|
{
|
||||||
|
if ($this->applicationContainerStatuses->isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($this->applicationContainerStatuses as $applicationId => $containerStatuses) {
|
||||||
|
$application = $this->applications->where('id', $applicationId)->first();
|
||||||
|
if (! $application) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse docker compose to check for excluded containers
|
||||||
|
$dockerComposeRaw = data_get($application, 'docker_compose_raw');
|
||||||
|
$excludedContainers = collect();
|
||||||
|
|
||||||
|
if ($dockerComposeRaw) {
|
||||||
|
try {
|
||||||
|
$dockerCompose = \Symfony\Component\Yaml\Yaml::parse($dockerComposeRaw);
|
||||||
|
$services = data_get($dockerCompose, 'services', []);
|
||||||
|
|
||||||
|
foreach ($services as $serviceName => $serviceConfig) {
|
||||||
|
// Check if container should be excluded
|
||||||
|
$excludeFromHc = data_get($serviceConfig, 'exclude_from_hc', false);
|
||||||
|
$restartPolicy = data_get($serviceConfig, 'restart', 'always');
|
||||||
|
|
||||||
|
if ($excludeFromHc || $restartPolicy === 'no') {
|
||||||
|
$excludedContainers->push($serviceName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
// If we can't parse, treat all containers as included
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Filter out excluded containers
|
||||||
|
$relevantStatuses = $containerStatuses->filter(function ($status, $containerName) use ($excludedContainers) {
|
||||||
|
return ! $excludedContainers->contains($containerName);
|
||||||
|
});
|
||||||
|
|
||||||
|
// If all containers are excluded, don't update status
|
||||||
|
if ($relevantStatuses->isEmpty()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Aggregate status: if any container is running, app is running
|
||||||
|
$hasRunning = false;
|
||||||
|
$hasUnhealthy = false;
|
||||||
|
|
||||||
|
foreach ($relevantStatuses as $status) {
|
||||||
|
if (str($status)->contains('running')) {
|
||||||
|
$hasRunning = true;
|
||||||
|
if (str($status)->contains('unhealthy')) {
|
||||||
|
$hasUnhealthy = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$aggregatedStatus = null;
|
||||||
|
if ($hasRunning) {
|
||||||
|
$aggregatedStatus = $hasUnhealthy ? 'running (unhealthy)' : 'running (healthy)';
|
||||||
|
} else {
|
||||||
|
// All containers are exited
|
||||||
|
$aggregatedStatus = 'exited (unhealthy)';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update application status with aggregated result
|
||||||
|
if ($aggregatedStatus && $application->status !== $aggregatedStatus) {
|
||||||
|
$application->status = $aggregatedStatus;
|
||||||
|
$application->save();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private function updateApplicationStatus(string $applicationId, string $containerStatus)
|
private function updateApplicationStatus(string $applicationId, string $containerStatus)
|
||||||
{
|
{
|
||||||
$application = $this->applications->where('id', $applicationId)->first();
|
$application = $this->applications->where('id', $applicationId)->first();
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
namespace App\Jobs;
|
namespace App\Jobs;
|
||||||
|
|
||||||
use App\Events\ScheduledTaskDone;
|
use App\Events\ScheduledTaskDone;
|
||||||
|
use App\Exceptions\NonReportableException;
|
||||||
use App\Models\Application;
|
use App\Models\Application;
|
||||||
use App\Models\ScheduledTask;
|
use App\Models\ScheduledTask;
|
||||||
use App\Models\ScheduledTaskExecution;
|
use App\Models\ScheduledTaskExecution;
|
||||||
@@ -120,7 +121,7 @@ class ScheduledTaskJob implements ShouldQueue
|
|||||||
}
|
}
|
||||||
|
|
||||||
// No valid container was found.
|
// No valid container was found.
|
||||||
throw new \Exception('ScheduledTaskJob failed: No valid container was found. Is the container name correct?');
|
throw new NonReportableException('ScheduledTaskJob failed: No valid container was found. Is the container name correct?');
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
if ($this->task_log) {
|
if ($this->task_log) {
|
||||||
$this->task_log->update([
|
$this->task_log->update([
|
||||||
|
|||||||
@@ -78,11 +78,11 @@ class ServerConnectionCheckJob implements ShouldBeEncrypted, ShouldQueue
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Server is reachable, check if Docker is available
|
// Server is reachable, check if Docker is available
|
||||||
// $isUsable = $this->checkDockerAvailability();
|
$isUsable = $this->checkDockerAvailability();
|
||||||
|
|
||||||
$this->server->settings->update([
|
$this->server->settings->update([
|
||||||
'is_reachable' => true,
|
'is_reachable' => true,
|
||||||
'is_usable' => true,
|
'is_usable' => $isUsable,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ class StripeProcessJob implements ShouldQueue
|
|||||||
case 'checkout.session.completed':
|
case 'checkout.session.completed':
|
||||||
$clientReferenceId = data_get($data, 'client_reference_id');
|
$clientReferenceId = data_get($data, 'client_reference_id');
|
||||||
if (is_null($clientReferenceId)) {
|
if (is_null($clientReferenceId)) {
|
||||||
send_internal_notification('Checkout session completed without client reference id.');
|
// send_internal_notification('Checkout session completed without client reference id.');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
$userId = Str::before($clientReferenceId, ':');
|
$userId = Str::before($clientReferenceId, ':');
|
||||||
@@ -68,7 +68,7 @@ class StripeProcessJob implements ShouldQueue
|
|||||||
$team = Team::find($teamId);
|
$team = Team::find($teamId);
|
||||||
$found = $team->members->where('id', $userId)->first();
|
$found = $team->members->where('id', $userId)->first();
|
||||||
if (! $found->isAdmin()) {
|
if (! $found->isAdmin()) {
|
||||||
send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
|
// send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
|
||||||
throw new \RuntimeException("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
|
throw new \RuntimeException("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
|
||||||
}
|
}
|
||||||
$subscription = Subscription::where('team_id', $teamId)->first();
|
$subscription = Subscription::where('team_id', $teamId)->first();
|
||||||
@@ -95,7 +95,7 @@ class StripeProcessJob implements ShouldQueue
|
|||||||
$customerId = data_get($data, 'customer');
|
$customerId = data_get($data, 'customer');
|
||||||
$planId = data_get($data, 'lines.data.0.plan.id');
|
$planId = data_get($data, 'lines.data.0.plan.id');
|
||||||
if (Str::contains($excludedPlans, $planId)) {
|
if (Str::contains($excludedPlans, $planId)) {
|
||||||
send_internal_notification('Subscription excluded.');
|
// send_internal_notification('Subscription excluded.');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
$subscription = Subscription::where('stripe_customer_id', $customerId)->first();
|
$subscription = Subscription::where('stripe_customer_id', $customerId)->first();
|
||||||
@@ -110,16 +110,38 @@ class StripeProcessJob implements ShouldQueue
|
|||||||
break;
|
break;
|
||||||
case 'invoice.payment_failed':
|
case 'invoice.payment_failed':
|
||||||
$customerId = data_get($data, 'customer');
|
$customerId = data_get($data, 'customer');
|
||||||
|
$invoiceId = data_get($data, 'id');
|
||||||
|
$paymentIntentId = data_get($data, 'payment_intent');
|
||||||
|
|
||||||
$subscription = Subscription::where('stripe_customer_id', $customerId)->first();
|
$subscription = Subscription::where('stripe_customer_id', $customerId)->first();
|
||||||
if (! $subscription) {
|
if (! $subscription) {
|
||||||
send_internal_notification('invoice.payment_failed failed but no subscription found in Coolify for customer: '.$customerId);
|
// send_internal_notification('invoice.payment_failed failed but no subscription found in Coolify for customer: '.$customerId);
|
||||||
throw new \RuntimeException("No subscription found for customer: {$customerId}");
|
throw new \RuntimeException("No subscription found for customer: {$customerId}");
|
||||||
}
|
}
|
||||||
$team = data_get($subscription, 'team');
|
$team = data_get($subscription, 'team');
|
||||||
if (! $team) {
|
if (! $team) {
|
||||||
send_internal_notification('invoice.payment_failed failed but no team found in Coolify for customer: '.$customerId);
|
// send_internal_notification('invoice.payment_failed failed but no team found in Coolify for customer: '.$customerId);
|
||||||
throw new \RuntimeException("No team found in Coolify for customer: {$customerId}");
|
throw new \RuntimeException("No team found in Coolify for customer: {$customerId}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Verify payment status with Stripe API before sending failure notification
|
||||||
|
if ($paymentIntentId) {
|
||||||
|
try {
|
||||||
|
$stripe = new \Stripe\StripeClient(config('subscription.stripe_api_key'));
|
||||||
|
$paymentIntent = $stripe->paymentIntents->retrieve($paymentIntentId);
|
||||||
|
|
||||||
|
if (in_array($paymentIntent->status, ['processing', 'succeeded', 'requires_action', 'requires_confirmation'])) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! $subscription->stripe_invoice_paid && $subscription->created_at->diffInMinutes(now()) < 5) {
|
||||||
|
SubscriptionInvoiceFailedJob::dispatch($team)->delay(now()->addSeconds(60));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (! $subscription->stripe_invoice_paid) {
|
if (! $subscription->stripe_invoice_paid) {
|
||||||
SubscriptionInvoiceFailedJob::dispatch($team);
|
SubscriptionInvoiceFailedJob::dispatch($team);
|
||||||
// send_internal_notification('Invoice payment failed: '.$customerId);
|
// send_internal_notification('Invoice payment failed: '.$customerId);
|
||||||
@@ -129,11 +151,11 @@ class StripeProcessJob implements ShouldQueue
|
|||||||
$customerId = data_get($data, 'customer');
|
$customerId = data_get($data, 'customer');
|
||||||
$subscription = Subscription::where('stripe_customer_id', $customerId)->first();
|
$subscription = Subscription::where('stripe_customer_id', $customerId)->first();
|
||||||
if (! $subscription) {
|
if (! $subscription) {
|
||||||
send_internal_notification('payment_intent.payment_failed, no subscription found in Coolify for customer: '.$customerId);
|
// send_internal_notification('payment_intent.payment_failed, no subscription found in Coolify for customer: '.$customerId);
|
||||||
throw new \RuntimeException("No subscription found in Coolify for customer: {$customerId}");
|
throw new \RuntimeException("No subscription found in Coolify for customer: {$customerId}");
|
||||||
}
|
}
|
||||||
if ($subscription->stripe_invoice_paid) {
|
if ($subscription->stripe_invoice_paid) {
|
||||||
send_internal_notification('payment_intent.payment_failed but invoice is active for customer: '.$customerId);
|
// send_internal_notification('payment_intent.payment_failed but invoice is active for customer: '.$customerId);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -154,7 +176,7 @@ class StripeProcessJob implements ShouldQueue
|
|||||||
$team = Team::find($teamId);
|
$team = Team::find($teamId);
|
||||||
$found = $team->members->where('id', $userId)->first();
|
$found = $team->members->where('id', $userId)->first();
|
||||||
if (! $found->isAdmin()) {
|
if (! $found->isAdmin()) {
|
||||||
send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
|
// send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
|
||||||
throw new \RuntimeException("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
|
throw new \RuntimeException("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
|
||||||
}
|
}
|
||||||
$subscription = Subscription::where('team_id', $teamId)->first();
|
$subscription = Subscription::where('team_id', $teamId)->first();
|
||||||
@@ -177,7 +199,7 @@ class StripeProcessJob implements ShouldQueue
|
|||||||
$subscriptionId = data_get($data, 'items.data.0.subscription') ?? data_get($data, 'id');
|
$subscriptionId = data_get($data, 'items.data.0.subscription') ?? data_get($data, 'id');
|
||||||
$planId = data_get($data, 'items.data.0.plan.id') ?? data_get($data, 'plan.id');
|
$planId = data_get($data, 'items.data.0.plan.id') ?? data_get($data, 'plan.id');
|
||||||
if (Str::contains($excludedPlans, $planId)) {
|
if (Str::contains($excludedPlans, $planId)) {
|
||||||
send_internal_notification('Subscription excluded.');
|
// send_internal_notification('Subscription excluded.');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
$subscription = Subscription::where('stripe_customer_id', $customerId)->first();
|
$subscription = Subscription::where('stripe_customer_id', $customerId)->first();
|
||||||
@@ -194,7 +216,7 @@ class StripeProcessJob implements ShouldQueue
|
|||||||
'stripe_invoice_paid' => false,
|
'stripe_invoice_paid' => false,
|
||||||
]);
|
]);
|
||||||
} else {
|
} else {
|
||||||
send_internal_notification('No subscription and team id found');
|
// send_internal_notification('No subscription and team id found');
|
||||||
throw new \RuntimeException('No subscription and team id found');
|
throw new \RuntimeException('No subscription and team id found');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -230,7 +252,7 @@ class StripeProcessJob implements ShouldQueue
|
|||||||
$subscription->update([
|
$subscription->update([
|
||||||
'stripe_past_due' => true,
|
'stripe_past_due' => true,
|
||||||
]);
|
]);
|
||||||
send_internal_notification('Past Due: '.$customerId.'Subscription ID: '.$subscriptionId);
|
// send_internal_notification('Past Due: '.$customerId.'Subscription ID: '.$subscriptionId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($status === 'unpaid') {
|
if ($status === 'unpaid') {
|
||||||
@@ -238,13 +260,13 @@ class StripeProcessJob implements ShouldQueue
|
|||||||
$subscription->update([
|
$subscription->update([
|
||||||
'stripe_invoice_paid' => false,
|
'stripe_invoice_paid' => false,
|
||||||
]);
|
]);
|
||||||
send_internal_notification('Unpaid: '.$customerId.'Subscription ID: '.$subscriptionId);
|
// send_internal_notification('Unpaid: '.$customerId.'Subscription ID: '.$subscriptionId);
|
||||||
}
|
}
|
||||||
$team = data_get($subscription, 'team');
|
$team = data_get($subscription, 'team');
|
||||||
if ($team) {
|
if ($team) {
|
||||||
$team->subscriptionEnded();
|
$team->subscriptionEnded();
|
||||||
} else {
|
} else {
|
||||||
send_internal_notification('Subscription unpaid but no team found in Coolify for customer: '.$customerId);
|
// send_internal_notification('Subscription unpaid but no team found in Coolify for customer: '.$customerId);
|
||||||
throw new \RuntimeException("No team found in Coolify for customer: {$customerId}");
|
throw new \RuntimeException("No team found in Coolify for customer: {$customerId}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -273,11 +295,11 @@ class StripeProcessJob implements ShouldQueue
|
|||||||
if ($team) {
|
if ($team) {
|
||||||
$team->subscriptionEnded();
|
$team->subscriptionEnded();
|
||||||
} else {
|
} else {
|
||||||
send_internal_notification('Subscription deleted but no team found in Coolify for customer: '.$customerId);
|
// send_internal_notification('Subscription deleted but no team found in Coolify for customer: '.$customerId);
|
||||||
throw new \RuntimeException("No team found in Coolify for customer: {$customerId}");
|
throw new \RuntimeException("No team found in Coolify for customer: {$customerId}");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
send_internal_notification('Subscription deleted but no subscription found in Coolify for customer: '.$customerId);
|
// send_internal_notification('Subscription deleted but no subscription found in Coolify for customer: '.$customerId);
|
||||||
throw new \RuntimeException("No subscription found in Coolify for customer: {$customerId}");
|
throw new \RuntimeException("No subscription found in Coolify for customer: {$customerId}");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -23,6 +23,47 @@ class SubscriptionInvoiceFailedJob implements ShouldBeEncrypted, ShouldQueue
|
|||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
// Double-check subscription status before sending failure notification
|
||||||
|
$subscription = $this->team->subscription;
|
||||||
|
if ($subscription && $subscription->stripe_customer_id) {
|
||||||
|
try {
|
||||||
|
$stripe = new \Stripe\StripeClient(config('subscription.stripe_api_key'));
|
||||||
|
|
||||||
|
if ($subscription->stripe_subscription_id) {
|
||||||
|
$stripeSubscription = $stripe->subscriptions->retrieve($subscription->stripe_subscription_id);
|
||||||
|
|
||||||
|
if (in_array($stripeSubscription->status, ['active', 'trialing'])) {
|
||||||
|
if (! $subscription->stripe_invoice_paid) {
|
||||||
|
$subscription->update([
|
||||||
|
'stripe_invoice_paid' => true,
|
||||||
|
'stripe_past_due' => false,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$invoices = $stripe->invoices->all([
|
||||||
|
'customer' => $subscription->stripe_customer_id,
|
||||||
|
'limit' => 3,
|
||||||
|
]);
|
||||||
|
|
||||||
|
foreach ($invoices->data as $invoice) {
|
||||||
|
if ($invoice->paid && $invoice->created > (time() - 3600)) {
|
||||||
|
$subscription->update([
|
||||||
|
'stripe_invoice_paid' => true,
|
||||||
|
'stripe_past_due' => false,
|
||||||
|
]);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we reach here, payment genuinely failed
|
||||||
$session = getStripeCustomerPortalSession($this->team);
|
$session = getStripeCustomerPortalSession($this->team);
|
||||||
$mail = new MailMessage;
|
$mail = new MailMessage;
|
||||||
$mail->view('emails.subscription-invoice-failed', [
|
$mail->view('emails.subscription-invoice-failed', [
|
||||||
|
|||||||
372
app/Livewire/GlobalSearch.php
Normal file
372
app/Livewire/GlobalSearch.php
Normal file
@@ -0,0 +1,372 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Livewire;
|
||||||
|
|
||||||
|
use App\Models\Application;
|
||||||
|
use App\Models\Server;
|
||||||
|
use App\Models\Service;
|
||||||
|
use App\Models\StandaloneClickhouse;
|
||||||
|
use App\Models\StandaloneDragonfly;
|
||||||
|
use App\Models\StandaloneKeydb;
|
||||||
|
use App\Models\StandaloneMariadb;
|
||||||
|
use App\Models\StandaloneMongodb;
|
||||||
|
use App\Models\StandaloneMysql;
|
||||||
|
use App\Models\StandalonePostgresql;
|
||||||
|
use App\Models\StandaloneRedis;
|
||||||
|
use Illuminate\Support\Facades\Cache;
|
||||||
|
use Livewire\Component;
|
||||||
|
|
||||||
|
class GlobalSearch extends Component
|
||||||
|
{
|
||||||
|
public $searchQuery = '';
|
||||||
|
|
||||||
|
public $isModalOpen = false;
|
||||||
|
|
||||||
|
public $searchResults = [];
|
||||||
|
|
||||||
|
public $allSearchableItems = [];
|
||||||
|
|
||||||
|
public function mount()
|
||||||
|
{
|
||||||
|
$this->searchQuery = '';
|
||||||
|
$this->isModalOpen = false;
|
||||||
|
$this->searchResults = [];
|
||||||
|
$this->allSearchableItems = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function openSearchModal()
|
||||||
|
{
|
||||||
|
$this->isModalOpen = true;
|
||||||
|
$this->loadSearchableItems();
|
||||||
|
$this->dispatch('search-modal-opened');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function closeSearchModal()
|
||||||
|
{
|
||||||
|
$this->isModalOpen = false;
|
||||||
|
$this->searchQuery = '';
|
||||||
|
$this->searchResults = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getCacheKey($teamId)
|
||||||
|
{
|
||||||
|
return 'global_search_items_'.$teamId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function clearTeamCache($teamId)
|
||||||
|
{
|
||||||
|
Cache::forget(self::getCacheKey($teamId));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updatedSearchQuery()
|
||||||
|
{
|
||||||
|
$this->search();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function loadSearchableItems()
|
||||||
|
{
|
||||||
|
// Try to get from Redis cache first
|
||||||
|
$cacheKey = self::getCacheKey(auth()->user()->currentTeam()->id);
|
||||||
|
|
||||||
|
$this->allSearchableItems = Cache::remember($cacheKey, 300, function () {
|
||||||
|
ray()->showQueries();
|
||||||
|
$items = collect();
|
||||||
|
$team = auth()->user()->currentTeam();
|
||||||
|
|
||||||
|
// Get all applications
|
||||||
|
$applications = Application::ownedByCurrentTeam()
|
||||||
|
->with(['environment.project'])
|
||||||
|
->get()
|
||||||
|
->map(function ($app) {
|
||||||
|
// Collect all FQDNs from the application
|
||||||
|
$fqdns = collect([]);
|
||||||
|
|
||||||
|
// For regular applications
|
||||||
|
if ($app->fqdn) {
|
||||||
|
$fqdns = collect(explode(',', $app->fqdn))->map(fn ($fqdn) => trim($fqdn));
|
||||||
|
}
|
||||||
|
|
||||||
|
// For docker compose based applications
|
||||||
|
if ($app->build_pack === 'dockercompose' && $app->docker_compose_domains) {
|
||||||
|
try {
|
||||||
|
$composeDomains = json_decode($app->docker_compose_domains, true);
|
||||||
|
if (is_array($composeDomains)) {
|
||||||
|
foreach ($composeDomains as $serviceName => $domains) {
|
||||||
|
if (is_array($domains)) {
|
||||||
|
$fqdns = $fqdns->merge($domains);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
// Ignore JSON parsing errors
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$fqdnsString = $fqdns->implode(' ');
|
||||||
|
|
||||||
|
return [
|
||||||
|
'id' => $app->id,
|
||||||
|
'name' => $app->name,
|
||||||
|
'type' => 'application',
|
||||||
|
'uuid' => $app->uuid,
|
||||||
|
'description' => $app->description,
|
||||||
|
'link' => $app->link(),
|
||||||
|
'project' => $app->environment->project->name ?? null,
|
||||||
|
'environment' => $app->environment->name ?? null,
|
||||||
|
'fqdns' => $fqdns->take(2)->implode(', '), // Show first 2 FQDNs in UI
|
||||||
|
'search_text' => strtolower($app->name.' '.$app->description.' '.$fqdnsString),
|
||||||
|
];
|
||||||
|
});
|
||||||
|
|
||||||
|
// Get all services
|
||||||
|
$services = Service::ownedByCurrentTeam()
|
||||||
|
->with(['environment.project', 'applications'])
|
||||||
|
->get()
|
||||||
|
->map(function ($service) {
|
||||||
|
// Collect all FQDNs from service applications
|
||||||
|
$fqdns = collect([]);
|
||||||
|
foreach ($service->applications as $app) {
|
||||||
|
if ($app->fqdn) {
|
||||||
|
$appFqdns = collect(explode(',', $app->fqdn))->map(fn ($fqdn) => trim($fqdn));
|
||||||
|
$fqdns = $fqdns->merge($appFqdns);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$fqdnsString = $fqdns->implode(' ');
|
||||||
|
|
||||||
|
return [
|
||||||
|
'id' => $service->id,
|
||||||
|
'name' => $service->name,
|
||||||
|
'type' => 'service',
|
||||||
|
'uuid' => $service->uuid,
|
||||||
|
'description' => $service->description,
|
||||||
|
'link' => $service->link(),
|
||||||
|
'project' => $service->environment->project->name ?? null,
|
||||||
|
'environment' => $service->environment->name ?? null,
|
||||||
|
'fqdns' => $fqdns->take(2)->implode(', '), // Show first 2 FQDNs in UI
|
||||||
|
'search_text' => strtolower($service->name.' '.$service->description.' '.$fqdnsString),
|
||||||
|
];
|
||||||
|
});
|
||||||
|
|
||||||
|
// Get all standalone databases
|
||||||
|
$databases = collect();
|
||||||
|
|
||||||
|
// PostgreSQL
|
||||||
|
$databases = $databases->merge(
|
||||||
|
StandalonePostgresql::ownedByCurrentTeam()
|
||||||
|
->with(['environment.project'])
|
||||||
|
->get()
|
||||||
|
->map(function ($db) {
|
||||||
|
return [
|
||||||
|
'id' => $db->id,
|
||||||
|
'name' => $db->name,
|
||||||
|
'type' => 'database',
|
||||||
|
'subtype' => 'postgresql',
|
||||||
|
'uuid' => $db->uuid,
|
||||||
|
'description' => $db->description,
|
||||||
|
'link' => $db->link(),
|
||||||
|
'project' => $db->environment->project->name ?? null,
|
||||||
|
'environment' => $db->environment->name ?? null,
|
||||||
|
'search_text' => strtolower($db->name.' postgresql '.$db->description),
|
||||||
|
];
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
// MySQL
|
||||||
|
$databases = $databases->merge(
|
||||||
|
StandaloneMysql::ownedByCurrentTeam()
|
||||||
|
->with(['environment.project'])
|
||||||
|
->get()
|
||||||
|
->map(function ($db) {
|
||||||
|
return [
|
||||||
|
'id' => $db->id,
|
||||||
|
'name' => $db->name,
|
||||||
|
'type' => 'database',
|
||||||
|
'subtype' => 'mysql',
|
||||||
|
'uuid' => $db->uuid,
|
||||||
|
'description' => $db->description,
|
||||||
|
'link' => $db->link(),
|
||||||
|
'project' => $db->environment->project->name ?? null,
|
||||||
|
'environment' => $db->environment->name ?? null,
|
||||||
|
'search_text' => strtolower($db->name.' mysql '.$db->description),
|
||||||
|
];
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
// MariaDB
|
||||||
|
$databases = $databases->merge(
|
||||||
|
StandaloneMariadb::ownedByCurrentTeam()
|
||||||
|
->with(['environment.project'])
|
||||||
|
->get()
|
||||||
|
->map(function ($db) {
|
||||||
|
return [
|
||||||
|
'id' => $db->id,
|
||||||
|
'name' => $db->name,
|
||||||
|
'type' => 'database',
|
||||||
|
'subtype' => 'mariadb',
|
||||||
|
'uuid' => $db->uuid,
|
||||||
|
'description' => $db->description,
|
||||||
|
'link' => $db->link(),
|
||||||
|
'project' => $db->environment->project->name ?? null,
|
||||||
|
'environment' => $db->environment->name ?? null,
|
||||||
|
'search_text' => strtolower($db->name.' mariadb '.$db->description),
|
||||||
|
];
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
// MongoDB
|
||||||
|
$databases = $databases->merge(
|
||||||
|
StandaloneMongodb::ownedByCurrentTeam()
|
||||||
|
->with(['environment.project'])
|
||||||
|
->get()
|
||||||
|
->map(function ($db) {
|
||||||
|
return [
|
||||||
|
'id' => $db->id,
|
||||||
|
'name' => $db->name,
|
||||||
|
'type' => 'database',
|
||||||
|
'subtype' => 'mongodb',
|
||||||
|
'uuid' => $db->uuid,
|
||||||
|
'description' => $db->description,
|
||||||
|
'link' => $db->link(),
|
||||||
|
'project' => $db->environment->project->name ?? null,
|
||||||
|
'environment' => $db->environment->name ?? null,
|
||||||
|
'search_text' => strtolower($db->name.' mongodb '.$db->description),
|
||||||
|
];
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
// Redis
|
||||||
|
$databases = $databases->merge(
|
||||||
|
StandaloneRedis::ownedByCurrentTeam()
|
||||||
|
->with(['environment.project'])
|
||||||
|
->get()
|
||||||
|
->map(function ($db) {
|
||||||
|
return [
|
||||||
|
'id' => $db->id,
|
||||||
|
'name' => $db->name,
|
||||||
|
'type' => 'database',
|
||||||
|
'subtype' => 'redis',
|
||||||
|
'uuid' => $db->uuid,
|
||||||
|
'description' => $db->description,
|
||||||
|
'link' => $db->link(),
|
||||||
|
'project' => $db->environment->project->name ?? null,
|
||||||
|
'environment' => $db->environment->name ?? null,
|
||||||
|
'search_text' => strtolower($db->name.' redis '.$db->description),
|
||||||
|
];
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
// KeyDB
|
||||||
|
$databases = $databases->merge(
|
||||||
|
StandaloneKeydb::ownedByCurrentTeam()
|
||||||
|
->with(['environment.project'])
|
||||||
|
->get()
|
||||||
|
->map(function ($db) {
|
||||||
|
return [
|
||||||
|
'id' => $db->id,
|
||||||
|
'name' => $db->name,
|
||||||
|
'type' => 'database',
|
||||||
|
'subtype' => 'keydb',
|
||||||
|
'uuid' => $db->uuid,
|
||||||
|
'description' => $db->description,
|
||||||
|
'link' => $db->link(),
|
||||||
|
'project' => $db->environment->project->name ?? null,
|
||||||
|
'environment' => $db->environment->name ?? null,
|
||||||
|
'search_text' => strtolower($db->name.' keydb '.$db->description),
|
||||||
|
];
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
// Dragonfly
|
||||||
|
$databases = $databases->merge(
|
||||||
|
StandaloneDragonfly::ownedByCurrentTeam()
|
||||||
|
->with(['environment.project'])
|
||||||
|
->get()
|
||||||
|
->map(function ($db) {
|
||||||
|
return [
|
||||||
|
'id' => $db->id,
|
||||||
|
'name' => $db->name,
|
||||||
|
'type' => 'database',
|
||||||
|
'subtype' => 'dragonfly',
|
||||||
|
'uuid' => $db->uuid,
|
||||||
|
'description' => $db->description,
|
||||||
|
'link' => $db->link(),
|
||||||
|
'project' => $db->environment->project->name ?? null,
|
||||||
|
'environment' => $db->environment->name ?? null,
|
||||||
|
'search_text' => strtolower($db->name.' dragonfly '.$db->description),
|
||||||
|
];
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
// Clickhouse
|
||||||
|
$databases = $databases->merge(
|
||||||
|
StandaloneClickhouse::ownedByCurrentTeam()
|
||||||
|
->with(['environment.project'])
|
||||||
|
->get()
|
||||||
|
->map(function ($db) {
|
||||||
|
return [
|
||||||
|
'id' => $db->id,
|
||||||
|
'name' => $db->name,
|
||||||
|
'type' => 'database',
|
||||||
|
'subtype' => 'clickhouse',
|
||||||
|
'uuid' => $db->uuid,
|
||||||
|
'description' => $db->description,
|
||||||
|
'link' => $db->link(),
|
||||||
|
'project' => $db->environment->project->name ?? null,
|
||||||
|
'environment' => $db->environment->name ?? null,
|
||||||
|
'search_text' => strtolower($db->name.' clickhouse '.$db->description),
|
||||||
|
];
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
// Get all servers
|
||||||
|
$servers = Server::ownedByCurrentTeam()
|
||||||
|
->get()
|
||||||
|
->map(function ($server) {
|
||||||
|
return [
|
||||||
|
'id' => $server->id,
|
||||||
|
'name' => $server->name,
|
||||||
|
'type' => 'server',
|
||||||
|
'uuid' => $server->uuid,
|
||||||
|
'description' => $server->description,
|
||||||
|
'link' => $server->url(),
|
||||||
|
'project' => null,
|
||||||
|
'environment' => null,
|
||||||
|
'search_text' => strtolower($server->name.' '.$server->ip.' '.$server->description),
|
||||||
|
];
|
||||||
|
});
|
||||||
|
|
||||||
|
// Merge all collections
|
||||||
|
$items = $items->merge($applications)
|
||||||
|
->merge($services)
|
||||||
|
->merge($databases)
|
||||||
|
->merge($servers);
|
||||||
|
|
||||||
|
return $items->toArray();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private function search()
|
||||||
|
{
|
||||||
|
if (strlen($this->searchQuery) < 2) {
|
||||||
|
$this->searchResults = [];
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$query = strtolower($this->searchQuery);
|
||||||
|
|
||||||
|
// Case-insensitive search in the items
|
||||||
|
$this->searchResults = collect($this->allSearchableItems)
|
||||||
|
->filter(function ($item) use ($query) {
|
||||||
|
return str_contains($item['search_text'], $query);
|
||||||
|
})
|
||||||
|
->take(20)
|
||||||
|
->values()
|
||||||
|
->toArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function render()
|
||||||
|
{
|
||||||
|
return view('livewire.global-search');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -42,7 +42,7 @@ class Help extends Component
|
|||||||
'content' => 'User: `'.auth()->user()?->email.'` with subject: `'.$this->subject.'` has the following problem: `'.$this->description.'`',
|
'content' => 'User: `'.auth()->user()?->email.'` with subject: `'.$this->subject.'` has the following problem: `'.$this->description.'`',
|
||||||
]);
|
]);
|
||||||
} else {
|
} else {
|
||||||
send_user_an_email($mail, auth()->user()?->email, 'hi@coollabs.io');
|
send_user_an_email($mail, auth()->user()?->email, 'feedback@coollabs.io');
|
||||||
}
|
}
|
||||||
$this->dispatch('success', 'Feedback sent.', 'We will get in touch with you as soon as possible.');
|
$this->dispatch('success', 'Feedback sent.', 'We will get in touch with you as soon as possible.');
|
||||||
$this->reset('description', 'subject');
|
$this->reset('description', 'subject');
|
||||||
|
|||||||
@@ -78,6 +78,8 @@ class Index extends Component
|
|||||||
'new_email' => ['required', 'email', 'unique:users,email'],
|
'new_email' => ['required', 'email', 'unique:users,email'],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
$this->new_email = strtolower($this->new_email);
|
||||||
|
|
||||||
// Skip rate limiting in development mode
|
// Skip rate limiting in development mode
|
||||||
if (! isDev()) {
|
if (! isDev()) {
|
||||||
// Rate limit by current user's email (1 request per 2 minutes)
|
// Rate limit by current user's email (1 request per 2 minutes)
|
||||||
@@ -90,7 +92,7 @@ class Index extends Component
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Rate limit by new email address (3 requests per hour per email)
|
// Rate limit by new email address (3 requests per hour per email)
|
||||||
$newEmailKey = 'email-change:email:'.md5(strtolower($this->new_email));
|
$newEmailKey = 'email-change:email:'.md5($this->new_email);
|
||||||
if (! RateLimiter::attempt($newEmailKey, 3, function () {}, 3600)) {
|
if (! RateLimiter::attempt($newEmailKey, 3, function () {}, 3600)) {
|
||||||
$this->dispatch('error', 'This email address has received too many verification requests. Please try again later.');
|
$this->dispatch('error', 'This email address has received too many verification requests. Please try again later.');
|
||||||
|
|
||||||
|
|||||||
@@ -28,6 +28,9 @@ class Advanced extends Component
|
|||||||
#[Validate(['boolean'])]
|
#[Validate(['boolean'])]
|
||||||
public bool $isPreviewDeploymentsEnabled = false;
|
public bool $isPreviewDeploymentsEnabled = false;
|
||||||
|
|
||||||
|
#[Validate(['boolean'])]
|
||||||
|
public bool $isPrDeploymentsPublicEnabled = false;
|
||||||
|
|
||||||
#[Validate(['boolean'])]
|
#[Validate(['boolean'])]
|
||||||
public bool $isAutoDeployEnabled = true;
|
public bool $isAutoDeployEnabled = true;
|
||||||
|
|
||||||
@@ -91,6 +94,7 @@ class Advanced extends Component
|
|||||||
$this->application->settings->is_git_lfs_enabled = $this->isGitLfsEnabled;
|
$this->application->settings->is_git_lfs_enabled = $this->isGitLfsEnabled;
|
||||||
$this->application->settings->is_git_shallow_clone_enabled = $this->isGitShallowCloneEnabled;
|
$this->application->settings->is_git_shallow_clone_enabled = $this->isGitShallowCloneEnabled;
|
||||||
$this->application->settings->is_preview_deployments_enabled = $this->isPreviewDeploymentsEnabled;
|
$this->application->settings->is_preview_deployments_enabled = $this->isPreviewDeploymentsEnabled;
|
||||||
|
$this->application->settings->is_pr_deployments_public_enabled = $this->isPrDeploymentsPublicEnabled;
|
||||||
$this->application->settings->is_auto_deploy_enabled = $this->isAutoDeployEnabled;
|
$this->application->settings->is_auto_deploy_enabled = $this->isAutoDeployEnabled;
|
||||||
$this->application->settings->is_log_drain_enabled = $this->isLogDrainEnabled;
|
$this->application->settings->is_log_drain_enabled = $this->isLogDrainEnabled;
|
||||||
$this->application->settings->is_gpu_enabled = $this->isGpuEnabled;
|
$this->application->settings->is_gpu_enabled = $this->isGpuEnabled;
|
||||||
@@ -117,6 +121,7 @@ class Advanced extends Component
|
|||||||
$this->isGitLfsEnabled = $this->application->settings->is_git_lfs_enabled;
|
$this->isGitLfsEnabled = $this->application->settings->is_git_lfs_enabled;
|
||||||
$this->isGitShallowCloneEnabled = $this->application->settings->is_git_shallow_clone_enabled ?? false;
|
$this->isGitShallowCloneEnabled = $this->application->settings->is_git_shallow_clone_enabled ?? false;
|
||||||
$this->isPreviewDeploymentsEnabled = $this->application->settings->is_preview_deployments_enabled;
|
$this->isPreviewDeploymentsEnabled = $this->application->settings->is_preview_deployments_enabled;
|
||||||
|
$this->isPrDeploymentsPublicEnabled = $this->application->settings->is_pr_deployments_public_enabled ?? false;
|
||||||
$this->isAutoDeployEnabled = $this->application->settings->is_auto_deploy_enabled;
|
$this->isAutoDeployEnabled = $this->application->settings->is_auto_deploy_enabled;
|
||||||
$this->isGpuEnabled = $this->application->settings->is_gpu_enabled;
|
$this->isGpuEnabled = $this->application->settings->is_gpu_enabled;
|
||||||
$this->gpuDriver = $this->application->settings->gpu_driver;
|
$this->gpuDriver = $this->application->settings->gpu_driver;
|
||||||
|
|||||||
@@ -52,15 +52,24 @@ class DeploymentNavbar extends Component
|
|||||||
|
|
||||||
public function cancel()
|
public function cancel()
|
||||||
{
|
{
|
||||||
$kill_command = "docker rm -f {$this->application_deployment_queue->deployment_uuid}";
|
$deployment_uuid = $this->application_deployment_queue->deployment_uuid;
|
||||||
|
$kill_command = "docker rm -f {$deployment_uuid}";
|
||||||
$build_server_id = $this->application_deployment_queue->build_server_id ?? $this->application->destination->server_id;
|
$build_server_id = $this->application_deployment_queue->build_server_id ?? $this->application->destination->server_id;
|
||||||
$server_id = $this->application_deployment_queue->server_id ?? $this->application->destination->server_id;
|
$server_id = $this->application_deployment_queue->server_id ?? $this->application->destination->server_id;
|
||||||
|
|
||||||
|
// First, mark the deployment as cancelled to prevent further processing
|
||||||
|
$this->application_deployment_queue->update([
|
||||||
|
'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
|
||||||
|
]);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if ($this->application->settings->is_build_server_enabled) {
|
if ($this->application->settings->is_build_server_enabled) {
|
||||||
$server = Server::ownedByCurrentTeam()->find($build_server_id);
|
$server = Server::ownedByCurrentTeam()->find($build_server_id);
|
||||||
} else {
|
} else {
|
||||||
$server = Server::ownedByCurrentTeam()->find($server_id);
|
$server = Server::ownedByCurrentTeam()->find($server_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add cancellation log entry
|
||||||
if ($this->application_deployment_queue->logs) {
|
if ($this->application_deployment_queue->logs) {
|
||||||
$previous_logs = json_decode($this->application_deployment_queue->logs, associative: true, flags: JSON_THROW_ON_ERROR);
|
$previous_logs = json_decode($this->application_deployment_queue->logs, associative: true, flags: JSON_THROW_ON_ERROR);
|
||||||
|
|
||||||
@@ -77,13 +86,35 @@ class DeploymentNavbar extends Component
|
|||||||
'logs' => json_encode($previous_logs, flags: JSON_THROW_ON_ERROR),
|
'logs' => json_encode($previous_logs, flags: JSON_THROW_ON_ERROR),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
instant_remote_process([$kill_command], $server);
|
|
||||||
|
// Try to stop the helper container if it exists
|
||||||
|
// Check if container exists first
|
||||||
|
$checkCommand = "docker ps -a --filter name={$deployment_uuid} --format '{{.Names}}'";
|
||||||
|
$containerExists = instant_remote_process([$checkCommand], $server);
|
||||||
|
|
||||||
|
if ($containerExists && str($containerExists)->trim()->isNotEmpty()) {
|
||||||
|
// Container exists, kill it
|
||||||
|
instant_remote_process([$kill_command], $server);
|
||||||
|
} else {
|
||||||
|
// Container hasn't started yet
|
||||||
|
$this->application_deployment_queue->addLogEntry('Helper container not yet started. Deployment will be cancelled when job checks status.');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Also try to kill any running process if we have a process ID
|
||||||
|
if ($this->application_deployment_queue->current_process_id) {
|
||||||
|
try {
|
||||||
|
$processKillCommand = "kill -9 {$this->application_deployment_queue->current_process_id}";
|
||||||
|
instant_remote_process([$processKillCommand], $server);
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
// Process might already be gone, that's ok
|
||||||
|
}
|
||||||
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
|
// Still mark as cancelled even if cleanup fails
|
||||||
return handleError($e, $this);
|
return handleError($e, $this);
|
||||||
} finally {
|
} finally {
|
||||||
$this->application_deployment_queue->update([
|
$this->application_deployment_queue->update([
|
||||||
'current_process_id' => null,
|
'current_process_id' => null,
|
||||||
'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
|
|
||||||
]);
|
]);
|
||||||
next_after_cancel($server);
|
next_after_cancel($server);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -487,7 +487,7 @@ class General extends Component
|
|||||||
$domains = str($this->application->fqdn)->trim()->explode(',');
|
$domains = str($this->application->fqdn)->trim()->explode(',');
|
||||||
if ($this->application->additional_servers->count() === 0) {
|
if ($this->application->additional_servers->count() === 0) {
|
||||||
foreach ($domains as $domain) {
|
foreach ($domains as $domain) {
|
||||||
if (! validate_dns_entry($domain, $this->application->destination->server)) {
|
if (! validateDNSEntry($domain, $this->application->destination->server)) {
|
||||||
$showToaster && $this->dispatch('error', 'Validating DNS failed.', "Make sure you have added the DNS records correctly.<br><br>$domain->{$this->application->destination->server->ip}<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
|
$showToaster && $this->dispatch('error', 'Validating DNS failed.', "Make sure you have added the DNS records correctly.<br><br>$domain->{$this->application->destination->server->ip}<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -615,7 +615,7 @@ class General extends Component
|
|||||||
foreach ($this->parsedServiceDomains as $service) {
|
foreach ($this->parsedServiceDomains as $service) {
|
||||||
$domain = data_get($service, 'domain');
|
$domain = data_get($service, 'domain');
|
||||||
if ($domain) {
|
if ($domain) {
|
||||||
if (! validate_dns_entry($domain, $this->application->destination->server)) {
|
if (! validateDNSEntry($domain, $this->application->destination->server)) {
|
||||||
$showToaster && $this->dispatch('error', 'Validating DNS failed.', "Make sure you have added the DNS records correctly.<br><br>$domain->{$this->application->destination->server->ip}<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
|
$showToaster && $this->dispatch('error', 'Validating DNS failed.', "Make sure you have added the DNS records correctly.<br><br>$domain->{$this->application->destination->server->ip}<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -671,7 +671,7 @@ class General extends Component
|
|||||||
$domains = collect(json_decode($this->application->docker_compose_domains, true)) ?? collect([]);
|
$domains = collect(json_decode($this->application->docker_compose_domains, true)) ?? collect([]);
|
||||||
|
|
||||||
foreach ($domains as $serviceName => $service) {
|
foreach ($domains as $serviceName => $service) {
|
||||||
$serviceNameFormatted = str($serviceName)->upper()->replace('-', '_');
|
$serviceNameFormatted = str($serviceName)->upper()->replace('-', '_')->replace('.', '_');
|
||||||
$domain = data_get($service, 'domain');
|
$domain = data_get($service, 'domain');
|
||||||
// Delete SERVICE_FQDN_ and SERVICE_URL_ variables if domain is removed
|
// Delete SERVICE_FQDN_ and SERVICE_URL_ variables if domain is removed
|
||||||
$this->application->environment_variables()->where('resourceable_type', Application::class)
|
$this->application->environment_variables()->where('resourceable_type', Application::class)
|
||||||
@@ -703,7 +703,6 @@ class General extends Component
|
|||||||
'key' => "SERVICE_FQDN_{$serviceNameFormatted}",
|
'key' => "SERVICE_FQDN_{$serviceNameFormatted}",
|
||||||
], [
|
], [
|
||||||
'value' => $fqdnValue,
|
'value' => $fqdnValue,
|
||||||
'is_build_time' => false,
|
|
||||||
'is_preview' => false,
|
'is_preview' => false,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
@@ -712,7 +711,6 @@ class General extends Component
|
|||||||
'key' => "SERVICE_URL_{$serviceNameFormatted}",
|
'key' => "SERVICE_URL_{$serviceNameFormatted}",
|
||||||
], [
|
], [
|
||||||
'value' => $urlValue,
|
'value' => $urlValue,
|
||||||
'is_build_time' => false,
|
|
||||||
'is_preview' => false,
|
'is_preview' => false,
|
||||||
]);
|
]);
|
||||||
// Create/update port-specific variables if port exists
|
// Create/update port-specific variables if port exists
|
||||||
@@ -721,7 +719,6 @@ class General extends Component
|
|||||||
'key' => "SERVICE_FQDN_{$serviceNameFormatted}_{$port}",
|
'key' => "SERVICE_FQDN_{$serviceNameFormatted}_{$port}",
|
||||||
], [
|
], [
|
||||||
'value' => $fqdnValue,
|
'value' => $fqdnValue,
|
||||||
'is_build_time' => false,
|
|
||||||
'is_preview' => false,
|
'is_preview' => false,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
@@ -729,7 +726,6 @@ class General extends Component
|
|||||||
'key' => "SERVICE_URL_{$serviceNameFormatted}_{$port}",
|
'key' => "SERVICE_URL_{$serviceNameFormatted}_{$port}",
|
||||||
], [
|
], [
|
||||||
'value' => $urlValue,
|
'value' => $urlValue,
|
||||||
'is_build_time' => false,
|
|
||||||
'is_preview' => false,
|
'is_preview' => false,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ class Previews extends Component
|
|||||||
$preview->fqdn = str($preview->fqdn)->replaceEnd(',', '')->trim();
|
$preview->fqdn = str($preview->fqdn)->replaceEnd(',', '')->trim();
|
||||||
$preview->fqdn = str($preview->fqdn)->replaceStart(',', '')->trim();
|
$preview->fqdn = str($preview->fqdn)->replaceStart(',', '')->trim();
|
||||||
$preview->fqdn = str($preview->fqdn)->trim()->lower();
|
$preview->fqdn = str($preview->fqdn)->trim()->lower();
|
||||||
if (! validate_dns_entry($preview->fqdn, $this->application->destination->server)) {
|
if (! validateDNSEntry($preview->fqdn, $this->application->destination->server)) {
|
||||||
$this->dispatch('error', 'Validating DNS failed.', "Make sure you have added the DNS records correctly.<br><br>$preview->fqdn->{$this->application->destination->server->ip}<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
|
$this->dispatch('error', 'Validating DNS failed.', "Make sure you have added the DNS records correctly.<br><br>$preview->fqdn->{$this->application->destination->server->ip}<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
|
||||||
$success = false;
|
$success = false;
|
||||||
}
|
}
|
||||||
@@ -231,6 +231,18 @@ class Previews extends Component
|
|||||||
$this->parameters['deployment_uuid'] = $this->deployment_uuid;
|
$this->parameters['deployment_uuid'] = $this->deployment_uuid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function stopContainers(array $containers, $server)
|
||||||
|
{
|
||||||
|
$containersToStop = collect($containers)->pluck('Names')->toArray();
|
||||||
|
|
||||||
|
foreach ($containersToStop as $containerName) {
|
||||||
|
instant_remote_process(command: [
|
||||||
|
"docker stop --time=30 $containerName",
|
||||||
|
"docker rm -f $containerName",
|
||||||
|
], server: $server, throwError: false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function stop(int $pull_request_id)
|
public function stop(int $pull_request_id)
|
||||||
{
|
{
|
||||||
$this->authorize('deploy', $this->application);
|
$this->authorize('deploy', $this->application);
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Livewire\Project;
|
namespace App\Livewire\Project;
|
||||||
|
|
||||||
use App\Actions\Application\StopApplication;
|
|
||||||
use App\Actions\Database\StartDatabase;
|
use App\Actions\Database\StartDatabase;
|
||||||
use App\Actions\Database\StopDatabase;
|
use App\Actions\Database\StopDatabase;
|
||||||
use App\Actions\Service\StartService;
|
use App\Actions\Service\StartService;
|
||||||
@@ -128,144 +127,10 @@ class CloneMe extends Component
|
|||||||
$databases = $this->environment->databases();
|
$databases = $this->environment->databases();
|
||||||
$services = $this->environment->services;
|
$services = $this->environment->services;
|
||||||
foreach ($applications as $application) {
|
foreach ($applications as $application) {
|
||||||
$applicationSettings = $application->settings;
|
$selectedDestination = $this->servers->flatMap(fn ($server) => $server->destinations())->where('id', $this->selectedDestination)->first();
|
||||||
|
clone_application($application, $selectedDestination, [
|
||||||
$uuid = (string) new Cuid2;
|
|
||||||
$url = $application->fqdn;
|
|
||||||
if ($this->server->proxyType() !== 'NONE' && $applicationSettings->is_container_label_readonly_enabled === true) {
|
|
||||||
$url = generateUrl(server: $this->server, random: $uuid);
|
|
||||||
}
|
|
||||||
|
|
||||||
$newApplication = $application->replicate([
|
|
||||||
'id',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
'additional_servers_count',
|
|
||||||
'additional_networks_count',
|
|
||||||
])->fill([
|
|
||||||
'uuid' => $uuid,
|
|
||||||
'fqdn' => $url,
|
|
||||||
'status' => 'exited',
|
|
||||||
'environment_id' => $environment->id,
|
'environment_id' => $environment->id,
|
||||||
'destination_id' => $this->selectedDestination,
|
], $this->cloneVolumeData);
|
||||||
]);
|
|
||||||
$newApplication->save();
|
|
||||||
|
|
||||||
if ($newApplication->destination->server->proxyType() !== 'NONE' && $applicationSettings->is_container_label_readonly_enabled === true) {
|
|
||||||
$customLabels = str(implode('|coolify|', generateLabelsApplication($newApplication)))->replace('|coolify|', "\n");
|
|
||||||
$newApplication->custom_labels = base64_encode($customLabels);
|
|
||||||
$newApplication->save();
|
|
||||||
}
|
|
||||||
|
|
||||||
$newApplication->settings()->delete();
|
|
||||||
if ($applicationSettings) {
|
|
||||||
$newApplicationSettings = $applicationSettings->replicate([
|
|
||||||
'id',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
])->fill([
|
|
||||||
'application_id' => $newApplication->id,
|
|
||||||
]);
|
|
||||||
$newApplicationSettings->save();
|
|
||||||
}
|
|
||||||
|
|
||||||
$tags = $application->tags;
|
|
||||||
foreach ($tags as $tag) {
|
|
||||||
$newApplication->tags()->attach($tag->id);
|
|
||||||
}
|
|
||||||
|
|
||||||
$scheduledTasks = $application->scheduled_tasks()->get();
|
|
||||||
foreach ($scheduledTasks as $task) {
|
|
||||||
$newTask = $task->replicate([
|
|
||||||
'id',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
])->fill([
|
|
||||||
'uuid' => (string) new Cuid2,
|
|
||||||
'application_id' => $newApplication->id,
|
|
||||||
'team_id' => currentTeam()->id,
|
|
||||||
]);
|
|
||||||
$newTask->save();
|
|
||||||
}
|
|
||||||
|
|
||||||
$applicationPreviews = $application->previews()->get();
|
|
||||||
foreach ($applicationPreviews as $preview) {
|
|
||||||
$newPreview = $preview->replicate([
|
|
||||||
'id',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
])->fill([
|
|
||||||
'application_id' => $newApplication->id,
|
|
||||||
'status' => 'exited',
|
|
||||||
]);
|
|
||||||
$newPreview->save();
|
|
||||||
}
|
|
||||||
|
|
||||||
$persistentVolumes = $application->persistentStorages()->get();
|
|
||||||
foreach ($persistentVolumes as $volume) {
|
|
||||||
$newName = '';
|
|
||||||
if (str_starts_with($volume->name, $application->uuid)) {
|
|
||||||
$newName = str($volume->name)->replace($application->uuid, $newApplication->uuid);
|
|
||||||
} else {
|
|
||||||
$newName = $newApplication->uuid.'-'.$volume->name;
|
|
||||||
}
|
|
||||||
|
|
||||||
$newPersistentVolume = $volume->replicate([
|
|
||||||
'id',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
])->fill([
|
|
||||||
'name' => $newName,
|
|
||||||
'resource_id' => $newApplication->id,
|
|
||||||
]);
|
|
||||||
$newPersistentVolume->save();
|
|
||||||
|
|
||||||
if ($this->cloneVolumeData) {
|
|
||||||
try {
|
|
||||||
StopApplication::dispatch($application, false, false);
|
|
||||||
$sourceVolume = $volume->name;
|
|
||||||
$targetVolume = $newPersistentVolume->name;
|
|
||||||
$sourceServer = $application->destination->server;
|
|
||||||
$targetServer = $newApplication->destination->server;
|
|
||||||
|
|
||||||
VolumeCloneJob::dispatch($sourceVolume, $targetVolume, $sourceServer, $targetServer, $newPersistentVolume);
|
|
||||||
|
|
||||||
queue_application_deployment(
|
|
||||||
deployment_uuid: (string) new Cuid2,
|
|
||||||
application: $application,
|
|
||||||
server: $sourceServer,
|
|
||||||
destination: $application->destination,
|
|
||||||
no_questions_asked: true
|
|
||||||
);
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
\Log::error('Failed to copy volume data for '.$volume->name.': '.$e->getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$fileStorages = $application->fileStorages()->get();
|
|
||||||
foreach ($fileStorages as $storage) {
|
|
||||||
$newStorage = $storage->replicate([
|
|
||||||
'id',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
])->fill([
|
|
||||||
'resource_id' => $newApplication->id,
|
|
||||||
]);
|
|
||||||
$newStorage->save();
|
|
||||||
}
|
|
||||||
|
|
||||||
$environmentVaribles = $application->environment_variables()->get();
|
|
||||||
foreach ($environmentVaribles as $environmentVarible) {
|
|
||||||
$newEnvironmentVariable = $environmentVarible->replicate([
|
|
||||||
'id',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
])->fill([
|
|
||||||
'resourceable_id' => $newApplication->id,
|
|
||||||
]);
|
|
||||||
$newEnvironmentVariable->save();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($databases as $database) {
|
foreach ($databases as $database) {
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ class DockerCompose extends Component
|
|||||||
EnvironmentVariable::create([
|
EnvironmentVariable::create([
|
||||||
'key' => $key,
|
'key' => $key,
|
||||||
'value' => $variable,
|
'value' => $variable,
|
||||||
'is_build_time' => false,
|
|
||||||
'is_preview' => false,
|
'is_preview' => false,
|
||||||
'resourceable_id' => $service->id,
|
'resourceable_id' => $service->id,
|
||||||
'resourceable_type' => $service->getMorphClass(),
|
'resourceable_type' => $service->getMorphClass(),
|
||||||
|
|||||||
@@ -97,7 +97,6 @@ class Create extends Component
|
|||||||
'value' => $value,
|
'value' => $value,
|
||||||
'resourceable_id' => $service->id,
|
'resourceable_id' => $service->id,
|
||||||
'resourceable_type' => $service->getMorphClass(),
|
'resourceable_type' => $service->getMorphClass(),
|
||||||
'is_build_time' => false,
|
|
||||||
'is_preview' => false,
|
'is_preview' => false,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,15 @@ class ConfigurationChecker extends Component
|
|||||||
|
|
||||||
public Application|Service|StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse $resource;
|
public Application|Service|StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse $resource;
|
||||||
|
|
||||||
protected $listeners = ['configurationChanged'];
|
public function getListeners()
|
||||||
|
{
|
||||||
|
$teamId = auth()->user()->currentTeam()->id;
|
||||||
|
|
||||||
|
return [
|
||||||
|
"echo-private:team.{$teamId},ApplicationConfigurationChanged" => 'configurationChanged',
|
||||||
|
'configurationChanged' => 'configurationChanged',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
public function mount()
|
public function mount()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -19,28 +19,32 @@ class Add extends Component
|
|||||||
|
|
||||||
public ?string $value = null;
|
public ?string $value = null;
|
||||||
|
|
||||||
public bool $is_build_time = false;
|
|
||||||
|
|
||||||
public bool $is_multiline = false;
|
public bool $is_multiline = false;
|
||||||
|
|
||||||
public bool $is_literal = false;
|
public bool $is_literal = false;
|
||||||
|
|
||||||
|
public bool $is_runtime = true;
|
||||||
|
|
||||||
|
public bool $is_buildtime = true;
|
||||||
|
|
||||||
protected $listeners = ['clearAddEnv' => 'clear'];
|
protected $listeners = ['clearAddEnv' => 'clear'];
|
||||||
|
|
||||||
protected $rules = [
|
protected $rules = [
|
||||||
'key' => 'required|string',
|
'key' => 'required|string',
|
||||||
'value' => 'nullable',
|
'value' => 'nullable',
|
||||||
'is_build_time' => 'required|boolean',
|
|
||||||
'is_multiline' => 'required|boolean',
|
'is_multiline' => 'required|boolean',
|
||||||
'is_literal' => 'required|boolean',
|
'is_literal' => 'required|boolean',
|
||||||
|
'is_runtime' => 'required|boolean',
|
||||||
|
'is_buildtime' => 'required|boolean',
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $validationAttributes = [
|
protected $validationAttributes = [
|
||||||
'key' => 'key',
|
'key' => 'key',
|
||||||
'value' => 'value',
|
'value' => 'value',
|
||||||
'is_build_time' => 'build',
|
|
||||||
'is_multiline' => 'multiline',
|
'is_multiline' => 'multiline',
|
||||||
'is_literal' => 'literal',
|
'is_literal' => 'literal',
|
||||||
|
'is_runtime' => 'runtime',
|
||||||
|
'is_buildtime' => 'buildtime',
|
||||||
];
|
];
|
||||||
|
|
||||||
public function mount()
|
public function mount()
|
||||||
@@ -54,9 +58,10 @@ class Add extends Component
|
|||||||
$this->dispatch('saveKey', [
|
$this->dispatch('saveKey', [
|
||||||
'key' => $this->key,
|
'key' => $this->key,
|
||||||
'value' => $this->value,
|
'value' => $this->value,
|
||||||
'is_build_time' => $this->is_build_time,
|
|
||||||
'is_multiline' => $this->is_multiline,
|
'is_multiline' => $this->is_multiline,
|
||||||
'is_literal' => $this->is_literal,
|
'is_literal' => $this->is_literal,
|
||||||
|
'is_runtime' => $this->is_runtime,
|
||||||
|
'is_buildtime' => $this->is_buildtime,
|
||||||
'is_preview' => $this->is_preview,
|
'is_preview' => $this->is_preview,
|
||||||
]);
|
]);
|
||||||
$this->clear();
|
$this->clear();
|
||||||
@@ -66,8 +71,9 @@ class Add extends Component
|
|||||||
{
|
{
|
||||||
$this->key = '';
|
$this->key = '';
|
||||||
$this->value = '';
|
$this->value = '';
|
||||||
$this->is_build_time = false;
|
|
||||||
$this->is_multiline = false;
|
$this->is_multiline = false;
|
||||||
$this->is_literal = false;
|
$this->is_literal = false;
|
||||||
|
$this->is_runtime = true;
|
||||||
|
$this->is_buildtime = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ class All extends Component
|
|||||||
|
|
||||||
public bool $is_env_sorting_enabled = false;
|
public bool $is_env_sorting_enabled = false;
|
||||||
|
|
||||||
|
public bool $use_build_secrets = false;
|
||||||
|
|
||||||
protected $listeners = [
|
protected $listeners = [
|
||||||
'saveKey' => 'submit',
|
'saveKey' => 'submit',
|
||||||
'refreshEnvs',
|
'refreshEnvs',
|
||||||
@@ -34,13 +36,14 @@ class All extends Component
|
|||||||
public function mount()
|
public function mount()
|
||||||
{
|
{
|
||||||
$this->is_env_sorting_enabled = data_get($this->resource, 'settings.is_env_sorting_enabled', false);
|
$this->is_env_sorting_enabled = data_get($this->resource, 'settings.is_env_sorting_enabled', false);
|
||||||
|
$this->use_build_secrets = data_get($this->resource, 'settings.use_build_secrets', false);
|
||||||
$this->resourceClass = get_class($this->resource);
|
$this->resourceClass = get_class($this->resource);
|
||||||
$resourceWithPreviews = [\App\Models\Application::class];
|
$resourceWithPreviews = [\App\Models\Application::class];
|
||||||
$simpleDockerfile = filled(data_get($this->resource, 'dockerfile'));
|
$simpleDockerfile = filled(data_get($this->resource, 'dockerfile'));
|
||||||
if (str($this->resourceClass)->contains($resourceWithPreviews) && ! $simpleDockerfile) {
|
if (str($this->resourceClass)->contains($resourceWithPreviews) && ! $simpleDockerfile) {
|
||||||
$this->showPreview = true;
|
$this->showPreview = true;
|
||||||
}
|
}
|
||||||
$this->sortEnvironmentVariables();
|
$this->getDevView();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function instantSave()
|
public function instantSave()
|
||||||
@@ -49,34 +52,38 @@ class All extends Component
|
|||||||
$this->authorize('manageEnvironment', $this->resource);
|
$this->authorize('manageEnvironment', $this->resource);
|
||||||
|
|
||||||
$this->resource->settings->is_env_sorting_enabled = $this->is_env_sorting_enabled;
|
$this->resource->settings->is_env_sorting_enabled = $this->is_env_sorting_enabled;
|
||||||
|
$this->resource->settings->use_build_secrets = $this->use_build_secrets;
|
||||||
$this->resource->settings->save();
|
$this->resource->settings->save();
|
||||||
$this->sortEnvironmentVariables();
|
$this->getDevView();
|
||||||
$this->dispatch('success', 'Environment variable settings updated.');
|
$this->dispatch('success', 'Environment variable settings updated.');
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
return handleError($e, $this);
|
return handleError($e, $this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function sortEnvironmentVariables()
|
public function getEnvironmentVariablesProperty()
|
||||||
{
|
{
|
||||||
if ($this->is_env_sorting_enabled === false) {
|
if ($this->is_env_sorting_enabled === false) {
|
||||||
if ($this->resource->environment_variables) {
|
return $this->resource->environment_variables()->orderBy('order')->get();
|
||||||
$this->resource->environment_variables = $this->resource->environment_variables->sortBy('order')->values();
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->resource->environment_variables_preview) {
|
|
||||||
$this->resource->environment_variables_preview = $this->resource->environment_variables_preview->sortBy('order')->values();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->getDevView();
|
return $this->resource->environment_variables;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getEnvironmentVariablesPreviewProperty()
|
||||||
|
{
|
||||||
|
if ($this->is_env_sorting_enabled === false) {
|
||||||
|
return $this->resource->environment_variables_preview()->orderBy('order')->get();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->resource->environment_variables_preview;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDevView()
|
public function getDevView()
|
||||||
{
|
{
|
||||||
$this->variables = $this->formatEnvironmentVariables($this->resource->environment_variables);
|
$this->variables = $this->formatEnvironmentVariables($this->environmentVariables);
|
||||||
if ($this->showPreview) {
|
if ($this->showPreview) {
|
||||||
$this->variablesPreview = $this->formatEnvironmentVariables($this->resource->environment_variables_preview);
|
$this->variablesPreview = $this->formatEnvironmentVariables($this->environmentVariablesPreview);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -97,7 +104,7 @@ class All extends Component
|
|||||||
public function switch()
|
public function switch()
|
||||||
{
|
{
|
||||||
$this->view = $this->view === 'normal' ? 'dev' : 'normal';
|
$this->view = $this->view === 'normal' ? 'dev' : 'normal';
|
||||||
$this->sortEnvironmentVariables();
|
$this->getDevView();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function submit($data = null)
|
public function submit($data = null)
|
||||||
@@ -111,7 +118,7 @@ class All extends Component
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->updateOrder();
|
$this->updateOrder();
|
||||||
$this->sortEnvironmentVariables();
|
$this->getDevView();
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
return handleError($e, $this);
|
return handleError($e, $this);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -212,9 +219,10 @@ class All extends Component
|
|||||||
$environment = new EnvironmentVariable;
|
$environment = new EnvironmentVariable;
|
||||||
$environment->key = $data['key'];
|
$environment->key = $data['key'];
|
||||||
$environment->value = $data['value'];
|
$environment->value = $data['value'];
|
||||||
$environment->is_build_time = $data['is_build_time'] ?? false;
|
|
||||||
$environment->is_multiline = $data['is_multiline'] ?? false;
|
$environment->is_multiline = $data['is_multiline'] ?? false;
|
||||||
$environment->is_literal = $data['is_literal'] ?? false;
|
$environment->is_literal = $data['is_literal'] ?? false;
|
||||||
|
$environment->is_runtime = $data['is_runtime'] ?? true;
|
||||||
|
$environment->is_buildtime = $data['is_buildtime'] ?? true;
|
||||||
$environment->is_preview = $data['is_preview'] ?? false;
|
$environment->is_preview = $data['is_preview'] ?? false;
|
||||||
$environment->resourceable_id = $this->resource->id;
|
$environment->resourceable_id = $this->resource->id;
|
||||||
$environment->resourceable_type = $this->resource->getMorphClass();
|
$environment->resourceable_type = $this->resource->getMorphClass();
|
||||||
@@ -257,7 +265,7 @@ class All extends Component
|
|||||||
{
|
{
|
||||||
$count = 0;
|
$count = 0;
|
||||||
foreach ($variables as $key => $value) {
|
foreach ($variables as $key => $value) {
|
||||||
if (str($key)->startsWith('SERVICE_FQDN') || str($key)->startsWith('SERVICE_URL')) {
|
if (str($key)->startsWith('SERVICE_FQDN') || str($key)->startsWith('SERVICE_URL') || str($key)->startsWith('SERVICE_NAME')) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$method = $isPreview ? 'environment_variables_preview' : 'environment_variables';
|
$method = $isPreview ? 'environment_variables_preview' : 'environment_variables';
|
||||||
@@ -276,7 +284,6 @@ class All extends Component
|
|||||||
$environment = new EnvironmentVariable;
|
$environment = new EnvironmentVariable;
|
||||||
$environment->key = $key;
|
$environment->key = $key;
|
||||||
$environment->value = $value;
|
$environment->value = $value;
|
||||||
$environment->is_build_time = false;
|
|
||||||
$environment->is_multiline = false;
|
$environment->is_multiline = false;
|
||||||
$environment->is_preview = $isPreview;
|
$environment->is_preview = $isPreview;
|
||||||
$environment->resourceable_id = $this->resource->id;
|
$environment->resourceable_id = $this->resource->id;
|
||||||
@@ -293,7 +300,6 @@ class All extends Component
|
|||||||
public function refreshEnvs()
|
public function refreshEnvs()
|
||||||
{
|
{
|
||||||
$this->resource->refresh();
|
$this->resource->refresh();
|
||||||
$this->sortEnvironmentVariables();
|
|
||||||
$this->getDevView();
|
$this->getDevView();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,14 +32,16 @@ class Show extends Component
|
|||||||
|
|
||||||
public bool $is_shared = false;
|
public bool $is_shared = false;
|
||||||
|
|
||||||
public bool $is_build_time = false;
|
|
||||||
|
|
||||||
public bool $is_multiline = false;
|
public bool $is_multiline = false;
|
||||||
|
|
||||||
public bool $is_literal = false;
|
public bool $is_literal = false;
|
||||||
|
|
||||||
public bool $is_shown_once = false;
|
public bool $is_shown_once = false;
|
||||||
|
|
||||||
|
public bool $is_runtime = true;
|
||||||
|
|
||||||
|
public bool $is_buildtime = true;
|
||||||
|
|
||||||
public bool $is_required = false;
|
public bool $is_required = false;
|
||||||
|
|
||||||
public bool $is_really_required = false;
|
public bool $is_really_required = false;
|
||||||
@@ -55,10 +57,11 @@ class Show extends Component
|
|||||||
protected $rules = [
|
protected $rules = [
|
||||||
'key' => 'required|string',
|
'key' => 'required|string',
|
||||||
'value' => 'nullable',
|
'value' => 'nullable',
|
||||||
'is_build_time' => 'required|boolean',
|
|
||||||
'is_multiline' => 'required|boolean',
|
'is_multiline' => 'required|boolean',
|
||||||
'is_literal' => 'required|boolean',
|
'is_literal' => 'required|boolean',
|
||||||
'is_shown_once' => 'required|boolean',
|
'is_shown_once' => 'required|boolean',
|
||||||
|
'is_runtime' => 'required|boolean',
|
||||||
|
'is_buildtime' => 'required|boolean',
|
||||||
'real_value' => 'nullable',
|
'real_value' => 'nullable',
|
||||||
'is_required' => 'required|boolean',
|
'is_required' => 'required|boolean',
|
||||||
];
|
];
|
||||||
@@ -101,8 +104,9 @@ class Show extends Component
|
|||||||
]);
|
]);
|
||||||
} else {
|
} else {
|
||||||
$this->validate();
|
$this->validate();
|
||||||
$this->env->is_build_time = $this->is_build_time;
|
|
||||||
$this->env->is_required = $this->is_required;
|
$this->env->is_required = $this->is_required;
|
||||||
|
$this->env->is_runtime = $this->is_runtime;
|
||||||
|
$this->env->is_buildtime = $this->is_buildtime;
|
||||||
$this->env->is_shared = $this->is_shared;
|
$this->env->is_shared = $this->is_shared;
|
||||||
}
|
}
|
||||||
$this->env->key = $this->key;
|
$this->env->key = $this->key;
|
||||||
@@ -114,10 +118,11 @@ class Show extends Component
|
|||||||
} else {
|
} else {
|
||||||
$this->key = $this->env->key;
|
$this->key = $this->env->key;
|
||||||
$this->value = $this->env->value;
|
$this->value = $this->env->value;
|
||||||
$this->is_build_time = $this->env->is_build_time ?? false;
|
|
||||||
$this->is_multiline = $this->env->is_multiline;
|
$this->is_multiline = $this->env->is_multiline;
|
||||||
$this->is_literal = $this->env->is_literal;
|
$this->is_literal = $this->env->is_literal;
|
||||||
$this->is_shown_once = $this->env->is_shown_once;
|
$this->is_shown_once = $this->env->is_shown_once;
|
||||||
|
$this->is_runtime = $this->env->is_runtime ?? true;
|
||||||
|
$this->is_buildtime = $this->env->is_buildtime ?? true;
|
||||||
$this->is_required = $this->env->is_required ?? false;
|
$this->is_required = $this->env->is_required ?? false;
|
||||||
$this->is_really_required = $this->env->is_really_required ?? false;
|
$this->is_really_required = $this->env->is_really_required ?? false;
|
||||||
$this->is_shared = $this->env->is_shared ?? false;
|
$this->is_shared = $this->env->is_shared ?? false;
|
||||||
@@ -128,7 +133,7 @@ class Show extends Component
|
|||||||
public function checkEnvs()
|
public function checkEnvs()
|
||||||
{
|
{
|
||||||
$this->isDisabled = false;
|
$this->isDisabled = false;
|
||||||
if (str($this->env->key)->startsWith('SERVICE_FQDN') || str($this->env->key)->startsWith('SERVICE_URL')) {
|
if (str($this->env->key)->startsWith('SERVICE_FQDN') || str($this->env->key)->startsWith('SERVICE_URL') || str($this->env->key)->startsWith('SERVICE_NAME')) {
|
||||||
$this->isDisabled = true;
|
$this->isDisabled = true;
|
||||||
}
|
}
|
||||||
if ($this->env->is_shown_once) {
|
if ($this->env->is_shown_once) {
|
||||||
@@ -139,9 +144,6 @@ class Show extends Component
|
|||||||
public function serialize()
|
public function serialize()
|
||||||
{
|
{
|
||||||
data_forget($this->env, 'real_value');
|
data_forget($this->env, 'real_value');
|
||||||
if ($this->env->getMorphClass() === \App\Models\SharedEnvironmentVariable::class) {
|
|
||||||
data_forget($this->env, 'is_build_time');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function lock()
|
public function lock()
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ class Metrics extends Component
|
|||||||
{
|
{
|
||||||
public $resource;
|
public $resource;
|
||||||
|
|
||||||
public $chartId = 'container-cpu';
|
public $chartId = 'metrics';
|
||||||
|
|
||||||
public $data;
|
public $data;
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Livewire\Project\Shared;
|
namespace App\Livewire\Project\Shared;
|
||||||
|
|
||||||
use App\Actions\Application\StopApplication;
|
|
||||||
use App\Actions\Database\StartDatabase;
|
use App\Actions\Database\StartDatabase;
|
||||||
use App\Actions\Database\StopDatabase;
|
use App\Actions\Database\StopDatabase;
|
||||||
use App\Actions\Service\StartService;
|
use App\Actions\Service\StartService;
|
||||||
@@ -61,145 +60,7 @@ class ResourceOperations extends Component
|
|||||||
$server = $new_destination->server;
|
$server = $new_destination->server;
|
||||||
|
|
||||||
if ($this->resource->getMorphClass() === \App\Models\Application::class) {
|
if ($this->resource->getMorphClass() === \App\Models\Application::class) {
|
||||||
$name = 'clone-of-'.str($this->resource->name)->limit(20).'-'.$uuid;
|
$new_resource = clone_application($this->resource, $new_destination, ['uuid' => $uuid], $this->cloneVolumeData);
|
||||||
$applicationSettings = $this->resource->settings;
|
|
||||||
$url = $this->resource->fqdn;
|
|
||||||
|
|
||||||
if ($server->proxyType() !== 'NONE' && $applicationSettings->is_container_label_readonly_enabled === true) {
|
|
||||||
$url = generateUrl(server: $server, random: $uuid);
|
|
||||||
}
|
|
||||||
|
|
||||||
$new_resource = $this->resource->replicate([
|
|
||||||
'id',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
'additional_servers_count',
|
|
||||||
'additional_networks_count',
|
|
||||||
])->fill([
|
|
||||||
'uuid' => $uuid,
|
|
||||||
'name' => $name,
|
|
||||||
'fqdn' => $url,
|
|
||||||
'status' => 'exited',
|
|
||||||
'destination_id' => $new_destination->id,
|
|
||||||
]);
|
|
||||||
$new_resource->save();
|
|
||||||
|
|
||||||
if ($new_resource->destination->server->proxyType() !== 'NONE' && $applicationSettings->is_container_label_readonly_enabled === true) {
|
|
||||||
$customLabels = str(implode('|coolify|', generateLabelsApplication($new_resource)))->replace('|coolify|', "\n");
|
|
||||||
$new_resource->custom_labels = base64_encode($customLabels);
|
|
||||||
$new_resource->save();
|
|
||||||
}
|
|
||||||
|
|
||||||
$new_resource->settings()->delete();
|
|
||||||
if ($applicationSettings) {
|
|
||||||
$newApplicationSettings = $applicationSettings->replicate([
|
|
||||||
'id',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
])->fill([
|
|
||||||
'application_id' => $new_resource->id,
|
|
||||||
]);
|
|
||||||
$newApplicationSettings->save();
|
|
||||||
}
|
|
||||||
|
|
||||||
$tags = $this->resource->tags;
|
|
||||||
foreach ($tags as $tag) {
|
|
||||||
$new_resource->tags()->attach($tag->id);
|
|
||||||
}
|
|
||||||
|
|
||||||
$scheduledTasks = $this->resource->scheduled_tasks()->get();
|
|
||||||
foreach ($scheduledTasks as $task) {
|
|
||||||
$newTask = $task->replicate([
|
|
||||||
'id',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
])->fill([
|
|
||||||
'uuid' => (string) new Cuid2,
|
|
||||||
'application_id' => $new_resource->id,
|
|
||||||
'team_id' => currentTeam()->id,
|
|
||||||
]);
|
|
||||||
$newTask->save();
|
|
||||||
}
|
|
||||||
|
|
||||||
$applicationPreviews = $this->resource->previews()->get();
|
|
||||||
foreach ($applicationPreviews as $preview) {
|
|
||||||
$newPreview = $preview->replicate([
|
|
||||||
'id',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
])->fill([
|
|
||||||
'application_id' => $new_resource->id,
|
|
||||||
'status' => 'exited',
|
|
||||||
]);
|
|
||||||
$newPreview->save();
|
|
||||||
}
|
|
||||||
|
|
||||||
$persistentVolumes = $this->resource->persistentStorages()->get();
|
|
||||||
foreach ($persistentVolumes as $volume) {
|
|
||||||
$newName = '';
|
|
||||||
if (str_starts_with($volume->name, $this->resource->uuid)) {
|
|
||||||
$newName = str($volume->name)->replace($this->resource->uuid, $new_resource->uuid);
|
|
||||||
} else {
|
|
||||||
$newName = $new_resource->uuid.'-'.str($volume->name)->afterLast('-');
|
|
||||||
}
|
|
||||||
|
|
||||||
$newPersistentVolume = $volume->replicate([
|
|
||||||
'id',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
])->fill([
|
|
||||||
'name' => $newName,
|
|
||||||
'resource_id' => $new_resource->id,
|
|
||||||
]);
|
|
||||||
$newPersistentVolume->save();
|
|
||||||
|
|
||||||
if ($this->cloneVolumeData) {
|
|
||||||
try {
|
|
||||||
StopApplication::dispatch($this->resource, false, false);
|
|
||||||
$sourceVolume = $volume->name;
|
|
||||||
$targetVolume = $newPersistentVolume->name;
|
|
||||||
$sourceServer = $this->resource->destination->server;
|
|
||||||
$targetServer = $new_resource->destination->server;
|
|
||||||
|
|
||||||
VolumeCloneJob::dispatch($sourceVolume, $targetVolume, $sourceServer, $targetServer, $newPersistentVolume);
|
|
||||||
|
|
||||||
queue_application_deployment(
|
|
||||||
deployment_uuid: (string) new Cuid2,
|
|
||||||
application: $this->resource,
|
|
||||||
server: $sourceServer,
|
|
||||||
destination: $this->resource->destination,
|
|
||||||
no_questions_asked: true
|
|
||||||
);
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
\Log::error('Failed to copy volume data for '.$volume->name.': '.$e->getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$fileStorages = $this->resource->fileStorages()->get();
|
|
||||||
foreach ($fileStorages as $storage) {
|
|
||||||
$newStorage = $storage->replicate([
|
|
||||||
'id',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
])->fill([
|
|
||||||
'resource_id' => $new_resource->id,
|
|
||||||
]);
|
|
||||||
$newStorage->save();
|
|
||||||
}
|
|
||||||
|
|
||||||
$environmentVaribles = $this->resource->environment_variables()->get();
|
|
||||||
foreach ($environmentVaribles as $environmentVarible) {
|
|
||||||
$newEnvironmentVariable = $environmentVarible->replicate([
|
|
||||||
'id',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
])->fill([
|
|
||||||
'resourceable_id' => $new_resource->id,
|
|
||||||
'resourceable_type' => $new_resource->getMorphClass(),
|
|
||||||
]);
|
|
||||||
$newEnvironmentVariable->save();
|
|
||||||
}
|
|
||||||
|
|
||||||
$route = route('project.application.configuration', [
|
$route = route('project.application.configuration', [
|
||||||
'project_uuid' => $this->projectUuid,
|
'project_uuid' => $this->projectUuid,
|
||||||
|
|||||||
@@ -105,6 +105,19 @@ class Executions extends Component
|
|||||||
$this->currentPage++;
|
$this->currentPage++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function loadAllLogs()
|
||||||
|
{
|
||||||
|
if (! $this->selectedExecution || ! $this->selectedExecution->message) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$lines = collect(explode("\n", $this->selectedExecution->message));
|
||||||
|
$totalLines = $lines->count();
|
||||||
|
$totalPages = ceil($totalLines / $this->logsPerPage);
|
||||||
|
|
||||||
|
$this->currentPage = $totalPages;
|
||||||
|
}
|
||||||
|
|
||||||
public function getLogLinesProperty()
|
public function getLogLinesProperty()
|
||||||
{
|
{
|
||||||
if (! $this->selectedExecution) {
|
if (! $this->selectedExecution) {
|
||||||
|
|||||||
@@ -9,4 +9,15 @@ class All extends Component
|
|||||||
public $resource;
|
public $resource;
|
||||||
|
|
||||||
protected $listeners = ['refreshStorages' => '$refresh'];
|
protected $listeners = ['refreshStorages' => '$refresh'];
|
||||||
|
|
||||||
|
public function getFirstStorageIdProperty()
|
||||||
|
{
|
||||||
|
if ($this->resource->persistentStorages->isEmpty()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use the storage with the smallest ID as the "first" one
|
||||||
|
// This ensures stability even when storages are deleted
|
||||||
|
return $this->resource->persistentStorages->sortBy('id')->first()->id;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ class Navbar extends Component
|
|||||||
$teamId = auth()->user()->currentTeam()->id;
|
$teamId = auth()->user()->currentTeam()->id;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'refreshServerShow' => '$refresh',
|
'refreshServerShow' => 'refreshServer',
|
||||||
"echo-private:team.{$teamId},ProxyStatusChangedUI" => 'showNotification',
|
"echo-private:team.{$teamId},ProxyStatusChangedUI" => 'showNotification',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -134,6 +134,12 @@ class Navbar extends Component
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function refreshServer()
|
||||||
|
{
|
||||||
|
$this->server->refresh();
|
||||||
|
$this->server->load('settings');
|
||||||
|
}
|
||||||
|
|
||||||
public function render()
|
public function render()
|
||||||
{
|
{
|
||||||
return view('livewire.server.navbar');
|
return view('livewire.server.navbar');
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
namespace App\Livewire\Server;
|
namespace App\Livewire\Server;
|
||||||
|
|
||||||
use App\Actions\Proxy\CheckConfiguration;
|
use App\Actions\Proxy\GetProxyConfiguration;
|
||||||
use App\Actions\Proxy\SaveConfiguration;
|
use App\Actions\Proxy\SaveProxyConfiguration;
|
||||||
use App\Models\Server;
|
use App\Models\Server;
|
||||||
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
|
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
|
||||||
use Livewire\Component;
|
use Livewire\Component;
|
||||||
@@ -16,11 +16,11 @@ class Proxy extends Component
|
|||||||
|
|
||||||
public ?string $selectedProxy = null;
|
public ?string $selectedProxy = null;
|
||||||
|
|
||||||
public $proxy_settings = null;
|
public $proxySettings = null;
|
||||||
|
|
||||||
public bool $redirect_enabled = true;
|
public bool $redirectEnabled = true;
|
||||||
|
|
||||||
public ?string $redirect_url = null;
|
public ?string $redirectUrl = null;
|
||||||
|
|
||||||
public function getListeners()
|
public function getListeners()
|
||||||
{
|
{
|
||||||
@@ -39,14 +39,14 @@ class Proxy extends Component
|
|||||||
public function mount()
|
public function mount()
|
||||||
{
|
{
|
||||||
$this->selectedProxy = $this->server->proxyType();
|
$this->selectedProxy = $this->server->proxyType();
|
||||||
$this->redirect_enabled = data_get($this->server, 'proxy.redirect_enabled', true);
|
$this->redirectEnabled = data_get($this->server, 'proxy.redirect_enabled', true);
|
||||||
$this->redirect_url = data_get($this->server, 'proxy.redirect_url');
|
$this->redirectUrl = data_get($this->server, 'proxy.redirect_url');
|
||||||
}
|
}
|
||||||
|
|
||||||
// public function proxyStatusUpdated()
|
public function getConfigurationFilePathProperty()
|
||||||
// {
|
{
|
||||||
// $this->dispatch('refresh')->self();
|
return $this->server->proxyPath().'docker-compose.yml';
|
||||||
// }
|
}
|
||||||
|
|
||||||
public function changeProxy()
|
public function changeProxy()
|
||||||
{
|
{
|
||||||
@@ -86,7 +86,7 @@ class Proxy extends Component
|
|||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$this->authorize('update', $this->server);
|
$this->authorize('update', $this->server);
|
||||||
$this->server->proxy->redirect_enabled = $this->redirect_enabled;
|
$this->server->proxy->redirect_enabled = $this->redirectEnabled;
|
||||||
$this->server->save();
|
$this->server->save();
|
||||||
$this->server->setupDefaultRedirect();
|
$this->server->setupDefaultRedirect();
|
||||||
$this->dispatch('success', 'Proxy configuration saved.');
|
$this->dispatch('success', 'Proxy configuration saved.');
|
||||||
@@ -99,8 +99,8 @@ class Proxy extends Component
|
|||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$this->authorize('update', $this->server);
|
$this->authorize('update', $this->server);
|
||||||
SaveConfiguration::run($this->server, $this->proxy_settings);
|
SaveProxyConfiguration::run($this->server, $this->proxySettings);
|
||||||
$this->server->proxy->redirect_url = $this->redirect_url;
|
$this->server->proxy->redirect_url = $this->redirectUrl;
|
||||||
$this->server->save();
|
$this->server->save();
|
||||||
$this->server->setupDefaultRedirect();
|
$this->server->setupDefaultRedirect();
|
||||||
$this->dispatch('success', 'Proxy configuration saved.');
|
$this->dispatch('success', 'Proxy configuration saved.');
|
||||||
@@ -109,14 +109,15 @@ class Proxy extends Component
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function reset_proxy_configuration()
|
public function resetProxyConfiguration()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$this->authorize('update', $this->server);
|
$this->authorize('update', $this->server);
|
||||||
$this->proxy_settings = CheckConfiguration::run($this->server, true);
|
// Explicitly regenerate default configuration
|
||||||
SaveConfiguration::run($this->server, $this->proxy_settings);
|
$this->proxySettings = GetProxyConfiguration::run($this->server, forceRegenerate: true);
|
||||||
|
SaveProxyConfiguration::run($this->server, $this->proxySettings);
|
||||||
$this->server->save();
|
$this->server->save();
|
||||||
$this->dispatch('success', 'Proxy configuration saved.');
|
$this->dispatch('success', 'Proxy configuration reset to default.');
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
return handleError($e, $this);
|
return handleError($e, $this);
|
||||||
}
|
}
|
||||||
@@ -125,7 +126,7 @@ class Proxy extends Component
|
|||||||
public function loadProxyConfiguration()
|
public function loadProxyConfiguration()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$this->proxy_settings = CheckConfiguration::run($this->server);
|
$this->proxySettings = GetProxyConfiguration::run($this->server);
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
return handleError($e, $this);
|
return handleError($e, $this);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,6 +63,8 @@ class Show extends Component
|
|||||||
|
|
||||||
public bool $isSentinelDebugEnabled;
|
public bool $isSentinelDebugEnabled;
|
||||||
|
|
||||||
|
public ?string $sentinelCustomDockerImage = null;
|
||||||
|
|
||||||
public string $serverTimezone;
|
public string $serverTimezone;
|
||||||
|
|
||||||
public function getListeners()
|
public function getListeners()
|
||||||
@@ -267,7 +269,8 @@ class Show extends Component
|
|||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$this->authorize('manageSentinel', $this->server);
|
$this->authorize('manageSentinel', $this->server);
|
||||||
$this->server->restartSentinel();
|
$customImage = isDev() ? $this->sentinelCustomDockerImage : null;
|
||||||
|
$this->server->restartSentinel($customImage);
|
||||||
$this->dispatch('success', 'Restarting Sentinel.');
|
$this->dispatch('success', 'Restarting Sentinel.');
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
return handleError($e, $this);
|
return handleError($e, $this);
|
||||||
@@ -295,12 +298,38 @@ class Show extends Component
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function updatedIsBuildServer($value)
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
$this->authorize('update', $this->server);
|
||||||
|
if ($value === true && $this->isSentinelEnabled) {
|
||||||
|
$this->isSentinelEnabled = false;
|
||||||
|
$this->isMetricsEnabled = false;
|
||||||
|
$this->isSentinelDebugEnabled = false;
|
||||||
|
StopSentinel::dispatch($this->server);
|
||||||
|
$this->dispatch('info', 'Sentinel has been disabled as build servers cannot run Sentinel.');
|
||||||
|
}
|
||||||
|
$this->submit();
|
||||||
|
// Dispatch event to refresh the navbar
|
||||||
|
$this->dispatch('refreshServerShow');
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
return handleError($e, $this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function updatedIsSentinelEnabled($value)
|
public function updatedIsSentinelEnabled($value)
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$this->authorize('manageSentinel', $this->server);
|
$this->authorize('manageSentinel', $this->server);
|
||||||
if ($value === true) {
|
if ($value === true) {
|
||||||
StartSentinel::run($this->server, true);
|
if ($this->isBuildServer) {
|
||||||
|
$this->isSentinelEnabled = false;
|
||||||
|
$this->dispatch('error', 'Sentinel cannot be enabled on build servers.');
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
$customImage = isDev() ? $this->sentinelCustomDockerImage : null;
|
||||||
|
StartSentinel::run($this->server, true, null, $customImage);
|
||||||
} else {
|
} else {
|
||||||
$this->isMetricsEnabled = false;
|
$this->isMetricsEnabled = false;
|
||||||
$this->isSentinelDebugEnabled = false;
|
$this->isSentinelDebugEnabled = false;
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ class Index extends Component
|
|||||||
$this->validate();
|
$this->validate();
|
||||||
|
|
||||||
if ($this->settings->is_dns_validation_enabled && $this->fqdn) {
|
if ($this->settings->is_dns_validation_enabled && $this->fqdn) {
|
||||||
if (! validate_dns_entry($this->fqdn, $this->server)) {
|
if (! validateDNSEntry($this->fqdn, $this->server)) {
|
||||||
$this->dispatch('error', "Validating DNS failed.<br><br>Make sure you have added the DNS records correctly.<br><br>{$this->fqdn}->{$this->server->ip}<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
|
$this->dispatch('error', "Validating DNS failed.<br><br>Make sure you have added the DNS records correctly.<br><br>{$this->fqdn}->{$this->server->ip}<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
|
||||||
$error_show = true;
|
$error_show = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Livewire;
|
namespace App\Livewire;
|
||||||
|
|
||||||
use App\Jobs\PullChangelogFromGitHub;
|
use App\Jobs\PullChangelog;
|
||||||
use App\Services\ChangelogService;
|
use App\Services\ChangelogService;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
use Livewire\Component;
|
use Livewire\Component;
|
||||||
@@ -23,6 +23,11 @@ class SettingsDropdown extends Component
|
|||||||
return app(ChangelogService::class)->getEntriesForUser($user);
|
return app(ChangelogService::class)->getEntriesForUser($user);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getCurrentVersionProperty()
|
||||||
|
{
|
||||||
|
return 'v'.config('constants.coolify.version');
|
||||||
|
}
|
||||||
|
|
||||||
public function openWhatsNewModal()
|
public function openWhatsNewModal()
|
||||||
{
|
{
|
||||||
$this->showWhatsNewModal = true;
|
$this->showWhatsNewModal = true;
|
||||||
@@ -50,7 +55,7 @@ class SettingsDropdown extends Component
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
PullChangelogFromGitHub::dispatch();
|
PullChangelog::dispatch();
|
||||||
$this->dispatch('success', 'Changelog fetch initiated! Check back in a few moments.');
|
$this->dispatch('success', 'Changelog fetch initiated! Check back in a few moments.');
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
$this->dispatch('error', 'Failed to fetch changelog: '.$e->getMessage());
|
$this->dispatch('error', 'Failed to fetch changelog: '.$e->getMessage());
|
||||||
@@ -62,6 +67,7 @@ class SettingsDropdown extends Component
|
|||||||
return view('livewire.settings-dropdown', [
|
return view('livewire.settings-dropdown', [
|
||||||
'entries' => $this->entries,
|
'entries' => $this->entries,
|
||||||
'unreadCount' => $this->unreadCount,
|
'unreadCount' => $this->unreadCount,
|
||||||
|
'currentVersion' => $this->currentVersion,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ namespace App\Models;
|
|||||||
|
|
||||||
use App\Enums\ApplicationDeploymentStatus;
|
use App\Enums\ApplicationDeploymentStatus;
|
||||||
use App\Services\ConfigurationGenerator;
|
use App\Services\ConfigurationGenerator;
|
||||||
|
use App\Traits\ClearsGlobalSearchCache;
|
||||||
use App\Traits\HasConfiguration;
|
use App\Traits\HasConfiguration;
|
||||||
use App\Traits\HasSafeStringAttribute;
|
use App\Traits\HasSafeStringAttribute;
|
||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
@@ -110,7 +111,7 @@ use Visus\Cuid2\Cuid2;
|
|||||||
|
|
||||||
class Application extends BaseModel
|
class Application extends BaseModel
|
||||||
{
|
{
|
||||||
use HasConfiguration, HasFactory, HasSafeStringAttribute, SoftDeletes;
|
use ClearsGlobalSearchCache, HasConfiguration, HasFactory, HasSafeStringAttribute, SoftDeletes;
|
||||||
|
|
||||||
private static $parserVersion = '5';
|
private static $parserVersion = '5';
|
||||||
|
|
||||||
@@ -123,66 +124,6 @@ class Application extends BaseModel
|
|||||||
'http_basic_auth_password' => 'encrypted',
|
'http_basic_auth_password' => 'encrypted',
|
||||||
];
|
];
|
||||||
|
|
||||||
public function customNetworkAliases(): Attribute
|
|
||||||
{
|
|
||||||
return Attribute::make(
|
|
||||||
set: function ($value) {
|
|
||||||
if (is_null($value) || $value === '') {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If it's already a JSON string, decode it
|
|
||||||
if (is_string($value) && $this->isJson($value)) {
|
|
||||||
$value = json_decode($value, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
// If it's a string but not JSON, treat it as a comma-separated list
|
|
||||||
if (is_string($value) && ! is_array($value)) {
|
|
||||||
$value = explode(',', $value);
|
|
||||||
}
|
|
||||||
|
|
||||||
$value = collect($value)
|
|
||||||
->map(function ($alias) {
|
|
||||||
if (is_string($alias)) {
|
|
||||||
return str_replace(' ', '-', trim($alias));
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
})
|
|
||||||
->filter()
|
|
||||||
->unique() // Remove duplicate values
|
|
||||||
->values()
|
|
||||||
->toArray();
|
|
||||||
|
|
||||||
return empty($value) ? null : json_encode($value);
|
|
||||||
},
|
|
||||||
get: function ($value) {
|
|
||||||
if (is_null($value)) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_string($value) && $this->isJson($value)) {
|
|
||||||
return json_decode($value, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
return is_array($value) ? $value : [];
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if a string is a valid JSON
|
|
||||||
*/
|
|
||||||
private function isJson($string)
|
|
||||||
{
|
|
||||||
if (! is_string($string)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
json_decode($string);
|
|
||||||
|
|
||||||
return json_last_error() === JSON_ERROR_NONE;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static function booted()
|
protected static function booted()
|
||||||
{
|
{
|
||||||
static::addGlobalScope('withRelations', function ($builder) {
|
static::addGlobalScope('withRelations', function ($builder) {
|
||||||
@@ -250,6 +191,66 @@ class Application extends BaseModel
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function customNetworkAliases(): Attribute
|
||||||
|
{
|
||||||
|
return Attribute::make(
|
||||||
|
set: function ($value) {
|
||||||
|
if (is_null($value) || $value === '') {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If it's already a JSON string, decode it
|
||||||
|
if (is_string($value) && $this->isJson($value)) {
|
||||||
|
$value = json_decode($value, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
// If it's a string but not JSON, treat it as a comma-separated list
|
||||||
|
if (is_string($value) && ! is_array($value)) {
|
||||||
|
$value = explode(',', $value);
|
||||||
|
}
|
||||||
|
|
||||||
|
$value = collect($value)
|
||||||
|
->map(function ($alias) {
|
||||||
|
if (is_string($alias)) {
|
||||||
|
return str_replace(' ', '-', trim($alias));
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
})
|
||||||
|
->filter()
|
||||||
|
->unique() // Remove duplicate values
|
||||||
|
->values()
|
||||||
|
->toArray();
|
||||||
|
|
||||||
|
return empty($value) ? null : json_encode($value);
|
||||||
|
},
|
||||||
|
get: function ($value) {
|
||||||
|
if (is_null($value)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is_string($value) && $this->isJson($value)) {
|
||||||
|
return json_decode($value, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
return is_array($value) ? $value : [];
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if a string is a valid JSON
|
||||||
|
*/
|
||||||
|
private function isJson($string)
|
||||||
|
{
|
||||||
|
if (! is_string($string)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
json_decode($string);
|
||||||
|
|
||||||
|
return json_last_error() === JSON_ERROR_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
public static function ownedByCurrentTeamAPI(int $teamId)
|
public static function ownedByCurrentTeamAPI(int $teamId)
|
||||||
{
|
{
|
||||||
return Application::whereRelation('environment.project.team', 'id', $teamId)->orderBy('name');
|
return Application::whereRelation('environment.project.team', 'id', $teamId)->orderBy('name');
|
||||||
@@ -728,7 +729,14 @@ class Application extends BaseModel
|
|||||||
{
|
{
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
||||||
->where('is_preview', false)
|
->where('is_preview', false)
|
||||||
->orderBy('key', 'asc');
|
->orderByRaw("
|
||||||
|
CASE
|
||||||
|
WHEN LOWER(key) LIKE 'service_%' THEN 1
|
||||||
|
WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
|
||||||
|
ELSE 3
|
||||||
|
END,
|
||||||
|
LOWER(key) ASC
|
||||||
|
");
|
||||||
}
|
}
|
||||||
|
|
||||||
public function runtime_environment_variables()
|
public function runtime_environment_variables()
|
||||||
@@ -738,14 +746,6 @@ class Application extends BaseModel
|
|||||||
->where('key', 'not like', 'NIXPACKS_%');
|
->where('key', 'not like', 'NIXPACKS_%');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function build_environment_variables()
|
|
||||||
{
|
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
|
||||||
->where('is_preview', false)
|
|
||||||
->where('is_build_time', true)
|
|
||||||
->where('key', 'not like', 'NIXPACKS_%');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function nixpacks_environment_variables()
|
public function nixpacks_environment_variables()
|
||||||
{
|
{
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
||||||
@@ -757,7 +757,14 @@ class Application extends BaseModel
|
|||||||
{
|
{
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
||||||
->where('is_preview', true)
|
->where('is_preview', true)
|
||||||
->orderByRaw("LOWER(key) LIKE LOWER('SERVICE%') DESC, LOWER(key) ASC");
|
->orderByRaw("
|
||||||
|
CASE
|
||||||
|
WHEN LOWER(key) LIKE 'service_%' THEN 1
|
||||||
|
WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
|
||||||
|
ELSE 3
|
||||||
|
END,
|
||||||
|
LOWER(key) ASC
|
||||||
|
");
|
||||||
}
|
}
|
||||||
|
|
||||||
public function runtime_environment_variables_preview()
|
public function runtime_environment_variables_preview()
|
||||||
@@ -767,14 +774,6 @@ class Application extends BaseModel
|
|||||||
->where('key', 'not like', 'NIXPACKS_%');
|
->where('key', 'not like', 'NIXPACKS_%');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function build_environment_variables_preview()
|
|
||||||
{
|
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
|
||||||
->where('is_preview', true)
|
|
||||||
->where('is_build_time', true)
|
|
||||||
->where('key', 'not like', 'NIXPACKS_%');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function nixpacks_environment_variables_preview()
|
public function nixpacks_environment_variables_preview()
|
||||||
{
|
{
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
||||||
@@ -934,11 +933,11 @@ class Application extends BaseModel
|
|||||||
|
|
||||||
public function isConfigurationChanged(bool $save = false)
|
public function isConfigurationChanged(bool $save = false)
|
||||||
{
|
{
|
||||||
$newConfigHash = base64_encode($this->fqdn.$this->git_repository.$this->git_branch.$this->git_commit_sha.$this->build_pack.$this->static_image.$this->install_command.$this->build_command.$this->start_command.$this->ports_exposes.$this->ports_mappings.$this->base_directory.$this->publish_directory.$this->dockerfile.$this->dockerfile_location.$this->custom_labels.$this->custom_docker_run_options.$this->dockerfile_target_build.$this->redirect.$this->custom_nginx_configuration.$this->custom_labels);
|
$newConfigHash = base64_encode($this->fqdn.$this->git_repository.$this->git_branch.$this->git_commit_sha.$this->build_pack.$this->static_image.$this->install_command.$this->build_command.$this->start_command.$this->ports_exposes.$this->ports_mappings.$this->base_directory.$this->publish_directory.$this->dockerfile.$this->dockerfile_location.$this->custom_labels.$this->custom_docker_run_options.$this->dockerfile_target_build.$this->redirect.$this->custom_nginx_configuration.$this->custom_labels.$this->settings->use_build_secrets);
|
||||||
if ($this->pull_request_id === 0 || $this->pull_request_id === null) {
|
if ($this->pull_request_id === 0 || $this->pull_request_id === null) {
|
||||||
$newConfigHash .= json_encode($this->environment_variables()->get('value')->sort());
|
$newConfigHash .= json_encode($this->environment_variables()->get(['value', 'is_multiline', 'is_literal', 'is_buildtime', 'is_runtime'])->sort());
|
||||||
} else {
|
} else {
|
||||||
$newConfigHash .= json_encode($this->environment_variables_preview->get('value')->sort());
|
$newConfigHash .= json_encode($this->environment_variables_preview->get(['value', 'is_multiline', 'is_literal', 'is_buildtime', 'is_runtime'])->sort());
|
||||||
}
|
}
|
||||||
$newConfigHash = md5($newConfigHash);
|
$newConfigHash = md5($newConfigHash);
|
||||||
$oldConfigHash = data_get($this, 'config_hash');
|
$oldConfigHash = data_get($this, 'config_hash');
|
||||||
@@ -1481,14 +1480,14 @@ class Application extends BaseModel
|
|||||||
$json = collect(json_decode($this->docker_compose_domains));
|
$json = collect(json_decode($this->docker_compose_domains));
|
||||||
foreach ($json as $key => $value) {
|
foreach ($json as $key => $value) {
|
||||||
if (str($key)->contains('-')) {
|
if (str($key)->contains('-')) {
|
||||||
$key = str($key)->replace('-', '_');
|
$key = str($key)->replace('-', '_')->replace('.', '_');
|
||||||
}
|
}
|
||||||
$json->put((string) $key, $value);
|
$json->put((string) $key, $value);
|
||||||
}
|
}
|
||||||
$services = collect(data_get($parsedServices, 'services', []));
|
$services = collect(data_get($parsedServices, 'services', []));
|
||||||
foreach ($services as $name => $service) {
|
foreach ($services as $name => $service) {
|
||||||
if (str($name)->contains('-')) {
|
if (str($name)->contains('-')) {
|
||||||
$replacedName = str($name)->replace('-', '_');
|
$replacedName = str($name)->replace('-', '_')->replace('.', '_');
|
||||||
$services->put((string) $replacedName, $service);
|
$services->put((string) $replacedName, $service);
|
||||||
$services->forget((string) $name);
|
$services->forget((string) $name);
|
||||||
}
|
}
|
||||||
@@ -1572,7 +1571,19 @@ class Application extends BaseModel
|
|||||||
if (is_null($this->watch_paths)) {
|
if (is_null($this->watch_paths)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
$watch_paths = collect(explode("\n", $this->watch_paths));
|
$watch_paths = collect(explode("\n", $this->watch_paths))
|
||||||
|
->map(function (string $path): string {
|
||||||
|
return trim($path);
|
||||||
|
})
|
||||||
|
->filter(function (string $path): bool {
|
||||||
|
return strlen($path) > 0;
|
||||||
|
});
|
||||||
|
|
||||||
|
// If no valid patterns after filtering, don't trigger
|
||||||
|
if ($watch_paths->isEmpty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
$matches = $modified_files->filter(function ($file) use ($watch_paths) {
|
$matches = $modified_files->filter(function ($file) use ($watch_paths) {
|
||||||
return $watch_paths->contains(function ($glob) use ($file) {
|
return $watch_paths->contains(function ($glob) use ($file) {
|
||||||
return fnmatch($glob, $file);
|
return fnmatch($glob, $file);
|
||||||
|
|||||||
@@ -85,6 +85,47 @@ class ApplicationDeploymentQueue extends Model
|
|||||||
return str($this->commit_message)->value();
|
return str($this->commit_message)->value();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function redactSensitiveInfo($text)
|
||||||
|
{
|
||||||
|
$text = remove_iip($text);
|
||||||
|
|
||||||
|
$app = $this->application;
|
||||||
|
if (! $app) {
|
||||||
|
return $text;
|
||||||
|
}
|
||||||
|
|
||||||
|
$lockedVars = collect([]);
|
||||||
|
|
||||||
|
if ($app->environment_variables) {
|
||||||
|
$lockedVars = $lockedVars->merge(
|
||||||
|
$app->environment_variables
|
||||||
|
->where('is_shown_once', true)
|
||||||
|
->pluck('real_value', 'key')
|
||||||
|
->filter()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->pull_request_id !== 0 && $app->environment_variables_preview) {
|
||||||
|
$lockedVars = $lockedVars->merge(
|
||||||
|
$app->environment_variables_preview
|
||||||
|
->where('is_shown_once', true)
|
||||||
|
->pluck('real_value', 'key')
|
||||||
|
->filter()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($lockedVars as $key => $value) {
|
||||||
|
$escapedValue = preg_quote($value, '/');
|
||||||
|
$text = preg_replace(
|
||||||
|
'/'.$escapedValue.'/',
|
||||||
|
REDACTED,
|
||||||
|
$text
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $text;
|
||||||
|
}
|
||||||
|
|
||||||
public function addLogEntry(string $message, string $type = 'stdout', bool $hidden = false)
|
public function addLogEntry(string $message, string $type = 'stdout', bool $hidden = false)
|
||||||
{
|
{
|
||||||
if ($type === 'error') {
|
if ($type === 'error') {
|
||||||
@@ -96,7 +137,7 @@ class ApplicationDeploymentQueue extends Model
|
|||||||
}
|
}
|
||||||
$newLogEntry = [
|
$newLogEntry = [
|
||||||
'command' => null,
|
'command' => null,
|
||||||
'output' => remove_iip($message),
|
'output' => $this->redactSensitiveInfo($message),
|
||||||
'type' => $type,
|
'type' => $type,
|
||||||
'timestamp' => Carbon::now('UTC'),
|
'timestamp' => Carbon::now('UTC'),
|
||||||
'hidden' => $hidden,
|
'hidden' => $hidden,
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ class ApplicationSetting extends Model
|
|||||||
'is_force_https_enabled' => 'boolean',
|
'is_force_https_enabled' => 'boolean',
|
||||||
'is_debug_enabled' => 'boolean',
|
'is_debug_enabled' => 'boolean',
|
||||||
'is_preview_deployments_enabled' => 'boolean',
|
'is_preview_deployments_enabled' => 'boolean',
|
||||||
|
'is_pr_deployments_public_enabled' => 'boolean',
|
||||||
'is_git_submodules_enabled' => 'boolean',
|
'is_git_submodules_enabled' => 'boolean',
|
||||||
'is_git_lfs_enabled' => 'boolean',
|
'is_git_lfs_enabled' => 'boolean',
|
||||||
'is_git_shallow_clone_enabled' => 'boolean',
|
'is_git_shallow_clone_enabled' => 'boolean',
|
||||||
|
|||||||
@@ -14,10 +14,11 @@ use OpenApi\Attributes as OA;
|
|||||||
'uuid' => ['type' => 'string'],
|
'uuid' => ['type' => 'string'],
|
||||||
'resourceable_type' => ['type' => 'string'],
|
'resourceable_type' => ['type' => 'string'],
|
||||||
'resourceable_id' => ['type' => 'integer'],
|
'resourceable_id' => ['type' => 'integer'],
|
||||||
'is_build_time' => ['type' => 'boolean'],
|
|
||||||
'is_literal' => ['type' => 'boolean'],
|
'is_literal' => ['type' => 'boolean'],
|
||||||
'is_multiline' => ['type' => 'boolean'],
|
'is_multiline' => ['type' => 'boolean'],
|
||||||
'is_preview' => ['type' => 'boolean'],
|
'is_preview' => ['type' => 'boolean'],
|
||||||
|
'is_runtime' => ['type' => 'boolean'],
|
||||||
|
'is_buildtime' => ['type' => 'boolean'],
|
||||||
'is_shared' => ['type' => 'boolean'],
|
'is_shared' => ['type' => 'boolean'],
|
||||||
'is_shown_once' => ['type' => 'boolean'],
|
'is_shown_once' => ['type' => 'boolean'],
|
||||||
'key' => ['type' => 'string'],
|
'key' => ['type' => 'string'],
|
||||||
@@ -35,15 +36,16 @@ class EnvironmentVariable extends BaseModel
|
|||||||
protected $casts = [
|
protected $casts = [
|
||||||
'key' => 'string',
|
'key' => 'string',
|
||||||
'value' => 'encrypted',
|
'value' => 'encrypted',
|
||||||
'is_build_time' => 'boolean',
|
|
||||||
'is_multiline' => 'boolean',
|
'is_multiline' => 'boolean',
|
||||||
'is_preview' => 'boolean',
|
'is_preview' => 'boolean',
|
||||||
|
'is_runtime' => 'boolean',
|
||||||
|
'is_buildtime' => 'boolean',
|
||||||
'version' => 'string',
|
'version' => 'string',
|
||||||
'resourceable_type' => 'string',
|
'resourceable_type' => 'string',
|
||||||
'resourceable_id' => 'integer',
|
'resourceable_id' => 'integer',
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $appends = ['real_value', 'is_shared', 'is_really_required'];
|
protected $appends = ['real_value', 'is_shared', 'is_really_required', 'is_nixpacks', 'is_coolify'];
|
||||||
|
|
||||||
protected static function booted()
|
protected static function booted()
|
||||||
{
|
{
|
||||||
@@ -61,8 +63,8 @@ class EnvironmentVariable extends BaseModel
|
|||||||
ModelsEnvironmentVariable::create([
|
ModelsEnvironmentVariable::create([
|
||||||
'key' => $environment_variable->key,
|
'key' => $environment_variable->key,
|
||||||
'value' => $environment_variable->value,
|
'value' => $environment_variable->value,
|
||||||
'is_build_time' => $environment_variable->is_build_time,
|
|
||||||
'is_multiline' => $environment_variable->is_multiline ?? false,
|
'is_multiline' => $environment_variable->is_multiline ?? false,
|
||||||
|
'is_literal' => $environment_variable->is_literal ?? false,
|
||||||
'resourceable_type' => Application::class,
|
'resourceable_type' => Application::class,
|
||||||
'resourceable_id' => $environment_variable->resourceable_id,
|
'resourceable_id' => $environment_variable->resourceable_id,
|
||||||
'is_preview' => true,
|
'is_preview' => true,
|
||||||
@@ -137,6 +139,32 @@ class EnvironmentVariable extends BaseModel
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function isNixpacks(): Attribute
|
||||||
|
{
|
||||||
|
return Attribute::make(
|
||||||
|
get: function () {
|
||||||
|
if (str($this->key)->startsWith('NIXPACKS_')) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function isCoolify(): Attribute
|
||||||
|
{
|
||||||
|
return Attribute::make(
|
||||||
|
get: function () {
|
||||||
|
if (str($this->key)->startsWith('SERVICE_')) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
protected function isShared(): Attribute
|
protected function isShared(): Attribute
|
||||||
{
|
{
|
||||||
return Attribute::make(
|
return Attribute::make(
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Models;
|
|
||||||
|
|
||||||
class Kubernetes extends BaseModel {}
|
|
||||||
@@ -119,6 +119,7 @@ class LocalFileVolume extends BaseModel
|
|||||||
$commands = collect([]);
|
$commands = collect([]);
|
||||||
if ($this->is_directory) {
|
if ($this->is_directory) {
|
||||||
$commands->push("mkdir -p $this->fs_path > /dev/null 2>&1 || true");
|
$commands->push("mkdir -p $this->fs_path > /dev/null 2>&1 || true");
|
||||||
|
$commands->push("mkdir -p $workdir > /dev/null 2>&1 || true");
|
||||||
$commands->push("cd $workdir");
|
$commands->push("cd $workdir");
|
||||||
}
|
}
|
||||||
if (str($this->fs_path)->startsWith('.') || str($this->fs_path)->startsWith('/') || str($this->fs_path)->startsWith('~')) {
|
if (str($this->fs_path)->startsWith('.') || str($this->fs_path)->startsWith('/') || str($this->fs_path)->startsWith('~')) {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ namespace App\Models;
|
|||||||
|
|
||||||
use App\Traits\HasSafeStringAttribute;
|
use App\Traits\HasSafeStringAttribute;
|
||||||
use DanHarrin\LivewireRateLimiting\WithRateLimiting;
|
use DanHarrin\LivewireRateLimiting\WithRateLimiting;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
use Illuminate\Validation\ValidationException;
|
use Illuminate\Validation\ValidationException;
|
||||||
use OpenApi\Attributes as OA;
|
use OpenApi\Attributes as OA;
|
||||||
@@ -99,11 +100,18 @@ class PrivateKey extends BaseModel
|
|||||||
|
|
||||||
public static function createAndStore(array $data)
|
public static function createAndStore(array $data)
|
||||||
{
|
{
|
||||||
$privateKey = new self($data);
|
return DB::transaction(function () use ($data) {
|
||||||
$privateKey->save();
|
$privateKey = new self($data);
|
||||||
$privateKey->storeInFileSystem();
|
$privateKey->save();
|
||||||
|
|
||||||
return $privateKey;
|
try {
|
||||||
|
$privateKey->storeInFileSystem();
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
throw new \Exception('Failed to store SSH key: '.$e->getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
return $privateKey;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function generateNewKeyPair($type = 'rsa')
|
public static function generateNewKeyPair($type = 'rsa')
|
||||||
@@ -151,15 +159,64 @@ class PrivateKey extends BaseModel
|
|||||||
public function storeInFileSystem()
|
public function storeInFileSystem()
|
||||||
{
|
{
|
||||||
$filename = "ssh_key@{$this->uuid}";
|
$filename = "ssh_key@{$this->uuid}";
|
||||||
Storage::disk('ssh-keys')->put($filename, $this->private_key);
|
$disk = Storage::disk('ssh-keys');
|
||||||
|
|
||||||
return "/var/www/html/storage/app/ssh/keys/{$filename}";
|
// Ensure the storage directory exists and is writable
|
||||||
|
$this->ensureStorageDirectoryExists();
|
||||||
|
|
||||||
|
// Attempt to store the private key
|
||||||
|
$success = $disk->put($filename, $this->private_key);
|
||||||
|
|
||||||
|
if (! $success) {
|
||||||
|
throw new \Exception("Failed to write SSH key to filesystem. Check disk space and permissions for: {$this->getKeyLocation()}");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify the file was actually created and has content
|
||||||
|
if (! $disk->exists($filename)) {
|
||||||
|
throw new \Exception("SSH key file was not created: {$this->getKeyLocation()}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$storedContent = $disk->get($filename);
|
||||||
|
if (empty($storedContent) || $storedContent !== $this->private_key) {
|
||||||
|
$disk->delete($filename); // Clean up the bad file
|
||||||
|
throw new \Exception("SSH key file content verification failed: {$this->getKeyLocation()}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->getKeyLocation();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function deleteFromStorage(self $privateKey)
|
public static function deleteFromStorage(self $privateKey)
|
||||||
{
|
{
|
||||||
$filename = "ssh_key@{$privateKey->uuid}";
|
$filename = "ssh_key@{$privateKey->uuid}";
|
||||||
Storage::disk('ssh-keys')->delete($filename);
|
$disk = Storage::disk('ssh-keys');
|
||||||
|
|
||||||
|
if ($disk->exists($filename)) {
|
||||||
|
$disk->delete($filename);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function ensureStorageDirectoryExists()
|
||||||
|
{
|
||||||
|
$disk = Storage::disk('ssh-keys');
|
||||||
|
$directoryPath = '';
|
||||||
|
|
||||||
|
if (! $disk->exists($directoryPath)) {
|
||||||
|
$success = $disk->makeDirectory($directoryPath);
|
||||||
|
if (! $success) {
|
||||||
|
throw new \Exception('Failed to create SSH keys storage directory');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if directory is writable by attempting a test file
|
||||||
|
$testFilename = '.test_write_'.uniqid();
|
||||||
|
$testSuccess = $disk->put($testFilename, 'test');
|
||||||
|
|
||||||
|
if (! $testSuccess) {
|
||||||
|
throw new \Exception('SSH keys storage directory is not writable');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clean up test file
|
||||||
|
$disk->delete($testFilename);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getKeyLocation()
|
public function getKeyLocation()
|
||||||
@@ -169,10 +226,17 @@ class PrivateKey extends BaseModel
|
|||||||
|
|
||||||
public function updatePrivateKey(array $data)
|
public function updatePrivateKey(array $data)
|
||||||
{
|
{
|
||||||
$this->update($data);
|
return DB::transaction(function () use ($data) {
|
||||||
$this->storeInFileSystem();
|
$this->update($data);
|
||||||
|
|
||||||
return $this;
|
try {
|
||||||
|
$this->storeInFileSystem();
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
throw new \Exception('Failed to update SSH key: '.$e->getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function servers()
|
public function servers()
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ use App\Jobs\RegenerateSslCertJob;
|
|||||||
use App\Notifications\Server\Reachable;
|
use App\Notifications\Server\Reachable;
|
||||||
use App\Notifications\Server\Unreachable;
|
use App\Notifications\Server\Unreachable;
|
||||||
use App\Services\ConfigurationRepository;
|
use App\Services\ConfigurationRepository;
|
||||||
|
use App\Traits\ClearsGlobalSearchCache;
|
||||||
use App\Traits\HasSafeStringAttribute;
|
use App\Traits\HasSafeStringAttribute;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
@@ -55,7 +56,7 @@ use Visus\Cuid2\Cuid2;
|
|||||||
|
|
||||||
class Server extends BaseModel
|
class Server extends BaseModel
|
||||||
{
|
{
|
||||||
use HasFactory, SchemalessAttributesTrait, SoftDeletes;
|
use ClearsGlobalSearchCache, HasFactory, SchemalessAttributesTrait, SoftDeletes;
|
||||||
|
|
||||||
public static $batch_counter = 0;
|
public static $batch_counter = 0;
|
||||||
|
|
||||||
@@ -1259,13 +1260,13 @@ $schema://$host {
|
|||||||
return str($this->ip)->contains(':');
|
return str($this->ip)->contains(':');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function restartSentinel(bool $async = true)
|
public function restartSentinel(?string $customImage = null, bool $async = true)
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
if ($async) {
|
if ($async) {
|
||||||
StartSentinel::dispatch($this, true);
|
StartSentinel::dispatch($this, true, null, $customImage);
|
||||||
} else {
|
} else {
|
||||||
StartSentinel::run($this, true);
|
StartSentinel::run($this, true, null, $customImage);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
return handleError($e);
|
return handleError($e);
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
use App\Enums\ProcessStatus;
|
use App\Enums\ProcessStatus;
|
||||||
|
use App\Traits\ClearsGlobalSearchCache;
|
||||||
use App\Traits\HasSafeStringAttribute;
|
use App\Traits\HasSafeStringAttribute;
|
||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
@@ -41,7 +42,7 @@ use Visus\Cuid2\Cuid2;
|
|||||||
)]
|
)]
|
||||||
class Service extends BaseModel
|
class Service extends BaseModel
|
||||||
{
|
{
|
||||||
use HasFactory, HasSafeStringAttribute, SoftDeletes;
|
use ClearsGlobalSearchCache, HasFactory, HasSafeStringAttribute, SoftDeletes;
|
||||||
|
|
||||||
private static $parserVersion = '5';
|
private static $parserVersion = '5';
|
||||||
|
|
||||||
@@ -1113,7 +1114,6 @@ class Service extends BaseModel
|
|||||||
$this->environment_variables()->create([
|
$this->environment_variables()->create([
|
||||||
'key' => $key,
|
'key' => $key,
|
||||||
'value' => $value,
|
'value' => $value,
|
||||||
'is_build_time' => false,
|
|
||||||
'resourceable_id' => $this->id,
|
'resourceable_id' => $this->id,
|
||||||
'resourceable_type' => $this->getMorphClass(),
|
'resourceable_type' => $this->getMorphClass(),
|
||||||
'is_preview' => false,
|
'is_preview' => false,
|
||||||
@@ -1230,14 +1230,14 @@ class Service extends BaseModel
|
|||||||
public function environment_variables()
|
public function environment_variables()
|
||||||
{
|
{
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
||||||
->orderBy('key', 'asc');
|
->orderByRaw("
|
||||||
}
|
CASE
|
||||||
|
WHEN LOWER(key) LIKE 'service_%' THEN 1
|
||||||
public function environment_variables_preview()
|
WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
|
||||||
{
|
ELSE 3
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
END,
|
||||||
->where('is_preview', true)
|
LOWER(key) ASC
|
||||||
->orderByRaw("LOWER(key) LIKE LOWER('SERVICE%') DESC, LOWER(key) ASC");
|
");
|
||||||
}
|
}
|
||||||
|
|
||||||
public function workdir()
|
public function workdir()
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
|
use App\Traits\ClearsGlobalSearchCache;
|
||||||
use App\Traits\HasSafeStringAttribute;
|
use App\Traits\HasSafeStringAttribute;
|
||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
@@ -9,7 +10,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
|
|||||||
|
|
||||||
class StandaloneClickhouse extends BaseModel
|
class StandaloneClickhouse extends BaseModel
|
||||||
{
|
{
|
||||||
use HasFactory, HasSafeStringAttribute, SoftDeletes;
|
use ClearsGlobalSearchCache, HasFactory, HasSafeStringAttribute, SoftDeletes;
|
||||||
|
|
||||||
protected $guarded = [];
|
protected $guarded = [];
|
||||||
|
|
||||||
@@ -28,7 +29,6 @@ class StandaloneClickhouse extends BaseModel
|
|||||||
'host_path' => null,
|
'host_path' => null,
|
||||||
'resource_id' => $database->id,
|
'resource_id' => $database->id,
|
||||||
'resource_type' => $database->getMorphClass(),
|
'resource_type' => $database->getMorphClass(),
|
||||||
'is_readonly' => true,
|
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
static::forceDeleting(function ($database) {
|
static::forceDeleting(function ($database) {
|
||||||
@@ -44,6 +44,11 @@ class StandaloneClickhouse extends BaseModel
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function ownedByCurrentTeam()
|
||||||
|
{
|
||||||
|
return StandaloneClickhouse::whereRelation('environment.project.team', 'id', currentTeam()->id)->orderBy('name');
|
||||||
|
}
|
||||||
|
|
||||||
protected function serverStatus(): Attribute
|
protected function serverStatus(): Attribute
|
||||||
{
|
{
|
||||||
return Attribute::make(
|
return Attribute::make(
|
||||||
@@ -267,7 +272,14 @@ class StandaloneClickhouse extends BaseModel
|
|||||||
public function environment_variables()
|
public function environment_variables()
|
||||||
{
|
{
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
||||||
->orderBy('key', 'asc');
|
->orderByRaw("
|
||||||
|
CASE
|
||||||
|
WHEN LOWER(key) LIKE 'service_%' THEN 1
|
||||||
|
WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
|
||||||
|
ELSE 3
|
||||||
|
END,
|
||||||
|
LOWER(key) ASC
|
||||||
|
");
|
||||||
}
|
}
|
||||||
|
|
||||||
public function runtime_environment_variables()
|
public function runtime_environment_variables()
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
|
use App\Traits\ClearsGlobalSearchCache;
|
||||||
use App\Traits\HasSafeStringAttribute;
|
use App\Traits\HasSafeStringAttribute;
|
||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
@@ -9,7 +10,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
|
|||||||
|
|
||||||
class StandaloneDragonfly extends BaseModel
|
class StandaloneDragonfly extends BaseModel
|
||||||
{
|
{
|
||||||
use HasFactory, HasSafeStringAttribute, SoftDeletes;
|
use ClearsGlobalSearchCache, HasFactory, HasSafeStringAttribute, SoftDeletes;
|
||||||
|
|
||||||
protected $guarded = [];
|
protected $guarded = [];
|
||||||
|
|
||||||
@@ -28,7 +29,6 @@ class StandaloneDragonfly extends BaseModel
|
|||||||
'host_path' => null,
|
'host_path' => null,
|
||||||
'resource_id' => $database->id,
|
'resource_id' => $database->id,
|
||||||
'resource_type' => $database->getMorphClass(),
|
'resource_type' => $database->getMorphClass(),
|
||||||
'is_readonly' => true,
|
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
static::forceDeleting(function ($database) {
|
static::forceDeleting(function ($database) {
|
||||||
@@ -44,6 +44,11 @@ class StandaloneDragonfly extends BaseModel
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function ownedByCurrentTeam()
|
||||||
|
{
|
||||||
|
return StandaloneDragonfly::whereRelation('environment.project.team', 'id', currentTeam()->id)->orderBy('name');
|
||||||
|
}
|
||||||
|
|
||||||
protected function serverStatus(): Attribute
|
protected function serverStatus(): Attribute
|
||||||
{
|
{
|
||||||
return Attribute::make(
|
return Attribute::make(
|
||||||
@@ -342,6 +347,13 @@ class StandaloneDragonfly extends BaseModel
|
|||||||
public function environment_variables()
|
public function environment_variables()
|
||||||
{
|
{
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
||||||
->orderBy('key', 'asc');
|
->orderByRaw("
|
||||||
|
CASE
|
||||||
|
WHEN LOWER(key) LIKE 'service_%' THEN 1
|
||||||
|
WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
|
||||||
|
ELSE 3
|
||||||
|
END,
|
||||||
|
LOWER(key) ASC
|
||||||
|
");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
|
use App\Traits\ClearsGlobalSearchCache;
|
||||||
use App\Traits\HasSafeStringAttribute;
|
use App\Traits\HasSafeStringAttribute;
|
||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
@@ -9,7 +10,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
|
|||||||
|
|
||||||
class StandaloneKeydb extends BaseModel
|
class StandaloneKeydb extends BaseModel
|
||||||
{
|
{
|
||||||
use HasFactory, HasSafeStringAttribute, SoftDeletes;
|
use ClearsGlobalSearchCache, HasFactory, HasSafeStringAttribute, SoftDeletes;
|
||||||
|
|
||||||
protected $guarded = [];
|
protected $guarded = [];
|
||||||
|
|
||||||
@@ -28,7 +29,6 @@ class StandaloneKeydb extends BaseModel
|
|||||||
'host_path' => null,
|
'host_path' => null,
|
||||||
'resource_id' => $database->id,
|
'resource_id' => $database->id,
|
||||||
'resource_type' => $database->getMorphClass(),
|
'resource_type' => $database->getMorphClass(),
|
||||||
'is_readonly' => true,
|
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
static::forceDeleting(function ($database) {
|
static::forceDeleting(function ($database) {
|
||||||
@@ -44,6 +44,11 @@ class StandaloneKeydb extends BaseModel
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function ownedByCurrentTeam()
|
||||||
|
{
|
||||||
|
return StandaloneKeydb::whereRelation('environment.project.team', 'id', currentTeam()->id)->orderBy('name');
|
||||||
|
}
|
||||||
|
|
||||||
protected function serverStatus(): Attribute
|
protected function serverStatus(): Attribute
|
||||||
{
|
{
|
||||||
return Attribute::make(
|
return Attribute::make(
|
||||||
@@ -342,6 +347,13 @@ class StandaloneKeydb extends BaseModel
|
|||||||
public function environment_variables()
|
public function environment_variables()
|
||||||
{
|
{
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
||||||
->orderBy('key', 'asc');
|
->orderByRaw("
|
||||||
|
CASE
|
||||||
|
WHEN LOWER(key) LIKE 'service_%' THEN 1
|
||||||
|
WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
|
||||||
|
ELSE 3
|
||||||
|
END,
|
||||||
|
LOWER(key) ASC
|
||||||
|
");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
|
use App\Traits\ClearsGlobalSearchCache;
|
||||||
use App\Traits\HasSafeStringAttribute;
|
use App\Traits\HasSafeStringAttribute;
|
||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
@@ -10,7 +11,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
|
|||||||
|
|
||||||
class StandaloneMariadb extends BaseModel
|
class StandaloneMariadb extends BaseModel
|
||||||
{
|
{
|
||||||
use HasFactory, HasSafeStringAttribute, SoftDeletes;
|
use ClearsGlobalSearchCache, HasFactory, HasSafeStringAttribute, SoftDeletes;
|
||||||
|
|
||||||
protected $guarded = [];
|
protected $guarded = [];
|
||||||
|
|
||||||
@@ -29,7 +30,6 @@ class StandaloneMariadb extends BaseModel
|
|||||||
'host_path' => null,
|
'host_path' => null,
|
||||||
'resource_id' => $database->id,
|
'resource_id' => $database->id,
|
||||||
'resource_type' => $database->getMorphClass(),
|
'resource_type' => $database->getMorphClass(),
|
||||||
'is_readonly' => true,
|
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
static::forceDeleting(function ($database) {
|
static::forceDeleting(function ($database) {
|
||||||
@@ -45,6 +45,11 @@ class StandaloneMariadb extends BaseModel
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function ownedByCurrentTeam()
|
||||||
|
{
|
||||||
|
return StandaloneMariadb::whereRelation('environment.project.team', 'id', currentTeam()->id)->orderBy('name');
|
||||||
|
}
|
||||||
|
|
||||||
protected function serverStatus(): Attribute
|
protected function serverStatus(): Attribute
|
||||||
{
|
{
|
||||||
return Attribute::make(
|
return Attribute::make(
|
||||||
@@ -263,7 +268,14 @@ class StandaloneMariadb extends BaseModel
|
|||||||
public function environment_variables()
|
public function environment_variables()
|
||||||
{
|
{
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
||||||
->orderBy('key', 'asc');
|
->orderByRaw("
|
||||||
|
CASE
|
||||||
|
WHEN LOWER(key) LIKE 'service_%' THEN 1
|
||||||
|
WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
|
||||||
|
ELSE 3
|
||||||
|
END,
|
||||||
|
LOWER(key) ASC
|
||||||
|
");
|
||||||
}
|
}
|
||||||
|
|
||||||
public function runtime_environment_variables()
|
public function runtime_environment_variables()
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
|
use App\Traits\ClearsGlobalSearchCache;
|
||||||
use App\Traits\HasSafeStringAttribute;
|
use App\Traits\HasSafeStringAttribute;
|
||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
@@ -9,7 +10,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
|
|||||||
|
|
||||||
class StandaloneMongodb extends BaseModel
|
class StandaloneMongodb extends BaseModel
|
||||||
{
|
{
|
||||||
use HasFactory, HasSafeStringAttribute, SoftDeletes;
|
use ClearsGlobalSearchCache, HasFactory, HasSafeStringAttribute, SoftDeletes;
|
||||||
|
|
||||||
protected $guarded = [];
|
protected $guarded = [];
|
||||||
|
|
||||||
@@ -24,7 +25,6 @@ class StandaloneMongodb extends BaseModel
|
|||||||
'host_path' => null,
|
'host_path' => null,
|
||||||
'resource_id' => $database->id,
|
'resource_id' => $database->id,
|
||||||
'resource_type' => $database->getMorphClass(),
|
'resource_type' => $database->getMorphClass(),
|
||||||
'is_readonly' => true,
|
|
||||||
]);
|
]);
|
||||||
LocalPersistentVolume::create([
|
LocalPersistentVolume::create([
|
||||||
'name' => 'mongodb-db-'.$database->uuid,
|
'name' => 'mongodb-db-'.$database->uuid,
|
||||||
@@ -32,7 +32,6 @@ class StandaloneMongodb extends BaseModel
|
|||||||
'host_path' => null,
|
'host_path' => null,
|
||||||
'resource_id' => $database->id,
|
'resource_id' => $database->id,
|
||||||
'resource_type' => $database->getMorphClass(),
|
'resource_type' => $database->getMorphClass(),
|
||||||
'is_readonly' => true,
|
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
static::forceDeleting(function ($database) {
|
static::forceDeleting(function ($database) {
|
||||||
@@ -48,6 +47,11 @@ class StandaloneMongodb extends BaseModel
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function ownedByCurrentTeam()
|
||||||
|
{
|
||||||
|
return StandaloneMongodb::whereRelation('environment.project.team', 'id', currentTeam()->id)->orderBy('name');
|
||||||
|
}
|
||||||
|
|
||||||
protected function serverStatus(): Attribute
|
protected function serverStatus(): Attribute
|
||||||
{
|
{
|
||||||
return Attribute::make(
|
return Attribute::make(
|
||||||
@@ -365,6 +369,13 @@ class StandaloneMongodb extends BaseModel
|
|||||||
public function environment_variables()
|
public function environment_variables()
|
||||||
{
|
{
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
||||||
->orderBy('key', 'asc');
|
->orderByRaw("
|
||||||
|
CASE
|
||||||
|
WHEN LOWER(key) LIKE 'service_%' THEN 1
|
||||||
|
WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
|
||||||
|
ELSE 3
|
||||||
|
END,
|
||||||
|
LOWER(key) ASC
|
||||||
|
");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
|
use App\Traits\ClearsGlobalSearchCache;
|
||||||
use App\Traits\HasSafeStringAttribute;
|
use App\Traits\HasSafeStringAttribute;
|
||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
@@ -9,7 +10,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
|
|||||||
|
|
||||||
class StandaloneMysql extends BaseModel
|
class StandaloneMysql extends BaseModel
|
||||||
{
|
{
|
||||||
use HasFactory, HasSafeStringAttribute, SoftDeletes;
|
use ClearsGlobalSearchCache, HasFactory, HasSafeStringAttribute, SoftDeletes;
|
||||||
|
|
||||||
protected $guarded = [];
|
protected $guarded = [];
|
||||||
|
|
||||||
@@ -29,7 +30,6 @@ class StandaloneMysql extends BaseModel
|
|||||||
'host_path' => null,
|
'host_path' => null,
|
||||||
'resource_id' => $database->id,
|
'resource_id' => $database->id,
|
||||||
'resource_type' => $database->getMorphClass(),
|
'resource_type' => $database->getMorphClass(),
|
||||||
'is_readonly' => true,
|
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
static::forceDeleting(function ($database) {
|
static::forceDeleting(function ($database) {
|
||||||
@@ -45,6 +45,11 @@ class StandaloneMysql extends BaseModel
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function ownedByCurrentTeam()
|
||||||
|
{
|
||||||
|
return StandaloneMysql::whereRelation('environment.project.team', 'id', currentTeam()->id)->orderBy('name');
|
||||||
|
}
|
||||||
|
|
||||||
protected function serverStatus(): Attribute
|
protected function serverStatus(): Attribute
|
||||||
{
|
{
|
||||||
return Attribute::make(
|
return Attribute::make(
|
||||||
@@ -346,6 +351,13 @@ class StandaloneMysql extends BaseModel
|
|||||||
public function environment_variables()
|
public function environment_variables()
|
||||||
{
|
{
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
||||||
->orderBy('key', 'asc');
|
->orderByRaw("
|
||||||
|
CASE
|
||||||
|
WHEN LOWER(key) LIKE 'service_%' THEN 1
|
||||||
|
WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
|
||||||
|
ELSE 3
|
||||||
|
END,
|
||||||
|
LOWER(key) ASC
|
||||||
|
");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
|
use App\Traits\ClearsGlobalSearchCache;
|
||||||
use App\Traits\HasSafeStringAttribute;
|
use App\Traits\HasSafeStringAttribute;
|
||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
@@ -9,7 +10,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
|
|||||||
|
|
||||||
class StandalonePostgresql extends BaseModel
|
class StandalonePostgresql extends BaseModel
|
||||||
{
|
{
|
||||||
use HasFactory, HasSafeStringAttribute, SoftDeletes;
|
use ClearsGlobalSearchCache, HasFactory, HasSafeStringAttribute, SoftDeletes;
|
||||||
|
|
||||||
protected $guarded = [];
|
protected $guarded = [];
|
||||||
|
|
||||||
@@ -29,7 +30,6 @@ class StandalonePostgresql extends BaseModel
|
|||||||
'host_path' => null,
|
'host_path' => null,
|
||||||
'resource_id' => $database->id,
|
'resource_id' => $database->id,
|
||||||
'resource_type' => $database->getMorphClass(),
|
'resource_type' => $database->getMorphClass(),
|
||||||
'is_readonly' => true,
|
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
static::forceDeleting(function ($database) {
|
static::forceDeleting(function ($database) {
|
||||||
@@ -45,6 +45,11 @@ class StandalonePostgresql extends BaseModel
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function ownedByCurrentTeam()
|
||||||
|
{
|
||||||
|
return StandalonePostgresql::whereRelation('environment.project.team', 'id', currentTeam()->id)->orderBy('name');
|
||||||
|
}
|
||||||
|
|
||||||
public function workdir()
|
public function workdir()
|
||||||
{
|
{
|
||||||
return database_configuration_dir()."/{$this->uuid}";
|
return database_configuration_dir()."/{$this->uuid}";
|
||||||
@@ -297,7 +302,14 @@ class StandalonePostgresql extends BaseModel
|
|||||||
public function environment_variables()
|
public function environment_variables()
|
||||||
{
|
{
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
||||||
->orderBy('key', 'asc');
|
->orderByRaw("
|
||||||
|
CASE
|
||||||
|
WHEN LOWER(key) LIKE 'service_%' THEN 1
|
||||||
|
WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
|
||||||
|
ELSE 3
|
||||||
|
END,
|
||||||
|
LOWER(key) ASC
|
||||||
|
");
|
||||||
}
|
}
|
||||||
|
|
||||||
public function isBackupSolutionAvailable()
|
public function isBackupSolutionAvailable()
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
|
use App\Traits\ClearsGlobalSearchCache;
|
||||||
use App\Traits\HasSafeStringAttribute;
|
use App\Traits\HasSafeStringAttribute;
|
||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
@@ -9,7 +10,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
|
|||||||
|
|
||||||
class StandaloneRedis extends BaseModel
|
class StandaloneRedis extends BaseModel
|
||||||
{
|
{
|
||||||
use HasFactory, HasSafeStringAttribute, SoftDeletes;
|
use ClearsGlobalSearchCache, HasFactory, HasSafeStringAttribute, SoftDeletes;
|
||||||
|
|
||||||
protected $guarded = [];
|
protected $guarded = [];
|
||||||
|
|
||||||
@@ -24,7 +25,6 @@ class StandaloneRedis extends BaseModel
|
|||||||
'host_path' => null,
|
'host_path' => null,
|
||||||
'resource_id' => $database->id,
|
'resource_id' => $database->id,
|
||||||
'resource_type' => $database->getMorphClass(),
|
'resource_type' => $database->getMorphClass(),
|
||||||
'is_readonly' => true,
|
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
static::forceDeleting(function ($database) {
|
static::forceDeleting(function ($database) {
|
||||||
@@ -46,6 +46,11 @@ class StandaloneRedis extends BaseModel
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function ownedByCurrentTeam()
|
||||||
|
{
|
||||||
|
return StandaloneRedis::whereRelation('environment.project.team', 'id', currentTeam()->id)->orderBy('name');
|
||||||
|
}
|
||||||
|
|
||||||
protected function serverStatus(): Attribute
|
protected function serverStatus(): Attribute
|
||||||
{
|
{
|
||||||
return Attribute::make(
|
return Attribute::make(
|
||||||
@@ -389,6 +394,13 @@ class StandaloneRedis extends BaseModel
|
|||||||
public function environment_variables()
|
public function environment_variables()
|
||||||
{
|
{
|
||||||
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
|
||||||
->orderBy('key', 'asc');
|
->orderByRaw("
|
||||||
|
CASE
|
||||||
|
WHEN LOWER(key) LIKE 'service_%' THEN 1
|
||||||
|
WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
|
||||||
|
ELSE 3
|
||||||
|
END,
|
||||||
|
LOWER(key) ASC
|
||||||
|
");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user