Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

SettingsManager::bootSettings - fix providing CIVICRM_DSN directly on Standalone #31216

Merged
merged 1 commit into from
Oct 3, 2024

Conversation

ufundo
Copy link
Contributor

@ufundo ufundo commented Sep 30, 2024

Overview

On Standalone, the CIVICRM_DSN can be provided using env vars for its component parts. However the exceptional handling for this doesn't check whether the value for CIVICRM_DSN has actually come from component parts - and so tries to reset it if it is already set.

Before

On Standalone, set CIVICRM_DSN as env var

( ! ) Warning: Constant CIVICRM_DSN already defined in /home/ufundo/Code/civicrm/civicrm-buildkit/build/build-0/web/core/Civi/Core/SettingsManager.php on line 435

After

Setting CIVICRM_DSN as env var works as expected.

Copy link

civibot bot commented Sep 30, 2024

🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this PR. 👷

Introduction for new contributors...
  • If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
  • A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
  • A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
  • If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
  • Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
  • A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
  • To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
  • For more information about contributing, see CONTRIBUTING.md.
Quick links for reviewers...

➡️ Online demo of this PR 🔗

@civibot civibot bot added the master label Sep 30, 2024
@ufundo ufundo marked this pull request as ready for review September 30, 2024 12:40
@ufundo
Copy link
Contributor Author

ufundo commented Sep 30, 2024

@michaelmcandrew I think you hit this the other day - could you review?

@michaelmcandrew
Copy link
Contributor

@ufundo - I don't think I did actually. In #31155 (comment) I was able to pass in a DSN or seperate variables and it booted OK.

In any case, I applied your patch onto #31155 (comment) and can confirm that it still booted fine when db credentials were passed in as a DSN or as seperate variables.

And the cursory glance at the logic looks fine to me (though I have no knowledge of the rest of the context so not sure how helpful that is, but anyway).

@seamuslee001
Copy link
Contributor

I'm just going to get Jenkins to run the standlone ones but I think this is mergeable

@seamuslee001 seamuslee001 added the run-standalone Civibot should setup demos+tests for Standalone label Oct 2, 2024
@ufundo
Copy link
Contributor Author

ufundo commented Oct 2, 2024

thanks @seamuslee001

just noting standalone upgrade test fails are pre-existing

@totten
Copy link
Member

totten commented Oct 3, 2024

Agree - Seems reasonable, and test-failures are pre-existing/unrelated.

@totten totten merged commit 37ba768 into civicrm:master Oct 3, 2024
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
master run-standalone Civibot should setup demos+tests for Standalone
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants