[BB-1134] githbu: return annotations

Author: Bencheng21

pkg/connector/enterprise_role.go

@@ -135,9 +135,12 @@ func (o *enterpriseRoleResourceType) Grants(
 		return nil, "", nil, fmt.Errorf("baton-github: error getting user roles cache: %w", err)
 	}
 
-	ret := []*v2.Grant{}
+	var (
+		annotations annotations.Annotations
+		ret         = make([]*v2.Grant, 0, len(cache[resource.Id.Resource]))
+	)
 	for _, userLogin := range cache[resource.Id.Resource] {
-		user, _, err := o.client.Users.Get(ctx, userLogin)
+		user, resp, err := o.client.Users.Get(ctx, userLogin)
 		if err != nil {
 			return nil, "", nil, fmt.Errorf("baton-github: error getting user %s: %w", userLogin, err)
 		}
@@ -147,6 +150,12 @@ func (o *enterpriseRoleResourceType) Grants(
 			return nil, "", nil, fmt.Errorf("baton-github: error creating resource ID for user %s: %w", userLogin, err)
 		}
 
+		restApiRateLimit, err := extractRateLimitData(resp)
+		if err != nil {
+			return nil, "", nil, err
+		}
+		annotations.WithRateLimiting(restApiRateLimit)
+
 		ret = append(ret, grant.NewGrant(
 			resource,
 			"assigned",

pkg/connector/invitation.go

@@ -99,7 +99,7 @@ func (i *invitationResourceType) List(ctx context.Context, parentID *v2.Resource
 		invitationResources = append(invitationResources, ir)
 	}
 	annotations.WithRateLimiting(restApiRateLimit)
-	return invitationResources, pageToken, nil, nil
+	return invitationResources, pageToken, annotations, nil
 }
 
 func (i *invitationResourceType) Entitlements(_ context.Context, resource *v2.Resource, _ *pagination.Token) ([]*v2.Entitlement, string, annotations.Annotations, error) {
@@ -155,7 +155,7 @@ func (i *invitationResourceType) CreateAccount(
 	}
 	return &v2.CreateAccountResponse_SuccessResult{
 		Resource: r,
-	}, nil, nil, nil
+	}, nil, annotations, nil
 }
 
 func (i *invitationResourceType) Delete(ctx context.Context, resourceId *v2.ResourceId) (annotations.Annotations, error) {

pkg/connector/org.go

@@ -100,7 +100,8 @@ func (o *orgResourceType) List(
 
 	orgs, resp, err := o.client.Organizations.List(ctx, "", opts)
 	if err != nil {
-		return nil, "", nil, fmt.Errorf("github-connector: failed to fetch org: %w", err)
+		_, reqAnnos, _ := parseResp(resp)
+		return nil, "", reqAnnos, fmt.Errorf("github-connector: failed to fetch org: %w", err)
 	}
 
 	nextPage, reqAnnos, err := parseResp(resp)
@@ -199,7 +200,8 @@ func (o *orgResourceType) Grants(
 
 	users, resp, err := o.client.Organizations.ListMembers(ctx, orgName, &opts)
 	if err != nil {
-		return nil, "", nil, fmt.Errorf("github-connectorv2: failed to list org members: %w", err)
+		_, reqAnnos, _ := parseResp(resp)
+		return nil, "", reqAnnos, fmt.Errorf("github-connectorv2: failed to list org members: %w", err)
 	}
 
 	nextPage, reqAnnos, err := parseResp(resp)
@@ -216,7 +218,8 @@ func (o *orgResourceType) Grants(
 	for _, user := range users {
 		membership, _, err := o.client.Organizations.GetOrgMembership(ctx, user.GetLogin(), orgName)
 		if err != nil {
-			return nil, "", nil, fmt.Errorf("github-connectorv2: failed to get org memberships for user: %w", err)
+			_, reqAnnos, _ := parseResp(resp)
+			return nil, "", reqAnnos, fmt.Errorf("github-connectorv2: failed to get org memberships for user: %w", err)
 		}
 		if membership.GetState() == "pending" {
 			continue

pkg/connector/repository.go

@@ -88,7 +88,8 @@ func (o *repositoryResourceType) List(ctx context.Context, parentID *v2.Resource
 
 	repos, resp, err := o.client.Repositories.ListByOrg(ctx, orgName, opts)
 	if err != nil {
-		return nil, "", nil, fmt.Errorf("github-connector: failed to list repositories: %w", err)
+		_, reqAnnos, _ := parseResp(resp)
+		return nil, "", reqAnnos, fmt.Errorf("github-connector: failed to list repositories: %w", err)
 	}
 
 	nextPage, reqAnnos, err := parseResp(resp)

pkg/connector/team.go

@@ -95,7 +95,8 @@ func (o *teamResourceType) List(ctx context.Context, parentID *v2.ResourceId, pt
 
 	teams, resp, err := o.client.Teams.ListTeams(ctx, orgName, opts)
 	if err != nil {
-		return nil, "", nil, fmt.Errorf("github-connector: failed to list teams: %w", err)
+		_, reqAnnos, _ := parseResp(resp)
+		return nil, "", reqAnnos, fmt.Errorf("github-connector: failed to list teams: %w", err)
 	}
 
 	nextPage, reqAnnos, err := parseResp(resp)
@@ -164,9 +165,10 @@ func (o *teamResourceType) Grants(ctx context.Context, resource *v2.Resource, pT
 		return nil, "", nil, fmt.Errorf("error fetching orgID from team profile")
 	}
 
-	org, _, err := o.client.Organizations.GetByID(ctx, orgID)
+	org, resp, err := o.client.Organizations.GetByID(ctx, orgID)
 	if err != nil {
-		return nil, "", nil, err
+		_, reqAnnos, _ := parseResp(resp)
+		return nil, "", reqAnnos, err
 	}
 
 	githubID, err := parseResourceToGitHub(resource.Id)