@goodfellow-cms/gitlab 0.9.0 → 0.10.1

package/dist/index.js

@@ -1368,27 +1368,79 @@ function gitlabSetup(options = {}) {
 		async function isAvailable(owner, name) {
 			return (await gitlabRequest(api, `/projects/${encodeURIComponent(`${owner.path}/${name}`)}`, { allow: [404] })).status === 404;
 		}
+		const projectPath = (path) => `/projects/${encodeURIComponent(path)}`;
+		/**
+		* Makes one connection between a site's projects, giving what's left to do
+		* by hand where GitLab refuses it, with what it answered.
+		*/
+		async function attempt(unmade, request, left) {
+			try {
+				await request();
+			} catch (error) {
+				if (!(error instanceof GitApiError)) throw error;
+				left.push({
+					...unmade,
+					reason: error.message
+				});
+			}
+		}
 		/**
 		* Lets each project's pipelines reach the other, as their setup files say:
 		* a job token is refused by a project whose job token allowlist doesn't
 		* name its project, even a public one. Also lets the code project's job
-		* token publish updates, and runs pipelines each night where they need it.
-		* Returns whether it worked.
+		* token publish updates. Runs before the project's files are written,
+		* since their first pipeline reads the other project. Each is tried on its
+		* own, so one GitLab refuses doesn't keep the others from being made.
 		*/
-		async function connectProjects(link) {
-			const project = (path) => `/projects/${encodeURIComponent(path)}`;
-			try {
-				const ids = /* @__PURE__ */ new Map();
-				for (const which of ["code", "content"]) ids.set(which, (await gitlabJson(api, project(link[which]))).id);
-				for (const { reader, read } of link.links.reads) await gitlabRequest(api, `${project(link[read])}/job_token_scope/allowlist`, {
-					method: "POST",
-					body: { target_project_id: ids.get(reader) }
-				});
-				if (link.links.updates) await gitlabRequest(api, project(link[link.links.updates]), {
+		async function connectProjects(link, left) {
+			const ids = /* @__PURE__ */ new Map();
+			for (const which of ["code", "content"]) try {
+				ids.set(which, (await gitlabJson(api, projectPath(link[which]))).id);
+			} catch (error) {
+				if (!(error instanceof GitApiError)) throw error;
+			}
+			for (const { reader, read } of link.links.reads) {
+				const target = ids.get(reader);
+				const source = ids.get(read);
+				await attempt({
+					kind: "read",
+					reader: link[reader],
+					read: link[read],
+					reason: ""
+				}, async () => {
+					if (target === void 0) throw new GitApiError(404, `GitLab couldn't find ${link[reader]}.`);
+					if (source === void 0) throw new GitApiError(404, `GitLab couldn't find ${link[read]}.`);
+					await gitlabRequest(api, `/projects/${source}/job_token_scope/allowlist`, {
+						method: "POST",
+						body: { target_project_id: target }
+					});
+				}, left);
+			}
+			if (link.links.updates) {
+				const repo = link[link.links.updates];
+				await attempt({
+					kind: "push",
+					repo,
+					reason: ""
+				}, () => gitlabRequest(api, projectPath(repo), {
 					method: "PUT",
 					body: { ci_push_repository_for_job_token_allowed: true }
-				});
-				for (const which of link.links.nightly) await gitlabRequest(api, `${project(link[which])}/pipeline_schedules`, {
+				}), left);
+			}
+		}
+		/**
+		* Runs the pipelines that need it each night. After the project's files
+		* are written, since a schedule names the main branch, which an empty
+		* project doesn't have yet.
+		*/
+		async function scheduleNightly(link, left) {
+			for (const which of link.links.nightly) {
+				const repo = link[which];
+				await attempt({
+					kind: "nightly",
+					repo,
+					reason: ""
+				}, () => gitlabRequest(api, `${projectPath(repo)}/pipeline_schedules`, {
 					method: "POST",
 					body: {
 						description: which === link.links.updates ? "Rebuild the site and install Goodfellow's fixes each night" : "Rebuild the site each night",
@@ -1397,15 +1449,7 @@ function gitlabSetup(options = {}) {
 						cron_timezone: "UTC",
 						active: true
 					}
-				});
-				return true;
-			} catch (error) {
-				if (error instanceof GitApiError && [
-					400,
-					403,
-					404
-				].includes(error.status)) return false;
-				throw error;
+				}), left);
 			}
 		}
 		return {
@@ -1446,9 +1490,10 @@ function gitlabSetup(options = {}) {
 					throw error;
 				}
 				const warnings = [];
+				const unconnected = [];
 				if (site.link) {
 					onStep?.("connect");
-					if (!await connectProjects(site.link)) warnings.push("connect-unavailable");
+					await connectProjects(site.link, unconnected);
 				}
 				let siteUrl;
 				if (site.pages && site.domain) {
@@ -1491,13 +1536,16 @@ function gitlabSetup(options = {}) {
 						}])
 					}
 				});
+				if (site.link) await scheduleNightly(site.link, unconnected);
+				if (unconnected.length) warnings.push("connect-unavailable");
 				return {
 					repo: project.path_with_namespace,
 					webUrl: project.web_url,
 					...siteUrl && { siteUrl },
 					buildsUrl: `${project.web_url}/-/pipelines`,
 					pagesUrl: site.pages ? `${project.web_url}/pages` : void 0,
-					warnings
+					warnings,
+					...unconnected.length && { unconnected }
 				};
 			}
 		};

package/dist/testing.d.ts

@@ -40,6 +40,8 @@ export interface FakeGitLabOptions {
   };
   /** Domains another GitLab Pages site already uses. */
   takenDomains?: string[];
+  /** What connecting created projects GitLab refuses, as a plan or a sign-in might: job token allowlists, job token pushes or pipeline schedules. */
+  refuseConnections?: Array<"allowlist" | "push" | "schedule">;
   /** Other GitLab accounts that exist, which can be added to the project. Every token's user exists and is a member. */
   accounts?: string[];
   /** Who can see the project. Private by default. */

package/dist/testing.js

@@ -375,6 +375,7 @@ function fakeGitLab(options) {
 		});
 		if (rest === "" && request.method === "PUT") {
 			const body = await request.json();
+			if (options.refuseConnections?.includes("push")) return json({ message: "403 Forbidden" }, 403);
 			if (body.ci_push_repository_for_job_token_allowed !== void 0) project.jobTokenPush = body.ci_push_repository_for_job_token_allowed;
 			return json({
 				id: project.id,
@@ -382,7 +383,9 @@ function fakeGitLab(options) {
 			});
 		}
 		if (rest === "/job_token_scope/allowlist" && request.method === "POST") {
+			if (!/^\d+$/.test(key)) return json({ error: "id is invalid" }, 400);
 			const body = await request.json();
+			if (options.refuseConnections?.includes("allowlist")) return json({ message: "403 Forbidden" }, 403);
 			if (![...created.values()].some((candidate) => candidate.id === body.target_project_id)) return json({ message: "404 Project Not Found" }, 404);
 			if (!project.jobTokenAllowlist.includes(body.target_project_id)) project.jobTokenAllowlist.push(body.target_project_id);
 			return json({
@@ -401,6 +404,8 @@ function fakeGitLab(options) {
 		}
 		if (rest === "/pipeline_schedules" && request.method === "POST") {
 			const body = await request.json();
+			if (options.refuseConnections?.includes("schedule")) return json({ message: { ref: ["is ambiguous"] } }, 400);
+			if (project.repo.files().size === 0) return json({ message: { ref: ["is ambiguous"] } }, 400);
 			project.schedules.push({
 				...body,
 				active: body.active !== false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodfellow-cms/gitlab",
-  "version": "0.9.0",
+  "version": "0.10.1",
   "description": "Edit a Goodfellow CMS site stored on GitLab, straight from the browser.",
   "keywords": [
     "goodfellow",
@@ -39,7 +39,7 @@
     "dist"
   ],
   "dependencies": {
-    "@goodfellow-cms/core": "0.9.0"
+    "@goodfellow-cms/core": "0.10.1"
   },
   "devDependencies": {
     "@puckeditor/core": "0.23.0"