[no-relnote] move 'set' / 'unset' update actions to constants

Signed-off-by: Christopher Desiniotis <[email protected]>

Author: cdesiniotis

cmd/nvidia-ctk-installer/container/runtime/crio/crio.go

@@ -191,7 +191,7 @@ func cleanupConfig(o *container.Options) error {
 		return fmt.Errorf("unable to load config: %v", err)
 	}
 
-	err = cfg.UpdateDefaultRuntime(o.RuntimeName, "unset")
+	err = cfg.UpdateDefaultRuntime(o.RuntimeName, engine.UpdateActionUnset)
 	if err != nil {
 		return fmt.Errorf("failed to unset %q as the default runtime: %w", o.RuntimeName, err)
 	}

pkg/config/engine/api.go

@@ -20,6 +20,12 @@ const (
 	// SaveToSTDOUT is used to write the specified config to stdout instead of
 	// to a file on disk.
 	SaveToSTDOUT = ""
+	// UpdateActionSet is used as an argument to UpdateDefaultRuntime
+	// when setting a runtime handler as the default in the config
+	UpdateActionSet = "set"
+	// UpdateActionUnset is used as an argument to UpdateDefaultRuntime
+	// when unsetting a runtime handler as the default in the config
+	UpdateActionUnset = "unset"
 )
 
 // Interface defines the API for a runtime config updater.

pkg/config/engine/containerd/config.go

@@ -160,19 +160,19 @@ func (c *Config) RemoveRuntime(name string) error {
 // When action is 'unset' we make sure the provided runtime name is not
 // the default.
 func (c *Config) UpdateDefaultRuntime(name string, action string) error {
-	if action != "set" && action != "unset" {
-		return fmt.Errorf("invalid action %q, valid actions are 'set' and 'unset'", action)
+	if action != engine.UpdateActionSet && action != engine.UpdateActionUnset {
+		return fmt.Errorf("invalid action %q, valid actions are %q and %q", action, engine.UpdateActionSet, engine.UpdateActionUnset)
 	}
 
 	if c == nil || c.Tree == nil {
-		if action == "set" {
+		if action == engine.UpdateActionSet {
 			return fmt.Errorf("config toml is nil")
 		}
 		return nil
 	}
 
 	config := *c.Tree
-	if action == "set" {
+	if action == engine.UpdateActionSet {
 		config.SetPath([]string{"plugins", c.CRIRuntimePluginName, "containerd", "default_runtime_name"}, name)
 	} else {
 		defaultRuntime, ok := config.GetPath([]string{"plugins", c.CRIRuntimePluginName, "containerd", "default_runtime_name"}).(string)

pkg/config/engine/crio/crio.go

@@ -182,20 +182,20 @@ func (c *Config) RemoveRuntime(name string) error {
 // When action is 'unset' we make sure the provided runtime name is not
 // the default.
 func (c *Config) UpdateDefaultRuntime(name string, action string) error {
-	if action != "set" && action != "unset" {
-		return fmt.Errorf("invalid action %q, valid actions are 'set' and 'unset'", action)
+	if action != engine.UpdateActionSet && action != engine.UpdateActionUnset {
+		return fmt.Errorf("invalid action %q, valid actions are %q and %q", action, engine.UpdateActionSet, engine.UpdateActionUnset)
 	}
 
 	if c == nil || c.Tree == nil {
-		if action == "set" {
+		if action == engine.UpdateActionSet {
 			return fmt.Errorf("config toml is nil")
 		}
 		return nil
 	}
 
 	config := *c.Tree
 
-	if action == "set" {
+	if action == engine.UpdateActionSet {
 		config.SetPath([]string{"crio", "runtime", "default_runtime"}, name)
 	} else {
 		if runtime, ok := config.GetPath([]string{"crio", "runtime", "default_runtime"}).(string); ok {

pkg/config/engine/docker/docker.go

@@ -155,20 +155,20 @@ func (c *Config) RemoveRuntime(name string) error {
 // When action is 'unset' we make sure the provided runtime name is not
 // the default.
 func (c *Config) UpdateDefaultRuntime(name string, action string) error {
-	if action != "set" && action != "unset" {
-		return fmt.Errorf("invalid action %q, valid actions are 'set' and 'unset'", action)
+	if action != engine.UpdateActionSet && action != engine.UpdateActionUnset {
+		return fmt.Errorf("invalid action %q, valid actions are %q and %q", action, engine.UpdateActionSet, engine.UpdateActionUnset)
 	}
 
 	if c == nil {
-		if action == "set" {
+		if action == engine.UpdateActionSet {
 			return fmt.Errorf("config toml is nil")
 		}
 		return nil
 	}
 
 	config := *c
 
-	if action == "set" {
+	if action == engine.UpdateActionSet {
 		config["default-runtime"] = name
 	} else {
 		if _, exists := config["default-runtime"]; exists {