Skip to content

[SHOT-148] fix: syntax error in BUILT_IN_MS_SQL_ENABLED conditional check#492

Merged
keithhubner merged 2 commits intobitwarden:mainfrom
sander-adamse:main
Apr 27, 2026
Merged

[SHOT-148] fix: syntax error in BUILT_IN_MS_SQL_ENABLED conditional check#492
keithhubner merged 2 commits intobitwarden:mainfrom
sander-adamse:main

Conversation

@sander-adamse
Copy link
Copy Markdown
Contributor

🎟️ Tracking

Discovered during automated AWX playbook runs — the unconditional 60-second sleep was causing unnecessary delays on deployments using an external database.

📔 Objective

The updatebw function in run.sh unconditionally sleeps 60 seconds after an update to wait for MSSQL to come online. This is unnecessary for users running an external database. This PR adds a conditional check so the 60-second sleep only occurs when enable_built_in_ms_sql is set to true in config.yml. The BUILT_IN_MS_SQL_ENABLED variable is read from the config and used to gate the sleep, matching the pattern already used for enable_key_connector.

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

@sander-adamse sander-adamse requested a review from a team as a code owner April 13, 2026 08:38
@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Apr 13, 2026

CLA assistant check
All committers have signed the CLA.

@sander-adamse sander-adamse changed the title fix: syntax error in BUILT_IN_MS_SQL_ENABLED conditional check fix: add BUILT_IN_MS_SQL_ENABLED conditional check when updating Apr 13, 2026
@djsmith85 djsmith85 changed the title fix: add BUILT_IN_MS_SQL_ENABLED conditional check when updating [PM-35037] fix: add BUILT_IN_MS_SQL_ENABLED conditional check when updating Apr 13, 2026
@bitwarden-bot
Copy link
Copy Markdown

bitwarden-bot commented Apr 14, 2026

Thank you for your contribution! We've added this to our internal tracking system for review.
ID: SHOT-148
Link: https://bitwarden.atlassian.net/browse/SHOT-148

Details on our contribution process can be found here: https://contributing.bitwarden.com/contributing/pull-requests/community-pr-process.

@bitwarden-bot bitwarden-bot changed the title [PM-35037] fix: add BUILT_IN_MS_SQL_ENABLED conditional check when updating [PM-35079] fix: syntax error in BUILT_IN_MS_SQL_ENABLED conditional check Apr 14, 2026
@keithhubner keithhubner added ai-review Request a Claude code review and removed ai-review Request a Claude code review labels Apr 20, 2026
keithhubner
keithhubner previously approved these changes Apr 20, 2026
@sonarqubecloud
Copy link
Copy Markdown

@github-actions
Copy link
Copy Markdown
Contributor

Logo
Checkmarx One – Scan Summary & Detailsc80c1c7e-6421-4877-a3db-a99bbc73c3b9

Great job! No new security vulnerabilities introduced in this pull request

Comment thread run.sh Outdated
@keithhubner keithhubner dismissed their stale review April 22, 2026 08:33

Re-reviewing: the = true check skips the sleep for legacy configs that don't have the key yet (first upgrade only). Suggest != false so the sleep is preserved unless explicitly disabled.

@djsmith85 djsmith85 changed the title [PM-35079] fix: syntax error in BUILT_IN_MS_SQL_ENABLED conditional check [SHOT-148] fix: syntax error in BUILT_IN_MS_SQL_ENABLED conditional check Apr 22, 2026
@keithhubner keithhubner merged commit 94e7f63 into bitwarden:main Apr 27, 2026
9 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants