Merge remote-tracking branch 'upstream/main' into becca/default-icon

ee/desktop/user/menu/menu.go

@@ -22,6 +22,7 @@ const (
 	DefaultIcon             menuIcon = "default"
 	TriangleExclamationIcon menuIcon = "triangle-exclamation"
 	CircleXIcon             menuIcon = "circle-x"
+	CircleDotIcon           menuIcon = "circle-dot"
 )
 
 // MenuData encapsulates a menu bar icon and accessible menu items

ee/desktop/user/menu/menu_icon.go

@@ -42,6 +42,17 @@ func getIcon(icon menuIcon) []byte {
 			assets.MenubarCircleXMonochromeIco,
 			assets.MenubarCircleXMonochromePng,
 		)
+	case CircleDotIcon:
+		return chooseIcon(
+			assets.MenubarCircleDotDarkmodeIco,
+			assets.MenubarCircleDotDarkmodePng,
+			assets.MenubarCircleDotLightmodeIco,
+			assets.MenubarCircleDotLightmodePng,
+			assets.MenubarCircleDotLightmodeShadowIco,
+			assets.MenubarCircleDotLightmodeShadowPng,
+			assets.MenubarCircleDotMonochromeIco,
+			assets.MenubarCircleDotMonochromePng,
+		)
 	case DefaultIcon:
 		fallthrough
 	default:

ee/desktop/user/menu/menu_icon_test.go

@@ -33,6 +33,10 @@ func Test_getIcon(t *testing.T) {
 			name: "CircleX",
 			icon: CircleXIcon,
 		},
+		{
+			name: "CircleDot",
+			icon: CircleDotIcon,
+		},
 	}
 	for _, tt := range tests {
 		tt := tt

ee/tuf/library_manager.go

@@ -18,6 +18,7 @@ import (
 	"github.com/Masterminds/semver"
 	"github.com/kolide/kit/fsutil"
 	"github.com/kolide/launcher/pkg/autoupdate"
+	"github.com/kolide/launcher/pkg/backoff"
 	"github.com/kolide/launcher/pkg/traces"
 	"github.com/theupdateframework/go-tuf/data"
 	tufutil "github.com/theupdateframework/go-tuf/util"
@@ -100,7 +101,9 @@ func (ulm *updateLibraryManager) AddToLibrary(binary autoupdatableBinary, curren
 			return
 		}
 		dirToRemove := filepath.Dir(stagedUpdatePath)
-		if err := os.RemoveAll(dirToRemove); err != nil {
+		if err := backoff.WaitFor(func() error {
+			return os.RemoveAll(dirToRemove)
+		}, 500*time.Millisecond, 100*time.Millisecond); err != nil {
 			ulm.slogger.Log(context.TODO(), slog.LevelWarn,
 				"could not remove temp staging directory",
 				"directory", dirToRemove,
@@ -187,13 +190,17 @@ func (ulm *updateLibraryManager) moveVerifiedUpdate(binary autoupdatableBinary,
 		return fmt.Errorf("could not create temporary directory for untarring and validating new update: %w", err)
 	}
 	defer func() {
-		// In case of error, clean up the staged version
-		if err := os.RemoveAll(stagedVersionedDirectory); err != nil {
-			ulm.slogger.Log(context.TODO(), slog.LevelWarn,
-				"could not remove staged update",
-				"directory", stagedVersionedDirectory,
-				"err", err,
-			)
+		// In case of error, clean up the staged version and its directory
+		if _, err := os.Stat(stagedVersionedDirectory); err == nil || !os.IsNotExist(err) {
+			if err := backoff.WaitFor(func() error {
+				return os.RemoveAll(stagedVersionedDirectory)
+			}, 500*time.Millisecond, 100*time.Millisecond); err != nil {
+				ulm.slogger.Log(context.TODO(), slog.LevelWarn,
+					"could not remove staged update",
+					"directory", stagedVersionedDirectory,
+					"err", err,
+				)
+			}
 		}
 	}()
 

ee/ui/assets/assets.go

@@ -19,6 +19,30 @@ var KolideIco []byte
 //go:embed kolide.png
 var KolidePng []byte
 
+//go:embed menubar-circle-dot-darkmode.ico
+var MenubarCircleDotDarkmodeIco []byte
+
+//go:embed menubar-circle-dot-darkmode.png
+var MenubarCircleDotDarkmodePng []byte
+
+//go:embed menubar-circle-dot-lightmode.ico
+var MenubarCircleDotLightmodeIco []byte
+
+//go:embed menubar-circle-dot-lightmode.png
+var MenubarCircleDotLightmodePng []byte
+
+//go:embed menubar-circle-dot-lightmode-shadow.ico
+var MenubarCircleDotLightmodeShadowIco []byte
+
+//go:embed menubar-circle-dot-lightmode-shadow.png
+var MenubarCircleDotLightmodeShadowPng []byte
+
+//go:embed menubar-circle-dot-monochrome.ico
+var MenubarCircleDotMonochromeIco []byte
+
+//go:embed menubar-circle-dot-monochrome.png
+var MenubarCircleDotMonochromePng []byte
+
 //go:embed menubar-circle-x-darkmode.ico
 var MenubarCircleXDarkmodeIco []byte