2220233805

Build # 2220233805

Build Type

github

Committed by GitHub

Commit Message

Merge 8bdc3c8ca into 026232ab6

Pull Request Pull Request #975: migrate phase 1: support old/new instances both sending over jobs

Run Details

564 of 752 branches covered (75.0%)

Branch coverage included in aggregate %.

30 of 31 new or added lines in 5 files covered. (96.77%)

2 existing lines in 1 file now uncovered.

1101 of 1288 relevant lines covered (85.48%)

23.78 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

70.0

/src/cli/commands/update-cron.ts

import { Command } from "commander";
import { promises as fs } from "fs";
import { QuirrelClient } from "../../client";
import {
  RouteScheduleManifest,
  RouteScheduleManifestSchema,
} from "./detect-cron";
import * as config from "../../client/config";
import Table from "easy-table";

async function clearOldInstance() {
  const client = new QuirrelClient({
    async handler() {},
    route: "",
    config: {
      quirrelBaseUrl: config.getOldQuirrelBaseUrl(),
      token: config.getOldQuirrelToken(),
    },
  });
  const endpointsResponse = await client.makeRequest("/queues/update-cron", {
    method: "PUT",
    body: JSON.stringify({
      baseUrl: config.withoutTrailingSlash(
        config.prefixWithProtocol(config.getApplicationBaseUrl())
      ),
      crons: [],
    }),
    headers: { "content-type": "application/json" },
  });
  if (endpointsResponse.status !== 200) {
    throw new Error(
      "Failed to clear old instance: " + (await endpointsResponse.text())
    );
  }
  console.log("Cleared old instance.");
}

export function formatRouteScheduleMapAsTable(jobs: RouteScheduleManifest) {
  return Table.print(
    jobs.map((job) => ({
      Route: job.route,
      Schedule: job.schedule,
    }))
  );
}
export async function updateCron(
  scheduleMap: RouteScheduleManifest,
  dryRun: boolean,
  production: boolean
) {
  if (production) {
    process.env.NODE_ENV = "production";
  }

  const quirrel = new QuirrelClient({
    async handler() {},
    route: "",
  });

  console.log("Jobs:\n");

  console.log(formatRouteScheduleMapAsTable(scheduleMap));

  console.log("Updating server ... ");

  const endpointsResponse = await quirrel.makeRequest("/queues/update-cron", {
    method: "PUT",
    body: JSON.stringify({
      baseUrl: config.withoutTrailingSlash(
        config.prefixWithProtocol(config.getApplicationBaseUrl())
      ),
      crons: scheduleMap,
      dryRun,
    }),
    headers: { "content-type": "application/json" },
  });

  if (endpointsResponse.status !== 200) {
    console.error("Something went wrong: " + (await endpointsResponse.text()));
    return;
  }

  if (dryRun) {
    console.error(`This was a --dry-run, so nothing was applied.`);
  } else {
    console.error(`Successfully updated jobs.`);
  }

  const { deleted } = (await endpointsResponse.json()) as { deleted: string[] };
  if (deleted.length > 0) {
    console.error(
      `These jobs are obsolete, and ${dryRun ? "would be" : "were"} removed: `
    );
    deleted.forEach((route) => console.log(route));
  }

  if (!dryRun && config.getOldQuirrelBaseUrl()) {
    await clearOldInstance();
  }
}

export default function registerUpdateCron(program: Command) {
  program
    .command("update-cron [filename]")
    .description(
      "Updates the Quirrel API with cron jobs that have been detected using detect-cron."
    )
    .option("-d, --dry-run", "Only plan the update, don't execute.", false)
    .option("-p, --production", "Use production config.", false)
    .action(
      async (
        filename = "/dev/stdin",
        { dryRun, production }: { dryRun: boolean; production: boolean }
      ) => {
        const routeScheduleMapString = await fs.readFile(filename, "utf-8");
        const routeScheduleMap = RouteScheduleManifestSchema.parse(
          JSON.parse(routeScheduleMapString)
        );

        await updateCron(routeScheduleMap, dryRun, production);
      }
    );
}

1	import { Command } from "commander";
2	import { promises as fs } from "fs";
3	import { QuirrelClient } from "../../client";
4	import {
5	RouteScheduleManifest,
6	RouteScheduleManifestSchema,
7	} from "./detect-cron";
8	import * as config from "../../client/config";
9	import Table from "easy-table";
10
11	async function clearOldInstance() {
12	const client = new QuirrelClient({
13	async handler() {},
14	route: "",
15	config: {
16	quirrelBaseUrl: config.getOldQuirrelBaseUrl(),
17	token: config.getOldQuirrelToken(),
18	},
19	});
20	const endpointsResponse = await client.makeRequest("/queues/update-cron", {
21	method: "PUT",
22	body: JSON.stringify({
23	baseUrl: config.withoutTrailingSlash(
24	config.prefixWithProtocol(config.getApplicationBaseUrl())
25	),
26	crons: [],
27	}),
28	headers: { "content-type": "application/json" },
29	});
30	if (endpointsResponse.status !== 200) {	×
NEW 31	throw new Error(
32	"Failed to clear old instance: " + (await endpointsResponse.text())
33	);
34	}
35	console.log("Cleared old instance.");
36	}
37
38	export function formatRouteScheduleMapAsTable(jobs: RouteScheduleManifest) {
39	return Table.print(
40	jobs.map((job) => ({
41	Route: job.route,
42	Schedule: job.schedule,
43	}))
44	);
45	}
46	export async function updateCron(
47	scheduleMap: RouteScheduleManifest,
48	dryRun: boolean,
49	production: boolean
50	) {
51	if (production) {	×
52	process.env.NODE_ENV = "production";
53	}
54
55	const quirrel = new QuirrelClient({
56	async handler() {},
57	route: "",
58	});
59
60	console.log("Jobs:\n");
61
62	console.log(formatRouteScheduleMapAsTable(scheduleMap));
63
64	console.log("Updating server ... ");
65
66	const endpointsResponse = await quirrel.makeRequest("/queues/update-cron", {
67	method: "PUT",
68	body: JSON.stringify({
69	baseUrl: config.withoutTrailingSlash(
70	config.prefixWithProtocol(config.getApplicationBaseUrl())
71	),
72	crons: scheduleMap,
73	dryRun,
74	}),
75	headers: { "content-type": "application/json" },
76	});
77
78	if (endpointsResponse.status !== 200) {	×
79	console.error("Something went wrong: " + (await endpointsResponse.text()));
80	return;
81	}
82
83	if (dryRun) {	5!
84	console.error(`This was a --dry-run, so nothing was applied.`);
85	} else {
86	console.error(`Successfully updated jobs.`);
87	}
88
89	const { deleted } = (await endpointsResponse.json()) as { deleted: string[] };
90	if (deleted.length > 0) {	1✔
91	console.error(
92	`These jobs are obsolete, and ${dryRun ? "would be" : "were"} removed: `	1!
93	);
94	deleted.forEach((route) => console.log(route));
95	}
96
97	if (!dryRun && config.getOldQuirrelBaseUrl()) {	11✔
98	await clearOldInstance();
99	}
100	}
101
102	export default function registerUpdateCron(program: Command) {
103	program
104	.command("update-cron [filename]")
105	.description(
106	"Updates the Quirrel API with cron jobs that have been detected using detect-cron."
107	)
108	.option("-d, --dry-run", "Only plan the update, don't execute.", false)
109	.option("-p, --production", "Use production config.", false)
110	.action(
111	async (
112	filename = "/dev/stdin",	×
113	{ dryRun, production }: { dryRun: boolean; production: boolean }
114	) => {
115	const routeScheduleMapString = await fs.readFile(filename, "utf-8");
116	const routeScheduleMap = RouteScheduleManifestSchema.parse(
117	JSON.parse(routeScheduleMapString)
118	);
119
120	await updateCron(routeScheduleMap, dryRun, production);
121	}
122	);
123	}

quirrel-dev / quirrel / 2220233805

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous