Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add releaseDate to json #796

Merged
merged 2 commits into from
Apr 18, 2024
Merged

feat: add releaseDate to json #796

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28a6129
feat: add releaseDate to json
marco-ippolito Apr 14, 2024
ea416f3
feat: leave TBD if not defined yet
marco-ippolito Apr 18, 2024
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
18 changes: 11 additions & 7 deletions lib/prepare_security.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,16 @@ export default class SecurityReleaseSteward {
const req = new Request(credentials);
const release = new PrepareSecurityRelease(req);
const releaseDate = await release.promptReleaseDate(cli);
validateDate(releaseDate);
if (releaseDate !== 'TBD') {
validateDate(releaseDate);
}

const createVulnerabilitiesJSON = await release.promptVulnerabilitiesJSON(cli);

let securityReleasePRUrl;
if (createVulnerabilitiesJSON) {
securityReleasePRUrl = await this.createVulnerabilitiesJSON(req, release, { cli });
securityReleasePRUrl = await this.createVulnerabilitiesJSON(
req, release, releaseDate, { cli });
}

const createIssue = await release.promptCreateRelaseIssue(cli);
Expand All @@ -51,7 +55,7 @@ export default class SecurityReleaseSteward {
cli.ok('Done!');
}

async createVulnerabilitiesJSON(req, release, { cli }) {
async createVulnerabilitiesJSON(req, release, releaseDate, { cli }) {
// checkout on the next-security-release branch
checkoutOnSecurityReleaseBranch(cli, this.repository);

Expand All @@ -61,8 +65,7 @@ export default class SecurityReleaseSteward {
const deps = _.groupBy(depUpdates, 'name');

// create the vulnerabilities.json file in the security-release repo
const filePath = await release.createVulnerabilitiesJSON(reports, deps, { cli });

const filePath = await release.createVulnerabilitiesJSON(reports, deps, releaseDate, { cli });
// review the vulnerabilities.json file
const review = await release.promptReviewVulnerabilitiesJSON(cli);

Expand Down Expand Up @@ -127,7 +130,7 @@ class PrepareSecurityRelease {
nextWeekDate.setDate(nextWeekDate.getDate() + 7);
// Format the date as YYYY/MM/DD
const formattedDate = nextWeekDate.toISOString().slice(0, 10).replace(/-/g, '/');
return cli.prompt('Enter target release date in YYYY/MM/DD format:', {
return cli.prompt('Enter target release date in YYYY/MM/DD format (TBD if not defined yet):', {
questionType: 'input',
defaultAnswer: formattedDate
});
Expand Down Expand Up @@ -217,9 +220,10 @@ class PrepareSecurityRelease {
return selectedReports;
}

async createVulnerabilitiesJSON(reports, dependencies, { cli }) {
async createVulnerabilitiesJSON(reports, dependencies, releaseDate, { cli }) {
cli.separator('Creating vulnerabilities.json...');
const file = JSON.stringify({
releaseDate,
reports,
dependencies
}, null, 2);
Expand Down
Loading