fixup! Different rate limits depending on HTTP method (#5555)

Author: dsotirho-ucsc

terraform/api_gateway.tf.json.template.py

@@ -2,9 +2,6 @@
     dataclass,
 )
 import importlib
-from itertools import (
-    chain,
-)
 import json
 import logging
 
@@ -119,19 +116,17 @@ def check_waf_rules(rules: JSONs) -> JSONs:
     return rules
 
 
-def user_ip() -> str:
+def public_ip() -> str:
     """
-    Return the user's public IP address in CIDR notation.
+    Return the public IPv4 address of the machine running this code.
     """
     url = 'https://checkip.amazonaws.com'
     http = http_client(log)
     response = http.request('GET', url)
-    if response.status != 200:
-        raise RuntimeError('Unexpected response %s' % url, response.status)
-    else:
-        ip_address = response.data.decode().strip()
-        log.info('Determined IP address: %s', ip_address)
-        return ip_address + '/32'
+    assert response.status == 200, R('Unexpected response', response)
+    ip_address = response.data.decode().strip()
+    log.info('Determined IP address: %s', ip_address)
+    return ip_address
 
 
 zones_by_domain = {
@@ -263,15 +258,13 @@ def user_ip() -> str:
                     'name': config.qualified_resource_name('it_v4_ips'),
                     'scope': 'REGIONAL',
                     'ip_address_version': 'IPV4',
-                    'addresses': list(chain(
-                        [
+                    'addresses': [
+                        public_ip() + '/32',
+                        *[
                             f'${{data.aws_nat_gateway.gitlab_{zone}.public_ip}}/32'
                             for zone in range(vpc.num_zones)
-                        ],
-                        [
-                            user_ip(),
                         ]
-                    ))
+                    ]
                 }
             },
             'aws_wafv2_web_acl': {