From feb2e57abafa7f0b8b2a54625dda655cec29214c Mon Sep 17 00:00:00 2001 From: Jonathan Katz Date: Fri, 19 Jun 2026 16:27:12 -0400 Subject: [PATCH] =?UTF-8?q?Fix=20TestUpgradeCodesFromMaintainedApps=20afte?= =?UTF-8?q?r=20Cloudflare=20WARP=E2=86=92One=20rename?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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). --- server/service/integration_enterprise_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/service/integration_enterprise_test.go b/server/service/integration_enterprise_test.go index cbb2d87bfc5..757ad9ae796 100644 --- a/server/service/integration_enterprise_test.go +++ b/server/service/integration_enterprise_test.go @@ -21482,7 +21482,7 @@ func (s *integrationEnterpriseTestSuite) TestUpgradeCodesFromMaintainedApps() { // verify WARP is in `fleet_maintained_apps` table but not in `software_installers` var warpFmaId uint mysqltest.ExecAdhocSQL(t, s.ds, func(q sqlx.ExtContext) error { - return sqlx.GetContext(ctx, q, &warpFmaId, "SELECT id FROM fleet_maintained_apps WHERE name = 'Cloudflare WARP' AND platform = 'windows'") + return sqlx.GetContext(ctx, q, &warpFmaId, "SELECT id FROM fleet_maintained_apps WHERE name = 'Cloudflare One' AND platform = 'windows'") }) require.NotNil(t, warpFmaId) @@ -21500,7 +21500,7 @@ func (s *integrationEnterpriseTestSuite) TestUpgradeCodesFromMaintainedApps() { // Add WARP for Windows var warpAppId uint mysqltest.ExecAdhocSQL(t, s.ds, func(q sqlx.ExtContext) error { - return sqlx.GetContext(ctx, q, &warpAppId, "SELECT id FROM fleet_maintained_apps WHERE name = 'Cloudflare WARP' and platform = 'windows'") + return sqlx.GetContext(ctx, q, &warpAppId, "SELECT id FROM fleet_maintained_apps WHERE name = 'Cloudflare One' and platform = 'windows'") }) var addMAresp addFleetMaintainedAppResponse