diff --git a/source/plugins/projects/index.mjs b/source/plugins/projects/index.mjs index 98dfe1ef05c..d6131e872fd 100644 --- a/source/plugins/projects/index.mjs +++ b/source/plugins/projects/index.mjs @@ -13,21 +13,17 @@ export default async function({login, data, imports, graphql, q, queries, accoun //Update limit if repositories projects were specified manually limit = Math.max(repositories.length, limit) - //Retrieve user owned projects from graphql api + //Retrieve user owned projects from graphql api (ProjectsV2 only) console.debug(`metrics/compute/${login}/plugins > projects > querying api`) - const {[account]: {projects}} = await graphql(queries.projects["user.legacy"]({login, limit, account})) - const {[account]: {projectsV2}} = await graphql(queries.projects.user({login, limit, account})) - projects.nodes.unshift(...projectsV2.nodes) - projects.totalCount += projectsV2.totalCount + const {[account]: {projectsV2: projects}} = await graphql(queries.projects.user({login, limit, account})) - //Retrieve repositories projects from graphql api + //Retrieve repositories projects from graphql api (ProjectsV2 only) for (const identifier of repositories) { //Querying repository project console.debug(`metrics/compute/${login}/plugins > projects > querying api for ${identifier}`) const {user, repository, id} = identifier.match(/(?[-\w]+)[/](?[-\w]+)[/]projects[/](?\d+)/)?.groups ?? {} let project = null for (const account of ["user", "organization"]) { - //Try projects beta try { project = (await graphql(queries.projects.repository({user, repository, id, account})))[account].repository.projectV2 if (project) @@ -36,16 +32,6 @@ export default async function({login, data, imports, graphql, q, queries, accoun catch (error) { console.debug(error) } - //Try projects classic - try { - console.debug(`metrics/compute/${login}/plugins > projects > falling back to projects classic for ${identifier}`) - ;({project} = (await graphql(queries.projects["repository.legacy"]({user, repository, id, account})))[account].repository) - if (project) - break - } - catch (error) { - console.debug(error) - } } if (!project) throw new Error(`Could not load project ${user}/${repository}`)