From cdb7eed21d10ba870f1eb63c328c76c665b588ec Mon Sep 17 00:00:00 2001
From: "trop[bot]" <trop[bot]@users.noreply.github.com>
Date: Tue, 5 Feb 2019 15:01:20 -0800
Subject: [PATCH] build: ensure index.json is actually valid JSON before
 uploading (backport: 3-1-x) (#16752)

* build: ensure index.json is actually valid JSON before uploading

* chore: fix py linting for validation of index.json
---
 script/upload-index-json.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/script/upload-index-json.py b/script/upload-index-json.py
index 55d0675d070..c6418133a18 100755
--- a/script/upload-index-json.py
+++ b/script/upload-index-json.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import json
 import os
 import sys
 import urllib2
@@ -15,6 +16,13 @@ BASE_URL = 'https://electron-metadumper.herokuapp.com/?version='
 version = sys.argv[1]
 authToken = os.getenv('META_DUMPER_AUTH_HEADER')
 
+def is_json(myjson):
+  try:
+    json.loads(myjson)
+  except ValueError:
+    return False
+  return True
+
 def get_content(retry_count = 5):
   try:
     request = urllib2.Request(
@@ -22,9 +30,14 @@ def get_content(retry_count = 5):
       headers={"Authorization" : authToken}
     )
 
-    return urllib2.urlopen(
+    proposed_content = urllib2.urlopen(
       request
     ).read()
+
+    if is_json(proposed_content):
+      return proposed_content
+    print("bad attempt")
+    raise Exception("Failed to fetch valid JSON from the metadumper service")
   except Exception as e:
     if retry_count == 0:
       raise e