cleanup: don't panic and return proper error

Author: dmacvicar

libvirt/network_def.go

@@ -47,21 +47,16 @@ func getXMLNetworkDefFromLibvirt(virConn *libvirt.Libvirt, network libvirt.Netwo
 }
 
 // Creates a network definition with the defaults the provider uses.
-func newNetworkDef() libvirtxml.Network {
-	const defNetworkXML = `
+func newNetworkDef() (libvirtxml.Network, error) {
+	return newDefNetworkFromXML(`
 		<network>
 		  <name>default</name>
 		  <forward mode='nat'>
 		    <nat>
 		      <port start='1024' end='65535'/>
 		    </nat>
 		  </forward>
-		</network>`
-	if d, err := newDefNetworkFromXML(defNetworkXML); err != nil {
-		panic(fmt.Sprintf("Unexpected error while parsing default network definition: %s", err))
-	} else {
-		return d
-	}
+		</network>`)
 }
 
 func getHostXMLDesc(ip, mac, name string) string {

libvirt/network_def_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
+	"github.com/stretchr/testify/require"
 	"libvirt.org/go/libvirtxml"
 )
 
@@ -14,7 +15,9 @@ func init() {
 }
 
 func TestDefaultNetworkMarshall(t *testing.T) {
-	b := newNetworkDef()
+	b, err := newNetworkDef()
+	require.NoError(t, err)
+
 	buf := new(bytes.Buffer)
 	enc := xml.NewEncoder(buf)
 	enc.Indent("  ", "    ")

libvirt/resource_libvirt_network.go

@@ -342,7 +342,11 @@ func resourceLibvirtNetworkCreate(ctx context.Context, d *schema.ResourceData, m
 	// see https://libvirt.org/formatnetwork.html
 	virConn := meta.(*Client).libvirt
 
-	networkDef := newNetworkDef()
+	networkDef, err := newNetworkDef()
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	networkDef.Name = d.Get("name").(string)
 	networkDef.Domain = getDomainFromResource(d)