Switch commands to ConfigKit configuration

internal/cli/cache_contract_test.go

@@ -23,7 +23,7 @@ func TestRunChunkPlanModePrecedenceAndValidation(t *testing.T) {
 	}{
 		{name: "default", wantStores: 1},
 		{name: "file", fileMode: "bypass"},
-		{name: "environment", envMode: "bypass"},
+		{name: "retired environment has no effect", envMode: "bypass", wantStores: 1},
 		{name: "cli", envMode: "refresh", cliMode: "bypass"},
 	}
 	for _, tt := range tests {
@@ -80,25 +80,14 @@ func TestRunChunkPlanModePrecedenceAndValidation(t *testing.T) {
 	})
 
 	for _, tt := range []struct {
-		name       string
-		fileConfig bool
+		name string
 	}{
-		{name: "invalid environment mode"},
-		{name: "invalid file mode", fileConfig: true},
+		{name: "invalid file mode"},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
 			roots := newStateTestRoots(t)
 			opts := newStateTestHarness().options()
-			if tt.fileConfig {
-				replaceStateTestConfigLine(t, roots.config, "    mode: auto\n", "    mode: invalid\n")
-			} else {
-				opts.LookupEnv = func(name string) (string, bool) {
-					if name == "NOTARIUS_CACHE_CHUNK_PLANS_MODE" {
-						return "invalid", true
-					}
-					return "", false
-				}
-			}
+			replaceStateTestConfigLine(t, roots.config, "    mode: auto\n", "    mode: invalid\n")
 			var stdout, stderr bytes.Buffer
 			code := RunWithOptions([]string{"run", "sample", "--config", roots.config, "--input", roots.input}, &stdout, &stderr, opts)
 			if code != 1 || stdout.Len() != 0 || stderr.Len() == 0 {
@@ -207,16 +196,20 @@ func TestRunAutoReusesPlanWhenRunInputsChange(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	configText := replaceRequiredOnce(t, string(data), "    chunk: test/chunk\n", `    chunk:
+	configText := replaceRequiredOnce(t, string(data), "    chunk:\n      module: test/chunk\n", `    chunk:
       module: test/chunk
       options:
         strategy: first
 `)
-	configText = replaceRequiredOnce(t, configText, "    output: test/output\n", `      other:
-        extract: test/extract
-        merge: test/merge
-        normalize: test/normalize
-    output: test/output
+	configText = replaceRequiredOnce(t, configText, "    output:\n      module: test/output\n", `      other:
+        extract:
+          module: test/extract
+        merge:
+          module: test/merge
+        normalize:
+          module: test/normalize
+    output:
+      module: test/output
 `)
 	if err := os.WriteFile(roots.config, []byte(configText), 0o600); err != nil {
 		t.Fatal(err)