Simplify body builder using latest xmldot enhancements

Author: danischm

body.go

@@ -73,64 +73,26 @@ func (body Body) Err() error {
 	return body.err
 }
 
-// initializeXMLIfEmpty initializes an empty XML string with a minimal root element
-// inferred from the first segment of the path.
-//
-// If xml is empty and path is non-empty, extracts the first path segment
-// (before '.', '@', or '[') and creates a root element with that name.
-//
-// Returns the initialized XML string (original xml if not empty, or new root element).
-func initializeXMLIfEmpty(xml, path string) string {
-	// If already has content or path is empty, return as-is
-	if xml != "" || path == "" {
-		return xml
-	}
-
-	// Extract first path segment as root element name
-	firstDot := 0
-	for i, ch := range path {
-		if ch == '.' || ch == '@' || ch == '[' {
-			firstDot = i
-			break
-		}
-	}
-	if firstDot == 0 {
-		firstDot = len(path)
-	}
-
-	rootName := path[:firstDot]
-	return "<" + rootName + "></" + rootName + ">"
-}
-
 // Set sets an XML element at the given path to the specified value
 //
 // The path uses dot notation to navigate the XML structure.
 // The value can be any type that xmldot supports (string, int, bool, etc.).
 //
-// If the body is empty, this will automatically create a minimal root element
-// based on the first segment of the path.
+// If the body is empty, xmldot will automatically create the XML structure
+// based on the path.
 //
 // If an error occurs, the error is stored and returned by String() or Err().
 // Once an error occurs, all subsequent operations are no-ops that preserve the error.
 //
-// Example:
-//
-//	body := netconf.Body{}.
-//	    Set("config.system.hostname", "router1").
-//	    Set("config.system.domain-name", "example.com")
-//	xml, err := body.String()
-//
 // Returns the Body for method chaining.
 func (body Body) Set(path string, value any) Body {
 	// Short-circuit if already in error state
 	if body.err != nil {
 		return body
 	}
 
-	// Initialize empty XML with root element if needed
-	xml := initializeXMLIfEmpty(body.str, path)
-
-	result, err := xmldot.Set(xml, path, value)
+	// xmldot now handles empty XML and multi-root detection automatically
+	result, err := xmldot.Set(body.str, path, value)
 	if err != nil {
 		// Store error and return body with error state
 		return Body{str: body.str, err: fmt.Errorf("Set(%q): %w", path, err)}
@@ -160,10 +122,7 @@ func (body Body) SetRaw(path, rawXML string) Body {
 		return body
 	}
 
-	// Initialize empty XML with root element if needed
-	xml := initializeXMLIfEmpty(body.str, path)
-
-	result, err := xmldot.SetRaw(xml, path, rawXML)
+	result, err := xmldot.SetRaw(body.str, path, rawXML)
 	if err != nil {
 		return Body{str: body.str, err: fmt.Errorf("SetRaw(%q): %w", path, err)}
 	}

body_test.go

@@ -269,7 +269,8 @@ func TestBodySetError(t *testing.T) {
 	})
 
 	t.Run("invalid path", func(t *testing.T) {
-		body := Body{}.Set("..invalid", "value")
+		// Empty path should error - xmldot rejects empty paths
+		body := Body{}.Set("", "value")
 		_, err := body.String()
 		if err == nil {
 			t.Error("expected error for invalid path")
@@ -348,7 +349,7 @@ func TestBodySetAttrError(t *testing.T) {
 	t.Run("SetAttr on invalid path", func(t *testing.T) {
 		body := Body{}.
 			Set("config.interface", "test").
-			SetAttr("invalid..path", "attr", "value")
+			SetAttr("", "attr", "value") // Empty path should error
 
 		_, err := body.String()
 		if err == nil {
@@ -525,3 +526,74 @@ func ExampleBody_Set() {
 	// Output: Configuration built successfully
 	// XML length: 200 bytes
 }
+
+// TestBodySetMultipleRoots tests that Body.Set() properly handles multiple root-level sibling elements
+func TestBodySetMultipleRoots(t *testing.T) {
+	t.Run("ACL with deny and permit siblings", func(t *testing.T) {
+		// This is the real-world use case from terraform-provider-iosxe ACLs
+		// where we have both deny and permit at the same level
+		body := Body{}.
+			Set("sequence", "10").
+			Set("deny.std-ace.ipv4-address-prefix", "10.0.0.0").
+			Set("deny.std-ace.mask", "0.0.0.255").
+			Set("permit.std-ace.ipv4-address-prefix", "192.168.0.0").
+			Set("permit.std-ace.mask", "0.0.255.255")
+
+		xml, err := body.String()
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+
+		t.Logf("Generated XML:\n%s", xml)
+
+		// Verify we have <sequence>, <deny>, and <permit> as separate root-level siblings
+		if !strings.Contains(xml, "<sequence>10</sequence>") {
+			t.Errorf("expected separate <sequence> element, got: %s", xml)
+		}
+		if !strings.Contains(xml, "<deny>") {
+			t.Errorf("expected <deny> element, got: %s", xml)
+		}
+		if !strings.Contains(xml, "<permit>") {
+			t.Errorf("expected <permit> element, got: %s", xml)
+		}
+		if !strings.Contains(xml, "<ipv4-address-prefix>10.0.0.0</ipv4-address-prefix>") {
+			t.Errorf("expected deny prefix in XML, got: %s", xml)
+		}
+		if !strings.Contains(xml, "<ipv4-address-prefix>192.168.0.0</ipv4-address-prefix>") {
+			t.Errorf("expected permit prefix in XML, got: %s", xml)
+		}
+
+		// Verify it's NOT all nested inside <sequence> or duplicated
+		// The XML should have the structure:
+		// <sequence>10</sequence><deny>...</deny><permit>...</permit>
+		// NOT: <sequence>10<deny>...</deny><permit>...</permit></sequence>
+		if strings.Contains(xml, "<sequence>10<deny>") || strings.Contains(xml, "</deny></sequence>") {
+			t.Errorf("deny should not be nested inside sequence, got: %s", xml)
+		}
+	})
+
+	t.Run("multiple different root elements", func(t *testing.T) {
+		body := Body{}.
+			Set("hostname", "router1").
+			Set("domain", "example.com").
+			Set("port", "8080")
+
+		xml, err := body.String()
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+
+		t.Logf("Generated XML:\n%s", xml)
+
+		// All should be separate root elements
+		if !strings.Contains(xml, "<hostname>router1</hostname>") {
+			t.Errorf("expected hostname element, got: %s", xml)
+		}
+		if !strings.Contains(xml, "<domain>example.com</domain>") {
+			t.Errorf("expected domain element, got: %s", xml)
+		}
+		if !strings.Contains(xml, "<port>8080</port>") {
+			t.Errorf("expected port element, got: %s", xml)
+		}
+	})
+}

go.mod

@@ -3,7 +3,7 @@ module github.com/netascode/go-netconf
 go 1.24.0
 
 require (
-	github.com/netascode/xmldot v0.4.0
+	github.com/netascode/xmldot v0.4.1
 	github.com/scrapli/scrapligo v1.3.3
 )
 

go.sum

@@ -2,8 +2,8 @@ github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
 github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/netascode/xmldot v0.4.0 h1:uGa7M4KJ/ECn3YXZ27vEX1mAPYPH3UgmOlYwBHq1L+Q=
-github.com/netascode/xmldot v0.4.0/go.mod h1:T0zddov+d7Sgam8cpJSOr155HiKyXwY58PE/iiuXbT8=
+github.com/netascode/xmldot v0.4.1 h1:Uw5qJRHOxUFOOzzcQt3F4+PYgHZC/YneRVU5UGknoqc=
+github.com/netascode/xmldot v0.4.1/go.mod h1:T0zddov+d7Sgam8cpJSOr155HiKyXwY58PE/iiuXbT8=
 github.com/scrapli/scrapligo v1.3.3 h1:D9zj1QrOYNYAQ30YT7wfQBINvPGxvs5L5Lz+2LnL7V4=
 github.com/scrapli/scrapligo v1.3.3/go.mod h1:pOWxVyPsQRrWTrkoSSDg05tjOqtWfLffAZtAsCc0w3M=
 github.com/sirikothe/gotextfsm v1.1.0 h1:Hd6S3g4383e8b0awZQEPr+d1QPVxxnR/3NU1Kw4dI/Y=