Don't run legacy autoupdater after transition

cmd/launcher/launcher.go

@@ -382,7 +382,7 @@ func runLauncher(ctx context.Context, cancel func(), opts *launcher.Options) err
 		runGroup.Add("localserver", ls.Start, ls.Interrupt)
 	}
 
-	// If the autoupdater is enabled, enable it for both osquery and launcher
+	// If autoupdating is enabled, run the new autoupdater
 	if k.Autoupdate() {
 		// Create a new TUF autoupdater
 		metadataClient := http.DefaultClient
@@ -398,12 +398,15 @@ func runLauncher(ctx context.Context, cancel func(), opts *launcher.Options) err
 			tuf.WithOsqueryRestart(runnerRestart),
 		)
 		if err != nil {
-			// Log the error, but don't return it -- the new TUF autoupdater is not critical yet
-			level.Debug(logger).Log("msg", "could not create TUF autoupdater", "err", err)
-		} else {
-			runGroup.Add("tufAutoupdater", tufAutoupdater.Execute, tufAutoupdater.Interrupt)
+			return fmt.Errorf("creating TUF autoupdater updater: %w", err)
 		}
 
+		runGroup.Add("tufAutoupdater", tufAutoupdater.Execute, tufAutoupdater.Interrupt)
+	}
+
+	// Run the legacy autoupdater only if autoupdating is enabled and the given channel hasn't moved
+	// to the new autoupdater yet.
+	if k.Autoupdate() && !tuf.ChannelUsesNewAutoupdater(k.UpdateChannel()) {
 		osqueryUpdaterconfig := &updater.UpdaterConfig{
 			Logger:             logger,
 			RootDirectory:      rootDirectory,
@@ -413,7 +416,7 @@ func runLauncher(ctx context.Context, cancel func(), opts *launcher.Options) err
 			MirrorURL:          k.MirrorServerURL(),
 			NotaryPrefix:       k.NotaryPrefix(),
 			HTTPClient:         httpClient,
-			InitialDelay:       k.AutoupdateInitialDelay() + k.AutoupdateInterval()/2 + 5*time.Minute,
+			InitialDelay:       k.AutoupdateInitialDelay() + k.AutoupdateInterval()/2,
 			SigChannel:         sigChannel,
 		}
 
@@ -433,7 +436,7 @@ func runLauncher(ctx context.Context, cancel func(), opts *launcher.Options) err
 			MirrorURL:          k.MirrorServerURL(),
 			NotaryPrefix:       k.NotaryPrefix(),
 			HTTPClient:         httpClient,
-			InitialDelay:       k.AutoupdateInitialDelay() + 5*time.Minute,
+			InitialDelay:       k.AutoupdateInitialDelay(),
 			SigChannel:         sigChannel,
 		}
 

pkg/autoupdate/tuf/autoupdate.go

@@ -317,7 +317,7 @@ func (ta *TufAutoupdater) checkForUpdate() error {
 
 	// Only perform restarts if we're configured to use this new autoupdate library,
 	// to prevent performing unnecessary restarts.
-	if !usingNewAutoupdater(ta.channel) {
+	if !ChannelUsesNewAutoupdater(ta.channel) {
 		return nil
 	}
 

pkg/autoupdate/tuf/library_lookup.go

@@ -54,7 +54,7 @@ func UsingNewAutoupdater() bool {
 		return false
 	}
 
-	return usingNewAutoupdater(cfg.channel)
+	return ChannelUsesNewAutoupdater(cfg.channel)
 }
 
 // getAutoupdateConfig reads launcher's config file to determine the configuration values
@@ -98,7 +98,7 @@ func getAutoupdateConfig() (*autoupdateConfig, error) {
 // as its version.
 func CheckOutLatest(binary autoupdatableBinary, rootDirectory string, updateDirectory string, channel string, logger log.Logger) (*BinaryUpdateInfo, error) {
 	// TODO: Remove this check once we decide to roll out the new autoupdater more broadly
-	if !usingNewAutoupdater(channel) {
+	if !ChannelUsesNewAutoupdater(channel) {
 		return nil, fmt.Errorf("not rolling out new TUF to channel %s that should still use legacy autoupdater", channel)
 	}
 
@@ -119,7 +119,7 @@ func CheckOutLatest(binary autoupdatableBinary, rootDirectory string, updateDire
 	return mostRecentVersion(binary, updateDirectory)
 }
 
-func usingNewAutoupdater(channel string) bool {
+func ChannelUsesNewAutoupdater(channel string) bool {
 	_, ok := channelsUsingNewAutoupdater[channel]
 	return ok
 }

pkg/autoupdate/tuf/library_lookup_test.go

@@ -180,7 +180,7 @@ func Test_mostRecentVersion_ReturnsErrorOnNoUpdatesDownloaded(t *testing.T) {
 	}
 }
 
-func Test_usingNewAutoupdater(t *testing.T) {
+func TestChannelUsesNewAutoupdater(t *testing.T) {
 	t.Parallel()
 
 	channelsForTest := []struct {
@@ -210,6 +210,6 @@ func Test_usingNewAutoupdater(t *testing.T) {
 	}
 
 	for _, channel := range channelsForTest {
-		require.Equal(t, channel.usesNewAutoupdater, usingNewAutoupdater(channel.channelName))
+		require.Equal(t, channel.usesNewAutoupdater, ChannelUsesNewAutoupdater(channel.channelName))
 	}
 }