scraper: pass values to `In` as a set instead of individually
authorConnor Sheehan <sheehan@mozilla.com>
Tue, 18 Jan 2022 11:13:29 -0500
changeset 7787 9822fcf4b1178d219b7d7a386dda02a11facf55b
parent 7786 c8bfdccd86193d25635966ea75448ae5c45fbfd6
child 7788 7d54c862c69e8bb845fba3f4577b28a36575330f
push id3901
push usercosheehan@mozilla.com
push dateTue, 18 Jan 2022 16:13:40 +0000
treeherderversion-control-tools@9822fcf4b117 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
scraper: pass values to `In` as a set instead of individually The function signature is `In(container, msg=None)`, so `ipv4Prefix` is being considered the single value in the container, and `ipv6Prefix` is being mapped to `msg`.
scripts/scrape-manifest-ip-ranges.py
--- a/scripts/scrape-manifest-ip-ranges.py
+++ b/scripts/scrape-manifest-ip-ranges.py
@@ -263,17 +263,17 @@ def get_gcp_ips():
             'syncToken': str,
             'creationTime': str,
             # The prefixes field must meet both requirements:
             # 1. There must be at least one entry for each region containing CI and S3 bundles
             # 2. Must be a list of dicts that fit the schema below
             'prefixes': All(all_required_gcp_regions_exist, [
                 {
                     # One of these tags must be present, and it's value must be an IP block.
-                    In('ipv4Prefix', 'ipv6Prefix'): is_ip_address_network,
+                    In({'ipv4Prefix', 'ipv6Prefix'}): is_ip_address_network,
                     'scope': str,
                     'service': str,
                 },
             ]),
         }, extra=False, required=True)
 
 
         # Validate dict schema