From 9fac078da28d2281822df64f992527a4940b4a29 Mon Sep 17 00:00:00 2001 From: Thomas Polasek Date: Mon, 18 Nov 2024 08:01:04 -0800 Subject: [PATCH] Convert directory fbcode/measurement to use the Ruff Formatter Summary: Converts the directory specified to use the Ruff formatter in pyfmt ruff_dog If this diff causes merge conflicts when rebasing, please run `hg status -n -0 --change . -I '**/*.{py,pyi}' | xargs -0 arc pyfmt` on your diff, and amend any changes before rebasing onto latest. That should help reduce or eliminate any merge conflicts. allow-large-files Reviewed By: amyreese Differential Revision: D66013130 --- fbpcp/mapper/aws.py | 2 +- fbpcp/service/pce_aws.py | 1 - onedocker/mapper/aws.py | 2 +- onedocker/script/cli/onedocker_cli.py | 10 +++++++++- onedocker/script/runner/onedocker_runner.py | 1 + pce/gateway/ec2.py | 3 --- pce/validator/validator.py | 2 -- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/fbpcp/mapper/aws.py b/fbpcp/mapper/aws.py index 1a65d4fd..2893308d 100644 --- a/fbpcp/mapper/aws.py +++ b/fbpcp/mapper/aws.py @@ -198,7 +198,7 @@ def map_ec2ippermission_to_firewallrule(ip_permission: Dict[str, Any]) -> Firewa def map_ec2securitygroup_to_firewallruleset( - security_group: Dict[str, Any] + security_group: Dict[str, Any], ) -> FirewallRuleset: id = security_group["GroupId"] vpc_id = security_group["VpcId"] diff --git a/fbpcp/service/pce_aws.py b/fbpcp/service/pce_aws.py index 804cb435..9a709f45 100644 --- a/fbpcp/service/pce_aws.py +++ b/fbpcp/service/pce_aws.py @@ -43,7 +43,6 @@ def get_pce( return PCE(pce_id, self.region, pce_network, pce_compute) def _get_network(self, pce_id: str) -> PCENetwork: - tags = {PCE_ID_KEY: pce_id} vpcs = self.ec2_gateway.describe_vpcs(tags=tags) vpc = vpcs[0] if vpcs else None diff --git a/onedocker/mapper/aws.py b/onedocker/mapper/aws.py index 36038a6b..3ef6938a 100644 --- a/onedocker/mapper/aws.py +++ b/onedocker/mapper/aws.py @@ -13,7 +13,7 @@ def map_dynamodbitem_to_packagemetadata( - dynamodb_item: Dict[str, Any] + dynamodb_item: Dict[str, Any], ) -> PackageMetadata: measurements = { MeasurementType(key): value diff --git a/onedocker/script/cli/onedocker_cli.py b/onedocker/script/cli/onedocker_cli.py index 2151b861..04d77163 100644 --- a/onedocker/script/cli/onedocker_cli.py +++ b/onedocker/script/cli/onedocker_cli.py @@ -220,7 +220,15 @@ def _build_onedocker_service( def main() -> None: - global container_svc, onedocker_svc, onedocker_repo_svc, log_svc, logger, task_definition, repository_path, storage_svc + global \ + container_svc, \ + onedocker_svc, \ + onedocker_repo_svc, \ + log_svc, \ + logger, \ + task_definition, \ + repository_path, \ + storage_svc s = schema.Schema( { "upload": bool, diff --git a/onedocker/script/runner/onedocker_runner.py b/onedocker/script/runner/onedocker_runner.py index 35ff2e00..f582ea6a 100644 --- a/onedocker/script/runner/onedocker_runner.py +++ b/onedocker/script/runner/onedocker_runner.py @@ -24,6 +24,7 @@ --opa_workflow_path= Set path of a pre-defined workflow for OneDocker Plugin Architecture usage. When set, OPA exeuction according to the predefined workflow is triggered. --verbose Set logging level to DEBUG. """ + import logging import os import resource diff --git a/pce/gateway/ec2.py b/pce/gateway/ec2.py index 7794e8b3..c6b24438 100644 --- a/pce/gateway/ec2.py +++ b/pce/gateway/ec2.py @@ -57,7 +57,6 @@ def describe_vpc_peering_connections_with_accepter_vpc_id( def accept_vpc_peering_connection( self, vpc_peering_connection_id: str, vpc_id: str ) -> Optional[VpcPeering]: - response = self.client.accept_vpc_peering_connection( VpcPeeringConnectionId=vpc_peering_connection_id ) @@ -72,7 +71,6 @@ def accept_vpc_peering_connection( def create_route( self, route_table_id: str, vpc_peering_connection_id: str, dest_cidr: str ) -> bool: - response = self.client.create_route( RouteTableId=route_table_id, DestinationCidrBlock=dest_cidr, @@ -85,7 +83,6 @@ def create_route( def replace_route( self, route_table_id: str, vpc_peering_connection_id: str, dest_cidr: str ) -> None: - self.client.replace_route( RouteTableId=route_table_id, DestinationCidrBlock=dest_cidr, diff --git a/pce/validator/validator.py b/pce/validator/validator.py index e48275cc..eb6586f6 100644 --- a/pce/validator/validator.py +++ b/pce/validator/validator.py @@ -21,7 +21,6 @@ --skip-step= [+] name of a validation step to be skipped, eg vpc_peering """ - import logging import sys from enum import Enum @@ -58,7 +57,6 @@ def get_arn( key_id: str, key_data: str, ) -> str: - sts_gateway: STSGateway = STSGateway(region, key_id, key_data, None) return sts_gateway.get_caller_arn()