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

fix: use a new strategy for finding the app name in case the title is wrong #25297

Merged
merged 9 commits into from
Jan 10, 2025

Conversation

jahzielv
Copy link
Contributor

@jahzielv jahzielv commented Jan 9, 2025

For #24873

Checklist for submitter

If some of the following don't apply, delete the relevant line.

  • Changes file added for user-visible changes in changes/, orbit/changes/ or ee/fleetd-chrome/changes.
    See Changes files for more information.
  • Added/updated automated tests
  • A detailed QA plan exists on the associated ticket (if it isn't there, work with the product group's QA engineer to add it)
  • Manual QA for all new/changed functionality

// try to get the name some other way.
var knownBadNames = map[string]struct{}{
"DISTRIBUTION_TITLE": {},
"MacFULL": {},
Copy link
Contributor Author

Choose a reason for hiding this comment

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

MacFULL and SU_TITLE are two other "bad names" that @jmwatts found, as we find more we can add them to this set.

Copy link
Member

Choose a reason for hiding this comment

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

Guessing this fix worked on the other packages @jmwatts found? Or do some of those wind up needing to fall all the way back to bundle ID?

@jahzielv jahzielv marked this pull request as ready for review January 9, 2025 21:32
@jahzielv jahzielv requested a review from a team as a code owner January 9, 2025 21:32
@iansltx iansltx assigned iansltx and unassigned ksykulev Jan 9, 2025
Copy link
Member

@iansltx iansltx left a comment

Choose a reason for hiding this comment

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

Have some nits/questions. Approach LGTM, and handling this as a fallback after we've done the fallback from name to title seems fine (would've implemented it differently but this is probably better tbh).

changes/24873-pkg-name Outdated Show resolved Hide resolved
// try to get the name some other way.
var knownBadNames = map[string]struct{}{
"DISTRIBUTION_TITLE": {},
"MacFULL": {},
Copy link
Member

Choose a reason for hiding this comment

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

Guessing this fix worked on the other packages @jmwatts found? Or do some of those wind up needing to fall all the way back to bundle ID?

pkg/file/xar.go Show resolved Hide resolved
Copy link

codecov bot commented Jan 9, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 63.55%. Comparing base (9c2d68c) to head (ba0fb39).
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #25297      +/-   ##
==========================================
+ Coverage   63.54%   63.55%   +0.01%     
==========================================
  Files        1618     1618              
  Lines      154433   154459      +26     
  Branches     4037     4037              
==========================================
+ Hits        98132    98174      +42     
+ Misses      48562    48551      -11     
+ Partials     7739     7734       -5     
Flag Coverage Δ
backend 64.40% <100.00%> (+0.01%) ⬆️

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.

@jahzielv jahzielv requested a review from iansltx January 9, 2025 22:57
Copy link
Contributor

@ksykulev ksykulev left a comment

Choose a reason for hiding this comment

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

Looks good to me.

pkg/file/xar.go Show resolved Hide resolved
pkg/file/xar.go Show resolved Hide resolved
@jahzielv
Copy link
Contributor Author

tests are busted due to an unrelated issue, but I will re-trigger once that is addressed just to be sure.

@jahzielv jahzielv merged commit cf3a3cf into main Jan 10, 2025
37 checks passed
@jahzielv jahzielv deleted the 24873-pkg-name branch January 10, 2025 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants