From f3be716e23914bb83e12d8dac90ed504ca5f2ad7 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 12 Apr 2018 14:35:57 -0400 Subject: [PATCH] WRN-2239: Use date to identify release versions --- README.md | 5 ++--- openwebvulndb/wordpress/__main__.py | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e015d0d..8bca848 100644 --- a/README.md +++ b/README.md @@ -49,10 +49,9 @@ python -m openwebvulndb.wordpress vane_export -i ~/vane/data/ # Export the Vane 2.0 WordPress Scanner vulnerability data. # Add Vane 2 data as an asset of a release on the GitHub repository configured in the virtual environment. # With no argument, the data will be added to the latest release. To create a new release for the data, -# use the --create-release option, specify the version with --release-version. +# use the --create-release option. The current date will be used for the release number. # --target-commitish can be ignored for now, as the default is master. -python -m openwebvulndb.wordpress vane2_export [--create-release] [--target-commitish branch|tag|commit] -[--release-version version] +python -m openwebvulndb.wordpress vane2_export [--create-release] [--target-commitish branch|commit] # Re-load CVE data python -m openwebvulndb.wordpress load_cve diff --git a/openwebvulndb/wordpress/__main__.py b/openwebvulndb/wordpress/__main__.py index 70b14df..34b602e 100644 --- a/openwebvulndb/wordpress/__main__.py +++ b/openwebvulndb/wordpress/__main__.py @@ -59,7 +59,7 @@ def vane_export(vane_importer, storage, input_path): rebuild.write() -def vane2_export(storage, aiohttp_session, loop, create_release=False, target_commitish=None, release_version=None): +def vane2_export(storage, aiohttp_session, loop, create_release=False, target_commitish=None): export_path = EXPORT_PATH os.makedirs(export_path, exist_ok=True) exporter = Exporter(storage) @@ -89,8 +89,8 @@ def vane2_export(storage, aiohttp_session, loop, create_release=False, target_co github_release.set_repository_settings(os.environ["VANE2_REPO_OWNER"], os.environ["VANE2_REPO_PASSWORD"], os.environ["VANE2_REPO_NAME"]) try: - loop.run_until_complete(github_release.release_data(export_path, "vane2_data_", create_release, target_commitish, - release_version)) + loop.run_until_complete(github_release.release_data(export_path, "vane2_data_", create_release, + target_commitish, str(date.today()))) logger.info("Vane data successfully released.") except (Exception, RuntimeError, ValueError) as e: logger.exception(e) @@ -166,7 +166,6 @@ def change_version_format(storage): parser.add_argument("--create-release", dest="create_release", action="store_true", help="Create a new GitHub release") parser.add_argument("--target-commitish", dest="target_commitish", help="Branch name or SHA number of the commit used " "for the new release", default="master") -parser.add_argument("--release-version", dest="release_version", help="print version of the new release") parser.add_argument("--interval", dest="interval", help="The interval in days since the last update of plugins and " "themes versions. 30 days by default", default=30, type=int) parser.add_argument("-w", "--wp-only", dest="wp_only", help="Only populate versions for WordPress core, skip plugins " @@ -184,7 +183,6 @@ def change_version_format(storage): dest_folder=args.dest_folder, create_release=args.create_release, target_commitish=args.target_commitish, - release_version=args.release_version, interval=args.interval, wp_only=args.wp_only) local.call(operations[args.action])