Skip to content

Cherry-pick: Adding name to software checksum for mac software#34289

Merged
ksykulev merged 1 commit into
rc-minor-fleet-v4.75.0from
cp-34097-75
Oct 15, 2025
Merged

Cherry-pick: Adding name to software checksum for mac software#34289
ksykulev merged 1 commit into
rc-minor-fleet-v4.75.0from
cp-34097-75

Conversation

@ksykulev
Copy link
Copy Markdown
Contributor

Back ported: #34097 to be compatible with the 4.75.0 release.
Original issue #28788

Back ported: #34097 to be compatible with the 4.75.0 release.
Original issue #28788
@ksykulev ksykulev requested a review from a team as a code owner October 15, 2025 16:39
@codecov
Copy link
Copy Markdown

codecov Bot commented Oct 15, 2025

Codecov Report

❌ Patch coverage is 87.03704% with 21 lines in your changes missing coverage. Please review.
⚠️ Please upload report for BASE (rc-minor-fleet-v4.75.0@f1cad2f). Learn more about missing BASE report.

Files with missing lines Patch % Lines
server/datastore/mysql/software.go 87.85% 11 Missing and 2 partials ⚠️
...51015103505_AddNameToSoftwareCheckumCalculation.go 84.90% 6 Missing and 2 partials ⚠️
Additional details and impacted files
@@                    Coverage Diff                    @@
##             rc-minor-fleet-v4.75.0   #34289   +/-   ##
=========================================================
  Coverage                          ?   64.03%           
=========================================================
  Files                             ?     2068           
  Lines                             ?   207138           
  Branches                          ?     6682           
=========================================================
  Hits                              ?   132649           
  Misses                            ?    64056           
  Partials                          ?    10433           
Flag Coverage Δ
backend 65.14% <87.03%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ 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.

Copy link
Copy Markdown
Contributor

@sgress454 sgress454 left a comment

Choose a reason for hiding this comment

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

As with the 4.74.1 cherry pick, the only things I see are extension_for -> browser and the weird numArguments changes in the original patch here and here (you have to expand the software diff in the patch to see them)

// however, eventually they should be updated. This is trading off immediate consistency
// for less lock contention.
lockQuery := fmt.Sprintf(
"SELECT id, name FROM software WHERE id IN (%s) ORDER BY id FOR UPDATE SKIP LOCKED",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👋 SKIP LOCKED, we hardly knew ye

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

😢

@ksykulev ksykulev merged commit 4a04c4c into rc-minor-fleet-v4.75.0 Oct 15, 2025
36 checks passed
@ksykulev ksykulev deleted the cp-34097-75 branch October 15, 2025 18:06
@ksykulev
Copy link
Copy Markdown
Contributor Author

I just tested this on my local machine, I am getting the same results as with the work from main.

select name, bundle_identifier from software_titles where name like 'Slack%';
+--------------+----------------------------------+
| name         | bundle_identifier                |
+--------------+----------------------------------+
| Slack        | com.tinyspeck.slackmacgap        |
| Slack Helper | com.tinyspeck.slackmacgap.helper |
+--------------+----------------------------------+
2 rows in set (0.01 sec)

(root@[localhost]:3306) [fleet]
> select name, bundle_identifier fselect name, bundle_identifier, title_id from software where name like 'Slack%';
+-------------------------+----------------------------------+----------+
| name                    | bundle_identifier                | title_id |
+-------------------------+----------------------------------+----------+
| Slack                   | com.tinyspeck.slackmacgap        |     1646 |
| Slack Helper            | com.tinyspeck.slackmacgap.helper |     1341 |
| Slack Helper (GPU)      | com.tinyspeck.slackmacgap.helper |     1341 |
| Slack Helper (Plugin)   | com.tinyspeck.slackmacgap.helper |     1341 |
| Slack Helper (Renderer) | com.tinyspeck.slackmacgap.helper |     1341 |
+-------------------------+----------------------------------+----------+
5 rows in set (0.01 sec)
> select name, bundle_identifier, title_id from software where name like 'Postman%';
+---------------------------+----------------------------+----------+
| name                      | bundle_identifier          | title_id |
+---------------------------+----------------------------+----------+
| Postman Helper (GPU)      | com.postmanlabs.mac.helper |     1671 |
| Postman Helper (Renderer) | com.postmanlabs.mac.helper |     1671 |
+---------------------------+----------------------------+----------+
2 rows in set (0.00 sec)

(root@[localhost]:3306) [fleet]
> select id, name, bundle_identifier from software_titles where name like 'Postman%';
+------+----------------+----------------------------+
| id   | name           | bundle_identifier          |
+------+----------------+----------------------------+
| 1671 | Postman Helper | com.postmanlabs.mac.helper |
+------+----------------+----------------------------+
1 row in set (0.00 sec)

georgekarrv pushed a commit that referenced this pull request Oct 21, 2025
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.

2 participants