Fix: 'Error return value of is not checked (errcheck)'

Abdelkarim Boujida · Abdelkarim Boujida · commit ded9101e3837 · 2024-04-07T20:18:59.000+02:00
diff --git a/internal/provider/resource_default_privileges.go b/internal/provider/resource_default_privileges.go
@@ -188,7 +188,7 @@ func (r *defaultPriviligesResource) Create(ctx context.Context, req resource.Cre
 		)
 		return
 	}
-	defer tx.Rollback()
+	defer r.txRollback(ctx, tx)
 
 	err = r.revokeAll(ctx, tx, owner, inSchema, objectType, role)
 	if err != nil {
@@ -387,7 +387,7 @@ func (r *defaultPriviligesResource) Delete(ctx context.Context, req resource.Del
 		)
 		return
 	}
-	defer tx.Rollback()
+	defer r.txRollback(ctx, tx)
 
 	err = r.revokeAll(ctx, tx, owner, inSchema, objectType, role)
 	if err != nil {
@@ -431,3 +431,10 @@ func (r *defaultPriviligesResource) revokeAll(ctx context.Context, tx *sql.Tx, o
 	_, err := tx.ExecContext(ctx, sqlStatement)
 	return err
 }
+
+func (r *defaultPriviligesResource) txRollback(ctx context.Context, tx *sql.Tx) {
+	err := tx.Rollback()
+	if err != nil {
+		tflog.Error(ctx, "Unexpected error while rollback: "+err.Error())
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ func (r *defaultPriviligesResource) Create(ctx context.Context, req resource.Cre`
`188`	`188`	`)`
`189`	`189`	`return`
`190`	`190`	`}`
`191`		`- defer tx.Rollback()`
	`191`	`+ defer r.txRollback(ctx, tx)`
`192`	`192`
`193`	`193`	`err = r.revokeAll(ctx, tx, owner, inSchema, objectType, role)`
`194`	`194`	`if err != nil {`
`@@ -387,7 +387,7 @@ func (r *defaultPriviligesResource) Delete(ctx context.Context, req resource.Del`
`387`	`387`	`)`
`388`	`388`	`return`
`389`	`389`	`}`
`390`		`- defer tx.Rollback()`
	`390`	`+ defer r.txRollback(ctx, tx)`
`391`	`391`
`392`	`392`	`err = r.revokeAll(ctx, tx, owner, inSchema, objectType, role)`
`393`	`393`	`if err != nil {`
`@@ -431,3 +431,10 @@ func (r defaultPriviligesResource) revokeAll(ctx context.Context, tx sql.Tx, o`
`431`	`431`	`_, err := tx.ExecContext(ctx, sqlStatement)`
`432`	`432`	`return err`
`433`	`433`	`}`
	`434`	`+`
	`435`	`+func (r defaultPriviligesResource) txRollback(ctx context.Context, tx sql.Tx) {`
	`436`	`+ err := tx.Rollback()`
	`437`	`+ if err != nil {`
	`438`	`+ tflog.Error(ctx, "Unexpected error while rollback: "+err.Error())`
	`439`	`+ }`
	`440`	`+}`