Skip to content

Commit

Permalink
GH-9 - Handle unchecked Tx.Commit error (#27)
Browse files Browse the repository at this point in the history
What

Handle tx.Commit() errors in several different files.

Why

`make errcheck` currently ignores these unchecked errors, but, seeing as
tx.Commit() returns an error, it should be surfaced and returned. This
change prints the text of the error and returns it if tx.Commit() has an
error.

Relates to #9
  • Loading branch information
coopergillan committed May 4, 2021
1 parent 5d895d9 commit 507896f
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 14 deletions.
1 change: 0 additions & 1 deletion errcheck_excludes.txt
Expand Up @@ -2,5 +2,4 @@
(*database/sql.DB).Close
(*database/sql.DB).Exec
(*database/sql.Rows).Close
(*database/sql.Tx).Commit
(*database/sql.Tx).Rollback
7 changes: 6 additions & 1 deletion redshift/resource_redshift_database.go
Expand Up @@ -176,7 +176,12 @@ func resourceRedshiftDatabaseUpdate(d *schema.ResourceData, meta interface{}) er
return err
}

tx.Commit()
commitErr := tx.Commit()
if commitErr != nil {
log.Print("Error committing transaction: ", commitErr)
return commitErr
}

return nil
}

Expand Down
21 changes: 18 additions & 3 deletions redshift/resource_redshift_group.go
Expand Up @@ -100,7 +100,12 @@ func resourceRedshiftGroupCreate(d *schema.ResourceData, meta interface{}) error
return readErr
}

tx.Commit()
commitErr := tx.Commit()
if commitErr != nil {
log.Print("Error committing transaction: ", commitErr)
return commitErr
}

return nil
}

Expand All @@ -121,7 +126,12 @@ func resourceRedshiftGroupRead(d *schema.ResourceData, meta interface{}) error {
return err
}

tx.Commit()
commitErr := tx.Commit()
if commitErr != nil {
log.Print("Error committing transaction: ", commitErr)
return commitErr
}

return nil
}

Expand Down Expand Up @@ -212,7 +222,12 @@ func resourceRedshiftGroupUpdate(d *schema.ResourceData, meta interface{}) error
return err
}

tx.Commit()
commitErr := tx.Commit()
if commitErr != nil {
log.Print("Error committing transaction: ", commitErr)
return commitErr
}

return nil
}

Expand Down
7 changes: 6 additions & 1 deletion redshift/resource_redshift_schema.go
Expand Up @@ -201,7 +201,12 @@ func resourceRedshiftSchemaUpdate(d *schema.ResourceData, meta interface{}) erro
return err
}

tx.Commit()
commitErr := tx.Commit()
if commitErr != nil {
log.Print("Error committing transaction: ", commitErr)
return commitErr
}

return nil
}

Expand Down
28 changes: 24 additions & 4 deletions redshift/resource_redshift_schema_group_privilege.go
Expand Up @@ -178,7 +178,12 @@ func resourceRedshiftSchemaGroupPrivilegeCreate(d *schema.ResourceData, meta int
return readErr
}

tx.Commit()
commitErr := tx.Commit()
if commitErr != nil {
log.Print("Error committing transaction: ", commitErr)
return commitErr
}

return nil
}

Expand All @@ -197,7 +202,12 @@ func resourceRedshiftSchemaGroupPrivilegeRead(d *schema.ResourceData, meta inter
return err
}

tx.Commit()
commitErr := tx.Commit()
if commitErr != nil {
log.Print("Error committing transaction: ", commitErr)
return commitErr
}

return nil
}

Expand Down Expand Up @@ -325,7 +335,12 @@ func resourceRedshiftSchemaGroupPrivilegeUpdate(d *schema.ResourceData, meta int
return err
}

tx.Commit()
commitErr := tx.Commit()
if commitErr != nil {
log.Print("Error committing transaction: ", commitErr)
return commitErr
}

return nil
}

Expand Down Expand Up @@ -367,7 +382,12 @@ func resourceRedshiftSchemaGroupPrivilegeDelete(d *schema.ResourceData, meta int
return err
}

tx.Commit()
commitErr := tx.Commit()
if commitErr != nil {
log.Print("Error committing transaction: ", commitErr)
return commitErr
}

return nil
}

Expand Down
28 changes: 24 additions & 4 deletions redshift/resource_redshift_user.go
Expand Up @@ -161,7 +161,12 @@ func resourceRedshiftUserCreate(d *schema.ResourceData, meta interface{}) error
return readErr
}

tx.Commit()
commitErr := tx.Commit()
if commitErr != nil {
log.Print("Error committing transaction: ", commitErr)
return commitErr
}

return nil
}

Expand All @@ -182,7 +187,12 @@ func resourceRedshiftUserRead(d *schema.ResourceData, meta interface{}) error {
return err
}

tx.Commit()
commitErr := tx.Commit()
if commitErr != nil {
log.Print("Error committing transaction: ", commitErr)
return commitErr
}

return nil
}

Expand Down Expand Up @@ -302,7 +312,12 @@ func resourceRedshiftUserUpdate(d *schema.ResourceData, meta interface{}) error
return err
}

tx.Commit()
commitErr := tx.Commit()
if commitErr != nil {
log.Print("Error committing transaction: ", commitErr)
return commitErr
}

return nil
}

Expand Down Expand Up @@ -449,7 +464,12 @@ func resourceRedshiftUserDelete(d *schema.ResourceData, meta interface{}) error
tx.Rollback()
}

tx.Commit()
commitErr := tx.Commit()
if commitErr != nil {
log.Print("Error committing transaction: ", commitErr)
return commitErr
}

return nil
}

Expand Down

0 comments on commit 507896f

Please sign in to comment.