add tests for RemoveRuntime

Author: phyrog

pkg/containerd/configure.go

@@ -50,11 +50,8 @@ func (c *Config) AddRuntime(shimPath string) error {
 		return err
 	}
 
-	// Fail if config.toml already contains the runtimeName
-	// Prevents corrupt config but could lead to unexpcted fails for the user.
-	// Maybe skipping existing config?
+	// Warn if config.toml already contains runtimeName
 	if strings.Contains(string(data), runtimeName) {
-		//return configPath, fmt.Errorf("config file %s already contains runtime config for '%s'", configPath, runtimeName)
 		slog.Info(fmt.Sprintf("config for runtime '%s' already exists, skipping", runtimeName))
 		return nil
 	}
@@ -86,9 +83,10 @@ func (c *Config) RemoveRuntime(shimPath string) error {
 		return err
 	}
 
-	// Fail if config.toml does not contain the runtimeName
+	// Warn if config.toml does not contain the runtimeName
 	if !strings.Contains(string(data), runtimeName) {
-		return fmt.Errorf("config file %s does not contain a runtime config for '%s'", c.configPath, runtimeName)
+		slog.Warn(fmt.Sprintf("config for runtime '%s' does not exist, skipping", runtimeName))
+		return nil
 	}
 
 	// Convert the file data to a string and replace the target string with an empty string.

pkg/containerd/configure_test.go

@@ -125,3 +125,89 @@ runtime_type = "/opt/kwasm/bin/containerd-shim-spin-v1"
 		})
 	}
 }
+
+func TestConfig_RemoveRuntime(t *testing.T) {
+	type fields struct {
+		hostFs     afero.Fs
+		configPath string
+	}
+	type args struct {
+		shimPath string
+	}
+	tests := []struct {
+		name            string
+		fields          fields
+		args            args
+		wantErr         bool
+		wantFileErr     bool
+		wantFileContent string
+	}{
+		{"missing shim config", fields{
+			hostFs:     newFixtureFs("testdata/containerd/missing-containerd-shim-config"),
+			configPath: "/etc/containerd/config.toml",
+		}, args{"/opt/kwasm/bin/containerd-shim-spin-v1"}, false, false, `[plugins]
+  [plugins."io.containerd.monitor.v1.cgroups"]
+    no_prometheus = false
+  [plugins."io.containerd.service.v1.diff-service"]
+    default = ["walking"]
+  [plugins."io.containerd.gc.v1.scheduler"]
+    pause_threshold = 0.02
+    deletion_threshold = 0
+    mutation_threshold = 100
+    schedule_delay = 0
+    startup_delay = "100ms"
+  [plugins."io.containerd.runtime.v2.task"]
+    platforms = ["linux/amd64"]
+    sched_core = true
+  [plugins."io.containerd.service.v1.tasks-service"]
+    blockio_config_file = ""
+    rdt_config_file = ""
+`},
+		{"missing config", fields{
+			hostFs:     newFixtureFs("testdata/containerd/missing-containerd-config"),
+			configPath: "/etc/containerd/config.toml",
+		}, args{"/opt/kwasm/bin/containerd-shim-spin-v1"}, true, true, ``},
+		{"existing shim config", fields{
+			hostFs:     newFixtureFs("testdata/containerd/existing-containerd-shim-config"),
+			configPath: "/etc/containerd/config.toml",
+		}, args{"/opt/kwasm/bin/containerd-shim-spin-v1"}, false, false, `[plugins]
+  [plugins."io.containerd.monitor.v1.cgroups"]
+    no_prometheus = false
+  [plugins."io.containerd.service.v1.diff-service"]
+    default = ["walking"]
+  [plugins."io.containerd.gc.v1.scheduler"]
+    pause_threshold = 0.02
+    deletion_threshold = 0
+    mutation_threshold = 100
+    schedule_delay = 0
+    startup_delay = "100ms"
+  [plugins."io.containerd.runtime.v2.task"]
+    platforms = ["linux/amd64"]
+    sched_core = true
+  [plugins."io.containerd.service.v1.tasks-service"]
+    blockio_config_file = ""
+    rdt_config_file = ""
+`},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			c := &Config{
+				hostFs:     tt.fields.hostFs,
+				configPath: tt.fields.configPath,
+			}
+			if err := c.RemoveRuntime(tt.args.shimPath); (err != nil) != tt.wantErr {
+				t.Errorf("Config.RemoveRuntime() error = %v, wantErr %v", err, tt.wantErr)
+			}
+
+			gotContent, err := afero.ReadFile(c.hostFs, c.configPath)
+			if (err != nil) != tt.wantFileErr {
+				t.Errorf("read %s error = %v, wantFileErr %v", c.configPath, err, tt.wantFileErr)
+				return
+			}
+
+			if string(gotContent) != tt.wantFileContent {
+				t.Errorf("file content %s got = %s, want = %s", c.configPath, string(gotContent), tt.wantFileContent)
+			}
+		})
+	}
+}