Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions lib/security-announcement.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import fs from 'node:fs';
import {
NEXT_SECURITY_RELEASE_REPOSITORY,
checkoutOnSecurityReleaseBranch,
getVulnerabilitiesJSON,
getVulnerabilitiesJSONPath,
validateDate,
formatDateToYYYYMMDD,
commitAndPushVulnerabilitiesJSON,
createIssue
} from './security-release/security-release.js';
import auth from './auth.js';
Expand Down Expand Up @@ -40,10 +43,21 @@ export default class SecurityAnnouncement {
validateDate(content.releaseDate);
const releaseDate = new Date(content.releaseDate);

await Promise.all([
const [dockerIssue, buildIssue] = await Promise.all([
this.createDockerNodeIssue(releaseDate),
this.createBuildWGIssue(releaseDate)
]);

content.buildIssue = buildIssue;
content.dockerIssue = dockerIssue;

const vulnerabilitiesJSONPath = getVulnerabilitiesJSONPath();
fs.writeFileSync(vulnerabilitiesJSONPath, JSON.stringify(content, null, 2));
const commitMessage = 'chore: add build and docker issue link';
commitAndPushVulnerabilitiesJSON([vulnerabilitiesJSONPath],
commitMessage, { cli: this.cli, repository: this.repository });

this.cli.ok('Added docker and build issue in vulnerabilities.json');
}

async createBuildWGIssue(releaseDate) {
Expand All @@ -53,7 +67,7 @@ export default class SecurityAnnouncement {
};

const { title, content } = this.createPreleaseAnnouncementIssue(releaseDate, 'build');
await createIssue(title, content, repository, { cli: this.cli, req: this.req });
return createIssue(title, content, repository, { cli: this.cli, req: this.req });
}

createPreleaseAnnouncementIssue(releaseDate, team) {
Expand All @@ -71,6 +85,6 @@ export default class SecurityAnnouncement {
};

const { title, content } = this.createPreleaseAnnouncementIssue(releaseDate, 'docker');
await createIssue(title, content, repository, { cli: this.cli, req: this.req });
return createIssue(title, content, repository, { cli: this.cli, req: this.req });
}
}
7 changes: 7 additions & 0 deletions lib/security-release/security-release.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,12 @@ export function getVulnerabilitiesJSON(cli) {
return file;
}

export function getVulnerabilitiesJSONPath() {
const vulnerabilitiesJSONPath = path.join(process.cwd(),
NEXT_SECURITY_RELEASE_FOLDER, 'vulnerabilities.json');
return vulnerabilitiesJSONPath;
}

export function validateDate(releaseDate) {
const value = new Date(releaseDate).valueOf();
if (Number.isNaN(value) || value < 0) {
Expand Down Expand Up @@ -135,6 +141,7 @@ export async function createIssue(title, content, repository, { cli, req }) {
const data = await req.createIssue(title, content, repository);
if (data.html_url) {
cli.ok(`Created: ${data.html_url}`);
return data.html_url;
} else {
cli.error(data);
process.exit(1);
Expand Down
Loading