Skip to content

Commit 5745a7d

Browse files
authored
Don't panic when provisioning teams if there is no parent resource defined (#25)
* Don't panic when provisioning teams if there is no parent resource defined * Use helpers to make sure the resource exists * Use helpers to make sure the parent resource exists as well
1 parent cd0ed93 commit 5745a7d

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

pkg/connector/team.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,10 @@ func (o *teamResourceType) Grant(ctx context.Context, principal *v2.Resource, en
266266
return nil, err
267267
}
268268

269+
if entitlement.GetResource().GetParentResourceId() == nil {
270+
return nil, fmt.Errorf("github-connectorv2: parent resource is required to grant team membership")
271+
}
272+
269273
orgId, err := strconv.ParseInt(entitlement.Resource.ParentResourceId.Resource, 10, 64)
270274
if err != nil {
271275
return nil, err
@@ -311,6 +315,10 @@ func (o *teamResourceType) Revoke(ctx context.Context, grant *v2.Grant) (annotat
311315
return nil, err
312316
}
313317

318+
if entitlement.GetResource().GetParentResourceId() == nil {
319+
return nil, fmt.Errorf("github-connectorv2: parent resource is required to revoke team membership")
320+
}
321+
314322
orgId, err := strconv.ParseInt(entitlement.Resource.ParentResourceId.Resource, 10, 64)
315323
if err != nil {
316324
return nil, err

0 commit comments

Comments
 (0)