ben.carrasco/prowler
1
0 Fork 0
mirror of https://github.com/prowler-cloud/prowler.git synced 2026-10-30 15:24:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(oci): rename OCI provider to oraclecloud with oci alias (#9126)

Browse Source
This commit is contained in:
Sergio Garcia authored and GitHub committed 2025-11-04 11:44:56 -05:00
1 parent 1e584c5b58
commit f16f94acf3
147 files changed
+623 -688
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

api/src/backend/api/migrations/0051_oraclecloud_provider.py
+2 -2
View File
@@ -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,
),
]
api/src/backend/api/models.py
+3 -3
View File
@@ -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.<resource_type>.<realm>.<region>.<unique_id>",
code="oci-uid",
code="oraclecloud-uid",
pointer="/data/attributes/uid",
)
api/src/backend/api/specs/v1.yaml
+99 -99
View File
@@ -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
api/src/backend/api/tests/test_utils.py
+3 -3
View File
@@ -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,
{},
),
],
api/src/backend/api/tests/test_views.py
+3 -3
View File
@@ -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",
api/src/backend/api/utils.py
+7 -7
View File
@@ -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)
api/src/backend/api/v1/serializers.py
+1 -1
View File
@@ -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(
api/src/backend/conftest.py
+1 -1
View File
@@ -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,
api/src/backend/tasks/jobs/export.py
+3 -3
View File
@@ -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),
],
}