Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit02ce49e

Browse files
authored
Merge pull request#1363 from python-gitlab/feat/all-audit-events
Feat: cover all audit events
2 parentse798c9b +2a0fbdf commit02ce49e

File tree

6 files changed

+98
-25
lines changed

6 files changed

+98
-25
lines changed

‎gitlab/tests/objects/test_audit_events.py

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
importpytest
99
importresponses
1010

11-
fromgitlab.v4.objects.audit_eventsimportProjectAudit
11+
fromgitlab.v4.objects.audit_eventsimport (
12+
AuditEvent,
13+
GroupAuditEvent,
14+
ProjectAuditEvent,
15+
)
1216

1317
id=5
1418

@@ -32,11 +36,11 @@
3236
}
3337

3438
audit_events_url=re.compile(
35-
r"http://localhost/api/v4/((groups|projects)/1/)audit_events"
39+
r"http://localhost/api/v4/((groups|projects)/1/)?audit_events"
3640
)
3741

3842
audit_events_url_id=re.compile(
39-
rf"http://localhost/api/v4/((groups|projects)/1/)audit_events/{id}"
43+
rf"http://localhost/api/v4/((groups|projects)/1/)?audit_events/{id}"
4044
)
4145

4246

@@ -54,7 +58,7 @@ def resp_list_audit_events():
5458

5559

5660
@pytest.fixture
57-
defresp_get_variable():
61+
defresp_get_audit_event():
5862
withresponses.RequestsMock()asrsps:
5963
rsps.add(
6064
method=responses.GET,
@@ -66,14 +70,40 @@ def resp_get_variable():
6670
yieldrsps
6771

6872

73+
deftest_list_instance_audit_events(gl,resp_list_audit_events):
74+
audit_events=gl.audit_events.list()
75+
assertisinstance(audit_events,list)
76+
assertisinstance(audit_events[0],AuditEvent)
77+
assertaudit_events[0].id==id
78+
79+
80+
deftest_get_instance_audit_events(gl,resp_get_audit_event):
81+
audit_event=gl.audit_events.get(id)
82+
assertisinstance(audit_event,AuditEvent)
83+
assertaudit_event.id==id
84+
85+
86+
deftest_list_group_audit_events(group,resp_list_audit_events):
87+
audit_events=group.audit_events.list()
88+
assertisinstance(audit_events,list)
89+
assertisinstance(audit_events[0],GroupAuditEvent)
90+
assertaudit_events[0].id==id
91+
92+
93+
deftest_get_group_audit_events(group,resp_get_audit_event):
94+
audit_event=group.audit_events.get(id)
95+
assertisinstance(audit_event,GroupAuditEvent)
96+
assertaudit_event.id==id
97+
98+
6999
deftest_list_project_audit_events(project,resp_list_audit_events):
70100
audit_events=project.audit_events.list()
71101
assertisinstance(audit_events,list)
72-
assertisinstance(audit_events[0],ProjectAudit)
102+
assertisinstance(audit_events[0],ProjectAuditEvent)
73103
assertaudit_events[0].id==id
74104

75105

76-
deftest_get_project_audit_events(project,resp_get_variable):
106+
deftest_get_project_audit_events(project,resp_get_audit_event):
77107
audit_event=project.audit_events.get(id)
78-
assertisinstance(audit_event,ProjectAudit)
108+
assertisinstance(audit_event,ProjectAuditEvent)
79109
assertaudit_event.id==id

‎gitlab/v4/objects/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from .access_requestsimport*
1919
from .appearanceimport*
2020
from .applicationsimport*
21+
from .audit_eventsimport*
2122
from .award_emojisimport*
2223
from .badgesimport*
2324
from .boardsimport*

‎gitlab/v4/objects/audit_events.py

Lines changed: 56 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,75 @@
11
"""
22
GitLab API:
3-
https://docs.gitlab.com/ee/api/audit_events.html#project-audit-events
3+
https://docs.gitlab.com/ee/api/audit_events.html
44
"""
5+
importwarnings
56

67
fromgitlab.baseimportRESTManager,RESTObject
78
fromgitlab.mixinsimportRetrieveMixin
89

910
__all__= [
11+
"AuditEvent",
12+
"AuditEventManager",
13+
"GroupAuditEvent",
14+
"GroupAuditEventManager",
15+
"ProjectAuditEvent",
16+
"ProjectAuditEventManager",
1017
"ProjectAudit",
1118
"ProjectAuditManager",
1219
]
1320

1421

15-
classProjectAudit(RESTObject):
22+
classAuditEvent(RESTObject):
1623
_id_attr="id"
1724

1825

19-
classProjectAuditManager(RetrieveMixin,RESTManager):
26+
classAuditEventManager(RetrieveMixin,RESTManager):
27+
_path="/audit_events"
28+
_obj_cls=AuditEvent
29+
_list_filters= ("created_after","created_before","entity_type","entity_id")
30+
31+
32+
classGroupAuditEvent(RESTObject):
33+
_id_attr="id"
34+
35+
36+
classGroupAuditEventManager(RetrieveMixin,RESTManager):
37+
_path="/groups/%(group_id)s/audit_events"
38+
_obj_cls=GroupAuditEvent
39+
_from_parent_attrs= {"group_id":"id"}
40+
_list_filters= ("created_after","created_before")
41+
42+
43+
classProjectAuditEvent(RESTObject):
44+
_id_attr="id"
45+
46+
def__init_subclass__(self):
47+
warnings.warn(
48+
"This class has been renamed to ProjectAuditEvent "
49+
"and will be removed in a future release.",
50+
DeprecationWarning,
51+
2,
52+
)
53+
54+
55+
classProjectAuditEventManager(RetrieveMixin,RESTManager):
2056
_path="/projects/%(project_id)s/audit_events"
21-
_obj_cls=ProjectAudit
57+
_obj_cls=ProjectAuditEvent
2258
_from_parent_attrs= {"project_id":"id"}
2359
_list_filters= ("created_after","created_before")
60+
61+
def__init_subclass__(self):
62+
warnings.warn(
63+
"This class has been renamed to ProjectAuditEventManager "
64+
"and will be removed in a future release.",
65+
DeprecationWarning,
66+
2,
67+
)
68+
69+
70+
classProjectAudit(ProjectAuditEvent):
71+
pass
72+
73+
74+
classProjectAuditManager(ProjectAuditEventManager):
75+
pass

‎gitlab/v4/objects/events.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
__all__= [
77
"Event",
88
"EventManager",
9-
"AuditEvent",
10-
"AuditEventManager",
119
"GroupEpicResourceLabelEvent",
1210
"GroupEpicResourceLabelEventManager",
1311
"ProjectEvent",
@@ -36,16 +34,6 @@ class EventManager(ListMixin, RESTManager):
3634
_list_filters= ("action","target_type","before","after","sort")
3735

3836

39-
classAuditEvent(RESTObject):
40-
_id_attr="id"
41-
42-
43-
classAuditEventManager(ListMixin,RESTManager):
44-
_path="/audit_events"
45-
_obj_cls=AuditEvent
46-
_list_filters= ("created_after","created_before","entity_type","entity_id")
47-
48-
4937
classGroupEpicResourceLabelEvent(RESTObject):
5038
pass
5139

‎gitlab/v4/objects/groups.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
fromgitlab.baseimportRESTManager,RESTObject
44
fromgitlab.mixinsimportCRUDMixin,ListMixin,ObjectDeleteMixin,SaveMixin
55
from .access_requestsimportGroupAccessRequestManager
6+
from .audit_eventsimportGroupAuditEventManager
67
from .badgesimportGroupBadgeManager
78
from .boardsimportGroupBoardManager
89
from .custom_attributesimportGroupCustomAttributeManager
@@ -34,6 +35,7 @@ class Group(SaveMixin, ObjectDeleteMixin, RESTObject):
3435
_short_print_attr="name"
3536
_managers= (
3637
("accessrequests","GroupAccessRequestManager"),
38+
("audit_events","GroupAuditEventManager"),
3739
("badges","GroupBadgeManager"),
3840
("boards","GroupBoardManager"),
3941
("customattributes","GroupCustomAttributeManager"),

‎gitlab/v4/objects/projects.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from .deploymentsimportProjectDeploymentManager
2626
from .environmentsimportProjectEnvironmentManager
2727
from .eventsimportProjectEventManager
28-
from .audit_eventsimportProjectAuditManager
28+
from .audit_eventsimportProjectAuditEventManager
2929
from .export_importimportProjectExportManager,ProjectImportManager
3030
from .filesimportProjectFileManager
3131
from .hooksimportProjectHookManager
@@ -117,7 +117,7 @@ class Project(RefreshMixin, SaveMixin, ObjectDeleteMixin, RepositoryMixin, RESTO
117117
("deployments","ProjectDeploymentManager"),
118118
("environments","ProjectEnvironmentManager"),
119119
("events","ProjectEventManager"),
120-
("audit_events","ProjectAuditManager"),
120+
("audit_events","ProjectAuditEventManager"),
121121
("exports","ProjectExportManager"),
122122
("files","ProjectFileManager"),
123123
("forks","ProjectForkManager"),

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp