Update metadata headers

This commit is contained in:
netravnen 2020-02-07 14:25:33 +00:00
parent 7cac46a708
commit f85258ebce
2 changed files with 57 additions and 37 deletions

View file

@ -7,13 +7,35 @@ require ("lib/functions.php");
// Define array() we are going to populate with data. // Define array() we are going to populate with data.
$roas["slurmVersion"] = 1; $roas["slurmVersion"] = 1;
$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%H'"); $roas["metadata"]["human"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%H'");
$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%p'"); $roas["metadata"]["human"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%p'");
$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%an'"); $roas["metadata"]["human"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%an'");
$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%aD'"); $roas["metadata"]["human"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%aD'");
$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%s'"); $roas["metadata"]["human"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%s'");
$roas["_comments"]["modified"]["url"] = "https://git.dn42.us/dn42/registry/commit/"; $roas["metadata"]["human"]["url"] = "https://git.dn42.us/dn42/registry/commit/";
$roas["_comments"]["modified"]["url"] .= $roas["_comments"]["modified"]["commit"]; $roas["metadata"]["human"]["url"] .= $roas["metadata"]["human"]["commit"];
/*
* Function: Add metadata
*
* Addinfo
* 1.generationtime(now),
* 2.expiretime(now+3days),
* 3.numberofroutes
*
* Numbersmustbeunquotedintegers,andtimeformatmust
* beepochformat.TImezoneissettoEtc/UTC.
*/
$roas["metadata"]["counts"]=(int)count($roas["roas"]);
$roas["metadata"]["generated"]=(int)(date_format(new \DateTime("now",new \DateTimeZone("UTC")),"U"));
$roas["metadata"]["valid"]=(int)(date_format(date_modify(new \DateTime("now",new \DateTimeZone("UTC")),"+3day"),"U"));
//$roas["metadata"]["signature"] = "";
//$roas["metadata"]["signatureData"] = "";
// Additional human read-able DateTime format, example: 2013-04-12T15:52:01+00:00
$roas["metadata"]["human"]["generated"]=date_format(new \DateTime("now",new \DateTimeZone("UTC")),"c");
$roas["metadata"]["human"]["valid"]=date_format(date_modify(new \DateTime("now",new \DateTimeZone("UTC")),"+3day"),"c");
$roas["validationOutputFilters"]["prefixFilters"] = array(); $roas["validationOutputFilters"]["prefixFilters"] = array();
$roas["validationOutputFilters"]["bgpsecFilters"] = array(); $roas["validationOutputFilters"]["bgpsecFilters"] = array();
$roas["locallyAddedAssertions"]["bgpsecAssertions"] = array(); $roas["locallyAddedAssertions"]["bgpsecAssertions"] = array();

View file

@ -6,13 +6,34 @@ require ("lib/define.php");
require ("lib/functions.php"); require ("lib/functions.php");
// Define array() we are going to populate with data. // Define array() we are going to populate with data.
$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%H'"); $roas["metadata"]["human"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%H'");
$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%p'"); $roas["metadata"]["human"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%p'");
$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%an'"); $roas["metadata"]["human"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%an'");
$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%aD'"); $roas["metadata"]["human"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%aD'");
$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%s'"); $roas["metadata"]["human"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%s'");
$roas["_comments"]["modified"]["url"] = "https://git.dn42.us/dn42/registry/commit/"; $roas["metadata"]["human"]["url"] = "https://git.dn42.us/dn42/registry/commit/";
$roas["_comments"]["modified"]["url"] .= $roas["_comments"]["modified"]["commit"]; $roas["metadata"]["human"]["url"] .= $roas["metadata"]["human"]["commit"];
/*
* Function: Add metadata
*
* Addinfo
* 1.generationtime(now),
* 2.expiretime(now+3days),
* 3.numberofroutes
*
* Numbersmustbeunquotedintegers,andtimeformatmust
* beepochformat.TImezoneissettoEtc/UTC.
*/
$roas["metadata"]["counts"] = (int)count($roas["roas"]);
$roas["metadata"]["generated"] = (int)(date_format(new \DateTime("now",new \DateTimeZone("UTC")),"U"));
$roas["metadata"]["valid"] = (int)(date_format(date_modify(new \DateTime("now",new \DateTimeZone("UTC")),"+3day"),"U"));
//$roas["metadata"]["signature"] = "";
//$roas["metadata"]["signatureData"] = "";
// Additional human read-able DateTime format, example: 2013-04-12T15:52:01+00:00
$roas["metadata"]["human"]["generated"] = date_format(new \DateTime("now",new \DateTimeZone("UTC")),"c");
$roas["metadata"]["human"]["valid"] = date_format(date_modify(new \DateTime("now",new \DateTimeZone("UTC")),"+3day"),"c");
/* /*
* *
@ -220,29 +241,6 @@ foreach ($raw_array as $sub_array)
} }
} }
/*
* Function: Add metadata
*
* Add info
* 1. generation time (now),
* 2. expire time (now + 3 days),
* 3. number of routes
*
* Numbers must be unquoted integers, and timeformat must
* be epoch format. TImezone is set to Etc/UTC.
*/
$roas["metadata"]["counts"] = (int)count($roas["roas"]);
$roas["metadata"]["generated"] = (int)(date_format(new \DateTime("now", new \DateTimeZone("UTC")), "U"));
$roas["metadata"]["valid"] = (int)(date_format(date_modify(new \DateTime("now", new \DateTimeZone("UTC")), "+3 day"), "U"));
/*
$roas["metadata"]["signature"] = "";
$roas["metadata"]["signatureData"] = "";
*/
// Additional human readbable DateTime format, example: 2013-04-12T15:52:01+00:00
$roas["metadata"]["human"]["generated"] = date_format(new \DateTime("now", new \DateTimeZone("UTC")), "c");
$roas["metadata"]["human"]["valid"] = date_format(date_modify(new \DateTime("now", new \DateTimeZone("UTC")), "+3 day"), "c");
writeExportJSON($roas); writeExportJSON($roas);
writeBirdConfig($roas); writeBirdConfig($roas);