Skip to content

Fix TestUpgradeCodesFromMaintainedApps after Cloudflare WARP rename#47953

Merged
jkatz01 merged 1 commit into
mainfrom
jk-fix-TestUpgradeCodesFromMaintainedApps-rename
Jun 19, 2026
Merged

Fix TestUpgradeCodesFromMaintainedApps after Cloudflare WARP rename#47953
jkatz01 merged 1 commit into
mainfrom
jk-fix-TestUpgradeCodesFromMaintainedApps-rename

Conversation

@jkatz01

@jkatz01 jkatz01 commented Jun 19, 2026

Copy link
Copy Markdown
Member

Related issue: Resolves #
Cloudflare WARP was renamed to Cloudflare One, and this test used it's name in the fleet_maintained_apps table

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.

  • Input data is properly validated, SELECT * is avoided, SQL injection is prevented (using placeholders for values in statements), JS inline code is prevented especially for url redirects, and untrusted data interpolated into shell scripts/commands is validated against shell metacharacters.

  • Timeouts are implemented and retries are limited to avoid infinite loops

  • If paths of existing endpoints are modified without backwards compatibility, checked the frontend/CLI for any necessary changes

Testing

Summary by CodeRabbit

  • Tests
    • Updated Windows WARP integration tests to use current product naming conventions when querying fleet-maintained applications, ensuring test accuracy across both verification and setup phases.

The Cloudflare WARP FMA display name was renamed to 'Cloudflare One' in
#47939, but TestUpgradeCodesFromMaintainedApps still looked up the FMA by
name = 'Cloudflare WARP', so it failed with 'sql: no rows in result set'.
Update both lookups to 'Cloudflare One' (the windows unique_identifier,
'Cloudflare One Client', is unchanged).
@allenhouchins

Copy link
Copy Markdown
Member

@jkatz01 thanks! I was just putting in a PR for this. Sorry for breaking it!

@jkatz01 jkatz01 marked this pull request as ready for review June 19, 2026 20:40
@jkatz01 jkatz01 requested a review from a team as a code owner June 19, 2026 20:40

@claude claude Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Claude Code Review

This repository is configured for manual code reviews. Comment @claude review to trigger a review and subscribe this PR to future pushes, or @claude review once for a one-time review.

Tip: disable this comment in your organization's Code Review settings.

@coderabbitai

coderabbitai Bot commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 7a54c9a2-fed5-48d8-9fb1-647c1c2c5f2e

📥 Commits

Reviewing files that changed from the base of the PR and between 0fc1cb7 and feb2e57.

📒 Files selected for processing (1)
  • server/service/integration_enterprise_test.go

Walkthrough

Two SQL queries inside server/service/integration_enterprise_test.go that look up a Windows entry in the fleet_maintained_apps table have their name filter changed from Cloudflare WARP to Cloudflare One. One query verifies the presence or absence of the record; the other fetches the fleet maintained app ID during test setup. No production code, interfaces, or exported symbols are modified.

Possibly related PRs

  • fleetdm/fleet#47939: Renames Cloudflare's fleet maintained app from "Cloudflare WARP" to "Cloudflare One" in the same test context, which is the upstream change these test query updates align with.
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title accurately describes the main change: fixing a test that broke due to Cloudflare WARP being renamed to Cloudflare One.
Description check ✅ Passed The description explains the issue and fix, includes checked testing boxes, and notes the changes file is not applicable. However, it lacks a specific issue number and some template sections remain incomplete.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch jk-fix-TestUpgradeCodesFromMaintainedApps-rename

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 ast-grep (0.43.0)
server/service/integration_enterprise_test.go

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@jkatz01

jkatz01 commented Jun 19, 2026

Copy link
Copy Markdown
Member Author

@allenhouchins no problem, pretty random thing for a test to use 😅

@codecov

codecov Bot commented Jun 19, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 67.31%. Comparing base (0301aea) to head (feb2e57).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #47953      +/-   ##
==========================================
- Coverage   67.31%   67.31%   -0.01%     
==========================================
  Files        3655     3655              
  Lines      231251   231251              
  Branches    12075    12075              
==========================================
- Hits       155667   155665       -2     
- Misses      61620    61621       +1     
- Partials    13964    13965       +1     
Flag Coverage Δ
backend 68.94% <ø> (-0.01%) ⬇️

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

☔ View full report in Codecov by Harness.
📢 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.

@jkatz01 jkatz01 merged commit f138f6b into main Jun 19, 2026
47 of 49 checks passed
@jkatz01 jkatz01 deleted the jk-fix-TestUpgradeCodesFromMaintainedApps-rename branch June 19, 2026 21:02
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