Merge branch 'main' into update/sync-secrets-new

Author: aldevv

pkg/connector/helpers.go

@@ -3,6 +3,7 @@ package connector
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strconv"
 	"strings"
 	"sync"
@@ -212,3 +213,10 @@ type hasSAMLQuery struct {
 		}
 	} `graphql:"organization(login: $orgLoginName)"`
 }
+
+func isNotFoundError(resp *github.Response) bool {
+	if resp == nil {
+		return false
+	}
+	return resp.StatusCode == http.StatusNotFound
+}

pkg/connector/repository.go

@@ -227,9 +227,18 @@ func (o *repositoryResourceType) Grants(
 					return nil, "", nil, err
 				}
 
-				rv = append(rv, grant.NewGrant(resource, permission, tr.Id, grant.WithAnnotation(&v2.V1Identifier{
-					Id: fmt.Sprintf("repo-grant:%s:%d:%s", resource.Id.Resource, team.GetID(), permission),
-				})))
+				rv = append(rv, grant.NewGrant(resource, permission, tr.Id, grant.WithAnnotation(
+					&v2.V1Identifier{
+						Id: fmt.Sprintf("repo-grant:%s:%d:%s", resource.Id.Resource, team.GetID(), permission),
+					},
+					&v2.GrantExpandable{
+						EntitlementIds: []string{
+							entitlement.NewEntitlementID(tr, teamRoleMaintainer),
+							entitlement.NewEntitlementID(tr, teamRoleMember),
+						},
+						Shallow: true,
+					},
+				)))
 			}
 		}
 	default:
@@ -289,7 +298,7 @@ func (o *repositoryResourceType) Grant(ctx context.Context, principal *v2.Resour
 			return nil, fmt.Errorf("github-connectorv2: failed to add user to a repository: %w", e)
 		}
 	case resourceTypeTeam.Id:
-		team, _, err := o.client.Teams.GetTeamBySlug(ctx, fmt.Sprintf("%v", org.GetID()), fmt.Sprintf("%v", principalID))
+		team, _, err := o.client.Teams.GetTeamBySlug(ctx, *org.Name, fmt.Sprintf("%v", principalID))
 		if err != nil {
 			return nil, fmt.Errorf("github-connectorv2: failed to get team: %w", err)
 		}
@@ -347,7 +356,7 @@ func (o *repositoryResourceType) Revoke(ctx context.Context, grant *v2.Grant) (a
 			return nil, fmt.Errorf("github-connectorv2: failed to remove user from repo: %w", e)
 		}
 	case resourceTypeTeam.Id:
-		team, _, err := o.client.Teams.GetTeamBySlug(ctx, fmt.Sprintf("%v", org.GetID()), fmt.Sprintf("%v", principalID))
+		team, _, err := o.client.Teams.GetTeamBySlug(ctx, *org.Name, fmt.Sprintf("%v", principalID))
 		if err != nil {
 			return nil, fmt.Errorf("github-connectorv2: failed to get team: %w", err)
 		}

pkg/connector/team.go

@@ -12,9 +12,11 @@ import (
 	"github.com/conductorone/baton-sdk/pkg/types/entitlement"
 	"github.com/conductorone/baton-sdk/pkg/types/grant"
 	rType "github.com/conductorone/baton-sdk/pkg/types/resource"
+	"github.com/conductorone/baton-sdk/pkg/uhttp"
 	"github.com/google/go-github/v69/github"
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
 	"go.uber.org/zap"
+	"google.golang.org/grpc/codes"
 )
 
 const (
@@ -102,8 +104,11 @@ func (o *teamResourceType) List(ctx context.Context, parentID *v2.ResourceId, pt
 	}
 
 	for _, team := range teams {
-		fullTeam, _, err := o.client.Teams.GetTeamBySlug(ctx, fmt.Sprintf("%v", orgID), fmt.Sprintf("%v", team.GetID()))
+		fullTeam, _, err := o.client.Teams.GetTeamBySlug(ctx, orgName, team.GetSlug())
 		if err != nil {
+			if isNotFoundError(resp) {
+				return nil, "", nil, uhttp.WrapErrors(codes.NotFound, fmt.Sprintf("team: %d not found", team.GetID()))
+			}
 			return nil, "", nil, err
 		}
 
@@ -178,6 +183,9 @@ func (o *teamResourceType) Grants(ctx context.Context, resource *v2.Resource, pT
 
 	users, resp, err := o.client.Teams.ListTeamMembersByID(ctx, org.GetID(), githubID, &opts)
 	if err != nil {
+		if isNotFoundError(resp) {
+			return nil, "", nil, uhttp.WrapErrors(codes.NotFound, fmt.Sprintf("org: %d not found", org.GetID()))
+		}
 		return nil, "", nil, fmt.Errorf("github-connectorv2: failed to fetch team members: %w", err)
 	}
 
@@ -195,6 +203,9 @@ func (o *teamResourceType) Grants(ctx context.Context, resource *v2.Resource, pT
 	for _, user := range users {
 		membership, _, err := o.client.Teams.GetTeamMembershipByID(ctx, org.GetID(), githubID, user.GetLogin())
 		if err != nil {
+			if isNotFoundError(resp) {
+				return nil, "", nil, uhttp.WrapErrors(codes.NotFound, fmt.Sprintf("user: %s not found", user.GetLogin()))
+			}
 			return nil, "", nil, fmt.Errorf("github-connectorv2: failed to get team membership for user: %w", err)
 		}