DEVPROD-15766: Return resource IDs with permissions (evergreen-ci#10034)

Author: sophstad

graphql/generated.go

@@ -66,9 +66,10 @@ func (r *permissionsResolver) DistroPermissions(ctx context.Context, obj *Permis
 		return nil, ResourceNotFound.Send(ctx, fmt.Sprintf("user '%s' not found", obj.UserID))
 	}
 	return &DistroPermissions{
-		Admin: userHasDistroPermission(ctx, usr, options.DistroID, evergreen.DistroSettingsAdmin.Value),
-		Edit:  userHasDistroPermission(ctx, usr, options.DistroID, evergreen.DistroSettingsEdit.Value),
-		View:  userHasDistroPermission(ctx, usr, options.DistroID, evergreen.DistroSettingsView.Value),
+		DistroID: options.DistroID,
+		Admin:    userHasDistroPermission(ctx, usr, options.DistroID, evergreen.DistroSettingsAdmin.Value),
+		Edit:     userHasDistroPermission(ctx, usr, options.DistroID, evergreen.DistroSettingsEdit.Value),
+		View:     userHasDistroPermission(ctx, usr, options.DistroID, evergreen.DistroSettingsView.Value),
 	}, nil
 }
 
@@ -89,8 +90,9 @@ func (r *permissionsResolver) ProjectPermissions(ctx context.Context, obj *Permi
 		return nil, ResourceNotFound.Send(ctx, fmt.Sprintf("project '%s' not found", options.ProjectIdentifier))
 	}
 	return &ProjectPermissions{
-		Edit: userHasProjectSettingsPermission(ctx, usr, project.Id, evergreen.ProjectSettingsEdit.Value),
-		View: userHasProjectSettingsPermission(ctx, usr, project.Id, evergreen.ProjectSettingsView.Value),
+		ProjectIdentifier: options.ProjectIdentifier,
+		Edit:              userHasProjectSettingsPermission(ctx, usr, project.Id, evergreen.ProjectSettingsEdit.Value),
+		View:              userHasProjectSettingsPermission(ctx, usr, project.Id, evergreen.ProjectSettingsView.Value),
 	}, nil
 }
 
@@ -117,8 +119,9 @@ func (r *permissionsResolver) RepoPermissions(ctx context.Context, obj *Permissi
 	}
 
 	return &RepoPermissions{
-		Edit: userHasProjectSettingsPermission(ctx, usr, repo.Id, evergreen.ProjectSettingsEdit.Value),
-		View: hasRepoViewPermission,
+		RepoID: options.RepoID,
+		Edit:   userHasProjectSettingsPermission(ctx, usr, repo.Id, evergreen.ProjectSettingsEdit.Value),
+		View:   hasRepoViewPermission,
 	}, nil
 }
 

graphql/models_gen.go

@@ -11,17 +11,20 @@ input RepoPermissionsOptions {
 }
 
 type DistroPermissions {
+  distroId: String!
   admin: Boolean!
   edit: Boolean!
   view: Boolean!
 }
 
 type ProjectPermissions {
+  projectIdentifier: String!
   edit: Boolean!
   view: Boolean!
 }
 
 type RepoPermissions {
+  repoId: String!
   edit: Boolean!
   view: Boolean!
 }

graphql/permissions_resolver.go

@@ -7,15 +7,18 @@ query {
       canCreateProject
       canEditAdminSettings
       distroPermissions(options: { distroId: "rhel71-power8-large" }) {
+        distroId
         admin
         edit
         view
       }
       projectPermissions(options: { projectIdentifier: "sandbox_project_id" }) {
+        projectIdentifier
         edit
         view
       }
       repoPermissions(options: { repoId: "sandbox_repo_id" }) {
+        repoId
         edit
         view
       }

graphql/schema/types/permissions.graphql

@@ -5,15 +5,18 @@ query {
     permissions {
       canCreateDistro
       distroPermissions(options: { distroId: "rhel71-power8-large" }) {
+        distroId
         admin
         edit
         view
       }
       projectPermissions(options: { projectIdentifier: "sandbox_project_id" }) {
+        projectIdentifier
         edit
         view
       }
       repoPermissions(options: { repoId: "sandbox_repo_id" }) {
+        repoId
         edit
         view
       }