Skip to content

Fix(ols): Fix cli not detecting OLS sites - #1

Merged
tareq1988 merged 2 commits into
flywp:developfrom
ma-04:develop
Jun 16, 2025
Merged

tareq1988 merged 2 commits into
flywp:developfrom
ma-04:develop

Conversation

@ma-04

@ma-04 ma-04 commented Apr 9, 2025 •

Copy link
Copy Markdown
Member

Summary by CodeRabbit

  • New Features
    • Updated service handling to support a new service identifier, ensuring a more consistent experience.
    • Enhanced command execution so that commands run under a designated user when the new service is in use, improving overall compatibility.

@coderabbitai

coderabbitai Bot commented Apr 9, 2025 •

Copy link
Copy Markdown

Walkthrough

The changes update service name checks by replacing "litespeed" with "openlitespeed" in command execution logic. In the site command (cmd/site.go), the service name is now verified against "openlitespeed". In addition, within the Docker compose logic (internal/docker/compose.go), the container name check is modified accordingly. When executing WP CLI commands, a conditional now adds the --user www-data flag if the container is identified as "openlitespeed". The overall control flow remains similar with these targeted modifications.

Changes

Files Change Summary
cmd/site.go, internal/docker/compose.go (getContainerName) Updated service name checks: replaced "litespeed" with "openlitespeed".
internal/docker/compose.go (RunWPCLI) Introduced a conditional to prepend --user www-data to WP CLI arguments when the container is "openlitespeed".

Sequence Diagram(s)

sequenceDiagram
    participant U as User
    participant EC as execCmd
    participant CN as getContainerName
    participant WP as RunWPCLI
    participant D as Docker Engine

    U->>EC: Execute command with a specified service name
    EC->>CN: Check service (php, nginx, openlitespeed)
    CN-->>EC: Return container name ("openlitespeed" if exists)
    EC->>WP: Build WP CLI command arguments
    alt Container is "openlitespeed"
        WP->>WP: Add "--user www-data" flag
    end
    WP->>D: Execute command in container
Loading

Poem

I hopped through lines where code resides,
With OpenLitespeed leading the tides.
The commands now spring a cautious dance,
www-data takes its graceful stance.
A little hop, a tweak so light—
Coding magic in my burrow tonight!
🐰✨


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between dfe1395 and 46eff13.

📒 Files selected for processing (2)
  • cmd/site.go (1 hunks)
  • internal/docker/compose.go (2 hunks)
🔇 Additional comments (3)
cmd/site.go (1)

105-108: Appropriate service name update for OpenLiteSpeed detection

The change from "litespeed" to "openlitespeed" in both the comment and conditional check correctly aligns with the PR objective to fix CLI detection of OLS sites. This ensures the command will properly recognize OpenLiteSpeed containers when explicitly specified.

internal/docker/compose.go (2)

51-52: Correct container name detection for OpenLiteSpeed

The update from "litespeed" to "openlitespeed" in the container detection logic aligns with the changes in cmd/site.go, ensuring consistent service naming throughout the codebase.


64-69: Appropriate user context for OpenLiteSpeed commands

Good implementation of conditional logic to execute WP CLI commands as the www-data user specifically for OpenLiteSpeed containers. This ensures proper file permissions and access when running commands in the OLS environment, which typically uses www-data as the web server user.

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai plan to trigger planning for file edits and PR creation.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@ma-04 ma-04 changed the title Fix(ols): Fix cli not detecting OLS sites and use ols user www-data for exec commands Fix(ols): Fix cli not detecting OLS sites Apr 9, 2025
@alaminfirdows

Copy link
Copy Markdown
Contributor

@tareq1988 bhai, need to merge this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants