From 5c95d6eaff07d755053b7ac3a145dc0aeeda8a35 Mon Sep 17 00:00:00 2001 From: Chriztoffer Date: Fri, 7 Feb 2020 19:42:07 +0000 Subject: [PATCH] Update metadata headers --- rfc8416.php | 58 +++++++++++++++++++++++++++-------------------------- roagen.php | 58 +++++++++++++++++++++++++++-------------------------- 2 files changed, 60 insertions(+), 56 deletions(-) diff --git a/rfc8416.php b/rfc8416.php index 043e964..0b52d59 100755 --- a/rfc8416.php +++ b/rfc8416.php @@ -6,35 +6,9 @@ require ("lib/define.php"); require ("lib/functions.php"); // Define array() we are going to populate with data. +$roas[] = array(); + $roas["slurmVersion"] = 1; -$roas["metadata"]["human"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%H'"); -$roas["metadata"]["human"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%p'"); -$roas["metadata"]["human"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%an'"); -$roas["metadata"]["human"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%aD'"); -$roas["metadata"]["human"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%s'"); -$roas["metadata"]["human"]["url"] = "https://git.dn42.us/dn42/registry/commit/"; -$roas["metadata"]["human"]["url"] .= $roas["metadata"]["human"]["commit"]; - -/* - * 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")),"+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"]["bgpsecFilters"] = array(); @@ -246,6 +220,34 @@ foreach ($raw_array as $sub_array) } } +$roas["metadata"]["human"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%p'"); +$roas["metadata"]["human"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%an'"); +$roas["metadata"]["human"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%aD'"); +$roas["metadata"]["human"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%s'"); +$roas["metadata"]["human"]["url"] = "https://git.dn42.us/dn42/registry/commit/"; +$roas["metadata"]["human"]["url"] .= $roas["metadata"]["human"]["commit"]; + +/* + * 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")),"+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"); + writeRoutinatorExceptionFile($roas); ?> diff --git a/roagen.php b/roagen.php index 21087da..91ffa22 100755 --- a/roagen.php +++ b/roagen.php @@ -6,34 +6,7 @@ require ("lib/define.php"); require ("lib/functions.php"); // Define array() we are going to populate with data. -$roas["metadata"]["human"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%H'"); -$roas["metadata"]["human"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%p'"); -$roas["metadata"]["human"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%an'"); -$roas["metadata"]["human"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%aD'"); -$roas["metadata"]["human"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%s'"); -$roas["metadata"]["human"]["url"] = "https://git.dn42.us/dn42/registry/commit/"; -$roas["metadata"]["human"]["url"] .= $roas["metadata"]["human"]["commit"]; - -/* - * 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")),"+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[] = array(); /* * @@ -241,6 +214,35 @@ foreach ($raw_array as $sub_array) } } +$roas["metadata"]["human"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%H'"); +$roas["metadata"]["human"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%p'"); +$roas["metadata"]["human"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%an'"); +$roas["metadata"]["human"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%aD'"); +$roas["metadata"]["human"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%s'"); +$roas["metadata"]["human"]["url"] = "https://git.dn42.us/dn42/registry/commit/"; +$roas["metadata"]["human"]["url"] .= $roas["metadata"]["human"]["commit"]; + +/* + * 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")),"+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"); + writeExportJSON($roas); writeBirdConfig($roas);