fix(sidekick): bad version bump edits (#2613)

Sometimes we were introducing two version lines in `rust-version-bump`.

Author: coryan

internal/sidekick/internal/rust_release/update_sidekick_config.go

@@ -45,7 +45,7 @@ func updateSidekickConfig(manifest, newVersion string) error {
 	var result []string
 	result = append(result, lines[:iCodec+1]...)
 	tail := lines[iCodec+1:]
-	iVersion := slices.IndexFunc(tail, func(a string) bool { return strings.HasPrefix(a, "version = ") })
+	iVersion := slices.IndexFunc(tail, func(a string) bool { return strings.HasPrefix(a, "version ") && strings.Contains(a, " = ") })
 	verLine := fmt.Sprintf(`version        = '%s'`, newVersion)
 	if iVersion == -1 {
 		result = append(result, verLine)

internal/sidekick/internal/rust_release/update_sidekick_config_test.go

@@ -24,20 +24,59 @@ import (
 )
 
 func TestUpdateSidekickConfigSuccess(t *testing.T) {
+	const contentsA = `# With version line
+[codec]
+a = 123
+version = "1.2.3"
+copyright-year = '2038'
+`
+	const contentsB = `# With version line
+[codec]
+a = 123
+version        = "1.2.3"
+copyright-year = '2038'
+`
+
+	for _, contents := range []string{contentsA, contentsB} {
+		tmpDir := t.TempDir()
+		manifest := path.Join(tmpDir, "Cargo.toml")
+		sidekick := path.Join(tmpDir, ".sidekick.toml")
+		const want = `# With version line
+[codec]
+a = 123
+version        = '2.3.4'
+copyright-year = '2038'
+`
+		if err := os.WriteFile(sidekick, []byte(contents), 0644); err != nil {
+			t.Fatal(err)
+		}
+		if err := updateSidekickConfig(manifest, "2.3.4"); err != nil {
+			t.Fatal(err)
+		}
+		got, err := os.ReadFile(sidekick)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if diff := cmp.Diff(want, string(got)); diff != "" {
+			t.Errorf("mismatch (-want +got):\n%s", diff)
+		}
+	}
+}
+
+func TestUpdateSidekickConfigSuccessNoVersion(t *testing.T) {
 	tmpDir := t.TempDir()
 	manifest := path.Join(tmpDir, "Cargo.toml")
 	sidekick := path.Join(tmpDir, ".sidekick.toml")
 	const contents = `# With version line
 [codec]
-a = 123
-version = "1.2.3"
 copyright-year = '2038'
+c = 345
 `
 	const want = `# With version line
 [codec]
-a = 123
 version        = '2.3.4'
 copyright-year = '2038'
+c = 345
 `
 	if err := os.WriteFile(sidekick, []byte(contents), 0644); err != nil {
 		t.Fatal(err)
@@ -54,20 +93,18 @@ copyright-year = '2038'
 	}
 }
 
-func TestUpdateSidekickConfigSuccessNoVersion(t *testing.T) {
+func TestUpdateSidekickConfigSuccessEmptyCodec(t *testing.T) {
 	tmpDir := t.TempDir()
 	manifest := path.Join(tmpDir, "Cargo.toml")
 	sidekick := path.Join(tmpDir, ".sidekick.toml")
 	const contents = `# With version line
+
 [codec]
-copyright-year = '2038'
-c = 345
 `
 	const want = `# With version line
+
 [codec]
 version        = '2.3.4'
-copyright-year = '2038'
-c = 345
 `
 	if err := os.WriteFile(sidekick, []byte(contents), 0644); err != nil {
 		t.Fatal(err)
@@ -84,13 +121,14 @@ c = 345
 	}
 }
 
-func TestUpdateSidekickConfigSuccessEmptyCodec(t *testing.T) {
+func TestUpdateSidekickConfigSuccessOnlyVersion(t *testing.T) {
 	tmpDir := t.TempDir()
 	manifest := path.Join(tmpDir, "Cargo.toml")
 	sidekick := path.Join(tmpDir, ".sidekick.toml")
 	const contents = `# With version line
 
 [codec]
+version        = '1.2.3'
 `
 	const want = `# With version line