Merge pull request #85 from github/dont-deprecate-quite-yet

Don't deprecate the 192.30.252.15{3,4} quite yet

Author: parkr

lib/github-pages-health-check/domain.rb

@@ -5,11 +5,6 @@ module HealthCheck
     class Domain < Checkable
       attr_reader :host
 
-      GITHUB_DATACENTER_ADDRESSES = %w(
-        192.30.252.153
-        192.30.252.154
-      ).freeze
-
       LEGACY_IP_ADDRESSES = [
         # Legacy GitHub Datacenter
         "207.97.227.245",
@@ -68,18 +63,22 @@ class Domain < Checkable
         "43.249.72.133",
         "43.249.73.133",
         "43.249.74.133",
-        "43.249.75.133",
-
-        *GITHUB_DATACENTER_ADDRESSES
+        "43.249.75.133"
       ].freeze
 
-      CURRENT_IP_ADDRESSES = %w(
+      NEW_PRIMARY_IPS = %w(
         185.199.108.153
         185.199.109.153
         185.199.110.153
         185.199.111.153
       ).freeze
 
+      CURRENT_IP_ADDRESSES = [
+        "192.30.252.153",
+        "192.30.252.154",
+        *NEW_PRIMARY_IPS
+      ].freeze
+
       HASH_METHODS = %i[
         host uri dns_resolves? proxied? cloudflare_ip? fastly_ip?
         old_ip_address? a_record? cname_record? mx_records_present?
@@ -164,6 +163,11 @@ def pointed_to_github_pages_ip?
         a_record? && CURRENT_IP_ADDRESSES.include?(dns.first.address.to_s)
       end
 
+      # Is the domain's first response an A record to the new primary IPs?
+      def pointed_to_new_primary_ips?
+        a_record? && NEW_PRIMARY_IPS.include?(dns.first.address.to_s)
+      end
+
       # Is the domain's first response a CNAME to a pages domain?
       def cname_to_github_user_domain?
         cname? && !cname_to_pages_dot_github_dot_com? && cname.pages_domain?
@@ -339,7 +343,7 @@ def enforces_https?
 
       # Can an HTTPS certificate be issued for this domain?
       def https_eligible?
-        (cname_to_github_user_domain? || pointed_to_github_pages_ip?) &&
+        (cname_to_github_user_domain? || pointed_to_new_primary_ips?) &&
           caa.lets_encrypt_allowed?
       end
 

spec/github_pages_health_check/domain_spec.rb

@@ -101,7 +101,7 @@
     before(:each) { allow(subject).to receive(:dns) { [a_packet] } }
 
     context "old IP addresses" do
-      %w(204.232.175.78 207.97.227.245 192.30.252.153 192.30.252.154).each do |ip_address|
+      %w(204.232.175.78 207.97.227.245).each do |ip_address|
         context ip_address do
           let(:ip) { ip_address }
 
@@ -112,6 +112,18 @@
         end
       end
 
+      %w(192.30.252.153 192.30.252.154).each do |ip_address|
+        context ip_address do
+          let(:ip) { ip_address }
+
+          it "knows it's not an old IP" do
+            expect(subject).not_to be_a_old_ip_address
+            expect(subject).not_to be_a_deprecated_ip
+            expect(subject).to be_pointed_to_github_pages_ip
+          end
+        end
+      end
+
       context "a random IP" do
         let(:ip) { "1.2.3.4" }