Page MenuHomePhabricator
Differential D8980

[reports-service] Parse email config from CLI args
ClosedPublic
Actions

Authored by bartek on Aug 28 2023, 6:35 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 2, 5:20 AM
Unknown Object (File)
Tue, Apr 1, 9:10 AM
Unknown Object (File)
Sat, Mar 29, 1:28 PM
Unknown Object (File)
Wed, Mar 26, 11:15 AM
Unknown Object (File)
Wed, Mar 26, 11:15 AM
Unknown Object (File)
Wed, Mar 26, 11:15 AM
Unknown Object (File)
Wed, Mar 26, 11:15 AM
Unknown Object (File)
Wed, Mar 26, 5:48 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
michal
• patryk
varun
• jon
Commits
rCOMMab730cddf332: [reports-service] Parse email config from CLI args
Summary

Introduced possibility to pass email config either via CLI args, or from a file (with path configurable from CLI).
The Postmark API token can also be passed as an env variable.

Config being None means that e-mails are disabled.

Depends on D8978

Test Plan

Unit tests, also printed the config object and confirmed that:

  • Config is None if no args passed and no email-config.json present
  • Config is Some if no args passed and valid email-config.json present
  • Config is None if no args passed and invalid email-config.json present
  • Config from email-config.json is overriden by inline json passed as --email-config arg
  • Error is raised if --email-config arg contains invalid JSON (malfolmed or missing fields)
  • Error is raised if both --email-config and --email-config-file are present at the same time
  • Error is raised if --email-config-file contains invalid path (e.g. file not exists)
  • Error is raised if --email-config-file contains path to incorrect JSON
  • Postmark token is read from the config file
  • If POSTMARK_TOKEN env is present, it overrides the file value
  • If the token isn't present in the config file or env, an warn is displayed and config is None

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
services/
reports/
1 line
src/
31 lines
email/
113 lines

Diff 30438

View Options

services/reports/.gitignore

Show First 20 Lines • Show All 342 Lines • ▼ Show 20 Lines query.append(SQL`
ORDER BY tw.threadID, tw.time DESC, tw.id DESC ORDER BY tw.threadID, tw.time DESC, tw.id DESC
`); `);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
const derivedMessages = await fetchDerivedMessages(result, viewer); const derivedMessages = await fetchDerivedMessages(result, viewer);
const messages = await parseMessageSQLResult(result, derivedMessages, viewer); const messages = await parseMessageSQLResult(result, derivedMessages, viewer);
const rawMessageInfos = []; const rawMessageInfos = [];
const threadToMessageCount = new Map(); const threadToMessageCount = new Map<string, number>();
for (const message of messages) { for (const message of messages) {
const { rawMessageInfo } = message; const { rawMessageInfo } = message;
rawMessageInfos.push(rawMessageInfo); rawMessageInfos.push(rawMessageInfo);
const { threadID } = rawMessageInfo; const { threadID } = rawMessageInfo;
const currentCountValue = threadToMessageCount.get(threadID); const currentCountValue = threadToMessageCount.get(threadID);
const currentCount = currentCountValue ? currentCountValue : 0; const currentCount = currentCountValue ? currentCountValue : 0;
threadToMessageCount.set(threadID, currentCount + 1); threadToMessageCount.set(threadID, currentCount + 1);
} }
▲ Show 20 Lines • Show All 479 Lines • ▼ Show 20 Lines SELECT m.id, (
ORDER BY time DESC, id DESC ORDER BY time DESC, id DESC
LIMIT 1 LIMIT 1
) content ) content
FROM messages m FROM messages m
WHERE m.id IN(${messageIDs}) WHERE m.id IN(${messageIDs})
`; `;
const [result] = await dbQuery(latestEditedMessageQuery); const [result] = await dbQuery(latestEditedMessageQuery);
const latestContentByID = new Map(); const latestContentByID = new Map<string, EditMessageContent>();
for (const row of result) { for (const row of result) {
if (!row.content) { if (!row.content) {
continue; continue;
} }
const content = JSON.parse(row.content); const content = JSON.parse(row.content);
latestContentByID.set(row.id.toString(), content); latestContentByID.set(row.id.toString(), content);
} }
▲ Show 20 Lines • Show All 181 Lines • Show Last 20 Lines
View Options

services/reports/src/config.rs

Show First 20 Lines • Show All 342 Lines • ▼ Show 20 Lines query.append(SQL`
ORDER BY tw.threadID, tw.time DESC, tw.id DESC ORDER BY tw.threadID, tw.time DESC, tw.id DESC
`); `);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
const derivedMessages = await fetchDerivedMessages(result, viewer); const derivedMessages = await fetchDerivedMessages(result, viewer);
const messages = await parseMessageSQLResult(result, derivedMessages, viewer); const messages = await parseMessageSQLResult(result, derivedMessages, viewer);
const rawMessageInfos = []; const rawMessageInfos = [];
const threadToMessageCount = new Map(); const threadToMessageCount = new Map<string, number>();
for (const message of messages) { for (const message of messages) {
const { rawMessageInfo } = message; const { rawMessageInfo } = message;
rawMessageInfos.push(rawMessageInfo); rawMessageInfos.push(rawMessageInfo);
const { threadID } = rawMessageInfo; const { threadID } = rawMessageInfo;
const currentCountValue = threadToMessageCount.get(threadID); const currentCountValue = threadToMessageCount.get(threadID);
const currentCount = currentCountValue ? currentCountValue : 0; const currentCount = currentCountValue ? currentCountValue : 0;
threadToMessageCount.set(threadID, currentCount + 1); threadToMessageCount.set(threadID, currentCount + 1);
} }
▲ Show 20 Lines • Show All 479 Lines • ▼ Show 20 Lines SELECT m.id, (
ORDER BY time DESC, id DESC ORDER BY time DESC, id DESC
LIMIT 1 LIMIT 1
) content ) content
FROM messages m FROM messages m
WHERE m.id IN(${messageIDs}) WHERE m.id IN(${messageIDs})
`; `;
const [result] = await dbQuery(latestEditedMessageQuery); const [result] = await dbQuery(latestEditedMessageQuery);
const latestContentByID = new Map(); const latestContentByID = new Map<string, EditMessageContent>();
for (const row of result) { for (const row of result) {
if (!row.content) { if (!row.content) {
continue; continue;
} }
const content = JSON.parse(row.content); const content = JSON.parse(row.content);
latestContentByID.set(row.id.toString(), content); latestContentByID.set(row.id.toString(), content);
} }
▲ Show 20 Lines • Show All 181 Lines • Show Last 20 Lines
View Options

services/reports/src/email/config.rs

Show First 20 Lines • Show All 342 Lines • ▼ Show 20 Lines query.append(SQL`
ORDER BY tw.threadID, tw.time DESC, tw.id DESC ORDER BY tw.threadID, tw.time DESC, tw.id DESC
`); `);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
const derivedMessages = await fetchDerivedMessages(result, viewer); const derivedMessages = await fetchDerivedMessages(result, viewer);
const messages = await parseMessageSQLResult(result, derivedMessages, viewer); const messages = await parseMessageSQLResult(result, derivedMessages, viewer);
const rawMessageInfos = []; const rawMessageInfos = [];
const threadToMessageCount = new Map(); const threadToMessageCount = new Map<string, number>();
for (const message of messages) { for (const message of messages) {
const { rawMessageInfo } = message; const { rawMessageInfo } = message;
rawMessageInfos.push(rawMessageInfo); rawMessageInfos.push(rawMessageInfo);
const { threadID } = rawMessageInfo; const { threadID } = rawMessageInfo;
const currentCountValue = threadToMessageCount.get(threadID); const currentCountValue = threadToMessageCount.get(threadID);
const currentCount = currentCountValue ? currentCountValue : 0; const currentCount = currentCountValue ? currentCountValue : 0;
threadToMessageCount.set(threadID, currentCount + 1); threadToMessageCount.set(threadID, currentCount + 1);
} }
▲ Show 20 Lines • Show All 479 Lines • ▼ Show 20 Lines SELECT m.id, (
ORDER BY time DESC, id DESC ORDER BY time DESC, id DESC
LIMIT 1 LIMIT 1
) content ) content
FROM messages m FROM messages m
WHERE m.id IN(${messageIDs}) WHERE m.id IN(${messageIDs})
`; `;
const [result] = await dbQuery(latestEditedMessageQuery); const [result] = await dbQuery(latestEditedMessageQuery);
const latestContentByID = new Map(); const latestContentByID = new Map<string, EditMessageContent>();
for (const row of result) { for (const row of result) {
if (!row.content) { if (!row.content) {
continue; continue;
} }
const content = JSON.parse(row.content); const content = JSON.parse(row.content);
latestContentByID.set(row.id.toString(), content); latestContentByID.set(row.id.toString(), content);
} }
▲ Show 20 Lines • Show All 181 Lines • Show Last 20 Lines