Merge pull request #294 from stacklok/fix-linting

fix: fix formatting issues

Author: yrobla

cert_gen.py

@@ -1,9 +1,11 @@
+import datetime
+import os
+
 from cryptography import x509
-from cryptography.x509.oid import NameOID, ExtendedKeyUsageOID
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
-import datetime
-import os
+from cryptography.x509.oid import ExtendedKeyUsageOID, NameOID
+
 
 def generate_certificates(cert_dir="certs"):
     """Generate self-signed certificates with proper extensions for HTTPS proxy"""
@@ -22,12 +24,14 @@ def generate_certificates(cert_dir="certs"):
     ca_public_key = ca_private_key.public_key()
 
     # CA BEGIN
-    name = x509.Name([
-        x509.NameAttribute(NameOID.COMMON_NAME, "Proxy Pilot CA"),
-        x509.NameAttribute(NameOID.ORGANIZATION_NAME, "Proxy Pilot"),
-        x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, "Development"),
-        x509.NameAttribute(NameOID.COUNTRY_NAME, "UK"),
-    ])
+    name = x509.Name(
+        [
+            x509.NameAttribute(NameOID.COMMON_NAME, "Proxy Pilot CA"),
+            x509.NameAttribute(NameOID.ORGANIZATION_NAME, "Proxy Pilot"),
+            x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, "Development"),
+            x509.NameAttribute(NameOID.COUNTRY_NAME, "UK"),
+        ]
+    )
 
     builder = x509.CertificateBuilder()
     builder = builder.subject_name(name)
@@ -54,11 +58,11 @@ def generate_certificates(cert_dir="certs"):
             key_cert_sign=True,  # This is a CA
             crl_sign=True,
             encipher_only=False,
-            decipher_only=False
+            decipher_only=False,
         ),
         critical=True,
     )
-    
+
     ca_cert = builder.sign(
         private_key=ca_private_key,
         algorithm=hashes.SHA256(),
@@ -67,51 +71,55 @@ def generate_certificates(cert_dir="certs"):
     # Save CA certificate and key
 
     with open("certs/ca.crt", "wb") as f:
-            f.write(ca_cert.public_bytes(serialization.Encoding.PEM))
+        f.write(ca_cert.public_bytes(serialization.Encoding.PEM))
 
     with open("certs/ca.key", "wb") as f:
-        f.write(ca_private_key.private_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PrivateFormat.PKCS8,
-            encryption_algorithm=serialization.NoEncryption()
-        ))
+        f.write(
+            ca_private_key.private_bytes(
+                encoding=serialization.Encoding.PEM,
+                format=serialization.PrivateFormat.PKCS8,
+                encryption_algorithm=serialization.NoEncryption(),
+            )
+        )
     # CA END
 
     # SERVER BEGIN
 
-    ## Generate new certificate for domain
+    # Generate new certificate for domain
     server_key = rsa.generate_private_key(
         public_exponent=65537,
         key_size=2048,  # 2048 bits is sufficient for domain certs
     )
 
-    name = x509.Name([
-        x509.NameAttribute(NameOID.COMMON_NAME, "Proxy Pilot CA"),
-        x509.NameAttribute(NameOID.ORGANIZATION_NAME, "Proxy Pilot Generated"),
-    ])
+    name = x509.Name(
+        [
+            x509.NameAttribute(NameOID.COMMON_NAME, "Proxy Pilot CA"),
+            x509.NameAttribute(NameOID.ORGANIZATION_NAME, "Proxy Pilot Generated"),
+        ]
+    )
 
     builder = x509.CertificateBuilder()
     builder = builder.subject_name(name)
     builder = builder.issuer_name(ca_cert.subject)
     builder = builder.public_key(server_key.public_key())
     builder = builder.serial_number(x509.random_serial_number())
     builder = builder.not_valid_before(datetime.datetime.utcnow())
-    builder = builder.not_valid_after(
-        datetime.datetime.utcnow() + datetime.timedelta(days=365)
-    )
+    builder = builder.not_valid_after(datetime.datetime.utcnow() + datetime.timedelta(days=365))
 
-   # Add domain to SAN
+    # Add domain to SAN
     builder = builder.add_extension(
         x509.SubjectAlternativeName([x509.DNSName("localhost")]),
         critical=False,
     )
 
     # Add extended key usage
     builder = builder.add_extension(
-        x509.ExtendedKeyUsage([
-            ExtendedKeyUsageOID.SERVER_AUTH,
-            ExtendedKeyUsageOID.CLIENT_AUTH,
-        ]),
+        x509.ExtendedKeyUsage(
+            [
+                ExtendedKeyUsageOID.SERVER_AUTH,
+                ExtendedKeyUsageOID.CLIENT_AUTH,
+            ]
+        ),
         critical=False,
     )
 
@@ -130,31 +138,41 @@ def generate_certificates(cert_dir="certs"):
         f.write(certificate.public_bytes(serialization.Encoding.PEM))
 
     with open("certs/server.key", "wb") as f:
-        f.write(server_key.private_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PrivateFormat.PKCS8,
-            encryption_algorithm=serialization.NoEncryption()
-        ))
-
+        f.write(
+            server_key.private_bytes(
+                encoding=serialization.Encoding.PEM,
+                format=serialization.PrivateFormat.PKCS8,
+                encryption_algorithm=serialization.NoEncryption(),
+            )
+        )
 
     print("Certificates generated successfully in the 'certs' directory")
     print("\nTo trust these certificates:")
     print("\nOn macOS:")
-    print("sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain certs/server.crt")
+    print(
+        "sudo security add-trusted-cert -d -r trustRoot "
+        "-k /Library/Keychains/System.keychain certs/server.crt"
+    )
     print("\nOn Windows (PowerShell as Admin):")
-    print("Import-Certificate -FilePath \"certs\\server.crt\" -CertStoreLocation Cert:\\LocalMachine\\Root")
+    print(
+        'Import-Certificate -FilePath "certs\\server.crt" '
+        '-CertStoreLocation Cert:\\LocalMachine\\Root'
+    )
     print("\nOn Linux:")
     print("sudo cp certs/server.crt /usr/local/share/ca-certificates/proxy-pilot.crt")
     print("sudo update-ca-certificates")
     print("\nFor VSCode, add to settings.json:")
-    print('''{
+    print(
+        """{
     "http.proxy": "https://localhost:8989",
     "http.proxySupport": "on",
     "github.copilot.advanced": {
         "debug.testOverrideProxyUrl": "https://localhost:8989",
         "debug.overrideProxyUrl": "https://localhost:8989"
     }
-}''')
+}"""
+    )
+
 
 if __name__ == "__main__":
     generate_certificates()

scripts/import_packages.py

@@ -14,7 +14,7 @@
 
 
 class PackageImporter:
-    def __init__(self, jsonl_dir='data', take_backup=True, restore_backup=True):
+    def __init__(self, jsonl_dir="data", take_backup=True, restore_backup=True):
         self.take_backup_flag = take_backup
         self.restore_backup_flag = restore_backup
 
@@ -153,12 +153,13 @@ async def run_import(self):
         "--jsonl-dir",
         type=str,
         default="data",
-        help="Directory containing JSONL files. Default is 'data'."
+        help="Directory containing JSONL files. Default is 'data'.",
     )
     args = parser.parse_args()
 
-    importer = PackageImporter(jsonl_dir=args.jsonl_dir, take_backup=args.take_backup,
-                               restore_backup=args.restore_backup)
+    importer = PackageImporter(
+        jsonl_dir=args.jsonl_dir, take_backup=args.take_backup, restore_backup=args.restore_backup
+    )
     asyncio.run(importer.run_import())
     try:
         assert importer.client.is_live()