chore(release): 3.8.0

.github/workflows/pull-request.yml

@@ -13,19 +13,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9"]
 
     steps:
       - uses: actions/checkout@v3
       - name: Install poetry
         run: |
-          python -m pip install --upgrade pip
-          pipx install poetry
+         python -m pip install --upgrade pip
+         pipx install poetry
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-          cache: "poetry"
+          cache: 'poetry'
       - name: Install dependencies
         run: |
           poetry install
@@ -61,8 +61,4 @@ jobs:
           /tmp/hadolint Dockerfile --ignore=DL3013
       - name: Test with pytest
         run: |
-          poetry run pytest -n auto --cov=./prowler --cov-report=xml tests
-      - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+          poetry run pytest tests -n auto

.gitignore

@@ -46,8 +46,3 @@ junit-reports/
 
 # .env
 .env*
-
-# Coverage
-.coverage*
-.coverage
-coverage*

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
 
   ## TOML
   - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-    rev: v2.10.0
+    rev: v2.7.0
     hooks:
       - id: pretty-format-toml
         args: [--autofix]
@@ -28,7 +28,7 @@ repos:
       - id: shellcheck
   ## PYTHON
   - repo: https://github.com/myint/autoflake
-    rev: v2.2.0
+    rev: v2.0.1
     hooks:
       - id: autoflake
         args:
@@ -45,19 +45,19 @@ repos:
         args: ["--profile", "black"]
 
   - repo: https://github.com/psf/black
-    rev: 22.12.0
+    rev: 23.1.0
     hooks:
       - id: black
 
   - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
+    rev: 6.0.0
     hooks:
       - id: flake8
         exclude: contrib
         args: ["--ignore=E266,W503,E203,E501,W605"]
 
   - repo: https://github.com/python-poetry/poetry
-    rev: 1.6.0 # add version here
+    rev: 1.5.1 # add version here
     hooks:
       - id: poetry-check
       - id: poetry-lock

Makefile

@@ -2,19 +2,12 @@
 
 ##@ Testing
 test:   ## Test with pytest
-	rm -rf .coverage && \
-	pytest -n auto -vvv -s --cov=./prowler --cov-report=xml tests
+	pytest -n auto -vvv -s -x
 
 coverage: ## Show Test Coverage
 	coverage run --skip-covered -m pytest -v && \
 	coverage report -m && \
-	rm -rf .coverage && \
-	coverage report -m
-
-coverage-html: ## Show Test Coverage
-	rm -rf ./htmlcov && \
-	coverage html && \
-	open htmlcov/index.html
+	rm -rf .coverage
 
 ##@ Linting
 format: ## Format Code

README.md

@@ -39,7 +39,7 @@ It contains hundreds of controls covering CIS, NIST 800, NIST CSF, CISA, RBI, Fe
 
 | Provider | Checks | Services | [Compliance Frameworks](https://docs.prowler.cloud/en/latest/tutorials/compliance/) | [Categories](https://docs.prowler.cloud/en/latest/tutorials/misc/#categories) |
 |---|---|---|---|---|
-| AWS | 290 | 56 -> `prowler aws --list-services` | 25 -> `prowler aws --list-compliance` | 5 -> `prowler aws --list-categories` |
+| AWS | 285 | 55 -> `prowler aws --list-services` | 25 -> `prowler aws --list-compliance` | 5 -> `prowler aws --list-categories` |
 | GCP | 73 | 11 -> `prowler gcp --list-services` | 1 -> `prowler gcp --list-compliance` | 2 -> `prowler gcp --list-categories`|
 | Azure | 23 | 4 -> `prowler azure --list-services` | CIS soon | 1 -> `prowler azure --list-categories` |
 | Kubernetes | Planned | - | - | - |
@@ -115,8 +115,8 @@ Make sure you have properly configured your AWS-CLI with a valid Access Key and
 
 Those credentials must be associated to a user or role with proper permissions to do all checks. To make sure, add the following AWS managed policies to the user or role being used:
 
-  - `arn:aws:iam::aws:policy/SecurityAudit`
-  - `arn:aws:iam::aws:policy/job-function/ViewOnlyAccess`
+  - arn:aws:iam::aws:policy/SecurityAudit
+  - arn:aws:iam::aws:policy/job-function/ViewOnlyAccess
 
   > Moreover, some read-only additional permissions are needed for several checks, make sure you attach also the custom policy [prowler-additions-policy.json](https://github.com/prowler-cloud/prowler/blob/master/permissions/prowler-additions-policy.json) to the role you are using.
 

docs/developer-guide/audit-info.md

@@ -1,9 +0,0 @@
-# Audit Info
-
-In each Prowler provider we have a Python object called `audit_info` which is in charge of keeping the credentials, the configuration and the state of each audit, and it's passed to each service during the `__init__`.
-
-- AWS: https://github.com/prowler-cloud/prowler/blob/master/prowler/providers/aws/lib/audit_info/models.py#L34-L54
-- GCP: https://github.com/prowler-cloud/prowler/blob/master/prowler/providers/aws/lib/audit_info/models.py#L7-L30
-- Azure: https://github.com/prowler-cloud/prowler/blob/master/prowler/providers/azure/lib/audit_info/models.py#L17-L31
-
-This `audit_info` object is shared during the Prowler execution and for that reason is important to mock it in each test to isolate them. See the [testing guide](./unit-testing.md) for more information.

docs/developer-guide/checks.md

@@ -1,309 +0,0 @@
-# Create a new Check for a Provider
-
-Here you can find how to create new checks for Prowler.
-
-**To create a check is required to have a Prowler provider service already created, so if the service is not present or the attribute you want to audit is not retrieved by the service, please refer to the [Service](./services.md) documentation.**
-
-## Introduction
-To create a new check for a supported Prowler provider, you will need to create a folder with the check name inside the specific service for the selected provider.
-
-We are going to use the `ec2_ami_public` check form the `AWS` provider as an example. So the folder name will `prowler/providers/aws/services/ec2/ec2_ami_public` (following the format `prowler/providers/<provider>/services/<service>/<check_name>`), with the name of check following the pattern: `service_subservice/resource_action`.
-
-Inside that folder, we need to create three files:
-
-- An empty `__init__.py`: to make Python treat this check folder as a package.
-- A `check_name.py` with the above format containing the check's logic. Refer to the [check](./checks.md#check)
-- A `check_name.metadata.json` containing the check's metadata. Refer to the [check metadata](./checks.md#check-metadata)
-
-## Check
-
-The Prowler's check structure is very simple and following it there is nothing more to do to include a check in a provider's service because the load is done dynamically based on the paths.
-
-The following is the code for the `ec2_ami_public` check:
-```python title="Check Class"
-# At the top of the file we need to import the following:
-# - Check class which is in charge of the following:
-#   - Retrieve the check metadata and expose the `metadata()`
-#       to return a JSON representation of the metadata,
-#       read more at Check Metadata Model down below.
-#   - Enforce that each check requires to have the `execute()` function
-from prowler.lib.check.models import Check, Check_Report_AWS
-
-# Then you have to import the provider service client
-# read more at the Service documentation.
-from prowler.providers.aws.services.ec2.ec2_client import ec2_client
-
-# For each check we need to create a python class called the same as the
-# file which inherits from the Check class.
-class ec2_ami_public(Check):
-    """ec2_ami_public verifies if an EC2 AMI is publicly shared"""
-
-    # Then, within the check's class we need to create the "execute(self)"
-    # function, which is enforce by the "Check" class to implement
-    # the Check's interface and let Prowler to run this check.
-    def execute(self):
-
-        # Inside the execute(self) function we need to create
-        # the list of findings initialised to an empty list []
-        findings = []
-
-        # Then, using the service client we need to iterate by the resource we
-        # want to check, in this case EC2 AMIs stored in the
-        # "ec2_client.images" object.
-        for image in ec2_client.images:
-
-            # Once iterating for the images, we have to intialise
-            # the Check_Report_AWS class passing the check's metadata
-            # using the "metadata" function explained above.
-            report = Check_Report_AWS(self.metadata())
-
-            # For each Prowler check we MUST fill the following
-            # Check_Report_AWS fields:
-            # - region
-            # - resource_id
-            # - resource_arn
-            # - resource_tags
-            # - status
-            # - status_extended
-            report.region = image.region
-            report.resource_id = image.id
-            report.resource_arn = image.arn
-            # The resource_tags should be filled if the resource has the ability
-            # of having tags, please check the service first.
-            report.resource_tags = image.tags
-
-            # Then we need to create the business logic for the check
-            # which always should be simple because the Prowler service
-            # must do the heavy lifting and the check should be in charge
-            # of parsing the data provided
-            report.status = "PASS"
-            report.status_extended = f"EC2 AMI {image.id} is not public."
-
-            # In this example each "image" object has a boolean attribute
-            # called "public" to set if the AMI is publicly shared
-            if image.public:
-                report.status = "FAIL"
-                report.status_extended = (
-                    f"EC2 AMI {image.id} is currently public."
-                )
-
-            # Then at the same level as the "report"
-            # object we need to append it to the findings list.
-            findings.append(report)
-
-        # Last thing to do is to return the findings list to Prowler
-        return findings
-```
-
-### Check Status
-
-All the checks MUST fill the `report.status` and `report.status_extended` with the following criteria:
-
-- Status -- `report.status`
-    - `PASS` --> If the check is passing against the configured value.
-    - `FAIL` --> If the check is passing against the configured value.
-    - `INFO` --> This value cannot be used unless a manual operation is required in order to determine if the `report.status` is whether `PASS` or `FAIL`.
-- Status Extended -- `report.status_extended`
-    - MUST end in a dot `.`
-    - MUST include the service audited with the resource and a brief explanation of the result generated, e.g.: `EC2 AMI ami-0123456789 is not public.`
-
-### Resource ID, Name and ARN
-All the hecks must fill the `report.resource_id` and `report.resource_arn` with the following criteria:
-
-- AWS
-    - Resource ID -- `report.resource_id`
-        - AWS Account --> Account Number `123456789012`
-        - AWS Resource --> Resource ID / Name
-        - Root resource --> `<root_account>`
-    - Resource ARN -- `report.resource_arn`
-        - AWS Account --> Root ARN `arn:aws:iam::123456789012:root`
-        - AWS Resource --> Resource ARN
-        - Root resource --> Root ARN `arn:aws:iam::123456789012:root`
-- GCP
-    - Resource ID -- `report.resource_id`
-        - GCP Resource --> Resource ID
-    - Resource Name -- `report.resource_name`
-        - GCP Resource --> Resource Name
-- Azure
-    - Resource ID -- `report.resource_id`
-        - Azure Resource --> Resource ID
-    - Resource Name -- `report.resource_name`
-        - Azure Resource --> Resource Name
-
-### Python Model
-The following is the Python model for the check's class.
-
-As per August 5th 2023 the `Check_Metadata_Model` can be found [here](https://github.com/prowler-cloud/prowler/blob/master/prowler/lib/check/models.py#L59-L80).
-
-```python
-class Check(ABC, Check_Metadata_Model):
-    """Prowler Check"""
-
-    def __init__(self, **data):
-        """Check's init function. Calls the CheckMetadataModel init."""
-        # Parse the Check's metadata file
-        metadata_file = (
-            os.path.abspath(sys.modules[self.__module__].__file__)[:-3]
-            + ".metadata.json"
-        )
-        # Store it to validate them with Pydantic
-        data = Check_Metadata_Model.parse_file(metadata_file).dict()
-        # Calls parents init function
-        super().__init__(**data)
-
-    def metadata(self) -> dict:
-        """Return the JSON representation of the check's metadata"""
-        return self.json()
-
-    @abstractmethod
-    def execute(self):
-        """Execute the check's logic"""
-```
-
-### Using the audit config
-
-Prowler has a [configuration file](../tutorials/configuration_file.md) which is used to pass certain configuration values to the checks, like the following:
-
-```python title="ec2_securitygroup_with_many_ingress_egress_rules.py"
-class ec2_securitygroup_with_many_ingress_egress_rules(Check):
-    def execute(self):
-        findings = []
-
-        # max_security_group_rules, default: 50
-        max_security_group_rules = ec2_client.audit_config.get(
-            "max_security_group_rules", 50
-        )
-        for security_group in ec2_client.security_groups:
-```
-
-```yaml title="config.yaml"
-# AWS Configuration
-aws:
-  # AWS EC2 Configuration
-
-  # aws.ec2_securitygroup_with_many_ingress_egress_rules
-  # The default value is 50 rules
-  max_security_group_rules: 50
-```
-
-As you can see in the above code, within the service client, in this case the `ec2_client`, there is an object called `audit_config` which is a Python dictionary containing the values read from the configuration file.
-
-In order to use it, you have to check first if the value is present in the configuration file. If the value is not present, you can create it in the `config.yaml` file and then, read it from the check.
-> It is mandatory to always use the `dictionary.get(value, default)` syntax to set a default value in the case the configuration value is not present.
-
-
-## Check Metadata
-
-Each Prowler check has metadata associated which is stored at the same level of the check's folder in a file called A `check_name.metadata.json` containing the check's metadata.
-
-> We are going to include comments in this example metadata JSON but they cannot be included because the JSON format does not allow comments.
-
-```json
-{
-  # Provider holds the Prowler provider which the checks belongs to
-  "Provider": "aws",
-  # CheckID holds check name
-  "CheckID": "ec2_ami_public",
-  # CheckTitle holds the title of the check
-  "CheckTitle": "Ensure there are no EC2 AMIs set as Public.",
-  # CheckType holds Software and Configuration Checks, check more here
-  # https://docs.aws.amazon.com/securityhub/latest/userguide/asff-required-attributes.html#Types
-  "CheckType": [
-    "Infrastructure Security"
-  ],
-  # ServiceName holds the provider service name
-  "ServiceName": "ec2",
-  # SubServiceName holds the service's subservice or resource used by the check
-  "SubServiceName": "ami",
-  # ResourceIdTemplate holds the unique ID for the resource used by the check
-  "ResourceIdTemplate": "arn:partition:service:region:account-id:resource-id",
-  # Severity holds the check's severity, always in lowercase (critical, high, medium, low or informational)
-  "Severity": "critical",
-  # ResourceType only for AWS, holds the type from here
-  # https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html
-  "ResourceType": "Other",
-  # Description holds the title of the check, for now is the same as CheckTitle
-  "Description": "Ensure there are no EC2 AMIs set as Public.",
-  # Risk holds the check risk if the result is FAIL
-  "Risk": "When your AMIs are publicly accessible, they are available in the Community AMIs where everyone with an AWS account can use them to launch EC2 instances. Your AMIs could contain snapshots of your applications (including their data), therefore exposing your snapshots in this manner is not advised.",
-  # RelatedUrl holds an URL with more information about the check purpose
-  "RelatedUrl": "",
-  # Remediation holds the information to help the practitioner to fix the issue in the case of the check raise a FAIL
-  "Remediation": {
-    # Code holds different methods to remediate the FAIL finding
-    "Code": {
-      # CLI holds the command in the provider native CLI to remediate it
-      "CLI": "https://docs.bridgecrew.io/docs/public_8#cli-command",
-      # NativeIaC holds the native IaC code to remediate it, use "https://docs.bridgecrew.io/docs"
-      "NativeIaC": "",
-      # Other holds the other commands, scripts or code to remediate it, use "https://www.trendmicro.com/cloudoneconformity"
-      "Other": "https://docs.bridgecrew.io/docs/public_8#aws-console",
-      # Terraform holds the Terraform code to remediate it, use "https://docs.bridgecrew.io/docs"
-      "Terraform": ""
-    },
-    # Recommendation holds the recommendation for this check with a description and a related URL
-    "Recommendation": {
-      "Text": "We recommend your EC2 AMIs are not publicly accessible, or generally available in the Community AMIs.",
-      "Url": "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/cancel-sharing-an-AMI.html"
-    }
-  },
-  # Categories holds the category or categories where the check can be included, if applied
-  "Categories": [
-    "internet-exposed"
-  ],
-  # DependsOn is not actively used for the moment but it will hold other
-  # checks wich this check is dependant to
-  "DependsOn": [],
-  # RelatedTo is not actively used for the moment but it will hold other
-  # checks wich this check is related to
-  "RelatedTo": [],
-  # Notes holds additional information not covered in this file
-  "Notes": ""
-}
-```
-
-### Remediation Code
-
-For the Remediation Code we use the following knowledge base to fill it:
-
-- Official documentation for the provider
-- https://docs.bridgecrew.io
-- https://www.trendmicro.com/cloudoneconformity
-- https://github.com/cloudmatos/matos/tree/master/remediations
-
-### RelatedURL and Recommendation
-
-The RelatedURL field must be filled with an URL from the provider's official documentation like https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/sharingamis-intro.html
-
-Also, if not present you can use the Risk and Recommendation texts from the TrendMicro [CloudConformity](https://www.trendmicro.com/cloudoneconformity) guide.
-
-
-### Python Model
-The following is the Python model for the check's metadata model. We use the Pydantic's [BaseModel](https://docs.pydantic.dev/latest/api/base_model/#pydantic.BaseModel) as the parent class.
-
-As per August 5th 2023 the `Check_Metadata_Model` can be found [here](https://github.com/prowler-cloud/prowler/blob/master/prowler/lib/check/models.py#L34-L56).
-```python
-class Check_Metadata_Model(BaseModel):
-    """Check Metadata Model"""
-
-    Provider: str
-    CheckID: str
-    CheckTitle: str
-    CheckType: list[str]
-    ServiceName: str
-    SubServiceName: str
-    ResourceIdTemplate: str
-    Severity: str
-    ResourceType: str
-    Description: str
-    Risk: str
-    RelatedUrl: str
-    Remediation: Remediation
-    Categories: list[str]
-    DependsOn: list[str]
-    RelatedTo: list[str]
-    Notes: str
-    # We set the compliance to None to
-    # store the compliance later if supplied
-    Compliance: list = None
-```

docs/developer-guide/documentation.md

@@ -1,8 +0,0 @@
-## Contribute with documentation
-
-We use `mkdocs` to build this Prowler documentation site so you can easily contribute back with new docs or improving them.
-
-1. Install `mkdocs` with your favorite package manager.
-2. Inside the `prowler` repository folder run `mkdocs serve` and point your browser to `http://localhost:8000` and you will see live changes to your local copy of this documentation site.
-3. Make all needed changes to docs or add new documents. To do so just edit existing md files inside `prowler/docs` and if you are adding a new section or file please make sure you add it to `mkdocs.yaml` file in the root folder of the Prowler repo.
-4. Once you are done with changes, please send a pull request to us for review and merge. Thank you in advance!

docs/developer-guide/integration-testing.md

@@ -1,3 +0,0 @@
-# Integration Tests
-
-Coming soon ...

docs/developer-guide/integrations.md

@@ -1,3 +0,0 @@
-# Create a new integration
-
-Coming soon ...

docs/developer-guide/introduction.md

@@ -1,47 +0,0 @@
-# Developer Guide
-
-You can extend Prowler in many different ways, in most cases you will want to create your own checks and compliance security frameworks, here is where you can learn about how to get started with it. We also include how to create custom outputs, integrations and more.
-
-## Get the code and install all dependencies
-
-First of all, you need a version of Python 3.9 or higher and also pip installed to be able to install all dependencies required. Once that is satisfied go a head and clone the repo:
-
-```
-git clone https://github.com/prowler-cloud/prowler
-cd prowler
-```
-For isolation and avoid conflicts with other environments, we recommend usage of `poetry`:
-```
-pip install poetry
-```
-Then install all dependencies including the ones for developers:
-```
-poetry install
-poetry shell
-```
-
-## Contributing with your code or fixes to Prowler
-
-This repo has git pre-commit hooks managed via the [pre-commit](https://pre-commit.com/) tool. [Install](https://pre-commit.com/#install) it how ever you like, then in the root of this repo run:
-```shell
-pre-commit install
-```
-You should get an output like the following:
-```shell
-pre-commit installed at .git/hooks/pre-commit
-```
-
-Before we merge any of your pull requests we pass checks to the code, we use the following tools and automation to make sure the code is secure and dependencies up-to-dated (these should have been already installed if you ran `pipenv install -d`):
-
-- [`bandit`](https://pypi.org/project/bandit/) for code security review.
-- [`safety`](https://pypi.org/project/safety/) and [`dependabot`](https://github.com/features/security) for dependencies.
-- [`hadolint`](https://github.com/hadolint/hadolint) and [`dockle`](https://github.com/goodwithtech/dockle) for our containers security.
-- [`Snyk`](https://docs.snyk.io/integrations/snyk-container-integrations/container-security-with-docker-hub-integration) in Docker Hub.
-- [`clair`](https://github.com/quay/clair) in Amazon ECR.
-- [`vulture`](https://pypi.org/project/vulture/), [`flake8`](https://pypi.org/project/flake8/), [`black`](https://pypi.org/project/black/) and [`pylint`](https://pypi.org/project/pylint/) for formatting and best practices.
-
-You can see all dependencies in file `pyproject.toml`.
-
-## Want some swag as appreciation for your contribution?
-
-If you are like us and you love swag, we are happy to thank you for your contribution with some laptop stickers or whatever other swag we may have at that time. Please, tell us more details and your pull request link in our [Slack workspace here](https://join.slack.com/t/prowler-workspace/shared_invite/zt-1hix76xsl-2uq222JIXrC7Q8It~9ZNog). You can also reach out to Toni de la Fuente on Twitter [here](https://twitter.com/ToniBlyx), his DMs are open.

docs/developer-guide/outputs.md

@@ -1,3 +0,0 @@
-# Create a custom output format
-
-Coming soon ...

docs/developer-guide/security-compliance-framework.md

@@ -1,41 +0,0 @@
-# Create a new security compliance framework
-
-
-## Introduction
-If you want to create or contribute with your own security frameworks or add public ones to Prowler you need to make sure the checks are available if not you have to create your own. Then create a compliance file per provider like in `prowler/compliance/<provider>/` and name it as `<framework>_<version>_<provider>.json` then follow the following format to create yours.
-
-## Compliance Framework
-Each file version of a framework will have the following structure at high level with the case that each framework needs to be generally identified, one requirement can be also called one control but one requirement can be linked to multiple prowler checks.:
-
-- `Framework`: string. Distinguish name of the framework, like CIS
-- `Provider`: string. Provider where the framework applies, such as AWS, Azure, OCI,...
-- `Version`: string. Version of the framework itself, like 1.4 for CIS.
-- `Requirements`: array of objects. Include all requirements or controls with the mapping to Prowler.
-- `Requirements_Id`: string. Unique identifier per each requirement in the specific framework
-- `Requirements_Description`: string. Description as in the framework.
-- `Requirements_Attributes`: array of objects. Includes all needed attributes per each requirement, like levels, sections, etc. Whatever helps to create a dedicated report with the result of the findings. Attributes would be taken as closely as possible from the framework's own terminology directly.
-- `Requirements_Checks`: array. Prowler checks that are needed to prove this requirement. It can be one or multiple checks. In case of no automation possible this can be empty.
-
-```
-{
-  "Framework": "<framework>-<provider>",
-  "Version": "<version>",
-  "Requirements": [
-    {
-      "Id": "<unique-id>",
-      "Description": "Requiemente full description",
-      "Checks": [
-        "Here is the prowler check or checks that is going to be executed"
-      ],
-      "Attributes": [
-        {
-         <Add here your custom attributes.>
-        }
-      ]
-    },
-    ...
-  ]
-}
-```
-
-Finally, to have a proper output file for your reports, your framework data model has to be created in `prowler/lib/outputs/models.py` and also the CLI table output in `prowler/lib/outputs/compliance.py`.

docs/developer-guide/services.md

@@ -1,235 +0,0 @@
-# Create a new Provider Service
-
-Here you can find how to create a new service, or to complement an existing one, for a Prowler Provider.
-
-## Introduction
-
-To create a new service, you will need to create a folder inside the specific provider, i.e. `prowler/providers/<provider>/services/<service>/`.
-
-Inside that folder, you MUST create the following files:
-
-- An empty `__init__.py`: to make Python treat this service folder as a package.
-- A `<service>_service.py`, containing all the service's logic and API calls.
-- A `<service>_client_.py`, containing the initialization of the service's class we have just created so the checks's checks can use it.
-
-## Service
-
-The Prowler's service structure is the following and the way to initialise it is just by importing the service client in a check.
-
-## Service Base Class
-
-All the Prowler provider's services inherits from a base class depending on the provider used.
-
-- [AWS Service Base Class](https://github.com/prowler-cloud/prowler/blob/22f8855ad7dad2e976dabff78611b643e234beaf/prowler/providers/aws/lib/service/service.py)
-- [GCP Service Base Class](https://github.com/prowler-cloud/prowler/blob/22f8855ad7dad2e976dabff78611b643e234beaf/prowler/providers/gcp/lib/service/service.py)
-- [Azure Service Base Class](https://github.com/prowler-cloud/prowler/blob/22f8855ad7dad2e976dabff78611b643e234beaf/prowler/providers/azure/lib/service/service.py)
-
-Each class is used to initialize the credentials and the API's clients to be used in the service. If some threading is used it must be coded there.
-
-## Service Class
-
-Due to the complexity and differencies of each provider API we are going to use an example service to guide you in how can it be created.
-
-The following is the `<service>_service.py` file:
-
-```python title="Service Class"
-from datetime import datetime
-from typing import Optional
-
-# The following is just for the AWS provider
-from botocore.client import ClientError
-
-# To use the Pydantic's BaseModel
-from pydantic import BaseModel
-
-# Prowler logging library
-from prowler.lib.logger import logger
-
-# Prowler resource filter, only for the AWS provider
-from prowler.lib.scan_filters.scan_filters import is_resource_filtered
-
-# Provider parent class
-from prowler.providers.<provider>.lib.service.service import ServiceParentClass
-
-
-# Create a class for the Service
-################## <Service>
-class <Service>(ServiceParentClass):
-    def __init__(self, audit_info):
-        # Call Service Parent Class __init__
-        # We use the __class__.__name__ to get it automatically
-        # from the Service Class name but you can pass a custom
-        # string if the provider's API service name is different
-        super().__init__(__class__.__name__, audit_info)
-
-        # Create an empty dictionary of items to be gathered,
-        # using the unique ID as the dictionary key
-        # e.g., instances
-        self.<items> = {}
-
-        # If you can parallelize by regions or locations
-        # you can use the __threading_call__ function
-        # available in the Service Parent Class
-        self.__threading_call__(self.__describe_<items>__)
-
-        # Optionally you can create another function to retrieve
-        # more data about each item without parallel
-        self.__describe_<item>__()
-
-    def __describe_<items>__(self, regional_client):
-        """Get ALL <Service> <Items>"""
-        logger.info("<Service> - Describing <Items>...")
-
-        # We MUST include a try/except block in each function
-        try:
-
-            # Call to the provider API to retrieve the data we want
-            describe_<items>_paginator = regional_client.get_paginator("describe_<items>")
-
-            # Paginator to get every item
-            for page in describe_<items>_paginator.paginate():
-
-                # Another try/except within the loop for to continue looping
-                # if something unexpected happens
-                try:
-
-                    for <item> in page["<Items>"]:
-
-                        # For the AWS provider we MUST include the following lines to retrieve
-                        # or not data for the resource passed as argument using the --resource-arn
-                        if not self.audit_resources or (
-                            is_resource_filtered(<item>["<item_arn>"], self.audit_resources)
-                        ):
-                            # Then we have to include the retrieved resource in the object
-                            # previously created
-                            self.<items>[<item_unique_id>] =
-                                <Item>(
-                                    arn=stack["<item_arn>"],
-                                    name=stack["<item_name>"],
-                                    tags=stack.get("Tags", []),
-                                    region=regional_client.region,
-                                )
-
-                except Exception as error:
-                    logger.error(
-                        f"{<provider_specific_field>} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-                    )
-
-        # In the except part we have to use the following code to log the errors
-        except Exception as error:
-            # Depending on each provider we can use the following fields in the logger:
-            # - AWS: regional_client.region or self.region
-            # - GCP: project_id and location
-            # - Azure: subscription
-
-            logger.error(
-                f"{<provider_specific_field>} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-            )
-
-    def __describe_<item>__(self):
-        """Get Details for a <Service> <Item>"""
-        logger.info("<Service> - Describing <Item> to get specific details...")
-
-        # We MUST include a try/except block in each function
-        try:
-
-            # Loop over the items retrieved in the previous function
-            for <item> in self.<items>:
-
-                # When we perform calls to the Provider API within a for loop we have
-                # to include another try/except block because in the cloud there are
-                # ephemeral resources that can be deleted at the time we are checking them
-                try:
-                    <item>_details = self.regional_clients[<item>.region].describe_<item>(
-                        <Attribute>=<item>.name
-                    )
-
-                    # For example, check if item is Public. Here is important if we are
-                    # getting values from a dictionary we have to use the "dict.get()"
-                    # function with a default value in the case this value is not present
-                    <item>.public = <item>_details.get("Public", False)
-
-
-                # In this except block, for example for the AWS Provider we can use
-                # the botocore.ClientError exception and check for a specific error code
-                # to raise a WARNING instead of an ERROR if some resource is not present.
-                except ClientError as error:
-                    if error.response["Error"]["Code"] == "InvalidInstanceID.NotFound":
-                        logger.warning(
-                            f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-                        )
-                    else:
-                        logger.error(
-                            f"{<provider_specific_field>} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-                        )
-                    continue
-
-         # In the except part we have to use the following code to log the errors
-        except Exception as error:
-            # Depending on each provider we can use the following fields in the logger:
-            # - AWS: regional_client.region or self.region
-            # - GCP: project_id and location
-            # - Azure: subscription
-
-            logger.error(
-                f"{<item>.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-            )
-```
-
-### Service Models
-
-For each class object we need to model we use the Pydantic's [BaseModel](https://docs.pydantic.dev/latest/api/base_model/#pydantic.BaseModel) to take advantage of the data validation.
-
-```python title="Service Model"
-# In each service class we have to create some classes using
-# the Pydantic's Basemodel for the resources we want to audit.
-class <Item>(BaseModel):
-    """<Item> holds a <Service> <Item>"""
-
-    arn: str
-    """<Items>[].arn"""
-
-    name: str
-    """<Items>[].name"""
-
-    region: str
-    """<Items>[].region"""
-
-    public: bool
-    """<Items>[].public"""
-
-    # We can create Optional attributes set to None by default
-    tags: Optional[list]
-     """<Items>[].tags"""
-```
-### Service Objects
-In the service each group of resources should be created as a Python [dictionary](https://docs.python.org/3/tutorial/datastructures.html#dictionaries). This is because we are performing lookups all the time and the Python dictionary lookup has [O(1) complexity](https://en.wikipedia.org/wiki/Big_O_notation#Orders_of_common_functions).
-
-We MUST set as the dictionary key a unique ID, like the resource Unique ID or ARN.
-
-Example:
-```python
-self.vpcs = {}
-self.vpcs["vpc-01234567890abcdef"] = VPC_Object_Class()
-```
-
-## Service Client
-
-Each Prowler service requires a service client to use the service in the checks.
-
-The following is the `<service>_client.py` containing the initialization of the service's class we have just created so the service's checks can use them:
-
-```python
-from prowler.providers.<provider>.lib.audit_info.audit_info import audit_info
-from prowler.providers.<provider>.services.<service>.<service>_service import <Service>
-
-<service>_client = <Service>(audit_info)
-```
-
-## Permissions
-
-It is really important to check if the current Prowler's permissions for each provider are enough to implement a new service. If we need to include more please refer to the following documentaion and update it:
-
-- AWS: https://docs.prowler.cloud/en/latest/getting-started/requirements/#aws-authentication
-- Azure: https://docs.prowler.cloud/en/latest/getting-started/requirements/#permissions
-- GCP: https://docs.prowler.cloud/en/latest/getting-started/requirements/#gcp-authentication

docs/developer-guide/unit-testing.md

@@ -1,590 +0,0 @@
-# Unit Tests
-
-The unit tests for the Prowler checks varies between each provider supported.
-
-Here we left some good reads about unit testing and things we've learnt through all the process.
-
-**Python Testing**
-
-- https://docs.python-guide.org/writing/tests/
-
-**Where to patch**
-
-- https://docs.python.org/3/library/unittest.mock.html#where-to-patch
-- https://stackoverflow.com/questions/893333/multiple-variables-in-a-with-statement
-- ​https://docs.python.org/3/reference/compound_stmts.html#the-with-statement
-
-**Utils to trace mocking and test execution**
-
-- https://news.ycombinator.com/item?id=36054868
-- https://docs.python.org/3/library/sys.html#sys.settrace
-- https://github.com/kunalb/panopticon
-
-## General Recommendations
-
-When creating tests for some provider's checks we follow these guidelines trying to cover as much test scenarios as possible:
-
-1. Create a test without resource to generate 0 findings, because Prowler will generate 0 findings if a service does not contain the resources the check is looking for audit.
-2. Create test to generate both a `PASS` and a `FAIL` result.
-3. Create tests with more than 1 resource to evaluate how the check behaves and if the number of findings is right.
-
-## How to run Prowler tests
-
-To run the Prowler test suite you need to install the testing dependencies already included in the `pyproject.toml` file. If you didn't install it yet please read the developer guide introduction [here](./introduction.md#get-the-code-and-install-all-dependencies).
-
-Then in the project's root path execute `pytest -n auto -vvv -s -x` or use the `Makefile` with `make test`.
-
-Other commands to run tests:
-
-- Run tests for a provider: `pytest -n auto -vvv -s -x tests/providers/<provider>/services`
-- Run tests for a provider service: `pytest -n auto -vvv -s -x tests/providers/<provider>/services/<service>`
-- Run tests for a provider check: `pytest -n auto -vvv -s -x tests/providers/<provider>/services/<service>/<check>`
-
-> Refer to the [pytest documentation](https://docs.pytest.org/en/7.1.x/getting-started.html) documentation for more information.
-
-## AWS
-
-For the AWS provider we have ways to test a Prowler check based on the following criteria:
-
-> Note: We use and contribute to the [Moto](https://github.com/getmoto/moto) library which allows us to easily mock out tests based on AWS infrastructure. **It's awesome!**
-
-- AWS API calls covered by [Moto](https://github.com/getmoto/moto):
-    - Service tests with `@mock_<service>`
-    - Checks tests with `@mock_<service>`
-- AWS API calls not covered by Moto:
-    - Service test with `mock_make_api_call`
-    - Checks tests with [MagicMock](https://docs.python.org/3/library/unittest.mock.html#unittest.mock.MagicMock)
-- AWS API calls partially covered by Moto:
-    - Service test with `@mock_<service>` and `mock_make_api_call`
-    - Checks tests with `@mock_<service>` and `mock_make_api_call`
-
-In the following section we are going to explain all of the above scenarios with examples based on if the [Moto](https://github.com/getmoto/moto) library covers the AWS API calls made by the service. You can check the covered API calls [here](https://github.com/getmoto/moto/blob/master/IMPLEMENTATION_COVERAGE.md).
-
-An important point for the AWS testing is that in each check we MUST have a unique `audit_info` which is the key object during the AWS execution to isolate the test execution.
-
-Check the [Audit Info](./audit-info.md) section to get more details.
-
-```python
-# We need to import the AWS_Audit_Info and the Audit_Metadata
-# to set the audit_info to call AWS APIs
-from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
-from prowler.providers.common.models import Audit_Metadata
-
-AWS_ACCOUNT_NUMBER = "123456789012"
-
-def set_mocked_audit_info(self):
-  audit_info = AWS_Audit_Info(
-      session_config=None,
-      original_session=None,
-      audit_session=session.Session(
-          profile_name=None,
-          botocore_session=None,
-      ),
-      audit_config=None,
-      audited_account=AWS_ACCOUNT_NUMBER,
-      audited_account_arn=f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root",
-      audited_user_id=None,
-      audited_partition="aws",
-      audited_identity_arn=None,
-      profile=None,
-      profile_region=None,
-      credentials=None,
-      assumed_role_info=None,
-      audited_regions=["us-east-1", "eu-west-1"],
-      organizations_metadata=None,
-      audit_resources=None,
-      mfa_enabled=False,
-      audit_metadata=Audit_Metadata(
-          services_scanned=0,
-          expected_checks=[],
-          completed_checks=0,
-          audit_progress=0,
-      ),
-  )
-
-  return audit_info
-```
-### Checks
-
-For the AWS tests examples we are going to use the tests for the `iam_password_policy_uppercase` check.
-
-This section is going to be divided based on the API coverage of the [Moto](https://github.com/getmoto/moto) library.
-
-#### API calls covered
-
-If the [Moto](https://github.com/getmoto/moto) library covers the API calls we want to test we can use the `@mock_<service>` decorator which will mocked out all the API calls made to AWS keeping the state within the code decorated, in this case the test function.
-
-```python
-# We need to import the unittest.mock to allow us to patch some objects
-# not to use shared ones between test, hence to isolate the test
-from unittest import mock
-
-# Boto3 client and session to call the AWS APIs
-from boto3 import client, session
-
-# Moto decorator for the IAM service we want to mock
-from moto import mock_iam
-
-# Constants used
-AWS_ACCOUNT_NUMBER = "123456789012"
-AWS_REGION = "us-east-1"
-
-
-# We always name the test classes like Test_<check_name>
-class Test_iam_password_policy_uppercase:
-
-  # We include the Moto decorator for the service we want to use
-  # You can include more than one if two or more services are
-  # involved in test
-  @mock_iam
-  # We name the tests with test_<service>_<check_name>_<test_action>
-  def test_iam_password_policy_no_uppercase_flag(self):
-    # First, we have to create an IAM client
-    iam_client = client("iam", region_name=AWS_REGION)
-
-    # Then, since all the AWS accounts have a password
-    # policy we want to set to False the RequireUppercaseCharacters
-    iam_client.update_account_password_policy(RequireUppercaseCharacters=False)
-
-    # We set a mocked audit_info for AWS not to share the same audit state
-    # between checks
-    current_audit_info = self.set_mocked_audit_info()
-
-    # The Prowler service import MUST be made within the decorated
-    # code not to make real API calls to the AWS service.
-    from prowler.providers.aws.services.iam.iam_service import IAM
-
-    # Prowler for AWS uses a shared object called `current_audit_info` where it stores
-    # the audit's state, credentials and configuration.
-    with mock.patch(
-        "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-        new=current_audit_info,
-    ),
-    # We have to mock also the iam_client from the check to enforce that the iam_client used is the one
-    # created within this check because patch != import, and if you execute tests in parallel some objects
-    # can be already initialised hence the check won't be isolated
-      mock.patch(
-        "prowler.providers.aws.services.iam.iam_password_policy_uppercase.iam_password_policy_uppercase.iam_client",
-        new=IAM(current_audit_info),
-    ):
-        # We import the check within the two mocks not to initialise the iam_client with some shared information from
-        # the current_audit_info or the IAM service.
-        from prowler.providers.aws.services.iam.iam_password_policy_uppercase.iam_password_policy_uppercase import (
-            iam_password_policy_uppercase,
-        )
-
-        # Once imported, we only need to instantiate the check's class
-        check = iam_password_policy_uppercase()
-
-        # And then, call the execute() function to run the check
-        # against the IAM client we've set up.
-        result = check.execute()
-
-        # Last but not least, we need to assert all the fields
-        # from the check's results
-        assert len(results) == 1
-        assert result[0].status == "FAIL"
-        assert result[0].status_extended == "IAM password policy does not require at least one uppercase letter."
-        assert result[0].resource_arn == f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root"
-        assert result[0].resource_id == AWS_ACCOUNT_NUMBER
-        assert result[0].resource_tags == []
-        assert result[0].region == AWS_REGION
-```
-
-#### API calls not covered
-
-If the IAM service for the check's we want to test is not covered by Moto we have to inject the objects in the service client using [MagicMock](https://docs.python.org/3/library/unittest.mock.html#unittest.mock.MagicMock) because we cannot instantiate the service since it will make real calls to the AWS APIs.
-
-> The following example uses the IAM GetAccountPasswordPolicy which is covered by Moto but this is only for demonstration purposes.
-
-The following code shows how to use MagicMock to create the service objects.
-
-```python
-# We need to import the unittest.mock to allow us to patch some objects
-# not to use shared ones between test, hence to isolate the test
-from unittest import mock
-
-# Constants used
-AWS_ACCOUNT_NUMBER = "123456789012"
-AWS_REGION = "us-east-1"
-
-
-# We always name the test classes like Test_<check_name>
-class Test_iam_password_policy_uppercase:
-
-  # We name the tests with test_<service>_<check_name>_<test_action>
-  def test_iam_password_policy_no_uppercase_flag(self):
-    # Mocked client with MagicMock
-    mocked_iam_client = mock.MagicMock
-
-    # Since the IAM Password Policy has their own model we have to import it
-    from prowler.providers.aws.services.iam.iam_service import PasswordPolicy
-
-    # Create the mock PasswordPolicy object
-    mocked_iam_client.password_policy = PasswordPolicy(
-        length=5,
-        symbols=True,
-        numbers=True,
-        # We set the value to False to test the check
-        uppercase=False,
-        lowercase=True,
-        allow_change=False,
-        expiration=True,
-    )
-
-    # We set a mocked audit_info for AWS not to share the same audit state
-    # between checks
-    current_audit_info = self.set_mocked_audit_info()
-
-    # In this scenario we have to mock also the IAM service and the iam_client from the check to enforce that the iam_client used is the one created within this check because patch != import, and if you execute tests in parallel some objects can be already initialised hence the check won't be isolated.
-    # In this case we don't use the Moto decorator, we use the mocked IAM client for both objects
-    with mock.patch(
-        "prowler.providers.aws.services.iam.iam_service.IAM",
-        new=mocked_iam_client,
-    ), mock.patch(
-        "prowler.providers.aws.services.iam.iam_client.iam_client",
-        new=mocked_iam_client,
-    ):
-        # We import the check within the two mocks not to initialise the iam_client with some shared information from
-        # the current_audit_info or the IAM service.
-        from prowler.providers.aws.services.iam.iam_password_policy_uppercase.iam_password_policy_uppercase import (
-            iam_password_policy_uppercase,
-        )
-
-        # Once imported, we only need to instantiate the check's class
-        check = iam_password_policy_uppercase()
-
-        # And then, call the execute() function to run the check
-        # against the IAM client we've set up.
-        result = check.execute()
-
-        # Last but not least, we need to assert all the fields
-        # from the check's results
-        assert len(results) == 1
-        assert result[0].status == "FAIL"
-        assert result[0].status_extended == "IAM password policy does not require at least one uppercase letter."
-        assert result[0].resource_arn == f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:root"
-        assert result[0].resource_id == AWS_ACCOUNT_NUMBER
-        assert result[0].resource_tags == []
-        assert result[0].region == AWS_REGION
-```
-
-#### API calls partially covered
-
-If the API calls we want to use in the service are partially covered by the Moto decorator we have to create our own mocked API calls to use it in combination.
-
-To do so, you need to mock the `botocore.client.BaseClient._make_api_call` function, which is the Boto3 function in charge of making the real API call to the AWS APIs, using `mock.patch <https://docs.python.org/3/library/unittest.mock.html#patch>`:
-
-
-```python
-
-import boto3
-import botocore
-from unittest.mock import patch
-from moto import mock_iam
-
-# Original botocore _make_api_call function
-orig = botocore.client.BaseClient._make_api_call
-
-# Mocked botocore _make_api_call function
-def mock_make_api_call(self, operation_name, kwarg):
-    # As you can see the operation_name has the get_account_password_policy snake_case form but
-    # we are using the GetAccountPasswordPolicy form.
-    # Rationale -> https://github.com/boto/botocore/blob/develop/botocore/client.py#L810:L816
-    if operation_name == 'GetAccountPasswordPolicy':
-        return {
-            'PasswordPolicy': {
-                'MinimumPasswordLength': 123,
-                'RequireSymbols': True|False,
-                'RequireNumbers': True|False,
-                'RequireUppercaseCharacters': True|False,
-                'RequireLowercaseCharacters': True|False,
-                'AllowUsersToChangePassword': True|False,
-                'ExpirePasswords': True|False,
-                'MaxPasswordAge': 123,
-                'PasswordReusePrevention': 123,
-                'HardExpiry': True|False
-            }
-        }
-    # If we don't want to patch the API call
-    return orig(self, operation_name, kwarg)
-
-# We always name the test classes like Test_<check_name>
-class Test_iam_password_policy_uppercase:
-
-  # We include the custom API call mock decorator for the service we want to use
-  @patch("botocore.client.BaseClient._make_api_call", new=mock_make_api_call)
-  # We include also the IAM Moto decorator for the API calls supported
-  @mock_iam
-  # We name the tests with test_<service>_<check_name>_<test_action>
-  def test_iam_password_policy_no_uppercase_flag(self):
-    # Check the previous section to see the check test since is the same
-```
-
-Note that this does not use Moto, to keep it simple, but if you use any `moto`-decorators in addition to the patch, the call to `orig(self, operation_name, kwarg)` will be intercepted by Moto.
-
-> The above code comes from here https://docs.getmoto.org/en/latest/docs/services/patching_other_services.html
-
-#### Mocking more than one service
-
-If the test your are creating belongs to a check that uses more than one provider service, you should mock each of the services used. For example, the check `cloudtrail_logs_s3_bucket_access_logging_enabled` requires the CloudTrail and the S3 client, hence the service's mock part of the test will be as follows:
-
-
-```python
-with mock.patch(
-    "prowler.providers.aws.lib.audit_info.audit_info.current_audit_info",
-    new=mock_audit_info,
-), mock.patch(
-    "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_client",
-    new=Cloudtrail(mock_audit_info),
-), mock.patch(
-    "prowler.providers.aws.services.cloudtrail.cloudtrail_logs_s3_bucket_access_logging_enabled.cloudtrail_logs_s3_bucket_access_logging_enabled.s3_client",
-    new=S3(mock_audit_info),
-):
-```
-
-
-As you can see in the above code, it is required to mock the AWS audit info and both services used.
-
-
-#### Patching vs. Importing
-
-This is an important topic within the Prowler check's unit testing. Due to the dynamic nature of the check's load, the process of importing the service client from a check is the following:
-
-1. `<check>.py`:
-```python
-from prowler.providers.<provider>.services.<service>.<service>_client import <service>_client
-```
-2. `<service>_client.py`:
-```python
-from prowler.providers.<provider>.lib.audit_info.audit_info import audit_info
-from prowler.providers.<provider>.services.<service>.<service>_service import <SERVICE>
-
-<service>_client = <SERVICE>(audit_info)
-```
-
-Due to the above import path it's not the same to patch the following objects because if you run a bunch of tests, either in parallel or not, some clients can be already instantiated by another check, hence your test exection will be using another test's service instance:
-
-- `<service>_client` imported at `<check>.py`
-- `<service>_client` initialised at `<service>_client.py`
-- `<SERVICE>` imported at `<service>_client.py`
-
-A useful read about this topic can be found in the following article: https://stackoverflow.com/questions/8658043/how-to-mock-an-import
-
-
-#### Different ways to mock the service client
-
-##### Mocking the service client at the service client level
-
-Mocking a service client using the following code ...
-
-```python title="Mocking the service_client"
-with mock.patch(
-    "prowler.providers.<provider>.lib.audit_info.audit_info.audit_info",
-    new=audit_info,
-), mock.patch(
-    "prowler.providers.aws.services.<service>.<check>.<check>.<service>_client",
-    new=<SERVICE>(audit_info),
-):
-```
-will cause that the service will be initialised twice:
-
-1. When the `<SERVICE>(audit_info)` is mocked out using `mock.patch` to have the object ready for the patching.
-2. At the `<service>_client.py` when we are patching it since the `mock.patch` needs to go to that object an initialise it, hence the `<SERVICE>(audit_info)` will be called again.
-
-Then, when we import the `<service>_client.py` at `<check>.py`, since we are mocking where the object is used, Python will use the mocked one.
-
-In the [next section](./unit-testing.md#mocking-the-service-and-the-service-client-at-the-service-client-level) you will see an improved version to mock objects.
-
-
-##### Mocking the service and the service client at the service client level
-Mocking a service client using the following code ...
-
-```python title="Mocking the service and the service_client"
-with mock.patch(
-    "prowler.providers.<provider>.lib.audit_info.audit_info.audit_info",
-    new=audit_info,
-), mock.patch(
-    "prowler.providers.aws.services.<service>.<SERVICE>",
-    return_value=<SERVICE>(audit_info),
-) as service_client, mock.patch(
-    "prowler.providers.aws.services.<service>.<service>_client.<service>_client",
-    new=service_client,
-):
-```
-will cause that the service will be initialised once, just when the `<SERVICE>(audit_info)` is mocked out using `mock.patch`.
-
-Then, at the check_level when Python tries to import the client with `from prowler.providers.<provider>.services.<service>.<service>_client`, since it is already mocked out, the execution will continue using the `service_client` without getting into the `<service>_client.py`.
-
-
-### Services
-
-For testing the AWS services we have to follow the same logic as with the AWS checks, we have to check if the AWS API calls made by the service are covered by Moto and we have to test the service `__init__` to verifiy that the information is being correctly retrieved.
-
-The service tests could act as *Integration Tests* since we test how the service retrieves the information from the provider, but since Moto or the custom mock objects mocks that calls this test will fall into *Unit Tests*.
-
-Please refer to the [AWS checks tests](./unit-testing.md#checks) for more information on how to create tests and check the existing services tests [here](https://github.com/prowler-cloud/prowler/tree/master/tests/providers/aws/services).
-
-## GCP
-
-### Checks
-
-For the GCP Provider we don't have any library to mock out the API calls we use. So in this scenario we inject the objects in the service client using [MagicMock](https://docs.python.org/3/library/unittest.mock.html#unittest.mock.MagicMock).
-
-The following code shows how to use MagicMock to create the service objects for a GCP check test.
-
-```python
-# We need to import the unittest.mock to allow us to patch some objects
-# not to use shared ones between test, hence to isolate the test
-from unittest import mock
-
-# GCP Constants
-GCP_PROJECT_ID = "123456789012"
-
-# We are going to create a test for the compute_firewall_rdp_access_from_the_internet_allowed check
-class Test_compute_firewall_rdp_access_from_the_internet_allowed:
-
-    # We name the tests with test_<service>_<check_name>_<test_action>
-    def test_compute_compute_firewall_rdp_access_from_the_internet_allowed_one_compliant_rule_with_valid_port(self):
-        # Mocked client with MagicMock
-        compute_client = mock.MagicMock
-
-        # Assign GCP client configuration
-        compute_client.project_ids = [GCP_PROJECT_ID]
-        compute_client.region = "global"
-
-        # Import the service resource model to create the mocked object
-        from prowler.providers.gcp.services.compute.compute_service import Firewall
-
-        # Create the custom Firewall object to be tested
-        firewall = Firewall(
-            name="test",
-            id="1234567890",
-            source_ranges=["0.0.0.0/0"],
-            direction="INGRESS",
-            allowed_rules=[{"IPProtocol": "tcp", "ports": ["443"]}],
-            project_id=GCP_PROJECT_ID,
-        )
-        compute_client.firewalls = [firewall]
-
-        # In this scenario we have to mock also the Compute service and the compute_client from the check to enforce that the compute_client used is the one created within this check because patch != import, and if you execute tests in parallel some objects can be already initialised hence the check won't be isolated.
-        # In this case we don't use the Moto decorator, we use the mocked Compute client for both objects
-        with mock.patch(
-            "prowler.providers.gcp.services.compute.compute_service.Compute",
-            new=defender_client,
-        ), mock.patch(
-            "prowler.providers.gcp.services.compute.compute_client.compute_client",
-            new=defender_client,
-        ):
-
-            # We import the check within the two mocks not to initialise the iam_client with some shared information from
-            # the current_audit_info or the Compute service.
-            from prowler.providers.gcp.services.compute.compute_firewall_rdp_access_from_the_internet_allowed.compute_firewall_rdp_access_from_the_internet_allowed import (
-                compute_firewall_rdp_access_from_the_internet_allowed,
-            )
-
-            # Once imported, we only need to instantiate the check's class
-            check = compute_firewall_rdp_access_from_the_internet_allowed()
-
-            # And then, call the execute() function to run the check
-            # against the IAM client we've set up.
-            result = check.execute()
-
-            # Last but not least, we need to assert all the fields
-            # from the check's results
-            assert len(result) == 1
-            assert result[0].status == "PASS"
-            assert result[0].status_extended == f"Firewall {firewall.name} does not expose port 3389 (RDP) to the internet."
-            assert result[0].resource_name = firewall.name
-            assert result[0].resource_id == firewall.id
-            assert result[0].project_id = GCP_PROJECT_ID
-            assert result[0].location = compute_client.region
-```
-
-### Services
-
-Coming soon ...
-
-## Azure
-
-### Checks
-
-For the Azure Provider we don't have any library to mock out the API calls we use. So in this scenario we inject the objects in the service client using [MagicMock](https://docs.python.org/3/library/unittest.mock.html#unittest.mock.MagicMock).
-
-The following code shows how to use MagicMock to create the service objects for a Azure check test.
-
-```python
-# We need to import the unittest.mock to allow us to patch some objects
-# not to use shared ones between test, hence to isolate the test
-from unittest import mock
-
-from uuid import uuid4
-
-# Azure Constants
-AZURE_SUSCRIPTION = str(uuid4())
-
-
-
-# We are going to create a test for the Test_defender_ensure_defender_for_arm_is_on check
-class Test_defender_ensure_defender_for_arm_is_on:
-
-    # We name the tests with test_<service>_<check_name>_<test_action>
-    def test_defender_defender_ensure_defender_for_arm_is_on_arm_pricing_tier_not_standard(self):
-        resource_id = str(uuid4())
-
-        # Mocked client with MagicMock
-        defender_client = mock.MagicMock
-
-        # Import the service resource model to create the mocked object
-        from prowler.providers.azure.services.defender.defender_service import Defender_Pricing
-
-        # Create the custom Defender object to be tested
-        defender_client.pricings = {
-            AZURE_SUSCRIPTION: {
-                "Arm": Defender_Pricing(
-                    resource_id=resource_id,
-                    pricing_tier="Not Standard",
-                    free_trial_remaining_time=0,
-                )
-            }
-        }
-
-        # In this scenario we have to mock also the Defender service and the defender_client from the check to enforce that the defender_client used is the one created within this check because patch != import, and if you execute tests in parallel some objects can be already initialised hence the check won't be isolated.
-        # In this case we don't use the Moto decorator, we use the mocked Defender client for both objects
-        with mock.patch(
-            "prowler.providers.azure.services.defender.defender_service.Defender",
-            new=defender_client,
-        ), mock.patch(
-            "prowler.providers.azure.services.defender.defender_client.defender_client",
-            new=defender_client,
-        ):
-
-            # We import the check within the two mocks not to initialise the iam_client with some shared information from
-            # the current_audit_info or the Defender service.
-            from prowler.providers.azure.services.defender.defender_ensure_defender_for_arm_is_on.defender_ensure_defender_for_arm_is_on import (
-                defender_ensure_defender_for_arm_is_on,
-            )
-
-            # Once imported, we only need to instantiate the check's class
-            check = defender_ensure_defender_for_arm_is_on()
-
-            # And then, call the execute() function to run the check
-            # against the IAM client we've set up.
-            result = check.execute()
-
-            # Last but not least, we need to assert all the fields
-            # from the check's results
-            assert len(result) == 1
-            assert result[0].status == "FAIL"
-            assert (
-                result[0].status_extended
-                == f"Defender plan Defender for ARM from subscription {AZURE_SUSCRIPTION} is set to OFF (pricing tier not standard)"
-            )
-            assert result[0].subscription == AZURE_SUSCRIPTION
-            assert result[0].resource_name == "Defender plan ARM"
-            assert result[0].resource_id == resource_id
-```
-
-### Services
-
-Coming soon ...

docs/getting-started/requirements.md

@@ -23,8 +23,8 @@ export AWS_SESSION_TOKEN="XXXXXXXXX"
 
 Those credentials must be associated to a user or role with proper permissions to do all checks. To make sure, add the following AWS managed policies to the user or role being used:
 
-  - `arn:aws:iam::aws:policy/SecurityAudit`
-  - `arn:aws:iam::aws:policy/job-function/ViewOnlyAccess`
+  - arn:aws:iam::aws:policy/SecurityAudit
+  - arn:aws:iam::aws:policy/job-function/ViewOnlyAccess
 
   > Moreover, some read-only additional permissions are needed for several checks, make sure you attach also the custom policy [prowler-additions-policy.json](https://github.com/prowler-cloud/prowler/blob/master/permissions/prowler-additions-policy.json) to the role you are using.
 

docs/index.md

@@ -10,9 +10,9 @@
 For **Prowler v2 Documentation**, please go [here](https://github.com/prowler-cloud/prowler/tree/2.12.0) to the branch and its README.md.
 
 - You are currently in the **Getting Started** section where you can find general information and requirements to help you start with the tool.
-- In the [Tutorials](./tutorials/misc.md) section you will see how to take advantage of all the features in Prowler.
-- In the [Contact Us](./contact.md) section you can find how to reach us out in case of technical issues.
-- In the [About](./about.md) section you will find more information about the Prowler team and license.
+- In the [Tutorials](tutorials/overview) section you will see how to take advantage of all the features in Prowler.
+- In the [Contact Us](contact) section you can find how to reach us out in case of technical issues.
+- In the [About](about) section you will find more information about the Prowler team and license.
 
 ## About Prowler
 
@@ -201,7 +201,7 @@ To run Prowler, you will need to specify the provider (e.g aws, gcp or azure):
 prowler <provider>
 ```
 ![Prowler Execution](img/short-display.png)
-> Running the `prowler` command without options will use your environment variable credentials, see [Requirements](./getting-started/requirements.md) section to review the credentials settings.
+> Running the `prowler` command without options will use your environment variable credentials, see [Requirements](getting-started/requirements/) section to review the credentials settings.
 
 If you miss the former output you can use `--verbose` but Prowler v3 is smoking fast, so you won't see much ;)
 

docs/troubleshooting.md

@@ -11,4 +11,4 @@
     This error is also related with a lack of system requirements. To improve performance, Prowler stores information in memory so it may need to be run in a system with more than 1GB of memory.
 
 
-See section [Logging](./tutorials/logging.md) for further information or [contact us](./contact.md).
+See section [Logging](/tutorials/logging/) for further information or [contact us](/contact/).

docs/tutorials/aws/authentication.md

@@ -16,8 +16,8 @@ export AWS_SESSION_TOKEN="XXXXXXXXX"
 
 Those credentials must be associated to a user or role with proper permissions to do all checks. To make sure, add the following AWS managed policies to the user or role being used:
 
-  - `arn:aws:iam::aws:policy/SecurityAudit`
-  - `arn:aws:iam::aws:policy/job-function/ViewOnlyAccess`
+  - arn:aws:iam::aws:policy/SecurityAudit
+  - arn:aws:iam::aws:policy/job-function/ViewOnlyAccess
 
   > Moreover, some read-only additional permissions are needed for several checks, make sure you attach also the custom policy [prowler-additions-policy.json](https://github.com/prowler-cloud/prowler/blob/master/permissions/prowler-additions-policy.json) to the role you are using.
 

docs/tutorials/aws/organizations.md

@@ -1,19 +1,18 @@
 # AWS Organizations
-## Get AWS Account details from your AWS Organization
+## Get AWS Account details from your AWS Organization:
 
 Prowler allows you to get additional information of the scanned account in CSV and JSON outputs. When scanning a single account you get the Account ID as part of the output.
 
 If you have AWS Organizations Prowler can get your account details like Account Name, Email, ARN, Organization ID and Tags and you will have them next to every finding in the CSV and JSON outputs.
 
-In order to do that you can use the option `-O`/`--organizations-role <organizations_role_arn>`. See the following sample command:
+- In order to do that you can use the option `-O`/`--organizations-role <organizations_role_arn>`. See the following sample command:
 
-```shell
-prowler aws \
-  -O arn:aws:iam::<management_organizations_account_id>:role/<role_name>
+```
+prowler aws -O arn:aws:iam::<management_organizations_account_id>:role/<role_name>
 ```
 > Make sure the role in your AWS Organizations management account has the permissions `organizations:ListAccounts*` and `organizations:ListTagsForResource`.
 
-In that command Prowler will scan the account and getting the account details from the AWS Organizations management account assuming a role and creating two reports with those details in JSON and CSV.
+- In that command Prowler will scan the account and getting the account details from the AWS Organizations management account assuming a role and creating two reports with those details in JSON and CSV.
 
 In the JSON output below (redacted) you can see tags coded in base64 to prevent breaking CSV or JSON due to its format:
 
@@ -31,28 +30,20 @@ The additional fields in CSV header output are as follow:
 ACCOUNT_DETAILS_EMAIL,ACCOUNT_DETAILS_NAME,ACCOUNT_DETAILS_ARN,ACCOUNT_DETAILS_ORG,ACCOUNT_DETAILS_TAGS
 ```
 
-## Extra: run Prowler across all accounts in AWS Organizations by assuming roles
+## Assume Role and across all accounts in AWS Organizations or just a list of accounts:
 
 If you want to run Prowler across all accounts of AWS Organizations you can do this:
 
-1. First get a list of accounts that are not suspended:
+- First get a list of accounts that are not suspended:
 
-    ```shell
-    ACCOUNTS_IN_ORGS=$(aws organizations list-accounts \
-      --query "Accounts[?Status=='ACTIVE'].Id" \
-      --output text \
-    )
-    ```
+```
+ACCOUNTS_IN_ORGS=$(aws organizations list-accounts --query Accounts[?Status==`ACTIVE`].Id --output text)
+```
 
-2. Then run Prowler to assume a role (same in all members) per each account:
+- Then run Prowler to assume a role (same in all members) per each account, in this example it is just running one particular check:
 
-    ```shell
-    for accountId in $ACCOUNTS_IN_ORGS;
-    do
-      prowler aws \
-        -O arn:aws:iam::<management_organizations_account_id>:role/<role_name> \
-        -R arn:aws:iam::"${accountId}":role/<role_name>;
-    done
-    ```
+```
+for accountId in $ACCOUNTS_IN_ORGS; do prowler aws -O arn:aws:iam::<management_organizations_account_id>:role/<role_name>; done
+```
 
-> Using the same for loop it can be scanned a list of accounts with a variable like `ACCOUNTS_LIST='11111111111 2222222222 333333333'`
+- Using the same for loop it can be scanned a list of accounts with a variable like `ACCOUNTS_LIST='11111111111 2222222222 333333333'`

docs/tutorials/aws/s3.md

@@ -1,26 +0,0 @@
-# Send report to AWS S3 Bucket
-
-To save your report in an S3 bucket, use `-B`/`--output-bucket`.
-
-```sh
-prowler <provider> -B my-bucket
-```
-
-If you can use a custom folder and/or filename, use `-o`/`--output-directory` and/or `-F`/`--output-filename`.
-
-```sh
-prowler <provider> \
-        -B my-bucket \
-        --output-directory test-folder \
-        --output-filename output-filename
-```
-
-By default Prowler sends HTML, JSON and CSV output formats, if you want to send a custom output format or a single one of the defaults you can specify it with the `-M`/`--output-modes` flag.
-
-```sh
-prowler <provider> -M csv -B my-bucket
-```
-
-> In the case you do not want to use the assumed role credentials but the initial credentials to put the reports into the S3 bucket, use `-D`/`--output-bucket-no-assume` instead of `-B`/`--output-bucket`.
-
-> Make sure that the used credentials have `s3:PutObject` permissions in the S3 path where the reports are going to be uploaded.

docs/tutorials/aws/v2_to_v3_checks_mapping.md

@@ -2,7 +2,7 @@
 
 Prowler v3 comes with different identifiers but we maintained the same checks that were implemented in v2. The reason for this change is because in previous versions of Prowler, check names were mostly based on CIS Benchmark for AWS. In v3 all checks are independent from any security framework and they have its own name and ID.
 
-If you need more information about how new compliance implementation works in Prowler v3 see [Compliance](../compliance.md) section.
+If you need more information about how new compliance implementation works in Prowler v3 see [Compliance](../../compliance/) section.
 
 ```
 checks_v3_to_v2_mapping = {

docs/tutorials/azure/authentication.md

@@ -24,4 +24,4 @@ prowler azure --browser-auth --tenant-id "XXXXXXXX"
 prowler azure --managed-identity-auth
 ```
 
-To use Prowler you need to set up also the permissions required to access your resources in your Azure account, to more details refer to [Requirements](../../getting-started/requirements.md)
+To use Prowler you need to set up also the permissions required to access your resources in your Azure account, to more details refer to [Requirements](/getting-started/requirements)

docs/tutorials/configuration_file.md

@@ -1,111 +1,76 @@
 # Configuration File
-Several Prowler's checks have user configurable variables that can be modified in a common **configuration file**. This file can be found in the following [path](https://github.com/prowler-cloud/prowler/blob/master/prowler/config/config.yaml):
+Several Prowler's checks have user configurable variables that can be modified in a common **configuration file**.
+This file can be found in the following path:
 ```
 prowler/config/config.yaml
 ```
 
-Also you can input a custom configuration file using the `--config-file` argument.
+## Configurable Checks
+The following list includes all the checks with configurable variables that can be changed in the mentioned configuration yaml file:
 
-## AWS
+1. aws.ec2_elastic_ip_shodan
+    - shodan_api_key (String)
+- aws.ec2_securitygroup_with_many_ingress_egress_rules
+    - max_security_group_rules (Integer)
+- aws.ec2_instance_older_than_specific_days
+    - max_ec2_instance_age_in_days (Integer)
+- aws.vpc_endpoint_connections_trust_boundaries
+    - trusted_account_ids (List of Strings)
+- aws.vpc_endpoint_services_allowed_principals_trust_boundaries
+    - trusted_account_ids (List of Strings)
+- aws.cloudwatch_log_group_retention_policy_specific_days_enabled
+    - log_group_retention_days (Integer)
+- aws.appstream_fleet_session_idle_disconnect_timeout
+    - max_idle_disconnect_timeout_in_seconds (Integer)
+- aws.appstream_fleet_session_disconnect_timeout
+    - max_disconnect_timeout_in_seconds (Integer)
+- aws.appstream_fleet_maximum_session_duration
+    - max_session_duration_seconds (Integer)
+- aws.awslambda_function_using_supported_runtimes
+    - obsolete_lambda_runtimes (List of Strings)
 
-### Configurable Checks
-The following list includes all the AWS checks with configurable variables that can be changed in the configuration yaml file:
+## Config Yaml File
 
-| Check Name  | Value  | Type  |
-|---|---|---|
-| `ec2_elastic_ip_shodan`  | `shodan_api_key`  | String |
-| `ec2_securitygroup_with_many_ingress_egress_rules`  | `max_security_group_rules`  | Integer |
-| `ec2_instance_older_than_specific_days` | `max_ec2_instance_age_in_days`  | Integer |
-| `vpc_endpoint_connections_trust_boundaries`  | `trusted_account_ids`  | List of Strings |
-| `vpc_endpoint_services_allowed_principals_trust_boundaries`  | `trusted_account_ids`  | List of Strings |
-| `cloudwatch_log_group_retention_policy_specific_days_enabled` | `log_group_retention_days` | Integer |
-| `appstream_fleet_session_idle_disconnect_timeout`  | `max_idle_disconnect_timeout_in_seconds`  | Integer |
-| `appstream_fleet_session_disconnect_timeout`  |  `max_disconnect_timeout_in_seconds` | Integer |
-| `appstream_fleet_maximum_session_duration`  | `max_session_duration_seconds`  | Integer |
-| `awslambda_function_using_supported_runtimes` | `obsolete_lambda_runtimes`  | Integer |
-| `organizations_scp_check_deny_regions` | `organizations_enabled_regions`  | List of Strings |
-| `organizations_delegated_administrators` |  `organizations_trusted_delegated_administrators` | List of Strings |
-| `ecr_repositories_scan_vulnerabilities_in_latest_image` | `ecr_repository_vulnerability_minimum_severity` | String |
+    # AWS EC2 Configuration
+    # aws.ec2_elastic_ip_shodan
+    shodan_api_key: null
+    # aws.ec2_securitygroup_with_many_ingress_egress_rules --> by default is 50 rules
+    max_security_group_rules: 50
+    # aws.ec2_instance_older_than_specific_days --> by default is 6 months (180 days)
+    max_ec2_instance_age_in_days: 180
 
-## Azure
+    # AWS VPC Configuration (vpc_endpoint_connections_trust_boundaries, vpc_endpoint_services_allowed_principals_trust_boundaries)
+    # Single account environment: No action required. The AWS account number will be automatically added by the checks.
+    # Multi account environment: Any additional trusted account number should be added as a space separated list, e.g.
+    # trusted_account_ids : ["123456789012", "098765432109", "678901234567"]
+    trusted_account_ids: []
 
-### Configurable Checks
+    # AWS Cloudwatch Configuration
+    # aws.cloudwatch_log_group_retention_policy_specific_days_enabled --> by default is 365 days
+    log_group_retention_days: 365
 
-## GCP
+    # AWS AppStream Session Configuration
+    # aws.appstream_fleet_session_idle_disconnect_timeout
+    max_idle_disconnect_timeout_in_seconds: 600 # 10 Minutes
+    # aws.appstream_fleet_session_disconnect_timeout
+    max_disconnect_timeout_in_seconds: 300 # 5 Minutes
+    # aws.appstream_fleet_maximum_session_duration
+    max_session_duration_seconds: 36000 # 10 Hours
 
-### Configurable Checks
-
-## Config YAML File Structure
-> This is the new Prowler configuration file format. The old one without provider keys is still compatible just for the AWS provider.
-
-```yaml title="config.yaml"
-# AWS Configuration
-aws:
-  # AWS EC2 Configuration
-  # aws.ec2_elastic_ip_shodan
-  shodan_api_key: null
-  # aws.ec2_securitygroup_with_many_ingress_egress_rules --> by default is 50 rules
-  max_security_group_rules: 50
-  # aws.ec2_instance_older_than_specific_days --> by default is 6 months (180 days)
-  max_ec2_instance_age_in_days: 180
-
-  # AWS VPC Configuration (vpc_endpoint_connections_trust_boundaries, vpc_endpoint_services_allowed_principals_trust_boundaries)
-  # Single account environment: No action required. The AWS account number will be automatically added by the checks.
-  # Multi account environment: Any additional trusted account number should be added as a space separated list, e.g.
-  # trusted_account_ids : ["123456789012", "098765432109", "678901234567"]
-  trusted_account_ids: []
-
-  # AWS Cloudwatch Configuration
-  # aws.cloudwatch_log_group_retention_policy_specific_days_enabled --> by default is 365 days
-  log_group_retention_days: 365
-
-  # AWS AppStream Session Configuration
-  # aws.appstream_fleet_session_idle_disconnect_timeout
-  max_idle_disconnect_timeout_in_seconds: 600 # 10 Minutes
-  # aws.appstream_fleet_session_disconnect_timeout
-  max_disconnect_timeout_in_seconds: 300 # 5 Minutes
-  # aws.appstream_fleet_maximum_session_duration
-  max_session_duration_seconds: 36000 # 10 Hours
-
-  # AWS Lambda Configuration
-  # aws.awslambda_function_using_supported_runtimes
-  obsolete_lambda_runtimes:
+    # AWS Lambda Configuration
+    # aws.awslambda_function_using_supported_runtimes
+    obsolete_lambda_runtimes:
     [
-      "python3.6",
-      "python2.7",
-      "nodejs4.3",
-      "nodejs4.3-edge",
-      "nodejs6.10",
-      "nodejs",
-      "nodejs8.10",
-      "nodejs10.x",
-      "dotnetcore1.0",
-      "dotnetcore2.0",
-      "dotnetcore2.1",
-      "ruby2.5",
+        "python3.6",
+        "python2.7",
+        "nodejs4.3",
+        "nodejs4.3-edge",
+        "nodejs6.10",
+        "nodejs",
+        "nodejs8.10",
+        "nodejs10.x",
+        "dotnetcore1.0",
+        "dotnetcore2.0",
+        "dotnetcore2.1",
+        "ruby2.5",
     ]
-
-  # AWS Organizations
-  # organizations_scp_check_deny_regions
-  # organizations_enabled_regions: [
-  #   'eu-central-1',
-  #   'eu-west-1',
-  #   "us-east-1"
-  # ]
-  organizations_enabled_regions: []
-  organizations_trusted_delegated_administrators: []
-
-  # AWS ECR
-  # ecr_repositories_scan_vulnerabilities_in_latest_image
-  # CRITICAL
-  # HIGH
-  # MEDIUM
-  ecr_repository_vulnerability_minimum_severity: "MEDIUM"
-
-# Azure Configuration
-azure:
-
-# GCP Configuration
-gcp:
-
-```

docs/tutorials/developer-guide.md

@@ -0,0 +1,281 @@
+# Developer Guide
+
+You can extend Prowler in many different ways, in most cases you will want to create your own checks and compliance security frameworks, here is where you can learn about how to get started with it. We also include how to create custom outputs, integrations and more.
+
+## Get the code and install all dependencies
+
+First of all, you need a version of Python 3.9 or higher and also pip installed to be able to install all dependencies required. Once that is satisfied go a head and clone the repo:
+
+```
+git clone https://github.com/prowler-cloud/prowler
+cd prowler
+```
+For isolation and avoid conflicts with other environments, we recommend usage of `poetry`:
+```
+pip install poetry
+```
+Then install all dependencies including the ones for developers:
+```
+poetry install
+poetry shell
+```
+
+## Contributing with your code or fixes to Prowler
+
+This repo has git pre-commit hooks managed via the pre-commit tool. Install it how ever you like, then in the root of this repo run:
+```
+pre-commit install
+```
+You should get an output like the following:
+```
+pre-commit installed at .git/hooks/pre-commit
+```
+
+Before we merge any of your pull requests we pass checks to the code, we use the following tools and automation to make sure the code is secure and dependencies up-to-dated (these should have been already installed if you ran `pipenv install -d`):
+
+- `bandit` for code security review.
+- `safety` and `dependabot` for dependencies.
+- `hadolint` and `dockle` for our containers security.
+- `snyk` in Docker Hub.
+- `clair` in Amazon ECR.
+- `vulture`, `flake8`, `black` and `pylint` for formatting and best practices.
+
+You can see all dependencies in file `Pipfile`.
+
+## Create a new check for a Provider
+
+### If the check you want to create belongs to an existing service
+
+To create a new check, you will need to create a folder inside the specific service, i.e. `prowler/providers/<provider>/services/<service>/<check_name>/`, with the name of check following the pattern: `service_subservice_action`.
+Inside that folder, create the following files:
+
+- An empty `__init__.py`: to make Python treat this check folder as a package.
+- A `check_name.py` containing the check's logic, for example:
+```
+# Import the Check_Report of the specific provider
+from prowler.lib.check.models import Check, Check_Report_AWS
+# Import the client of the specific service
+from prowler.providers.aws.services.ec2.ec2_client import ec2_client
+
+# Create the class for the check
+class ec2_ebs_volume_encryption(Check):
+    def execute(self):
+        findings = []
+        # Iterate the service's asset that want to be analyzed
+        for volume in ec2_client.volumes:
+            # Initialize a Check Report for each item and assign the region, resource_id, resource_arn and resource_tags
+            report = Check_Report_AWS(self.metadata())
+            report.region = volume.region
+            report.resource_id = volume.id
+            report.resource_arn = volume.arn
+            report.resource_tags = volume.tags
+            # Make the logic with conditions and create a PASS and a FAIL with a status and a status_extended
+            if volume.encrypted:
+                report.status = "PASS"
+                report.status_extended = f"EBS Snapshot {volume.id} is encrypted."
+            else:
+                report.status = "FAIL"
+                report.status_extended = f"EBS Snapshot {volume.id} is unencrypted."
+            findings.append(report) # Append a report for each item
+
+        return findings
+```
+- A `check_name.metadata.json` containing the check's metadata, for example:
+```
+{
+  "Provider": "aws",
+  "CheckID": "ec2_ebs_volume_encryption",
+  "CheckTitle": "Ensure there are no EBS Volumes unencrypted.",
+  "CheckType": [
+    "Data Protection"
+  ],
+  "ServiceName": "ec2",
+  "SubServiceName": "volume",
+  "ResourceIdTemplate": "arn:partition:service:region:account-id:resource-id",
+  "Severity": "medium",
+  "ResourceType": "AwsEc2Volume",
+  "Description": "Ensure there are no EBS Volumes unencrypted.",
+  "Risk": "Data encryption at rest prevents data visibility in the event of its unauthorized access or theft.",
+  "RelatedUrl": "",
+  "Remediation": {
+    "Code": {
+      "CLI": "",
+      "NativeIaC": "",
+      "Other": "",
+      "Terraform": ""
+    },
+    "Recommendation": {
+      "Text": "Encrypt all EBS volumes and Enable Encryption by default You can configure your AWS account to enforce the encryption of the new EBS volumes and snapshot copies that you create. For example; Amazon EBS encrypts the EBS volumes created when you launch an instance and the snapshots that you copy from an unencrypted snapshot.",
+      "Url": "https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html"
+    }
+  },
+  "Categories": [
+    "encryption"
+  ],
+  "DependsOn": [],
+  "RelatedTo": [],
+  "Notes": ""
+}
+```
+
+### If the check you want to create belongs to a service not supported already by Prowler you will need to create a new service first
+
+To create a new service, you will need to create a folder inside the specific provider, i.e. `prowler/providers/<provider>/services/<service>/`.
+Inside that folder, create the following files:
+
+- An empty `__init__.py`: to make Python treat this service folder as a package.
+- A `<service>_service.py`, containing all the service's logic and API Calls:
+```
+# You must import the following libraries
+import threading
+from typing import Optional
+
+from pydantic import BaseModel
+
+from prowler.lib.logger import logger
+from prowler.lib.scan_filters.scan_filters import is_resource_filtered
+from prowler.providers.aws.aws_provider import generate_regional_clients
+
+
+# Create a class for the Service
+################## <Service>
+class <Service>:
+    def __init__(self, audit_info):
+        self.service = "<service>" # The name of the service boto3 client
+        self.session = audit_info.audit_session
+        self.audited_account = audit_info.audited_account
+        self.audit_resources = audit_info.audit_resources
+        self.regional_clients = generate_regional_clients(self.service, audit_info)
+        self.<items> = [] # Create an empty list of the items to be gathered, e.g., instances
+        self.__threading_call__(self.__describe_<items>__)
+        self.__describe_<item>__() # Optionally you can create another function to retrieve more data about each item
+
+    def __get_session__(self):
+        return self.session
+
+    def __threading_call__(self, call):
+        threads = []
+        for regional_client in self.regional_clients.values():
+            threads.append(threading.Thread(target=call, args=(regional_client,)))
+        for t in threads:
+            t.start()
+        for t in threads:
+            t.join()
+
+    def __describe_<items>__(self, regional_client):
+        """Get ALL <Service> <Items>"""
+        logger.info("<Service> - Describing <Items>...")
+        try:
+            describe_<items>_paginator = regional_client.get_paginator("describe_<items>") # Paginator to get every item
+            for page in describe_<items>_paginator.paginate():
+                for <item> in page["<Items>"]:
+                    if not self.audit_resources or (
+                        is_resource_filtered(<item>["<item_arn>"], self.audit_resources)
+                    ):
+                        self.<items>.append(
+                            <Item>(
+                                arn=stack["<item_arn>"],
+                                name=stack["<item_name>"],
+                                tags=stack.get("Tags", []),
+                                region=regional_client.region,
+                            )
+                        )
+        except Exception as error:
+            logger.error(
+                f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
+            )
+
+    def __describe_<item>__(self):
+        """Get Details for a <Service> <Item>"""
+        logger.info("<Service> - Describing <Item> to get specific details...")
+        try:
+            for <item> in self.<items>:
+                <item>_details = self.regional_clients[<item>.region].describe_<item>(
+                    <Attribute>=<item>.name
+                )
+                # For example, check if item is Public
+                <item>.public = <item>_details.get("Public", False)
+
+        except Exception as error:
+            logger.error(
+                f"{<item>.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
+            )
+
+
+class <Item>(BaseModel):
+    """<Item> holds a <Service> <Item>"""
+
+    arn: str
+    """<Items>[].Arn"""
+    name: str
+    """<Items>[].Name"""
+    public: bool
+    """<Items>[].Public"""
+    tags: Optional[list] = []
+    region: str
+
+```
+- A `<service>_client_.py`, containing the initialization of the service's class we have just created so the service's checks can use them:
+```
+from prowler.providers.aws.lib.audit_info.audit_info import current_audit_info
+from prowler.providers.aws.services.<service>.<service>_service import <Service>
+
+<service>_client = <Service>(current_audit_info)
+```
+
+## Create a new security compliance framework
+
+If you want to create or contribute with your own security frameworks or add public ones to Prowler you need to make sure the checks are available if not you have to create your own. Then create a compliance file per provider like in `prowler/compliance/aws/` and name it as `<framework>_<version>_<provider>.json` then follow the following format to create yours.
+
+Each file version of a framework will have the following structure at high level with the case that each framework needs to be generally identified, one requirement can be also called one control but one requirement can be linked to multiple prowler checks.:
+
+- `Framework`: string. Distinguish name of the framework, like CIS
+- `Provider`: string. Provider where the framework applies, such as AWS, Azure, OCI,...
+- `Version`: string. Version of the framework itself, like 1.4 for CIS.
+- `Requirements`: array of objects. Include all requirements or controls with the mapping to Prowler.
+- `Requirements_Id`: string. Unique identifier per each requirement in the specific framework
+- `Requirements_Description`: string. Description as in the framework.
+- `Requirements_Attributes`: array of objects. Includes all needed attributes per each requirement, like levels, sections, etc. Whatever helps to create a dedicated report with the result of the findings. Attributes would be taken as closely as possible from the framework's own terminology directly.
+- `Requirements_Checks`: array. Prowler checks that are needed to prove this requirement. It can be one or multiple checks. In case of no automation possible this can be empty.
+
+```
+{
+  "Framework": "<framework>-<provider>",
+  "Version": "<version>",
+  "Requirements": [
+    {
+      "Id": "<unique-id>",
+      "Description": "Requiemente full description",
+      "Checks": [
+        "Here is the prowler check or checks that is going to be executed"
+      ],
+      "Attributes": [
+        {
+         <Add here your custom attributes.>
+        }
+      ]
+    },
+    ...
+  ]
+}
+```
+
+Finally, to have a proper output file for your reports, your framework data model has to be created in `prowler/lib/outputs/models.py` and also the CLI table output in `prowler/lib/outputs/compliance.py`.
+
+
+## Create a custom output format
+
+## Create a new integration
+
+## Contribute with documentation
+
+We use `mkdocs` to build this Prowler documentation site so you can easily contribute back with new docs or improving them.
+
+1. Install `mkdocs` with your favorite package manager.
+2. Inside the `prowler` repository folder run `mkdocs serve` and point your browser to `http://localhost:8000` and you will see live changes to your local copy of this documentation site.
+3. Make all needed changes to docs or add new documents. To do so just edit existing md files inside `prowler/docs` and if you are adding a new section or file please make sure you add it to `mkdocs.yaml` file in the root folder of the Prowler repo.
+4. Once you are done with changes, please send a pull request to us for review and merge. Thank you in advance!
+
+## Want some swag as appreciation for your contribution?
+
+If you are like us and you love swag, we are happy to thank you for your contribution with some laptop stickers or whatever other swag we may have at that time. Please, tell us more details and your pull request link in our [Slack workspace here](https://join.slack.com/t/prowler-workspace/shared_invite/zt-1hix76xsl-2uq222JIXrC7Q8It~9ZNog). You can also reach out to Toni de la Fuente on Twitter [here](https://twitter.com/ToniBlyx), his DMs are open.

docs/tutorials/misc.md

@@ -65,7 +65,7 @@ The custom checks folder must contain one subfolder per check, each subfolder mu
 - A `check_name.metadata.json` containing the check's metadata.
 >The check name must start with the service name followed by an underscore (e.g., ec2_instance_public_ip).
 
-To see more information about how to write checks see the [Developer Guide](../developer-guide/checks.md#create-a-new-check-for-a-provider).
+To see more information about how to write checks see the [Developer Guide](../developer-guide/#create-a-new-check-for-a-provider).
 
 > If you want to run ONLY your custom check(s), import it with -x (--checks-folder) and then run it with -c (--checks), e.g.:
 ```console

docs/tutorials/reporting.md

@@ -21,9 +21,25 @@ prowler <provider> -M csv json json-asff html -o <custom_report_directory>
 ```
 > Both flags can be used simultaneously to provide a custom directory and filename.
 ```console
-prowler <provider> -M csv json json-asff html \
-        -F <custom_report_name> -o <custom_report_directory>
+prowler <provider> -M csv json json-asff html -F <custom_report_name> -o <custom_report_directory>
 ```
+## Send report to AWS S3 Bucket
+
+To save your report in an S3 bucket, use `-B`/`--output-bucket`.
+
+```sh
+prowler <provider> -B my-bucket/folder/
+```
+
+By default Prowler sends HTML, JSON and CSV output formats, if you want to send a custom output format or a single one of the defaults you can specify it with the `-M` flag.
+
+```sh
+prowler <provider> -M csv -B my-bucket/folder/
+```
+
+> In the case you do not want to use the assumed role credentials but the initial credentials to put the reports into the S3 bucket, use `-D`/`--output-bucket-no-assume` instead of `-B`/`--output-bucket`.
+
+> Make sure that the used credentials have s3:PutObject permissions in the S3 path where the reports are going to be uploaded.
 
 ## Output Formats
 
@@ -40,54 +56,12 @@ Hereunder is the structure for each of the supported report formats by Prowler:
 ### HTML
 ![HTML Output](../img/output-html.png)
 ### CSV
+| ASSESSMENT_START_TIME | FINDING_UNIQUE_ID | PROVIDER | PROFILE | ACCOUNT_ID | ACCOUNT_NAME | ACCOUNT_EMAIL | ACCOUNT_ARN | ACCOUNT_ORG | ACCOUNT_TAGS | REGION | CHECK_ID | CHECK_TITLE | CHECK_TYPE | STATUS | STATUS_EXTENDED | SERVICE_NAME | SUBSERVICE_NAME | SEVERITY | RESOURCE_ID | RESOURCE_ARN | RESOURCE_TYPE | RESOURCE_DETAILS | RESOURCE_TAGS | DESCRIPTION | COMPLIANCE | RISK | RELATED_URL | REMEDIATION_RECOMMENDATION_TEXT | REMEDIATION_RECOMMENDATION_URL | REMEDIATION_RECOMMENDATION_CODE_NATIVEIAC | REMEDIATION_RECOMMENDATION_CODE_TERRAFORM | REMEDIATION_RECOMMENDATION_CODE_CLI | REMEDIATION_RECOMMENDATION_CODE_OTHER | CATEGORIES | DEPENDS_ON | RELATED_TO | NOTES |
+| ------- | ----------- | ------ | -------- | ------------ | ----------- | ---------- | ---------- | --------------------- | -------------------------- | -------------- | ----------------- | ------------------------ | --------------- | ---------- | ----------------- | --------- | -------------- | ----------------- | ------------------ | --------------------- | -------------------- | ------------------- | ------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- | -------------------- |
 
-The following are the columns present in the CSV format:
-
-- ASSESSMENT_START_TIME
-- FINDING_UNIQUE_ID
-- PROVIDER
-- PROFILE
-- ACCOUNT_ID
--  ACCOUNT_NAME
--  ACCOUNT_EMAIL
--  ACCOUNT_ARN
--  ACCOUNT_ORG
--  ACCOUNT_TAGS
--  REGION
--  CHECK_ID
--  CHECK_TITLE
--  CHECK_TYPE
--  STATUS
--  STATUS_EXTENDED
--  SERVICE_NAME
--  SUBSERVICE_NAME
--  SEVERITY
--  RESOURCE_ID
--  RESOURCE_ARN
--  RESOURCE_TYPE
--  RESOURCE_DETAILS
--  RESOURCE_TAGS
--  DESCRIPTION
--  COMPLIANCE
--  RISK
--  RELATED_URL
--  REMEDIATION_RECOMMENDATION_TEXT
--  REMEDIATION_RECOMMENDATION_URL
--  REMEDIATION_RECOMMENDATION_CODE_NATIVEIAC
--  REMEDIATION_RECOMMENDATION_CODE_TERRAFORM
--  REMEDIATION_RECOMMENDATION_CODE_CLI
--  REMEDIATION_RECOMMENDATION_CODE_OTHER
--  CATEGORIES
--  DEPENDS_ON
--  RELATED_TO
--  NOTES
-
-> Since Prowler v3 the CSV column delimiter is the semicolon (`;`)
 ### JSON
 
-The following code is an example output of the JSON format:
-
-```json
+```
 [{
     "AssessmentStartTime": "2022-12-01T14:16:57.354413",
     "FindingUniqueId": "",
@@ -137,8 +111,7 @@ The following code is an example output of the JSON format:
             "1.20"
         ]
     }
-},
-{
+},{
     "AssessmentStartTime": "2022-12-01T14:16:57.354413",
     "FindingUniqueId": "",
     "Provider": "aws",
@@ -175,18 +148,17 @@ The following code is an example output of the JSON format:
     },
     "Categories": [],
     "Notes": "",
-    "Compliance": {}
+    "Compliance: {}
 }]
 ```
 
-> NOTE: Each finding is a `json` object within a list. This has changed in v3 since in v2 the format used was [ndjson](http://ndjson.org/).
-
+> NOTE: Each finding is a `json` object.
 
 ### JSON-OCSF
 
 Based on [Open Cybersecurity Schema Framework Security Finding v1.0.0-rc.3](https://schema.ocsf.io/1.0.0-rc.3/classes/security_finding?extensions=)
 
-```json
+```
 [{
     "finding": {
         "title": "Check if ACM Certificates are about to expire in specific days or less",
@@ -443,9 +415,7 @@ Based on [Open Cybersecurity Schema Framework Security Finding v1.0.0-rc.3](http
 > NOTE: Each finding is a `json` object.
 ### JSON-ASFF
 
-The following code is an example output of the [JSON-ASFF](https://docs.aws.amazon.com/securityhub/latest/userguide/securityhub-findings-format-syntax.html) format:
-
-```json
+```
 [{
     "SchemaVersion": "2018-10-08",
     "Id": "prowler-rds_instance_minor_version_upgrade_enabled-ACCOUNT_ID-eu-west-1-b1ade474a",
@@ -573,4 +543,4 @@ The following code is an example output of the [JSON-ASFF](https://docs.aws.amaz
 }]
 ```
 
-> NOTE: Each finding is a `json` object within a list.
+> NOTE: Each finding is a `json` object.

mkdocs.yml

@@ -38,7 +38,7 @@ nav:
       - Logging: tutorials/logging.md
       - Allowlist: tutorials/allowlist.md
       - Pentesting: tutorials/pentesting.md
-      - Developer Guide: developer-guide/introduction.md
+      - Developer Guide: tutorials/developer-guide.md
       - AWS:
           - Authentication: tutorials/aws/authentication.md
           - Assume Role: tutorials/aws/role-assumption.md
@@ -46,7 +46,6 @@ nav:
           - AWS Organizations: tutorials/aws/organizations.md
           - AWS Regions and Partitions: tutorials/aws/regions-and-partitions.md
           - Scan Multiple AWS Accounts: tutorials/aws/multiaccount.md
-          - Send reports to AWS S3: tutorials/aws/s3.md
           - AWS CloudShell: tutorials/aws/cloudshell.md
           - Checks v2 to v3 Mapping: tutorials/aws/v2_to_v3_checks_mapping.md
           - Tag-based Scan: tutorials/aws/tag-based-scan.md
@@ -57,18 +56,7 @@ nav:
           - Subscriptions: tutorials/azure/subscriptions.md
       - Google Cloud:
           - Authentication: tutorials/gcp/authentication.md
-  - Developer Guide:
-      - Introduction: developer-guide/introduction.md
-      - Audit Info: developer-guide/audit-info.md
-      - Services: developer-guide/services.md
-      - Checks: developer-guide/checks.md
-      - Documentation: developer-guide/documentation.md
-      - Compliance: developer-guide/security-compliance-framework.md
-      - Outputs: developer-guide/outputs.md
-      - Integrations: developer-guide/integrations.md
-      - Testing:
-          - Unit Tests: developer-guide/unit-testing.md
-          - Integration Tests: developer-guide/integration-testing.md
+  - Developer Guide: tutorials/developer-guide.md
   - Security: security.md
   - Contact Us: contact.md
   - Troubleshooting: troubleshooting.md

poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand.
 
 [[package]]
 name = "about-time"
@@ -28,13 +28,13 @@ grapheme = "0.6.0"
 
 [[package]]
 name = "astroid"
-version = "2.15.6"
+version = "2.15.4"
 description = "An abstract syntax tree for Python with inference support."
 optional = false
 python-versions = ">=3.7.2"
 files = [
-    {file = "astroid-2.15.6-py3-none-any.whl", hash = "sha256:389656ca57b6108f939cf5d2f9a2a825a3be50ba9d589670f393236e0a03b91c"},
-    {file = "astroid-2.15.6.tar.gz", hash = "sha256:903f024859b7c7687d7a7f3a3f73b17301f8e42dfd9cc9df9d4418172d3e2dbd"},
+    {file = "astroid-2.15.4-py3-none-any.whl", hash = "sha256:a1b8543ef9d36ea777194bc9b17f5f8678d2c56ee6a45b2c2f17eec96f242347"},
+    {file = "astroid-2.15.4.tar.gz", hash = "sha256:c81e1c7fbac615037744d067a9bb5f9aeb655edf59b63ee8b59585475d6f80d8"},
 ]
 
 [package.dependencies]
@@ -106,13 +106,13 @@ aio = ["aiohttp (>=3.0)"]
 
 [[package]]
 name = "azure-identity"
-version = "1.14.0"
+version = "1.13.0"
 description = "Microsoft Azure Identity Library for Python"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "azure-identity-1.14.0.zip", hash = "sha256:72441799f8c5c89bfe21026965e266672a7c5d050c2c65119ef899dd5362e2b1"},
-    {file = "azure_identity-1.14.0-py3-none-any.whl", hash = "sha256:edabf0e010eb85760e1dd19424d5e8f97ba2c9caff73a16e7b30ccbdbcce369b"},
+    {file = "azure-identity-1.13.0.zip", hash = "sha256:c931c27301ffa86b07b4dcf574e29da73e3deba9ab5d1fe4f445bb6a3117e260"},
+    {file = "azure_identity-1.13.0-py3-none-any.whl", hash = "sha256:bd700cebb80cd9862098587c29d8677e819beca33c62568ced6d5a8e5e332b82"},
 ]
 
 [package.dependencies]
@@ -120,6 +120,7 @@ azure-core = ">=1.11.0,<2.0.0"
 cryptography = ">=2.5"
 msal = ">=1.20.0,<2.0.0"
 msal-extensions = ">=0.3.0,<2.0.0"
+six = ">=1.12.0"
 
 [[package]]
 name = "azure-mgmt-authorization"
@@ -185,19 +186,19 @@ msrest = ">=0.6.21"
 
 [[package]]
 name = "azure-mgmt-storage"
-version = "21.1.0"
+version = "21.0.0"
 description = "Microsoft Azure Storage Management Client Library for Python"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "azure-mgmt-storage-21.1.0.tar.gz", hash = "sha256:d6d3c0e917c988bc9ed0472477d3ef3f90886009eb1d97a711944f8375630162"},
-    {file = "azure_mgmt_storage-21.1.0-py3-none-any.whl", hash = "sha256:593f2544fc4f05750c4fe7ca4d83c32ea1e9d266e57899bbf79ce5940124e8cc"},
+    {file = "azure-mgmt-storage-21.0.0.zip", hash = "sha256:6eb13eeecf89195b2b5f47be0679e3f27888efd7bd2132eec7ebcbce75cb1377"},
+    {file = "azure_mgmt_storage-21.0.0-py3-none-any.whl", hash = "sha256:89d644c6192118b0b097deaa9c4925832d8f7ea4693d38d5fce3f0125b43a1c5"},
 ]
 
 [package.dependencies]
 azure-common = ">=1.1,<2.0"
 azure-mgmt-core = ">=1.3.2,<2.0.0"
-isodate = ">=0.6.1,<1.0.0"
+msrest = ">=0.7.1"
 
 [[package]]
 name = "azure-mgmt-subscription"
@@ -235,17 +236,6 @@ typing-extensions = ">=4.3.0"
 [package.extras]
 aio = ["azure-core[aio] (>=1.28.0,<2.0.0)"]
 
-[[package]]
-name = "babel"
-version = "2.12.1"
-description = "Internationalization utilities"
-optional = true
-python-versions = ">=3.7"
-files = [
-    {file = "Babel-2.12.1-py3-none-any.whl", hash = "sha256:b4246fb7677d3b98f501a39d43396d3cafdc8eadb045f4a31be01863f655c610"},
-    {file = "Babel-2.12.1.tar.gz", hash = "sha256:cc2d99999cd01d44420ae725a21c9e3711b3aadc7976d6147f622d8581963455"},
-]
-
 [[package]]
 name = "bandit"
 version = "1.7.5"
@@ -269,24 +259,6 @@ test = ["beautifulsoup4 (>=4.8.0)", "coverage (>=4.5.4)", "fixtures (>=3.0.0)",
 toml = ["tomli (>=1.1.0)"]
 yaml = ["PyYAML"]
 
-[[package]]
-name = "beautifulsoup4"
-version = "4.12.2"
-description = "Screen-scraping library"
-optional = true
-python-versions = ">=3.6.0"
-files = [
-    {file = "beautifulsoup4-4.12.2-py3-none-any.whl", hash = "sha256:bd2520ca0d9d7d12694a53d44ac482d181b4ec1888909b035a3dbf40d0f57d4a"},
-    {file = "beautifulsoup4-4.12.2.tar.gz", hash = "sha256:492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da"},
-]
-
-[package.dependencies]
-soupsieve = ">1.2"
-
-[package.extras]
-html5lib = ["html5lib"]
-lxml = ["lxml"]
-
 [[package]]
 name = "black"
 version = "22.12.0"
@@ -597,68 +569,73 @@ files = [
 
 [[package]]
 name = "coverage"
-version = "7.3.0"
+version = "7.2.7"
 description = "Code coverage measurement for Python"
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.7"
 files = [
-    {file = "coverage-7.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:db76a1bcb51f02b2007adacbed4c88b6dee75342c37b05d1822815eed19edee5"},
-    {file = "coverage-7.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c02cfa6c36144ab334d556989406837336c1d05215a9bdf44c0bc1d1ac1cb637"},
-    {file = "coverage-7.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:477c9430ad5d1b80b07f3c12f7120eef40bfbf849e9e7859e53b9c93b922d2af"},
-    {file = "coverage-7.3.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ce2ee86ca75f9f96072295c5ebb4ef2a43cecf2870b0ca5e7a1cbdd929cf67e1"},
-    {file = "coverage-7.3.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:68d8a0426b49c053013e631c0cdc09b952d857efa8f68121746b339912d27a12"},
-    {file = "coverage-7.3.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b3eb0c93e2ea6445b2173da48cb548364f8f65bf68f3d090404080d338e3a689"},
-    {file = "coverage-7.3.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:90b6e2f0f66750c5a1178ffa9370dec6c508a8ca5265c42fbad3ccac210a7977"},
-    {file = "coverage-7.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:96d7d761aea65b291a98c84e1250cd57b5b51726821a6f2f8df65db89363be51"},
-    {file = "coverage-7.3.0-cp310-cp310-win32.whl", hash = "sha256:63c5b8ecbc3b3d5eb3a9d873dec60afc0cd5ff9d9f1c75981d8c31cfe4df8527"},
-    {file = "coverage-7.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:97c44f4ee13bce914272589b6b41165bbb650e48fdb7bd5493a38bde8de730a1"},
-    {file = "coverage-7.3.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:74c160285f2dfe0acf0f72d425f3e970b21b6de04157fc65adc9fd07ee44177f"},
-    {file = "coverage-7.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b543302a3707245d454fc49b8ecd2c2d5982b50eb63f3535244fd79a4be0c99d"},
-    {file = "coverage-7.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ad0f87826c4ebd3ef484502e79b39614e9c03a5d1510cfb623f4a4a051edc6fd"},
-    {file = "coverage-7.3.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:13c6cbbd5f31211d8fdb477f0f7b03438591bdd077054076eec362cf2207b4a7"},
-    {file = "coverage-7.3.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fac440c43e9b479d1241fe9d768645e7ccec3fb65dc3a5f6e90675e75c3f3e3a"},
-    {file = "coverage-7.3.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:3c9834d5e3df9d2aba0275c9f67989c590e05732439b3318fa37a725dff51e74"},
-    {file = "coverage-7.3.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:4c8e31cf29b60859876474034a83f59a14381af50cbe8a9dbaadbf70adc4b214"},
-    {file = "coverage-7.3.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:7a9baf8e230f9621f8e1d00c580394a0aa328fdac0df2b3f8384387c44083c0f"},
-    {file = "coverage-7.3.0-cp311-cp311-win32.whl", hash = "sha256:ccc51713b5581e12f93ccb9c5e39e8b5d4b16776d584c0f5e9e4e63381356482"},
-    {file = "coverage-7.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:887665f00ea4e488501ba755a0e3c2cfd6278e846ada3185f42d391ef95e7e70"},
-    {file = "coverage-7.3.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:d000a739f9feed900381605a12a61f7aaced6beae832719ae0d15058a1e81c1b"},
-    {file = "coverage-7.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:59777652e245bb1e300e620ce2bef0d341945842e4eb888c23a7f1d9e143c446"},
-    {file = "coverage-7.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c9737bc49a9255d78da085fa04f628a310c2332b187cd49b958b0e494c125071"},
-    {file = "coverage-7.3.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5247bab12f84a1d608213b96b8af0cbb30d090d705b6663ad794c2f2a5e5b9fe"},
-    {file = "coverage-7.3.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e2ac9a1de294773b9fa77447ab7e529cf4fe3910f6a0832816e5f3d538cfea9a"},
-    {file = "coverage-7.3.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:85b7335c22455ec12444cec0d600533a238d6439d8d709d545158c1208483873"},
-    {file = "coverage-7.3.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:36ce5d43a072a036f287029a55b5c6a0e9bd73db58961a273b6dc11a2c6eb9c2"},
-    {file = "coverage-7.3.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:211a4576e984f96d9fce61766ffaed0115d5dab1419e4f63d6992b480c2bd60b"},
-    {file = "coverage-7.3.0-cp312-cp312-win32.whl", hash = "sha256:56afbf41fa4a7b27f6635bc4289050ac3ab7951b8a821bca46f5b024500e6321"},
-    {file = "coverage-7.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:7f297e0c1ae55300ff688568b04ff26b01c13dfbf4c9d2b7d0cb688ac60df479"},
-    {file = "coverage-7.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ac0dec90e7de0087d3d95fa0533e1d2d722dcc008bc7b60e1143402a04c117c1"},
-    {file = "coverage-7.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:438856d3f8f1e27f8e79b5410ae56650732a0dcfa94e756df88c7e2d24851fcd"},
-    {file = "coverage-7.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1084393c6bda8875c05e04fce5cfe1301a425f758eb012f010eab586f1f3905e"},
-    {file = "coverage-7.3.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:49ab200acf891e3dde19e5aa4b0f35d12d8b4bd805dc0be8792270c71bd56c54"},
-    {file = "coverage-7.3.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a67e6bbe756ed458646e1ef2b0778591ed4d1fcd4b146fc3ba2feb1a7afd4254"},
-    {file = "coverage-7.3.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:8f39c49faf5344af36042b293ce05c0d9004270d811c7080610b3e713251c9b0"},
-    {file = "coverage-7.3.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:7df91fb24c2edaabec4e0eee512ff3bc6ec20eb8dccac2e77001c1fe516c0c84"},
-    {file = "coverage-7.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:34f9f0763d5fa3035a315b69b428fe9c34d4fc2f615262d6be3d3bf3882fb985"},
-    {file = "coverage-7.3.0-cp38-cp38-win32.whl", hash = "sha256:bac329371d4c0d456e8d5f38a9b0816b446581b5f278474e416ea0c68c47dcd9"},
-    {file = "coverage-7.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:b859128a093f135b556b4765658d5d2e758e1fae3e7cc2f8c10f26fe7005e543"},
-    {file = "coverage-7.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fc0ed8d310afe013db1eedd37176d0839dc66c96bcfcce8f6607a73ffea2d6ba"},
-    {file = "coverage-7.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61260ec93f99f2c2d93d264b564ba912bec502f679793c56f678ba5251f0393"},
-    {file = "coverage-7.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97af9554a799bd7c58c0179cc8dbf14aa7ab50e1fd5fa73f90b9b7215874ba28"},
-    {file = "coverage-7.3.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3558e5b574d62f9c46b76120a5c7c16c4612dc2644c3d48a9f4064a705eaee95"},
-    {file = "coverage-7.3.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37d5576d35fcb765fca05654f66aa71e2808d4237d026e64ac8b397ffa66a56a"},
-    {file = "coverage-7.3.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:07ea61bcb179f8f05ffd804d2732b09d23a1238642bf7e51dad62082b5019b34"},
-    {file = "coverage-7.3.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:80501d1b2270d7e8daf1b64b895745c3e234289e00d5f0e30923e706f110334e"},
-    {file = "coverage-7.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4eddd3153d02204f22aef0825409091a91bf2a20bce06fe0f638f5c19a85de54"},
-    {file = "coverage-7.3.0-cp39-cp39-win32.whl", hash = "sha256:2d22172f938455c156e9af2612650f26cceea47dc86ca048fa4e0b2d21646ad3"},
-    {file = "coverage-7.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:60f64e2007c9144375dd0f480a54d6070f00bb1a28f65c408370544091c9bc9e"},
-    {file = "coverage-7.3.0-pp38.pp39.pp310-none-any.whl", hash = "sha256:5492a6ce3bdb15c6ad66cb68a0244854d9917478877a25671d70378bdc8562d0"},
-    {file = "coverage-7.3.0.tar.gz", hash = "sha256:49dbb19cdcafc130f597d9e04a29d0a032ceedf729e41b181f51cd170e6ee865"},
+    {file = "coverage-7.2.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d39b5b4f2a66ccae8b7263ac3c8170994b65266797fb96cbbfd3fb5b23921db8"},
+    {file = "coverage-7.2.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6d040ef7c9859bb11dfeb056ff5b3872436e3b5e401817d87a31e1750b9ae2fb"},
+    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba90a9563ba44a72fda2e85302c3abc71c5589cea608ca16c22b9804262aaeb6"},
+    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e7d9405291c6928619403db1d10bd07888888ec1abcbd9748fdaa971d7d661b2"},
+    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31563e97dae5598556600466ad9beea39fb04e0229e61c12eaa206e0aa202063"},
+    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:ebba1cd308ef115925421d3e6a586e655ca5a77b5bf41e02eb0e4562a111f2d1"},
+    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:cb017fd1b2603ef59e374ba2063f593abe0fc45f2ad9abdde5b4d83bd922a353"},
+    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62a5c7dad11015c66fbb9d881bc4caa5b12f16292f857842d9d1871595f4495"},
+    {file = "coverage-7.2.7-cp310-cp310-win32.whl", hash = "sha256:ee57190f24fba796e36bb6d3aa8a8783c643d8fa9760c89f7a98ab5455fbf818"},
+    {file = "coverage-7.2.7-cp310-cp310-win_amd64.whl", hash = "sha256:f75f7168ab25dd93110c8a8117a22450c19976afbc44234cbf71481094c1b850"},
+    {file = "coverage-7.2.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:06a9a2be0b5b576c3f18f1a241f0473575c4a26021b52b2a85263a00f034d51f"},
+    {file = "coverage-7.2.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5baa06420f837184130752b7c5ea0808762083bf3487b5038d68b012e5937dbe"},
+    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fdec9e8cbf13a5bf63290fc6013d216a4c7232efb51548594ca3631a7f13c3a3"},
+    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:52edc1a60c0d34afa421c9c37078817b2e67a392cab17d97283b64c5833f427f"},
+    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63426706118b7f5cf6bb6c895dc215d8a418d5952544042c8a2d9fe87fcf09cb"},
+    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:afb17f84d56068a7c29f5fa37bfd38d5aba69e3304af08ee94da8ed5b0865833"},
+    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:48c19d2159d433ccc99e729ceae7d5293fbffa0bdb94952d3579983d1c8c9d97"},
+    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0e1f928eaf5469c11e886fe0885ad2bf1ec606434e79842a879277895a50942a"},
+    {file = "coverage-7.2.7-cp311-cp311-win32.whl", hash = "sha256:33d6d3ea29d5b3a1a632b3c4e4f4ecae24ef170b0b9ee493883f2df10039959a"},
+    {file = "coverage-7.2.7-cp311-cp311-win_amd64.whl", hash = "sha256:5b7540161790b2f28143191f5f8ec02fb132660ff175b7747b95dcb77ac26562"},
+    {file = "coverage-7.2.7-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f2f67fe12b22cd130d34d0ef79206061bfb5eda52feb6ce0dba0644e20a03cf4"},
+    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a342242fe22407f3c17f4b499276a02b01e80f861f1682ad1d95b04018e0c0d4"},
+    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:171717c7cb6b453aebac9a2ef603699da237f341b38eebfee9be75d27dc38e01"},
+    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49969a9f7ffa086d973d91cec8d2e31080436ef0fb4a359cae927e742abfaaa6"},
+    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b46517c02ccd08092f4fa99f24c3b83d8f92f739b4657b0f146246a0ca6a831d"},
+    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:a3d33a6b3eae87ceaefa91ffdc130b5e8536182cd6dfdbfc1aa56b46ff8c86de"},
+    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:976b9c42fb2a43ebf304fa7d4a310e5f16cc99992f33eced91ef6f908bd8f33d"},
+    {file = "coverage-7.2.7-cp312-cp312-win32.whl", hash = "sha256:8de8bb0e5ad103888d65abef8bca41ab93721647590a3f740100cd65c3b00511"},
+    {file = "coverage-7.2.7-cp312-cp312-win_amd64.whl", hash = "sha256:9e31cb64d7de6b6f09702bb27c02d1904b3aebfca610c12772452c4e6c21a0d3"},
+    {file = "coverage-7.2.7-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:58c2ccc2f00ecb51253cbe5d8d7122a34590fac9646a960d1430d5b15321d95f"},
+    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d22656368f0e6189e24722214ed8d66b8022db19d182927b9a248a2a8a2f67eb"},
+    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a895fcc7b15c3fc72beb43cdcbdf0ddb7d2ebc959edac9cef390b0d14f39f8a9"},
+    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e84606b74eb7de6ff581a7915e2dab7a28a0517fbe1c9239eb227e1354064dcd"},
+    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:0a5f9e1dbd7fbe30196578ca36f3fba75376fb99888c395c5880b355e2875f8a"},
+    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:419bfd2caae268623dd469eff96d510a920c90928b60f2073d79f8fe2bbc5959"},
+    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:2aee274c46590717f38ae5e4650988d1af340fe06167546cc32fe2f58ed05b02"},
+    {file = "coverage-7.2.7-cp37-cp37m-win32.whl", hash = "sha256:61b9a528fb348373c433e8966535074b802c7a5d7f23c4f421e6c6e2f1697a6f"},
+    {file = "coverage-7.2.7-cp37-cp37m-win_amd64.whl", hash = "sha256:b1c546aca0ca4d028901d825015dc8e4d56aac4b541877690eb76490f1dc8ed0"},
+    {file = "coverage-7.2.7-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:54b896376ab563bd38453cecb813c295cf347cf5906e8b41d340b0321a5433e5"},
+    {file = "coverage-7.2.7-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3d376df58cc111dc8e21e3b6e24606b5bb5dee6024f46a5abca99124b2229ef5"},
+    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e330fc79bd7207e46c7d7fd2bb4af2963f5f635703925543a70b99574b0fea9"},
+    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e9d683426464e4a252bf70c3498756055016f99ddaec3774bf368e76bbe02b6"},
+    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d13c64ee2d33eccf7437961b6ea7ad8673e2be040b4f7fd4fd4d4d28d9ccb1e"},
+    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b7aa5f8a41217360e600da646004f878250a0d6738bcdc11a0a39928d7dc2050"},
+    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8fa03bce9bfbeeef9f3b160a8bed39a221d82308b4152b27d82d8daa7041fee5"},
+    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:245167dd26180ab4c91d5e1496a30be4cd721a5cf2abf52974f965f10f11419f"},
+    {file = "coverage-7.2.7-cp38-cp38-win32.whl", hash = "sha256:d2c2db7fd82e9b72937969bceac4d6ca89660db0a0967614ce2481e81a0b771e"},
+    {file = "coverage-7.2.7-cp38-cp38-win_amd64.whl", hash = "sha256:2e07b54284e381531c87f785f613b833569c14ecacdcb85d56b25c4622c16c3c"},
+    {file = "coverage-7.2.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:537891ae8ce59ef63d0123f7ac9e2ae0fc8b72c7ccbe5296fec45fd68967b6c9"},
+    {file = "coverage-7.2.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:06fb182e69f33f6cd1d39a6c597294cff3143554b64b9825d1dc69d18cc2fff2"},
+    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:201e7389591af40950a6480bd9edfa8ed04346ff80002cec1a66cac4549c1ad7"},
+    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f6951407391b639504e3b3be51b7ba5f3528adbf1a8ac3302b687ecababf929e"},
+    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6f48351d66575f535669306aa7d6d6f71bc43372473b54a832222803eb956fd1"},
+    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b29019c76039dc3c0fd815c41392a044ce555d9bcdd38b0fb60fb4cd8e475ba9"},
+    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:81c13a1fc7468c40f13420732805a4c38a105d89848b7c10af65a90beff25250"},
+    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:975d70ab7e3c80a3fe86001d8751f6778905ec723f5b110aed1e450da9d4b7f2"},
+    {file = "coverage-7.2.7-cp39-cp39-win32.whl", hash = "sha256:7ee7d9d4822c8acc74a5e26c50604dff824710bc8de424904c0982e25c39c6cb"},
+    {file = "coverage-7.2.7-cp39-cp39-win_amd64.whl", hash = "sha256:eb393e5ebc85245347950143969b241d08b52b88a3dc39479822e073a1a8eb27"},
+    {file = "coverage-7.2.7-pp37.pp38.pp39-none-any.whl", hash = "sha256:b7b4c971f05e6ae490fef852c218b0e79d4e52f79ef0c8475566584a8fb3e01d"},
+    {file = "coverage-7.2.7.tar.gz", hash = "sha256:924d94291ca674905fe9481f12294eb11f2d3d3fd1adb20314ba89e94f44ed59"},
 ]
 
-[package.dependencies]
-tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.11.0a6\" and extra == \"toml\""}
-
 [package.extras]
 toml = ["tomli"]
 
@@ -707,17 +684,6 @@ ssh = ["bcrypt (>=3.1.5)"]
 test = ["pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-xdist"]
 test-randomorder = ["pytest-randomly"]
 
-[[package]]
-name = "cssselect"
-version = "1.2.0"
-description = "cssselect parses CSS3 Selectors and translates them to XPath 1.0"
-optional = true
-python-versions = ">=3.7"
-files = [
-    {file = "cssselect-1.2.0-py2.py3-none-any.whl", hash = "sha256:da1885f0c10b60c03ed5eccbb6b68d6eff248d91976fcde348f395d54c9fd35e"},
-    {file = "cssselect-1.2.0.tar.gz", hash = "sha256:666b19839cfaddb9ce9d36bfe4c969132c647b92fc9088c4e23f786b30f1b3dc"},
-]
-
 [[package]]
 name = "detect-secrets"
 version = "1.4.0"
@@ -819,21 +785,6 @@ files = [
 [package.extras]
 testing = ["pre-commit"]
 
-[[package]]
-name = "filelock"
-version = "3.12.2"
-description = "A platform independent file lock."
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "filelock-3.12.2-py3-none-any.whl", hash = "sha256:cbb791cdea2a72f23da6ac5b5269ab0a0d161e9ef0100e653b69049a7706d1ec"},
-    {file = "filelock-3.12.2.tar.gz", hash = "sha256:002740518d8aa59a26b0c76e10fb8c6e15eae825d34b6fdf670333fd7b938d81"},
-]
-
-[package.extras]
-docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"]
-testing = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "diff-cover (>=7.5)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)", "pytest-timeout (>=2.1)"]
-
 [[package]]
 name = "flake8"
 version = "6.1.0"
@@ -897,13 +848,13 @@ smmap = ">=3.0.1,<6"
 
 [[package]]
 name = "gitpython"
-version = "3.1.32"
+version = "3.1.31"
 description = "GitPython is a Python library used to interact with Git repositories"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "GitPython-3.1.32-py3-none-any.whl", hash = "sha256:e3d59b1c2c6ebb9dfa7a184daf3b6dd4914237e7488a1730a6d8f6f5d0b4187f"},
-    {file = "GitPython-3.1.32.tar.gz", hash = "sha256:8d9b8cb1e80b9735e8717c9362079d3ce4c6e5ddeebedd0361b228c3a67a62f6"},
+    {file = "GitPython-3.1.31-py3-none-any.whl", hash = "sha256:f04893614f6aa713a60cbbe1e6a97403ef633103cdd0ef5eb6efe0deb98dbe8d"},
+    {file = "GitPython-3.1.31.tar.gz", hash = "sha256:8ce3bcf69adfdf7c7d503e78fd3b1c492af782d58893b650adb2ac8912ddd573"},
 ]
 
 [package.dependencies]
@@ -933,13 +884,13 @@ grpcio-gcp = ["grpcio-gcp (>=0.2.2,<1.0dev)"]
 
 [[package]]
 name = "google-api-python-client"
-version = "2.97.0"
+version = "2.95.0"
 description = "Google API Client Library for Python"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "google-api-python-client-2.97.0.tar.gz", hash = "sha256:48277291894876a1ca7ed4127e055e81f81e6343ced1b544a7200ae2c119dcd7"},
-    {file = "google_api_python_client-2.97.0-py2.py3-none-any.whl", hash = "sha256:5215f4cd577753fc4192ccfbe0bb8b55d4bb5fd68fa6268ac5cf271b6305de31"},
+    {file = "google-api-python-client-2.95.0.tar.gz", hash = "sha256:d2731ede12f79e53fbe11fdb913dfe986440b44c0a28431c78a8ec275f4c1541"},
+    {file = "google_api_python_client-2.95.0-py2.py3-none-any.whl", hash = "sha256:a8aab2da678f42a01f2f52108f787fef4310f23f9dd917c4e64664c3f0c885ba"},
 ]
 
 [package.dependencies]
@@ -1230,113 +1181,6 @@ files = [
     {file = "lazy_object_proxy-1.9.0-cp39-cp39-win_amd64.whl", hash = "sha256:db1c1722726f47e10e0b5fdbf15ac3b8adb58c091d12b3ab713965795036985f"},
 ]
 
-[[package]]
-name = "lxml"
-version = "4.9.3"
-description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
-optional = true
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*"
-files = [
-    {file = "lxml-4.9.3-cp27-cp27m-macosx_11_0_x86_64.whl", hash = "sha256:b0a545b46b526d418eb91754565ba5b63b1c0b12f9bd2f808c852d9b4b2f9b5c"},
-    {file = "lxml-4.9.3-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:075b731ddd9e7f68ad24c635374211376aa05a281673ede86cbe1d1b3455279d"},
-    {file = "lxml-4.9.3-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:1e224d5755dba2f4a9498e150c43792392ac9b5380aa1b845f98a1618c94eeef"},
-    {file = "lxml-4.9.3-cp27-cp27m-win32.whl", hash = "sha256:2c74524e179f2ad6d2a4f7caf70e2d96639c0954c943ad601a9e146c76408ed7"},
-    {file = "lxml-4.9.3-cp27-cp27m-win_amd64.whl", hash = "sha256:4f1026bc732b6a7f96369f7bfe1a4f2290fb34dce00d8644bc3036fb351a4ca1"},
-    {file = "lxml-4.9.3-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c0781a98ff5e6586926293e59480b64ddd46282953203c76ae15dbbbf302e8bb"},
-    {file = "lxml-4.9.3-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:cef2502e7e8a96fe5ad686d60b49e1ab03e438bd9123987994528febd569868e"},
-    {file = "lxml-4.9.3-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:b86164d2cff4d3aaa1f04a14685cbc072efd0b4f99ca5708b2ad1b9b5988a991"},
-    {file = "lxml-4.9.3-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:42871176e7896d5d45138f6d28751053c711ed4d48d8e30b498da155af39aebd"},
-    {file = "lxml-4.9.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:ae8b9c6deb1e634ba4f1930eb67ef6e6bf6a44b6eb5ad605642b2d6d5ed9ce3c"},
-    {file = "lxml-4.9.3-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:411007c0d88188d9f621b11d252cce90c4a2d1a49db6c068e3c16422f306eab8"},
-    {file = "lxml-4.9.3-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:cd47b4a0d41d2afa3e58e5bf1f62069255aa2fd6ff5ee41604418ca925911d76"},
-    {file = "lxml-4.9.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0e2cb47860da1f7e9a5256254b74ae331687b9672dfa780eed355c4c9c3dbd23"},
-    {file = "lxml-4.9.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1247694b26342a7bf47c02e513d32225ededd18045264d40758abeb3c838a51f"},
-    {file = "lxml-4.9.3-cp310-cp310-win32.whl", hash = "sha256:cdb650fc86227eba20de1a29d4b2c1bfe139dc75a0669270033cb2ea3d391b85"},
-    {file = "lxml-4.9.3-cp310-cp310-win_amd64.whl", hash = "sha256:97047f0d25cd4bcae81f9ec9dc290ca3e15927c192df17331b53bebe0e3ff96d"},
-    {file = "lxml-4.9.3-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:1f447ea5429b54f9582d4b955f5f1985f278ce5cf169f72eea8afd9502973dd5"},
-    {file = "lxml-4.9.3-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:57d6ba0ca2b0c462f339640d22882acc711de224d769edf29962b09f77129cbf"},
-    {file = "lxml-4.9.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:9767e79108424fb6c3edf8f81e6730666a50feb01a328f4a016464a5893f835a"},
-    {file = "lxml-4.9.3-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:71c52db65e4b56b8ddc5bb89fb2e66c558ed9d1a74a45ceb7dcb20c191c3df2f"},
-    {file = "lxml-4.9.3-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:d73d8ecf8ecf10a3bd007f2192725a34bd62898e8da27eb9d32a58084f93962b"},
-    {file = "lxml-4.9.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0a3d3487f07c1d7f150894c238299934a2a074ef590b583103a45002035be120"},
-    {file = "lxml-4.9.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9e28c51fa0ce5674be9f560c6761c1b441631901993f76700b1b30ca6c8378d6"},
-    {file = "lxml-4.9.3-cp311-cp311-win32.whl", hash = "sha256:0bfd0767c5c1de2551a120673b72e5d4b628737cb05414f03c3277bf9bed3305"},
-    {file = "lxml-4.9.3-cp311-cp311-win_amd64.whl", hash = "sha256:25f32acefac14ef7bd53e4218fe93b804ef6f6b92ffdb4322bb6d49d94cad2bc"},
-    {file = "lxml-4.9.3-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:d3ff32724f98fbbbfa9f49d82852b159e9784d6094983d9a8b7f2ddaebb063d4"},
-    {file = "lxml-4.9.3-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:48d6ed886b343d11493129e019da91d4039826794a3e3027321c56d9e71505be"},
-    {file = "lxml-4.9.3-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:9a92d3faef50658dd2c5470af249985782bf754c4e18e15afb67d3ab06233f13"},
-    {file = "lxml-4.9.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b4e4bc18382088514ebde9328da057775055940a1f2e18f6ad2d78aa0f3ec5b9"},
-    {file = "lxml-4.9.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:fc9b106a1bf918db68619fdcd6d5ad4f972fdd19c01d19bdb6bf63f3589a9ec5"},
-    {file = "lxml-4.9.3-cp312-cp312-win_amd64.whl", hash = "sha256:d37017287a7adb6ab77e1c5bee9bcf9660f90ff445042b790402a654d2ad81d8"},
-    {file = "lxml-4.9.3-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:56dc1f1ebccc656d1b3ed288f11e27172a01503fc016bcabdcbc0978b19352b7"},
-    {file = "lxml-4.9.3-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:578695735c5a3f51569810dfebd05dd6f888147a34f0f98d4bb27e92b76e05c2"},
-    {file = "lxml-4.9.3-cp35-cp35m-win32.whl", hash = "sha256:704f61ba8c1283c71b16135caf697557f5ecf3e74d9e453233e4771d68a1f42d"},
-    {file = "lxml-4.9.3-cp35-cp35m-win_amd64.whl", hash = "sha256:c41bfca0bd3532d53d16fd34d20806d5c2b1ace22a2f2e4c0008570bf2c58833"},
-    {file = "lxml-4.9.3-cp36-cp36m-macosx_11_0_x86_64.whl", hash = "sha256:64f479d719dc9f4c813ad9bb6b28f8390360660b73b2e4beb4cb0ae7104f1c12"},
-    {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:dd708cf4ee4408cf46a48b108fb9427bfa00b9b85812a9262b5c668af2533ea5"},
-    {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c31c7462abdf8f2ac0577d9f05279727e698f97ecbb02f17939ea99ae8daa98"},
-    {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:e3cd95e10c2610c360154afdc2f1480aea394f4a4f1ea0a5eacce49640c9b190"},
-    {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_28_x86_64.whl", hash = "sha256:4930be26af26ac545c3dffb662521d4e6268352866956672231887d18f0eaab2"},
-    {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4aec80cde9197340bc353d2768e2a75f5f60bacda2bab72ab1dc499589b3878c"},
-    {file = "lxml-4.9.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:14e019fd83b831b2e61baed40cab76222139926b1fb5ed0e79225bc0cae14584"},
-    {file = "lxml-4.9.3-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:0c0850c8b02c298d3c7006b23e98249515ac57430e16a166873fc47a5d549287"},
-    {file = "lxml-4.9.3-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:aca086dc5f9ef98c512bac8efea4483eb84abbf926eaeedf7b91479feb092458"},
-    {file = "lxml-4.9.3-cp36-cp36m-win32.whl", hash = "sha256:50baa9c1c47efcaef189f31e3d00d697c6d4afda5c3cde0302d063492ff9b477"},
-    {file = "lxml-4.9.3-cp36-cp36m-win_amd64.whl", hash = "sha256:bef4e656f7d98aaa3486d2627e7d2df1157d7e88e7efd43a65aa5dd4714916cf"},
-    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:46f409a2d60f634fe550f7133ed30ad5321ae2e6630f13657fb9479506b00601"},
-    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:4c28a9144688aef80d6ea666c809b4b0e50010a2aca784c97f5e6bf143d9f129"},
-    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:141f1d1a9b663c679dc524af3ea1773e618907e96075262726c7612c02b149a4"},
-    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:53ace1c1fd5a74ef662f844a0413446c0629d151055340e9893da958a374f70d"},
-    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:17a753023436a18e27dd7769e798ce302963c236bc4114ceee5b25c18c52c693"},
-    {file = "lxml-4.9.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:7d298a1bd60c067ea75d9f684f5f3992c9d6766fadbc0bcedd39750bf344c2f4"},
-    {file = "lxml-4.9.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:081d32421db5df44c41b7f08a334a090a545c54ba977e47fd7cc2deece78809a"},
-    {file = "lxml-4.9.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:23eed6d7b1a3336ad92d8e39d4bfe09073c31bfe502f20ca5116b2a334f8ec02"},
-    {file = "lxml-4.9.3-cp37-cp37m-win32.whl", hash = "sha256:1509dd12b773c02acd154582088820893109f6ca27ef7291b003d0e81666109f"},
-    {file = "lxml-4.9.3-cp37-cp37m-win_amd64.whl", hash = "sha256:120fa9349a24c7043854c53cae8cec227e1f79195a7493e09e0c12e29f918e52"},
-    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:4d2d1edbca80b510443f51afd8496be95529db04a509bc8faee49c7b0fb6d2cc"},
-    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:8d7e43bd40f65f7d97ad8ef5c9b1778943d02f04febef12def25f7583d19baac"},
-    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:71d66ee82e7417828af6ecd7db817913cb0cf9d4e61aa0ac1fde0583d84358db"},
-    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:6fc3c450eaa0b56f815c7b62f2b7fba7266c4779adcf1cece9e6deb1de7305ce"},
-    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:65299ea57d82fb91c7f019300d24050c4ddeb7c5a190e076b5f48a2b43d19c42"},
-    {file = "lxml-4.9.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:eadfbbbfb41b44034a4c757fd5d70baccd43296fb894dba0295606a7cf3124aa"},
-    {file = "lxml-4.9.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:3e9bdd30efde2b9ccfa9cb5768ba04fe71b018a25ea093379c857c9dad262c40"},
-    {file = "lxml-4.9.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fcdd00edfd0a3001e0181eab3e63bd5c74ad3e67152c84f93f13769a40e073a7"},
-    {file = "lxml-4.9.3-cp38-cp38-win32.whl", hash = "sha256:57aba1bbdf450b726d58b2aea5fe47c7875f5afb2c4a23784ed78f19a0462574"},
-    {file = "lxml-4.9.3-cp38-cp38-win_amd64.whl", hash = "sha256:92af161ecbdb2883c4593d5ed4815ea71b31fafd7fd05789b23100d081ecac96"},
-    {file = "lxml-4.9.3-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:9bb6ad405121241e99a86efff22d3ef469024ce22875a7ae045896ad23ba2340"},
-    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:8ed74706b26ad100433da4b9d807eae371efaa266ffc3e9191ea436087a9d6a7"},
-    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:fbf521479bcac1e25a663df882c46a641a9bff6b56dc8b0fafaebd2f66fb231b"},
-    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:303bf1edce6ced16bf67a18a1cf8339d0db79577eec5d9a6d4a80f0fb10aa2da"},
-    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:5515edd2a6d1a5a70bfcdee23b42ec33425e405c5b351478ab7dc9347228f96e"},
-    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:690dafd0b187ed38583a648076865d8c229661ed20e48f2335d68e2cf7dc829d"},
-    {file = "lxml-4.9.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b6420a005548ad52154c8ceab4a1290ff78d757f9e5cbc68f8c77089acd3c432"},
-    {file = "lxml-4.9.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:bb3bb49c7a6ad9d981d734ef7c7193bc349ac338776a0360cc671eaee89bcf69"},
-    {file = "lxml-4.9.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d27be7405547d1f958b60837dc4c1007da90b8b23f54ba1f8b728c78fdb19d50"},
-    {file = "lxml-4.9.3-cp39-cp39-win32.whl", hash = "sha256:8df133a2ea5e74eef5e8fc6f19b9e085f758768a16e9877a60aec455ed2609b2"},
-    {file = "lxml-4.9.3-cp39-cp39-win_amd64.whl", hash = "sha256:4dd9a263e845a72eacb60d12401e37c616438ea2e5442885f65082c276dfb2b2"},
-    {file = "lxml-4.9.3-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:6689a3d7fd13dc687e9102a27e98ef33730ac4fe37795d5036d18b4d527abd35"},
-    {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:f6bdac493b949141b733c5345b6ba8f87a226029cbabc7e9e121a413e49441e0"},
-    {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:05186a0f1346ae12553d66df1cfce6f251589fea3ad3da4f3ef4e34b2d58c6a3"},
-    {file = "lxml-4.9.3-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c2006f5c8d28dee289f7020f721354362fa304acbaaf9745751ac4006650254b"},
-    {file = "lxml-4.9.3-pp38-pypy38_pp73-macosx_11_0_x86_64.whl", hash = "sha256:5c245b783db29c4e4fbbbfc9c5a78be496c9fea25517f90606aa1f6b2b3d5f7b"},
-    {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:4fb960a632a49f2f089d522f70496640fdf1218f1243889da3822e0a9f5f3ba7"},
-    {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:50670615eaf97227d5dc60de2dc99fb134a7130d310d783314e7724bf163f75d"},
-    {file = "lxml-4.9.3-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:9719fe17307a9e814580af1f5c6e05ca593b12fb7e44fe62450a5384dbf61b4b"},
-    {file = "lxml-4.9.3-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:3331bece23c9ee066e0fb3f96c61322b9e0f54d775fccefff4c38ca488de283a"},
-    {file = "lxml-4.9.3-pp39-pypy39_pp73-macosx_11_0_x86_64.whl", hash = "sha256:ed667f49b11360951e201453fc3967344d0d0263aa415e1619e85ae7fd17b4e0"},
-    {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:8b77946fd508cbf0fccd8e400a7f71d4ac0e1595812e66025bac475a8e811694"},
-    {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:e4da8ca0c0c0aea88fd46be8e44bd49716772358d648cce45fe387f7b92374a7"},
-    {file = "lxml-4.9.3-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:fe4bda6bd4340caa6e5cf95e73f8fea5c4bfc55763dd42f1b50a94c1b4a2fbd4"},
-    {file = "lxml-4.9.3-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:f3df3db1d336b9356dd3112eae5f5c2b8b377f3bc826848567f10bfddfee77e9"},
-    {file = "lxml-4.9.3.tar.gz", hash = "sha256:48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c"},
-]
-
-[package.extras]
-cssselect = ["cssselect (>=0.7)"]
-html5 = ["html5lib"]
-htmlsoup = ["BeautifulSoup4"]
-source = ["Cython (>=0.29.35)"]
-
 [[package]]
 name = "markdown"
 version = "3.3.7"
@@ -1378,22 +1222,6 @@ profiling = ["gprof2dot"]
 rtd = ["attrs", "myst-parser", "pyyaml", "sphinx", "sphinx-copybutton", "sphinx-design", "sphinx_book_theme"]
 testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"]
 
-[[package]]
-name = "markdown2"
-version = "2.4.10"
-description = "A fast and complete Python implementation of Markdown"
-optional = true
-python-versions = ">=3.5, <4"
-files = [
-    {file = "markdown2-2.4.10-py2.py3-none-any.whl", hash = "sha256:e6105800483783831f5dc54f827aa5b44eb137ecef5a70293d8ecfbb4109ecc6"},
-    {file = "markdown2-2.4.10.tar.gz", hash = "sha256:cdba126d90dc3aef6f4070ac342f974d63f415678959329cc7909f96cc235d72"},
-]
-
-[package.extras]
-all = ["pygments (>=2.7.3)", "wavedrom"]
-code-syntax-highlighting = ["pygments (>=2.7.3)"]
-wavedrom = ["wavedrom"]
-
 [[package]]
 name = "markupsafe"
 version = "2.1.2"
@@ -1488,13 +1316,13 @@ files = [
 
 [[package]]
 name = "mkdocs"
-version = "1.5.2"
+version = "1.4.3"
 description = "Project documentation with Markdown."
 optional = true
 python-versions = ">=3.7"
 files = [
-    {file = "mkdocs-1.5.2-py3-none-any.whl", hash = "sha256:60a62538519c2e96fe8426654a67ee177350451616118a41596ae7c876bb7eac"},
-    {file = "mkdocs-1.5.2.tar.gz", hash = "sha256:70d0da09c26cff288852471be03c23f0f521fc15cf16ac89c7a3bfb9ae8d24f9"},
+    {file = "mkdocs-1.4.3-py3-none-any.whl", hash = "sha256:6ee46d309bda331aac915cd24aab882c179a933bd9e77b80ce7d2eaaa3f689dd"},
+    {file = "mkdocs-1.4.3.tar.gz", hash = "sha256:5955093bbd4dd2e9403c5afaf57324ad8b04f16886512a3ee6ef828956481c57"},
 ]
 
 [package.dependencies]
@@ -1503,43 +1331,36 @@ colorama = {version = ">=0.4", markers = "platform_system == \"Windows\""}
 ghp-import = ">=1.0"
 importlib-metadata = {version = ">=4.3", markers = "python_version < \"3.10\""}
 jinja2 = ">=2.11.1"
-markdown = ">=3.2.1"
-markupsafe = ">=2.0.1"
+markdown = ">=3.2.1,<3.4"
 mergedeep = ">=1.3.4"
 packaging = ">=20.5"
-pathspec = ">=0.11.1"
-platformdirs = ">=2.2.0"
 pyyaml = ">=5.1"
 pyyaml-env-tag = ">=0.1"
 watchdog = ">=2.0"
 
 [package.extras]
 i18n = ["babel (>=2.9.0)"]
-min-versions = ["babel (==2.9.0)", "click (==7.0)", "colorama (==0.4)", "ghp-import (==1.0)", "importlib-metadata (==4.3)", "jinja2 (==2.11.1)", "markdown (==3.2.1)", "markupsafe (==2.0.1)", "mergedeep (==1.3.4)", "packaging (==20.5)", "pathspec (==0.11.1)", "platformdirs (==2.2.0)", "pyyaml (==5.1)", "pyyaml-env-tag (==0.1)", "typing-extensions (==3.10)", "watchdog (==2.0)"]
+min-versions = ["babel (==2.9.0)", "click (==7.0)", "colorama (==0.4)", "ghp-import (==1.0)", "importlib-metadata (==4.3)", "jinja2 (==2.11.1)", "markdown (==3.2.1)", "markupsafe (==2.0.1)", "mergedeep (==1.3.4)", "packaging (==20.5)", "pyyaml (==5.1)", "pyyaml-env-tag (==0.1)", "typing-extensions (==3.10)", "watchdog (==2.0)"]
 
 [[package]]
 name = "mkdocs-material"
-version = "9.2.1"
+version = "9.1.20"
 description = "Documentation that simply works"
 optional = true
 python-versions = ">=3.7"
 files = [
-    {file = "mkdocs_material-9.2.1-py3-none-any.whl", hash = "sha256:941a3b70f45baab9f243f54d8ec0fe63b1139617d9aa6c0a972b991c82d61c6f"},
-    {file = "mkdocs_material-9.2.1.tar.gz", hash = "sha256:42c1993b03e4618e53eae24156c8e34f56f88f9cfa3dfdd0c422d1fd1b4829f9"},
+    {file = "mkdocs_material-9.1.20-py3-none-any.whl", hash = "sha256:152db66f667825d5aa3398386fe4d227640ec393c31e7cf109b114a569fc40fc"},
+    {file = "mkdocs_material-9.1.20.tar.gz", hash = "sha256:91621b6a6002138c72d50a0beef20ed12cf367d2af27d1f53382562b3a9625c7"},
 ]
 
 [package.dependencies]
-babel = ">=2.10.3"
 colorama = ">=0.4"
 jinja2 = ">=3.0"
-lxml = ">=4.6"
 markdown = ">=3.2"
-mkdocs = ">=1.5.2"
+mkdocs = ">=1.4.2"
 mkdocs-material-extensions = ">=1.1"
-paginate = ">=0.5.6"
 pygments = ">=2.14"
 pymdown-extensions = ">=9.9.1"
-readtime = ">=2.0"
 regex = ">=2022.4.24"
 requests = ">=2.26"
 
@@ -1556,13 +1377,13 @@ files = [
 
 [[package]]
 name = "mock"
-version = "5.1.0"
+version = "5.0.2"
 description = "Rolling backport of unittest.mock for all Pythons"
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "mock-5.1.0-py3-none-any.whl", hash = "sha256:18c694e5ae8a208cdb3d2c20a993ca1a7b0efa258c247a1e565150f477f83744"},
-    {file = "mock-5.1.0.tar.gz", hash = "sha256:5e96aad5ccda4718e0a229ed94b2024df75cc2d55575ba5762d31f5767b8767d"},
+    {file = "mock-5.0.2-py3-none-any.whl", hash = "sha256:0e0bc5ba78b8db3667ad636d964eb963dc97a59f04c6f6214c5f0e4a8f726c56"},
+    {file = "mock-5.0.2.tar.gz", hash = "sha256:06f18d7d65b44428202b145a9a36e99c2ee00d1eb992df0caf881d4664377891"},
 ]
 
 [package.extras]
@@ -1572,13 +1393,13 @@ test = ["pytest", "pytest-cov"]
 
 [[package]]
 name = "moto"
-version = "4.1.15"
+version = "4.1.14"
 description = ""
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "moto-4.1.15-py2.py3-none-any.whl", hash = "sha256:3fbcf91090692c30117d275fb34b48a075a6f65d4712ba6c4d004ffab976db46"},
-    {file = "moto-4.1.15.tar.gz", hash = "sha256:272236d312457b324c645741ee589924fd61a96b84680dc2e607f8663c563551"},
+    {file = "moto-4.1.14-py2.py3-none-any.whl", hash = "sha256:7d3bd748a34641715ba469c761f72fb8ec18f349987c98f5a0f9be85a07a9911"},
+    {file = "moto-4.1.14.tar.gz", hash = "sha256:545afeb4df94dfa730e2d7e87366dc26b4a33c2891f462cbb049f040c80ed1ec"},
 ]
 
 [package.dependencies]
@@ -1610,7 +1431,6 @@ efs = ["sshpubkeys (>=3.1.0)"]
 eks = ["sshpubkeys (>=3.1.0)"]
 glue = ["pyparsing (>=3.0.7)"]
 iotdata = ["jsondiff (>=1.1.2)"]
-resourcegroupstaggingapi = ["PyYAML (>=5.1)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "graphql-core", "jsondiff (>=1.1.2)", "openapi-spec-validator (>=0.2.8)", "py-partiql-parser (==0.3.6)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "sshpubkeys (>=3.1.0)"]
 route53resolver = ["sshpubkeys (>=3.1.0)"]
 s3 = ["PyYAML (>=5.1)", "py-partiql-parser (==0.3.6)"]
 s3crc32c = ["PyYAML (>=5.1)", "crc32c", "py-partiql-parser (==0.3.6)"]
@@ -1761,16 +1581,6 @@ files = [
 [package.dependencies]
 pyparsing = ">=2.0.2,<3.0.5 || >3.0.5"
 
-[[package]]
-name = "paginate"
-version = "0.5.6"
-description = "Divides large result sets into pages for easier browsing"
-optional = true
-python-versions = "*"
-files = [
-    {file = "paginate-0.5.6.tar.gz", hash = "sha256:5e6007b6a9398177a7e1648d04fdd9f8c9766a1a945bceac82f1929e8c78af2d"},
-]
-
 [[package]]
 name = "pathable"
 version = "0.4.3"
@@ -2021,17 +1831,17 @@ tests = ["coverage[toml] (==5.0.4)", "pytest (>=6.0.0,<7.0.0)"]
 
 [[package]]
 name = "pylint"
-version = "2.17.5"
+version = "2.17.4"
 description = "python code static checker"
 optional = false
 python-versions = ">=3.7.2"
 files = [
-    {file = "pylint-2.17.5-py3-none-any.whl", hash = "sha256:73995fb8216d3bed149c8d51bba25b2c52a8251a2c8ac846ec668ce38fab5413"},
-    {file = "pylint-2.17.5.tar.gz", hash = "sha256:f7b601cbc06fef7e62a754e2b41294c2aa31f1cb659624b9a85bcba29eaf8252"},
+    {file = "pylint-2.17.4-py3-none-any.whl", hash = "sha256:7a1145fb08c251bdb5cca11739722ce64a63db479283d10ce718b2460e54123c"},
+    {file = "pylint-2.17.4.tar.gz", hash = "sha256:5dcf1d9e19f41f38e4e85d10f511e5b9c35e1aa74251bf95cdd8cb23584e2db1"},
 ]
 
 [package.dependencies]
-astroid = ">=2.15.6,<=2.17.0-dev0"
+astroid = ">=2.15.4,<=2.17.0-dev0"
 colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""}
 dill = [
     {version = ">=0.2", markers = "python_version < \"3.11\""},
@@ -2077,24 +1887,6 @@ files = [
 [package.extras]
 diagrams = ["jinja2", "railroad-diagrams"]
 
-[[package]]
-name = "pyquery"
-version = "2.0.0"
-description = "A jquery-like library for python"
-optional = true
-python-versions = "*"
-files = [
-    {file = "pyquery-2.0.0-py3-none-any.whl", hash = "sha256:8dfc9b4b7c5f877d619bbae74b1898d5743f6ca248cfd5d72b504dd614da312f"},
-    {file = "pyquery-2.0.0.tar.gz", hash = "sha256:963e8d4e90262ff6d8dec072ea97285dc374a2f69cad7776f4082abcf6a1d8ae"},
-]
-
-[package.dependencies]
-cssselect = ">=1.2.0"
-lxml = ">=2.1"
-
-[package.extras]
-test = ["pytest", "pytest-cov", "requests", "webob", "webtest"]
-
 [[package]]
 name = "pytest"
 version = "7.4.0"
@@ -2117,33 +1909,15 @@ tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""}
 [package.extras]
 testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"]
 
-[[package]]
-name = "pytest-cov"
-version = "4.1.0"
-description = "Pytest plugin for measuring coverage."
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "pytest-cov-4.1.0.tar.gz", hash = "sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6"},
-    {file = "pytest_cov-4.1.0-py3-none-any.whl", hash = "sha256:6ba70b9e97e69fcc3fb45bfeab2d0a138fb65c4d0d6a41ef33983ad114be8c3a"},
-]
-
-[package.dependencies]
-coverage = {version = ">=5.2.1", extras = ["toml"]}
-pytest = ">=4.6"
-
-[package.extras]
-testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
-
 [[package]]
 name = "pytest-randomly"
-version = "3.15.0"
+version = "3.13.0"
 description = "Pytest plugin to randomly order tests and control random.seed."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pytest_randomly-3.15.0-py3-none-any.whl", hash = "sha256:0516f4344b29f4e9cdae8bce31c4aeebf59d0b9ef05927c33354ff3859eeeca6"},
-    {file = "pytest_randomly-3.15.0.tar.gz", hash = "sha256:b908529648667ba5e54723088edd6f82252f540cc340d748d1fa985539687047"},
+    {file = "pytest_randomly-3.13.0-py3-none-any.whl", hash = "sha256:e78d898ef4066f89744e5075083aa7fb6f0de07ffd70ca9c4435cda590cf1eac"},
+    {file = "pytest_randomly-3.13.0.tar.gz", hash = "sha256:079c78b94693189879fbd7304de4e147304f0811fa96249ea5619f2f1cd33df0"},
 ]
 
 [package.dependencies]
@@ -2270,21 +2044,6 @@ files = [
 [package.dependencies]
 pyyaml = "*"
 
-[[package]]
-name = "readtime"
-version = "3.0.0"
-description = "Calculates the time some text takes the average human to read, based on Medium's read time forumula"
-optional = true
-python-versions = "*"
-files = [
-    {file = "readtime-3.0.0.tar.gz", hash = "sha256:76c5a0d773ad49858c53b42ba3a942f62fbe20cc8c6f07875797ac7dc30963a9"},
-]
-
-[package.dependencies]
-beautifulsoup4 = ">=4.0.1"
-markdown2 = ">=2.4.3"
-pyquery = ">=1.2"
-
 [[package]]
 name = "referencing"
 version = "0.29.1"
@@ -2418,21 +2177,6 @@ urllib3 = ">=1.21.1,<3"
 socks = ["PySocks (>=1.5.6,!=1.5.7)"]
 use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
 
-[[package]]
-name = "requests-file"
-version = "1.5.1"
-description = "File transport adapter for Requests"
-optional = false
-python-versions = "*"
-files = [
-    {file = "requests-file-1.5.1.tar.gz", hash = "sha256:07d74208d3389d01c38ab89ef403af0cfec63957d53a0081d8eca738d0247d8e"},
-    {file = "requests_file-1.5.1-py2.py3-none-any.whl", hash = "sha256:dfe5dae75c12481f68ba353183c53a65e6044c923e64c24b2209f6c7570ca953"},
-]
-
-[package.dependencies]
-requests = ">=1.0.0"
-six = "*"
-
 [[package]]
 name = "requests-oauthlib"
 version = "1.3.1"
@@ -2655,8 +2399,7 @@ files = [
     {file = "ruamel.yaml.clib-0.2.7-cp310-cp310-win32.whl", hash = "sha256:763d65baa3b952479c4e972669f679fe490eee058d5aa85da483ebae2009d231"},
     {file = "ruamel.yaml.clib-0.2.7-cp310-cp310-win_amd64.whl", hash = "sha256:d000f258cf42fec2b1bbf2863c61d7b8918d31ffee905da62dede869254d3b8a"},
     {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:045e0626baf1c52e5527bd5db361bc83180faaba2ff586e763d3d5982a876a9e"},
-    {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-macosx_13_0_arm64.whl", hash = "sha256:1a6391a7cabb7641c32517539ca42cf84b87b667bad38b78d4d42dd23e957c81"},
-    {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-manylinux2014_aarch64.whl", hash = "sha256:9c7617df90c1365638916b98cdd9be833d31d337dbcd722485597b43c4a215bf"},
+    {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-macosx_12_6_arm64.whl", hash = "sha256:721bc4ba4525f53f6a611ec0967bdcee61b31df5a56801281027a3a6d1c2daf5"},
     {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:41d0f1fa4c6830176eef5b276af04c89320ea616655d01327d5ce65e50575c94"},
     {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-win32.whl", hash = "sha256:f6d3d39611ac2e4f62c3128a9eed45f19a6608670c5a2f4f07f24e8de3441d38"},
     {file = "ruamel.yaml.clib-0.2.7-cp311-cp311-win_amd64.whl", hash = "sha256:da538167284de58a52109a9b89b8f6a53ff8437dd6dc26d33b57bf6699153122"},
@@ -2759,12 +2502,12 @@ testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (
 
 [[package]]
 name = "shodan"
-version = "1.30.0"
+version = "1.29.1"
 description = "Python library and command-line utility for Shodan (https://developer.shodan.io)"
 optional = false
 python-versions = "*"
 files = [
-    {file = "shodan-1.30.0.tar.gz", hash = "sha256:c9617c66c47b87d4801e7080b6c769ec9a31da398defe0b047a6794927436453"},
+    {file = "shodan-1.29.1.tar.gz", hash = "sha256:e2af6254e19d2a8fa4e929738be551e25dc7aafc394732e776e7e30fa44ce339"},
 ]
 
 [package.dependencies]
@@ -2772,7 +2515,6 @@ click = "*"
 click-plugins = "*"
 colorama = "*"
 requests = ">=2.2.1"
-tldextract = "*"
 XlsxWriter = "*"
 
 [[package]]
@@ -2812,17 +2554,6 @@ files = [
     {file = "smmap-5.0.0.tar.gz", hash = "sha256:c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936"},
 ]
 
-[[package]]
-name = "soupsieve"
-version = "2.4.1"
-description = "A modern CSS selector implementation for Beautiful Soup."
-optional = true
-python-versions = ">=3.7"
-files = [
-    {file = "soupsieve-2.4.1-py3-none-any.whl", hash = "sha256:1c1bfee6819544a3447586c889157365a27e10d88cde3ad3da0cf0ddf646feb8"},
-    {file = "soupsieve-2.4.1.tar.gz", hash = "sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea"},
-]
-
 [[package]]
 name = "stevedore"
 version = "5.0.0"
@@ -2837,6 +2568,20 @@ files = [
 [package.dependencies]
 pbr = ">=2.0.0,<2.1.0 || >2.1.0"
 
+[[package]]
+name = "sure"
+version = "2.0.1"
+description = "utility belt for automated testing in python for python"
+optional = false
+python-versions = "*"
+files = [
+    {file = "sure-2.0.1.tar.gz", hash = "sha256:c8fc6fabc0e7f6984eeabb942540e45646e5bef0bb99fe59e02da634e4d4b9ca"},
+]
+
+[package.dependencies]
+mock = "*"
+six = "*"
+
 [[package]]
 name = "tabulate"
 version = "0.9.0"
@@ -2851,23 +2596,6 @@ files = [
 [package.extras]
 widechars = ["wcwidth"]
 
-[[package]]
-name = "tldextract"
-version = "3.4.4"
-description = "Accurately separates a URL's subdomain, domain, and public suffix, using the Public Suffix List (PSL). By default, this includes the public ICANN TLDs and their exceptions. You can optionally support the Public Suffix List's private domains as well."
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "tldextract-3.4.4-py3-none-any.whl", hash = "sha256:581e7dbefc90e7bb857bb6f768d25c811a3c5f0892ed56a9a2999ddb7b1b70c2"},
-    {file = "tldextract-3.4.4.tar.gz", hash = "sha256:5fe3210c577463545191d45ad522d3d5e78d55218ce97215e82004dcae1e1234"},
-]
-
-[package.dependencies]
-filelock = ">=3.0.8"
-idna = "*"
-requests = ">=2.1.0"
-requests-file = ">=1.4"
-
 [[package]]
 name = "toml"
 version = "0.10.2"
@@ -2952,13 +2680,13 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
 name = "vulture"
-version = "2.8"
+version = "2.7"
 description = "Find dead code"
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "vulture-2.8-py2.py3-none-any.whl", hash = "sha256:78bd44972b71d914ac382e64cacd4f56682017dcfa5929d3110ad09453796133"},
-    {file = "vulture-2.8.tar.gz", hash = "sha256:393293f183508064294b0feb4c8579e7f1f27e5bf74c9def6a3d52f38b29b599"},
+    {file = "vulture-2.7-py2.py3-none-any.whl", hash = "sha256:bccc51064ed76db15a6b58277cea8885936af047f53d2655fb5de575e93d0bca"},
+    {file = "vulture-2.7.tar.gz", hash = "sha256:67fb80a014ed9fdb599dd44bb96cb54311032a104106fc2e706ef7a6dad88032"},
 ]
 
 [package.dependencies]
@@ -3163,4 +2891,4 @@ docs = ["mkdocs", "mkdocs-material"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.9"
-content-hash = "a3cc3cb89965a792f4ec253c97e35689d599acd4e05d49cc719bdd4ef627aac0"
+content-hash = "af1b95fa997c6e4eb7f6764a69c00cb89aac5cfce77c130e1722f6322f495755"

prowler/__main__.py

@@ -12,7 +12,6 @@ from prowler.lib.check.check import (
     exclude_services_to_run,
     execute_checks,
     list_categories,
-    list_checks_json,
     list_services,
     parse_checks_from_folder,
     print_categories,
@@ -29,10 +28,9 @@ from prowler.lib.logger import logger, set_logging_config
 from prowler.lib.outputs.compliance import display_compliance_table
 from prowler.lib.outputs.html import add_html_footer, fill_html_overview_statistics
 from prowler.lib.outputs.json import close_json
-from prowler.lib.outputs.outputs import extract_findings_statistics
+from prowler.lib.outputs.outputs import extract_findings_statistics, send_to_s3_bucket
 from prowler.lib.outputs.slack import send_slack_message
 from prowler.lib.outputs.summary_table import display_summary_table
-from prowler.providers.aws.lib.s3.s3 import send_to_s3_bucket
 from prowler.providers.aws.lib.security_hub.security_hub import (
     resolve_security_hub_previous_findings,
 )
@@ -115,11 +113,6 @@ def prowler():
         provider,
     )
 
-    # if --list-checks-json, dump a json file and exit
-    if args.list_checks_json:
-        print(list_checks_json(provider, sorted(checks_to_execute)))
-        sys.exit()
-
     # If -l/--list-checks passed as argument, print checks to execute and quit
     if args.list_checks:
         print_checks(provider, sorted(checks_to_execute), bulk_checks_metadata)
@@ -145,8 +138,7 @@ def prowler():
     # Once the audit_info is set and we have the eventual checks based on the resource identifier,
     # it is time to check what Prowler's checks are going to be executed
     if audit_info.audit_resources:
-        checks_from_resources = set_provider_execution_parameters(provider, audit_info)
-        checks_to_execute = checks_to_execute.intersection(checks_from_resources)
+        checks_to_execute = set_provider_execution_parameters(provider, audit_info)
 
     # Sort final check list
     checks_to_execute = sorted(checks_to_execute)
@@ -227,11 +219,7 @@ def prowler():
 
     # Resolve previous fails of Security Hub
     if provider == "aws" and args.security_hub and not args.skip_sh_update:
-        resolve_security_hub_previous_findings(
-            audit_output_options.output_directory,
-            audit_output_options.output_filename,
-            audit_info,
-        )
+        resolve_security_hub_previous_findings(args.output_directory, audit_info)
 
     # Display summary table
     if not args.only_logs:

prowler/compliance/aws/aws_foundational_security_best_practices_aws.json

@@ -369,8 +369,7 @@
         "iam_password_policy_minimum_length_14",
         "iam_disable_90_days_credentials",
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {

prowler/compliance/aws/aws_well_architected_framework_security_pillar_aws.json

@@ -346,7 +346,6 @@
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
         "iam_customer_unattached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "opensearch_service_domains_internal_user_database_enabled"
       ]
     },

prowler/compliance/aws/cisa_aws.json

@@ -90,7 +90,6 @@
         "iam_no_custom_policy_permissive_role_assumption",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -185,7 +184,6 @@
         "iam_no_custom_policy_permissive_role_assumption",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key"
       ]
     },

prowler/compliance/aws/ens_rd2022_aws.json

@@ -129,7 +129,6 @@
         "iam_policy_allows_privilege_escalation",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "organizations_scp_check_deny_regions",
         "organizations_account_part_of_organizations"
       ]
@@ -158,8 +157,7 @@
         "iam_policy_allows_privilege_escalation",
         "iam_no_custom_policy_permissive_role_assumption",
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {
@@ -233,8 +231,7 @@
       ],
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {
@@ -1225,7 +1222,6 @@
         "iam_policy_allows_privilege_escalation",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_custom_policy_permissive_role_assumption",
         "iam_policy_attached_only_to_group_or_roles",
         "iam_role_cross_service_confused_deputy_prevention"

prowler/compliance/aws/fedramp_low_revision_4_aws.json

@@ -29,7 +29,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -62,7 +61,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_disable_90_days_credentials",
         "awslambda_function_not_publicly_accessible",

prowler/compliance/aws/fedramp_moderate_revision_4_aws.json

@@ -22,7 +22,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -96,7 +95,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -150,7 +148,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
         "iam_rotate_access_key_90_days",
@@ -195,7 +192,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_disable_90_days_credentials",
         "awslambda_function_not_publicly_accessible",
@@ -257,7 +253,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_disable_90_days_credentials"
       ]
@@ -277,7 +272,6 @@
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key"
       ]
     },
@@ -299,7 +293,6 @@
         "emr_cluster_master_nodes_no_public_ip",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_disable_90_days_credentials",
         "awslambda_function_not_publicly_accessible",
@@ -984,8 +977,7 @@
       "Checks": [
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {

prowler/compliance/aws/ffiec_aws.json

@@ -421,7 +421,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key"
       ]
     },
@@ -521,8 +520,7 @@
       ],
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {
@@ -539,8 +537,7 @@
       ],
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {
@@ -558,7 +555,6 @@
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key"
@@ -585,7 +581,6 @@
         "iam_password_policy_uppercase",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_rotate_access_key_90_days",
@@ -762,8 +757,7 @@
         "cloudtrail_cloudwatch_logging_enabled",
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {

prowler/compliance/aws/gdpr_aws.json

@@ -37,7 +37,6 @@
         "iam_password_policy_uppercase",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",

prowler/compliance/aws/gxp_21_cfr_part_11_aws.json

@@ -85,7 +85,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -170,7 +169,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",

prowler/compliance/aws/hipaa_aws.json

@@ -47,7 +47,6 @@
         "opensearch_service_domains_encryption_at_rest_enabled",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "awslambda_function_not_publicly_accessible",
         "awslambda_function_url_public",
@@ -118,7 +117,6 @@
         "ec2_instance_public_ip",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "awslambda_function_not_publicly_accessible",
         "awslambda_function_url_public",
@@ -175,7 +173,6 @@
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_disable_90_days_credentials"
       ]
@@ -208,8 +205,7 @@
       ],
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {
@@ -264,8 +260,7 @@
       ],
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {
@@ -283,7 +278,6 @@
         "iam_password_policy_reuse_24",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_rotate_access_key_90_days",
         "iam_disable_90_days_credentials",
@@ -526,7 +520,6 @@
         "emr_cluster_master_nodes_no_public_ip",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_user_mfa_enabled_console_access",
         "awslambda_function_not_publicly_accessible",
         "awslambda_function_url_public",

prowler/compliance/aws/mitre_attack_aws.json

@@ -165,7 +165,6 @@
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
         "iam_customer_unattached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_expired_server_certificates_stored",
         "iam_disable_30_days_credentials",
         "iam_no_root_access_key",
@@ -307,7 +306,6 @@
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_policy_allows_privilege_escalation",
         "iam_policy_no_full_access_to_cloudtrail",
         "iam_policy_no_full_access_to_kms"
@@ -371,9 +369,7 @@
       "TechniqueURL": "https://attack.mitre.org/techniques/T1098/",
       "Checks": [
         "config_recorder_all_regions_enabled",
-        "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_policy_allows_privilege_escalation",
         "iam_policy_no_full_access_to_cloudtrail",
         "iam_policy_no_full_access_to_kms",
@@ -618,7 +614,6 @@
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_policy_allows_privilege_escalation",
         "iam_policy_no_full_access_to_cloudtrail",
         "iam_policy_no_full_access_to_kms"
@@ -667,9 +662,7 @@
       "TechniqueURL": "https://attack.mitre.org/techniques/T1550/",
       "Checks": [
         "iam_administrator_access_with_mfa",
-        "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_policy_allows_privilege_escalation",
         "iam_policy_no_full_access_to_cloudtrail",
         "iam_policy_no_full_access_to_kms",
@@ -858,9 +851,7 @@
       "Checks": [
         "iam_no_custom_policy_permissive_role_assumption",
         "iam_policy_allows_privilege_escalation",
-        "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_user_hardware_mfa_enabled",
@@ -1743,7 +1734,6 @@
         "guardduty_is_enabled",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_custom_policy_permissive_role_assumption",
         "iam_policy_allows_privilege_escalation",
         "iam_policy_no_full_access_to_cloudtrail",
@@ -1795,8 +1785,7 @@
         "organizations_account_part_of_organizations",
         "iam_user_mfa_enabled_console_access",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_aws_attached_policy_no_administrative_privileges"
       ],
       "Attributes": [
         {
@@ -1856,7 +1845,6 @@
       "Checks": [
         "iam_customer_attached_policy_no_administrative_privileges",
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_policy_allows_privilege_escalation"
       ],
       "Attributes": [
@@ -1967,7 +1955,6 @@
       "Checks": [
         "iam_customer_attached_policy_no_administrative_privileges",
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_policy_allows_privilege_escalation"
       ],
       "Attributes": [

prowler/compliance/aws/nist_800_171_revision_2_aws.json

@@ -23,7 +23,6 @@
         "emr_cluster_master_nodes_no_public_ip",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -64,7 +63,6 @@
         "emr_cluster_master_nodes_no_public_ip",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -131,7 +129,6 @@
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_disable_90_days_credentials"
       ]
@@ -150,7 +147,6 @@
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_disable_90_days_credentials"
       ]
@@ -169,7 +165,6 @@
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key"
       ]
     },
@@ -187,7 +182,6 @@
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key"
       ]
     },
@@ -463,7 +457,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "awslambda_function_url_public",
         "rds_snapshots_public_access",
@@ -836,8 +829,7 @@
       ],
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {

prowler/compliance/aws/nist_800_53_revision_4_aws.json

@@ -103,7 +103,6 @@
         "iam_password_policy_reuse_24",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
         "iam_rotate_access_key_90_days",
@@ -129,7 +128,6 @@
         "ec2_ebs_public_snapshot",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_disable_90_days_credentials",
         "awslambda_function_url_public",
@@ -185,8 +183,7 @@
       ],
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {
@@ -223,7 +220,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_disable_90_days_credentials",
         "awslambda_function_url_public",
@@ -855,8 +851,7 @@
       ],
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {

prowler/compliance/aws/nist_800_53_revision_5_aws.json

@@ -21,7 +21,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -164,7 +163,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_disable_90_days_credentials",
         "awslambda_function_not_publicly_accessible",
@@ -243,8 +241,7 @@
       "Checks": [
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {
@@ -282,7 +279,6 @@
         "emr_cluster_master_nodes_no_public_ip",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_policy_attached_only_to_group_or_roles",
         "iam_disable_90_days_credentials",
         "awslambda_function_not_publicly_accessible",
@@ -357,7 +353,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -387,7 +382,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -417,7 +411,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -447,7 +440,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -477,7 +469,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -507,7 +498,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -537,7 +527,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -567,7 +556,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -596,7 +584,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -626,7 +613,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -661,7 +647,6 @@
         "iam_root_hardware_mfa_enabled",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_policy_attached_only_to_group_or_roles",
         "iam_password_policy_minimum_length_14",
         "ec2_instance_imdsv2_enabled"
@@ -686,7 +671,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -716,7 +700,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -746,7 +729,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -778,7 +760,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_disable_90_days_credentials",
         "awslambda_function_not_publicly_accessible",
@@ -810,7 +791,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -863,7 +843,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -909,7 +888,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -939,7 +917,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -969,7 +946,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -1095,7 +1071,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -1120,8 +1095,7 @@
       ],
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {
@@ -1143,7 +1117,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_disable_90_days_credentials",
         "awslambda_function_not_publicly_accessible",
@@ -1173,7 +1146,6 @@
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key"
       ]
     },
@@ -1192,8 +1164,7 @@
       "Checks": [
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {
@@ -1234,7 +1205,6 @@
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key"
       ]
     },
@@ -1490,7 +1460,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -2666,7 +2635,6 @@
         "iam_password_policy_minimum_length_14",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_policy_attached_only_to_group_or_roles",
         "iam_root_hardware_mfa_enabled",
         "iam_no_root_access_key",
@@ -2747,7 +2715,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -3004,7 +2971,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -3977,7 +3943,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_disable_90_days_credentials",
         "awslambda_function_not_publicly_accessible",
@@ -5450,7 +5415,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_no_root_access_key",
@@ -5495,7 +5459,6 @@
         "emr_cluster_master_nodes_no_public_ip",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "awslambda_function_not_publicly_accessible",
         "awslambda_function_url_public",

prowler/compliance/aws/nist_csf_1.1_aws.json

@@ -571,7 +571,6 @@
         "iam_password_policy_reuse_24",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_rotate_access_key_90_days",
         "iam_disable_90_days_credentials",
@@ -628,7 +627,6 @@
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "iam_disable_90_days_credentials"
       ]
@@ -1082,7 +1080,6 @@
         "ec2_ebs_public_snapshot",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_no_root_access_key",
         "awslambda_function_url_public",
         "rds_snapshots_public_access",

prowler/compliance/aws/pci_3.2.1_aws.json

@@ -158,7 +158,6 @@
         "iam_no_root_access_key",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_root_hardware_mfa_enabled",
         "iam_root_mfa_enabled",
         "iam_user_mfa_enabled_console_access",

prowler/compliance/aws/rbi_cyber_security_framework_aws.json

@@ -115,8 +115,9 @@
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_policy_attached_only_to_group_or_roles",
+        "iam_aws_attached_policy_no_administrative_privileges",
+        "iam_customer_attached_policy_no_administrative_privileges",
         "iam_no_root_access_key"
       ]
     },

prowler/compliance/aws/soc2_aws.json

@@ -48,7 +48,6 @@
         "iam_policy_attached_only_to_group_or_roles",
         "iam_aws_attached_policy_no_administrative_privileges",
         "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges",
         "iam_disable_90_days_credentials"
       ]
     },
@@ -314,8 +313,7 @@
       ],
       "Checks": [
         "iam_aws_attached_policy_no_administrative_privileges",
-        "iam_customer_attached_policy_no_administrative_privileges",
-        "iam_inline_policy_no_administrative_privileges"
+        "iam_customer_attached_policy_no_administrative_privileges"
       ]
     },
     {

prowler/config/config.py

@@ -1,6 +1,5 @@
 import os
 import pathlib
-import sys
 from datetime import datetime, timezone
 from os import getcwd
 
@@ -11,7 +10,7 @@ from prowler.lib.logger import logger
 
 timestamp = datetime.today()
 timestamp_utc = datetime.now(timezone.utc).replace(tzinfo=timezone.utc)
-prowler_version = "3.9.0"
+prowler_version = "3.8.0"
 html_logo_url = "https://github.com/prowler-cloud/prowler/"
 html_logo_img = "https://user-images.githubusercontent.com/3985464/113734260-7ba06900-96fb-11eb-82bc-d4f68a1e2710.png"
 square_logo_img = "https://user-images.githubusercontent.com/38561120/235905862-9ece5bd7-9aa3-4e48-807a-3a9035eb8bfb.png"
@@ -24,23 +23,16 @@ banner_color = "\033[1;92m"
 
 # Compliance
 actual_directory = pathlib.Path(os.path.dirname(os.path.realpath(__file__)))
-
-
-def get_available_compliance_frameworks():
-    available_compliance_frameworks = []
-    for provider in ["aws", "gcp", "azure"]:
-        with os.scandir(f"{actual_directory}/../compliance/{provider}") as files:
-            for file in files:
-                if file.is_file() and file.name.endswith(".json"):
-                    available_compliance_frameworks.append(
-                        file.name.removesuffix(".json")
-                    )
-    return available_compliance_frameworks
-
-
-available_compliance_frameworks = get_available_compliance_frameworks()
-
-
+available_compliance_frameworks = []
+for provider in ["aws", "gcp"]:
+    with os.scandir(f"{actual_directory}/../compliance/{provider}") as files:
+        files = [
+            file.name
+            for file in files
+            if file.is_file()
+            and file.name.endswith(".json")
+            and available_compliance_frameworks.append(file.name.removesuffix(".json"))
+        ]
 # AWS services-regions matrix json
 aws_services_json_file = "aws_regions_by_service.json"
 
@@ -55,9 +47,7 @@ json_file_suffix = ".json"
 json_asff_file_suffix = ".asff.json"
 json_ocsf_file_suffix = ".ocsf.json"
 html_file_suffix = ".html"
-default_config_file_path = (
-    f"{pathlib.Path(os.path.dirname(os.path.realpath(__file__)))}/config.yaml"
-)
+config_yaml = f"{pathlib.Path(os.path.dirname(os.path.realpath(__file__)))}/config.yaml"
 
 
 def check_current_version():
@@ -72,51 +62,29 @@ def check_current_version():
         else:
             return f"{prowler_version_string} (it is the latest version, yay!)"
     except Exception as error:
-        logger.error(
-            f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}"
-        )
+        logger.error(f"{error.__class__.__name__}: {error}")
         return f"{prowler_version_string}"
 
 
-def change_config_var(variable: str, value: str, audit_info):
+def change_config_var(variable, value):
     try:
-        if (
-            hasattr(audit_info, "audit_config")
-            and audit_info.audit_config is not None
-            and variable in audit_info.audit_config
-        ):
-            audit_info.audit_config[variable] = value
-        return audit_info
+        with open(config_yaml) as f:
+            doc = yaml.safe_load(f)
+
+        doc[variable] = value
+
+        with open(config_yaml, "w") as f:
+            yaml.dump(doc, f)
     except Exception as error:
-        logger.error(
-            f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}"
-        )
+        logger.error(f"{error.__class__.__name__}: {error}")
 
 
-def load_and_validate_config_file(provider: str, config_file_path: str) -> dict:
-    """
-    load_and_validate_config_file reads the Prowler config file in YAML format from the default location or the file passed with the --config-file flag
-    """
+def get_config_var(variable):
     try:
-        with open(config_file_path) as f:
-            config = {}
-            config_file = yaml.safe_load(f)
-
-            # Not to introduce a breaking change we have to allow the old format config file without any provider keys
-            # and a new format with a key for each provider to include their configuration values within
-            # Check if the new format is passed
-            if "aws" in config_file or "gcp" in config_file or "azure" in config_file:
-                config = config_file.get(provider, {})
-            else:
-                config = config_file if config_file else {}
-                # Not to break Azure and GCP does not support neither use the old config format
-                if provider in ["azure", "gcp"]:
-                    config = {}
-
-            return config
+        with open(config_yaml) as f:
+            doc = yaml.safe_load(f)
 
+        return doc[variable]
     except Exception as error:
-        logger.critical(
-            f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}"
-        )
-        sys.exit(1)
+        logger.error(f"{error.__class__.__name__}: {error}")
+        return ""

prowler/config/config.yaml

@@ -1,68 +1,57 @@
-# AWS Configuration
-aws:
-  # AWS EC2 Configuration
-  # aws.ec2_elastic_ip_shodan
-  shodan_api_key: null
-  # aws.ec2_securitygroup_with_many_ingress_egress_rules --> by default is 50 rules
-  max_security_group_rules: 50
-  # aws.ec2_instance_older_than_specific_days --> by default is 6 months (180 days)
-  max_ec2_instance_age_in_days: 180
+# AWS EC2 Configuration
+# aws.ec2_elastic_ip_shodan
+shodan_api_key: null
+# aws.ec2_securitygroup_with_many_ingress_egress_rules --> by default is 50 rules
+max_security_group_rules: 50
+# aws.ec2_instance_older_than_specific_days --> by default is 6 months (180 days)
+max_ec2_instance_age_in_days: 180
 
-  # AWS VPC Configuration (vpc_endpoint_connections_trust_boundaries, vpc_endpoint_services_allowed_principals_trust_boundaries)
-  # Single account environment: No action required. The AWS account number will be automatically added by the checks.
-  # Multi account environment: Any additional trusted account number should be added as a space separated list, e.g.
-  # trusted_account_ids : ["123456789012", "098765432109", "678901234567"]
-  trusted_account_ids: []
+# AWS VPC Configuration (vpc_endpoint_connections_trust_boundaries, vpc_endpoint_services_allowed_principals_trust_boundaries)
+# Single account environment: No action required. The AWS account number will be automatically added by the checks.
+# Multi account environment: Any additional trusted account number should be added as a space separated list, e.g.
+# trusted_account_ids : ["123456789012", "098765432109", "678901234567"]
+trusted_account_ids: []
 
-  # AWS Cloudwatch Configuration
-  # aws.cloudwatch_log_group_retention_policy_specific_days_enabled --> by default is 365 days
-  log_group_retention_days: 365
+# AWS Cloudwatch Configuration
+# aws.cloudwatch_log_group_retention_policy_specific_days_enabled --> by default is 365 days
+log_group_retention_days: 365
 
-  # AWS AppStream Session Configuration
-  # aws.appstream_fleet_session_idle_disconnect_timeout
-  max_idle_disconnect_timeout_in_seconds: 600 # 10 Minutes
-  # aws.appstream_fleet_session_disconnect_timeout
-  max_disconnect_timeout_in_seconds: 300 # 5 Minutes
-  # aws.appstream_fleet_maximum_session_duration
-  max_session_duration_seconds: 36000 # 10 Hours
+# AWS AppStream Session Configuration
+# aws.appstream_fleet_session_idle_disconnect_timeout
+max_idle_disconnect_timeout_in_seconds: 600 # 10 Minutes
+# aws.appstream_fleet_session_disconnect_timeout
+max_disconnect_timeout_in_seconds: 300 # 5 Minutes
+# aws.appstream_fleet_maximum_session_duration
+max_session_duration_seconds: 36000 # 10 Hours
 
-  # AWS Lambda Configuration
-  # aws.awslambda_function_using_supported_runtimes
-  obsolete_lambda_runtimes:
-    [
-      "python3.6",
-      "python2.7",
-      "nodejs4.3",
-      "nodejs4.3-edge",
-      "nodejs6.10",
-      "nodejs",
-      "nodejs8.10",
-      "nodejs10.x",
-      "dotnetcore1.0",
-      "dotnetcore2.0",
-      "dotnetcore2.1",
-      "ruby2.5",
-    ]
+# AWS Lambda Configuration
+# aws.awslambda_function_using_supported_runtimes
+obsolete_lambda_runtimes:
+  [
+    "python3.6",
+    "python2.7",
+    "nodejs4.3",
+    "nodejs4.3-edge",
+    "nodejs6.10",
+    "nodejs",
+    "nodejs8.10",
+    "nodejs10.x",
+    "dotnetcore1.0",
+    "dotnetcore2.0",
+    "dotnetcore2.1",
+    "ruby2.5",
+  ]
 
-  # AWS Organizations
-  # organizations_scp_check_deny_regions
-  # organizations_enabled_regions: [
-  #   'eu-central-1',
-  #   'eu-west-1',
-  #   "us-east-1"
-  # ]
-  organizations_enabled_regions: []
-  organizations_trusted_delegated_administrators: []
-
-  # AWS ECR
-  # ecr_repositories_scan_vulnerabilities_in_latest_image
-  # CRITICAL
-  # HIGH
-  # MEDIUM
-  ecr_repository_vulnerability_minimum_severity: "MEDIUM"
-
-# Azure Configuration
-azure:
-
-# GCP Configuration
-gcp:
+# AWS Organizations
+# organizations_scp_check_deny_regions
+# organizations_enabled_regions: [
+#   'eu-central-1',
+#   'eu-west-1',
+#   "us-east-1"
+# ]
+organizations_enabled_regions: []
+# organizations_delegated_administrators
+# organizations_trusted_delegated_administrators: [
+#   "12345678901"
+# ]
+organizations_trusted_delegated_administrators: []

prowler/lib/check/check.py

@@ -1,6 +1,5 @@
 import functools
 import importlib
-import json
 import os
 import re
 import shutil
@@ -208,43 +207,42 @@ def list_categories(bulk_checks_metadata: dict) -> set():
 
 def print_categories(categories: set):
     categories_num = len(categories)
-    plural_string = f"\nThere are {Fore.YELLOW}{categories_num}{Style.RESET_ALL} available categories.\n"
-    singular_string = f"\nThere is {Fore.YELLOW}{categories_num}{Style.RESET_ALL} available category.\n"
+    plural_string = f"There are {Fore.YELLOW}{categories_num}{Style.RESET_ALL} available categories: \n"
+    singular_string = f"There is {Fore.YELLOW}{categories_num}{Style.RESET_ALL} available category: \n"
 
     message = plural_string if categories_num > 1 else singular_string
+    print(message)
     for category in categories:
         print(f"- {category}")
 
-    print(message)
-
 
 def print_services(service_list: set):
     services_num = len(service_list)
-    plural_string = f"\nThere are {Fore.YELLOW}{services_num}{Style.RESET_ALL} available services.\n"
+    plural_string = (
+        f"There are {Fore.YELLOW}{services_num}{Style.RESET_ALL} available services: \n"
+    )
     singular_string = (
-        f"\nThere is {Fore.YELLOW}{services_num}{Style.RESET_ALL} available service.\n"
+        f"There is {Fore.YELLOW}{services_num}{Style.RESET_ALL} available service: \n"
     )
 
     message = plural_string if services_num > 1 else singular_string
+    print(message)
 
     for service in service_list:
         print(f"- {service}")
 
-    print(message)
-
 
 def print_compliance_frameworks(
     bulk_compliance_frameworks: dict,
 ):
     frameworks_num = len(bulk_compliance_frameworks.keys())
-    plural_string = f"\nThere are {Fore.YELLOW}{frameworks_num}{Style.RESET_ALL} available Compliance Frameworks.\n"
-    singular_string = f"\nThere is {Fore.YELLOW}{frameworks_num}{Style.RESET_ALL} available Compliance Framework.\n"
+    plural_string = f"There are {Fore.YELLOW}{frameworks_num}{Style.RESET_ALL} available Compliance Frameworks: \n"
+    singular_string = f"There is {Fore.YELLOW}{frameworks_num}{Style.RESET_ALL} available Compliance Framework: \n"
     message = plural_string if frameworks_num > 1 else singular_string
 
-    for framework in bulk_compliance_frameworks.keys():
-        print(f"- {framework}")
-
     print(message)
+    for framework in bulk_compliance_frameworks.keys():
+        print(f"\t- {Fore.YELLOW}{framework}{Style.RESET_ALL}")
 
 
 def print_compliance_requirements(
@@ -271,15 +269,6 @@ def print_compliance_requirements(
                     )
 
 
-def list_checks_json(provider: str, check_list: set):
-    try:
-        output = {provider: check_list}
-        return json.dumps(output, indent=2, default=str)
-    except Exception as e:
-        logger.critical(f"{e.__class__.__name__}[{e.__traceback__.tb_lineno}]: {e}")
-        sys.exit(1)
-
-
 def print_checks(
     provider: str,
     check_list: set,

prowler/lib/cli/parser.py

@@ -5,13 +5,10 @@ from argparse import RawTextHelpFormatter
 from prowler.config.config import (
     available_compliance_frameworks,
     check_current_version,
-    default_config_file_path,
     default_output_directory,
 )
-from prowler.providers.common.arguments import (
-    init_providers_parser,
-    validate_provider_arguments,
-)
+from prowler.providers.aws.aws_provider import get_aws_available_regions
+from prowler.providers.aws.lib.arn.arn import arn_type
 
 
 class ProwlerArgumentParser:
@@ -48,10 +45,11 @@ Detailed documentation at https://docs.prowler.cloud
         self.__init_checks_parser__()
         self.__init_exclude_checks_parser__()
         self.__init_list_checks_parser__()
-        self.__init_config_parser__()
 
         # Init Providers Arguments
-        init_providers_parser(self)
+        self.__init_aws_parser__()
+        self.__init_azure_parser__()
+        self.__init_gcp_parser__()
 
     def parse(self, args=None) -> argparse.Namespace:
         """
@@ -90,14 +88,9 @@ Detailed documentation at https://docs.prowler.cloud
             )
 
         # Only Logging Configuration
-        if args.only_logs or args.list_checks_json:
+        if args.only_logs:
             args.no_banner = True
 
-        # Extra validation for provider arguments
-        valid, message = validate_provider_arguments(args)
-        if not valid:
-            self.parser.error(f"{args.provider}: {message}")
-
         return args
 
     def __set_default_provider__(self, args: list) -> list:
@@ -198,7 +191,7 @@ Detailed documentation at https://docs.prowler.cloud
     def __init_checks_parser__(self):
         # Set checks to execute
         common_checks_parser = self.common_providers_parser.add_argument_group(
-            "Specify checks/services to run"
+            "Specify checks/services to run arguments"
         )
         # The following arguments needs to be set exclusivelly
         group = common_checks_parser.add_mutually_exclusive_group()
@@ -249,11 +242,6 @@ Detailed documentation at https://docs.prowler.cloud
         list_group.add_argument(
             "-l", "--list-checks", action="store_true", help="List checks"
         )
-        list_group.add_argument(
-            "--list-checks-json",
-            action="store_true",
-            help="Output a list of checks in json for use with --checks-file",
-        )
         list_group.add_argument(
             "--list-services", action="store_true", help="List services"
         )
@@ -272,11 +260,221 @@ Detailed documentation at https://docs.prowler.cloud
             help="List the available check's categories",
         )
 
-    def __init_config_parser__(self):
-        config_parser = self.common_providers_parser.add_argument_group("Configuration")
-        config_parser.add_argument(
-            "--config-file",
-            nargs="?",
-            default=default_config_file_path,
-            help="Set configuration file path",
+    def __init_aws_parser__(self):
+        """Init the AWS Provider CLI parser"""
+        aws_parser = self.subparsers.add_parser(
+            "aws", parents=[self.common_providers_parser], help="AWS Provider"
+        )
+        # Authentication Methods
+        aws_auth_subparser = aws_parser.add_argument_group("Authentication Modes")
+        aws_auth_subparser.add_argument(
+            "-p",
+            "--profile",
+            nargs="?",
+            default=None,
+            help="AWS profile to launch prowler with",
+        )
+        aws_auth_subparser.add_argument(
+            "-R",
+            "--role",
+            nargs="?",
+            default=None,
+            help="ARN of the role to be assumed",
+            # Pending ARN validation
+        )
+        aws_auth_subparser.add_argument(
+            "--sts-endpoint-region",
+            nargs="?",
+            default=None,
+            help="Specify the AWS STS endpoint region to use. Read more at https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html",
+        )
+        aws_auth_subparser.add_argument(
+            "--mfa",
+            action="store_true",
+            help="IAM entity enforces MFA so you need to input the MFA ARN and the TOTP",
+        )
+        aws_auth_subparser.add_argument(
+            "-T",
+            "--session-duration",
+            nargs="?",
+            default=3600,
+            type=int,
+            help="Assumed role session duration in seconds, must be between 900 and 43200. Default: 3600",
+            # Pending session duration validation
+        )
+        aws_auth_subparser.add_argument(
+            "-I",
+            "--external-id",
+            nargs="?",
+            default=None,
+            help="External ID to be passed when assuming role",
+        )
+        # AWS Regions
+        aws_regions_subparser = aws_parser.add_argument_group("AWS Regions")
+        aws_regions_subparser.add_argument(
+            "-f",
+            "--region",
+            "--filter-region",
+            nargs="+",
+            help="AWS region names to run Prowler against",
+            choices=get_aws_available_regions(),
+        )
+        # AWS Organizations
+        aws_orgs_subparser = aws_parser.add_argument_group("AWS Organizations")
+        aws_orgs_subparser.add_argument(
+            "-O",
+            "--organizations-role",
+            nargs="?",
+            help="Specify AWS Organizations management role ARN to be assumed, to get Organization metadata",
+        )
+        # AWS Security Hub
+        aws_security_hub_subparser = aws_parser.add_argument_group("AWS Security Hub")
+        aws_security_hub_subparser.add_argument(
+            "-S",
+            "--security-hub",
+            action="store_true",
+            help="Send check output to AWS Security Hub",
+        )
+        aws_security_hub_subparser.add_argument(
+            "--skip-sh-update",
+            action="store_true",
+            help="Skip updating previous findings of Prowler in Security Hub",
+        )
+        # AWS Quick Inventory
+        aws_quick_inventory_subparser = aws_parser.add_argument_group("Quick Inventory")
+        aws_quick_inventory_subparser.add_argument(
+            "-i",
+            "--quick-inventory",
+            action="store_true",
+            help="Run Prowler Quick Inventory. The inventory will be stored in an output csv by default",
+        )
+        # AWS Outputs
+        aws_outputs_subparser = aws_parser.add_argument_group("AWS Outputs to S3")
+        aws_outputs_bucket_parser = aws_outputs_subparser.add_mutually_exclusive_group()
+        aws_outputs_bucket_parser.add_argument(
+            "-B",
+            "--output-bucket",
+            nargs="?",
+            default=None,
+            help="Custom output bucket, requires -M <mode> and it can work also with -o flag.",
+        )
+        aws_outputs_bucket_parser.add_argument(
+            "-D",
+            "--output-bucket-no-assume",
+            nargs="?",
+            default=None,
+            help="Same as -B but do not use the assumed role credentials to put objects to the bucket, instead uses the initial credentials.",
+        )
+        aws_3rd_party_subparser = aws_parser.add_argument_group(
+            "3rd Party Integrations"
+        )
+        aws_3rd_party_subparser.add_argument(
+            "-N",
+            "--shodan",
+            nargs="?",
+            default=None,
+            help="Shodan API key used by check ec2_elastic_ip_shodan.",
+        )
+        # Allowlist
+        allowlist_subparser = aws_parser.add_argument_group("Allowlist")
+        allowlist_subparser.add_argument(
+            "-w",
+            "--allowlist-file",
+            nargs="?",
+            default=None,
+            help="Path for allowlist yaml file. See example prowler/config/allowlist.yaml for reference and format. It also accepts AWS DynamoDB Table or Lambda ARNs or S3 URIs, see more in https://docs.prowler.cloud/en/latest/tutorials/allowlist/",
+        )
+        # Based Scans
+        aws_based_scans_subparser = aws_parser.add_argument_group("AWS Based Scans")
+        aws_based_scans_parser = (
+            aws_based_scans_subparser.add_mutually_exclusive_group()
+        )
+        aws_based_scans_parser.add_argument(
+            "--resource-tags",
+            nargs="+",
+            default=None,
+            help="Scan only resources with specific AWS Tags (Key=Value), e.g., Environment=dev Project=prowler",
+        )
+        aws_based_scans_parser.add_argument(
+            "--resource-arn",
+            nargs="+",
+            type=arn_type,
+            default=None,
+            help="Scan only resources with specific AWS Resource ARNs, e.g., arn:aws:iam::012345678910:user/test arn:aws:ec2:us-east-1:123456789012:vpc/vpc-12345678",
+        )
+
+        # Boto3 Config
+        boto3_config_subparser = aws_parser.add_argument_group("Boto3 Config")
+        boto3_config_subparser.add_argument(
+            "--aws-retries-max-attempts",
+            nargs="?",
+            default=None,
+            type=int,
+            help="Set the maximum attemps for the Boto3 standard retrier config (Default: 3)",
+        )
+
+    def __init_azure_parser__(self):
+        """Init the Azure Provider CLI parser"""
+        azure_parser = self.subparsers.add_parser(
+            "azure", parents=[self.common_providers_parser], help="Azure Provider"
+        )
+        # Authentication Modes
+        azure_auth_subparser = azure_parser.add_argument_group("Authentication Modes")
+        azure_auth_modes_group = azure_auth_subparser.add_mutually_exclusive_group()
+        azure_auth_modes_group.add_argument(
+            "--az-cli-auth",
+            action="store_true",
+            help="Use Azure cli credentials to log in against azure",
+        )
+        azure_auth_modes_group.add_argument(
+            "--sp-env-auth",
+            action="store_true",
+            help="Use service principal env variables authentication to log in against azure",
+        )
+        azure_auth_modes_group.add_argument(
+            "--browser-auth",
+            action="store_true",
+            help="Use browser authentication to log in against Azure, --tenant-id is required for this option",
+        )
+        azure_auth_modes_group.add_argument(
+            "--managed-identity-auth",
+            action="store_true",
+            help="Use managed identity authentication to log in against azure ",
+        )
+        # Subscriptions
+        azure_subscriptions_subparser = azure_parser.add_argument_group("Subscriptions")
+        azure_subscriptions_subparser.add_argument(
+            "--subscription-ids",
+            nargs="+",
+            default=[],
+            help="Azure Subscription IDs to be scanned by Prowler",
+        )
+        azure_parser.add_argument(
+            "--tenant-id",
+            nargs="?",
+            default=None,
+            help="Azure Tenant ID to be used with --browser-auth option",
+        )
+
+    def __init_gcp_parser__(self):
+        """Init the GCP Provider CLI parser"""
+        gcp_parser = self.subparsers.add_parser(
+            "gcp", parents=[self.common_providers_parser], help="GCP Provider"
+        )
+        # Authentication Modes
+        gcp_auth_subparser = gcp_parser.add_argument_group("Authentication Modes")
+        gcp_auth_modes_group = gcp_auth_subparser.add_mutually_exclusive_group()
+        gcp_auth_modes_group.add_argument(
+            "--credentials-file",
+            nargs="?",
+            metavar="FILE_PATH",
+            help="Authenticate using a Google Service Account Application Credentials JSON file",
+        )
+        # Subscriptions
+        gcp_subscriptions_subparser = gcp_parser.add_argument_group("Projects")
+        gcp_subscriptions_subparser.add_argument(
+            "--project-ids",
+            nargs="+",
+            default=[],
+            help="GCP Project IDs to be scanned by Prowler",
         )

prowler/lib/logger.py

@@ -14,7 +14,7 @@ logging_levels = {
 def set_logging_config(log_level: str, log_file: str = None, only_logs: bool = False):
     # Logs formatter
     stream_formatter = logging.Formatter(
-        "\n%(asctime)s [File: %(filename)s:%(lineno)d] \t[Module: %(module)s]\t %(levelname)s: %(message)s"
+        "%(asctime)s [File: %(filename)s:%(lineno)d] \t[Module: %(module)s]\t %(levelname)s: %(message)s"
     )
     log_file_formatter = logging.Formatter(
         '{"timestamp": "%(asctime)s", "filename": "%(filename)s:%(lineno)d", "level": "%(levelname)s", "module": "%(module)s", "message": "%(message)s"}'

prowler/lib/outputs/outputs.py

@@ -1,8 +1,17 @@
 import json
+import sys
 
 from colorama import Fore, Style
 
-from prowler.config.config import available_compliance_frameworks, orange_color
+from prowler.config.config import (
+    available_compliance_frameworks,
+    csv_file_suffix,
+    html_file_suffix,
+    json_asff_file_suffix,
+    json_file_suffix,
+    json_ocsf_file_suffix,
+    orange_color,
+)
 from prowler.lib.logger import logger
 from prowler.lib.outputs.compliance import add_manual_controls, fill_compliance
 from prowler.lib.outputs.file_descriptors import fill_file_descriptors
@@ -200,6 +209,41 @@ def set_report_color(status: str) -> str:
     return color
 
 
+def send_to_s3_bucket(
+    output_filename, output_directory, output_mode, output_bucket, audit_session
+):
+    try:
+        filename = ""
+        # Get only last part of the path
+        if output_mode == "csv":
+            filename = f"{output_filename}{csv_file_suffix}"
+        elif output_mode == "json":
+            filename = f"{output_filename}{json_file_suffix}"
+        elif output_mode == "json-asff":
+            filename = f"{output_filename}{json_asff_file_suffix}"
+        elif output_mode == "json-ocsf":
+            filename = f"{output_filename}{json_ocsf_file_suffix}"
+        elif output_mode == "html":
+            filename = f"{output_filename}{html_file_suffix}"
+        else:  # Compliance output mode
+            filename = f"{output_filename}_{output_mode}{csv_file_suffix}"
+        logger.info(f"Sending outputs to S3 bucket {output_bucket}")
+        bucket_remote_dir = output_directory
+        while "prowler/" in bucket_remote_dir:  # Check if it is not a custom directory
+            bucket_remote_dir = bucket_remote_dir.partition("prowler/")[-1]
+        file_name = output_directory + "/" + filename
+        bucket_name = output_bucket
+        object_name = bucket_remote_dir + "/" + output_mode + "/" + filename
+        s3_client = audit_session.client("s3")
+        s3_client.upload_file(file_name, bucket_name, object_name)
+
+    except Exception as error:
+        logger.critical(
+            f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}"
+        )
+        sys.exit(1)
+
+
 def extract_findings_statistics(findings: list) -> dict:
     """
     extract_findings_statistics takes a list of findings and returns the following dict with the aggregated statistics

prowler/providers/aws/aws_provider.py

@@ -195,7 +195,6 @@ def get_aws_available_regions():
 def get_checks_from_input_arn(audit_resources: list, provider: str) -> set:
     """get_checks_from_input_arn gets the list of checks from the input arns"""
     checks_from_arn = set()
-    is_subservice_in_checks = False
     # Handle if there are audit resources so only their services are executed
     if audit_resources:
         services_without_subservices = ["guardduty", "kms", "s3", "elb", "efs"]
@@ -247,23 +246,21 @@ def get_checks_from_input_arn(audit_resources: list, provider: str) -> set:
             if any(sub_service in check for sub_service in sub_service_list):
                 if not (sub_service == "policy" and "password_policy" in check):
                     checks_from_arn.add(check)
-                    is_subservice_in_checks = True
-
-        if not is_subservice_in_checks:
-            checks_from_arn = checks
 
     # Return final checks list
     return sorted(checks_from_arn)
 
 
-def get_regions_from_audit_resources(audit_resources: list) -> set:
+def get_regions_from_audit_resources(audit_resources: list) -> list:
     """get_regions_from_audit_resources gets the regions from the audit resources arns"""
-    audited_regions = set()
+    audited_regions = []
     for resource in audit_resources:
         region = resource.split(":")[3]
-        if region:
-            audited_regions.add(region)
-    return audited_regions
+        if region and region not in audited_regions:  # Check if arn has a region
+            audited_regions.append(region)
+    if audited_regions:
+        return audited_regions
+    return None
 
 
 def get_available_aws_service_regions(service: str, audit_info: AWS_Audit_Info) -> list:

prowler/providers/aws/aws_regions_by_service.json

@@ -145,7 +145,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -496,17 +495,6 @@
         ]
       }
     },
-    "appfabric": {
-      "regions": {
-        "aws": [
-          "ap-northeast-1",
-          "eu-west-1",
-          "us-east-1"
-        ],
-        "aws-cn": [],
-        "aws-us-gov": []
-      }
-    },
     "appflow": {
       "regions": {
         "aws": [
@@ -798,10 +786,7 @@
           "us-west-1",
           "us-west-2"
         ],
-        "aws-cn": [
-          "cn-north-1",
-          "cn-northwest-1"
-        ],
+        "aws-cn": [],
         "aws-us-gov": []
       }
     },
@@ -867,7 +852,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -1075,7 +1059,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -1190,7 +1173,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -2579,7 +2561,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -3245,7 +3226,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -3604,24 +3584,6 @@
         "aws-us-gov": []
       }
     },
-    "entityresolution": {
-      "regions": {
-        "aws": [
-          "ap-northeast-1",
-          "ap-northeast-2",
-          "ap-southeast-1",
-          "ap-southeast-2",
-          "eu-central-1",
-          "eu-west-1",
-          "eu-west-2",
-          "us-east-1",
-          "us-east-2",
-          "us-west-2"
-        ],
-        "aws-cn": [],
-        "aws-us-gov": []
-      }
-    },
     "es": {
       "regions": {
         "aws": [
@@ -3947,7 +3909,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -4068,7 +4029,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -4110,7 +4070,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -4211,7 +4170,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -4468,7 +4426,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -4590,7 +4547,6 @@
       "regions": {
         "aws": [
           "af-south-1",
-          "ap-east-1",
           "ap-northeast-1",
           "ap-northeast-2",
           "ap-northeast-3",
@@ -4605,11 +4561,9 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "me-south-1",
           "sa-east-1",
           "us-east-1",
           "us-east-2",
-          "us-west-1",
           "us-west-2"
         ],
         "aws-cn": [],
@@ -5338,7 +5292,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -5622,7 +5575,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-south-1",
           "sa-east-1",
           "us-east-1",
@@ -5663,7 +5615,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -5676,10 +5627,7 @@
           "cn-north-1",
           "cn-northwest-1"
         ],
-        "aws-us-gov": [
-          "us-gov-east-1",
-          "us-gov-west-1"
-        ]
+        "aws-us-gov": []
       }
     },
     "license-manager-user-subscriptions": {
@@ -6116,11 +6064,9 @@
           "af-south-1",
           "ap-northeast-1",
           "ap-northeast-2",
-          "ap-northeast-3",
           "ap-south-1",
           "ap-southeast-1",
           "ap-southeast-2",
-          "ap-southeast-4",
           "ca-central-1",
           "eu-central-1",
           "eu-north-1",
@@ -6406,7 +6352,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -6490,7 +6435,6 @@
     "monitron": {
       "regions": {
         "aws": [
-          "ap-southeast-2",
           "eu-west-1",
           "us-east-1"
         ],
@@ -6590,7 +6534,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "me-central-1",
           "me-south-1",
           "sa-east-1",
           "us-east-1",
@@ -6996,8 +6939,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
-          "me-central-1",
           "me-south-1",
           "sa-east-1",
           "us-east-1",
@@ -7026,16 +6967,6 @@
         "aws-us-gov": []
       }
     },
-    "payment-cryptography": {
-      "regions": {
-        "aws": [
-          "us-east-1",
-          "us-west-2"
-        ],
-        "aws-cn": [],
-        "aws-us-gov": []
-      }
-    },
     "personalize": {
       "regions": {
         "aws": [
@@ -7236,7 +7167,6 @@
       "regions": {
         "aws": [
           "ap-south-1",
-          "eu-central-1",
           "us-east-1"
         ],
         "aws-cn": [],
@@ -7631,7 +7561,6 @@
           "eu-central-1",
           "eu-west-1",
           "eu-west-2",
-          "il-central-1",
           "us-east-1",
           "us-east-2",
           "us-west-1",
@@ -7843,7 +7772,6 @@
           "ap-southeast-1",
           "ap-southeast-2",
           "ap-southeast-3",
-          "ap-southeast-4",
           "ca-central-1",
           "eu-central-1",
           "eu-north-1",
@@ -7902,35 +7830,6 @@
         "aws-us-gov": []
       }
     },
-    "route53-application-recovery-controller": {
-      "regions": {
-        "aws": [
-          "af-south-1",
-          "ap-east-1",
-          "ap-northeast-1",
-          "ap-northeast-2",
-          "ap-northeast-3",
-          "ap-south-1",
-          "ap-southeast-1",
-          "ap-southeast-2",
-          "ca-central-1",
-          "eu-central-1",
-          "eu-north-1",
-          "eu-south-1",
-          "eu-west-1",
-          "eu-west-2",
-          "eu-west-3",
-          "me-south-1",
-          "sa-east-1",
-          "us-east-1",
-          "us-east-2",
-          "us-west-1",
-          "us-west-2"
-        ],
-        "aws-cn": [],
-        "aws-us-gov": []
-      }
-    },
     "route53-recovery-readiness": {
       "regions": {
         "aws": [
@@ -7972,7 +7871,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -8101,7 +7999,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-south-1",
           "sa-east-1",
           "us-east-1",
@@ -8177,7 +8074,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-south-1",
           "sa-east-1",
           "us-east-1",
@@ -8308,7 +8204,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -8365,36 +8260,25 @@
     "schemas": {
       "regions": {
         "aws": [
-          "af-south-1",
           "ap-east-1",
           "ap-northeast-1",
           "ap-northeast-2",
-          "ap-northeast-3",
           "ap-south-1",
           "ap-southeast-1",
           "ap-southeast-2",
-          "ap-southeast-3",
           "ca-central-1",
           "eu-central-1",
-          "eu-central-2",
           "eu-north-1",
-          "eu-south-1",
-          "eu-south-2",
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "me-central-1",
-          "me-south-1",
           "sa-east-1",
           "us-east-1",
           "us-east-2",
           "us-west-1",
           "us-west-2"
         ],
-        "aws-cn": [
-          "cn-north-1",
-          "cn-northwest-1"
-        ],
+        "aws-cn": [],
         "aws-us-gov": []
       }
     },
@@ -8479,7 +8363,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -8574,7 +8457,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -8616,7 +8498,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -9259,7 +9140,6 @@
           "eu-west-1",
           "eu-west-2",
           "eu-west-3",
-          "il-central-1",
           "me-central-1",
           "me-south-1",
           "sa-east-1",
@@ -9863,11 +9743,7 @@
           "ap-northeast-1",
           "ap-southeast-1",
           "ap-southeast-2",
-          "ca-central-1",
-          "eu-central-1",
-          "eu-north-1",
           "eu-west-1",
-          "eu-west-2",
           "us-east-1",
           "us-east-2",
           "us-west-2"

prowler/providers/aws/lib/arguments/arguments.py

@@ -1,176 +0,0 @@
-from argparse import ArgumentTypeError, Namespace
-
-from prowler.providers.aws.aws_provider import get_aws_available_regions
-from prowler.providers.aws.lib.arn.arn import arn_type
-
-
-def init_parser(self):
-    """Init the AWS Provider CLI parser"""
-    aws_parser = self.subparsers.add_parser(
-        "aws", parents=[self.common_providers_parser], help="AWS Provider"
-    )
-    # Authentication Methods
-    aws_auth_subparser = aws_parser.add_argument_group("Authentication Modes")
-    aws_auth_subparser.add_argument(
-        "-p",
-        "--profile",
-        nargs="?",
-        default=None,
-        help="AWS profile to launch prowler with",
-    )
-    aws_auth_subparser.add_argument(
-        "-R",
-        "--role",
-        nargs="?",
-        default=None,
-        help="ARN of the role to be assumed",
-        # Pending ARN validation
-    )
-    aws_auth_subparser.add_argument(
-        "--sts-endpoint-region",
-        nargs="?",
-        default=None,
-        help="Specify the AWS STS endpoint region to use. Read more at https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html",
-    )
-    aws_auth_subparser.add_argument(
-        "--mfa",
-        action="store_true",
-        help="IAM entity enforces MFA so you need to input the MFA ARN and the TOTP",
-    )
-    aws_auth_subparser.add_argument(
-        "-T",
-        "--session-duration",
-        nargs="?",
-        default=3600,
-        type=validate_session_duration,
-        help="Assumed role session duration in seconds, must be between 900 and 43200. Default: 3600",
-        # Pending session duration validation
-    )
-    aws_auth_subparser.add_argument(
-        "-I",
-        "--external-id",
-        nargs="?",
-        default=None,
-        help="External ID to be passed when assuming role",
-    )
-    # AWS Regions
-    aws_regions_subparser = aws_parser.add_argument_group("AWS Regions")
-    aws_regions_subparser.add_argument(
-        "-f",
-        "--region",
-        "--filter-region",
-        nargs="+",
-        help="AWS region names to run Prowler against",
-        choices=get_aws_available_regions(),
-    )
-    # AWS Organizations
-    aws_orgs_subparser = aws_parser.add_argument_group("AWS Organizations")
-    aws_orgs_subparser.add_argument(
-        "-O",
-        "--organizations-role",
-        nargs="?",
-        help="Specify AWS Organizations management role ARN to be assumed, to get Organization metadata",
-    )
-    # AWS Security Hub
-    aws_security_hub_subparser = aws_parser.add_argument_group("AWS Security Hub")
-    aws_security_hub_subparser.add_argument(
-        "-S",
-        "--security-hub",
-        action="store_true",
-        help="Send check output to AWS Security Hub",
-    )
-    aws_security_hub_subparser.add_argument(
-        "--skip-sh-update",
-        action="store_true",
-        help="Skip updating previous findings of Prowler in Security Hub",
-    )
-    # AWS Quick Inventory
-    aws_quick_inventory_subparser = aws_parser.add_argument_group("Quick Inventory")
-    aws_quick_inventory_subparser.add_argument(
-        "-i",
-        "--quick-inventory",
-        action="store_true",
-        help="Run Prowler Quick Inventory. The inventory will be stored in an output csv by default",
-    )
-    # AWS Outputs
-    aws_outputs_subparser = aws_parser.add_argument_group("AWS Outputs to S3")
-    aws_outputs_bucket_parser = aws_outputs_subparser.add_mutually_exclusive_group()
-    aws_outputs_bucket_parser.add_argument(
-        "-B",
-        "--output-bucket",
-        nargs="?",
-        default=None,
-        help="Custom output bucket, requires -M <mode> and it can work also with -o flag.",
-    )
-    aws_outputs_bucket_parser.add_argument(
-        "-D",
-        "--output-bucket-no-assume",
-        nargs="?",
-        default=None,
-        help="Same as -B but do not use the assumed role credentials to put objects to the bucket, instead uses the initial credentials.",
-    )
-    aws_3rd_party_subparser = aws_parser.add_argument_group("3rd Party Integrations")
-    aws_3rd_party_subparser.add_argument(
-        "-N",
-        "--shodan",
-        nargs="?",
-        default=None,
-        help="Shodan API key used by check ec2_elastic_ip_shodan.",
-    )
-    # Allowlist
-    allowlist_subparser = aws_parser.add_argument_group("Allowlist")
-    allowlist_subparser.add_argument(
-        "-w",
-        "--allowlist-file",
-        nargs="?",
-        default=None,
-        help="Path for allowlist yaml file. See example prowler/config/allowlist.yaml for reference and format. It also accepts AWS DynamoDB Table or Lambda ARNs or S3 URIs, see more in https://docs.prowler.cloud/en/latest/tutorials/allowlist/",
-    )
-    # Based Scans
-    aws_based_scans_subparser = aws_parser.add_argument_group("AWS Based Scans")
-    aws_based_scans_parser = aws_based_scans_subparser.add_mutually_exclusive_group()
-    aws_based_scans_parser.add_argument(
-        "--resource-tags",
-        nargs="+",
-        default=None,
-        help="Scan only resources with specific AWS Tags (Key=Value), e.g., Environment=dev Project=prowler",
-    )
-    aws_based_scans_parser.add_argument(
-        "--resource-arn",
-        nargs="+",
-        type=arn_type,
-        default=None,
-        help="Scan only resources with specific AWS Resource ARNs, e.g., arn:aws:iam::012345678910:user/test arn:aws:ec2:us-east-1:123456789012:vpc/vpc-12345678",
-    )
-
-    # Boto3 Config
-    boto3_config_subparser = aws_parser.add_argument_group("Boto3 Config")
-    boto3_config_subparser.add_argument(
-        "--aws-retries-max-attempts",
-        nargs="?",
-        default=None,
-        type=int,
-        help="Set the maximum attemps for the Boto3 standard retrier config (Default: 3)",
-    )
-
-
-def validate_session_duration(duration):
-    """validate_session_duration validates that the AWS STS Assume Role Session Duration is between 900 and 43200 seconds."""
-    duration = int(duration)
-    # Since the range(i,j) goes from i to j-1 we have to j+1
-    if duration not in range(900, 43201):
-        raise ArgumentTypeError("Session duration must be between 900 and 43200")
-    return duration
-
-
-def validate_arguments(arguments: Namespace) -> tuple[bool, str]:
-    """validate_arguments returns {True, "} if the provider arguments passed are valid and can be used together. It performs an extra validation, specific for the AWS provider, apart from the argparse lib."""
-
-    # Handle if session_duration is not the default value or external_id is set
-    if (
-        arguments.session_duration and arguments.session_duration != 3600
-    ) or arguments.external_id:
-        if not arguments.role:
-            return (False, "To use -I/-T options -R option is needed")
-
-    return (True, "")

prowler/providers/aws/lib/arn/arn.py

@@ -1,5 +1,5 @@
 import re
-from argparse import ArgumentTypeError
+from argparse import ArgumentError
 
 from prowler.providers.aws.lib.arn.error import (
     RoleArnParsingEmptyResource,
@@ -15,7 +15,7 @@ from prowler.providers.aws.lib.arn.models import ARN
 def arn_type(arn: str) -> bool:
     """arn_type returns a string ARN if it is valid and raises an argparse.ArgumentError if not."""
     if not is_valid_arn(arn):
-        raise ArgumentTypeError(f"Invalid ARN {arn}")
+        raise ArgumentError("Invalid ARN")
     return arn
 
 

prowler/providers/aws/lib/audit_info/audit_info.py

@@ -36,5 +36,4 @@ current_audit_info = AWS_Audit_Info(
     audited_regions=None,
     organizations_metadata=None,
     audit_metadata=None,
-    audit_config=None,
 )

prowler/providers/aws/lib/audit_info/models.py

@@ -51,4 +51,3 @@ class AWS_Audit_Info:
     audit_resources: list
     organizations_metadata: AWS_Organizations_Info
     audit_metadata: Optional[Any] = None
-    audit_config: Optional[dict] = None

prowler/providers/aws/lib/policy_condition_parser/policy_condition_parser.py

@@ -1,52 +1,22 @@
+# lista de cuentas y te devuelva las válidas
 def is_account_only_allowed_in_condition(
     condition_statement: dict, source_account: str
 ):
-    """
-    is_account_only_allowed_in_condition parses the IAM Condition policy block and returns True if the source_account passed as argument is within, False if not.
-
-    @param condition_statement: dict with an IAM Condition block, e.g.:
-        {
-            "StringLike": {
-                "AWS:SourceAccount": 111122223333
-            }
-        }
-
-    @param source_account: str with a 12-digit AWS Account number, e.g.: 111122223333
-    """
     is_condition_valid = False
-
-    # The conditions must be defined in lowercase since the context key names are not case-sensitive.
-    # For example, including the aws:SourceAccount context key is equivalent to testing for AWS:SourceAccount
-    # https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_elements_condition.html
     valid_condition_options = {
         "StringEquals": [
-            "aws:sourceaccount",
-            "aws:sourceowner",
-            "s3:resourceaccount",
-            "aws:principalaccount",
-            "aws:resourceaccount",
+            "aws:SourceAccount",
+            "s3:ResourceAccount",
+            "aws:PrincipalAccount",
         ],
-        "StringLike": [
-            "aws:sourceaccount",
-            "aws:sourceowner",
-            "aws:sourcearn",
-            "aws:principalarn",
-            "aws:resourceaccount",
-            "aws:principalaccount",
-        ],
-        "ArnLike": ["aws:sourcearn", "aws:principalarn"],
-        "ArnEquals": ["aws:sourcearn", "aws:principalarn"],
+        "StringLike": ["aws:SourceArn", "aws:PrincipalArn"],
+        "ArnLike": ["aws:SourceArn", "aws:PrincipalArn"],
+        "ArnEquals": ["aws:SourceArn", "aws:PrincipalArn"],
     }
 
     for condition_operator, condition_operator_key in valid_condition_options.items():
         if condition_operator in condition_statement:
             for value in condition_operator_key:
-                # We need to transform the condition_statement into lowercase
-                condition_statement[condition_operator] = {
-                    k.lower(): v
-                    for k, v in condition_statement[condition_operator].items()
-                }
-
                 if value in condition_statement[condition_operator]:
                     # values are a list
                     if isinstance(

prowler/providers/aws/lib/quick_inventory/quick_inventory.py

@@ -14,9 +14,9 @@ from prowler.config.config import (
     output_file_timestamp,
 )
 from prowler.lib.logger import logger
+from prowler.lib.outputs.outputs import send_to_s3_bucket
 from prowler.providers.aws.lib.arn.models import get_arn_resource_type
 from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
-from prowler.providers.aws.lib.s3.s3 import send_to_s3_bucket
 
 
 def quick_inventory(audit_info: AWS_Audit_Info, args):

prowler/providers/aws/lib/s3/s3.py

@@ -1,55 +0,0 @@
-import sys
-
-from prowler.config.config import (
-    csv_file_suffix,
-    html_file_suffix,
-    json_asff_file_suffix,
-    json_file_suffix,
-    json_ocsf_file_suffix,
-)
-from prowler.lib.logger import logger
-
-
-def send_to_s3_bucket(
-    output_filename, output_directory, output_mode, output_bucket_name, audit_session
-):
-    try:
-        filename = ""
-        # Get only last part of the path
-        if output_mode == "csv":
-            filename = f"{output_filename}{csv_file_suffix}"
-        elif output_mode == "json":
-            filename = f"{output_filename}{json_file_suffix}"
-        elif output_mode == "json-asff":
-            filename = f"{output_filename}{json_asff_file_suffix}"
-        elif output_mode == "json-ocsf":
-            filename = f"{output_filename}{json_ocsf_file_suffix}"
-        elif output_mode == "html":
-            filename = f"{output_filename}{html_file_suffix}"
-        else:  # Compliance output mode
-            filename = f"{output_filename}_{output_mode}{csv_file_suffix}"
-
-        logger.info(f"Sending outputs to S3 bucket {output_bucket_name}")
-        # File location
-        file_name = output_directory + "/" + filename
-
-        # S3 Object name
-        bucket_directory = get_s3_object_path(output_directory)
-        object_name = bucket_directory + "/" + output_mode + "/" + filename
-
-        s3_client = audit_session.client("s3")
-        s3_client.upload_file(file_name, output_bucket_name, object_name)
-
-    except Exception as error:
-        logger.critical(
-            f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}"
-        )
-        sys.exit(1)
-
-
-def get_s3_object_path(output_directory: str) -> str:
-    bucket_remote_dir = output_directory
-    if "prowler/" in bucket_remote_dir:  # Check if it is not a custom directory
-        bucket_remote_dir = bucket_remote_dir.partition("prowler/")[-1]
-
-    return bucket_remote_dir

prowler/providers/aws/lib/security_hub/security_hub.py

@@ -4,7 +4,11 @@ from operator import itemgetter
 
 from boto3 import session
 
-from prowler.config.config import json_asff_file_suffix, timestamp_utc
+from prowler.config.config import (
+    json_asff_file_suffix,
+    output_file_timestamp,
+    timestamp_utc,
+)
 from prowler.lib.logger import logger
 from prowler.lib.outputs.models import Check_Output_JSON_ASFF
 from prowler.providers.aws.lib.audit_info.models import AWS_Audit_Info
@@ -56,14 +60,16 @@ def send_to_security_hub(
 
 # Move previous Security Hub check findings to ARCHIVED (as prowler didn't re-detect them)
 def resolve_security_hub_previous_findings(
-    output_directory: str, output_filename: str, audit_info: AWS_Audit_Info
+    output_directory: str, audit_info: AWS_Audit_Info
 ) -> list:
     """
     resolve_security_hub_previous_findings archives all the findings that does not appear in the current execution
     """
     logger.info("Checking previous findings in Security Hub to archive them.")
     # Read current findings from json-asff file
-    with open(f"{output_directory}/{output_filename}{json_asff_file_suffix}") as f:
+    with open(
+        f"{output_directory}/prowler-output-{audit_info.audited_account}-{output_file_timestamp}{json_asff_file_suffix}"
+    ) as f:
         json_asff_file = json.load(f)
 
     # Sort by region

prowler/providers/aws/lib/service/service.py

@@ -4,7 +4,6 @@ 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:
@@ -15,7 +14,7 @@ class AWSService:
     - Also handles if the AWS Service is Global
     """
 
-    def __init__(self, service: str, audit_info: AWS_Audit_Info, global_service=False):
+    def __init__(self, service, audit_info, global_service=False):
         # Audit Information
         self.audit_info = audit_info
         self.audited_account = audit_info.audited_account
@@ -23,7 +22,6 @@ class AWSService:
         self.audited_partition = audit_info.audited_partition
         self.audit_resources = audit_info.audit_resources
         self.audited_checks = audit_info.audit_metadata.expected_checks
-        self.audit_config = audit_info.audit_config
 
         # AWS Session
         self.session = audit_info.audit_session

prowler/providers/aws/services/accessanalyzer/accessanalyzer_enabled/accessanalyzer_enabled.py

@@ -25,7 +25,6 @@ class accessanalyzer_enabled(Check):
                     f"IAM Access Analyzer in account {analyzer.name} is not enabled."
                 )
                 report.resource_id = analyzer.name
-                report.resource_arn = analyzer.arn
             else:
                 report.status = "FAIL"
                 report.status_extended = (

prowler/providers/aws/services/accessanalyzer/accessanalyzer_enabled_without_findings/accessanalyzer_enabled_without_findings.py

@@ -12,7 +12,9 @@ class accessanalyzer_enabled_without_findings(Check):
             report.region = analyzer.region
             if analyzer.status == "ACTIVE":
                 report.status = "PASS"
-                report.status_extended = f"IAM Access Analyzer {analyzer.name} does not have active findings."
+                report.status_extended = (
+                    f"IAM Access Analyzer {analyzer.name} does not have active findings"
+                )
                 report.resource_id = analyzer.name
                 report.resource_arn = analyzer.arn
                 report.resource_tags = analyzer.tags
@@ -24,21 +26,20 @@ class accessanalyzer_enabled_without_findings(Check):
 
                     if active_finding_counter > 0:
                         report.status = "FAIL"
-                        report.status_extended = f"IAM Access Analyzer {analyzer.name} has {active_finding_counter} active findings."
+                        report.status_extended = f"IAM Access Analyzer {analyzer.name} has {active_finding_counter} active findings"
                         report.resource_id = analyzer.name
                         report.resource_arn = analyzer.arn
                         report.resource_tags = analyzer.tags
             elif analyzer.status == "NOT_AVAILABLE":
                 report.status = "FAIL"
                 report.status_extended = (
-                    f"IAM Access Analyzer in account {analyzer.name} is not enabled."
+                    f"IAM Access Analyzer in account {analyzer.name} is not enabled"
                 )
                 report.resource_id = analyzer.name
-                report.resource_arn = analyzer.arn
             else:
                 report.status = "FAIL"
                 report.status_extended = (
-                    f"IAM Access Analyzer {analyzer.name} is not active."
+                    f"IAM Access Analyzer {analyzer.name} is not active"
                 )
                 report.resource_id = analyzer.name
                 report.resource_arn = analyzer.arn

prowler/providers/aws/services/accessanalyzer/accessanalyzer_service.py

@@ -43,7 +43,7 @@ class AccessAnalyzer(AWSService):
             if analyzer_count == 0:
                 self.analyzers.append(
                     Analyzer(
-                        arn=self.audited_account_arn,
+                        arn="",
                         name=self.audited_account,
                         status="NOT_AVAILABLE",
                         tags=[],

prowler/providers/aws/services/apigatewayv2/apigatewayv2_access_logging_enabled/apigatewayv2_access_logging_enabled.py

@@ -15,13 +15,11 @@ class apigatewayv2_access_logging_enabled(Check):
                     report.status = "PASS"
                     report.status_extended = f"API Gateway V2 {api.name} ID {api.id} in stage {stage.name} has access logging enabled."
                     report.resource_id = api.name
-                    report.resource_arn = api.arn
                     report.resource_tags = api.tags
                 else:
                     report.status = "FAIL"
                     report.status_extended = f"API Gateway V2 {api.name} ID {api.id} in stage {stage.name} has access logging disabled."
                     report.resource_id = api.name
-                    report.resource_arn = api.arn
                     report.resource_tags = api.tags
                 findings.append(report)
 

prowler/providers/aws/services/appstream/appstream_fleet_default_internet_access_disabled/appstream_fleet_default_internet_access_disabled.py

@@ -19,12 +19,12 @@ class appstream_fleet_default_internet_access_disabled(Check):
             if fleet.enable_default_internet_access:
                 report.status = "FAIL"
                 report.status_extended = (
-                    f"Fleet {fleet.name} has default internet access enabled."
+                    f"Fleet {fleet.name} has default internet access enabled"
                 )
             else:
                 report.status = "PASS"
                 report.status_extended = (
-                    f"Fleet {fleet.name} has default internet access disabled."
+                    f"Fleet {fleet.name} has default internet access disabled"
                 )
 
             findings.append(report)

prowler/providers/aws/services/appstream/appstream_fleet_maximum_session_duration/appstream_fleet_maximum_session_duration.py

@@ -1,18 +1,16 @@
+from prowler.config.config import get_config_var
 from prowler.lib.check.models import Check, Check_Report_AWS
 from prowler.providers.aws.services.appstream.appstream_client import appstream_client
 
+max_session_duration_seconds = get_config_var("max_session_duration_seconds")
+"""max_session_duration_seconds, default: 36000 seconds (10 hours)"""
+
 
 class appstream_fleet_maximum_session_duration(Check):
     """Check if there are AppStream Fleets with the user maximum session duration no longer than 10 hours"""
 
     def execute(self):
         """Execute the appstream_fleet_maximum_session_duration check"""
-
-        # max_session_duration_seconds, default: 36000 seconds (10 hours)
-        max_session_duration_seconds = appstream_client.audit_config.get(
-            "max_session_duration_seconds", 36000
-        )
-
         findings = []
         for fleet in appstream_client.fleets:
             report = Check_Report_AWS(self.metadata())
@@ -23,10 +21,10 @@ class appstream_fleet_maximum_session_duration(Check):
 
             if fleet.max_user_duration_in_seconds < max_session_duration_seconds:
                 report.status = "PASS"
-                report.status_extended = f"Fleet {fleet.name} has the maximum session duration configured for less that 10 hours."
+                report.status_extended = f"Fleet {fleet.name} has the maximum session duration configured for less that 10 hours"
             else:
                 report.status = "FAIL"
-                report.status_extended = f"Fleet {fleet.name} has the maximum session duration configured for more that 10 hours."
+                report.status_extended = f"Fleet {fleet.name} has the maximum session duration configured for more that 10 hours"
 
             findings.append(report)
 

prowler/providers/aws/services/appstream/appstream_fleet_session_disconnect_timeout/appstream_fleet_session_disconnect_timeout.py

@@ -1,18 +1,16 @@
+from prowler.config.config import get_config_var
 from prowler.lib.check.models import Check, Check_Report_AWS
 from prowler.providers.aws.services.appstream.appstream_client import appstream_client
 
+max_disconnect_timeout_in_seconds = get_config_var("max_disconnect_timeout_in_seconds")
+"""max_disconnect_timeout_in_seconds, default: 300 seconds (5 minutes)"""
+
 
 class appstream_fleet_session_disconnect_timeout(Check):
     """Check if there are AppStream Fleets with the session disconnect timeout set to 5 minutes or less"""
 
     def execute(self):
         """Execute the appstream_fleet_maximum_session_duration check"""
-
-        # max_disconnect_timeout_in_seconds, default: 300 seconds (5 minutes)
-        max_disconnect_timeout_in_seconds = appstream_client.audit_config.get(
-            "max_disconnect_timeout_in_seconds", 300
-        )
-
         findings = []
         for fleet in appstream_client.fleets:
             report = Check_Report_AWS(self.metadata())
@@ -23,11 +21,11 @@ class appstream_fleet_session_disconnect_timeout(Check):
 
             if fleet.disconnect_timeout_in_seconds <= max_disconnect_timeout_in_seconds:
                 report.status = "PASS"
-                report.status_extended = f"Fleet {fleet.name} has the session disconnect timeout set to less than 5 minutes."
+                report.status_extended = f"Fleet {fleet.name} has the session disconnect timeout set to less than 5 minutes"
 
             else:
                 report.status = "FAIL"
-                report.status_extended = f"Fleet {fleet.name} has the session disconnect timeout set to more than 5 minutes."
+                report.status_extended = f"Fleet {fleet.name} has the session disconnect timeout set to more than 5 minutes"
 
             findings.append(report)
 

prowler/providers/aws/services/appstream/appstream_fleet_session_idle_disconnect_timeout/appstream_fleet_session_idle_disconnect_timeout.py

@@ -1,18 +1,18 @@
+from prowler.config.config import get_config_var
 from prowler.lib.check.models import Check, Check_Report_AWS
 from prowler.providers.aws.services.appstream.appstream_client import appstream_client
 
+max_idle_disconnect_timeout_in_seconds = get_config_var(
+    "max_idle_disconnect_timeout_in_seconds"
+)
+"""max_idle_disconnect_timeout_in_seconds, default: 600 seconds (10 minutes)"""
+
 
 class appstream_fleet_session_idle_disconnect_timeout(Check):
     """Check if there are AppStream Fleets with the idle disconnect timeout set to 10 minutes or less"""
 
     def execute(self):
         """Execute the appstream_fleet_session_idle_disconnect_timeout check"""
-
-        # max_idle_disconnect_timeout_in_seconds, default: 600 seconds (10 minutes)
-        max_idle_disconnect_timeout_in_seconds = appstream_client.audit_config.get(
-            "max_idle_disconnect_timeout_in_seconds", 600
-        )
-
         findings = []
         for fleet in appstream_client.fleets:
             report = Check_Report_AWS(self.metadata())
@@ -27,11 +27,11 @@ class appstream_fleet_session_idle_disconnect_timeout(Check):
                 <= max_idle_disconnect_timeout_in_seconds
             ):
                 report.status = "PASS"
-                report.status_extended = f"Fleet {fleet.name} has the session idle disconnect timeout set to less than 10 minutes."
+                report.status_extended = f"Fleet {fleet.name} has the session idle disconnect timeout set to less than 10 minutes"
 
             else:
                 report.status = "FAIL"
-                report.status_extended = f"Fleet {fleet.name} has the session idle disconnect timeout set to more than 10 minutes."
+                report.status_extended = f"Fleet {fleet.name} has the session idle disconnect timeout set to more than 10 minutes"
 
             findings.append(report)
 

prowler/providers/aws/services/athena/athena_client.py

@@ -1,4 +0,0 @@
-from prowler.providers.aws.lib.audit_info.audit_info import current_audit_info
-from prowler.providers.aws.services.athena.athena_service import Athena
-
-athena_client = Athena(current_audit_info)

prowler/providers/aws/services/athena/athena_service.py

@@ -1,109 +0,0 @@
-from typing import Optional
-
-from pydantic import BaseModel
-
-from prowler.lib.logger import logger
-from prowler.lib.scan_filters.scan_filters import is_resource_filtered
-from prowler.providers.aws.lib.service.service import AWSService
-
-
-################## Athena
-class Athena(AWSService):
-    def __init__(self, audit_info):
-        # Call AWSService's __init__
-        super().__init__(__class__.__name__, audit_info)
-        self.workgroups = {}
-        self.__threading_call__(self.__list_workgroups__)
-        self.__get_workgroups__()
-        self.__list_tags_for_resource__()
-
-    def __list_workgroups__(self, regional_client):
-        logger.info("Athena - Listing WorkGroups...")
-        try:
-            list_workgroups = regional_client.list_work_groups()
-            for workgroup in list_workgroups["WorkGroups"]:
-                workgroup_name = workgroup["Name"]
-                workgroup_arn = f"arn:{self.audited_partition}:athena:{regional_client.region}:{self.audited_account}:workgroup/{workgroup_name}"
-                if not self.audit_resources or (
-                    is_resource_filtered(workgroup_arn, self.audit_resources)
-                ):
-                    self.workgroups[workgroup_arn] = WorkGroup(
-                        arn=workgroup_arn,
-                        name=workgroup_name,
-                        region=regional_client.region,
-                    )
-
-        except Exception as error:
-            logger.error(
-                f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-            )
-
-    def __get_workgroups__(self):
-        logger.info("Athena - Getting WorkGroups...")
-        try:
-            for workgroup in self.workgroups.values():
-                wg = self.regional_clients[workgroup.region].get_work_group(
-                    WorkGroup=workgroup.name
-                )
-
-                wg_configuration = wg.get("WorkGroup").get("Configuration")
-                self.workgroups[
-                    workgroup.arn
-                ].enforce_workgroup_configuration = wg_configuration.get(
-                    "EnforceWorkGroupConfiguration", False
-                )
-
-                # We include an empty EncryptionConfiguration to handle if the workgroup does not have encryption configured
-                encryption = (
-                    wg_configuration.get(
-                        "ResultConfiguration",
-                        {"EncryptionConfiguration": {}},
-                    )
-                    .get(
-                        "EncryptionConfiguration",
-                        {"EncryptionOption": ""},
-                    )
-                    .get("EncryptionOption")
-                )
-
-                if encryption in ["SSE_S3", "SSE_KMS", "CSE_KMS"]:
-                    encryption_configuration = EncryptionConfiguration(
-                        encryption_option=encryption, encrypted=True
-                    )
-                    self.workgroups[
-                        workgroup.arn
-                    ].encryption_configuration = encryption_configuration
-
-        except Exception as error:
-            logger.error(
-                f"{self.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-            )
-
-    def __list_tags_for_resource__(self):
-        logger.info("Athena - Listing Tags...")
-        try:
-            for workgroup in self.workgroups.values():
-                regional_client = self.regional_clients[workgroup.region]
-                workgroup.tags = regional_client.list_tags_for_resource(
-                    ResourceARN=workgroup.arn
-                )["Tags"]
-        except Exception as error:
-            logger.error(
-                f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-            )
-
-
-class EncryptionConfiguration(BaseModel):
-    encryption_option: str
-    encrypted: bool
-
-
-class WorkGroup(BaseModel):
-    arn: str
-    name: str
-    encryption_configuration: EncryptionConfiguration = EncryptionConfiguration(
-        encryption_option="", encrypted=False
-    )
-    enforce_workgroup_configuration: bool = False
-    region: str
-    tags: Optional[list] = []

prowler/providers/aws/services/athena/athena_workgroup_encryption/athena_workgroup_encryption.metadata.json

@@ -1,34 +0,0 @@
-{
-  "Provider": "aws",
-  "CheckID": "athena_workgroup_encryption",
-  "CheckTitle": "Ensure that encryption at rest is enabled for Amazon Athena query results stored in Amazon S3 in order to secure data and meet compliance requirements for data-at-rest encryption.",
-  "CheckType": [
-    "Software and Configuration Checks"
-  ],
-  "ServiceName": "athena",
-  "SubServiceName": "",
-  "ResourceIdTemplate": "arn:partition:athena:region:account-id:workgroup/resource-id",
-  "Severity": "high",
-  "ResourceType": "WorkGroup",
-  "Description": "Ensure that encryption at rest is enabled for Amazon Athena query results stored in Amazon S3 in order to secure data and meet compliance requirements for data-at-rest encryption.",
-  "Risk": "If not enabled sensitive information at rest is not protected.",
-  "RelatedUrl": "https://docs.aws.amazon.com/athena/latest/ug/encryption.html",
-  "Remediation": {
-    "Code": {
-      "CLI": "aws athena update-work-group --region <REGION> --work-group <workgroup_name> --configuration-updates ResultConfigurationUpdates={EncryptionConfiguration={EncryptionOption=SSE_S3|SSE_KMS|CSE_KMS}}",
-      "NativeIaC": "",
-      "Other": "https://www.trendmicro.com/cloudoneconformity/knowledge-base/aws/Athena/encryption-enabled.html",
-      "Terraform": "https://docs.bridgecrew.io/docs/ensure-that-athena-workgroup-is-encrypted#terraform"
-    },
-    "Recommendation": {
-      "Text": "Enable Encryption. Use a CMK where possible. It will provide additional management and privacy benefits.",
-      "Url": "https://docs.aws.amazon.com/athena/latest/ug/encrypting-query-results-stored-in-s3.html"
-    }
-  },
-  "Categories": [
-    "encryption"
-  ],
-  "DependsOn": [],
-  "RelatedTo": [],
-  "Notes": ""
-}

prowler/providers/aws/services/athena/athena_workgroup_encryption/athena_workgroup_encryption.py

@@ -1,27 +0,0 @@
-from prowler.lib.check.models import Check, Check_Report_AWS
-from prowler.providers.aws.services.athena.athena_client import athena_client
-
-
-class athena_workgroup_encryption(Check):
-    """Check if there are Athena workgroups not encrypting query results"""
-
-    def execute(self):
-        """Execute the athena_workgroup_encryption check"""
-        findings = []
-        for workgroup in athena_client.workgroups.values():
-            report = Check_Report_AWS(self.metadata())
-            report.region = workgroup.region
-            report.resource_id = workgroup.name
-            report.resource_arn = workgroup.arn
-            report.resource_tags = workgroup.tags
-
-            if workgroup.encryption_configuration.encrypted:
-                report.status = "PASS"
-                report.status_extended = f"Athena WorkGroup {workgroup.name} encrypts the query results using {workgroup.encryption_configuration.encryption_option}."
-            else:
-                report.status = "FAIL"
-                report.status_extended = f"Athena WorkGroup {workgroup.name} does not encrypt the query results."
-
-            findings.append(report)
-
-        return findings

prowler/providers/aws/services/athena/athena_workgroup_enforce_configuration/athena_workgroup_enforce_configuration.metadata.json

@@ -1,32 +0,0 @@
-{
-  "Provider": "aws",
-  "CheckID": "athena_workgroup_enforce_configuration",
-  "CheckTitle": "Ensure that workgroup configuration is enforced so it cannot be overriden by client-side settings.",
-  "CheckType": [
-    "Software and Configuration Checks"
-  ],
-  "ServiceName": "athena",
-  "SubServiceName": "",
-  "ResourceIdTemplate": "arn:partition:athena:region:account-id:workgroup/resource-id",
-  "Severity": "medium",
-  "ResourceType": "WorkGroup",
-  "Description": "Ensure that workgroup configuration is enforced so it cannot be overriden by client-side settings.",
-  "Risk": "If workgroup configuration is not enforced security settings like encryption can be overriden by client-side settings.",
-  "RelatedUrl": "https://docs.aws.amazon.com/athena/latest/ug/workgroups-settings-override.html",
-  "Remediation": {
-    "Code": {
-      "CLI": "aws athena update-work-group --region <REGION> --work-group <workgroup_name> --configuration-updates EnforceWorkGroupConfiguration=True",
-      "NativeIaC": "https://docs.bridgecrew.io/docs/bc_aws_general_33#cloudformation",
-      "Other": "",
-      "Terraform": "https://docs.bridgecrew.io/docs/bc_aws_general_33#terraform"
-    },
-    "Recommendation": {
-      "Text": "Ensure that workgroup configuration is enforced so it cannot be overriden by client-side settings.",
-      "Url": "https://docs.aws.amazon.com/athena/latest/ug/workgroups-settings-override.html"
-    }
-  },
-  "Categories": [],
-  "DependsOn": [],
-  "RelatedTo": [],
-  "Notes": ""
-}

prowler/providers/aws/services/athena/athena_workgroup_enforce_configuration/athena_workgroup_enforce_configuration.py

@@ -1,27 +0,0 @@
-from prowler.lib.check.models import Check, Check_Report_AWS
-from prowler.providers.aws.services.athena.athena_client import athena_client
-
-
-class athena_workgroup_enforce_configuration(Check):
-    """Check if there are Athena workgroups not encrypting query results"""
-
-    def execute(self):
-        """Execute the athena_workgroup_enforce_configuration check"""
-        findings = []
-        for workgroup in athena_client.workgroups.values():
-            report = Check_Report_AWS(self.metadata())
-            report.region = workgroup.region
-            report.resource_id = workgroup.name
-            report.resource_arn = workgroup.arn
-            report.resource_tags = workgroup.tags
-
-            if workgroup.enforce_workgroup_configuration:
-                report.status = "PASS"
-                report.status_extended = f"Athena WorkGroup {workgroup.name} enforces the workgroup configuration, so it cannot be overridden by the client-side settings."
-            else:
-                report.status = "FAIL"
-                report.status_extended = f"Athena WorkGroup {workgroup.name} does not enforce the workgroup configuration, so it can be overridden by the client-side settings."
-
-            findings.append(report)
-
-        return findings

prowler/providers/aws/services/awslambda/awslambda_function_invoke_api_operations_cloudtrail_logging_enabled/awslambda_function_invoke_api_operations_cloudtrail_logging_enabled.py

@@ -17,7 +17,7 @@ class awslambda_function_invoke_api_operations_cloudtrail_logging_enabled(Check)
 
             report.status = "FAIL"
             report.status_extended = (
-                f"Lambda function {function.name} is not recorded by CloudTrail."
+                f"Lambda function {function.name} is not recorded by CloudTrail"
             )
             lambda_recorded_cloudtrail = False
             for trail in cloudtrail_client.trails:
@@ -46,7 +46,7 @@ class awslambda_function_invoke_api_operations_cloudtrail_logging_enabled(Check)
                         break
                 if lambda_recorded_cloudtrail:
                     report.status = "PASS"
-                    report.status_extended = f"Lambda function {function.name} is recorded by CloudTrail trail {trail.name}."
+                    report.status_extended = f"Lambda function {function.name} is recorded by CloudTrail trail {trail.name}"
                     break
             findings.append(report)
 

prowler/providers/aws/services/awslambda/awslambda_function_no_secrets_in_code/awslambda_function_no_secrets_in_code.py

@@ -21,7 +21,7 @@ class awslambda_function_no_secrets_in_code(Check):
 
                 report.status = "PASS"
                 report.status_extended = (
-                    f"No secrets found in Lambda function {function.name} code."
+                    f"No secrets found in Lambda function {function.name} code"
                 )
                 with tempfile.TemporaryDirectory() as tmp_dir_name:
                     function.code.code_zip.extractall(tmp_dir_name)
@@ -55,11 +55,11 @@ class awslambda_function_no_secrets_in_code(Check):
                     if secrets_findings:
                         final_output_string = "; ".join(secrets_findings)
                         report.status = "FAIL"
-                        # report.status_extended = f"Potential {'secrets' if len(secrets_findings)>1 else 'secret'} found in Lambda function {function.name} code. {final_output_string}."
+                        # report.status_extended = f"Potential {'secrets' if len(secrets_findings)>1 else 'secret'} found in Lambda function {function.name} code. {final_output_string}"
                         if len(secrets_findings) > 1:
-                            report.status_extended = f"Potential secrets found in Lambda function {function.name} code -> {final_output_string}."
+                            report.status_extended = f"Potential secrets found in Lambda function {function.name} code -> {final_output_string}"
                         else:
-                            report.status_extended = f"Potential secret found in Lambda function {function.name} code -> {final_output_string}."
+                            report.status_extended = f"Potential secret found in Lambda function {function.name} code -> {final_output_string}"
                         # break // Don't break as there may be additional findings
 
                 findings.append(report)

prowler/providers/aws/services/awslambda/awslambda_function_no_secrets_in_variables/awslambda_function_no_secrets_in_variables.py

@@ -21,7 +21,7 @@ class awslambda_function_no_secrets_in_variables(Check):
 
             report.status = "PASS"
             report.status_extended = (
-                f"No secrets found in Lambda function {function.name} variables."
+                f"No secrets found in Lambda function {function.name} variables"
             )
 
             if function.environment:
@@ -47,7 +47,7 @@ class awslambda_function_no_secrets_in_variables(Check):
                         ]
                     )
                     report.status = "FAIL"
-                    report.status_extended = f"Potential secret found in Lambda function {function.name} variables -> {secrets_string}."
+                    report.status_extended = f"Potential secret found in Lambda function {function.name} variables -> {secrets_string}"
 
                 os.remove(temp_env_data_file.name)
 

prowler/providers/aws/services/awslambda/awslambda_function_not_publicly_accessible/awslambda_function_not_publicly_accessible.py

@@ -13,7 +13,7 @@ class awslambda_function_not_publicly_accessible(Check):
             report.resource_tags = function.tags
 
             report.status = "PASS"
-            report.status_extended = f"Lambda function {function.name} has a policy resource-based policy not public."
+            report.status_extended = f"Lambda function {function.name} has a policy resource-based policy not public"
 
             public_access = False
             if function.policy:
@@ -36,7 +36,7 @@ class awslambda_function_not_publicly_accessible(Check):
 
             if public_access:
                 report.status = "FAIL"
-                report.status_extended = f"Lambda function {function.name} has a policy resource-based policy with public access."
+                report.status_extended = f"Lambda function {function.name} has a policy resource-based policy with public access"
 
             findings.append(report)
 

prowler/providers/aws/services/awslambda/awslambda_function_using_supported_runtimes/awslambda_function_using_supported_runtimes.py

@@ -1,3 +1,4 @@
+from prowler.config.config import get_config_var
 from prowler.lib.check.models import Check, Check_Report_AWS
 from prowler.providers.aws.services.awslambda.awslambda_client import awslambda_client
 
@@ -13,14 +14,12 @@ class awslambda_function_using_supported_runtimes(Check):
                 report.resource_arn = function.arn
                 report.resource_tags = function.tags
 
-                if function.runtime in awslambda_client.audit_config.get(
-                    "obsolete_lambda_runtimes", []
-                ):
+                if function.runtime in get_config_var("obsolete_lambda_runtimes"):
                     report.status = "FAIL"
-                    report.status_extended = f"Lambda function {function.name} is using {function.runtime} which is obsolete."
+                    report.status_extended = f"Lambda function {function.name} is using {function.runtime} which is obsolete"
                 else:
                     report.status = "PASS"
-                    report.status_extended = f"Lambda function {function.name} is using {function.runtime} which is supported."
+                    report.status_extended = f"Lambda function {function.name} is using {function.runtime} which is supported"
 
                 findings.append(report)
 

prowler/providers/aws/services/backup/backup_plans_exist/backup_plans_exist.py

@@ -7,13 +7,15 @@ class backup_plans_exist(Check):
         findings = []
         report = Check_Report_AWS(self.metadata())
         report.status = "FAIL"
-        report.status_extended = "No Backup Plan exist."
+        report.status_extended = "No Backup Plan Exist"
         report.resource_arn = backup_client.audited_account_arn
         report.resource_id = backup_client.audited_account
         report.region = backup_client.region
         if backup_client.backup_plans:
             report.status = "PASS"
-            report.status_extended = f"At least one backup plan exists: {backup_client.backup_plans[0].name}."
+            report.status_extended = (
+                f"At least one backup plan exists: {backup_client.backup_plans[0].name}"
+            )
             report.resource_arn = backup_client.backup_plans[0].arn
             report.resource_id = backup_client.backup_plans[0].name
             report.region = backup_client.backup_plans[0].region

prowler/providers/aws/services/backup/backup_reportplans_exist/backup_reportplans_exist.py

@@ -9,13 +9,13 @@ class backup_reportplans_exist(Check):
         if backup_client.backup_plans:
             report = Check_Report_AWS(self.metadata())
             report.status = "FAIL"
-            report.status_extended = "No Backup Report Plan exist."
+            report.status_extended = "No Backup Report Plan Exist"
             report.resource_arn = backup_client.audited_account_arn
             report.resource_id = backup_client.audited_account
             report.region = backup_client.region
             if backup_client.backup_report_plans:
                 report.status = "PASS"
-                report.status_extended = f"At least one backup report plan exists: {backup_client.backup_report_plans[0].name}."
+                report.status_extended = f"At least one backup report plan exists: { backup_client.backup_report_plans[0].name}"
                 report.resource_arn = backup_client.backup_report_plans[0].arn
                 report.resource_id = backup_client.backup_report_plans[0].name
                 report.region = backup_client.backup_report_plans[0].region

prowler/providers/aws/services/backup/backup_vaults_encrypted/backup_vaults_encrypted.py

@@ -11,7 +11,7 @@ class backup_vaults_encrypted(Check):
             report = Check_Report_AWS(self.metadata())
             report.status = "FAIL"
             report.status_extended = (
-                f"Backup Vault {backup_vault.name} is not encrypted."
+                f"Backup Vault {backup_vault.name} is not encrypted"
             )
             report.resource_arn = backup_vault.arn
             report.resource_id = backup_vault.name
@@ -20,7 +20,7 @@ class backup_vaults_encrypted(Check):
             if backup_vault.encryption:
                 report.status = "PASS"
                 report.status_extended = (
-                    f"Backup Vault {backup_vault.name} is encrypted."
+                    f"Backup Vault {backup_vault.name} is encrypted"
                 )
             # then we store the finding
             findings.append(report)

prowler/providers/aws/services/backup/backup_vaults_exist/backup_vaults_exist.py

@@ -7,13 +7,13 @@ class backup_vaults_exist(Check):
         findings = []
         report = Check_Report_AWS(self.metadata())
         report.status = "FAIL"
-        report.status_extended = "No Backup Vault exist."
+        report.status_extended = "No Backup Vault Exist"
         report.resource_arn = backup_client.audited_account_arn
         report.resource_id = backup_client.audited_account
         report.region = backup_client.region
         if backup_client.backup_vaults:
             report.status = "PASS"
-            report.status_extended = f"At least one backup vault exists: {backup_client.backup_vaults[0].name}."
+            report.status_extended = f"At least one backup vault exists: { backup_client.backup_vaults[0].name}"
             report.resource_arn = backup_client.backup_vaults[0].arn
             report.resource_id = backup_client.backup_vaults[0].name
             report.region = backup_client.backup_vaults[0].region

prowler/providers/aws/services/cloudformation/cloudformation_stacks_termination_protection_enabled/cloudformation_stacks_termination_protection_enabled.py

@@ -20,10 +20,10 @@ class cloudformation_stacks_termination_protection_enabled(Check):
 
                 if stack.enable_termination_protection:
                     report.status = "PASS"
-                    report.status_extended = f"CloudFormation {stack.name} has termination protection enabled."
+                    report.status_extended = f"CloudFormation {stack.name} has termination protection enabled"
                 else:
                     report.status = "FAIL"
-                    report.status_extended = f"CloudFormation {stack.name} has termination protection disabled."
+                    report.status_extended = f"CloudFormation {stack.name} has termination protection disabled"
                 findings.append(report)
 
         return findings

prowler/providers/aws/services/cloudfront/cloudfront_distributions_field_level_encryption_enabled/cloudfront_distributions_field_level_encryption_enabled.py

@@ -18,10 +18,10 @@ class cloudfront_distributions_field_level_encryption_enabled(Check):
                 and distribution.default_cache_config.field_level_encryption_id
             ):
                 report.status = "PASS"
-                report.status_extended = f"CloudFront Distribution {distribution.id} has Field Level Encryption enabled."
+                report.status_extended = f"CloudFront Distribution {distribution.id} has Field Level Encryption enabled"
             else:
                 report.status = "FAIL"
-                report.status_extended = f"CloudFront Distribution {distribution.id} has Field Level Encryption disabled."
+                report.status_extended = f"CloudFront Distribution {distribution.id} has Field Level Encryption disabled"
 
             findings.append(report)
 

prowler/providers/aws/services/cloudfront/cloudfront_distributions_geo_restrictions_enabled/cloudfront_distributions_geo_restrictions_enabled.py

@@ -18,10 +18,10 @@ class cloudfront_distributions_geo_restrictions_enabled(Check):
             report.resource_tags = distribution.tags
             if distribution.geo_restriction_type == GeoRestrictionType.none:
                 report.status = "FAIL"
-                report.status_extended = f"CloudFront Distribution {distribution.id} has Geo restrictions disabled."
+                report.status_extended = f"CloudFront Distribution {distribution.id} has Geo restrictions disabled"
             else:
                 report.status = "PASS"
-                report.status_extended = f"CloudFront Distribution {distribution.id} has Geo restrictions enabled."
+                report.status_extended = f"CloudFront Distribution {distribution.id} has Geo restrictions enabled"
 
             findings.append(report)
 

prowler/providers/aws/services/cloudfront/cloudfront_distributions_https_enabled/cloudfront_distributions_https_enabled.py

@@ -24,7 +24,7 @@ class cloudfront_distributions_https_enabled(Check):
             ):
                 report.status = "PASS"
                 report.status_extended = (
-                    f"CloudFront Distribution {distribution.id} has redirect to HTTPS."
+                    f"CloudFront Distribution {distribution.id} has redirect to HTTPS"
                 )
             elif (
                 distribution.default_cache_config
@@ -33,11 +33,11 @@ class cloudfront_distributions_https_enabled(Check):
             ):
                 report.status = "PASS"
                 report.status_extended = (
-                    f"CloudFront Distribution {distribution.id} has HTTPS only."
+                    f"CloudFront Distribution {distribution.id} has HTTPS only"
                 )
             else:
                 report.status = "FAIL"
-                report.status_extended = f"CloudFront Distribution {distribution.id} viewers can use HTTP or HTTPS."
+                report.status_extended = f"CloudFront Distribution {distribution.id} viewers can use HTTP or HTTPS"
 
             findings.append(report)
 

prowler/providers/aws/services/cloudfront/cloudfront_distributions_logging_enabled/cloudfront_distributions_logging_enabled.py

@@ -19,12 +19,12 @@ class cloudfront_distributions_logging_enabled(Check):
             ):
                 report.status = "PASS"
                 report.status_extended = (
-                    f"CloudFront Distribution {distribution.id} has logging enabled."
+                    f"CloudFront Distribution {distribution.id} has logging enabled"
                 )
             else:
                 report.status = "FAIL"
                 report.status_extended = (
-                    f"CloudFront Distribution {distribution.id} has logging disabled."
+                    f"CloudFront Distribution {distribution.id} has logging disabled"
                 )
             findings.append(report)
 

prowler/providers/aws/services/cloudfront/cloudfront_distributions_using_deprecated_ssl_protocols/cloudfront_distributions_using_deprecated_ssl_protocols.py

@@ -17,7 +17,7 @@ class cloudfront_distributions_using_deprecated_ssl_protocols(Check):
             report.resource_id = distribution.id
             report.resource_tags = distribution.tags
             report.status = "PASS"
-            report.status_extended = f"CloudFront Distribution {distribution.id} is not using a deprecated SSL protocol."
+            report.status_extended = f"CloudFront Distribution {distribution.id} is not using a deprecated SSL protocol"
 
             bad_ssl_protocol = False
             for origin in distribution.origins:
@@ -34,7 +34,7 @@ class cloudfront_distributions_using_deprecated_ssl_protocols(Check):
                             break
                 if bad_ssl_protocol:
                     report.status = "FAIL"
-                    report.status_extended = f"CloudFront Distribution {distribution.id} is using a deprecated SSL protocol."
+                    report.status_extended = f"CloudFront Distribution {distribution.id} is using a deprecated SSL protocol"
                     break
 
             findings.append(report)

prowler/providers/aws/services/cloudfront/cloudfront_distributions_using_waf/cloudfront_distributions_using_waf.py

@@ -15,10 +15,10 @@ class cloudfront_distributions_using_waf(Check):
             report.resource_tags = distribution.tags
             if distribution.web_acl_id:
                 report.status = "PASS"
-                report.status_extended = f"CloudFront Distribution {distribution.id} is using AWS WAF web ACL {distribution.web_acl_id}."
+                report.status_extended = f"CloudFront Distribution {distribution.id} is using AWS WAF web ACL {distribution.web_acl_id}"
             else:
                 report.status = "FAIL"
-                report.status_extended = f"CloudFront Distribution {distribution.id} is not using AWS WAF web ACL."
+                report.status_extended = f"CloudFront Distribution {distribution.id} is not using AWS WAF web ACL"
             findings.append(report)
 
         return findings