Merge ~pfsmorigo/ubuntu-cve-tracker:is_hidden into ubuntu-cve-tracker:master

[Paulo Flabiano Smorigo]

[Steve Beattie (sbeattie)]

A couple of comments, but looks okay to me. Have you tested this as a process?

[Emilia Torino (emitorino)]

Also added a couple of comments. And a final one here: I noticed there is a test folder, in the main UCT dir. Could you please add there some tests and assert generated data (the shell script, the json file). Thanks!

[Emilia Torino (emitorino)]

I will leave the wording for Steve to review :), otherwise LGTM. Thanks!

diff --git a/scripts/publish-usn-to-website-api.py b/scripts/publish-usn-to-website-api.py
index 430867f..d867302 100755
--- a/scripts/publish-usn-to-website-api.py
+++ b/scripts/publish-usn-to-website-api.py
@@ -216,7 +216,9 @@ for notice_id, notice in payload:
         "summary": notice.get("isummary", notice["title"]),
         "instructions": notice.get("action", "In general, a standard system update will make all the necessary changes."),
     }
-    
+    if "is_hidden" in notice:
+        json_data["is_hidden"] = notice["is_hidden"]
+
     # Build endpoint
     if args.action == 'add':
         upsert = not args.no_upsert
diff --git a/scripts/sis-generate-usn b/scripts/sis-generate-usn
index 8c87a56..5ddc86c 100755
--- a/scripts/sis-generate-usn
+++ b/scripts/sis-generate-usn
@@ -542,6 +542,7 @@ print('set -e')
 print('export PATH=$PATH:%s' % (config['usn_tool']))
 print('export USN=%s'%(usn))
 print('export DB="%s"'%(local_pickle))
+print('#export HIDDEN=True')
 print('umask 0002')
 print()
 print('# check for known command-line arguments')
@@ -572,6 +573,7 @@ else:
     print('# XXX FIX ME XXX No CVEs found!  Please include URL-based reference')
     print('usn.py --db "$DB" $USN --cve "https://launchpad.net/bugs/XXXXXX"')
 print()
+print('test "${HIDDEN,,}" = "true" && usn.py --db "$DB" --hidden $HIDDEN $USN')
 
 # Is this an updated CVE?
 addition = False
@@ -859,6 +861,24 @@ for release in releases:
                 print('  usn.py --db "$DB" $USN --release %s --package %s --all-binary-version %s' % (release,deb,version))
         print()
 
+print('if [ "${HIDDEN,,}" = "true" ]; then')
+print('    $UCT/scripts/convert-pickle.py --input-file $DB --output-file $USN.json --prefix USN-')
+print('    mkdir -p "$UCT/experimental/usns"')
+print('    mv $USN.json $UCT/experimental/usns/')
+print('    echo ""')
+print('    echo This USN is set as HIDDEN so no information about it will be stored')
+print('    echo in our database yet. Use the command below to update the website api:')
+print('    echo ""')
+print('    echo "    \$UCT/scripts/publish-usn-to-website-api.py --action add --json \$UCT/experimental/usns/$USN.json"')
+print('    echo ""')
+print('    echo IMPORTANT: Keep $USN.json until it becomes public.')
+print('    echo ""')
+print('    exit')
+print('else')
+print('    read -p "Refresh local USN database and upload it to remote master? [yN] " -n 1 -r')
+print('    [[ ! $REPLY =~ ^[Yy]$ ]] && exit')
+print('fi')
+print('')
 # refresh the local db so when we do an import we can catch cases where a
 # duplicate USN is used before we go to push it to the remote master DB
 print('# Refresh the local DB')