feat: Create change requests for segments #4265

zachaysan · 2024-06-28T14:34:54Z

Changes

This PR works in concert with this other PR on the workflows repo.

This PR introduces many changes to support the addition of segments in change requests. The primary logic around transferring change request segment data into the target segment data involves re-using logic that was originally written for the segment versioning.

Due to the primary manager (.objects) now including versioned or change requested segments copies, some amount of work was necessary to get all the aspects of the existing code to pass. The .live_objects manager is used for segments that are not merely versions or change request segments but in some places manually filtering segments was the only solution.

How did you test this code?

Added tests across the test suite, including new tests for duplicate segments to test filtering, as well as tests located in with the other workflows PR to get coverage of edge cases.

vercel · 2024-06-28T14:34:56Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
docs	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Nov 13, 2024 7:49pm
flagsmith-frontend-preview	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Nov 13, 2024 7:49pm
flagsmith-frontend-staging	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Nov 13, 2024 7:49pm

github-actions · 2024-06-28T14:38:10Z

Uffizzi Ephemeral Environment `deployment-53620`

☁️ https://app.uffizzi.com/github.com/Flagsmith/flagsmith/pull/4265

📄 View Application Logs etc.

What is Uffizzi? Learn more!

codecov · 2024-06-28T14:43:22Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.35%. Comparing base (4a310b0) to head (ce7fca8).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #4265      +/-   ##
==========================================
+ Coverage   97.33%   97.35%   +0.02%     
==========================================
  Files        1182     1187       +5     
  Lines       41267    41245      -22     
==========================================
- Hits        40167    40156      -11     
+ Misses       1100     1089      -11

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

…for_segments

…s_for_segments

zachaysan · 2024-10-23T19:43:15Z

Added a couple of minor comments, but this looks good on the whole. I guess the only question I have is whether there should also be a bunch of removed code here based on the stuff we moved to the flagsmith-common repo?

Ok it took a while, but I've updated the repo with references to the flagsmith-common repo and of course removed the now unnecessary code.

matthewelwell

Added a few minor comments

api/permissions/migrations/0001_initial.py

matthewelwell · 2024-10-25T13:52:51Z

api/pyproject.toml

@@ -196,7 +196,7 @@ flagsmith-ldap = { git = "https://github.com/flagsmith/flagsmith-ldap", tag = "v
 optional = true

 [tool.poetry.group.workflows.dependencies]
-workflows-logic = { git = "https://github.com/flagsmith/flagsmith-workflows", tag = "v2.5.0" }
+workflows-logic = { git = "https://github.com/flagsmith/flagsmith-workflows", branch = "feat/add_change_requests_to_segments" }


Just a reminder that we'll need to update this before the merge.

api/segments/views.py

api/tests/unit/segments/test_unit_segments_views.py

…_for_segments

matthewelwell

This all looks good to me now - there's just the (new?) conflicts to resolve, and the CI failures.

…s_for_segments

zachaysan · 2024-11-13T20:06:50Z

This all looks good to me now - there's just the (new?) conflicts to resolve, and the CI failures.

Conflicts and CI failures have been resolved. Are we good to merge (other than the update to the workflows repo which needs to be merged itself)?

matthewelwell

I'm approving this now, but we need to consider the release plan as this is quite a meaty change. It will need a fair amount of regression testing in staging.

zachaysan added 3 commits June 28, 2024 14:28

Add change request to Segment

1ac4b83

Merge branch 'main' into feat/create_change_requests_for_segments

365e8a0

Add migration for adding change requests to segments

d78bc71

zachaysan requested a review from a team as a code owner June 28, 2024 14:34

zachaysan requested review from khvn26 and removed request for a team June 28, 2024 14:34

zachaysan removed the request for review from khvn26 June 28, 2024 14:35

github-actions bot added api Issue related to the REST API feature New feature or request labels Jun 28, 2024

khvn26 and others added 7 commits June 28, 2024 17:37

chore(build): API test image

98c56f4

Also publish flagsmith-api-test for main

4e7421f

fix target stage name

d2fda11

don't scan test images

c7c3ed0

Add shallow clone

e15c0cc

Merge branch 'chore/api-test-image' into feat/create_change_requests_…

12dcae8

…for_segments

Merge branch 'main' into feat/create_change_requests_for_segments

08b693f

github-actions bot added feature New feature or request and removed feature New feature or request labels Jul 1, 2024

vercel bot deployed to Preview – flagsmith-frontend-preview July 1, 2024 13:18 View deployment

vercel bot deployed to Preview – flagsmith-frontend-staging July 1, 2024 13:18 View deployment

Switch to optional due to string issue

d9e3a45

github-actions bot added feature New feature or request and removed feature New feature or request labels Jul 1, 2024

zachaysan added 3 commits July 17, 2024 14:54

Set version to None

edd2eeb

Add missing attributes to shallow clone

8e8bccb

Fix conflicts and merge branch 'main' into feat/create_change_request…

0255717

…s_for_segments

github-actions bot removed the feature New feature or request label Jul 17, 2024

github-actions bot added feature New feature or request and removed feature New feature or request labels Oct 23, 2024

zachaysan requested a review from matthewelwell October 23, 2024 19:43

matthewelwell removed the request for review from novakzaballa October 25, 2024 13:23

matthewelwell reviewed Oct 25, 2024

View reviewed changes

zachaysan requested a review from matthewelwell October 28, 2024 13:43

zachaysan added 2 commits October 29, 2024 15:46

Update segment manager calls

f02d229

Fix conflict and merge branch 'main' into feat/create_change_requests…

a76092c

…_for_segments

github-actions bot added feature New feature or request and removed feature New feature or request labels Nov 1, 2024

vercel bot deployed to Preview – docs November 1, 2024 18:07 View deployment

vercel bot deployed to Preview – flagsmith-frontend-preview November 1, 2024 18:07 View deployment

vercel bot deployed to Preview – flagsmith-frontend-staging November 1, 2024 18:07 View deployment

matthewelwell reviewed Nov 5, 2024

View reviewed changes

zachaysan added 3 commits November 13, 2024 16:49

Add filter for live segments

e4f1551

Just use the default manager and filter in code

f47922e

Fix conflicts and merge branch 'main' into feat/create_change_request…

ce7fca8

…s_for_segments

github-actions bot added feature New feature or request and removed feature New feature or request labels Nov 13, 2024

vercel bot deployed to Preview – docs November 13, 2024 19:47 View deployment

vercel bot deployed to Preview – flagsmith-frontend-staging November 13, 2024 19:49 View deployment

vercel bot deployed to Preview – flagsmith-frontend-preview November 13, 2024 19:49 View deployment

zachaysan requested a review from matthewelwell November 13, 2024 20:06

matthewelwell approved these changes Nov 14, 2024

View reviewed changes

matthewelwell assigned kyle-ssg Nov 19, 2024

matthewelwell linked an issue Nov 19, 2024 that may be closed by this pull request

Change requests for segments #4044

Open

matthewelwell unassigned kyle-ssg Nov 19, 2024

matthewelwell mentioned this pull request Nov 19, 2024

UI work to add Change Requests for segments #4844

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Create change requests for segments #4265

feat: Create change requests for segments #4265

zachaysan commented Jun 28, 2024 •

edited

Loading

vercel bot commented Jun 28, 2024 •

edited

Loading

github-actions bot commented Jun 28, 2024 •

edited

Loading

codecov bot commented Jun 28, 2024 •

edited

Loading

zachaysan commented Oct 23, 2024

matthewelwell left a comment

matthewelwell Oct 25, 2024

zachaysan Oct 28, 2024

matthewelwell left a comment

zachaysan commented Nov 13, 2024

matthewelwell left a comment

feat: Create change requests for segments #4265

Are you sure you want to change the base?

feat: Create change requests for segments #4265

Conversation

zachaysan commented Jun 28, 2024 • edited Loading

Changes

How did you test this code?

vercel bot commented Jun 28, 2024 • edited Loading

github-actions bot commented Jun 28, 2024 • edited Loading

Uffizzi Ephemeral Environment deployment-53620

codecov bot commented Jun 28, 2024 • edited Loading

Codecov Report

zachaysan commented Oct 23, 2024

matthewelwell left a comment

Choose a reason for hiding this comment

matthewelwell Oct 25, 2024

Choose a reason for hiding this comment

zachaysan Oct 28, 2024

Choose a reason for hiding this comment

matthewelwell left a comment

Choose a reason for hiding this comment

zachaysan commented Nov 13, 2024

matthewelwell left a comment

Choose a reason for hiding this comment

zachaysan commented Jun 28, 2024 •

edited

Loading

vercel bot commented Jun 28, 2024 •

edited

Loading

github-actions bot commented Jun 28, 2024 •

edited

Loading

Uffizzi Ephemeral Environment `deployment-53620`

codecov bot commented Jun 28, 2024 •

edited

Loading