misc golangci-lint fixes

Author: dmacvicar

.golangci.yaml

@@ -10,6 +10,7 @@ linters-settings:
   mnd:
     ignored-functions:
       - strings.SplitN
+      - os.WriteFile # perms is ok as numbers
   depguard:
     rules:
       main:
@@ -62,9 +63,12 @@ issues:
     - text: "ifElseChain: rewrite if-else to switch statement"
       linters:
         - gocritic
-    - text: "should check returned error before deferring file.Close()"
+    - text: "should check error returned from os.Open() before deferring file.Close()"
       linters:
         - staticcheck
     - path: '(.+)_test\.go'
       linters:
         - lll
+    - text: "d.GetOkExists is deprecated"
+      linters:
+        - staticcheck

libvirt/domain.go

@@ -25,7 +25,9 @@ const (
 	domainStateConfLeaseDone    = resourceStateConfDone
 )
 
-func domainLeaseStateRefreshFunc(ctx context.Context, virConn *libvirt.Libvirt, domain libvirt.Domain, waitForLeases []*libvirtxml.DomainInterface, rd *schema.ResourceData) retry.StateRefreshFunc {
+func domainLeaseStateRefreshFunc(_ context.Context,
+	virConn *libvirt.Libvirt, domain libvirt.Domain,
+	waitForLeases []*libvirtxml.DomainInterface, rd *schema.ResourceData) retry.StateRefreshFunc {
 	return func() (interface{}, string, error) {
 		state, err := domainGetState(virConn, domain)
 		if err != nil {
@@ -63,7 +65,9 @@ func domainLeaseStateRefreshFunc(ctx context.Context, virConn *libvirt.Libvirt,
 	}
 }
 
-func waitForStateDomainLeaseDone(ctx context.Context, virConn *libvirt.Libvirt, domain libvirt.Domain, waitForLeases []*libvirtxml.DomainInterface, rd *schema.ResourceData,
+func waitForStateDomainLeaseDone(ctx context.Context,
+	virConn *libvirt.Libvirt, domain libvirt.Domain,
+	waitForLeases []*libvirtxml.DomainInterface, rd *schema.ResourceData,
 ) error {
 	stateConf := &retry.StateChangeConf{
 		Pending:    []string{domainStateConfLeaseWaiting},
@@ -85,7 +89,7 @@ func waitForStateDomainLeaseDone(ctx context.Context, virConn *libvirt.Libvirt,
 			"IMPORTANT: This error is not a terraform libvirt-provider" +
 			" error, but an error caused by your KVM/libvirt" +
 			" infrastructure configuration/setup"
-		return fmt.Errorf("couldn't retrieve IP address of domain id: %s. %s \n %s", rd.Id(), ipNotFoundMsg, err)
+		return fmt.Errorf("couldn't retrieve IP address of domain id: %s. %s \n %w", rd.Id(), ipNotFoundMsg, err)
 	}
 	log.Print("[DEBUG] got lease")
 	return nil

libvirt/resource_libvirt_pool_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	"github.com/stretchr/testify/require"
 )
 
 func testAccCheckLibvirtPoolExists(name string, pool *libvirt.StoragePool) resource.TestCheckFunc {
@@ -180,17 +181,14 @@ func TestAccLibvirtPool_ManuallyDestroyed(t *testing.T) {
 					// delete the pool out of band (from terraform)
 					client := testAccProvider.Meta().(*Client)
 
-					if err := client.libvirt.StoragePoolDestroy(pool); err != nil {
-						t.Errorf(err.Error())
-					}
+					err := client.libvirt.StoragePoolDestroy(pool)
+					require.NoError(t, err)
 
-					if err := client.libvirt.StoragePoolDelete(pool, libvirt.StoragePoolDeleteNormal); err != nil {
-						t.Errorf(err.Error())
-					}
+					err = client.libvirt.StoragePoolDelete(pool, libvirt.StoragePoolDeleteNormal)
+					require.NoError(t, err)
 
-					if err := client.libvirt.StoragePoolUndefine(pool); err != nil {
-						t.Errorf(err.Error())
-					}
+					err = client.libvirt.StoragePoolUndefine(pool)
+					require.NoError(t, err)
 				},
 			},
 		},

libvirt/volume_image.go

@@ -49,10 +49,11 @@ func (i *localImage) Size() (uint64, error) {
 //nolint:mnd
 func (i *localImage) IsQCOW2() (bool, error) {
 	file, err := os.Open(i.path)
-	defer file.Close()
 	if err != nil {
 		return false, fmt.Errorf("error while opening %s: %w", i.path, err)
 	}
+	defer file.Close()
+
 	buf := make([]byte, 8)
 	_, err = io.ReadAtLeast(file, buf, 8)
 	if err != nil {
@@ -63,10 +64,11 @@ func (i *localImage) IsQCOW2() (bool, error) {
 
 func (i *localImage) Import(uploader func(io.Reader) error, vol libvirtxml.StorageVolume) error {
 	file, err := os.Open(i.path)
-	defer file.Close()
 	if err != nil {
 		return fmt.Errorf("error while opening %s: %w", i.path, err)
 	}
+	defer file.Close()
+
 
 	fi, err := file.Stat()
 	if err != nil {