From 76db92ea147afead60b8aae0e8604c7fa77aa7b4 Mon Sep 17 00:00:00 2001 From: Pepe Fagoaga Date: Thu, 10 Aug 2023 10:01:54 +0200 Subject: [PATCH] chore(service): service class type hints (#2695) --- prowler/providers/aws/lib/service/service.py | 3 ++- prowler/providers/azure/lib/service/service.py | 5 +++-- prowler/providers/gcp/lib/service/service.py | 9 ++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/prowler/providers/aws/lib/service/service.py b/prowler/providers/aws/lib/service/service.py index fac34057..0badb1a8 100644 --- a/prowler/providers/aws/lib/service/service.py +++ b/prowler/providers/aws/lib/service/service.py @@ -4,6 +4,7 @@ from prowler.providers.aws.aws_provider import ( generate_regional_clients, get_default_region, ) +from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info class AWSService: @@ -14,7 +15,7 @@ class AWSService: - Also handles if the AWS Service is Global """ - def __init__(self, service, audit_info, global_service=False): + def __init__(self, service: str, audit_info: AWS_Audit_Info, global_service=False): # Audit Information self.audit_info = audit_info self.audited_account = audit_info.audited_account diff --git a/prowler/providers/azure/lib/service/service.py b/prowler/providers/azure/lib/service/service.py index f888bfe4..f45747c5 100644 --- a/prowler/providers/azure/lib/service/service.py +++ b/prowler/providers/azure/lib/service/service.py @@ -1,11 +1,12 @@ from prowler.lib.logger import logger +from prowler.providers.azure.lib.audit_info.models import Azure_Audit_Info class AzureService: def __init__( self, - service, - audit_info, + service: str, + audit_info: Azure_Audit_Info, ): self.clients = self.__set_clients__( audit_info.identity.subscriptions, audit_info.credentials, service diff --git a/prowler/providers/gcp/lib/service/service.py b/prowler/providers/gcp/lib/service/service.py index 43ebd45f..fcff8938 100644 --- a/prowler/providers/gcp/lib/service/service.py +++ b/prowler/providers/gcp/lib/service/service.py @@ -6,10 +6,17 @@ from googleapiclient import discovery from prowler.lib.logger import logger from prowler.providers.gcp.gcp_provider import generate_client +from prowler.providers.gcp.lib.audit_info.models import GCP_Audit_Info class GCPService: - def __init__(self, service, audit_info, region="global", api_version="v1"): + def __init__( + self, + service: str, + audit_info: GCP_Audit_Info, + region="global", + api_version="v1", + ): # We receive the service using __class__.__name__ or the service name in lowercase # e.g.: APIKeys --> we need a lowercase string, so service.lower() self.service = service.lower() if not service.islower() else service