use short if where possible

Author: dmacvicar

libvirt/network_def_test.go

@@ -80,8 +80,7 @@ func TestNetworkDefUnmarshall(t *testing.T) {
 	if len(b.IPs) == 0 {
 		t.Errorf("wrong number of IPs: %d", len(b.IPs))
 	}
-	_, err2 := xmlMarshallIndented(b)
-	if err2 != nil {
+	if _, err2 := xmlMarshallIndented(b); err2 != nil {
 		t.Fatalf("marshalling error\n%s", spew.Sdump(b))
 	}
 }

libvirt/resource_libvirt_cloud_init.go

@@ -46,9 +46,9 @@ func resourceCloudInitDisk() *schema.Resource {
 
 func resourceCloudInitDiskCreate(d *schema.ResourceData, meta interface{}) error {
 	log.Printf("[DEBUG] creating cloudinit")
+
 	client := meta.(*Client)
-	virConn := client.libvirt
-	if virConn == nil {
+	if virConn := client.libvirt; virConn == nil {
 		return fmt.Errorf(LibVirtConIsNil)
 	}
 

libvirt/resource_libvirt_network.go

@@ -650,24 +650,24 @@ func resourceLibvirtNetworkDelete(d *schema.ResourceData, meta interface{}) erro
 	if err != nil {
 		return fmt.Errorf("Couldn't determine if network is active: %s", err)
 	}
+
 	// network can be in 2 states, handles this case by case
-	active := activeInt == 1
-	// in case network is inactive just undefine it
-	if !active {
-		if err := virConn.NetworkUndefine(network); err != nil {
-			return fmt.Errorf("Couldn't undefine libvirt network: %s", err)
-		}
-	}
-	// network is active, so we need to destroy it and undefine it
-	if active {
+	if active := int2bool(int(activeInt)); active {
+		// network is active, so we need to destroy it and undefine it
 		if err := virConn.NetworkDestroy(network); err != nil {
 			return fmt.Errorf("When destroying libvirt network: %s", err)
 		}
 
+		if err := virConn.NetworkUndefine(network); err != nil {
+			return fmt.Errorf("Couldn't undefine libvirt network: %s", err)
+		}
+	} else {
+		// in case network is inactive just undefine it
 		if err := virConn.NetworkUndefine(network); err != nil {
 			return fmt.Errorf("Couldn't undefine libvirt network: %s", err)
 		}
 	}
+
 	stateConf := &resource.StateChangeConf{
 		Pending:    []string{"ACTIVE"},
 		Target:     []string{"NOT-EXISTS"},

libvirt/resource_libvirt_pool.go

@@ -219,8 +219,7 @@ func resourceLibvirtPoolRead(d *schema.ResourceData, meta interface{}) error {
 		d.Set("path", poolPath)
 	}
 
-	poolType := poolDef.Type
-	if poolType == "" {
+	if poolType := poolDef.Type; poolType == "" {
 		log.Printf("Pool %s has no type specified", pool.Name)
 	} else {
 		log.Printf("[DEBUG] Pool %s type: %s", pool.Name, poolType)

libvirt/uri/connection_uri.go

@@ -33,8 +33,7 @@ func Parse(uriStr string) (*ConnectionURI, error) {
 // unless the name option is specified.
 func (u *ConnectionURI) RemoteName() string {
 	q := u.Query()
-	name := q.Get("name")
-	if name != "" {
+	if name := q.Get("name"); name != "" {
 		return name
 	}
 

libvirt/uri/tls.go

@@ -67,9 +67,8 @@ func (u *ConnectionURI) tlsConfig() (*tls.Config, error) {
 	clientKeySearchPath := []string{defaultGlobalClientKeyPath}
 
 	q := u.Query()
-	pkipath := q.Get("pkipath")
 	// if pkipath is provided, certs should all exist there
-	if pkipath != "" {
+	if pkipath := q.Get("pkipath"); pkipath != "" {
 		caCertSearchPath = []string{pkipath}
 		clientCertSearchPath = []string{pkipath}
 		clientKeySearchPath = []string{pkipath}

libvirt/utils_libvirt_test.go

@@ -15,8 +15,7 @@ func TestParseUUID(t *testing.T) {
 		t.Errorf("expected UUID %q, got %q", wantUUID, uuid)
 	}
 
-	uuidToStr := uuidString(uuid)
-	if uuidToStr != uuidStr {
+	if uuidToStr := uuidString(uuid); uuidToStr != uuidStr {
 		t.Errorf("expected UUID %q, got %q", uuidStr, uuidToStr)
 	}
 }

libvirt/utils_net.go

@@ -43,8 +43,7 @@ func (l *networkUpdateWorkaroundLibvirt) NetworkUpdate(Net libvirt.Network, Comm
 func randomMACAddress() (string, error) {
 	buf := make([]byte, 3)
 	rand.Seed(time.Now().UnixNano())
-	_, err := rand.Read(buf)
-	if err != nil {
+	if _, err := rand.Read(buf); err != nil {
 		return "", err
 	}
 

main_test.go

@@ -8,8 +8,7 @@ import (
 
 func TestPrintVersion(t *testing.T) {
 	buf := &bytes.Buffer{}
-	err := printVersion(buf)
-	if err != nil {
+	if err := printVersion(buf); err != nil {
 		t.Fatal(err)
 	}
 	output := buf.Bytes()