Ruff fixes

Author: azvoleff

scripts/fetch_boundaries_from_api.py

@@ -488,20 +488,20 @@ def fetch_all_adm0(self) -> None:
             f"Updated: {self.stats['adm0_metadata_updated']}"
         )
 
-        # Fetch countries that are missing from /ALL/ endpoint but available directly
-        # Note: Some countries (like India) are excluded from the bulk /ALL/ API response
-        # but are still available via direct ISO code requests
-        KNOWN_MISSING_COUNTRIES = [
+        # Fetch countries that are missing from /ALL/ endpoint but available
+        # directly. Some countries (like India) are excluded from the bulk /ALL/
+        # API response but are still available via direct ISO code requests.
+        known_missing_countries = [
             "IND"
         ]  # India is not in /ALL/ but available directly
 
-        if KNOWN_MISSING_COUNTRIES:
+        if known_missing_countries:
             logger.info(
-                f"Fetching {len(KNOWN_MISSING_COUNTRIES)} known missing countries "
+                f"Fetching {len(known_missing_countries)} known missing countries "
                 f"not included in /ALL/ endpoint"
             )
 
-            for iso_code in KNOWN_MISSING_COUNTRIES:
+            for iso_code in known_missing_countries:
                 logger.info(f"Fetching missing country: {iso_code}")
                 try:
                     api_data = self.api_client.get_boundary_metadata(iso_code, "ADM0")
@@ -573,16 +573,17 @@ def fetch_all_adm1(self) -> None:
         )
 
         # Fetch ADM1 data for countries missing from /ALL/ endpoint
-        KNOWN_MISSING_COUNTRIES = [
+        known_missing_countries = [
             "IND"
         ]  # India is not in /ALL/ but available directly
 
-        if KNOWN_MISSING_COUNTRIES:
+        if known_missing_countries:
             logger.info(
-                f"Fetching ADM1 data for {len(KNOWN_MISSING_COUNTRIES)} known missing countries"
+                f"Fetching ADM1 data for {len(known_missing_countries)} "
+                "known missing countries"
             )
 
-            for iso_code in KNOWN_MISSING_COUNTRIES:
+            for iso_code in known_missing_countries:
                 logger.info(f"Fetching ADM1 for missing country: {iso_code}")
                 try:
                     self.fetch_country_adm1(iso_code)

scripts/setup/setup_ec2_instance_role.py

@@ -59,7 +59,7 @@ def create_role(iam_client, account_id, region):
         response = iam_client.create_role(
             RoleName=ROLE_NAME,
             AssumeRolePolicyDocument=json.dumps(trust_policy),
-            Description="Role for EC2 instances running Trends.Earth API with CodeDeploy",
+            Description="EC2 role for Trends.Earth API with CodeDeploy",
             Tags=[
                 {"Key": "Project", "Value": "TrendsEarthAPI"},
                 {"Key": "ManagedBy", "Value": "automation"},
@@ -114,7 +114,9 @@ def attach_policies(iam_client, account_id, region):
                     "ecr:GetDownloadUrlForLayer",
                     "ecr:BatchGetImage",
                 ],
-                "Resource": f"arn:aws:ecr:{region}:{account_id}:repository/trendsearth-api",
+                "Resource": (
+                    f"arn:aws:ecr:{region}:{account_id}:repository/trendsearth-api"
+                ),
             },
             {
                 "Sid": "S3DeploymentBucket",
@@ -134,7 +136,9 @@ def attach_policies(iam_client, account_id, region):
                     "logs:PutLogEvents",
                     "logs:DescribeLogStreams",
                 ],
-                "Resource": f"arn:aws:logs:{region}:{account_id}:log-group:/aws/codedeploy/*",
+                "Resource": (
+                    f"arn:aws:logs:{region}:{account_id}:log-group:/aws/codedeploy/*"
+                ),
             },
         ],
     }
@@ -211,7 +215,7 @@ def main(profile=None, region=None):
 
     # Create role
     print("\n📋 Creating IAM role...")
-    role_arn = create_role(clients["iam"], account_id, actual_region)
+    create_role(clients["iam"], account_id, actual_region)
 
     # Attach policies
     print("\n📋 Attaching policies...")

scripts/setup/setup_github_oidc.py

@@ -66,29 +66,31 @@ def create_oidc_provider(iam_client):
     except ClientError as e:
         if e.response["Error"]["Code"] == "EntityAlreadyExists":
             account_id = boto3.client("sts").get_caller_identity()["Account"]
-            arn = f"arn:aws:iam::{account_id}:oidc-provider/token.actions.githubusercontent.com"
+            oidc_provider = "token.actions.githubusercontent.com"
+            arn = f"arn:aws:iam::{account_id}:oidc-provider/{oidc_provider}"
             print(f"ℹ️  OIDC provider already exists: {arn}")
             return arn
         raise
 
 
 def create_trust_policy(account_id):
     """Create the trust policy for the GitHub Actions role."""
+    oidc_provider = "token.actions.githubusercontent.com"
     return {
         "Version": "2012-10-17",
         "Statement": [
             {
                 "Effect": "Allow",
                 "Principal": {
-                    "Federated": f"arn:aws:iam::{account_id}:oidc-provider/token.actions.githubusercontent.com"
+                    "Federated": (
+                        f"arn:aws:iam::{account_id}:oidc-provider/{oidc_provider}"
+                    )
                 },
                 "Action": "sts:AssumeRoleWithWebIdentity",
                 "Condition": {
-                    "StringEquals": {
-                        "token.actions.githubusercontent.com:aud": "sts.amazonaws.com"
-                    },
+                    "StringEquals": {f"{oidc_provider}:aud": "sts.amazonaws.com"},
                     "StringLike": {
-                        "token.actions.githubusercontent.com:sub": f"repo:{GITHUB_ORG}/{GITHUB_REPO}:*"
+                        f"{oidc_provider}:sub": (f"repo:{GITHUB_ORG}/{GITHUB_REPO}:*")
                     },
                 },
             }