python3-cyberfusion-external-providers-ip-ranges 2.1.2__tar.gz → 2.3__tar.gz

{python3_cyberfusion_external_providers_ip_ranges-2.1.2 → python3_cyberfusion_external_providers_ip_ranges-2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python3-cyberfusion-external-providers-ip-ranges
-Version: 2.1.2
+Version: 2.3
 Summary: Scripts to add IP ranges of external providers to ferm.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-external-providers-ip-ranges

{python3_cyberfusion_external_providers_ip_ranges-2.1.2 → python3_cyberfusion_external_providers_ip_ranges-2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-cyberfusion-external-providers-ip-ranges"
-version = "2.1.2"
+version = "2.3"
 description = "Scripts to add IP ranges of external providers to ferm."
 readme = "README.md"
 authors = [

{python3_cyberfusion_external_providers_ip_ranges-2.1.2 → python3_cyberfusion_external_providers_ip_ranges-2.3}/src/cyberfusion/ExternalProvidersIPRanges/__init__.py

@@ -61,6 +61,32 @@ class AtlassianIPRangeHandler(ExternalProviderIPRangeHandlerInterface):
         return result
 
 
+class AWSIPRangeHandler(ExternalProviderIPRangeHandlerInterface):
+    """Class for external provider IP range handler."""
+
+    @property
+    def name(self) -> str:
+        """Get external provider name."""
+        return "aws"
+
+    @property
+    def ip_ranges(self) -> List[str]:
+        """Get IP ranges."""
+        result = []
+
+        request = requests.get("https://ip-ranges.amazonaws.com/ip-ranges.json")
+        request.raise_for_status()
+        data = request.json()
+
+        for item in data["prefixes"]:
+            result.append(item["ip_prefix"])
+
+        for item in data["ipv6_prefixes"]:
+            result.append(item["ipv6_prefix"])
+
+        return result
+
+
 class GoogleCloudIPRangeHandler(ExternalProviderIPRangeHandlerInterface):
     """Class for external provider IP range handler."""
 
@@ -100,11 +126,17 @@ class BuddyIPRangeHandler(ExternalProviderIPRangeHandlerInterface):
         """Get IP ranges."""
         result = []
 
+        ip_ranges = []
+
         request = requests.get("https://buddy.works/api/ips")
         request.raise_for_status()
-        data = request.json()
+        ip_ranges.extend(request.json()["runners"])
+
+        request = requests.get("https://buddy.works/api/ips/eu")
+        request.raise_for_status()
+        ip_ranges.extend(request.json()["runners"])
 
-        for item in data["runners"] + data["vms"]:
+        for item in ip_ranges:
             result.append(item)
 
         return result
@@ -123,6 +155,7 @@ def main() -> None:
         BuddyIPRangeHandler(),
         GoogleCloudIPRangeHandler(),
         AtlassianIPRangeHandler(),
+        AWSIPRangeHandler(),
     ]
 
     for handler in handlers:

{python3_cyberfusion_external_providers_ip_ranges-2.1.2 → python3_cyberfusion_external_providers_ip_ranges-2.3}/src/python3_cyberfusion_external_providers_ip_ranges.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python3-cyberfusion-external-providers-ip-ranges
-Version: 2.1.2
+Version: 2.3
 Summary: Scripts to add IP ranges of external providers to ferm.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-external-providers-ip-ranges