lxc/completion: Add missing completions for lxc config unset

kadinsayani · kadinsayani · commit 9592285201c5 · 2024-12-05T10:34:28.000-07:00
Signed-off-by: Kadin Sayani &lt;kadin.sayani@canonical.com&gt;
diff --git a/lxc/completion.go b/lxc/completion.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/canonical/lxd/lxd/instance/instancetype"
 	"github.com/canonical/lxd/shared"
 	"github.com/canonical/lxd/shared/api"
 )
@@ -357,8 +358,10 @@ func (g *cmdGlobal) cmpInstanceSetKeys(instanceName string) ([]string, cobra.She
 		return nil, cobra.ShellCompDirectiveError
 	}
 
-	// Fetch all config keys that can be set by a user.
-	allInstanceConfigKeys, _ := g.cmpInstanceAllKeys(instanceName)
+	instanceType := instance.Type
+
+	// Fetch all config keys that can be set by a user based on instance type.
+	allInstanceConfigKeys, _ := g.cmpInstanceKeys(instanceName)
 
 	// Convert slice to map[string]struct{} for O(1) lookups.
 	keySet := make(map[string]struct{}, len(allInstanceConfigKeys))
@@ -374,7 +377,11 @@ func (g *cmdGlobal) cmpInstanceSetKeys(instanceName string) ([]string, cobra.She
 		// We only want to return the intersection between allInstanceConfigKeys and configKeys to avoid returning the full instance config.
 		_, exists := keySet[configKey]
 		if exists {
-			configKeys = append(configKeys, configKey)
+			if shared.StringHasPrefix(configKey, instancetype.ConfigKeyPrefixes...) {
+				configKeys = append(configKeys, configKey)
+			} else if instanceType == string(api.InstanceTypeContainer) && shared.StringHasPrefix(configKey, instancetype.ConfigKeyPrefixesContainer...) {
+				configKeys = append(configKeys, configKey)
+			}
 		}
 	}
 
