1
0
Fork 0

misc: updated JSON file to include a _comments section for when file was last modified

This commit is contained in:
netravnen 2018-12-27 22:35:23 +00:00
parent e6c859d9bd
commit f6ad6102e6
3 changed files with 12 additions and 4 deletions

View File

@ -92,9 +92,6 @@ function writeRoutinatorExceptionFile ($roas)
$fp = fopen('roa/export_rfc8416_dn42.json', 'w');
//fwrite ($fp, shell_exec ("/usr/bin/git -C ../registry/ show | sed 's/^/\/\/ /g'"));
// Removed as routinator complains about comments in JSON file :(
fwrite($fp, $json);
fclose($fp);
@ -106,7 +103,6 @@ function writeExportJSON ($roas)
$fp = fopen ('roa/export_dn42.json', 'w');
fwrite ($fp, shell_exec ("/usr/bin/git -C ../registry/ show | sed 's/^/\/\/ /g'"));
fwrite ($fp, $json);
fclose ($fp);

View File

@ -6,6 +6,11 @@ require ("lib/functions.php");
// Define array() we are going to populate with data.
$roas["slurmVersion"] = 1;
$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%H'");
$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%p'");
$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%an <%ae>'");
$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%aD'");
$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%s'");
$roas["validationOutputFilters"]["prefixFilters"] = array();
$roas["validationOutputFilters"]["bgpsecFilters"] = array();
$roas["locallyAddedAssertions"]["bgpsecAssertions"] = array();

View File

@ -3,6 +3,13 @@
require ("lib/define.php");
require ("lib/functions.php");
// Define array() we are going to populate with data.
$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%H'");
$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%p'");
$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%an <%ae>'");
$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%aD'");
$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%s'");
/*
*
* IPv6