feat: plugins: Implement automated dev-plugins workflow

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "headlamp",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "Easy-to-use and extensible Kubernetes web UI",
   "main": "electron/main.js",
   "homepage": "https://github.com/kubernetes-sigs/headlamp/#readme",

app/windows/chocolatey/headlamp.nuspec

@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>headlamp</id>
-    <version>0.33.0</version>
+    <version>0.34.0</version>
     <packageSourceUrl>https://github.com/kubernetes-sigs/headlamp/tree/main/app/windows/chocolatey</packageSourceUrl>
     <title>Headlamp</title>
     <authors>Kinvolk</authors>

app/windows/chocolatey/tools/chocolateyinstall.ps1

@@ -1,8 +1,8 @@
 $ErrorActionPreference = 'Stop'; # stop on all errors
 $toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
-$headlampVersion = '0.33.0'
+$headlampVersion = '0.34.0'
 $url = "https://github.com/kubernetes-sigs/headlamp/releases/download/v${headlampVersion}/Headlamp-${headlampVersion}-win-x64.exe"
-$checksum = 'a438191fcb08b82afcc4c5cb203808b341a8117dcd21d921d94f5f01bba19980'
+$checksum = 'ce4d0a5c7566ed6c97042b6e3245b91e5a3d8e8169b669a88d4d9386db7650b3'
 
 $packageArgs = @{
   packageName   = $env:ChocolateyPackageName

backend/cmd/headlamp.go

@@ -290,6 +290,16 @@
 
 	r.PathPrefix("/plugins/").Handler(pluginHandler)
 
+	// Serve dev-plugins
+	devPluginDir := filepath.Join(filepath.Dir(config.PluginDir), "dev-plugins")
+	if _, err := os.Stat(devPluginDir); err == nil {
+		devPluginHandler := http.StripPrefix(config.BaseURL+"/dev-plugins/", http.FileServer(http.Dir(devPluginDir)))
+		if !config.UseInCluster {
+			devPluginHandler = serveWithNoCacheHeader(devPluginHandler)
+		}
+		r.PathPrefix("/dev-plugins/").Handler(devPluginHandler)
+	}
+
 	if config.StaticPluginDir != "" {
 		staticPluginsHandler := http.StripPrefix(config.BaseURL+"/static-plugins/",
 			http.FileServer(http.Dir(config.StaticPluginDir)))
@@ -1524,8 +1534,6 @@
 	}
 
 	for _, context := range contexts {
-		context := context
-
 		if context.Error != "" {
 			clusters = append(clusters, Cluster{
 				Name:  context.Name,
@@ -1580,8 +1588,6 @@
 	var setupErrors []error
 
 	for _, context := range contexts {
-		context := context
-
 		info := context.KubeContext.Extensions["headlamp_info"]
 		if info != nil {
 			// Convert the runtime.Unknown object to a byte slice
@@ -2042,8 +2048,6 @@
 	}
 
 	for _, context := range contexts {
-		context := context
-
 		// Remove the old context from the store
 		if err := c.KubeConfigStore.RemoveContext(clusterName); err != nil {
 			logger.Log(logger.LevelError, nil, err, "Removing context from the store")

backend/cmd/headlamp_test.go

@@ -248,7 +248,6 @@ func TestDynamicClusters(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			cache := cache.New[interface{}]()
 			kubeConfigStore := kubeconfig.NewContextStore()

backend/cmd/stateless.go

@@ -117,8 +117,6 @@ func (c *HeadlampConfig) handleStatelessReq(r *http.Request, kubeConfig string)
 	}
 
 	for _, context := range contexts {
-		context := context
-
 		info := context.KubeContext.Extensions["headlamp_info"]
 		if info != nil {
 			customObj, err := MarshalCustomObject(info, context.Name)

backend/cmd/stateless_test.go

@@ -71,7 +71,6 @@ func TestStatelessClustersKubeConfig(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			cache := cache.New[interface{}]()
 			kubeConfigStore := kubeconfig.NewContextStore()
@@ -127,7 +126,6 @@ func TestStatelessClusterApiRequest(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			cache := cache.New[interface{}]()
 			kubeConfigStore := kubeconfig.NewContextStore()

backend/pkg/helm/charts.go

@@ -63,7 +63,6 @@ func listCharts(filter string, settings *cli.EnvSettings) ([]chartInfo, error) {
 		index.AddRepo(name, indexFile, true)
 
 		for _, chart := range index.All() {
-			chart := chart
 			if filter != "" {
 				if strings.Contains(strings.ToLower(chart.Name), strings.ToLower(filter)) {
 					chartInfos = append(chartInfos, chartInfo{

backend/pkg/helm/repository.go

@@ -215,8 +215,6 @@ func listRepositories(settings *cli.EnvSettings) ([]repositoryInfo, error) {
 	repositories := make([]repositoryInfo, 0, len(repoFile.Repositories))
 
 	for _, repo := range repoFile.Repositories {
-		repo := repo
-
 		repositories = append(repositories, repositoryInfo{
 			Name: repo.Name,
 			URL:  repo.URL,

backend/pkg/helm/repository_test.go

@@ -64,7 +64,6 @@ func checkRepoExists(t *testing.T, helmHandler *helm.Handler, repoName string) b
 	require.NoError(t, err)
 
 	for _, repo := range listRepoResponse.Repositories {
-		repo := repo
 		if repo.Name == repoName {
 			return true
 		}
@@ -186,7 +185,6 @@ func TestUpdateRepo(t *testing.T) {
 		assert.NoError(t, err)
 
 		for _, repo := range listRepoResponse.Repositories {
-			repo := repo
 			if repo.Name == "headlamp_test_repo" {
 				assert.Equal(t, "https://kubernetes-sigs-update-url.github.io/headlamp/", repo.URL)
 			}

backend/pkg/kubeconfig/watcher.go

@@ -68,8 +68,6 @@ func LoadAndWatchFiles(kubeConfigStore ContextStore, paths string, source int, i
 
 func addFilesToWatcher(watcher *fsnotify.Watcher, paths []string) {
 	for _, path := range paths {
-		path := path
-
 		// if path is relative, make it absolute
 		if !filepath.IsAbs(path) {
 			absPath, err := filepath.Abs(path)

backend/pkg/logger/logger_test.go

@@ -70,7 +70,6 @@ func TestLog(t *testing.T) {
 
 	// Call the Log function
 	for _, test := range tests {
-		test := test // Assign test to a local variable
 		t.Run(test.name, func(t *testing.T) {
 			logger.Log(test.level, test.str, test.err, test.msg)
 

backend/pkg/plugins/plugins.go

@@ -99,44 +99,92 @@
 }
 
 // generateSeparatePluginPaths takes the staticPluginDir and pluginDir and returns separate lists of plugin paths.
-func generateSeparatePluginPaths(staticPluginDir, pluginDir string) ([]string, []string, error) {
+// Returns (staticPlugins, devPlugins, catalogPlugins, error) with proper priority ordering.
+func generateSeparatePluginPaths(staticPluginDir, pluginDir string) ([]string, []string, []string, error) {
 	var pluginListURLStatic []string
 
 	if staticPluginDir != "" {
 		var err error
 
 		pluginListURLStatic, err = pluginBasePathListForDir(staticPluginDir, "static-plugins")
 		if err != nil {
-			return nil, nil, err
+			return nil, nil, nil, err
 		}
 	}
 
+	// Get development plugins (highest priority)
+	// dev-plugins is a sibling directory to plugins, not a subdirectory
+	devPluginDir := filepath.Join(filepath.Dir(pluginDir), "dev-plugins")
+	pluginListURLDev, err := pluginBasePathListForDir(devPluginDir, "dev-plugins")
+	if err != nil && !os.IsNotExist(err) {
+		return nil, nil, nil, err
+	}
+
+	// Get catalog/installed plugins
 	pluginListURL, err := pluginBasePathListForDir(pluginDir, "plugins")
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, nil, err
 	}
 
-	return pluginListURLStatic, pluginListURL, nil
+	return pluginListURLStatic, pluginListURLDev, pluginListURL, nil
 }
 
 // GeneratePluginPaths generates a concatenated list of plugin paths from the staticPluginDir and pluginDir.
+// Priority order: dev-plugins > plugins > static-plugins (dev overrides catalog, catalog overrides static)
 func GeneratePluginPaths(staticPluginDir, pluginDir string) ([]string, error) {
-	pluginListURLStatic, pluginListURL, err := generateSeparatePluginPaths(staticPluginDir, pluginDir)
+	pluginListURLStatic, pluginListURLDev, pluginListURL, err := generateSeparatePluginPaths(staticPluginDir, pluginDir)
 	if err != nil {
 		return nil, err
 	}
 
-	// Concatenate the static and user plugin lists.
+	// Create a map to track plugin names and ensure proper priority
+	pluginMap := make(map[string]string)
+	var finalPluginList []string
+
+	// Add static plugins first (lowest priority)
 	if pluginListURLStatic != nil {
-		pluginListURL = append(pluginListURLStatic, pluginListURL...)
+		for _, pluginPath := range pluginListURLStatic {
+			pluginName := getPluginNameFromPath(pluginPath)
+			pluginMap[pluginName] = pluginPath
+		}
+	}
+
+	// Add catalog plugins (medium priority) - can override static
+	if pluginListURL != nil {
+		for _, pluginPath := range pluginListURL {
+			pluginName := getPluginNameFromPath(pluginPath)
+			pluginMap[pluginName] = pluginPath
+		}
+	}
+
+	// Add dev plugins (highest priority) - can override both catalog and static
+	if pluginListURLDev != nil {
+		for _, pluginPath := range pluginListURLDev {
+			pluginName := getPluginNameFromPath(pluginPath)
+			pluginMap[pluginName] = pluginPath
+		}
 	}
 
-	return pluginListURL, nil
+	// Convert map back to slice
+	for _, pluginPath := range pluginMap {
+		finalPluginList = append(finalPluginList, pluginPath)
+	}
+
+	return finalPluginList, nil
+}
+
+// getPluginNameFromPath extracts the plugin name from a plugin path
+func getPluginNameFromPath(pluginPath string) string {
+	parts := strings.Split(pluginPath, "/")
+	if len(parts) >= 2 {
+		return parts[len(parts)-1] // Return the last part (plugin name)
+	}
+	return pluginPath
 }
 
 // ListPlugins lists the plugins in the static and user-added plugin directories.
 func ListPlugins(staticPluginDir, pluginDir string) error {
-	staticPlugins, userPlugins, err := generateSeparatePluginPaths(staticPluginDir, pluginDir)
+	staticPlugins, devPlugins, userPlugins, err := generateSeparatePluginPaths(staticPluginDir, pluginDir)
 	if err != nil {
 		logger.Log(logger.LevelError, nil, err, "listing plugins")
 		return fmt.Errorf("listing plugins: %w", err)
@@ -173,6 +221,18 @@
 		fmt.Println("No static plugins found.")
 	}
 
+	if len(devPlugins) > 0 {
+		devPluginDir := filepath.Join(pluginDir, "dev-plugins")
+		fmt.Printf("\nDevelopment Plugins (%s):\n", devPluginDir)
+
+		for _, plugin := range devPlugins {
+			pluginName := getPluginName(filepath.Join(devPluginDir, plugin))
+			fmt.Println(" -", pluginName, "(dev)")
+		}
+	} else {
+		fmt.Printf("No development plugins found.")
+	}
+
 	if len(userPlugins) > 0 {
 		fmt.Printf("\nUser-added Plugins (%s):\n", pluginDir)
 

backend/pkg/plugins/plugins_test.go

@@ -497,7 +497,6 @@ func TestDelete(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.pluginName, func(t *testing.T) {
 			err := plugins.Delete(tt.pluginDir, tt.pluginName)
 			if tt.expectErr {

backend/pkg/portforward/internal_test.go

@@ -46,7 +46,6 @@ func TestPortforwardKeyGenerator(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		testname := tt.name
 		t.Run(testname, func(t *testing.T) {
 			key := portforwardKeyGenerator(tt.p)