Fix Grant revocation (#118)

* Fix Grant revocation If the grant is already gone when the reconclier tries to revoke it, it should mark the resource as successfully removed, not error. Signed-off-by: Jens Hausherr <[email protected]> * Fix linter findings Signed-off-by: Jens Hausherr <[email protected]> Signed-off-by: Jens Hausherr <[email protected]> Co-authored-by: Jens Hausherr <[email protected]>
crossplane-contrib · Nov 21, 2022 · 031c0bd · 031c0bd
1 parent e4ab206
commit 031c0bd
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/pkg/controller/mysql/grant/reconciler.go b/pkg/controller/mysql/grant/reconciler.go
@@ -329,6 +329,11 @@ func (c *external) Delete(ctx context.Context, mg resource.Managed) error {
 	)
 
 	if err := c.db.Exec(ctx, xsql.Query{String: query}); err != nil {
+		var myErr *mysqldriver.MySQLError
+		if errors.As(err, &myErr) && myErr.Number == errCodeNoSuchGrant {
+			// MySQL automatically deletes related grants if the user has been deleted
+			return nil
+		}
 		return errors.Wrap(err, errRevokeGrant)
 	}
 	err := c.db.Exec(ctx, xsql.Query{String: "FLUSH PRIVILEGES"})

diff --git a/pkg/controller/mysql/grant/reconciler_test.go b/pkg/controller/mysql/grant/reconciler_test.go
@@ -748,6 +748,27 @@ func TestDelete(t *testing.T) {
 			},
 			want: nil,
 		},
+		"SuccessGrantGone": {
+			reason: "No error should be returned if the grant is already revoked",
+			args: args{
+				mg: &v1alpha1.Grant{
+					Spec: v1alpha1.GrantSpec{
+						ForProvider: v1alpha1.GrantParameters{
+							Database: pointer.StringPtr("test-example"),
+							User:     pointer.StringPtr("test-example"),
+						},
+					},
+				},
+			},
+			fields: fields{
+				db: &mockDB{
+					MockExec: func(ctx context.Context, q xsql.Query) error {
+						return &mysql.MySQLError{Number: errCodeNoSuchGrant}
+					},
+				},
+			},
+			want: nil,
+		},
 	}
 
 	for name, tc := range cases {