99from openai import OpenAI , AsyncOpenAI
1010from tests .respx2 import MockRouter
1111from tests .respx2 .models import Call
12- from openai .types .admin .organization import GcpExternalStorageProvider , ExternalStorageConfiguration
12+ from openai .types .admin .organization import (
13+ AuditLogListResponse ,
14+ GcpExternalStorageProvider ,
15+ OciExternalStorageProvider ,
16+ ExternalStorageConfiguration ,
17+ )
1318from openai .types .admin .organization .external_storage_create_params import Provider
1419
1520BASE_URL = "https://example.com/v1"
6570 "future_provider_field" : {"retained" : True },
6671 },
6772 ),
73+ (
74+ {
75+ "type" : "oci" ,
76+ "tenancy_ocid" : "ocid1.tenancy.synthetic" ,
77+ "region" : "us-ashburn-1" ,
78+ "bucket" : "test-oci-bucket" ,
79+ },
80+ {
81+ "type" : "oci" ,
82+ "tenancy_ocid" : "ocid1.tenancy.synthetic" ,
83+ "region" : "us-ashburn-1" ,
84+ "bucket" : "test-oci-bucket" ,
85+ "future_provider_field" : {"retained" : True },
86+ },
87+ ),
6888]
6989
7090
@@ -82,7 +102,7 @@ def configuration(provider: dict[str, object], storage_id: str = "extstorage_tes
82102
83103
84104@pytest .mark .respx2 (base_url = BASE_URL )
85- @pytest .mark .parametrize ("provider,response_provider" , PROVIDERS , ids = ["aws" , "azure" , "gcp" ])
105+ @pytest .mark .parametrize ("provider,response_provider" , PROVIDERS , ids = ["aws" , "azure" , "gcp" , "oci" ])
86106def test_sync_external_storage_provider_and_admin_auth (
87107 provider : Provider , response_provider : dict [str , object ], respx2_mock : MockRouter
88108) -> None :
@@ -99,14 +119,19 @@ def test_sync_external_storage_provider_and_admin_auth(
99119 assert isinstance (result , ExternalStorageConfiguration )
100120 if provider ["type" ] == "gcp" :
101121 assert isinstance (result .provider , GcpExternalStorageProvider )
122+ elif provider ["type" ] == "oci" :
123+ assert isinstance (result .provider , OciExternalStorageProvider )
124+ assert result .provider .tenancy_ocid == provider ["tenancy_ocid" ]
125+ assert result .provider .region == provider ["region" ]
126+ assert result .provider .bucket == provider ["bucket" ]
102127 assert result .to_dict () == payload
103128 request = route .calls .last .request
104129 assert request .headers ["Authorization" ] == "Bearer test-admin-key"
105130 assert json .loads (request .content ) == {"project_id" : "proj_test" , "provider" : provider }
106131
107132
108133@pytest .mark .respx2 (base_url = BASE_URL )
109- @pytest .mark .parametrize ("provider,response_provider" , PROVIDERS , ids = ["aws" , "azure" , "gcp" ])
134+ @pytest .mark .parametrize ("provider,response_provider" , PROVIDERS , ids = ["aws" , "azure" , "gcp" , "oci" ])
110135async def test_async_external_storage_provider_and_admin_auth (
111136 provider : Provider , response_provider : dict [str , object ], respx2_mock : MockRouter
112137) -> None :
@@ -123,6 +148,11 @@ async def test_async_external_storage_provider_and_admin_auth(
123148 assert isinstance (result , ExternalStorageConfiguration )
124149 if provider ["type" ] == "gcp" :
125150 assert isinstance (result .provider , GcpExternalStorageProvider )
151+ elif provider ["type" ] == "oci" :
152+ assert isinstance (result .provider , OciExternalStorageProvider )
153+ assert result .provider .tenancy_ocid == provider ["tenancy_ocid" ]
154+ assert result .provider .region == provider ["region" ]
155+ assert result .provider .bucket == provider ["bucket" ]
126156 assert result .to_dict () == payload
127157 request = route .calls .last .request
128158 assert request .headers ["Authorization" ] == "Bearer test-admin-key"
@@ -201,3 +231,73 @@ async def test_async_external_storage_never_falls_back_to_project_key(
201231 with pytest .raises (TypeError , match = "Could not resolve authentication method" ):
202232 await client .admin .organization .external_storage .retrieve ("extstorage_test" )
203233 assert len (respx2_mock .calls ) == 0
234+
235+
236+ def mock_oci_audit_log (respx2_mock : MockRouter ) -> tuple [dict [str , object ], dict [str , object ]]:
237+ provider : dict [str , object ] = {
238+ "type" : "oci" ,
239+ "tenancy_ocid" : "ocid1.tenancy.synthetic" ,
240+ "region" : "us-ashburn-1" ,
241+ "bucket" : "test-oci-bucket" ,
242+ "future_provider_field" : {"retained" : True },
243+ }
244+ event : dict [str , object ] = {
245+ "id" : "audit_test" ,
246+ "effective_at" : 123 ,
247+ "type" : "external_storage.registered" ,
248+ "external_storage.registered" : {"id" : "extstorage_test" , "data" : {"provider" : provider }},
249+ "future_audit_field" : {"retained" : True },
250+ }
251+ respx2_mock .get ("/organization/audit_logs" ).mock (
252+ return_value = httpx2 .Response (
253+ 200 ,
254+ json = {
255+ "object" : "list" ,
256+ "data" : [event ],
257+ "first_id" : "audit_test" ,
258+ "last_id" : "audit_test" ,
259+ "has_more" : False ,
260+ },
261+ )
262+ )
263+ return event , provider
264+
265+
266+ def assert_oci_audit_log (result : AuditLogListResponse , event : dict [str , object ], provider : dict [str , object ]) -> None :
267+ assert result .external_storage_registered is not None
268+ assert result .external_storage_registered .data is not None
269+ parsed = result .external_storage_registered .data .provider
270+ assert isinstance (parsed , OciExternalStorageProvider )
271+ assert parsed .type == "oci"
272+ assert parsed .tenancy_ocid == provider ["tenancy_ocid" ]
273+ assert parsed .region == provider ["region" ]
274+ assert parsed .bucket == provider ["bucket" ]
275+ assert result .to_dict () == event
276+
277+
278+ @pytest .mark .respx2 (base_url = BASE_URL )
279+ def test_sync_oci_audit_log_uses_shared_provider (respx2_mock : MockRouter ) -> None :
280+ event , provider = mock_oci_audit_log (respx2_mock )
281+ with OpenAI (
282+ base_url = BASE_URL ,
283+ api_key = "test-project-key" ,
284+ admin_api_key = "test-admin-key" ,
285+ _strict_response_validation = True ,
286+ ) as client :
287+ result = client .admin .organization .audit_logs .list ().data [0 ]
288+ assert_oci_audit_log (result , event , provider )
289+ assert respx2_mock .calls .last .request .headers ["Authorization" ] == "Bearer test-admin-key"
290+
291+
292+ @pytest .mark .respx2 (base_url = BASE_URL )
293+ async def test_async_oci_audit_log_uses_shared_provider (respx2_mock : MockRouter ) -> None :
294+ event , provider = mock_oci_audit_log (respx2_mock )
295+ async with AsyncOpenAI (
296+ base_url = BASE_URL ,
297+ api_key = "test-project-key" ,
298+ admin_api_key = "test-admin-key" ,
299+ _strict_response_validation = True ,
300+ ) as client :
301+ result = (await client .admin .organization .audit_logs .list ()).data [0 ]
302+ assert_oci_audit_log (result , event , provider )
303+ assert respx2_mock .calls .last .request .headers ["Authorization" ] == "Bearer test-admin-key"
0 commit comments