From f16f94acf387258ab0c85b33dac08f3757073132 Mon Sep 17 00:00:00 2001 From: Sergio Garcia Date: Tue, 4 Nov 2025 11:44:56 -0500 Subject: [PATCH] chore(oci): rename OCI provider to oraclecloud with oci alias (#9126) --- .../migrations/0051_oraclecloud_provider.py | 4 +- api/src/backend/api/models.py | 6 +- api/src/backend/api/specs/v1.yaml | 198 +++++++++--------- api/src/backend/api/tests/test_utils.py | 6 +- api/src/backend/api/tests/test_views.py | 6 +- api/src/backend/api/utils.py | 14 +- api/src/backend/api/v1/serializers.py | 2 +- api/src/backend/conftest.py | 2 +- api/src/backend/tasks/jobs/export.py | 6 +- prowler/CHANGELOG.md | 1 + prowler/__main__.py | 8 +- .../{oci => oraclecloud}/__init__.py | 0 .../cis_3.0_oraclecloud.json} | 2 +- prowler/config/config.py | 2 +- prowler/lib/check/check.py | 20 +- prowler/lib/check/utils.py | 8 +- prowler/lib/cli/parser.py | 9 +- .../cis/{cis_oci.py => cis_oraclecloud.py} | 14 +- prowler/lib/outputs/compliance/cis/models.py | 6 +- prowler/lib/outputs/finding.py | 4 +- prowler/lib/outputs/outputs.py | 2 +- prowler/lib/outputs/summary_table.py | 2 +- prowler/lib/scan/scan.py | 10 +- prowler/providers/common/arguments.py | 18 +- prowler/providers/common/provider.py | 20 +- .../oraclecloud/lib/arguments/arguments.py | 17 +- .../oraclecloud/lib/service/service.py | 6 +- ...ci_provider.py => oraclecloud_provider.py} | 30 +-- ...s_instance_access_restricted.metadata.json | 2 +- ...og_retention_period_365_days.metadata.json | 2 +- ...ck_volume_encrypted_with_cmk.metadata.json | 2 +- ...ot_volume_encrypted_with_cmk.metadata.json | 2 +- .../cloudguard_enabled.metadata.json | 2 +- ...n_transit_encryption_enabled.metadata.json | 2 +- ...y_metadata_endpoint_disabled.metadata.json | 2 +- ...instance_secure_boot_enabled.metadata.json | 2 +- ...s_database_access_restricted.metadata.json | 2 +- ...opic_and_subscription_exists.metadata.json | 2 +- ...nts_rule_cloudguard_problems.metadata.json | 2 +- ...vents_rule_iam_group_changes.metadata.json | 2 +- ...ents_rule_iam_policy_changes.metadata.json | 2 +- ...le_identity_provider_changes.metadata.json | 2 +- ...le_idp_group_mapping_changes.metadata.json | 2 +- ...le_local_user_authentication.metadata.json | 2 +- ...rule_network_gateway_changes.metadata.json | 2 +- ...twork_security_group_changes.metadata.json | 2 +- ...nts_rule_route_table_changes.metadata.json | 2 +- ...s_rule_security_list_changes.metadata.json | 2 +- .../events_rule_user_changes.metadata.json | 2 +- .../events_rule_vcn_changes.metadata.json | 2 +- ...le_system_encrypted_with_cmk.metadata.json | 2 +- ...cannot_update_tenancy_admins.metadata.json | 2 +- ...tity_instance_principal_used.metadata.json | 2 +- ...esources_in_root_compartment.metadata.json | 2 +- ..._non_root_compartment_exists.metadata.json | 2 +- ...licy_expires_within_365_days.metadata.json | 2 +- ...ord_policy_minimum_length_14.metadata.json | 2 +- ...ssword_policy_prevents_reuse.metadata.json | 2 +- ...y_service_level_admins_exist.metadata.json | 2 +- ...cy_admin_permissions_limited.metadata.json | 2 +- ...ancy_admin_users_no_api_keys.metadata.json | 2 +- ...ser_api_keys_rotated_90_days.metadata.json | 2 +- ..._auth_tokens_rotated_90_days.metadata.json | 2 +- ..._secret_keys_rotated_90_days.metadata.json | 2 +- ...db_passwords_rotated_90_days.metadata.json | 2 +- ...r_mfa_enabled_console_access.metadata.json | 2 +- ...ity_user_valid_email_address.metadata.json | 2 +- ...n_instance_access_restricted.metadata.json | 2 +- .../kms_key_rotation_enabled.metadata.json | 2 +- ...urity_list_restricts_traffic.metadata.json | 2 +- ...ss_from_internet_to_rdp_port.metadata.json | 2 +- ...ss_from_internet_to_ssh_port.metadata.json | 2 +- ...ss_from_internet_to_rdp_port.metadata.json | 2 +- ...ss_from_internet_to_ssh_port.metadata.json | 2 +- ...vcn_subnet_flow_logs_enabled.metadata.json | 2 +- ...ge_bucket_encrypted_with_cmk.metadata.json | 2 +- ...orage_bucket_logging_enabled.metadata.json | 2 +- ...cket_not_publicly_accessible.metadata.json | 2 +- ...ge_bucket_versioning_enabled.metadata.json | 2 +- tests/lib/cli/parser_test.py | 4 +- tests/providers/oraclecloud/conftest.py | 38 ++-- tests/providers/oraclecloud/oci_fixtures.py | 4 +- ...alytics_instance_access_restricted_test.py | 12 +- .../analytics/analytics_service_test.py | 10 +- ...udit_log_retention_period_365_days_test.py | 8 +- .../services/audit/audit_service_test.py | 10 +- ...ge_block_volume_encrypted_with_cmk_test.py | 12 +- ...age_boot_volume_encrypted_with_cmk_test.py | 12 +- .../blockstorage/blockstorage_service_test.py | 10 +- .../cloudguard_enabled_test.py | 12 +- .../cloudguard/cloudguard_service_test.py | 10 +- ...ance_in_transit_encryption_enabled_test.py | 12 +- ..._legacy_metadata_endpoint_disabled_test.py | 12 +- ...mpute_instance_secure_boot_enabled_test.py | 12 +- .../services/compute/compute_service_test.py | 10 +- ...onomous_database_access_restricted_test.py | 12 +- .../database/database_service_test.py | 10 +- ...tion_topic_and_subscription_exists_test.py | 12 +- .../events_rule_cloudguard_problems_test.py | 12 +- .../events_rule_iam_group_changes_test.py | 12 +- .../events_rule_iam_policy_changes_test.py | 12 +- ...nts_rule_identity_provider_changes_test.py | 12 +- ...nts_rule_idp_group_mapping_changes_test.py | 12 +- ...nts_rule_local_user_authentication_test.py | 12 +- ...vents_rule_network_gateway_changes_test.py | 12 +- ...ule_network_security_group_changes_test.py | 12 +- .../events_rule_route_table_changes_test.py | 12 +- .../events_rule_security_list_changes_test.py | 12 +- .../events_rule_user_changes_test.py | 12 +- .../events_rule_vcn_changes_test.py | 12 +- .../services/events/events_service_test.py | 10 +- ...age_file_system_encrypted_with_cmk_test.py | 4 +- .../filestorage/filestorage_service_test.py | 10 +- ...dmins_cannot_update_tenancy_admins_test.py | 12 +- .../identity_instance_principal_used_test.py | 12 +- ...y_no_resources_in_root_compartment_test.py | 12 +- ...entity_non_root_compartment_exists_test.py | 12 +- ...ord_policy_expires_within_365_days_test.py | 12 +- ..._password_policy_minimum_length_14_test.py | 12 +- ...ity_password_policy_prevents_reuse_test.py | 12 +- ...dentity_service_level_admins_exist_test.py | 12 +- .../identity/identity_service_test.py | 10 +- ..._tenancy_admin_permissions_limited_test.py | 12 +- ...ty_tenancy_admin_users_no_api_keys_test.py | 12 +- ...tity_user_api_keys_rotated_90_days_test.py | 12 +- ...y_user_auth_tokens_rotated_90_days_test.py | 12 +- ...stomer_secret_keys_rotated_90_days_test.py | 12 +- ..._user_db_passwords_rotated_90_days_test.py | 12 +- ...ty_user_mfa_enabled_console_access_test.py | 12 +- .../identity_user_valid_email_address_test.py | 12 +- ...gration_instance_access_restricted_test.py | 12 +- .../integration/integration_service_test.py | 10 +- .../kms_key_rotation_enabled_test.py | 12 +- .../services/kms/kms_service_test.py | 10 +- .../services/logging/logging_service_test.py | 10 +- ...lt_security_list_restricts_traffic_test.py | 12 +- ..._ingress_from_internet_to_rdp_port_test.py | 12 +- ..._ingress_from_internet_to_ssh_port_test.py | 12 +- ..._ingress_from_internet_to_rdp_port_test.py | 12 +- ..._ingress_from_internet_to_ssh_port_test.py | 12 +- .../services/network/network_service_test.py | 10 +- ...twork_vcn_subnet_flow_logs_enabled_test.py | 12 +- ...tstorage_bucket_encrypted_with_cmk_test.py | 12 +- ...jectstorage_bucket_logging_enabled_test.py | 12 +- ...age_bucket_not_publicly_accessible_test.py | 12 +- ...tstorage_bucket_versioning_enabled_test.py | 12 +- .../objectstorage_service_test.py | 10 +- 147 files changed, 623 insertions(+), 688 deletions(-) rename prowler/compliance/{oci => oraclecloud}/__init__.py (100%) rename prowler/compliance/{oci/cis_3.0_oci.json => oraclecloud/cis_3.0_oraclecloud.json} (99%) rename prowler/lib/outputs/compliance/cis/{cis_oci.py => cis_oraclecloud.py} (92%) rename prowler/providers/oraclecloud/{oci_provider.py => oraclecloud_provider.py} (97%) diff --git a/api/src/backend/api/migrations/0051_oraclecloud_provider.py b/api/src/backend/api/migrations/0051_oraclecloud_provider.py index fd96dfbcd5..022c022ea6 100644 --- a/api/src/backend/api/migrations/0051_oraclecloud_provider.py +++ b/api/src/backend/api/migrations/0051_oraclecloud_provider.py @@ -22,13 +22,13 @@ class Migration(migrations.Migration): ("kubernetes", "Kubernetes"), ("m365", "M365"), ("github", "GitHub"), - ("oci", "Oracle Cloud Infrastructure"), + ("oraclecloud", "Oracle Cloud Infrastructure"), ], default="aws", ), ), migrations.RunSQL( - "ALTER TYPE provider ADD VALUE IF NOT EXISTS 'oci';", + "ALTER TYPE provider ADD VALUE IF NOT EXISTS 'oraclecloud';", reverse_sql=migrations.RunSQL.noop, ), ] diff --git a/api/src/backend/api/models.py b/api/src/backend/api/models.py index 43b6d7ae5c..304275f137 100644 --- a/api/src/backend/api/models.py +++ b/api/src/backend/api/models.py @@ -285,7 +285,7 @@ class Provider(RowLevelSecurityProtectedModel): M365 = "m365", _("M365") GITHUB = "github", _("GitHub") IAC = "iac", _("IaC") - OCI = "oci", _("Oracle Cloud Infrastructure") + ORACLECLOUD = "oraclecloud", _("Oracle Cloud Infrastructure") @staticmethod def validate_aws_uid(value): @@ -370,14 +370,14 @@ class Provider(RowLevelSecurityProtectedModel): ) @staticmethod - def validate_oci_uid(value): + def validate_oraclecloud_uid(value): if not re.match( r"^ocid1\.([a-z0-9_-]+)\.([a-z0-9_-]+)\.([a-z0-9_-]*)\.([a-z0-9]+)$", value ): raise ModelValidationError( detail="Oracle Cloud Infrastructure provider ID must be a valid tenancy OCID in the format: " "ocid1....", - code="oci-uid", + code="oraclecloud-uid", pointer="/data/attributes/uid", ) diff --git a/api/src/backend/api/specs/v1.yaml b/api/src/backend/api/specs/v1.yaml index d40a46f66e..6e81e5f81b 100644 --- a/api/src/backend/api/specs/v1.yaml +++ b/api/src/backend/api/specs/v1.yaml @@ -869,7 +869,7 @@ paths: name: filter[provider_type] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -878,7 +878,7 @@ paths: - iac - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -887,14 +887,14 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider_type__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -902,7 +902,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -913,7 +913,7 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - in: query @@ -1403,7 +1403,7 @@ paths: name: filter[provider_type] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -1412,7 +1412,7 @@ paths: - iac - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -1421,14 +1421,14 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider_type__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -1436,7 +1436,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -1447,7 +1447,7 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - in: query @@ -1845,7 +1845,7 @@ paths: name: filter[provider_type] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -1854,7 +1854,7 @@ paths: - iac - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -1863,14 +1863,14 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider_type__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -1878,7 +1878,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -1889,7 +1889,7 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - in: query @@ -2285,7 +2285,7 @@ paths: name: filter[provider_type] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -2294,7 +2294,7 @@ paths: - iac - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -2303,14 +2303,14 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider_type__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -2318,7 +2318,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -2329,7 +2329,7 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - in: query @@ -2713,7 +2713,7 @@ paths: name: filter[provider_type] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -2722,7 +2722,7 @@ paths: - iac - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -2731,14 +2731,14 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider_type__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -2746,7 +2746,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -2757,7 +2757,7 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - in: query @@ -4545,7 +4545,7 @@ paths: name: filter[provider_type] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -4554,7 +4554,7 @@ paths: - iac - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -4563,14 +4563,14 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider_type__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -4578,7 +4578,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -4589,7 +4589,7 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - in: query @@ -4729,7 +4729,7 @@ paths: name: filter[provider_type] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -4738,7 +4738,7 @@ paths: - iac - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -4747,14 +4747,14 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider_type__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -4762,7 +4762,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -4773,7 +4773,7 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - in: query @@ -4979,7 +4979,7 @@ paths: name: filter[provider_type] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -4988,7 +4988,7 @@ paths: - iac - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -4997,14 +4997,14 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider_type__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -5012,7 +5012,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -5023,7 +5023,7 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - in: query @@ -5709,7 +5709,7 @@ paths: name: filter[provider] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -5718,7 +5718,7 @@ paths: - iac - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -5727,14 +5727,14 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -5742,7 +5742,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -5752,14 +5752,14 @@ paths: * `kubernetes` - Kubernetes * `m365` - M365 * `github` - GitHub - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - in: query name: filter[provider_type] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -5767,7 +5767,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -5775,14 +5775,14 @@ paths: * `kubernetes` - Kubernetes * `m365` - M365 * `github` - GitHub - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider_type__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -5790,7 +5790,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -5800,7 +5800,7 @@ paths: * `kubernetes` - Kubernetes * `m365` - M365 * `github` - GitHub - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - name: filter[search] @@ -6398,7 +6398,7 @@ paths: name: filter[provider_type] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -6407,7 +6407,7 @@ paths: - iac - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -6416,14 +6416,14 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider_type__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -6431,7 +6431,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -6442,7 +6442,7 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - in: query @@ -6770,7 +6770,7 @@ paths: name: filter[provider_type] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -6779,7 +6779,7 @@ paths: - iac - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -6788,14 +6788,14 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider_type__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -6803,7 +6803,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -6814,7 +6814,7 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - in: query @@ -7043,7 +7043,7 @@ paths: name: filter[provider_type] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -7052,7 +7052,7 @@ paths: - iac - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -7061,14 +7061,14 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider_type__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -7076,7 +7076,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -7087,7 +7087,7 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - in: query @@ -7322,7 +7322,7 @@ paths: name: filter[provider_type] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -7331,7 +7331,7 @@ paths: - iac - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -7340,14 +7340,14 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider_type__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -7355,7 +7355,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -7366,7 +7366,7 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - in: query @@ -8164,7 +8164,7 @@ paths: name: filter[provider_type] schema: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -8173,7 +8173,7 @@ paths: - iac - kubernetes - m365 - - oci + - oraclecloud description: |- * `aws` - AWS * `azure` - Azure @@ -8182,14 +8182,14 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure - in: query name: filter[provider_type__in] schema: type: array items: type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 enum: - aws - azure @@ -8197,7 +8197,7 @@ paths: - github - kubernetes - m365 - - oci + - oraclecloud description: |- Multiple values may be separated by commas. @@ -8208,7 +8208,7 @@ paths: * `m365` - M365 * `github` - GitHub * `iac` - IaC - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure explode: false style: form - in: query @@ -15280,7 +15280,7 @@ components: - kubernetes - m365 - github - - oci + - oraclecloud type: string description: |- * `aws` - AWS @@ -15289,8 +15289,8 @@ components: * `kubernetes` - Kubernetes * `m365` - M365 * `github` - GitHub - * `oci` - Oracle Cloud Infrastructure - x-spec-enum-id: 6f034074d7104650 + * `oraclecloud` - Oracle Cloud Infrastructure + x-spec-enum-id: 7087703783970b51 uid: type: string title: Unique identifier for the provider, set by the provider @@ -15402,9 +15402,9 @@ components: - kubernetes - m365 - github - - oci + - oraclecloud type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 description: |- Type of provider to create. @@ -15414,7 +15414,7 @@ components: * `kubernetes` - Kubernetes * `m365` - M365 * `github` - GitHub - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure uid: type: string title: Unique identifier for the provider, set by the provider @@ -15458,9 +15458,9 @@ components: - kubernetes - m365 - github - - oci + - oraclecloud type: string - x-spec-enum-id: 6f034074d7104650 + x-spec-enum-id: 7087703783970b51 description: |- Type of provider to create. @@ -15470,7 +15470,7 @@ components: * `kubernetes` - Kubernetes * `m365` - M365 * `github` - GitHub - * `oci` - Oracle Cloud Infrastructure + * `oraclecloud` - Oracle Cloud Infrastructure uid: type: string minLength: 3 diff --git a/api/src/backend/api/tests/test_utils.py b/api/src/backend/api/tests/test_utils.py index 4926d722b0..02378eb11b 100644 --- a/api/src/backend/api/tests/test_utils.py +++ b/api/src/backend/api/tests/test_utils.py @@ -22,7 +22,7 @@ from prowler.providers.azure.azure_provider import AzureProvider from prowler.providers.gcp.gcp_provider import GcpProvider from prowler.providers.kubernetes.kubernetes_provider import KubernetesProvider from prowler.providers.m365.m365_provider import M365Provider -from prowler.providers.oraclecloud.oci_provider import OciProvider +from prowler.providers.oraclecloud.oraclecloud_provider import OraclecloudProvider class TestMergeDicts: @@ -109,7 +109,7 @@ class TestReturnProwlerProvider: (Provider.ProviderChoices.AZURE.value, AzureProvider), (Provider.ProviderChoices.KUBERNETES.value, KubernetesProvider), (Provider.ProviderChoices.M365.value, M365Provider), - (Provider.ProviderChoices.OCI.value, OciProvider), + (Provider.ProviderChoices.ORACLECLOUD.value, OraclecloudProvider), ], ) def test_return_prowler_provider(self, provider_type, expected_provider): @@ -206,7 +206,7 @@ class TestGetProwlerProviderKwargs: {"organizations": ["provider_uid"]}, ), ( - Provider.ProviderChoices.OCI.value, + Provider.ProviderChoices.ORACLECLOUD.value, {}, ), ], diff --git a/api/src/backend/api/tests/test_views.py b/api/src/backend/api/tests/test_views.py index 40835efee7..82db438d44 100644 --- a/api/src/backend/api/tests/test_views.py +++ b/api/src/backend/api/tests/test_views.py @@ -2022,7 +2022,7 @@ class TestProviderSecretViewSet: ), # OCI with API key credentials (with key_content) ( - Provider.ProviderChoices.OCI.value, + Provider.ProviderChoices.ORACLECLOUD.value, ProviderSecret.TypeChoices.STATIC, { "user": "ocid1.user.oc1..aaaaaaaakldibrbov4ubh25aqdeiroklxjngwka7u6w7no3glmdq3n5sxtkq", @@ -2034,7 +2034,7 @@ class TestProviderSecretViewSet: ), # OCI with API key credentials (with key_file) ( - Provider.ProviderChoices.OCI.value, + Provider.ProviderChoices.ORACLECLOUD.value, ProviderSecret.TypeChoices.STATIC, { "user": "ocid1.user.oc1..aaaaaaaakldibrbov4ubh25aqdeiroklxjngwka7u6w7no3glmdq3n5sxtkq", @@ -2046,7 +2046,7 @@ class TestProviderSecretViewSet: ), # OCI with API key credentials (with passphrase) ( - Provider.ProviderChoices.OCI.value, + Provider.ProviderChoices.ORACLECLOUD.value, ProviderSecret.TypeChoices.STATIC, { "user": "ocid1.user.oc1..aaaaaaaakldibrbov4ubh25aqdeiroklxjngwka7u6w7no3glmdq3n5sxtkq", diff --git a/api/src/backend/api/utils.py b/api/src/backend/api/utils.py index 024c7581d7..c7db08435b 100644 --- a/api/src/backend/api/utils.py +++ b/api/src/backend/api/utils.py @@ -21,7 +21,7 @@ from prowler.providers.github.github_provider import GithubProvider from prowler.providers.iac.iac_provider import IacProvider from prowler.providers.kubernetes.kubernetes_provider import KubernetesProvider from prowler.providers.m365.m365_provider import M365Provider -from prowler.providers.oraclecloud.oci_provider import OciProvider +from prowler.providers.oraclecloud.oraclecloud_provider import OraclecloudProvider class CustomOAuth2Client(OAuth2Client): @@ -70,7 +70,7 @@ def return_prowler_provider( | IacProvider | KubernetesProvider | M365Provider - | OciProvider + | OraclecloudProvider ]: """Return the Prowler provider class based on the given provider type. @@ -78,7 +78,7 @@ def return_prowler_provider( provider (Provider): The provider object containing the provider type and associated secrets. Returns: - AwsProvider | AzureProvider | GcpProvider | GithubProvider | IacProvider | KubernetesProvider | M365Provider | OciProvider: The corresponding provider class. + AwsProvider | AzureProvider | GcpProvider | GithubProvider | IacProvider | KubernetesProvider | M365Provider | OraclecloudProvider: The corresponding provider class. Raises: ValueError: If the provider type specified in `provider.provider` is not supported. @@ -98,8 +98,8 @@ def return_prowler_provider( prowler_provider = GithubProvider case Provider.ProviderChoices.IAC.value: prowler_provider = IacProvider - case Provider.ProviderChoices.OCI.value: - prowler_provider = OciProvider + case Provider.ProviderChoices.ORACLECLOUD.value: + prowler_provider = OraclecloudProvider case _: raise ValueError(f"Provider type {provider.provider} not supported") return prowler_provider @@ -166,7 +166,7 @@ def initialize_prowler_provider( | IacProvider | KubernetesProvider | M365Provider - | OciProvider + | OraclecloudProvider ): """Initialize a Prowler provider instance based on the given provider type. @@ -176,7 +176,7 @@ def initialize_prowler_provider( Returns: AwsProvider | AzureProvider | GcpProvider | GithubProvider | IacProvider | KubernetesProvider | M365Provider | OciProvider: An instance of the corresponding provider class - (`AwsProvider`, `AzureProvider`, `GcpProvider`, `GithubProvider`, `IacProvider`, `KubernetesProvider`, `M365Provider` or `OciProvider`) initialized with the + (`AwsProvider`, `AzureProvider`, `GcpProvider`, `GithubProvider`, `IacProvider`, `KubernetesProvider`, `M365Provider` or `OraclecloudProvider`) initialized with the provider's secrets. """ prowler_provider = return_prowler_provider(provider) diff --git a/api/src/backend/api/v1/serializers.py b/api/src/backend/api/v1/serializers.py index 0dd0fb53b5..682d94f798 100644 --- a/api/src/backend/api/v1/serializers.py +++ b/api/src/backend/api/v1/serializers.py @@ -1368,7 +1368,7 @@ class BaseWriteProviderSecretSerializer(BaseWriteSerializer): serializer = KubernetesProviderSecret(data=secret) elif provider_type == Provider.ProviderChoices.M365.value: serializer = M365ProviderSecret(data=secret) - elif provider_type == Provider.ProviderChoices.OCI.value: + elif provider_type == Provider.ProviderChoices.ORACLECLOUD.value: serializer = OracleCloudProviderSecret(data=secret) else: raise serializers.ValidationError( diff --git a/api/src/backend/conftest.py b/api/src/backend/conftest.py index 872dc60601..4e35b5c83f 100644 --- a/api/src/backend/conftest.py +++ b/api/src/backend/conftest.py @@ -501,7 +501,7 @@ def providers_fixture(tenants_fixture): tenant_id=tenant.id, ) provider7 = Provider.objects.create( - provider="oci", + provider="oraclecloud", uid="ocid1.tenancy.oc1..aaaaaaaa3dwoazoox4q7wrvriywpokp5grlhgnkwtyt6dmwyou7no6mdmzda", alias="oci_testing", tenant_id=tenant.id, diff --git a/api/src/backend/tasks/jobs/export.py b/api/src/backend/tasks/jobs/export.py index 66319ec7eb..a3aee7bfc9 100644 --- a/api/src/backend/tasks/jobs/export.py +++ b/api/src/backend/tasks/jobs/export.py @@ -32,7 +32,7 @@ from prowler.lib.outputs.compliance.cis.cis_gcp import GCPCIS from prowler.lib.outputs.compliance.cis.cis_github import GithubCIS from prowler.lib.outputs.compliance.cis.cis_kubernetes import KubernetesCIS from prowler.lib.outputs.compliance.cis.cis_m365 import M365CIS -from prowler.lib.outputs.compliance.cis.cis_oci import OCICIS +from prowler.lib.outputs.compliance.cis.cis_oraclecloud import OracleCloudCIS from prowler.lib.outputs.compliance.ens.ens_aws import AWSENS from prowler.lib.outputs.compliance.ens.ens_azure import AzureENS from prowler.lib.outputs.compliance.ens.ens_gcp import GCPENS @@ -117,8 +117,8 @@ COMPLIANCE_CLASS_MAP = { # IaC provider doesn't have specific compliance frameworks yet # Trivy handles its own compliance checks ], - "oci": [ - (lambda name: name.startswith("cis_"), OCICIS), + "oraclecloud": [ + (lambda name: name.startswith("cis_"), OracleCloudCIS), ], } diff --git a/prowler/CHANGELOG.md b/prowler/CHANGELOG.md index a7c31bdc1f..334aea97cd 100644 --- a/prowler/CHANGELOG.md +++ b/prowler/CHANGELOG.md @@ -33,6 +33,7 @@ All notable changes to the **Prowler SDK** are documented in this file. - Update AWS FSx service metadata to new format [(#9006)](https://github.com/prowler-cloud/prowler/pull/9006) - Update AWS Glacier service metadata to new format [(#9007)](https://github.com/prowler-cloud/prowler/pull/9007) - Update AWS CodeArtifact service metadata to new format [(#8850)](https://github.com/prowler-cloud/prowler/pull/8850) +- Rename OCI provider to oraclecloud with oci alias [(#9126)](https://github.com/prowler-cloud/prowler/pull/9126) --- diff --git a/prowler/__main__.py b/prowler/__main__.py index 7d578a7c6a..2227c6c645 100644 --- a/prowler/__main__.py +++ b/prowler/__main__.py @@ -61,7 +61,7 @@ from prowler.lib.outputs.compliance.cis.cis_gcp import GCPCIS from prowler.lib.outputs.compliance.cis.cis_github import GithubCIS from prowler.lib.outputs.compliance.cis.cis_kubernetes import KubernetesCIS from prowler.lib.outputs.compliance.cis.cis_m365 import M365CIS -from prowler.lib.outputs.compliance.cis.cis_oci import OCICIS +from prowler.lib.outputs.compliance.cis.cis_oraclecloud import OracleCloudCIS from prowler.lib.outputs.compliance.compliance import display_compliance_table from prowler.lib.outputs.compliance.ens.ens_aws import AWSENS from prowler.lib.outputs.compliance.ens.ens_azure import AzureENS @@ -334,7 +334,7 @@ def prowler(): output_options = IACOutputOptions(args, bulk_checks_metadata) elif provider == "llm": output_options = LLMOutputOptions(args, bulk_checks_metadata) - elif provider == "oci": + elif provider == "oraclecloud": output_options = OCIOutputOptions( args, bulk_checks_metadata, global_provider.identity ) @@ -969,7 +969,7 @@ def prowler(): generated_outputs["compliance"].append(generic_compliance) generic_compliance.batch_write_data_to_file() - elif provider == "oci": + elif provider == "oraclecloud": for compliance_name in input_compliance_frameworks: if compliance_name.startswith("cis_"): # Generate CIS Finding Object @@ -977,7 +977,7 @@ def prowler(): f"{output_options.output_directory}/compliance/" f"{output_options.output_filename}_{compliance_name}.csv" ) - cis = OCICIS( + cis = OracleCloudCIS( findings=finding_outputs, compliance=bulk_compliance_frameworks[compliance_name], file_path=filename, diff --git a/prowler/compliance/oci/__init__.py b/prowler/compliance/oraclecloud/__init__.py similarity index 100% rename from prowler/compliance/oci/__init__.py rename to prowler/compliance/oraclecloud/__init__.py diff --git a/prowler/compliance/oci/cis_3.0_oci.json b/prowler/compliance/oraclecloud/cis_3.0_oraclecloud.json similarity index 99% rename from prowler/compliance/oci/cis_3.0_oci.json rename to prowler/compliance/oraclecloud/cis_3.0_oraclecloud.json index 033a0845e5..76ff7cd7ef 100644 --- a/prowler/compliance/oci/cis_3.0_oci.json +++ b/prowler/compliance/oraclecloud/cis_3.0_oraclecloud.json @@ -2,7 +2,7 @@ "Framework": "CIS", "Name": "CIS Oracle Cloud Infrastructure Foundations Benchmark v3.0.0", "Version": "3.0", - "Provider": "OCI", + "Provider": "OracleCloud", "Description": "The CIS Oracle Cloud Infrastructure Foundations Benchmark provides prescriptive guidance for configuring security options for Oracle Cloud Infrastructure with an emphasis on foundational, testable, and architecture agnostic settings.", "Requirements": [ { diff --git a/prowler/config/config.py b/prowler/config/config.py index b8fbe91074..d925a37d31 100644 --- a/prowler/config/config.py +++ b/prowler/config/config.py @@ -33,7 +33,7 @@ class Provider(str, Enum): IAC = "iac" NHN = "nhn" MONGODBATLAS = "mongodbatlas" - OCI = "oci" + ORACLECLOUD = "oraclecloud" # Compliance diff --git a/prowler/lib/check/check.py b/prowler/lib/check/check.py index 0925c14925..d8f395d7ba 100644 --- a/prowler/lib/check/check.py +++ b/prowler/lib/check/check.py @@ -438,16 +438,8 @@ def execute_checks( service = check_name.split("_")[0] try: try: - # Map CLI provider names to directory names (for cases where they differ) - provider_directory_map = { - "oci": "oraclecloud", # OCI SDK conflict avoidance - } - provider_directory = provider_directory_map.get( - global_provider.type, global_provider.type - ) - # Import check module - check_module_path = f"prowler.providers.{provider_directory}.services.{service}.{check_name}.{check_name}" + check_module_path = f"prowler.providers.{global_provider.type}.services.{service}.{check_name}.{check_name}" lib = import_check(check_module_path) # Recover functions from check check_to_execute = getattr(lib, check_name) @@ -526,16 +518,8 @@ def execute_checks( ) try: try: - # Map CLI provider names to directory names (for cases where they differ) - provider_directory_map = { - "oci": "oraclecloud", # oci SDK conflict avoidance - } - provider_directory = provider_directory_map.get( - global_provider.type, global_provider.type - ) - # Import check module - check_module_path = f"prowler.providers.{provider_directory}.services.{service}.{check_name}.{check_name}" + check_module_path = f"prowler.providers.{global_provider.type}.services.{service}.{check_name}.{check_name}" lib = import_check(check_module_path) # Recover functions from check check_to_execute = getattr(lib, check_name) diff --git a/prowler/lib/check/utils.py b/prowler/lib/check/utils.py index 67dd5cda20..8cf37817c9 100644 --- a/prowler/lib/check/utils.py +++ b/prowler/lib/check/utils.py @@ -46,14 +46,8 @@ def recover_checks_from_provider( # List all available modules in the selected provider and service def list_modules(provider: str, service: str): - # Map CLI provider names to directory names (for cases where they differ) - provider_directory_map = { - "oci": "oraclecloud", # OCI SDK conflict avoidance - } - provider_directory = provider_directory_map.get(provider, provider) - # This module path requires the full path including "prowler." - module_path = f"prowler.providers.{provider_directory}.services" + module_path = f"prowler.providers.{provider}.services" if service: module_path += f".{service}" return walk_packages( diff --git a/prowler/lib/cli/parser.py b/prowler/lib/cli/parser.py index aaeda914bb..07327e5334 100644 --- a/prowler/lib/cli/parser.py +++ b/prowler/lib/cli/parser.py @@ -26,17 +26,17 @@ class ProwlerArgumentParser: self.parser = argparse.ArgumentParser( prog="prowler", formatter_class=RawTextHelpFormatter, - usage="prowler [-h] [--version] {aws,azure,gcp,kubernetes,m365,github,nhn,mongodbatlas,oci,dashboard,iac} ...", + usage="prowler [-h] [--version] {aws,azure,gcp,kubernetes,m365,github,nhn,mongodbatlas,oraclecloud,dashboard,iac} ...", epilog=""" Available Cloud Providers: - {aws,azure,gcp,kubernetes,m365,github,iac,llm,nhn,mongodbatlas,oci} + {aws,azure,gcp,kubernetes,m365,github,iac,llm,nhn,mongodbatlas,oraclecloud} aws AWS Provider azure Azure Provider gcp GCP Provider kubernetes Kubernetes Provider m365 Microsoft 365 Provider github GitHub Provider - oci Oracle Cloud Infrastructure Provider + oraclecloud Oracle Cloud Infrastructure Provider iac IaC Provider (Beta) llm LLM Provider (Beta) nhn NHN Provider (Unofficial) @@ -113,6 +113,9 @@ Detailed documentation at https://docs.prowler.com # Microsoft 365 elif sys.argv[1] == "microsoft365": sys.argv[1] = "m365" + # Oracle Cloud Infrastructure + elif sys.argv[1] == "oci": + sys.argv[1] = "oraclecloud" # Parse arguments args = self.parser.parse_args() diff --git a/prowler/lib/outputs/compliance/cis/cis_oci.py b/prowler/lib/outputs/compliance/cis/cis_oraclecloud.py similarity index 92% rename from prowler/lib/outputs/compliance/cis/cis_oci.py rename to prowler/lib/outputs/compliance/cis/cis_oraclecloud.py index 6d11bedbef..19e6e1d8c8 100644 --- a/prowler/lib/outputs/compliance/cis/cis_oci.py +++ b/prowler/lib/outputs/compliance/cis/cis_oraclecloud.py @@ -1,20 +1,20 @@ from prowler.config.config import timestamp from prowler.lib.check.compliance_models import Compliance -from prowler.lib.outputs.compliance.cis.models import OCICISModel +from prowler.lib.outputs.compliance.cis.models import OracleCloudCISModel from prowler.lib.outputs.compliance.compliance_output import ComplianceOutput from prowler.lib.outputs.finding import Finding -class OCICIS(ComplianceOutput): +class OracleCloudCIS(ComplianceOutput): """ - This class represents the OCI CIS compliance output. + This class represents the Oracle Cloud CIS compliance output. Attributes: - _data (list): A list to store transformed data from findings. - _file_descriptor (TextIOWrapper): A file descriptor to write data to a file. Methods: - - transform: Transforms findings into OCI CIS compliance format. + - transform: Transforms findings into Oracle Cloud CIS compliance format. """ def transform( @@ -24,7 +24,7 @@ class OCICIS(ComplianceOutput): compliance_name: str, ) -> None: """ - Transforms a list of findings into OCI CIS compliance format. + Transforms a list of findings into Oracle Cloud CIS compliance format. Parameters: - findings (list): A list of findings. @@ -40,7 +40,7 @@ class OCICIS(ComplianceOutput): for requirement in compliance.Requirements: if requirement.Id in finding_requirements: for attribute in requirement.Attributes: - compliance_row = OCICISModel( + compliance_row = OracleCloudCISModel( Provider=finding.provider, Description=compliance.Description, TenancyId=finding.account_uid, @@ -74,7 +74,7 @@ class OCICIS(ComplianceOutput): for requirement in compliance.Requirements: if not requirement.Checks: for attribute in requirement.Attributes: - compliance_row = OCICISModel( + compliance_row = OracleCloudCISModel( Provider=compliance.Provider.lower(), Description=compliance.Description, TenancyId="", diff --git a/prowler/lib/outputs/compliance/cis/models.py b/prowler/lib/outputs/compliance/cis/models.py index 3168a8c04c..6f3bb45c5f 100644 --- a/prowler/lib/outputs/compliance/cis/models.py +++ b/prowler/lib/outputs/compliance/cis/models.py @@ -207,9 +207,9 @@ class GithubCISModel(BaseModel): Name: str -class OCICISModel(BaseModel): +class OracleCloudCISModel(BaseModel): """ - OCICISModel generates a finding's output in OCI CIS Compliance format. + OracleCloudCISModel generates a finding's output in Oracle Cloud CIS Compliance format. """ Provider: str @@ -248,7 +248,7 @@ CIS_GCP = GCPCISModel CIS_Kubernetes = KubernetesCISModel CIS_M365 = M365CISModel CIS_Github = GithubCISModel -CIS_OCI = OCICISModel +CIS_OracleCloud = OracleCloudCISModel # TODO: Create a parent class for the common fields of CIS and have the specific classes from each provider to inherit from it. diff --git a/prowler/lib/outputs/finding.py b/prowler/lib/outputs/finding.py index 1a558fd11d..87db251156 100644 --- a/prowler/lib/outputs/finding.py +++ b/prowler/lib/outputs/finding.py @@ -330,7 +330,7 @@ class Finding(BaseModel): output_data["resource_uid"] = check_output.model output_data["region"] = check_output.model - elif provider.type == "oci": + elif provider.type == "oraclecloud": output_data["auth_method"] = ( f"Profile: {get_nested_attribute(provider, 'session.profile')}" ) @@ -418,7 +418,7 @@ class Finding(BaseModel): # For IaC, we don't have resource_line_range in the Finding model # It would need to be extracted from the resource metadata if needed finding.resource_line_range = "" # Set empty for compatibility - elif provider.type == "oci": + elif provider.type == "oraclecloud": finding.compartment_id = getattr(finding, "compartment_id", "") finding.check_metadata = CheckMetadata( diff --git a/prowler/lib/outputs/outputs.py b/prowler/lib/outputs/outputs.py index d7f1f6435a..11355ea5f7 100644 --- a/prowler/lib/outputs/outputs.py +++ b/prowler/lib/outputs/outputs.py @@ -28,7 +28,7 @@ def stdout_report(finding, color, verbose, status, fix): details = finding.check_metadata.CheckID if finding.check_metadata.Provider == "iac": details = finding.check_metadata.CheckID - if finding.check_metadata.Provider == "oci": + if finding.check_metadata.Provider == "oraclecloud": details = finding.region if (verbose or fix) and (not status or finding.status in status): diff --git a/prowler/lib/outputs/summary_table.py b/prowler/lib/outputs/summary_table.py index 03ca23453a..747bae1821 100644 --- a/prowler/lib/outputs/summary_table.py +++ b/prowler/lib/outputs/summary_table.py @@ -67,7 +67,7 @@ def display_summary_table( elif provider.type == "llm": entity_type = "LLM" audited_entities = provider.model - elif provider.type == "oci": + elif provider.type == "oraclecloud": entity_type = "Tenancy" audited_entities = ( provider.identity.tenancy_name diff --git a/prowler/lib/scan/scan.py b/prowler/lib/scan/scan.py index 062ea80738..61bc6dd684 100644 --- a/prowler/lib/scan/scan.py +++ b/prowler/lib/scan/scan.py @@ -351,16 +351,8 @@ class Scan: # Recover service from check name service = get_service_name_from_check_name(check_name) try: - # Map CLI provider names to directory names (for cases where they differ) - provider_directory_map = { - "oci": "oraclecloud", # OCI SDK conflict avoidance - } - provider_directory = provider_directory_map.get( - self._provider.type, self._provider.type - ) - # Import check module - check_module_path = f"prowler.providers.{provider_directory}.services.{service}.{check_name}.{check_name}" + check_module_path = f"prowler.providers.{self._provider.type}.services.{service}.{check_name}.{check_name}" lib = import_check(check_module_path) # Recover functions from check check_to_execute = getattr(lib, check_name) diff --git a/prowler/providers/common/arguments.py b/prowler/providers/common/arguments.py index f2f72cd481..f0af3a283c 100644 --- a/prowler/providers/common/arguments.py +++ b/prowler/providers/common/arguments.py @@ -16,15 +16,9 @@ def init_providers_parser(self): providers = Provider.get_available_providers() for provider in providers: try: - # Map CLI provider names to directory names (for cases where they differ) - provider_directory_map = { - "oci": "oraclecloud", # OCI SDK conflict avoidance - } - provider_directory = provider_directory_map.get(provider, provider) - getattr( import_module( - f"{providers_path}.{provider_directory}.{provider_arguments_lib_path}" + f"{providers_path}.{provider}.{provider_arguments_lib_path}" ), init_provider_arguments_function, )(self) @@ -38,18 +32,10 @@ def init_providers_parser(self): def validate_provider_arguments(arguments: Namespace) -> tuple[bool, str]: """validate_provider_arguments returns {True, "} if the provider arguments passed are valid and can be used together""" try: - # Map CLI provider names to directory names (for cases where they differ) - provider_directory_map = { - "oci": "oraclecloud", # OCI SDK conflict avoidance - } - provider_directory = provider_directory_map.get( - arguments.provider, arguments.provider - ) - # Provider function must be located at prowler.providers..lib.arguments.arguments.validate_arguments return getattr( import_module( - f"{providers_path}.{provider_directory}.{provider_arguments_lib_path}" + f"{providers_path}.{arguments.provider}.{provider_arguments_lib_path}" ), validate_provider_arguments_function, )(arguments) diff --git a/prowler/providers/common/provider.py b/prowler/providers/common/provider.py index 1f4493015b..c19d0c468e 100644 --- a/prowler/providers/common/provider.py +++ b/prowler/providers/common/provider.py @@ -146,24 +146,8 @@ class Provider(ABC): @staticmethod def init_global_provider(arguments: Namespace) -> None: try: - # Map CLI provider names to directory names (for cases where they differ) - provider_directory_map = { - "oci": "oraclecloud", # oci SDK conflict avoidance - } - # Map CLI provider names to provider file names (for cases where they differ) - provider_file_map = { - "oci": "oci", # oraclecloud directory but oci_provider.py file - } - - provider_directory = provider_directory_map.get( - arguments.provider, arguments.provider - ) - provider_file = provider_file_map.get( - arguments.provider, arguments.provider - ) - provider_class_path = ( - f"{providers_path}.{provider_directory}.{provider_file}_provider" + f"{providers_path}.{arguments.provider}.{arguments.provider}_provider" ) provider_class_name = f"{arguments.provider.capitalize()}Provider" provider_class = getattr( @@ -291,7 +275,7 @@ class Provider(ABC): mutelist_path=arguments.mutelist_file, fixer_config=fixer_config, ) - elif "oci" in provider_class_name.lower(): + elif "oraclecloud" in provider_class_name.lower(): provider_class( oci_config_file=arguments.oci_config_file, profile=arguments.profile, diff --git a/prowler/providers/oraclecloud/lib/arguments/arguments.py b/prowler/providers/oraclecloud/lib/arguments/arguments.py index bdbd6b7642..66971d0a58 100644 --- a/prowler/providers/oraclecloud/lib/arguments/arguments.py +++ b/prowler/providers/oraclecloud/lib/arguments/arguments.py @@ -5,9 +5,11 @@ from prowler.providers.oraclecloud.config import OCI_DEFAULT_CONFIG_FILE, OCI_RE def init_parser(self): - """Init the OCI Provider CLI parser""" + """Init the Oracle Cloud Infrastructure Provider CLI parser""" oci_parser = self.subparsers.add_parser( - "oci", parents=[self.common_providers_parser], help="OCI Provider" + "oraclecloud", + parents=[self.common_providers_parser], + help="Oracle Cloud Infrastructure Provider", ) # Config File Authentication Options @@ -109,15 +111,4 @@ def validate_arguments(arguments: Namespace) -> tuple[bool, str]: "Cannot use --use-instance-principal with --oci-config-file or --profile options", ) - # # Validate compartment OCIDs if provided - # if arguments.compartment_id: - # for compartment_id in arguments.compartment_id: - # if not OciProvider.validate_ocid(compartment_id, "compartment"): - # # Check if it's a tenancy OCID (root compartment) - # if not OciProvider.validate_ocid(compartment_id, "tenancy"): - # return ( - # False, - # f"Invalid compartment OCID: {compartment_id}", - # ) - return (True, "") diff --git a/prowler/providers/oraclecloud/lib/service/service.py b/prowler/providers/oraclecloud/lib/service/service.py index 7007eba384..971c1fe31f 100644 --- a/prowler/providers/oraclecloud/lib/service/service.py +++ b/prowler/providers/oraclecloud/lib/service/service.py @@ -1,7 +1,7 @@ from concurrent.futures import ThreadPoolExecutor, as_completed from prowler.lib.logger import logger -from prowler.providers.oraclecloud.oci_provider import OciProvider +from prowler.providers.oraclecloud.oraclecloud_provider import OraclecloudProvider MAX_WORKERS = 10 @@ -16,13 +16,13 @@ class OCIService: - Handles compartment traversal """ - def __init__(self, service: str, provider: OciProvider): + def __init__(self, service: str, provider: OraclecloudProvider): """ Initialize the OCIService base class. Args: service (str): The OCI service name (e.g., 'compute', 'object_storage'). - provider (OciProvider): The OCI provider instance. + provider (OraclecloudProvider): The Oracle Cloud Infrastructure provider instance. """ # Audit Information self.provider = provider diff --git a/prowler/providers/oraclecloud/oci_provider.py b/prowler/providers/oraclecloud/oraclecloud_provider.py similarity index 97% rename from prowler/providers/oraclecloud/oci_provider.py rename to prowler/providers/oraclecloud/oraclecloud_provider.py index 5735415386..08d654d580 100644 --- a/prowler/providers/oraclecloud/oci_provider.py +++ b/prowler/providers/oraclecloud/oraclecloud_provider.py @@ -40,9 +40,9 @@ from prowler.providers.oraclecloud.models import ( ) -class OciProvider(Provider): +class OraclecloudProvider(Provider): """ - OciProvider class is the main class for the OCI provider. + OraclecloudProvider class is the main class for the Oracle Cloud Infrastructure provider. This class is responsible for initializing the OCI provider, setting up the OCI session, validating the OCI credentials, getting the OCI identity, and managing compartments and regions. @@ -58,7 +58,7 @@ class OciProvider(Provider): audit_metadata (Audit_Metadata): The audit metadata. """ - _type: str = "oci" + _type: str = "oraclecloud" _identity: OCIIdentityInfo _session: OCISession _audit_config: dict @@ -118,11 +118,11 @@ class OciProvider(Provider): or - export OCI_CLI_AUTH=instance_principal (for instance principal) - To create a new OCI provider object: - - oci = OciProvider() - - oci = OciProvider(profile="profile_name") - - oci = OciProvider(oci_config_file="/path/to/config") - - oci = OciProvider(use_instance_principal=True) - - oci = OciProvider(user="ocid1...", fingerprint="...", key_content="...", tenancy="ocid1...", region="us-ashburn-1") + - oci = OraclecloudProvider() + - oci = OraclecloudProvider(profile="profile_name") + - oci = OraclecloudProvider(oci_config_file="/path/to/config") + - oci = OraclecloudProvider(use_instance_principal=True) + - oci = OraclecloudProvider(user="ocid1...", fingerprint="...", key_content="...", tenancy="ocid1...", region="us-ashburn-1") """ logger.info("Initializing OCI provider ...") @@ -439,7 +439,7 @@ class OciProvider(Provider): ) # Validate tenancy OCID format - if not OciProvider.validate_ocid(tenancy_id, "tenancy"): + if not OraclecloudProvider.validate_ocid(tenancy_id, "tenancy"): raise OCIInvalidTenancyError( file=pathlib.Path(__file__).name, message=f"Invalid tenancy OCID format: {tenancy_id}", @@ -817,11 +817,11 @@ class OciProvider(Provider): Exception: If there is an unexpected error. Examples: - >>> OciProvider.test_connection(profile="DEFAULT", raise_on_exception=False) + >>> OraclecloudProvider.test_connection(profile="DEFAULT", raise_on_exception=False) Connection(is_connected=True, Error=None) - >>> OciProvider.test_connection(use_instance_principal=True, raise_on_exception=False) + >>> OraclecloudProvider.test_connection(use_instance_principal=True, raise_on_exception=False) Connection(is_connected=True, Error=None) - >>> OciProvider.test_connection( + >>> OraclecloudProvider.test_connection( user="ocid1.user.oc1..aaaaaa...", fingerprint="12:34:56:78:...", key_content="base64_encoded_key", @@ -890,13 +890,13 @@ class OciProvider(Provider): session = OCISession(config=config, signer=None, profile=None) else: # Use traditional config file or instance principal authentication - session = OciProvider.setup_session( + session = OraclecloudProvider.setup_session( oci_config_file=oci_config_file, profile=profile, use_instance_principal=use_instance_principal, ) - identity = OciProvider.set_identity( + identity = OraclecloudProvider.set_identity( session=session, region=region, ) @@ -1032,7 +1032,7 @@ class OciProvider(Provider): set: A set of region names. Example: - >>> OciProvider.get_regions() + >>> OraclecloudProvider.get_regions() {"us-ashburn-1", "us-phoenix-1", ...} """ return set(OCI_REGIONS.keys()) diff --git a/prowler/providers/oraclecloud/services/analytics/analytics_instance_access_restricted/analytics_instance_access_restricted.metadata.json b/prowler/providers/oraclecloud/services/analytics/analytics_instance_access_restricted/analytics_instance_access_restricted.metadata.json index e456efe559..17828fc2c4 100644 --- a/prowler/providers/oraclecloud/services/analytics/analytics_instance_access_restricted/analytics_instance_access_restricted.metadata.json +++ b/prowler/providers/oraclecloud/services/analytics/analytics_instance_access_restricted/analytics_instance_access_restricted.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "analytics_instance_access_restricted", "CheckTitle": "Ensure Oracle Analytics Cloud (OAC) access is restricted to allowed sources or deployed within a Virtual Cloud Network", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/audit/audit_log_retention_period_365_days/audit_log_retention_period_365_days.metadata.json b/prowler/providers/oraclecloud/services/audit/audit_log_retention_period_365_days/audit_log_retention_period_365_days.metadata.json index 9089dff880..c31bcbdd02 100644 --- a/prowler/providers/oraclecloud/services/audit/audit_log_retention_period_365_days/audit_log_retention_period_365_days.metadata.json +++ b/prowler/providers/oraclecloud/services/audit/audit_log_retention_period_365_days/audit_log_retention_period_365_days.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "audit_log_retention_period_365_days", "CheckTitle": "Ensure audit log retention period is set to 365 days or greater", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/blockstorage/blockstorage_block_volume_encrypted_with_cmk/blockstorage_block_volume_encrypted_with_cmk.metadata.json b/prowler/providers/oraclecloud/services/blockstorage/blockstorage_block_volume_encrypted_with_cmk/blockstorage_block_volume_encrypted_with_cmk.metadata.json index bfde317c9d..741f9f731c 100644 --- a/prowler/providers/oraclecloud/services/blockstorage/blockstorage_block_volume_encrypted_with_cmk/blockstorage_block_volume_encrypted_with_cmk.metadata.json +++ b/prowler/providers/oraclecloud/services/blockstorage/blockstorage_block_volume_encrypted_with_cmk/blockstorage_block_volume_encrypted_with_cmk.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "blockstorage_block_volume_encrypted_with_cmk", "CheckTitle": "Ensure Block Volumes are encrypted with Customer Managed Keys", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/blockstorage/blockstorage_boot_volume_encrypted_with_cmk/blockstorage_boot_volume_encrypted_with_cmk.metadata.json b/prowler/providers/oraclecloud/services/blockstorage/blockstorage_boot_volume_encrypted_with_cmk/blockstorage_boot_volume_encrypted_with_cmk.metadata.json index 553b9c6ae0..638ce51d01 100644 --- a/prowler/providers/oraclecloud/services/blockstorage/blockstorage_boot_volume_encrypted_with_cmk/blockstorage_boot_volume_encrypted_with_cmk.metadata.json +++ b/prowler/providers/oraclecloud/services/blockstorage/blockstorage_boot_volume_encrypted_with_cmk/blockstorage_boot_volume_encrypted_with_cmk.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "blockstorage_boot_volume_encrypted_with_cmk", "CheckTitle": "Ensure Boot Volumes are encrypted with Customer Managed Key", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/cloudguard/cloudguard_enabled/cloudguard_enabled.metadata.json b/prowler/providers/oraclecloud/services/cloudguard/cloudguard_enabled/cloudguard_enabled.metadata.json index 09a09d3f1e..7e0722f9a1 100644 --- a/prowler/providers/oraclecloud/services/cloudguard/cloudguard_enabled/cloudguard_enabled.metadata.json +++ b/prowler/providers/oraclecloud/services/cloudguard/cloudguard_enabled/cloudguard_enabled.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "cloudguard_enabled", "CheckTitle": "Ensure Cloud Guard is enabled in the root compartment of the tenancy", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/compute/compute_instance_in_transit_encryption_enabled/compute_instance_in_transit_encryption_enabled.metadata.json b/prowler/providers/oraclecloud/services/compute/compute_instance_in_transit_encryption_enabled/compute_instance_in_transit_encryption_enabled.metadata.json index 06af08544e..cd6d9302e0 100644 --- a/prowler/providers/oraclecloud/services/compute/compute_instance_in_transit_encryption_enabled/compute_instance_in_transit_encryption_enabled.metadata.json +++ b/prowler/providers/oraclecloud/services/compute/compute_instance_in_transit_encryption_enabled/compute_instance_in_transit_encryption_enabled.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "compute_instance_in_transit_encryption_enabled", "CheckTitle": "Ensure In-transit Encryption is enabled on Compute Instance", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/compute/compute_instance_legacy_metadata_endpoint_disabled/compute_instance_legacy_metadata_endpoint_disabled.metadata.json b/prowler/providers/oraclecloud/services/compute/compute_instance_legacy_metadata_endpoint_disabled/compute_instance_legacy_metadata_endpoint_disabled.metadata.json index 58162d2587..c2a525e0ad 100644 --- a/prowler/providers/oraclecloud/services/compute/compute_instance_legacy_metadata_endpoint_disabled/compute_instance_legacy_metadata_endpoint_disabled.metadata.json +++ b/prowler/providers/oraclecloud/services/compute/compute_instance_legacy_metadata_endpoint_disabled/compute_instance_legacy_metadata_endpoint_disabled.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "compute_instance_legacy_metadata_endpoint_disabled", "CheckTitle": "Ensure Compute Instance Legacy Metadata service endpoint is disabled", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/compute/compute_instance_secure_boot_enabled/compute_instance_secure_boot_enabled.metadata.json b/prowler/providers/oraclecloud/services/compute/compute_instance_secure_boot_enabled/compute_instance_secure_boot_enabled.metadata.json index 1ecdf4de16..ef459a15f8 100644 --- a/prowler/providers/oraclecloud/services/compute/compute_instance_secure_boot_enabled/compute_instance_secure_boot_enabled.metadata.json +++ b/prowler/providers/oraclecloud/services/compute/compute_instance_secure_boot_enabled/compute_instance_secure_boot_enabled.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "compute_instance_secure_boot_enabled", "CheckTitle": "Ensure Secure Boot is enabled on Compute Instance", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/database/database_autonomous_database_access_restricted/database_autonomous_database_access_restricted.metadata.json b/prowler/providers/oraclecloud/services/database/database_autonomous_database_access_restricted/database_autonomous_database_access_restricted.metadata.json index ced824cc2a..f2fd7a600f 100644 --- a/prowler/providers/oraclecloud/services/database/database_autonomous_database_access_restricted/database_autonomous_database_access_restricted.metadata.json +++ b/prowler/providers/oraclecloud/services/database/database_autonomous_database_access_restricted/database_autonomous_database_access_restricted.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "database_autonomous_database_access_restricted", "CheckTitle": "Ensure Oracle Autonomous Shared Database (ADB) access is restricted or deployed within a VCN", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/events/events_notification_topic_and_subscription_exists/events_notification_topic_and_subscription_exists.metadata.json b/prowler/providers/oraclecloud/services/events/events_notification_topic_and_subscription_exists/events_notification_topic_and_subscription_exists.metadata.json index d07852ddd7..aeea44d734 100644 --- a/prowler/providers/oraclecloud/services/events/events_notification_topic_and_subscription_exists/events_notification_topic_and_subscription_exists.metadata.json +++ b/prowler/providers/oraclecloud/services/events/events_notification_topic_and_subscription_exists/events_notification_topic_and_subscription_exists.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "events_notification_topic_and_subscription_exists", "CheckTitle": "Create at least one notification topic and subscription to receive monitoring alerts", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/events/events_rule_cloudguard_problems/events_rule_cloudguard_problems.metadata.json b/prowler/providers/oraclecloud/services/events/events_rule_cloudguard_problems/events_rule_cloudguard_problems.metadata.json index db5abd08e7..17285acece 100644 --- a/prowler/providers/oraclecloud/services/events/events_rule_cloudguard_problems/events_rule_cloudguard_problems.metadata.json +++ b/prowler/providers/oraclecloud/services/events/events_rule_cloudguard_problems/events_rule_cloudguard_problems.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "events_rule_cloudguard_problems", "CheckTitle": "Ensure a notification is configured for Oracle Cloud Guard problems detected", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/events/events_rule_iam_group_changes/events_rule_iam_group_changes.metadata.json b/prowler/providers/oraclecloud/services/events/events_rule_iam_group_changes/events_rule_iam_group_changes.metadata.json index a871956a9d..16840d2477 100644 --- a/prowler/providers/oraclecloud/services/events/events_rule_iam_group_changes/events_rule_iam_group_changes.metadata.json +++ b/prowler/providers/oraclecloud/services/events/events_rule_iam_group_changes/events_rule_iam_group_changes.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "events_rule_iam_group_changes", "CheckTitle": "Ensure a notification is configured for IAM group changes", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/events/events_rule_iam_policy_changes/events_rule_iam_policy_changes.metadata.json b/prowler/providers/oraclecloud/services/events/events_rule_iam_policy_changes/events_rule_iam_policy_changes.metadata.json index 05b9553b7d..b2251abce9 100644 --- a/prowler/providers/oraclecloud/services/events/events_rule_iam_policy_changes/events_rule_iam_policy_changes.metadata.json +++ b/prowler/providers/oraclecloud/services/events/events_rule_iam_policy_changes/events_rule_iam_policy_changes.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "events_rule_iam_policy_changes", "CheckTitle": "Ensure a notification is configured for IAM policy changes", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/events/events_rule_identity_provider_changes/events_rule_identity_provider_changes.metadata.json b/prowler/providers/oraclecloud/services/events/events_rule_identity_provider_changes/events_rule_identity_provider_changes.metadata.json index e23e26f18e..b5cbf2990d 100644 --- a/prowler/providers/oraclecloud/services/events/events_rule_identity_provider_changes/events_rule_identity_provider_changes.metadata.json +++ b/prowler/providers/oraclecloud/services/events/events_rule_identity_provider_changes/events_rule_identity_provider_changes.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "events_rule_identity_provider_changes", "CheckTitle": "Ensure a notification is configured for Identity Provider changes", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/events/events_rule_idp_group_mapping_changes/events_rule_idp_group_mapping_changes.metadata.json b/prowler/providers/oraclecloud/services/events/events_rule_idp_group_mapping_changes/events_rule_idp_group_mapping_changes.metadata.json index ffe8b65901..4869f2330a 100644 --- a/prowler/providers/oraclecloud/services/events/events_rule_idp_group_mapping_changes/events_rule_idp_group_mapping_changes.metadata.json +++ b/prowler/providers/oraclecloud/services/events/events_rule_idp_group_mapping_changes/events_rule_idp_group_mapping_changes.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "events_rule_idp_group_mapping_changes", "CheckTitle": "Ensure a notification is configured for IdP group mapping changes", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/events/events_rule_local_user_authentication/events_rule_local_user_authentication.metadata.json b/prowler/providers/oraclecloud/services/events/events_rule_local_user_authentication/events_rule_local_user_authentication.metadata.json index 6a022932ac..4225e5c028 100644 --- a/prowler/providers/oraclecloud/services/events/events_rule_local_user_authentication/events_rule_local_user_authentication.metadata.json +++ b/prowler/providers/oraclecloud/services/events/events_rule_local_user_authentication/events_rule_local_user_authentication.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "events_rule_local_user_authentication", "CheckTitle": "Ensure a notification is configured for Local OCI User Authentication", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/events/events_rule_network_gateway_changes/events_rule_network_gateway_changes.metadata.json b/prowler/providers/oraclecloud/services/events/events_rule_network_gateway_changes/events_rule_network_gateway_changes.metadata.json index 11433e77f9..bb3461a66c 100644 --- a/prowler/providers/oraclecloud/services/events/events_rule_network_gateway_changes/events_rule_network_gateway_changes.metadata.json +++ b/prowler/providers/oraclecloud/services/events/events_rule_network_gateway_changes/events_rule_network_gateway_changes.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "events_rule_network_gateway_changes", "CheckTitle": "Ensure a notification is configured for changes to network gateways", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/events/events_rule_network_security_group_changes/events_rule_network_security_group_changes.metadata.json b/prowler/providers/oraclecloud/services/events/events_rule_network_security_group_changes/events_rule_network_security_group_changes.metadata.json index 6fba97f5c1..abf62a726f 100644 --- a/prowler/providers/oraclecloud/services/events/events_rule_network_security_group_changes/events_rule_network_security_group_changes.metadata.json +++ b/prowler/providers/oraclecloud/services/events/events_rule_network_security_group_changes/events_rule_network_security_group_changes.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "events_rule_network_security_group_changes", "CheckTitle": "Ensure a notification is configured for network security group changes", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/events/events_rule_route_table_changes/events_rule_route_table_changes.metadata.json b/prowler/providers/oraclecloud/services/events/events_rule_route_table_changes/events_rule_route_table_changes.metadata.json index 8653611cf4..aa5f454e5c 100644 --- a/prowler/providers/oraclecloud/services/events/events_rule_route_table_changes/events_rule_route_table_changes.metadata.json +++ b/prowler/providers/oraclecloud/services/events/events_rule_route_table_changes/events_rule_route_table_changes.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "events_rule_route_table_changes", "CheckTitle": "Ensure a notification is configured for changes to route tables", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/events/events_rule_security_list_changes/events_rule_security_list_changes.metadata.json b/prowler/providers/oraclecloud/services/events/events_rule_security_list_changes/events_rule_security_list_changes.metadata.json index f7e944d0fd..2a35524632 100644 --- a/prowler/providers/oraclecloud/services/events/events_rule_security_list_changes/events_rule_security_list_changes.metadata.json +++ b/prowler/providers/oraclecloud/services/events/events_rule_security_list_changes/events_rule_security_list_changes.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "events_rule_security_list_changes", "CheckTitle": "Ensure a notification is configured for security list changes", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/events/events_rule_user_changes/events_rule_user_changes.metadata.json b/prowler/providers/oraclecloud/services/events/events_rule_user_changes/events_rule_user_changes.metadata.json index a0e23329e3..206dfd0136 100644 --- a/prowler/providers/oraclecloud/services/events/events_rule_user_changes/events_rule_user_changes.metadata.json +++ b/prowler/providers/oraclecloud/services/events/events_rule_user_changes/events_rule_user_changes.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "events_rule_user_changes", "CheckTitle": "Ensure a notification is configured for user changes", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/events/events_rule_vcn_changes/events_rule_vcn_changes.metadata.json b/prowler/providers/oraclecloud/services/events/events_rule_vcn_changes/events_rule_vcn_changes.metadata.json index 29d311d283..cf3c71a379 100644 --- a/prowler/providers/oraclecloud/services/events/events_rule_vcn_changes/events_rule_vcn_changes.metadata.json +++ b/prowler/providers/oraclecloud/services/events/events_rule_vcn_changes/events_rule_vcn_changes.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "events_rule_vcn_changes", "CheckTitle": "Ensure a notification is configured for VCN changes", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/filestorage/filestorage_file_system_encrypted_with_cmk/filestorage_file_system_encrypted_with_cmk.metadata.json b/prowler/providers/oraclecloud/services/filestorage/filestorage_file_system_encrypted_with_cmk/filestorage_file_system_encrypted_with_cmk.metadata.json index 9fd7be5782..41848707ba 100644 --- a/prowler/providers/oraclecloud/services/filestorage/filestorage_file_system_encrypted_with_cmk/filestorage_file_system_encrypted_with_cmk.metadata.json +++ b/prowler/providers/oraclecloud/services/filestorage/filestorage_file_system_encrypted_with_cmk/filestorage_file_system_encrypted_with_cmk.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "filestorage_file_system_encrypted_with_cmk", "CheckTitle": "Ensure File Storage Systems are encrypted with Customer Managed Keys", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/identity/identity_iam_admins_cannot_update_tenancy_admins/identity_iam_admins_cannot_update_tenancy_admins.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_iam_admins_cannot_update_tenancy_admins/identity_iam_admins_cannot_update_tenancy_admins.metadata.json index 4e196d701c..9d4ec0bf26 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_iam_admins_cannot_update_tenancy_admins/identity_iam_admins_cannot_update_tenancy_admins.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_iam_admins_cannot_update_tenancy_admins/identity_iam_admins_cannot_update_tenancy_admins.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_iam_admins_cannot_update_tenancy_admins", "CheckTitle": "Ensure IAM administrators cannot update tenancy Administrators group", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/identity/identity_instance_principal_used/identity_instance_principal_used.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_instance_principal_used/identity_instance_principal_used.metadata.json index 8e79ed8f9e..8c7e03d5c7 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_instance_principal_used/identity_instance_principal_used.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_instance_principal_used/identity_instance_principal_used.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_instance_principal_used", "CheckTitle": "Ensure Instance Principal authentication is used for OCI instances, OCI Cloud Databases and OCI Functions to access OCI resources", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/identity/identity_no_resources_in_root_compartment/identity_no_resources_in_root_compartment.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_no_resources_in_root_compartment/identity_no_resources_in_root_compartment.metadata.json index bcfd9b6a7a..510e4ddaf8 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_no_resources_in_root_compartment/identity_no_resources_in_root_compartment.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_no_resources_in_root_compartment/identity_no_resources_in_root_compartment.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_no_resources_in_root_compartment", "CheckTitle": "Ensure no resources are created in the root compartment", "CheckType": [], diff --git a/prowler/providers/oraclecloud/services/identity/identity_non_root_compartment_exists/identity_non_root_compartment_exists.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_non_root_compartment_exists/identity_non_root_compartment_exists.metadata.json index b8dad7067d..41e0714daf 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_non_root_compartment_exists/identity_non_root_compartment_exists.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_non_root_compartment_exists/identity_non_root_compartment_exists.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_non_root_compartment_exists", "CheckTitle": "Create at least one non-root compartment in your tenancy to store cloud resources", "CheckType": [], diff --git a/prowler/providers/oraclecloud/services/identity/identity_password_policy_expires_within_365_days/identity_password_policy_expires_within_365_days.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_password_policy_expires_within_365_days/identity_password_policy_expires_within_365_days.metadata.json index 13837295e8..ae4f3f810f 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_password_policy_expires_within_365_days/identity_password_policy_expires_within_365_days.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_password_policy_expires_within_365_days/identity_password_policy_expires_within_365_days.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_password_policy_expires_within_365_days", "CheckTitle": "Ensure IAM password policy expires passwords within 365 days", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/identity/identity_password_policy_minimum_length_14/identity_password_policy_minimum_length_14.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_password_policy_minimum_length_14/identity_password_policy_minimum_length_14.metadata.json index f8e75d073a..b279d9e162 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_password_policy_minimum_length_14/identity_password_policy_minimum_length_14.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_password_policy_minimum_length_14/identity_password_policy_minimum_length_14.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_password_policy_minimum_length_14", "CheckTitle": "Ensure IAM password policy requires minimum length of 14 or greater", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/identity/identity_password_policy_prevents_reuse/identity_password_policy_prevents_reuse.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_password_policy_prevents_reuse/identity_password_policy_prevents_reuse.metadata.json index 66d0fd9e42..552e8e8608 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_password_policy_prevents_reuse/identity_password_policy_prevents_reuse.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_password_policy_prevents_reuse/identity_password_policy_prevents_reuse.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_password_policy_prevents_reuse", "CheckTitle": "Ensure IAM password policy prevents password reuse", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/identity/identity_service_level_admins_exist/identity_service_level_admins_exist.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_service_level_admins_exist/identity_service_level_admins_exist.metadata.json index 8c39459df8..156307f269 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_service_level_admins_exist/identity_service_level_admins_exist.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_service_level_admins_exist/identity_service_level_admins_exist.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_service_level_admins_exist", "CheckTitle": "Ensure service level admins are created to manage resources of particular service", "CheckType": [], diff --git a/prowler/providers/oraclecloud/services/identity/identity_tenancy_admin_permissions_limited/identity_tenancy_admin_permissions_limited.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_tenancy_admin_permissions_limited/identity_tenancy_admin_permissions_limited.metadata.json index 0e78b3d72b..48e008db1f 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_tenancy_admin_permissions_limited/identity_tenancy_admin_permissions_limited.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_tenancy_admin_permissions_limited/identity_tenancy_admin_permissions_limited.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_tenancy_admin_permissions_limited", "CheckTitle": "Ensure permissions on all resources are given only to the tenancy administrator group", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/identity/identity_tenancy_admin_users_no_api_keys/identity_tenancy_admin_users_no_api_keys.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_tenancy_admin_users_no_api_keys/identity_tenancy_admin_users_no_api_keys.metadata.json index cf915adba5..daa831f862 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_tenancy_admin_users_no_api_keys/identity_tenancy_admin_users_no_api_keys.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_tenancy_admin_users_no_api_keys/identity_tenancy_admin_users_no_api_keys.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_tenancy_admin_users_no_api_keys", "CheckTitle": "Ensure API keys are not created for tenancy administrator users", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/identity/identity_user_api_keys_rotated_90_days/identity_user_api_keys_rotated_90_days.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_user_api_keys_rotated_90_days/identity_user_api_keys_rotated_90_days.metadata.json index 30d6354fcd..0621d213af 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_user_api_keys_rotated_90_days/identity_user_api_keys_rotated_90_days.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_user_api_keys_rotated_90_days/identity_user_api_keys_rotated_90_days.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_user_api_keys_rotated_90_days", "CheckTitle": "Ensure user API keys rotate within 90 days or less", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/identity/identity_user_auth_tokens_rotated_90_days/identity_user_auth_tokens_rotated_90_days.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_user_auth_tokens_rotated_90_days/identity_user_auth_tokens_rotated_90_days.metadata.json index 2863fa21fb..f0f170f1db 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_user_auth_tokens_rotated_90_days/identity_user_auth_tokens_rotated_90_days.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_user_auth_tokens_rotated_90_days/identity_user_auth_tokens_rotated_90_days.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_user_auth_tokens_rotated_90_days", "CheckTitle": "Ensure user auth tokens rotate within 90 days or less", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/identity/identity_user_customer_secret_keys_rotated_90_days/identity_user_customer_secret_keys_rotated_90_days.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_user_customer_secret_keys_rotated_90_days/identity_user_customer_secret_keys_rotated_90_days.metadata.json index bc98570d89..9d6da4c7b5 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_user_customer_secret_keys_rotated_90_days/identity_user_customer_secret_keys_rotated_90_days.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_user_customer_secret_keys_rotated_90_days/identity_user_customer_secret_keys_rotated_90_days.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_user_customer_secret_keys_rotated_90_days", "CheckTitle": "Ensure user customer secret keys rotate within 90 days or less", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/identity/identity_user_db_passwords_rotated_90_days/identity_user_db_passwords_rotated_90_days.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_user_db_passwords_rotated_90_days/identity_user_db_passwords_rotated_90_days.metadata.json index 8f0e103a4d..0aa3e5d12c 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_user_db_passwords_rotated_90_days/identity_user_db_passwords_rotated_90_days.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_user_db_passwords_rotated_90_days/identity_user_db_passwords_rotated_90_days.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_user_db_passwords_rotated_90_days", "CheckTitle": "Ensure user IAM Database Passwords rotate within 90 days", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/identity/identity_user_mfa_enabled_console_access/identity_user_mfa_enabled_console_access.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_user_mfa_enabled_console_access/identity_user_mfa_enabled_console_access.metadata.json index cd3bf404b4..283fe65412 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_user_mfa_enabled_console_access/identity_user_mfa_enabled_console_access.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_user_mfa_enabled_console_access/identity_user_mfa_enabled_console_access.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_user_mfa_enabled_console_access", "CheckTitle": "Ensure MFA is enabled for all users with a console password", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/identity/identity_user_valid_email_address/identity_user_valid_email_address.metadata.json b/prowler/providers/oraclecloud/services/identity/identity_user_valid_email_address/identity_user_valid_email_address.metadata.json index 73dd2e309e..c1af4c37b2 100644 --- a/prowler/providers/oraclecloud/services/identity/identity_user_valid_email_address/identity_user_valid_email_address.metadata.json +++ b/prowler/providers/oraclecloud/services/identity/identity_user_valid_email_address/identity_user_valid_email_address.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "identity_user_valid_email_address", "CheckTitle": "Ensure all OCI IAM user accounts have a valid and current email address", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/integration/integration_instance_access_restricted/integration_instance_access_restricted.metadata.json b/prowler/providers/oraclecloud/services/integration/integration_instance_access_restricted/integration_instance_access_restricted.metadata.json index f73a4625a8..20673e5f60 100644 --- a/prowler/providers/oraclecloud/services/integration/integration_instance_access_restricted/integration_instance_access_restricted.metadata.json +++ b/prowler/providers/oraclecloud/services/integration/integration_instance_access_restricted/integration_instance_access_restricted.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "integration_instance_access_restricted", "CheckTitle": "Ensure Oracle Integration Cloud (OIC) access is restricted to allowed sources", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/kms/kms_key_rotation_enabled/kms_key_rotation_enabled.metadata.json b/prowler/providers/oraclecloud/services/kms/kms_key_rotation_enabled/kms_key_rotation_enabled.metadata.json index 036d889011..2c6cfe47a8 100644 --- a/prowler/providers/oraclecloud/services/kms/kms_key_rotation_enabled/kms_key_rotation_enabled.metadata.json +++ b/prowler/providers/oraclecloud/services/kms/kms_key_rotation_enabled/kms_key_rotation_enabled.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "kms_key_rotation_enabled", "CheckTitle": "Ensure customer created Customer Managed Key (CMK) is rotated at least annually", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/network/network_default_security_list_restricts_traffic/network_default_security_list_restricts_traffic.metadata.json b/prowler/providers/oraclecloud/services/network/network_default_security_list_restricts_traffic/network_default_security_list_restricts_traffic.metadata.json index 71a2e69c2b..b7c43eedc3 100644 --- a/prowler/providers/oraclecloud/services/network/network_default_security_list_restricts_traffic/network_default_security_list_restricts_traffic.metadata.json +++ b/prowler/providers/oraclecloud/services/network/network_default_security_list_restricts_traffic/network_default_security_list_restricts_traffic.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "network_default_security_list_restricts_traffic", "CheckTitle": "Ensure the default security list of every VCN restricts all traffic except ICMP", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_rdp_port/network_security_group_ingress_from_internet_to_rdp_port.metadata.json b/prowler/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_rdp_port/network_security_group_ingress_from_internet_to_rdp_port.metadata.json index 0b0016c0f7..b95bd0db6a 100644 --- a/prowler/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_rdp_port/network_security_group_ingress_from_internet_to_rdp_port.metadata.json +++ b/prowler/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_rdp_port/network_security_group_ingress_from_internet_to_rdp_port.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "network_security_group_ingress_from_internet_to_rdp_port", "CheckTitle": "Ensure no network security groups allow ingress from 0.0.0.0/0 to port 3389", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_ssh_port/network_security_group_ingress_from_internet_to_ssh_port.metadata.json b/prowler/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_ssh_port/network_security_group_ingress_from_internet_to_ssh_port.metadata.json index 05068d7c3b..b64e1ad5a1 100644 --- a/prowler/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_ssh_port/network_security_group_ingress_from_internet_to_ssh_port.metadata.json +++ b/prowler/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_ssh_port/network_security_group_ingress_from_internet_to_ssh_port.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "network_security_group_ingress_from_internet_to_ssh_port", "CheckTitle": "Ensure no network security groups allow ingress from 0.0.0.0/0 to port 22", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_rdp_port/network_security_list_ingress_from_internet_to_rdp_port.metadata.json b/prowler/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_rdp_port/network_security_list_ingress_from_internet_to_rdp_port.metadata.json index f6a8650a97..064a1a9986 100644 --- a/prowler/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_rdp_port/network_security_list_ingress_from_internet_to_rdp_port.metadata.json +++ b/prowler/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_rdp_port/network_security_list_ingress_from_internet_to_rdp_port.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "network_security_list_ingress_from_internet_to_rdp_port", "CheckTitle": "Ensure no security lists allow ingress from 0.0.0.0/0 to port 3389", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_ssh_port/network_security_list_ingress_from_internet_to_ssh_port.metadata.json b/prowler/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_ssh_port/network_security_list_ingress_from_internet_to_ssh_port.metadata.json index b380635a94..c94d6d85c5 100644 --- a/prowler/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_ssh_port/network_security_list_ingress_from_internet_to_ssh_port.metadata.json +++ b/prowler/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_ssh_port/network_security_list_ingress_from_internet_to_ssh_port.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "network_security_list_ingress_from_internet_to_ssh_port", "CheckTitle": "Ensure no security lists allow ingress from 0.0.0.0/0 to port 22", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/network/network_vcn_subnet_flow_logs_enabled/network_vcn_subnet_flow_logs_enabled.metadata.json b/prowler/providers/oraclecloud/services/network/network_vcn_subnet_flow_logs_enabled/network_vcn_subnet_flow_logs_enabled.metadata.json index 4fa542a15c..7abd9c44be 100644 --- a/prowler/providers/oraclecloud/services/network/network_vcn_subnet_flow_logs_enabled/network_vcn_subnet_flow_logs_enabled.metadata.json +++ b/prowler/providers/oraclecloud/services/network/network_vcn_subnet_flow_logs_enabled/network_vcn_subnet_flow_logs_enabled.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "network_vcn_subnet_flow_logs_enabled", "CheckTitle": "Ensure VCN flow logging is enabled for all subnets", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_encrypted_with_cmk/objectstorage_bucket_encrypted_with_cmk.metadata.json b/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_encrypted_with_cmk/objectstorage_bucket_encrypted_with_cmk.metadata.json index f01fd3e4bf..2f58776f38 100644 --- a/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_encrypted_with_cmk/objectstorage_bucket_encrypted_with_cmk.metadata.json +++ b/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_encrypted_with_cmk/objectstorage_bucket_encrypted_with_cmk.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "objectstorage_bucket_encrypted_with_cmk", "CheckTitle": "Ensure Object Storage Buckets are encrypted with a Customer Managed Key (CMK)", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_logging_enabled/objectstorage_bucket_logging_enabled.metadata.json b/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_logging_enabled/objectstorage_bucket_logging_enabled.metadata.json index 94ebcd4be3..73f77bcdce 100644 --- a/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_logging_enabled/objectstorage_bucket_logging_enabled.metadata.json +++ b/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_logging_enabled/objectstorage_bucket_logging_enabled.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "objectstorage_bucket_logging_enabled", "CheckTitle": "Ensure write level Object Storage logging is enabled for all buckets", "CheckType": [], diff --git a/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_not_publicly_accessible/objectstorage_bucket_not_publicly_accessible.metadata.json b/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_not_publicly_accessible/objectstorage_bucket_not_publicly_accessible.metadata.json index 2d9b38be45..433cc3b4a2 100644 --- a/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_not_publicly_accessible/objectstorage_bucket_not_publicly_accessible.metadata.json +++ b/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_not_publicly_accessible/objectstorage_bucket_not_publicly_accessible.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "objectstorage_bucket_not_publicly_accessible", "CheckTitle": "Ensure no Object Storage buckets are publicly visible", "CheckType": [ diff --git a/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_versioning_enabled/objectstorage_bucket_versioning_enabled.metadata.json b/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_versioning_enabled/objectstorage_bucket_versioning_enabled.metadata.json index 3ec7217d16..72df7b3e29 100644 --- a/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_versioning_enabled/objectstorage_bucket_versioning_enabled.metadata.json +++ b/prowler/providers/oraclecloud/services/objectstorage/objectstorage_bucket_versioning_enabled/objectstorage_bucket_versioning_enabled.metadata.json @@ -1,5 +1,5 @@ { - "Provider": "oci", + "Provider": "oraclecloud", "CheckID": "objectstorage_bucket_versioning_enabled", "CheckTitle": "Ensure Versioning is Enabled for Object Storage Buckets", "CheckType": [ diff --git a/tests/lib/cli/parser_test.py b/tests/lib/cli/parser_test.py index 9d04e050d1..c645a7b128 100644 --- a/tests/lib/cli/parser_test.py +++ b/tests/lib/cli/parser_test.py @@ -17,7 +17,7 @@ prowler_command = "prowler" # capsys # https://docs.pytest.org/en/7.1.x/how-to/capture-stdout-stderr.html -prowler_default_usage_error = "usage: prowler [-h] [--version] {aws,azure,gcp,kubernetes,m365,github,nhn,mongodbatlas,oci,dashboard,iac} ..." +prowler_default_usage_error = "usage: prowler [-h] [--version] {aws,azure,gcp,kubernetes,m365,github,nhn,mongodbatlas,oraclecloud,dashboard,iac} ..." def mock_get_available_providers(): @@ -31,7 +31,7 @@ def mock_get_available_providers(): "iac", "nhn", "mongodbatlas", - "oci", + "oraclecloud", ] diff --git a/tests/providers/oraclecloud/conftest.py b/tests/providers/oraclecloud/conftest.py index aeeb41f043..1c29b64cdf 100644 --- a/tests/providers/oraclecloud/conftest.py +++ b/tests/providers/oraclecloud/conftest.py @@ -18,27 +18,27 @@ class MockOCIModule(MagicMock): return MagicMock() -# Only mock if oci import fails (missing dependencies) +# Only mock if oraclecloud import fails (missing dependencies) try: pass except (ImportError, ModuleNotFoundError): # Create mock OCI module mock_oci = MockOCIModule() - sys.modules["oci"] = mock_oci - sys.modules["oci.auth"] = mock_oci.auth - sys.modules["oci.config"] = mock_oci.config - sys.modules["oci.identity"] = mock_oci.identity - sys.modules["oci.core"] = mock_oci.core - sys.modules["oci.object_storage"] = mock_oci.object_storage - sys.modules["oci.key_management"] = mock_oci.key_management - sys.modules["oci.file_storage"] = mock_oci.file_storage - sys.modules["oci.block_storage"] = mock_oci.block_storage - sys.modules["oci.database"] = mock_oci.database - sys.modules["oci.events"] = mock_oci.events - sys.modules["oci.cloud_guard"] = mock_oci.cloud_guard - sys.modules["oci.audit"] = mock_oci.audit - sys.modules["oci.analytics"] = mock_oci.analytics - sys.modules["oci.integration"] = mock_oci.integration - sys.modules["oci.logging"] = mock_oci.logging - sys.modules["oci.pagination"] = mock_oci.pagination - sys.modules["oci.exceptions"] = mock_oci.exceptions + sys.modules["oraclecloud"] = mock_oci + sys.modules["oraclecloud.auth"] = mock_oci.auth + sys.modules["oraclecloud.config"] = mock_oci.config + sys.modules["oraclecloud.identity"] = mock_oci.identity + sys.modules["oraclecloud.core"] = mock_oci.core + sys.modules["oraclecloud.object_storage"] = mock_oci.object_storage + sys.modules["oraclecloud.key_management"] = mock_oci.key_management + sys.modules["oraclecloud.file_storage"] = mock_oci.file_storage + sys.modules["oraclecloud.block_storage"] = mock_oci.block_storage + sys.modules["oraclecloud.database"] = mock_oci.database + sys.modules["oraclecloud.events"] = mock_oci.events + sys.modules["oraclecloud.cloud_guard"] = mock_oci.cloud_guard + sys.modules["oraclecloud.audit"] = mock_oci.audit + sys.modules["oraclecloud.analytics"] = mock_oci.analytics + sys.modules["oraclecloud.integration"] = mock_oci.integration + sys.modules["oraclecloud.logging"] = mock_oci.logging + sys.modules["oraclecloud.pagination"] = mock_oci.pagination + sys.modules["oraclecloud.exceptions"] = mock_oci.exceptions diff --git a/tests/providers/oraclecloud/oci_fixtures.py b/tests/providers/oraclecloud/oci_fixtures.py index a83a44cb2d..b1ebef62d9 100644 --- a/tests/providers/oraclecloud/oci_fixtures.py +++ b/tests/providers/oraclecloud/oci_fixtures.py @@ -16,7 +16,7 @@ OCI_USER_ID = "ocid1.user.oc1..aaaaaaaexample" OCI_REGION = "us-ashburn-1" -def set_mocked_oci_provider( +def set_mocked_oraclecloud_provider( tenancy_id: str = OCI_TENANCY_ID, tenancy_name: str = OCI_TENANCY_NAME, user_id: str = OCI_USER_ID, @@ -24,7 +24,7 @@ def set_mocked_oci_provider( ) -> MagicMock: """Create a mocked OCI provider for testing""" provider = MagicMock() - provider.type = "oci" + provider.type = "oraclecloud" # Mock session provider.session = OCISession( diff --git a/tests/providers/oraclecloud/services/analytics/analytics_instance_access_restricted/analytics_instance_access_restricted_test.py b/tests/providers/oraclecloud/services/analytics/analytics_instance_access_restricted/analytics_instance_access_restricted_test.py index af44a791e2..79ad464540 100644 --- a/tests/providers/oraclecloud/services/analytics/analytics_instance_access_restricted/analytics_instance_access_restricted_test.py +++ b/tests/providers/oraclecloud/services/analytics/analytics_instance_access_restricted/analytics_instance_access_restricted_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_analytics_instance_access_restricted: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.analytics.analytics_instance_access_restricted.analytics_instance_access_restricted.analytics_client", @@ -102,7 +102,7 @@ class Test_analytics_instance_access_restricted: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.analytics.analytics_instance_access_restricted.analytics_instance_access_restricted.analytics_client", @@ -136,7 +136,7 @@ class Test_analytics_instance_access_restricted: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "analytics_instance_access_restricted" @@ -187,7 +187,7 @@ class Test_analytics_instance_access_restricted: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.analytics.analytics_instance_access_restricted.analytics_instance_access_restricted.analytics_client", @@ -221,7 +221,7 @@ class Test_analytics_instance_access_restricted: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "analytics_instance_access_restricted" diff --git a/tests/providers/oraclecloud/services/analytics/analytics_service_test.py b/tests/providers/oraclecloud/services/analytics/analytics_service_test.py index bfafd798e1..02267a8c0e 100644 --- a/tests/providers/oraclecloud/services/analytics/analytics_service_test.py +++ b/tests/providers/oraclecloud/services/analytics/analytics_service_test.py @@ -1,12 +1,12 @@ from unittest.mock import patch -from tests.providers.oraclecloud.oci_fixtures import set_mocked_oci_provider +from tests.providers.oraclecloud.oci_fixtures import set_mocked_oraclecloud_provider class TestAnalyticsService: def test_service(self): """Test that analytics service can be instantiated and mocked""" - oci_provider = set_mocked_oci_provider() + oraclecloud_provider = set_mocked_oraclecloud_provider() # Mock the entire service initialization with patch( @@ -17,14 +17,14 @@ class TestAnalyticsService: Analytics, ) - analytics_client = Analytics(oci_provider) + analytics_client = Analytics(oraclecloud_provider) # Manually set required attributes since __init__ was mocked analytics_client.service = "analytics" - analytics_client.provider = oci_provider + analytics_client.provider = oraclecloud_provider analytics_client.audited_compartments = {} analytics_client.regional_clients = {} # Verify service name assert analytics_client.service == "analytics" - assert analytics_client.provider == oci_provider + assert analytics_client.provider == oraclecloud_provider diff --git a/tests/providers/oraclecloud/services/audit/audit_log_retention_period_365_days/audit_log_retention_period_365_days_test.py b/tests/providers/oraclecloud/services/audit/audit_log_retention_period_365_days/audit_log_retention_period_365_days_test.py index d5e7488721..972e261a57 100644 --- a/tests/providers/oraclecloud/services/audit/audit_log_retention_period_365_days/audit_log_retention_period_365_days_test.py +++ b/tests/providers/oraclecloud/services/audit/audit_log_retention_period_365_days/audit_log_retention_period_365_days_test.py @@ -3,7 +3,7 @@ from unittest import mock from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -18,7 +18,7 @@ class Test_audit_log_retention_period_365_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.audit.audit_log_retention_period_365_days.audit_log_retention_period_365_days.audit_client", @@ -51,7 +51,7 @@ class Test_audit_log_retention_period_365_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.audit.audit_log_retention_period_365_days.audit_log_retention_period_365_days.audit_client", @@ -84,7 +84,7 @@ class Test_audit_log_retention_period_365_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.audit.audit_log_retention_period_365_days.audit_log_retention_period_365_days.audit_client", diff --git a/tests/providers/oraclecloud/services/audit/audit_service_test.py b/tests/providers/oraclecloud/services/audit/audit_service_test.py index 06adc4576b..ab3710fa3d 100644 --- a/tests/providers/oraclecloud/services/audit/audit_service_test.py +++ b/tests/providers/oraclecloud/services/audit/audit_service_test.py @@ -1,12 +1,12 @@ from unittest.mock import patch -from tests.providers.oraclecloud.oci_fixtures import set_mocked_oci_provider +from tests.providers.oraclecloud.oci_fixtures import set_mocked_oraclecloud_provider class TestAuditService: def test_service(self): """Test that audit service can be instantiated and mocked""" - oci_provider = set_mocked_oci_provider() + oraclecloud_provider = set_mocked_oraclecloud_provider() # Mock the entire service initialization with patch( @@ -15,14 +15,14 @@ class TestAuditService: ): from prowler.providers.oraclecloud.services.audit.audit_service import Audit - audit_client = Audit(oci_provider) + audit_client = Audit(oraclecloud_provider) # Manually set required attributes since __init__ was mocked audit_client.service = "audit" - audit_client.provider = oci_provider + audit_client.provider = oraclecloud_provider audit_client.audited_compartments = {} audit_client.regional_clients = {} # Verify service name assert audit_client.service == "audit" - assert audit_client.provider == oci_provider + assert audit_client.provider == oraclecloud_provider diff --git a/tests/providers/oraclecloud/services/blockstorage/blockstorage_block_volume_encrypted_with_cmk/blockstorage_block_volume_encrypted_with_cmk_test.py b/tests/providers/oraclecloud/services/blockstorage/blockstorage_block_volume_encrypted_with_cmk/blockstorage_block_volume_encrypted_with_cmk_test.py index c201f35168..7a8aea77ef 100644 --- a/tests/providers/oraclecloud/services/blockstorage/blockstorage_block_volume_encrypted_with_cmk/blockstorage_block_volume_encrypted_with_cmk_test.py +++ b/tests/providers/oraclecloud/services/blockstorage/blockstorage_block_volume_encrypted_with_cmk/blockstorage_block_volume_encrypted_with_cmk_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -43,7 +43,7 @@ class Test_blockstorage_block_volume_encrypted_with_cmk: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.blockstorage.blockstorage_block_volume_encrypted_with_cmk.blockstorage_block_volume_encrypted_with_cmk.blockstorage_client", @@ -106,7 +106,7 @@ class Test_blockstorage_block_volume_encrypted_with_cmk: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.blockstorage.blockstorage_block_volume_encrypted_with_cmk.blockstorage_block_volume_encrypted_with_cmk.blockstorage_client", @@ -140,7 +140,7 @@ class Test_blockstorage_block_volume_encrypted_with_cmk: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "blockstorage_block_volume_encrypted_with_cmk" @@ -193,7 +193,7 @@ class Test_blockstorage_block_volume_encrypted_with_cmk: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.blockstorage.blockstorage_block_volume_encrypted_with_cmk.blockstorage_block_volume_encrypted_with_cmk.blockstorage_client", @@ -227,7 +227,7 @@ class Test_blockstorage_block_volume_encrypted_with_cmk: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "blockstorage_block_volume_encrypted_with_cmk" diff --git a/tests/providers/oraclecloud/services/blockstorage/blockstorage_boot_volume_encrypted_with_cmk/blockstorage_boot_volume_encrypted_with_cmk_test.py b/tests/providers/oraclecloud/services/blockstorage/blockstorage_boot_volume_encrypted_with_cmk/blockstorage_boot_volume_encrypted_with_cmk_test.py index e2e9ef489e..272a6fe3af 100644 --- a/tests/providers/oraclecloud/services/blockstorage/blockstorage_boot_volume_encrypted_with_cmk/blockstorage_boot_volume_encrypted_with_cmk_test.py +++ b/tests/providers/oraclecloud/services/blockstorage/blockstorage_boot_volume_encrypted_with_cmk/blockstorage_boot_volume_encrypted_with_cmk_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -43,7 +43,7 @@ class Test_blockstorage_boot_volume_encrypted_with_cmk: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.blockstorage.blockstorage_boot_volume_encrypted_with_cmk.blockstorage_boot_volume_encrypted_with_cmk.blockstorage_client", @@ -106,7 +106,7 @@ class Test_blockstorage_boot_volume_encrypted_with_cmk: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.blockstorage.blockstorage_boot_volume_encrypted_with_cmk.blockstorage_boot_volume_encrypted_with_cmk.blockstorage_client", @@ -140,7 +140,7 @@ class Test_blockstorage_boot_volume_encrypted_with_cmk: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "blockstorage_boot_volume_encrypted_with_cmk" @@ -193,7 +193,7 @@ class Test_blockstorage_boot_volume_encrypted_with_cmk: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.blockstorage.blockstorage_boot_volume_encrypted_with_cmk.blockstorage_boot_volume_encrypted_with_cmk.blockstorage_client", @@ -227,7 +227,7 @@ class Test_blockstorage_boot_volume_encrypted_with_cmk: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "blockstorage_boot_volume_encrypted_with_cmk" diff --git a/tests/providers/oraclecloud/services/blockstorage/blockstorage_service_test.py b/tests/providers/oraclecloud/services/blockstorage/blockstorage_service_test.py index 0dcba40f19..e6abd6d0d9 100644 --- a/tests/providers/oraclecloud/services/blockstorage/blockstorage_service_test.py +++ b/tests/providers/oraclecloud/services/blockstorage/blockstorage_service_test.py @@ -1,12 +1,12 @@ from unittest.mock import patch -from tests.providers.oraclecloud.oci_fixtures import set_mocked_oci_provider +from tests.providers.oraclecloud.oci_fixtures import set_mocked_oraclecloud_provider class TestBlockStorageService: def test_service(self): """Test that blockstorage service can be instantiated and mocked""" - oci_provider = set_mocked_oci_provider() + oraclecloud_provider = set_mocked_oraclecloud_provider() # Mock the entire service initialization with patch( @@ -17,14 +17,14 @@ class TestBlockStorageService: BlockStorage, ) - blockstorage_client = BlockStorage(oci_provider) + blockstorage_client = BlockStorage(oraclecloud_provider) # Manually set required attributes since __init__ was mocked blockstorage_client.service = "blockstorage" - blockstorage_client.provider = oci_provider + blockstorage_client.provider = oraclecloud_provider blockstorage_client.audited_compartments = {} blockstorage_client.regional_clients = {} # Verify service name assert blockstorage_client.service == "blockstorage" - assert blockstorage_client.provider == oci_provider + assert blockstorage_client.provider == oraclecloud_provider diff --git a/tests/providers/oraclecloud/services/cloudguard/cloudguard_enabled/cloudguard_enabled_test.py b/tests/providers/oraclecloud/services/cloudguard/cloudguard_enabled/cloudguard_enabled_test.py index 4aa3cd6635..c45304edcc 100644 --- a/tests/providers/oraclecloud/services/cloudguard/cloudguard_enabled/cloudguard_enabled_test.py +++ b/tests/providers/oraclecloud/services/cloudguard/cloudguard_enabled/cloudguard_enabled_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_cloudguard_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.cloudguard.cloudguard_enabled.cloudguard_enabled.cloudguard_client", @@ -102,7 +102,7 @@ class Test_cloudguard_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.cloudguard.cloudguard_enabled.cloudguard_enabled.cloudguard_client", @@ -136,7 +136,7 @@ class Test_cloudguard_enabled: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "cloudguard_enabled" ) @@ -186,7 +186,7 @@ class Test_cloudguard_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.cloudguard.cloudguard_enabled.cloudguard_enabled.cloudguard_client", @@ -220,7 +220,7 @@ class Test_cloudguard_enabled: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "cloudguard_enabled" ) diff --git a/tests/providers/oraclecloud/services/cloudguard/cloudguard_service_test.py b/tests/providers/oraclecloud/services/cloudguard/cloudguard_service_test.py index 53317d475b..e379b9f83c 100644 --- a/tests/providers/oraclecloud/services/cloudguard/cloudguard_service_test.py +++ b/tests/providers/oraclecloud/services/cloudguard/cloudguard_service_test.py @@ -1,12 +1,12 @@ from unittest.mock import patch -from tests.providers.oraclecloud.oci_fixtures import set_mocked_oci_provider +from tests.providers.oraclecloud.oci_fixtures import set_mocked_oraclecloud_provider class TestCloudguardService: def test_service(self): """Test that cloudguard service can be instantiated and mocked""" - oci_provider = set_mocked_oci_provider() + oraclecloud_provider = set_mocked_oraclecloud_provider() # Mock the entire service initialization with patch( @@ -17,14 +17,14 @@ class TestCloudguardService: CloudGuard, ) - cloudguard_client = CloudGuard(oci_provider) + cloudguard_client = CloudGuard(oraclecloud_provider) # Manually set required attributes since __init__ was mocked cloudguard_client.service = "cloudguard" - cloudguard_client.provider = oci_provider + cloudguard_client.provider = oraclecloud_provider cloudguard_client.audited_compartments = {} cloudguard_client.regional_clients = {} # Verify service name assert cloudguard_client.service == "cloudguard" - assert cloudguard_client.provider == oci_provider + assert cloudguard_client.provider == oraclecloud_provider diff --git a/tests/providers/oraclecloud/services/compute/compute_instance_in_transit_encryption_enabled/compute_instance_in_transit_encryption_enabled_test.py b/tests/providers/oraclecloud/services/compute/compute_instance_in_transit_encryption_enabled/compute_instance_in_transit_encryption_enabled_test.py index 807a364460..207672352a 100644 --- a/tests/providers/oraclecloud/services/compute/compute_instance_in_transit_encryption_enabled/compute_instance_in_transit_encryption_enabled_test.py +++ b/tests/providers/oraclecloud/services/compute/compute_instance_in_transit_encryption_enabled/compute_instance_in_transit_encryption_enabled_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_compute_instance_in_transit_encryption_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.compute.compute_instance_in_transit_encryption_enabled.compute_instance_in_transit_encryption_enabled.compute_client", @@ -102,7 +102,7 @@ class Test_compute_instance_in_transit_encryption_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.compute.compute_instance_in_transit_encryption_enabled.compute_instance_in_transit_encryption_enabled.compute_client", @@ -136,7 +136,7 @@ class Test_compute_instance_in_transit_encryption_enabled: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "compute_instance_in_transit_encryption_enabled" @@ -187,7 +187,7 @@ class Test_compute_instance_in_transit_encryption_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.compute.compute_instance_in_transit_encryption_enabled.compute_instance_in_transit_encryption_enabled.compute_client", @@ -221,7 +221,7 @@ class Test_compute_instance_in_transit_encryption_enabled: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "compute_instance_in_transit_encryption_enabled" diff --git a/tests/providers/oraclecloud/services/compute/compute_instance_legacy_metadata_endpoint_disabled/compute_instance_legacy_metadata_endpoint_disabled_test.py b/tests/providers/oraclecloud/services/compute/compute_instance_legacy_metadata_endpoint_disabled/compute_instance_legacy_metadata_endpoint_disabled_test.py index d695e8324e..22ed19ce92 100644 --- a/tests/providers/oraclecloud/services/compute/compute_instance_legacy_metadata_endpoint_disabled/compute_instance_legacy_metadata_endpoint_disabled_test.py +++ b/tests/providers/oraclecloud/services/compute/compute_instance_legacy_metadata_endpoint_disabled/compute_instance_legacy_metadata_endpoint_disabled_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_compute_instance_legacy_metadata_endpoint_disabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.compute.compute_instance_legacy_metadata_endpoint_disabled.compute_instance_legacy_metadata_endpoint_disabled.compute_client", @@ -102,7 +102,7 @@ class Test_compute_instance_legacy_metadata_endpoint_disabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.compute.compute_instance_legacy_metadata_endpoint_disabled.compute_instance_legacy_metadata_endpoint_disabled.compute_client", @@ -136,7 +136,7 @@ class Test_compute_instance_legacy_metadata_endpoint_disabled: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "compute_instance_legacy_metadata_endpoint_disabled" @@ -187,7 +187,7 @@ class Test_compute_instance_legacy_metadata_endpoint_disabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.compute.compute_instance_legacy_metadata_endpoint_disabled.compute_instance_legacy_metadata_endpoint_disabled.compute_client", @@ -221,7 +221,7 @@ class Test_compute_instance_legacy_metadata_endpoint_disabled: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "compute_instance_legacy_metadata_endpoint_disabled" diff --git a/tests/providers/oraclecloud/services/compute/compute_instance_secure_boot_enabled/compute_instance_secure_boot_enabled_test.py b/tests/providers/oraclecloud/services/compute/compute_instance_secure_boot_enabled/compute_instance_secure_boot_enabled_test.py index e5be514363..62a80086e5 100644 --- a/tests/providers/oraclecloud/services/compute/compute_instance_secure_boot_enabled/compute_instance_secure_boot_enabled_test.py +++ b/tests/providers/oraclecloud/services/compute/compute_instance_secure_boot_enabled/compute_instance_secure_boot_enabled_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_compute_instance_secure_boot_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.compute.compute_instance_secure_boot_enabled.compute_instance_secure_boot_enabled.compute_client", @@ -102,7 +102,7 @@ class Test_compute_instance_secure_boot_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.compute.compute_instance_secure_boot_enabled.compute_instance_secure_boot_enabled.compute_client", @@ -136,7 +136,7 @@ class Test_compute_instance_secure_boot_enabled: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "compute_instance_secure_boot_enabled" @@ -187,7 +187,7 @@ class Test_compute_instance_secure_boot_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.compute.compute_instance_secure_boot_enabled.compute_instance_secure_boot_enabled.compute_client", @@ -221,7 +221,7 @@ class Test_compute_instance_secure_boot_enabled: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "compute_instance_secure_boot_enabled" diff --git a/tests/providers/oraclecloud/services/compute/compute_service_test.py b/tests/providers/oraclecloud/services/compute/compute_service_test.py index cd5a11ff09..f8adf08200 100644 --- a/tests/providers/oraclecloud/services/compute/compute_service_test.py +++ b/tests/providers/oraclecloud/services/compute/compute_service_test.py @@ -1,12 +1,12 @@ from unittest.mock import patch -from tests.providers.oraclecloud.oci_fixtures import set_mocked_oci_provider +from tests.providers.oraclecloud.oci_fixtures import set_mocked_oraclecloud_provider class TestComputeService: def test_service(self): """Test that compute service can be instantiated and mocked""" - oci_provider = set_mocked_oci_provider() + oraclecloud_provider = set_mocked_oraclecloud_provider() # Mock the entire service initialization with patch( @@ -17,14 +17,14 @@ class TestComputeService: Compute, ) - compute_client = Compute(oci_provider) + compute_client = Compute(oraclecloud_provider) # Manually set required attributes since __init__ was mocked compute_client.service = "compute" - compute_client.provider = oci_provider + compute_client.provider = oraclecloud_provider compute_client.audited_compartments = {} compute_client.regional_clients = {} # Verify service name assert compute_client.service == "compute" - assert compute_client.provider == oci_provider + assert compute_client.provider == oraclecloud_provider diff --git a/tests/providers/oraclecloud/services/database/database_autonomous_database_access_restricted/database_autonomous_database_access_restricted_test.py b/tests/providers/oraclecloud/services/database/database_autonomous_database_access_restricted/database_autonomous_database_access_restricted_test.py index 38f4e8310e..a559fe6c8d 100644 --- a/tests/providers/oraclecloud/services/database/database_autonomous_database_access_restricted/database_autonomous_database_access_restricted_test.py +++ b/tests/providers/oraclecloud/services/database/database_autonomous_database_access_restricted/database_autonomous_database_access_restricted_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_database_autonomous_database_access_restricted: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.database.database_autonomous_database_access_restricted.database_autonomous_database_access_restricted.database_client", @@ -102,7 +102,7 @@ class Test_database_autonomous_database_access_restricted: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.database.database_autonomous_database_access_restricted.database_autonomous_database_access_restricted.database_client", @@ -136,7 +136,7 @@ class Test_database_autonomous_database_access_restricted: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "database_autonomous_database_access_restricted" @@ -187,7 +187,7 @@ class Test_database_autonomous_database_access_restricted: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.database.database_autonomous_database_access_restricted.database_autonomous_database_access_restricted.database_client", @@ -221,7 +221,7 @@ class Test_database_autonomous_database_access_restricted: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "database_autonomous_database_access_restricted" diff --git a/tests/providers/oraclecloud/services/database/database_service_test.py b/tests/providers/oraclecloud/services/database/database_service_test.py index 6715f3dbe8..49ce51a401 100644 --- a/tests/providers/oraclecloud/services/database/database_service_test.py +++ b/tests/providers/oraclecloud/services/database/database_service_test.py @@ -1,12 +1,12 @@ from unittest.mock import patch -from tests.providers.oraclecloud.oci_fixtures import set_mocked_oci_provider +from tests.providers.oraclecloud.oci_fixtures import set_mocked_oraclecloud_provider class TestDatabaseService: def test_service(self): """Test that database service can be instantiated and mocked""" - oci_provider = set_mocked_oci_provider() + oraclecloud_provider = set_mocked_oraclecloud_provider() # Mock the entire service initialization with patch( @@ -17,14 +17,14 @@ class TestDatabaseService: Database, ) - database_client = Database(oci_provider) + database_client = Database(oraclecloud_provider) # Manually set required attributes since __init__ was mocked database_client.service = "database" - database_client.provider = oci_provider + database_client.provider = oraclecloud_provider database_client.audited_compartments = {} database_client.regional_clients = {} # Verify service name assert database_client.service == "database" - assert database_client.provider == oci_provider + assert database_client.provider == oraclecloud_provider diff --git a/tests/providers/oraclecloud/services/events/events_notification_topic_and_subscription_exists/events_notification_topic_and_subscription_exists_test.py b/tests/providers/oraclecloud/services/events/events_notification_topic_and_subscription_exists/events_notification_topic_and_subscription_exists_test.py index 3d8ef06208..eeb39efd36 100644 --- a/tests/providers/oraclecloud/services/events/events_notification_topic_and_subscription_exists/events_notification_topic_and_subscription_exists_test.py +++ b/tests/providers/oraclecloud/services/events/events_notification_topic_and_subscription_exists/events_notification_topic_and_subscription_exists_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_events_notification_topic_and_subscription_exists: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_notification_topic_and_subscription_exists.events_notification_topic_and_subscription_exists.events_client", @@ -102,7 +102,7 @@ class Test_events_notification_topic_and_subscription_exists: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_notification_topic_and_subscription_exists.events_notification_topic_and_subscription_exists.events_client", @@ -136,7 +136,7 @@ class Test_events_notification_topic_and_subscription_exists: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "events_notification_topic_and_subscription_exists" @@ -187,7 +187,7 @@ class Test_events_notification_topic_and_subscription_exists: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_notification_topic_and_subscription_exists.events_notification_topic_and_subscription_exists.events_client", @@ -221,7 +221,7 @@ class Test_events_notification_topic_and_subscription_exists: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "events_notification_topic_and_subscription_exists" diff --git a/tests/providers/oraclecloud/services/events/events_rule_cloudguard_problems/events_rule_cloudguard_problems_test.py b/tests/providers/oraclecloud/services/events/events_rule_cloudguard_problems/events_rule_cloudguard_problems_test.py index 25305934db..7b0010265d 100644 --- a/tests/providers/oraclecloud/services/events/events_rule_cloudguard_problems/events_rule_cloudguard_problems_test.py +++ b/tests/providers/oraclecloud/services/events/events_rule_cloudguard_problems/events_rule_cloudguard_problems_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_events_rule_cloudguard_problems: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_cloudguard_problems.events_rule_cloudguard_problems.events_client", @@ -102,7 +102,7 @@ class Test_events_rule_cloudguard_problems: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_cloudguard_problems.events_rule_cloudguard_problems.events_client", @@ -136,7 +136,7 @@ class Test_events_rule_cloudguard_problems: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "events_rule_cloudguard_problems" @@ -187,7 +187,7 @@ class Test_events_rule_cloudguard_problems: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_cloudguard_problems.events_rule_cloudguard_problems.events_client", @@ -221,7 +221,7 @@ class Test_events_rule_cloudguard_problems: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "events_rule_cloudguard_problems" diff --git a/tests/providers/oraclecloud/services/events/events_rule_iam_group_changes/events_rule_iam_group_changes_test.py b/tests/providers/oraclecloud/services/events/events_rule_iam_group_changes/events_rule_iam_group_changes_test.py index 8cc8f179fc..0d17e9b8b5 100644 --- a/tests/providers/oraclecloud/services/events/events_rule_iam_group_changes/events_rule_iam_group_changes_test.py +++ b/tests/providers/oraclecloud/services/events/events_rule_iam_group_changes/events_rule_iam_group_changes_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_events_rule_iam_group_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_iam_group_changes.events_rule_iam_group_changes.events_client", @@ -102,7 +102,7 @@ class Test_events_rule_iam_group_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_iam_group_changes.events_rule_iam_group_changes.events_client", @@ -136,7 +136,7 @@ class Test_events_rule_iam_group_changes: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "events_rule_iam_group_changes" @@ -187,7 +187,7 @@ class Test_events_rule_iam_group_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_iam_group_changes.events_rule_iam_group_changes.events_client", @@ -221,7 +221,7 @@ class Test_events_rule_iam_group_changes: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "events_rule_iam_group_changes" diff --git a/tests/providers/oraclecloud/services/events/events_rule_iam_policy_changes/events_rule_iam_policy_changes_test.py b/tests/providers/oraclecloud/services/events/events_rule_iam_policy_changes/events_rule_iam_policy_changes_test.py index 699947c060..b37347f6d2 100644 --- a/tests/providers/oraclecloud/services/events/events_rule_iam_policy_changes/events_rule_iam_policy_changes_test.py +++ b/tests/providers/oraclecloud/services/events/events_rule_iam_policy_changes/events_rule_iam_policy_changes_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_events_rule_iam_policy_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_iam_policy_changes.events_rule_iam_policy_changes.events_client", @@ -102,7 +102,7 @@ class Test_events_rule_iam_policy_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_iam_policy_changes.events_rule_iam_policy_changes.events_client", @@ -136,7 +136,7 @@ class Test_events_rule_iam_policy_changes: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "events_rule_iam_policy_changes" @@ -187,7 +187,7 @@ class Test_events_rule_iam_policy_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_iam_policy_changes.events_rule_iam_policy_changes.events_client", @@ -221,7 +221,7 @@ class Test_events_rule_iam_policy_changes: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "events_rule_iam_policy_changes" diff --git a/tests/providers/oraclecloud/services/events/events_rule_identity_provider_changes/events_rule_identity_provider_changes_test.py b/tests/providers/oraclecloud/services/events/events_rule_identity_provider_changes/events_rule_identity_provider_changes_test.py index 9bc5da88fd..d8641551dc 100644 --- a/tests/providers/oraclecloud/services/events/events_rule_identity_provider_changes/events_rule_identity_provider_changes_test.py +++ b/tests/providers/oraclecloud/services/events/events_rule_identity_provider_changes/events_rule_identity_provider_changes_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_events_rule_identity_provider_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_identity_provider_changes.events_rule_identity_provider_changes.events_client", @@ -102,7 +102,7 @@ class Test_events_rule_identity_provider_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_identity_provider_changes.events_rule_identity_provider_changes.events_client", @@ -136,7 +136,7 @@ class Test_events_rule_identity_provider_changes: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "events_rule_identity_provider_changes" @@ -187,7 +187,7 @@ class Test_events_rule_identity_provider_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_identity_provider_changes.events_rule_identity_provider_changes.events_client", @@ -221,7 +221,7 @@ class Test_events_rule_identity_provider_changes: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "events_rule_identity_provider_changes" diff --git a/tests/providers/oraclecloud/services/events/events_rule_idp_group_mapping_changes/events_rule_idp_group_mapping_changes_test.py b/tests/providers/oraclecloud/services/events/events_rule_idp_group_mapping_changes/events_rule_idp_group_mapping_changes_test.py index deb4d8698d..a322bfae58 100644 --- a/tests/providers/oraclecloud/services/events/events_rule_idp_group_mapping_changes/events_rule_idp_group_mapping_changes_test.py +++ b/tests/providers/oraclecloud/services/events/events_rule_idp_group_mapping_changes/events_rule_idp_group_mapping_changes_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_events_rule_idp_group_mapping_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_idp_group_mapping_changes.events_rule_idp_group_mapping_changes.events_client", @@ -102,7 +102,7 @@ class Test_events_rule_idp_group_mapping_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_idp_group_mapping_changes.events_rule_idp_group_mapping_changes.events_client", @@ -136,7 +136,7 @@ class Test_events_rule_idp_group_mapping_changes: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "events_rule_idp_group_mapping_changes" @@ -187,7 +187,7 @@ class Test_events_rule_idp_group_mapping_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_idp_group_mapping_changes.events_rule_idp_group_mapping_changes.events_client", @@ -221,7 +221,7 @@ class Test_events_rule_idp_group_mapping_changes: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "events_rule_idp_group_mapping_changes" diff --git a/tests/providers/oraclecloud/services/events/events_rule_local_user_authentication/events_rule_local_user_authentication_test.py b/tests/providers/oraclecloud/services/events/events_rule_local_user_authentication/events_rule_local_user_authentication_test.py index cc7f3ef9f8..10c2941a15 100644 --- a/tests/providers/oraclecloud/services/events/events_rule_local_user_authentication/events_rule_local_user_authentication_test.py +++ b/tests/providers/oraclecloud/services/events/events_rule_local_user_authentication/events_rule_local_user_authentication_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_events_rule_local_user_authentication: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_local_user_authentication.events_rule_local_user_authentication.events_client", @@ -102,7 +102,7 @@ class Test_events_rule_local_user_authentication: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_local_user_authentication.events_rule_local_user_authentication.events_client", @@ -136,7 +136,7 @@ class Test_events_rule_local_user_authentication: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "events_rule_local_user_authentication" @@ -187,7 +187,7 @@ class Test_events_rule_local_user_authentication: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_local_user_authentication.events_rule_local_user_authentication.events_client", @@ -221,7 +221,7 @@ class Test_events_rule_local_user_authentication: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "events_rule_local_user_authentication" diff --git a/tests/providers/oraclecloud/services/events/events_rule_network_gateway_changes/events_rule_network_gateway_changes_test.py b/tests/providers/oraclecloud/services/events/events_rule_network_gateway_changes/events_rule_network_gateway_changes_test.py index b2aa44dace..0a14a54a4d 100644 --- a/tests/providers/oraclecloud/services/events/events_rule_network_gateway_changes/events_rule_network_gateway_changes_test.py +++ b/tests/providers/oraclecloud/services/events/events_rule_network_gateway_changes/events_rule_network_gateway_changes_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_events_rule_network_gateway_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_network_gateway_changes.events_rule_network_gateway_changes.events_client", @@ -102,7 +102,7 @@ class Test_events_rule_network_gateway_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_network_gateway_changes.events_rule_network_gateway_changes.events_client", @@ -136,7 +136,7 @@ class Test_events_rule_network_gateway_changes: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "events_rule_network_gateway_changes" @@ -187,7 +187,7 @@ class Test_events_rule_network_gateway_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_network_gateway_changes.events_rule_network_gateway_changes.events_client", @@ -221,7 +221,7 @@ class Test_events_rule_network_gateway_changes: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "events_rule_network_gateway_changes" diff --git a/tests/providers/oraclecloud/services/events/events_rule_network_security_group_changes/events_rule_network_security_group_changes_test.py b/tests/providers/oraclecloud/services/events/events_rule_network_security_group_changes/events_rule_network_security_group_changes_test.py index 80db1bb60e..d900e0a2a6 100644 --- a/tests/providers/oraclecloud/services/events/events_rule_network_security_group_changes/events_rule_network_security_group_changes_test.py +++ b/tests/providers/oraclecloud/services/events/events_rule_network_security_group_changes/events_rule_network_security_group_changes_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_events_rule_network_security_group_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_network_security_group_changes.events_rule_network_security_group_changes.events_client", @@ -102,7 +102,7 @@ class Test_events_rule_network_security_group_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_network_security_group_changes.events_rule_network_security_group_changes.events_client", @@ -136,7 +136,7 @@ class Test_events_rule_network_security_group_changes: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "events_rule_network_security_group_changes" @@ -187,7 +187,7 @@ class Test_events_rule_network_security_group_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_network_security_group_changes.events_rule_network_security_group_changes.events_client", @@ -221,7 +221,7 @@ class Test_events_rule_network_security_group_changes: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "events_rule_network_security_group_changes" diff --git a/tests/providers/oraclecloud/services/events/events_rule_route_table_changes/events_rule_route_table_changes_test.py b/tests/providers/oraclecloud/services/events/events_rule_route_table_changes/events_rule_route_table_changes_test.py index 545d8102e3..2a0e4f1bbd 100644 --- a/tests/providers/oraclecloud/services/events/events_rule_route_table_changes/events_rule_route_table_changes_test.py +++ b/tests/providers/oraclecloud/services/events/events_rule_route_table_changes/events_rule_route_table_changes_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_events_rule_route_table_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_route_table_changes.events_rule_route_table_changes.events_client", @@ -102,7 +102,7 @@ class Test_events_rule_route_table_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_route_table_changes.events_rule_route_table_changes.events_client", @@ -136,7 +136,7 @@ class Test_events_rule_route_table_changes: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "events_rule_route_table_changes" @@ -187,7 +187,7 @@ class Test_events_rule_route_table_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_route_table_changes.events_rule_route_table_changes.events_client", @@ -221,7 +221,7 @@ class Test_events_rule_route_table_changes: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "events_rule_route_table_changes" diff --git a/tests/providers/oraclecloud/services/events/events_rule_security_list_changes/events_rule_security_list_changes_test.py b/tests/providers/oraclecloud/services/events/events_rule_security_list_changes/events_rule_security_list_changes_test.py index 548bf7084a..64f9c61483 100644 --- a/tests/providers/oraclecloud/services/events/events_rule_security_list_changes/events_rule_security_list_changes_test.py +++ b/tests/providers/oraclecloud/services/events/events_rule_security_list_changes/events_rule_security_list_changes_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_events_rule_security_list_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_security_list_changes.events_rule_security_list_changes.events_client", @@ -102,7 +102,7 @@ class Test_events_rule_security_list_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_security_list_changes.events_rule_security_list_changes.events_client", @@ -136,7 +136,7 @@ class Test_events_rule_security_list_changes: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "events_rule_security_list_changes" @@ -187,7 +187,7 @@ class Test_events_rule_security_list_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_security_list_changes.events_rule_security_list_changes.events_client", @@ -221,7 +221,7 @@ class Test_events_rule_security_list_changes: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "events_rule_security_list_changes" diff --git a/tests/providers/oraclecloud/services/events/events_rule_user_changes/events_rule_user_changes_test.py b/tests/providers/oraclecloud/services/events/events_rule_user_changes/events_rule_user_changes_test.py index 91fb869fd0..cfe0e4b20a 100644 --- a/tests/providers/oraclecloud/services/events/events_rule_user_changes/events_rule_user_changes_test.py +++ b/tests/providers/oraclecloud/services/events/events_rule_user_changes/events_rule_user_changes_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_events_rule_user_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_user_changes.events_rule_user_changes.events_client", @@ -102,7 +102,7 @@ class Test_events_rule_user_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_user_changes.events_rule_user_changes.events_client", @@ -136,7 +136,7 @@ class Test_events_rule_user_changes: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "events_rule_user_changes" @@ -187,7 +187,7 @@ class Test_events_rule_user_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_user_changes.events_rule_user_changes.events_client", @@ -221,7 +221,7 @@ class Test_events_rule_user_changes: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "events_rule_user_changes" diff --git a/tests/providers/oraclecloud/services/events/events_rule_vcn_changes/events_rule_vcn_changes_test.py b/tests/providers/oraclecloud/services/events/events_rule_vcn_changes/events_rule_vcn_changes_test.py index 55967d1aa7..9181a57682 100644 --- a/tests/providers/oraclecloud/services/events/events_rule_vcn_changes/events_rule_vcn_changes_test.py +++ b/tests/providers/oraclecloud/services/events/events_rule_vcn_changes/events_rule_vcn_changes_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_events_rule_vcn_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_vcn_changes.events_rule_vcn_changes.events_client", @@ -102,7 +102,7 @@ class Test_events_rule_vcn_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_vcn_changes.events_rule_vcn_changes.events_client", @@ -136,7 +136,7 @@ class Test_events_rule_vcn_changes: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "events_rule_vcn_changes" @@ -187,7 +187,7 @@ class Test_events_rule_vcn_changes: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.events.events_rule_vcn_changes.events_rule_vcn_changes.events_client", @@ -221,7 +221,7 @@ class Test_events_rule_vcn_changes: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "events_rule_vcn_changes" diff --git a/tests/providers/oraclecloud/services/events/events_service_test.py b/tests/providers/oraclecloud/services/events/events_service_test.py index 37c202b773..70baf617f1 100644 --- a/tests/providers/oraclecloud/services/events/events_service_test.py +++ b/tests/providers/oraclecloud/services/events/events_service_test.py @@ -1,12 +1,12 @@ from unittest.mock import patch -from tests.providers.oraclecloud.oci_fixtures import set_mocked_oci_provider +from tests.providers.oraclecloud.oci_fixtures import set_mocked_oraclecloud_provider class TestEventsService: def test_service(self): """Test that events service can be instantiated and mocked""" - oci_provider = set_mocked_oci_provider() + oraclecloud_provider = set_mocked_oraclecloud_provider() # Mock the entire service initialization with patch( @@ -17,14 +17,14 @@ class TestEventsService: Events, ) - events_client = Events(oci_provider) + events_client = Events(oraclecloud_provider) # Manually set required attributes since __init__ was mocked events_client.service = "events" - events_client.provider = oci_provider + events_client.provider = oraclecloud_provider events_client.audited_compartments = {} events_client.regional_clients = {} # Verify service name assert events_client.service == "events" - assert events_client.provider == oci_provider + assert events_client.provider == oraclecloud_provider diff --git a/tests/providers/oraclecloud/services/filestorage/filestorage_file_system_encrypted_with_cmk/filestorage_file_system_encrypted_with_cmk_test.py b/tests/providers/oraclecloud/services/filestorage/filestorage_file_system_encrypted_with_cmk/filestorage_file_system_encrypted_with_cmk_test.py index ffca470502..58775d0413 100644 --- a/tests/providers/oraclecloud/services/filestorage/filestorage_file_system_encrypted_with_cmk/filestorage_file_system_encrypted_with_cmk_test.py +++ b/tests/providers/oraclecloud/services/filestorage/filestorage_file_system_encrypted_with_cmk/filestorage_file_system_encrypted_with_cmk_test.py @@ -5,7 +5,7 @@ import pytest from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -20,7 +20,7 @@ class Test_filestorage_file_system_encrypted_with_cmk: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.filestorage.filestorage_file_system_encrypted_with_cmk.filestorage_file_system_encrypted_with_cmk.filestorage_client", diff --git a/tests/providers/oraclecloud/services/filestorage/filestorage_service_test.py b/tests/providers/oraclecloud/services/filestorage/filestorage_service_test.py index 426b1d12f8..e9497f0d2d 100644 --- a/tests/providers/oraclecloud/services/filestorage/filestorage_service_test.py +++ b/tests/providers/oraclecloud/services/filestorage/filestorage_service_test.py @@ -1,12 +1,12 @@ from unittest.mock import patch -from tests.providers.oraclecloud.oci_fixtures import set_mocked_oci_provider +from tests.providers.oraclecloud.oci_fixtures import set_mocked_oraclecloud_provider class TestFilestorageService: def test_service(self): """Test that filestorage service can be instantiated and mocked""" - oci_provider = set_mocked_oci_provider() + oraclecloud_provider = set_mocked_oraclecloud_provider() # Mock the entire service initialization with patch( @@ -17,14 +17,14 @@ class TestFilestorageService: Filestorage, ) - filestorage_client = Filestorage(oci_provider) + filestorage_client = Filestorage(oraclecloud_provider) # Manually set required attributes since __init__ was mocked filestorage_client.service = "filestorage" - filestorage_client.provider = oci_provider + filestorage_client.provider = oraclecloud_provider filestorage_client.audited_compartments = {} filestorage_client.regional_clients = {} # Verify service name assert filestorage_client.service == "filestorage" - assert filestorage_client.provider == oci_provider + assert filestorage_client.provider == oraclecloud_provider diff --git a/tests/providers/oraclecloud/services/identity/identity_iam_admins_cannot_update_tenancy_admins/identity_iam_admins_cannot_update_tenancy_admins_test.py b/tests/providers/oraclecloud/services/identity/identity_iam_admins_cannot_update_tenancy_admins/identity_iam_admins_cannot_update_tenancy_admins_test.py index 1350fc69e6..0801effa32 100644 --- a/tests/providers/oraclecloud/services/identity/identity_iam_admins_cannot_update_tenancy_admins/identity_iam_admins_cannot_update_tenancy_admins_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_iam_admins_cannot_update_tenancy_admins/identity_iam_admins_cannot_update_tenancy_admins_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_iam_admins_cannot_update_tenancy_admins: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_iam_admins_cannot_update_tenancy_admins.identity_iam_admins_cannot_update_tenancy_admins.identity_client", @@ -102,7 +102,7 @@ class Test_identity_iam_admins_cannot_update_tenancy_admins: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_iam_admins_cannot_update_tenancy_admins.identity_iam_admins_cannot_update_tenancy_admins.identity_client", @@ -136,7 +136,7 @@ class Test_identity_iam_admins_cannot_update_tenancy_admins: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_iam_admins_cannot_update_tenancy_admins" @@ -187,7 +187,7 @@ class Test_identity_iam_admins_cannot_update_tenancy_admins: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_iam_admins_cannot_update_tenancy_admins.identity_iam_admins_cannot_update_tenancy_admins.identity_client", @@ -221,7 +221,7 @@ class Test_identity_iam_admins_cannot_update_tenancy_admins: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_iam_admins_cannot_update_tenancy_admins" diff --git a/tests/providers/oraclecloud/services/identity/identity_instance_principal_used/identity_instance_principal_used_test.py b/tests/providers/oraclecloud/services/identity/identity_instance_principal_used/identity_instance_principal_used_test.py index 622a9602ce..171bfbd3d8 100644 --- a/tests/providers/oraclecloud/services/identity/identity_instance_principal_used/identity_instance_principal_used_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_instance_principal_used/identity_instance_principal_used_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_instance_principal_used: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_instance_principal_used.identity_instance_principal_used.identity_client", @@ -102,7 +102,7 @@ class Test_identity_instance_principal_used: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_instance_principal_used.identity_instance_principal_used.identity_client", @@ -136,7 +136,7 @@ class Test_identity_instance_principal_used: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_instance_principal_used" @@ -187,7 +187,7 @@ class Test_identity_instance_principal_used: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_instance_principal_used.identity_instance_principal_used.identity_client", @@ -221,7 +221,7 @@ class Test_identity_instance_principal_used: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_instance_principal_used" diff --git a/tests/providers/oraclecloud/services/identity/identity_no_resources_in_root_compartment/identity_no_resources_in_root_compartment_test.py b/tests/providers/oraclecloud/services/identity/identity_no_resources_in_root_compartment/identity_no_resources_in_root_compartment_test.py index a8b6a72e04..d23b7cd4d8 100644 --- a/tests/providers/oraclecloud/services/identity/identity_no_resources_in_root_compartment/identity_no_resources_in_root_compartment_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_no_resources_in_root_compartment/identity_no_resources_in_root_compartment_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_no_resources_in_root_compartment: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_no_resources_in_root_compartment.identity_no_resources_in_root_compartment.identity_client", @@ -102,7 +102,7 @@ class Test_identity_no_resources_in_root_compartment: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_no_resources_in_root_compartment.identity_no_resources_in_root_compartment.identity_client", @@ -136,7 +136,7 @@ class Test_identity_no_resources_in_root_compartment: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_no_resources_in_root_compartment" @@ -187,7 +187,7 @@ class Test_identity_no_resources_in_root_compartment: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_no_resources_in_root_compartment.identity_no_resources_in_root_compartment.identity_client", @@ -221,7 +221,7 @@ class Test_identity_no_resources_in_root_compartment: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_no_resources_in_root_compartment" diff --git a/tests/providers/oraclecloud/services/identity/identity_non_root_compartment_exists/identity_non_root_compartment_exists_test.py b/tests/providers/oraclecloud/services/identity/identity_non_root_compartment_exists/identity_non_root_compartment_exists_test.py index 42d5ebe0e2..6da2c6b0d4 100644 --- a/tests/providers/oraclecloud/services/identity/identity_non_root_compartment_exists/identity_non_root_compartment_exists_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_non_root_compartment_exists/identity_non_root_compartment_exists_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_non_root_compartment_exists: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_non_root_compartment_exists.identity_non_root_compartment_exists.identity_client", @@ -102,7 +102,7 @@ class Test_identity_non_root_compartment_exists: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_non_root_compartment_exists.identity_non_root_compartment_exists.identity_client", @@ -136,7 +136,7 @@ class Test_identity_non_root_compartment_exists: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_non_root_compartment_exists" @@ -187,7 +187,7 @@ class Test_identity_non_root_compartment_exists: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_non_root_compartment_exists.identity_non_root_compartment_exists.identity_client", @@ -221,7 +221,7 @@ class Test_identity_non_root_compartment_exists: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_non_root_compartment_exists" diff --git a/tests/providers/oraclecloud/services/identity/identity_password_policy_expires_within_365_days/identity_password_policy_expires_within_365_days_test.py b/tests/providers/oraclecloud/services/identity/identity_password_policy_expires_within_365_days/identity_password_policy_expires_within_365_days_test.py index cbfd3df2e8..189aa115a5 100644 --- a/tests/providers/oraclecloud/services/identity/identity_password_policy_expires_within_365_days/identity_password_policy_expires_within_365_days_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_password_policy_expires_within_365_days/identity_password_policy_expires_within_365_days_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_password_policy_expires_within_365_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_password_policy_expires_within_365_days.identity_password_policy_expires_within_365_days.identity_client", @@ -102,7 +102,7 @@ class Test_identity_password_policy_expires_within_365_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_password_policy_expires_within_365_days.identity_password_policy_expires_within_365_days.identity_client", @@ -136,7 +136,7 @@ class Test_identity_password_policy_expires_within_365_days: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_password_policy_expires_within_365_days" @@ -187,7 +187,7 @@ class Test_identity_password_policy_expires_within_365_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_password_policy_expires_within_365_days.identity_password_policy_expires_within_365_days.identity_client", @@ -221,7 +221,7 @@ class Test_identity_password_policy_expires_within_365_days: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_password_policy_expires_within_365_days" diff --git a/tests/providers/oraclecloud/services/identity/identity_password_policy_minimum_length_14/identity_password_policy_minimum_length_14_test.py b/tests/providers/oraclecloud/services/identity/identity_password_policy_minimum_length_14/identity_password_policy_minimum_length_14_test.py index 40af84d011..f624bb3f14 100644 --- a/tests/providers/oraclecloud/services/identity/identity_password_policy_minimum_length_14/identity_password_policy_minimum_length_14_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_password_policy_minimum_length_14/identity_password_policy_minimum_length_14_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_password_policy_minimum_length_14: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_password_policy_minimum_length_14.identity_password_policy_minimum_length_14.identity_client", @@ -102,7 +102,7 @@ class Test_identity_password_policy_minimum_length_14: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_password_policy_minimum_length_14.identity_password_policy_minimum_length_14.identity_client", @@ -136,7 +136,7 @@ class Test_identity_password_policy_minimum_length_14: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_password_policy_minimum_length_14" @@ -187,7 +187,7 @@ class Test_identity_password_policy_minimum_length_14: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_password_policy_minimum_length_14.identity_password_policy_minimum_length_14.identity_client", @@ -221,7 +221,7 @@ class Test_identity_password_policy_minimum_length_14: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_password_policy_minimum_length_14" diff --git a/tests/providers/oraclecloud/services/identity/identity_password_policy_prevents_reuse/identity_password_policy_prevents_reuse_test.py b/tests/providers/oraclecloud/services/identity/identity_password_policy_prevents_reuse/identity_password_policy_prevents_reuse_test.py index 68713b7832..07a168ab4c 100644 --- a/tests/providers/oraclecloud/services/identity/identity_password_policy_prevents_reuse/identity_password_policy_prevents_reuse_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_password_policy_prevents_reuse/identity_password_policy_prevents_reuse_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_password_policy_prevents_reuse: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_password_policy_prevents_reuse.identity_password_policy_prevents_reuse.identity_client", @@ -102,7 +102,7 @@ class Test_identity_password_policy_prevents_reuse: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_password_policy_prevents_reuse.identity_password_policy_prevents_reuse.identity_client", @@ -136,7 +136,7 @@ class Test_identity_password_policy_prevents_reuse: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_password_policy_prevents_reuse" @@ -187,7 +187,7 @@ class Test_identity_password_policy_prevents_reuse: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_password_policy_prevents_reuse.identity_password_policy_prevents_reuse.identity_client", @@ -221,7 +221,7 @@ class Test_identity_password_policy_prevents_reuse: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_password_policy_prevents_reuse" diff --git a/tests/providers/oraclecloud/services/identity/identity_service_level_admins_exist/identity_service_level_admins_exist_test.py b/tests/providers/oraclecloud/services/identity/identity_service_level_admins_exist/identity_service_level_admins_exist_test.py index d85008c6c1..6c03723fa0 100644 --- a/tests/providers/oraclecloud/services/identity/identity_service_level_admins_exist/identity_service_level_admins_exist_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_service_level_admins_exist/identity_service_level_admins_exist_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_service_level_admins_exist: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_service_level_admins_exist.identity_service_level_admins_exist.identity_client", @@ -102,7 +102,7 @@ class Test_identity_service_level_admins_exist: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_service_level_admins_exist.identity_service_level_admins_exist.identity_client", @@ -136,7 +136,7 @@ class Test_identity_service_level_admins_exist: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_service_level_admins_exist" @@ -187,7 +187,7 @@ class Test_identity_service_level_admins_exist: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_service_level_admins_exist.identity_service_level_admins_exist.identity_client", @@ -221,7 +221,7 @@ class Test_identity_service_level_admins_exist: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_service_level_admins_exist" diff --git a/tests/providers/oraclecloud/services/identity/identity_service_test.py b/tests/providers/oraclecloud/services/identity/identity_service_test.py index 37284a273c..bb695d7128 100644 --- a/tests/providers/oraclecloud/services/identity/identity_service_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_service_test.py @@ -1,12 +1,12 @@ from unittest.mock import patch -from tests.providers.oraclecloud.oci_fixtures import set_mocked_oci_provider +from tests.providers.oraclecloud.oci_fixtures import set_mocked_oraclecloud_provider class TestIdentityService: def test_service(self): """Test that identity service can be instantiated and mocked""" - oci_provider = set_mocked_oci_provider() + oraclecloud_provider = set_mocked_oraclecloud_provider() # Mock the entire service initialization with patch( @@ -17,14 +17,14 @@ class TestIdentityService: Identity, ) - identity_client = Identity(oci_provider) + identity_client = Identity(oraclecloud_provider) # Manually set required attributes since __init__ was mocked identity_client.service = "identity" - identity_client.provider = oci_provider + identity_client.provider = oraclecloud_provider identity_client.audited_compartments = {} identity_client.regional_clients = {} # Verify service name assert identity_client.service == "identity" - assert identity_client.provider == oci_provider + assert identity_client.provider == oraclecloud_provider diff --git a/tests/providers/oraclecloud/services/identity/identity_tenancy_admin_permissions_limited/identity_tenancy_admin_permissions_limited_test.py b/tests/providers/oraclecloud/services/identity/identity_tenancy_admin_permissions_limited/identity_tenancy_admin_permissions_limited_test.py index 1514052306..ba9ecfba33 100644 --- a/tests/providers/oraclecloud/services/identity/identity_tenancy_admin_permissions_limited/identity_tenancy_admin_permissions_limited_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_tenancy_admin_permissions_limited/identity_tenancy_admin_permissions_limited_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_tenancy_admin_permissions_limited: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_tenancy_admin_permissions_limited.identity_tenancy_admin_permissions_limited.identity_client", @@ -102,7 +102,7 @@ class Test_identity_tenancy_admin_permissions_limited: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_tenancy_admin_permissions_limited.identity_tenancy_admin_permissions_limited.identity_client", @@ -136,7 +136,7 @@ class Test_identity_tenancy_admin_permissions_limited: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_tenancy_admin_permissions_limited" @@ -187,7 +187,7 @@ class Test_identity_tenancy_admin_permissions_limited: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_tenancy_admin_permissions_limited.identity_tenancy_admin_permissions_limited.identity_client", @@ -221,7 +221,7 @@ class Test_identity_tenancy_admin_permissions_limited: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_tenancy_admin_permissions_limited" diff --git a/tests/providers/oraclecloud/services/identity/identity_tenancy_admin_users_no_api_keys/identity_tenancy_admin_users_no_api_keys_test.py b/tests/providers/oraclecloud/services/identity/identity_tenancy_admin_users_no_api_keys/identity_tenancy_admin_users_no_api_keys_test.py index 51a2ab3609..664d3f1ed6 100644 --- a/tests/providers/oraclecloud/services/identity/identity_tenancy_admin_users_no_api_keys/identity_tenancy_admin_users_no_api_keys_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_tenancy_admin_users_no_api_keys/identity_tenancy_admin_users_no_api_keys_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_tenancy_admin_users_no_api_keys: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_tenancy_admin_users_no_api_keys.identity_tenancy_admin_users_no_api_keys.identity_client", @@ -102,7 +102,7 @@ class Test_identity_tenancy_admin_users_no_api_keys: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_tenancy_admin_users_no_api_keys.identity_tenancy_admin_users_no_api_keys.identity_client", @@ -136,7 +136,7 @@ class Test_identity_tenancy_admin_users_no_api_keys: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_tenancy_admin_users_no_api_keys" @@ -187,7 +187,7 @@ class Test_identity_tenancy_admin_users_no_api_keys: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_tenancy_admin_users_no_api_keys.identity_tenancy_admin_users_no_api_keys.identity_client", @@ -221,7 +221,7 @@ class Test_identity_tenancy_admin_users_no_api_keys: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_tenancy_admin_users_no_api_keys" diff --git a/tests/providers/oraclecloud/services/identity/identity_user_api_keys_rotated_90_days/identity_user_api_keys_rotated_90_days_test.py b/tests/providers/oraclecloud/services/identity/identity_user_api_keys_rotated_90_days/identity_user_api_keys_rotated_90_days_test.py index 0167d60e7d..0c42ea1c4e 100644 --- a/tests/providers/oraclecloud/services/identity/identity_user_api_keys_rotated_90_days/identity_user_api_keys_rotated_90_days_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_user_api_keys_rotated_90_days/identity_user_api_keys_rotated_90_days_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_user_api_keys_rotated_90_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_api_keys_rotated_90_days.identity_user_api_keys_rotated_90_days.identity_client", @@ -102,7 +102,7 @@ class Test_identity_user_api_keys_rotated_90_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_api_keys_rotated_90_days.identity_user_api_keys_rotated_90_days.identity_client", @@ -136,7 +136,7 @@ class Test_identity_user_api_keys_rotated_90_days: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_user_api_keys_rotated_90_days" @@ -187,7 +187,7 @@ class Test_identity_user_api_keys_rotated_90_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_api_keys_rotated_90_days.identity_user_api_keys_rotated_90_days.identity_client", @@ -221,7 +221,7 @@ class Test_identity_user_api_keys_rotated_90_days: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_user_api_keys_rotated_90_days" diff --git a/tests/providers/oraclecloud/services/identity/identity_user_auth_tokens_rotated_90_days/identity_user_auth_tokens_rotated_90_days_test.py b/tests/providers/oraclecloud/services/identity/identity_user_auth_tokens_rotated_90_days/identity_user_auth_tokens_rotated_90_days_test.py index 4079a795c8..d0b7f8781f 100644 --- a/tests/providers/oraclecloud/services/identity/identity_user_auth_tokens_rotated_90_days/identity_user_auth_tokens_rotated_90_days_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_user_auth_tokens_rotated_90_days/identity_user_auth_tokens_rotated_90_days_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_user_auth_tokens_rotated_90_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_auth_tokens_rotated_90_days.identity_user_auth_tokens_rotated_90_days.identity_client", @@ -102,7 +102,7 @@ class Test_identity_user_auth_tokens_rotated_90_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_auth_tokens_rotated_90_days.identity_user_auth_tokens_rotated_90_days.identity_client", @@ -136,7 +136,7 @@ class Test_identity_user_auth_tokens_rotated_90_days: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_user_auth_tokens_rotated_90_days" @@ -187,7 +187,7 @@ class Test_identity_user_auth_tokens_rotated_90_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_auth_tokens_rotated_90_days.identity_user_auth_tokens_rotated_90_days.identity_client", @@ -221,7 +221,7 @@ class Test_identity_user_auth_tokens_rotated_90_days: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_user_auth_tokens_rotated_90_days" diff --git a/tests/providers/oraclecloud/services/identity/identity_user_customer_secret_keys_rotated_90_days/identity_user_customer_secret_keys_rotated_90_days_test.py b/tests/providers/oraclecloud/services/identity/identity_user_customer_secret_keys_rotated_90_days/identity_user_customer_secret_keys_rotated_90_days_test.py index b17428f1f6..c5e98ac6b3 100644 --- a/tests/providers/oraclecloud/services/identity/identity_user_customer_secret_keys_rotated_90_days/identity_user_customer_secret_keys_rotated_90_days_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_user_customer_secret_keys_rotated_90_days/identity_user_customer_secret_keys_rotated_90_days_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_user_customer_secret_keys_rotated_90_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_customer_secret_keys_rotated_90_days.identity_user_customer_secret_keys_rotated_90_days.identity_client", @@ -102,7 +102,7 @@ class Test_identity_user_customer_secret_keys_rotated_90_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_customer_secret_keys_rotated_90_days.identity_user_customer_secret_keys_rotated_90_days.identity_client", @@ -136,7 +136,7 @@ class Test_identity_user_customer_secret_keys_rotated_90_days: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_user_customer_secret_keys_rotated_90_days" @@ -187,7 +187,7 @@ class Test_identity_user_customer_secret_keys_rotated_90_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_customer_secret_keys_rotated_90_days.identity_user_customer_secret_keys_rotated_90_days.identity_client", @@ -221,7 +221,7 @@ class Test_identity_user_customer_secret_keys_rotated_90_days: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_user_customer_secret_keys_rotated_90_days" diff --git a/tests/providers/oraclecloud/services/identity/identity_user_db_passwords_rotated_90_days/identity_user_db_passwords_rotated_90_days_test.py b/tests/providers/oraclecloud/services/identity/identity_user_db_passwords_rotated_90_days/identity_user_db_passwords_rotated_90_days_test.py index 7e362e9d85..8d031640db 100644 --- a/tests/providers/oraclecloud/services/identity/identity_user_db_passwords_rotated_90_days/identity_user_db_passwords_rotated_90_days_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_user_db_passwords_rotated_90_days/identity_user_db_passwords_rotated_90_days_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_user_db_passwords_rotated_90_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_db_passwords_rotated_90_days.identity_user_db_passwords_rotated_90_days.identity_client", @@ -102,7 +102,7 @@ class Test_identity_user_db_passwords_rotated_90_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_db_passwords_rotated_90_days.identity_user_db_passwords_rotated_90_days.identity_client", @@ -136,7 +136,7 @@ class Test_identity_user_db_passwords_rotated_90_days: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_user_db_passwords_rotated_90_days" @@ -187,7 +187,7 @@ class Test_identity_user_db_passwords_rotated_90_days: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_db_passwords_rotated_90_days.identity_user_db_passwords_rotated_90_days.identity_client", @@ -221,7 +221,7 @@ class Test_identity_user_db_passwords_rotated_90_days: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_user_db_passwords_rotated_90_days" diff --git a/tests/providers/oraclecloud/services/identity/identity_user_mfa_enabled_console_access/identity_user_mfa_enabled_console_access_test.py b/tests/providers/oraclecloud/services/identity/identity_user_mfa_enabled_console_access/identity_user_mfa_enabled_console_access_test.py index b55dd61581..534d40b22a 100644 --- a/tests/providers/oraclecloud/services/identity/identity_user_mfa_enabled_console_access/identity_user_mfa_enabled_console_access_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_user_mfa_enabled_console_access/identity_user_mfa_enabled_console_access_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_user_mfa_enabled_console_access: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_mfa_enabled_console_access.identity_user_mfa_enabled_console_access.identity_client", @@ -102,7 +102,7 @@ class Test_identity_user_mfa_enabled_console_access: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_mfa_enabled_console_access.identity_user_mfa_enabled_console_access.identity_client", @@ -136,7 +136,7 @@ class Test_identity_user_mfa_enabled_console_access: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_user_mfa_enabled_console_access" @@ -187,7 +187,7 @@ class Test_identity_user_mfa_enabled_console_access: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_mfa_enabled_console_access.identity_user_mfa_enabled_console_access.identity_client", @@ -221,7 +221,7 @@ class Test_identity_user_mfa_enabled_console_access: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_user_mfa_enabled_console_access" diff --git a/tests/providers/oraclecloud/services/identity/identity_user_valid_email_address/identity_user_valid_email_address_test.py b/tests/providers/oraclecloud/services/identity/identity_user_valid_email_address/identity_user_valid_email_address_test.py index b476be1e87..c1e661b7db 100644 --- a/tests/providers/oraclecloud/services/identity/identity_user_valid_email_address/identity_user_valid_email_address_test.py +++ b/tests/providers/oraclecloud/services/identity/identity_user_valid_email_address/identity_user_valid_email_address_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_identity_user_valid_email_address: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_valid_email_address.identity_user_valid_email_address.identity_client", @@ -102,7 +102,7 @@ class Test_identity_user_valid_email_address: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_valid_email_address.identity_user_valid_email_address.identity_client", @@ -136,7 +136,7 @@ class Test_identity_user_valid_email_address: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "identity_user_valid_email_address" @@ -187,7 +187,7 @@ class Test_identity_user_valid_email_address: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.identity.identity_user_valid_email_address.identity_user_valid_email_address.identity_client", @@ -221,7 +221,7 @@ class Test_identity_user_valid_email_address: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "identity_user_valid_email_address" diff --git a/tests/providers/oraclecloud/services/integration/integration_instance_access_restricted/integration_instance_access_restricted_test.py b/tests/providers/oraclecloud/services/integration/integration_instance_access_restricted/integration_instance_access_restricted_test.py index 99ea00d511..42def0ee5b 100644 --- a/tests/providers/oraclecloud/services/integration/integration_instance_access_restricted/integration_instance_access_restricted_test.py +++ b/tests/providers/oraclecloud/services/integration/integration_instance_access_restricted/integration_instance_access_restricted_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_integration_instance_access_restricted: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.integration.integration_instance_access_restricted.integration_instance_access_restricted.integration_client", @@ -102,7 +102,7 @@ class Test_integration_instance_access_restricted: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.integration.integration_instance_access_restricted.integration_instance_access_restricted.integration_client", @@ -136,7 +136,7 @@ class Test_integration_instance_access_restricted: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "integration_instance_access_restricted" @@ -187,7 +187,7 @@ class Test_integration_instance_access_restricted: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.integration.integration_instance_access_restricted.integration_instance_access_restricted.integration_client", @@ -221,7 +221,7 @@ class Test_integration_instance_access_restricted: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "integration_instance_access_restricted" diff --git a/tests/providers/oraclecloud/services/integration/integration_service_test.py b/tests/providers/oraclecloud/services/integration/integration_service_test.py index 27170bb0c2..a1f8cf3825 100644 --- a/tests/providers/oraclecloud/services/integration/integration_service_test.py +++ b/tests/providers/oraclecloud/services/integration/integration_service_test.py @@ -1,12 +1,12 @@ from unittest.mock import patch -from tests.providers.oraclecloud.oci_fixtures import set_mocked_oci_provider +from tests.providers.oraclecloud.oci_fixtures import set_mocked_oraclecloud_provider class TestIntegrationService: def test_service(self): """Test that integration service can be instantiated and mocked""" - oci_provider = set_mocked_oci_provider() + oraclecloud_provider = set_mocked_oraclecloud_provider() # Mock the entire service initialization with patch( @@ -17,14 +17,14 @@ class TestIntegrationService: Integration, ) - integration_client = Integration(oci_provider) + integration_client = Integration(oraclecloud_provider) # Manually set required attributes since __init__ was mocked integration_client.service = "integration" - integration_client.provider = oci_provider + integration_client.provider = oraclecloud_provider integration_client.audited_compartments = {} integration_client.regional_clients = {} # Verify service name assert integration_client.service == "integration" - assert integration_client.provider == oci_provider + assert integration_client.provider == oraclecloud_provider diff --git a/tests/providers/oraclecloud/services/kms/kms_key_rotation_enabled/kms_key_rotation_enabled_test.py b/tests/providers/oraclecloud/services/kms/kms_key_rotation_enabled/kms_key_rotation_enabled_test.py index 51ee56d597..bc9ec964a8 100644 --- a/tests/providers/oraclecloud/services/kms/kms_key_rotation_enabled/kms_key_rotation_enabled_test.py +++ b/tests/providers/oraclecloud/services/kms/kms_key_rotation_enabled/kms_key_rotation_enabled_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_kms_key_rotation_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.kms.kms_key_rotation_enabled.kms_key_rotation_enabled.kms_client", @@ -102,7 +102,7 @@ class Test_kms_key_rotation_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.kms.kms_key_rotation_enabled.kms_key_rotation_enabled.kms_client", @@ -136,7 +136,7 @@ class Test_kms_key_rotation_enabled: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "kms_key_rotation_enabled" @@ -187,7 +187,7 @@ class Test_kms_key_rotation_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.kms.kms_key_rotation_enabled.kms_key_rotation_enabled.kms_client", @@ -221,7 +221,7 @@ class Test_kms_key_rotation_enabled: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "kms_key_rotation_enabled" diff --git a/tests/providers/oraclecloud/services/kms/kms_service_test.py b/tests/providers/oraclecloud/services/kms/kms_service_test.py index 7b63287b62..3b87771ab8 100644 --- a/tests/providers/oraclecloud/services/kms/kms_service_test.py +++ b/tests/providers/oraclecloud/services/kms/kms_service_test.py @@ -1,12 +1,12 @@ from unittest.mock import patch -from tests.providers.oraclecloud.oci_fixtures import set_mocked_oci_provider +from tests.providers.oraclecloud.oci_fixtures import set_mocked_oraclecloud_provider class TestKmsService: def test_service(self): """Test that kms service can be instantiated and mocked""" - oci_provider = set_mocked_oci_provider() + oraclecloud_provider = set_mocked_oraclecloud_provider() # Mock the entire service initialization with patch( @@ -15,14 +15,14 @@ class TestKmsService: ): from prowler.providers.oraclecloud.services.kms.kms_service import Kms - kms_client = Kms(oci_provider) + kms_client = Kms(oraclecloud_provider) # Manually set required attributes since __init__ was mocked kms_client.service = "kms" - kms_client.provider = oci_provider + kms_client.provider = oraclecloud_provider kms_client.audited_compartments = {} kms_client.regional_clients = {} # Verify service name assert kms_client.service == "kms" - assert kms_client.provider == oci_provider + assert kms_client.provider == oraclecloud_provider diff --git a/tests/providers/oraclecloud/services/logging/logging_service_test.py b/tests/providers/oraclecloud/services/logging/logging_service_test.py index 3cea56d26b..dc52845a9f 100644 --- a/tests/providers/oraclecloud/services/logging/logging_service_test.py +++ b/tests/providers/oraclecloud/services/logging/logging_service_test.py @@ -1,12 +1,12 @@ from unittest.mock import patch -from tests.providers.oraclecloud.oci_fixtures import set_mocked_oci_provider +from tests.providers.oraclecloud.oci_fixtures import set_mocked_oraclecloud_provider class TestLoggingService: def test_service(self): """Test that logging service can be instantiated and mocked""" - oci_provider = set_mocked_oci_provider() + oraclecloud_provider = set_mocked_oraclecloud_provider() # Mock the entire service initialization with patch( @@ -17,14 +17,14 @@ class TestLoggingService: Logging, ) - logging_client = Logging(oci_provider) + logging_client = Logging(oraclecloud_provider) # Manually set required attributes since __init__ was mocked logging_client.service = "logging" - logging_client.provider = oci_provider + logging_client.provider = oraclecloud_provider logging_client.audited_compartments = {} logging_client.regional_clients = {} # Verify service name assert logging_client.service == "logging" - assert logging_client.provider == oci_provider + assert logging_client.provider == oraclecloud_provider diff --git a/tests/providers/oraclecloud/services/network/network_default_security_list_restricts_traffic/network_default_security_list_restricts_traffic_test.py b/tests/providers/oraclecloud/services/network/network_default_security_list_restricts_traffic/network_default_security_list_restricts_traffic_test.py index 0678d7e5a2..c79c934146 100644 --- a/tests/providers/oraclecloud/services/network/network_default_security_list_restricts_traffic/network_default_security_list_restricts_traffic_test.py +++ b/tests/providers/oraclecloud/services/network/network_default_security_list_restricts_traffic/network_default_security_list_restricts_traffic_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_network_default_security_list_restricts_traffic: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_default_security_list_restricts_traffic.network_default_security_list_restricts_traffic.network_client", @@ -102,7 +102,7 @@ class Test_network_default_security_list_restricts_traffic: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_default_security_list_restricts_traffic.network_default_security_list_restricts_traffic.network_client", @@ -136,7 +136,7 @@ class Test_network_default_security_list_restricts_traffic: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "network_default_security_list_restricts_traffic" @@ -187,7 +187,7 @@ class Test_network_default_security_list_restricts_traffic: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_default_security_list_restricts_traffic.network_default_security_list_restricts_traffic.network_client", @@ -221,7 +221,7 @@ class Test_network_default_security_list_restricts_traffic: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "network_default_security_list_restricts_traffic" diff --git a/tests/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_rdp_port/network_security_group_ingress_from_internet_to_rdp_port_test.py b/tests/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_rdp_port/network_security_group_ingress_from_internet_to_rdp_port_test.py index ec27474df6..55f94563c3 100644 --- a/tests/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_rdp_port/network_security_group_ingress_from_internet_to_rdp_port_test.py +++ b/tests/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_rdp_port/network_security_group_ingress_from_internet_to_rdp_port_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_network_security_group_ingress_from_internet_to_rdp_port: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_security_group_ingress_from_internet_to_rdp_port.network_security_group_ingress_from_internet_to_rdp_port.network_client", @@ -102,7 +102,7 @@ class Test_network_security_group_ingress_from_internet_to_rdp_port: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_security_group_ingress_from_internet_to_rdp_port.network_security_group_ingress_from_internet_to_rdp_port.network_client", @@ -136,7 +136,7 @@ class Test_network_security_group_ingress_from_internet_to_rdp_port: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "network_security_group_ingress_from_internet_to_rdp_port" @@ -187,7 +187,7 @@ class Test_network_security_group_ingress_from_internet_to_rdp_port: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_security_group_ingress_from_internet_to_rdp_port.network_security_group_ingress_from_internet_to_rdp_port.network_client", @@ -221,7 +221,7 @@ class Test_network_security_group_ingress_from_internet_to_rdp_port: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "network_security_group_ingress_from_internet_to_rdp_port" diff --git a/tests/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_ssh_port/network_security_group_ingress_from_internet_to_ssh_port_test.py b/tests/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_ssh_port/network_security_group_ingress_from_internet_to_ssh_port_test.py index 691256149b..baa7c49f12 100644 --- a/tests/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_ssh_port/network_security_group_ingress_from_internet_to_ssh_port_test.py +++ b/tests/providers/oraclecloud/services/network/network_security_group_ingress_from_internet_to_ssh_port/network_security_group_ingress_from_internet_to_ssh_port_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_network_security_group_ingress_from_internet_to_ssh_port: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_security_group_ingress_from_internet_to_ssh_port.network_security_group_ingress_from_internet_to_ssh_port.network_client", @@ -102,7 +102,7 @@ class Test_network_security_group_ingress_from_internet_to_ssh_port: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_security_group_ingress_from_internet_to_ssh_port.network_security_group_ingress_from_internet_to_ssh_port.network_client", @@ -136,7 +136,7 @@ class Test_network_security_group_ingress_from_internet_to_ssh_port: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "network_security_group_ingress_from_internet_to_ssh_port" @@ -187,7 +187,7 @@ class Test_network_security_group_ingress_from_internet_to_ssh_port: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_security_group_ingress_from_internet_to_ssh_port.network_security_group_ingress_from_internet_to_ssh_port.network_client", @@ -221,7 +221,7 @@ class Test_network_security_group_ingress_from_internet_to_ssh_port: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "network_security_group_ingress_from_internet_to_ssh_port" diff --git a/tests/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_rdp_port/network_security_list_ingress_from_internet_to_rdp_port_test.py b/tests/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_rdp_port/network_security_list_ingress_from_internet_to_rdp_port_test.py index 7d8651deda..5d4cdb8875 100644 --- a/tests/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_rdp_port/network_security_list_ingress_from_internet_to_rdp_port_test.py +++ b/tests/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_rdp_port/network_security_list_ingress_from_internet_to_rdp_port_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_network_security_list_ingress_from_internet_to_rdp_port: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_security_list_ingress_from_internet_to_rdp_port.network_security_list_ingress_from_internet_to_rdp_port.network_client", @@ -102,7 +102,7 @@ class Test_network_security_list_ingress_from_internet_to_rdp_port: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_security_list_ingress_from_internet_to_rdp_port.network_security_list_ingress_from_internet_to_rdp_port.network_client", @@ -136,7 +136,7 @@ class Test_network_security_list_ingress_from_internet_to_rdp_port: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "network_security_list_ingress_from_internet_to_rdp_port" @@ -187,7 +187,7 @@ class Test_network_security_list_ingress_from_internet_to_rdp_port: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_security_list_ingress_from_internet_to_rdp_port.network_security_list_ingress_from_internet_to_rdp_port.network_client", @@ -221,7 +221,7 @@ class Test_network_security_list_ingress_from_internet_to_rdp_port: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "network_security_list_ingress_from_internet_to_rdp_port" diff --git a/tests/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_ssh_port/network_security_list_ingress_from_internet_to_ssh_port_test.py b/tests/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_ssh_port/network_security_list_ingress_from_internet_to_ssh_port_test.py index d8fef5465d..cb7c2875b7 100644 --- a/tests/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_ssh_port/network_security_list_ingress_from_internet_to_ssh_port_test.py +++ b/tests/providers/oraclecloud/services/network/network_security_list_ingress_from_internet_to_ssh_port/network_security_list_ingress_from_internet_to_ssh_port_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_network_security_list_ingress_from_internet_to_ssh_port: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_security_list_ingress_from_internet_to_ssh_port.network_security_list_ingress_from_internet_to_ssh_port.network_client", @@ -102,7 +102,7 @@ class Test_network_security_list_ingress_from_internet_to_ssh_port: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_security_list_ingress_from_internet_to_ssh_port.network_security_list_ingress_from_internet_to_ssh_port.network_client", @@ -136,7 +136,7 @@ class Test_network_security_list_ingress_from_internet_to_ssh_port: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "network_security_list_ingress_from_internet_to_ssh_port" @@ -187,7 +187,7 @@ class Test_network_security_list_ingress_from_internet_to_ssh_port: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_security_list_ingress_from_internet_to_ssh_port.network_security_list_ingress_from_internet_to_ssh_port.network_client", @@ -221,7 +221,7 @@ class Test_network_security_list_ingress_from_internet_to_ssh_port: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "network_security_list_ingress_from_internet_to_ssh_port" diff --git a/tests/providers/oraclecloud/services/network/network_service_test.py b/tests/providers/oraclecloud/services/network/network_service_test.py index c73df8319c..6960e1d931 100644 --- a/tests/providers/oraclecloud/services/network/network_service_test.py +++ b/tests/providers/oraclecloud/services/network/network_service_test.py @@ -1,12 +1,12 @@ from unittest.mock import patch -from tests.providers.oraclecloud.oci_fixtures import set_mocked_oci_provider +from tests.providers.oraclecloud.oci_fixtures import set_mocked_oraclecloud_provider class TestNetworkService: def test_service(self): """Test that network service can be instantiated and mocked""" - oci_provider = set_mocked_oci_provider() + oraclecloud_provider = set_mocked_oraclecloud_provider() # Mock the entire service initialization with patch( @@ -17,14 +17,14 @@ class TestNetworkService: Network, ) - network_client = Network(oci_provider) + network_client = Network(oraclecloud_provider) # Manually set required attributes since __init__ was mocked network_client.service = "network" - network_client.provider = oci_provider + network_client.provider = oraclecloud_provider network_client.audited_compartments = {} network_client.regional_clients = {} # Verify service name assert network_client.service == "network" - assert network_client.provider == oci_provider + assert network_client.provider == oraclecloud_provider diff --git a/tests/providers/oraclecloud/services/network/network_vcn_subnet_flow_logs_enabled/network_vcn_subnet_flow_logs_enabled_test.py b/tests/providers/oraclecloud/services/network/network_vcn_subnet_flow_logs_enabled/network_vcn_subnet_flow_logs_enabled_test.py index 286dae00f4..ce41c90733 100644 --- a/tests/providers/oraclecloud/services/network/network_vcn_subnet_flow_logs_enabled/network_vcn_subnet_flow_logs_enabled_test.py +++ b/tests/providers/oraclecloud/services/network/network_vcn_subnet_flow_logs_enabled/network_vcn_subnet_flow_logs_enabled_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -41,7 +41,7 @@ class Test_network_vcn_subnet_flow_logs_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_vcn_subnet_flow_logs_enabled.network_vcn_subnet_flow_logs_enabled.network_client", @@ -102,7 +102,7 @@ class Test_network_vcn_subnet_flow_logs_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_vcn_subnet_flow_logs_enabled.network_vcn_subnet_flow_logs_enabled.network_client", @@ -136,7 +136,7 @@ class Test_network_vcn_subnet_flow_logs_enabled: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "network_vcn_subnet_flow_logs_enabled" @@ -187,7 +187,7 @@ class Test_network_vcn_subnet_flow_logs_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.network.network_vcn_subnet_flow_logs_enabled.network_vcn_subnet_flow_logs_enabled.network_client", @@ -221,7 +221,7 @@ class Test_network_vcn_subnet_flow_logs_enabled: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "network_vcn_subnet_flow_logs_enabled" diff --git a/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_encrypted_with_cmk/objectstorage_bucket_encrypted_with_cmk_test.py b/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_encrypted_with_cmk/objectstorage_bucket_encrypted_with_cmk_test.py index ab0231996b..2632c61f8f 100644 --- a/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_encrypted_with_cmk/objectstorage_bucket_encrypted_with_cmk_test.py +++ b/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_encrypted_with_cmk/objectstorage_bucket_encrypted_with_cmk_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -43,7 +43,7 @@ class Test_objectstorage_bucket_encrypted_with_cmk: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.objectstorage.objectstorage_bucket_encrypted_with_cmk.objectstorage_bucket_encrypted_with_cmk.objectstorage_client", @@ -106,7 +106,7 @@ class Test_objectstorage_bucket_encrypted_with_cmk: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.objectstorage.objectstorage_bucket_encrypted_with_cmk.objectstorage_bucket_encrypted_with_cmk.objectstorage_client", @@ -140,7 +140,7 @@ class Test_objectstorage_bucket_encrypted_with_cmk: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "objectstorage_bucket_encrypted_with_cmk" @@ -193,7 +193,7 @@ class Test_objectstorage_bucket_encrypted_with_cmk: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.objectstorage.objectstorage_bucket_encrypted_with_cmk.objectstorage_bucket_encrypted_with_cmk.objectstorage_client", @@ -227,7 +227,7 @@ class Test_objectstorage_bucket_encrypted_with_cmk: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "objectstorage_bucket_encrypted_with_cmk" diff --git a/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_logging_enabled/objectstorage_bucket_logging_enabled_test.py b/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_logging_enabled/objectstorage_bucket_logging_enabled_test.py index 708ae586a7..66239195ad 100644 --- a/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_logging_enabled/objectstorage_bucket_logging_enabled_test.py +++ b/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_logging_enabled/objectstorage_bucket_logging_enabled_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -43,7 +43,7 @@ class Test_objectstorage_bucket_logging_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.objectstorage.objectstorage_bucket_logging_enabled.objectstorage_bucket_logging_enabled.objectstorage_client", @@ -106,7 +106,7 @@ class Test_objectstorage_bucket_logging_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.objectstorage.objectstorage_bucket_logging_enabled.objectstorage_bucket_logging_enabled.objectstorage_client", @@ -140,7 +140,7 @@ class Test_objectstorage_bucket_logging_enabled: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "objectstorage_bucket_logging_enabled" @@ -193,7 +193,7 @@ class Test_objectstorage_bucket_logging_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.objectstorage.objectstorage_bucket_logging_enabled.objectstorage_bucket_logging_enabled.objectstorage_client", @@ -227,7 +227,7 @@ class Test_objectstorage_bucket_logging_enabled: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "objectstorage_bucket_logging_enabled" diff --git a/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_not_publicly_accessible/objectstorage_bucket_not_publicly_accessible_test.py b/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_not_publicly_accessible/objectstorage_bucket_not_publicly_accessible_test.py index 6c1e8b200e..14e940dd6a 100644 --- a/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_not_publicly_accessible/objectstorage_bucket_not_publicly_accessible_test.py +++ b/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_not_publicly_accessible/objectstorage_bucket_not_publicly_accessible_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -43,7 +43,7 @@ class Test_objectstorage_bucket_not_publicly_accessible: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.objectstorage.objectstorage_bucket_not_publicly_accessible.objectstorage_bucket_not_publicly_accessible.objectstorage_client", @@ -106,7 +106,7 @@ class Test_objectstorage_bucket_not_publicly_accessible: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.objectstorage.objectstorage_bucket_not_publicly_accessible.objectstorage_bucket_not_publicly_accessible.objectstorage_client", @@ -140,7 +140,7 @@ class Test_objectstorage_bucket_not_publicly_accessible: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "objectstorage_bucket_not_publicly_accessible" @@ -193,7 +193,7 @@ class Test_objectstorage_bucket_not_publicly_accessible: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.objectstorage.objectstorage_bucket_not_publicly_accessible.objectstorage_bucket_not_publicly_accessible.objectstorage_client", @@ -227,7 +227,7 @@ class Test_objectstorage_bucket_not_publicly_accessible: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "objectstorage_bucket_not_publicly_accessible" diff --git a/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_versioning_enabled/objectstorage_bucket_versioning_enabled_test.py b/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_versioning_enabled/objectstorage_bucket_versioning_enabled_test.py index 432db038ac..ce5d13c0ab 100644 --- a/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_versioning_enabled/objectstorage_bucket_versioning_enabled_test.py +++ b/tests/providers/oraclecloud/services/objectstorage/objectstorage_bucket_versioning_enabled/objectstorage_bucket_versioning_enabled_test.py @@ -4,7 +4,7 @@ from tests.providers.oraclecloud.oci_fixtures import ( OCI_COMPARTMENT_ID, OCI_REGION, OCI_TENANCY_ID, - set_mocked_oci_provider, + set_mocked_oraclecloud_provider, ) @@ -43,7 +43,7 @@ class Test_objectstorage_bucket_versioning_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.objectstorage.objectstorage_bucket_versioning_enabled.objectstorage_bucket_versioning_enabled.objectstorage_client", @@ -106,7 +106,7 @@ class Test_objectstorage_bucket_versioning_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.objectstorage.objectstorage_bucket_versioning_enabled.objectstorage_bucket_versioning_enabled.objectstorage_client", @@ -140,7 +140,7 @@ class Test_objectstorage_bucket_versioning_enabled: assert pass_results[0].compartment_id is not None # Verify metadata - assert pass_results[0].check_metadata.Provider == "oci" + assert pass_results[0].check_metadata.Provider == "oraclecloud" assert ( pass_results[0].check_metadata.CheckID == "objectstorage_bucket_versioning_enabled" @@ -193,7 +193,7 @@ class Test_objectstorage_bucket_versioning_enabled: with ( mock.patch( "prowler.providers.common.provider.Provider.get_global_provider", - return_value=set_mocked_oci_provider(), + return_value=set_mocked_oraclecloud_provider(), ), mock.patch( "prowler.providers.oraclecloud.services.objectstorage.objectstorage_bucket_versioning_enabled.objectstorage_bucket_versioning_enabled.objectstorage_client", @@ -227,7 +227,7 @@ class Test_objectstorage_bucket_versioning_enabled: assert fail_results[0].compartment_id is not None # Verify metadata - assert fail_results[0].check_metadata.Provider == "oci" + assert fail_results[0].check_metadata.Provider == "oraclecloud" assert ( fail_results[0].check_metadata.CheckID == "objectstorage_bucket_versioning_enabled" diff --git a/tests/providers/oraclecloud/services/objectstorage/objectstorage_service_test.py b/tests/providers/oraclecloud/services/objectstorage/objectstorage_service_test.py index f4cbe05f87..1000dcea7a 100644 --- a/tests/providers/oraclecloud/services/objectstorage/objectstorage_service_test.py +++ b/tests/providers/oraclecloud/services/objectstorage/objectstorage_service_test.py @@ -1,12 +1,12 @@ from unittest.mock import patch -from tests.providers.oraclecloud.oci_fixtures import set_mocked_oci_provider +from tests.providers.oraclecloud.oci_fixtures import set_mocked_oraclecloud_provider class TestObjectStorageService: def test_service(self): """Test that objectstorage service can be instantiated and mocked""" - oci_provider = set_mocked_oci_provider() + oraclecloud_provider = set_mocked_oraclecloud_provider() # Mock the entire service initialization with patch( @@ -17,14 +17,14 @@ class TestObjectStorageService: ObjectStorage, ) - objectstorage_client = ObjectStorage(oci_provider) + objectstorage_client = ObjectStorage(oraclecloud_provider) # Manually set required attributes since __init__ was mocked objectstorage_client.service = "objectstorage" - objectstorage_client.provider = oci_provider + objectstorage_client.provider = oraclecloud_provider objectstorage_client.audited_compartments = {} objectstorage_client.regional_clients = {} # Verify service name assert objectstorage_client.service == "objectstorage" - assert objectstorage_client.provider == oci_provider + assert objectstorage_client.provider == oraclecloud_provider