Skip to content

Commit 96465e5

Browse files
committed
fix counts for real
1 parent 2d7f6a5 commit 96465e5

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

pkg/connector/server_role.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,11 @@ func (d *serverRolePrincipalSyncer) Grant(ctx context.Context, resource *v2.Reso
204204

205205
// database-role:baton_test:6:member
206206
splitId := strings.Split(entitlement.Id, ":")
207-
// id length is 3
208-
if len(splitId) != 3 {
207+
if len(splitId) < 2 {
209208
return nil, nil, fmt.Errorf("unexpected entitlement id: %s", entitlement.Id)
210209
}
211210

212-
roleId := splitId[2]
211+
roleId := splitId[len(splitId)-2]
213212

214213
var role *mssqldb.RoleModel
215214

@@ -243,11 +242,11 @@ func (d *serverRolePrincipalSyncer) Revoke(ctx context.Context, grant *v2.Grant)
243242

244243
// database-role:baton_test:6:member
245244
splitId := strings.Split(grant.Entitlement.Id, ":")
246-
if len(splitId) != 3 {
245+
if len(splitId) < 2 {
247246
return nil, fmt.Errorf("unexpected entitlement id: %s", grant.Entitlement.Id)
248247
}
249248

250-
roleId := splitId[2]
249+
roleId := splitId[len(splitId)-2]
251250

252251
role, err := d.client.GetServerRole(ctx, roleId)
253252
if err != nil {

0 commit comments

Comments
 (0)