Add more Table ACL error message clarity

Author: nfx

access/resource_sql_permissions.go

@@ -122,7 +122,7 @@ func (ta *SqlPermissions) read() error {
 			strings.Contains(failure, "RESOURCE_DOES_NOT_EXIST") {
 			return common.NotFound(failure)
 		}
-		return fmt.Errorf(failure)
+		return fmt.Errorf("cannot read current grants: %s", failure)
 	}
 	// clear any previous entries
 	ta.PrivilegeAssignments = []PrivilegeAssignment{}
@@ -218,7 +218,10 @@ func (ta *SqlPermissions) apply(qb func(objType, key string) string) error {
 	sqlQuery := qb(objType, key)
 	log.Printf("[INFO] Executing SQL: %s", sqlQuery)
 	r := ta.exec.Execute(ta.ClusterID, "sql", sqlQuery)
-	return r.Err()
+	if !r.Failed() {
+		return nil
+	}
+	return fmt.Errorf("cannot execute %s: %s", sqlQuery, r.Error())
 }
 
 func (ta *SqlPermissions) initCluster(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) (err error) {

access/resource_sql_permissions_test.go

@@ -113,7 +113,7 @@ func TestTableACL_NotFound(t *testing.T) {
 func TestTableACL_OtherError(t *testing.T) {
 	ta := SqlPermissions{Table: "foo", exec: failedCommand("Some error")}
 	err := ta.read()
-	assert.EqualError(t, err, "Some error")
+	assert.EqualError(t, err, "cannot read current grants: Some error")
 }
 
 func TestTableACL_Revoke(t *testing.T) {
@@ -273,7 +273,7 @@ func TestResourceSqlPermissions_Read_ErrorCommand(t *testing.T) {
 		ID:          "database/foo",
 		Read:        true,
 		New:         true,
-	}.ExpectError(t, "does not compute")
+	}.ExpectError(t, "cannot read current grants: does not compute")
 }
 
 func TestResourceSqlPermissions_Create(t *testing.T) {
@@ -340,7 +340,7 @@ func TestResourceSqlPermissions_Create_Error(t *testing.T) {
 		Fixtures:    createHighConcurrencyCluster,
 		Resource:    ResourceSqlPermissions(),
 		Create:      true,
-	}.ExpectError(t, "Some error")
+	}.ExpectError(t, "cannot read current grants: Some error")
 }
 
 func TestResourceSqlPermissions_Create_Error2(t *testing.T) {
@@ -366,7 +366,7 @@ func TestResourceSqlPermissions_Create_Error2(t *testing.T) {
 		Fixtures: createHighConcurrencyCluster,
 		Resource: ResourceSqlPermissions(),
 		Create:   true,
-	}.ExpectError(t, "Action Unknown ActionType READ cannot be granted on tab... (127 more bytes)")
+	}.ExpectError(t, "cannot execute GRANT READ, MODIFY, SELECT ON TABLE `default`.`foo` TO `[email protected]`: Action Unknown ActionType READ cannot be granted on tab... (127 more bytes)")
 }
 
 func TestResourceSqlPermissions_Update(t *testing.T) {