Refine ownership conflict error messages and fix associated tests

Signed-off-by: Ilya Dmitrichenko <[email protected]>
stefanprodan · Jun 10, 2024 · b8686f0 · b8686f0
1 parent 1564099
commit b8686f0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cmd/timoni/apply_test.go b/cmd/timoni/apply_test.go
@@ -235,7 +235,7 @@ bundle: {
 			modPath,
 		))
 		g.Expect(err).To(HaveOccurred())
-		g.Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("instance \"%s\" exists and is managed by bundle \"%s\"", instanceName, bundleName)))
+		g.Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("instance \"%s\" exists and is managed by another bundle \"%s\"", instanceName, bundleName)))
 
 		output, err := executeCommand(fmt.Sprintf("ls -n %[1]s", namespace))
 		g.Expect(err).ToNot(HaveOccurred())

diff --git a/cmd/timoni/bundle_apply_test.go b/cmd/timoni/bundle_apply_test.go
@@ -155,8 +155,8 @@ bundle: {
 
 		_, err = executeCommandWithIn("bundle apply -f - -p main --wait", strings.NewReader(anotherBundleData))
 		g.Expect(err).To(HaveOccurred())
-		g.Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("instance \"%s\" exists and is managed by another bundle \"%s\"", "frontend", bundleName)))
-		g.Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("instance \"%s\" exists and is managed by another bundle \"%s\"", "backend", bundleName)))
+		g.Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("instance %q exists and is managed by another bundle %q", "frontend", bundleName)))
+		g.Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("instance %q exists and is managed by another bundle %q", "backend", bundleName)))
 	})
 
 	t.Run("fails to create instances from partially overlapping bundle", func(t *testing.T) {
@@ -247,7 +247,7 @@ bundle: {
 
 		_, err = executeCommandWithIn("bundle apply -f - -p main --wait", strings.NewReader(bundleData))
 		g.Expect(err).To(HaveOccurred())
-		g.Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("instance \"%s\" exists and is managed by no bundle", instanceName)))
+		g.Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("instance \"%s\" exists and is not managed by any bundle", instanceName)))
 	})
 }
 

diff --git a/internal/reconciler/types.go b/internal/reconciler/types.go
@@ -85,9 +85,9 @@ func (e *InstanceOwnershipConflictErr) Error() string {
 	numConflicts := len(*e)
 	for i, c := range *e {
 		if c.CurrentOwnerBundle != "" {
-			s.WriteString(fmt.Sprintf("instance %q exists and is managed by bundle %q", c.InstanceName, c.CurrentOwnerBundle))
+			s.WriteString(fmt.Sprintf("instance %q exists and is managed by another bundle %q", c.InstanceName, c.CurrentOwnerBundle))
 		} else {
-			s.WriteString(fmt.Sprintf("instance %q exists and is managed by no bundle", c.InstanceName))
+			s.WriteString(fmt.Sprintf("instance %q exists and is not managed by any bundle", c.InstanceName))
 		}
 		if numConflicts > 1 && i != numConflicts {
 			s.WriteString("; ")