Merge pull request #1703 from SkynetLabs/adjust-airtable-script-response

adjust airtable script to new response code
This commit is contained in:
Karol Wypchło 2022-02-14 13:03:47 +01:00 committed by GitHub
commit fa04d77bc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 23 deletions

View File

@ -7,7 +7,6 @@ from time import sleep
import traceback import traceback
import os import os
import sys import sys
import re
import asyncio import asyncio
import requests import requests
import json import json
@ -115,32 +114,17 @@ async def block_skylinks_from_airtable():
offset = data.get("offset") offset = data.get("offset")
print("Airtable returned total " + str(len(skylinks)) + " skylinks to block") print(
"Sending /skynet/blocklist request with "
skylinks_returned = skylinks + str(len(skylinks))
skylinks = [ + " skylinks to siad through nginx"
skylink for skylink in skylinks if re.search("^[a-zA-Z0-9_-]{46}$", skylink) )
]
if len(skylinks_returned) != len(skylinks):
invalid_skylinks = [
str(skylink) for skylink in list(set(skylinks_returned) - set(skylinks))
]
message = (
str(len(invalid_skylinks))
+ " of the skylinks returned from Airtable are not valid"
)
await send_msg(message, file=("\n".join(invalid_skylinks)))
print("Sending blocklist request to siad through nginx")
response = requests.post( response = requests.post(
"http://" + ipaddress + ":8000/skynet/blocklist", "http://" + ipaddress + ":8000/skynet/blocklist",
data=json.dumps({"add": skylinks}), data=json.dumps({"add": skylinks}),
) )
print(json.dumps({"add": skylinks})) if response.status_code != 200:
if response.status_code != 204:
status_code = str(response.status_code) status_code = str(response.status_code)
response_text = response.text or "empty response" response_text = response.text or "empty response"
message = ( message = (
@ -151,7 +135,17 @@ async def block_skylinks_from_airtable():
) )
return await send_msg(message, force_notify=False) return await send_msg(message, force_notify=False)
return await send_msg("Siad blocklist successfully updated with provided skylink") response_json = json.loads(response.text)
invalid_skylinks = response_json["invalids"]
if invalid_skylinks is None:
return await send_msg("Blocklist successfully updated all skylinks")
return await send_msg(
"Blocklist responded ok but failed to update "
+ str(len(invalid_skylinks))
+ " skylinks: "
+ json.dumps(invalid_skylinks)
)
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()