Skip to content

[PM-31909] Remove m3 flagged logic#7352

Merged
cturnbull-bitwarden merged 8 commits intomainfrom
billing/PM-31909/remove-m3-flagged-logic-server
Apr 14, 2026
Merged

[PM-31909] Remove m3 flagged logic#7352
cturnbull-bitwarden merged 8 commits intomainfrom
billing/PM-31909/remove-m3-flagged-logic-server

Conversation

@cturnbull-bitwarden
Copy link
Copy Markdown
Contributor

@cturnbull-bitwarden cturnbull-bitwarden commented Mar 30, 2026

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-31909
https://bitwarden.atlassian.net/browse/PM-31893

📔 Objective

Remove pm-26462-milestone-3 feature flag logic from the server. The flag is fully rolled out so we keep the "on" path everywhere:

  • Simplify PricingClient: always return "families-2025" lookup key, remove PreProcessFamiliesPreMigrationPlan safeguard, remove IFeatureService dependency
  • Remove milestone3 parameter from AlignOrganizationSubscriptionConcernsAsync, simplify guard clause
  • Update tests: remove flag mocking, delete flag-disabled test cases

Simplify FamiliesAnnually2025 lookup to always return "families-2025".
Remove PreProcessFamiliesPreMigrationPlan deployment safeguard method
and its call sites. Remove unused IFeatureService constructor dependency.
…rOrganizationAsync

Remove milestone3 variable and parameter from
AlignOrganizationSubscriptionConcernsAsync. Simplify guard clause
to only check plan type.
Remove IFeatureService from test setup. Delete tests for flag-disabled
safeguard behavior. Clean up remaining test names.
Remove all feature flag mock setup lines for PM26462_Milestone_3.
Delete test methods that verified flag-disabled behavior.
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Mar 30, 2026

Logo
Checkmarx One – Scan Summary & Detailsd174ef49-d4cc-43d0-8893-85b276b1ee32

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

@cturnbull-bitwarden cturnbull-bitwarden changed the title Remove pm-26462-milestone-3 flagged logic from server [PM-31909] Remove m3 flagged logic Mar 30, 2026
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 30, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 58.71%. Comparing base (7ef83de) to head (a031497).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7352      +/-   ##
==========================================
- Coverage   58.71%   58.71%   -0.01%     
==========================================
  Files        2069     2069              
  Lines       91218    91207      -11     
  Branches     8125     8123       -2     
==========================================
- Hits        53563    53552      -11     
  Misses      35741    35741              
  Partials     1914     1914              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@cturnbull-bitwarden cturnbull-bitwarden marked this pull request as ready for review March 31, 2026 16:01
@cturnbull-bitwarden cturnbull-bitwarden requested a review from a team as a code owner March 31, 2026 16:01
@cturnbull-bitwarden cturnbull-bitwarden added ai-review Request a Claude code review and removed ai-review Request a Claude code review labels Mar 31, 2026
Copy link
Copy Markdown
Collaborator

@sbrown-livefront sbrown-livefront left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment thread test/Core.Test/Billing/Pricing/PricingClientTests.cs Outdated
@sonarqubecloud
Copy link
Copy Markdown

@cturnbull-bitwarden cturnbull-bitwarden merged commit 9e49955 into main Apr 14, 2026
41 of 42 checks passed
@cturnbull-bitwarden cturnbull-bitwarden deleted the billing/PM-31909/remove-m3-flagged-logic-server branch April 14, 2026 19:32
ike-kottlowski pushed a commit that referenced this pull request Apr 17, 2026
* Remove pm-26462-milestone-3 flag from PricingClient

Simplify FamiliesAnnually2025 lookup to always return "families-2025".
Remove PreProcessFamiliesPreMigrationPlan deployment safeguard method
and its call sites. Remove unused IFeatureService constructor dependency.

* Remove pm-26462-milestone-3 flag from UpcomingInvoiceHandler.HandleForOrganizationAsync

Remove milestone3 variable and parameter from
AlignOrganizationSubscriptionConcernsAsync. Simplify guard clause
to only check plan type.

* Update PricingClientTests after pm-26462-milestone-3 removal

Remove IFeatureService from test setup. Delete tests for flag-disabled
safeguard behavior. Clean up remaining test names.

* Update UpcomingInvoiceHandlerTests after pm-26462-milestone-3 removal

Remove all feature flag mock setup lines for PM26462_Milestone_3.
Delete test methods that verified flag-disabled behavior.

* Merge GetPlan lookup key test regions into one
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