Bump flask from 1.1.1 to 2.2.5 (#1)

* Bump flask from 1.1.1 to 2.2.5

Bumps [flask](https://github.com/pallets/flask) from 1.1.1 to 2.2.5.
- [Release notes](https://github.com/pallets/flask/releases)
- [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst)
- [Commits](pallets/flask@1.1.1...2.2.5)

---
updated-dependencies:
- dependency-name: flask
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump all dependencies and fix linters

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Fionn Fitzmaurice <fionn@github.com>

Author: dependabot[bot]

.github/workflows/main.yml

@@ -3,26 +3,30 @@ name: CI
 on: push
 
 jobs:
+
   lint:
+
     name: Lint
     runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v2
+
+    - name: Checkout
+      uses: actions/checkout@v3
+
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: "3.10"
+
     - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-        pip install -r requirements_dev.txt
-        pip install safety
+      run: pip install -r requirements.txt -r requirements_dev.txt
+      env:
+        PIP_DISABLE_PIP_VERSION_CHECK: 1
+        PIP_PROGRESS_BAR: "off"
+
     - name: Lint
       run: make lint
+
     - name: Typecheck
       run: make typecheck
-    - name: Safety check
-      env:
-        SAFETY_API_KEY: ${{ secrets.SAFETY_API_KEY }}
-      run: safety check

mypy.ini renamed to .mypy.ini

@@ -3,14 +3,14 @@
 
 import os
 from dataclasses import dataclass
-from ipaddress import ip_address, IPv4Address
-from typing import Set, List, NamedTuple, Optional
+from ipaddress import IPv4Address
+from typing import NamedTuple, Optional
 
 import boto3
 
-NameDomain = NamedTuple("NameSubdomain", [("name", str), ("subdomain", str)])
-Infrastructure = NamedTuple("Infrastructure", [("clusters", List["Cluster"]),
-                                               ("servers", List["Server"])])
+NameDomain = NamedTuple("NameDomain", [("name", str), ("subdomain", str)])
+Infrastructure = NamedTuple("Infrastructure", [("clusters", list["Cluster"]),
+                                               ("servers", list["Server"])])
 
 CLUSTER_MAP = {1: NameDomain("Los Angeles", "la"),
                2: NameDomain("New York", "nyc"),
@@ -57,7 +57,7 @@ class Cluster:
     def __init__(self, cluster_id: int, subdomain: str) -> None:
         self.cluster_id = cluster_id
         self.subdomain = subdomain
-        self.server_instances: List[Server] = []
+        self.server_instances: list[Server] = []
 
     @property
     def cluster_name(self) -> str:
@@ -92,7 +92,7 @@ def _get_hosted_zone(self) -> dict:
         raise RuntimeError(f"Failed to find hosted zone for {self.name}")
 
     @property
-    def records(self) -> List[dict]:
+    def records(self) -> list[dict]:
         """Flexible record property"""
         record_sets = self.r53 \
                       .list_resource_record_sets(HostedZoneId=self.id) \
@@ -101,17 +101,17 @@ def records(self) -> List[dict]:
                 if (r["Type"] == "A" and r["Name"] != self.name)]
 
     @staticmethod
-    def ips_from_record(record: dict) -> Set[IPv4Address]:
+    def ips_from_record(record: dict) -> set[IPv4Address]:
         """Helper to get IP addresses from a given record"""
         ips = set()
         for value in record["ResourceRecords"]:
-            ips.add(ip_address(value["Value"]))
+            ips.add(IPv4Address(value["Value"]))
         return ips
 
-    def _a_record(self, name: str, ips: Set[IPv4Address],
+    def _a_record(self, name: str, ips: set[IPv4Address],
                   action: str, ttl: int = 30) -> None:
         change_batch = {
-            "Comment": "add {} -> {}"
+            "Comment": "add f{} -> {}"  # pylint: disable=consider-using-f-string
                        .format(name, ", ".join([ip.exploded for ip in ips])),
             "Changes": [
                 {
@@ -134,7 +134,7 @@ def add_server(self, server: Server) -> None:
         """Adds the server's IP to the cluster's subdomain."""
         fqdn = CLUSTER_MAP[server.cluster_id].subdomain + "." + self.name
 
-        ips: Set[IPv4Address] = set()
+        ips: set[IPv4Address] = set()
         for record in self.records:
             if fqdn == record["Name"]:
                 ips = self.ips_from_record(record)
@@ -149,7 +149,7 @@ def remove_server(self, server: Server) -> None:
         """Removes the server's IP from the DNS record."""
         fqdn = CLUSTER_MAP[server.cluster_id].subdomain + "." + self.name
 
-        ips: Set[IPv4Address] = set()
+        ips: set[IPv4Address] = set()
         for record in self.records:
             if fqdn == record["Name"]:
                 ips = self.ips_from_record(record)
@@ -174,15 +174,15 @@ def create_infrastructure() -> Infrastructure:
     for cluster_id, ident in CLUSTER_MAP.items():
         clusters.append(Cluster(cluster_id, ident.subdomain))
 
-    clusters[0].create_server(1, ip=ip_address("2.4.6.8"))
-    clusters[1].create_server(2, ip=ip_address("1.0.1.1"))
-    clusters[2].create_server(3, ip=ip_address("5.6.7.8"))
-    clusters[3].create_server(4, ip=ip_address("4.3.2.1"))
-    clusters[3].create_server(5, ip=ip_address("1.2.3.4"))
-    clusters[3].create_server(6, ip=ip_address("1.2.3.5"))
-    clusters[3].create_server(7, ip=ip_address("1.2.3.6"))
-    clusters[4].create_server(8, ip=ip_address("8.1.1.1"))
-    clusters[5].create_server(9, ip=ip_address("9.1.1.1"))
+    clusters[0].create_server(1, ip=IPv4Address("2.4.6.8"))
+    clusters[1].create_server(2, ip=IPv4Address("1.0.1.1"))
+    clusters[2].create_server(3, ip=IPv4Address("5.6.7.8"))
+    clusters[3].create_server(4, ip=IPv4Address("4.3.2.1"))
+    clusters[3].create_server(5, ip=IPv4Address("1.2.3.4"))
+    clusters[3].create_server(6, ip=IPv4Address("1.2.3.5"))
+    clusters[3].create_server(7, ip=IPv4Address("1.2.3.6"))
+    clusters[4].create_server(8, ip=IPv4Address("8.1.1.1"))
+    clusters[5].create_server(9, ip=IPv4Address("9.1.1.1"))
 
     servers = []
     for cluster in clusters:
@@ -193,15 +193,15 @@ def create_infrastructure() -> Infrastructure:
 
     return Infrastructure(clusters, servers)
 
-def print_servers(server_instances: List[Server]) -> None:
+def print_servers(server_instances: list[Server]) -> None:
     """ASCII analogy of the server UI"""
     print("\n\033[1mID\t Name\t Cluster\t IP\t\t DNS\033[0m")
     for server in server_instances:
         print(server.server_id, "\t", server.name, "\t",
               CLUSTER_MAP[server.cluster_id].name, "\t",
               server.ip_address, server.dns)
 
-def print_dns(dns_records: List[dict], server_instances: List[Server]) -> None:
+def print_dns(dns_records: list[dict], server_instances: list[Server]) -> None:
     """ASCII analogy of the DNS UI"""
     print("\n\033[1mDomain\t\t\t\t\t IP(s)\t\t Server(s)\t Cluster\033[0m")
     for record in dns_records:
@@ -214,7 +214,7 @@ def print_dns(dns_records: List[dict], server_instances: List[Server]) -> None:
               [CLUSTER_MAP[server.cluster_id].name
                for server in matching_servers])
 
-def update_servers(records: List[dict], servers: List[Server]) -> None:
+def update_servers(records: list[dict], servers: list[Server]) -> None:
     """Assigns to each server instance their DNS record name"""
     for server in servers:
         server.dns = None

app/server_admin/dns.py

@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+
+import unittest
+
+from app import create_app
+
+class BasicTest(unittest.TestCase):
+
+    def setUp(self) -> None:
+        self.app = create_app()
+
+def main() -> None:
+    """Entry point"""
+    unittest.main(verbosity=2)
+
+if __name__ == "__main__":
+    main()

app/tests/tests.py

@@ -17,7 +17,7 @@
 
 @APP.route("/")
 @APP.route("/index")
-def index() -> flask.signals.template_rendered:
+def index() -> str:
     """index"""
     links = [
         {
@@ -32,14 +32,14 @@ def index() -> flask.signals.template_rendered:
     return flask.render_template("index.html", title="Home", links=links)
 
 @APP.route("/servers")
-def servers_ui() -> flask.signals.template_rendered:
+def servers_ui() -> str:
     """Renders the server UI"""
     servers = INFRASTRUCTURE.servers
     dns.update_servers(ZONE.records, servers)
     return flask.render_template("servers.html", title="Servers", servers=servers)
 
 @APP.route("/dns")
-def dns_ui() -> flask.signals.template_rendered:
+def dns_ui() -> str:
     """Renders the DNS UI"""
     return flask.render_template("dns.html", title="DNS", zone_name=ZONE.name,
                                  servers=INFRASTRUCTURE.servers,

app/views.py

@@ -1,3 +1,3 @@
-flask == 1.1.1
-boto3 == 1.9.210
-gunicorn == 19.9.0
+flask == 2.3.2
+boto3 == 1.26.125
+gunicorn == 20.1.0

requirements.txt

@@ -1,3 +1,3 @@
-mypy >= 0.720
-pylint >= 2.3.1
-python-dotenv >= 0.10.3
+mypy == 1.2.0
+pylint == 2.17.3
+python-dotenv == 1.0.0

requirements_dev.txt

@@ -1 +1 @@
-python-3.8.1
+python-3.10.11