script/update-cdn-ips in github-pages-health-check-1.17.7 vs script/update-cdn-ips in github-pages-health-check-1.17.8

- old
+ new

@@ -6,17 +6,45 @@ require "open-uri" require "json" SOURCES = { - :cloudflare => "https://www.cloudflare.com/ips-v4", - :fastly => "https://api.fastly.com/public-ip-list" + :cloudflare => ["https://www.cloudflare.com/ips-v4", "https://www.cloudflare.com/ips-v6"], + :fastly => ["https://api.fastly.com/public-ip-list"] }.freeze -SOURCES.each do |source, url| +def parse_fastly(data) + json_data = JSON.parse(data) + (json_data["addresses"] + json_data["ipv6_addresses"]).join("\n") +end + +def parse_cloudflare(data) + data +end + +def fetch_ips_from_cdn(urls) + urls.map do |url| + puts "Fetching #{url}..." + URI.parse(url).open.read + end.join("\n") +end + +def update_cdn_file(source, data) file = "config/#{source}-ips.txt" - puts "Fetching #{url}..." - data = open(url).read - data = JSON.parse(data)["addresses"].join("\n") if source == :fastly File.write(file, data) + puts "Writing contents to #{file} and staging changes." `git add --verbose #{file}` +end + +def parse_cdn_response(source, ips) + send("parse_#{source}", ips) +end + +def update_cdn_ips(source, urls) + ips = fetch_ips_from_cdn(urls) + data = parse_cdn_response(source, ips) + update_cdn_file(source, data) +end + +SOURCES.each do |source, urls| + update_cdn_ips(source, urls) end