From 41f5bc4165c87f5fb579df4ac089fa6d202c0f2e Mon Sep 17 00:00:00 2001 From: subencheng Date: Thu, 3 Jul 2025 14:37:08 -0700 Subject: [PATCH 1/2] [BB-906] baton-sql-server: delete users instead of disabling users when we do account deprovisioning --- pkg/mssqldb/server.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/mssqldb/server.go b/pkg/mssqldb/server.go index a3df684..9ed2838 100644 --- a/pkg/mssqldb/server.go +++ b/pkg/mssqldb/server.go @@ -35,13 +35,13 @@ func (c *Client) GetServer(ctx context.Context) (*ServerModel, error) { return &ret, nil } -func (c *Client) DisableUserFromServer(ctx context.Context, userName string) error { +func (c *Client) DeleteUserFromServer(ctx context.Context, userName string) error { if strings.ContainsAny(userName, "[]\"';") { return fmt.Errorf("invalid characters in userName") } query := fmt.Sprintf(` -ALTER LOGIN [%s] DISABLE;`, userName) +DROP LOGIN [%s];`, userName) _, err := c.db.ExecContext(ctx, query) if err != nil { From 656c0f70136fea31634ac9c8cc3c0ad97bc7d181 Mon Sep 17 00:00:00 2001 From: subencheng Date: Thu, 3 Jul 2025 14:38:37 -0700 Subject: [PATCH 2/2] more --- pkg/connector/server_user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/connector/server_user.go b/pkg/connector/server_user.go index b1467ff..a3cf59d 100644 --- a/pkg/connector/server_user.go +++ b/pkg/connector/server_user.go @@ -249,7 +249,7 @@ func (d *userPrincipalSyncer) Delete(ctx context.Context, resourceId *v2.Resourc return nil, err } - err = d.client.DisableUserFromServer(ctx, user.Name) + err = d.client.DeleteUserFromServer(ctx, user.Name) if err != nil { return nil, err }