Skip to content

Add implementation for Members, Sources and Invitations endpoints #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ddd3401
feat(client): add members related endpoints
GG-Yanne Dec 5, 2024
d322eaa
feat(client): add teams related endpoints
GG-Yanne Dec 5, 2024
8e9748d
feat(client): add sources related endpoints
GG-Yanne Dec 6, 2024
8555586
feat(client): add invitation related endpoints
GG-Yanne Dec 6, 2024
a932163
docs(changelog): added changelog for teams, members, invitations and …
GG-Yanne Dec 6, 2024
b5f7f6b
fix(models): changed wrong keyword argument for parameters schema and…
GG-Yanne Dec 6, 2024
009bcad
refactor(client): delete methods now return None in case deletion was…
GG-Yanne Dec 11, 2024
f59f4a1
refactor(models): remove many arguments in from_dict and move list se…
GG-Yanne Dec 11, 2024
a672070
fix(models): mark last_scan as optional for a scan object
GG-Yanne Dec 11, 2024
27bc067
test(client): changed error message to detail
GG-Yanne Dec 11, 2024
3e17f92
refactor(models): move schema, parameters and paginated response to m…
GG-Yanne Dec 11, 2024
463062c
test(client): change client tests to allow tests to run on any workspace
GG-Yanne Dec 13, 2024
90f3f02
refactor(client): rename list team source to better match public api doc
GG-Yanne Dec 13, 2024
4a06722
refactor(models): prefix all post_load method with make
GG-Yanne Dec 18, 2024
994f987
refactor(client): rename "update" function model's argument to payload
GG-Yanne Dec 18, 2024
1ff53dc
docs(tests): add documentation around limitations of initial workplac…
GG-Yanne Dec 18, 2024
20b1624
test(client): move get functions to utils file
GG-Yanne Dec 18, 2024
b87bc42
fix(client): explicit add status code for all response
GG-Yanne Dec 19, 2024
3efc288
fix(models_utils): paginated data now also receives status code when …
GG-Yanne Dec 19, 2024
5133106
refactor(client): change query_parameters to parameters for list_members
GG-Yanne Dec 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 67 additions & 5 deletions pygitguardian/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
)
from .models import (
APITokensResponse,
CreateInvitation,
CreateInvitationParameter,
CreateTeam,
CreateTeamInvitation,
CreateTeamMember,
Expand All @@ -37,6 +39,8 @@
HealthCheckResponse,
HoneytokenResponse,
HoneytokenWithContextResponse,
Invitation,
InvitationParameter,
JWTResponse,
JWTService,
Member,
Expand Down Expand Up @@ -929,7 +933,7 @@ def list_members(

response = self.get(
endpoint="members",
data=query_parameters.to_dict() if query_parameters else {},
params=query_parameters.to_dict() if query_parameters else {},
extra_headers=extra_headers,
)

Expand Down Expand Up @@ -1106,7 +1110,7 @@ def list_team_invitations(
) -> Union[Detail, CursorPaginatedResponse[TeamInvitation]]:
response = self.get(
endpoint=f"teams/{team_id}/team_invitations",
data=parameters.to_dict() if parameters else {},
params=parameters.to_dict() if parameters else {},
extra_headers=extra_headers,
)

Expand Down Expand Up @@ -1166,7 +1170,7 @@ def list_team_members(
) -> Union[Detail, CursorPaginatedResponse[TeamMember]]:
response = self.get(
endpoint=f"teams/{team_id}/team_memberships",
data=parameters.to_dict() if parameters else {},
params=parameters.to_dict() if parameters else {},
extra_headers=extra_headers,
)

Expand Down Expand Up @@ -1225,7 +1229,7 @@ def list_sources(
) -> Union[Detail, CursorPaginatedResponse[Source]]:
response = self.get(
endpoint="sources",
data=parameters.to_dict() if parameters else {},
params=parameters.to_dict() if parameters else {},
extra_headers=extra_headers,
)

Expand All @@ -1246,7 +1250,7 @@ def list_teams_sources(
) -> Union[Detail, CursorPaginatedResponse[Source]]:
response = self.get(
endpoint=f"teams/{team_id}/sources",
data=parameters.to_dict() if parameters else {},
params=parameters.to_dict() if parameters else {},
extra_headers=extra_headers,
)

Expand Down Expand Up @@ -1278,3 +1282,61 @@ def update_team_source(
return 204

return load_detail(response)

def list_invitations(
self,
parameters: Optional[InvitationParameter] = None,
extra_headers: Optional[Dict[str, str]] = None,
) -> Union[Detail, CursorPaginatedResponse[Invitation]]:
response = self.get(
endpoint="invitations",
params=parameters.to_dict() if parameters else {},
extra_headers=extra_headers,
)

obj: Union[Detail, CursorPaginatedResponse[Invitation]]
if is_ok(response):
obj = CursorPaginatedResponse[Invitation].from_response(
response, Invitation
)
else:
obj = load_detail(response)

obj.status_code
return obj

def send_invitation(
self,
invitation: CreateInvitation,
parameters: Optional[CreateInvitationParameter] = None,
extra_headers: Optional[Dict[str, str]] = None,
) -> Union[Detail, Invitation]:
response = self.post(
endpoint="invitations",
data=CreateInvitation.to_dict(invitation),
params=parameters.to_dict() if parameters else {},
extra_headers=extra_headers,
)

obj: Union[Detail, Invitation]
if is_create_ok(response):
obj = Invitation.from_dict(response.json())
else:
obj = load_detail(response)

obj.status_code = response.status_code
return obj

def delete_invitation(
self,
invitation_id: int,
extra_headers: Optional[Dict[str, str]] = None,
) -> Union[Detail, int]:
response = self.delete(
endpoint=f"invitations/{invitation_id}", extra_headers=extra_headers
)

if is_delete_ok(response):
return response.status_code

return load_detail(response)
75 changes: 71 additions & 4 deletions pygitguardian/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1199,10 +1199,16 @@ class MembersParameters(PaginationParameter, SearchParameter, ToDictMixin):
] = None


MembersParametersSchema = cast(
Type[BaseSchema],
marshmallow_dataclass.class_schema(MembersParameters, base_schema=BaseSchema),
)
class MembersParametersSchema(BaseSchema):
access_level = fields.Enum(AccessLevel, by_value=True, allow_none=True)
active = fields.Bool(allow_none=True)
ordering = fields.Str(allow_none=True)

@post_load
def return_members_parameters(self, data: dict[str, Any], **kwargs: dict[str, Any]):
return MembersParameters(**data)


MembersParameters.SCHEMA = MembersParametersSchema()


Expand Down Expand Up @@ -1565,3 +1571,64 @@ class SourceParameters(TeamSourceParameters):
marshmallow_dataclass.class_schema(SourceParameters, base_schema=BaseSchema),
)
SourceParameters.SCHEMA = SourceParametersSchema()


@dataclass
class InvitationParameter(
PaginationParameter, SearchParameter, FromDictMixin, ToDictMixin
):
ordering: Literal["date", "-date"]


@dataclass
class Invitation(Base, FromDictMixin):
id: int
email: str
access_level: AccessLevel
date: datetime


class InvitationSchema(BaseSchema):
id = fields.Int(required=True)
email = fields.Str(required=True)
access_level = fields.Enum(AccessLevel, by_value=True, required=True)
date = fields.DateTime(required=True)

@post_load
def return_invitation(self, data: dict[str, Any], **kwargs: dict[str, Any]):
return Invitation(**data)


Invitation.SCHEMA = InvitationSchema()


@dataclass
class CreateInvitationParameter(FromDictMixin, ToDictMixin):
send_email: Optional[bool] = None


CreateInvitationParameterSchema = cast(
Type[BaseSchema],
marshmallow_dataclass.class_schema(
CreateInvitationParameter, base_schema=BaseSchema
),
)
CreateInvitationParameter.SCHEMA = CreateInvitationParameterSchema()


@dataclass
class CreateInvitation(FromDictMixin, ToDictMixin):
email: str
access_level: AccessLevel


class CreateInvitationSchema(BaseSchema):
email = fields.Str(required=True)
access_level = fields.Enum(AccessLevel, by_value=True, required=True)

@post_load
def return_invitation(self, data: dict[str, Any], **kwargs: dict[str, Any]):
return CreateInvitation(**data)


CreateInvitation.SCHEMA = CreateInvitationSchema()
54 changes: 54 additions & 0 deletions tests/cassettes/test_delete_invitation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
interactions:
- request:
body: null
headers:
Accept:
- '*/*'
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
Content-Length:
- '0'
User-Agent:
- pygitguardian/1.18.0 (Darwin;py3.11.8)
method: DELETE
uri: https://api.gitguardian.com/v1/invitations/2
response:
body:
string: ''
headers:
Access-Control-Expose-Headers:
- X-App-Version
Allow:
- DELETE, OPTIONS
Connection:
- keep-alive
Content-Length:
- '0'
Cross-Origin-Opener-Policy:
- same-origin
Date:
- Fri, 06 Dec 2024 13:38:57 GMT
Referrer-Policy:
- same-origin
Server:
- nginx/1.24.0
Vary:
- Cookie
X-App-Version:
- dev
X-Content-Type-Options:
- nosniff
X-Frame-Options:
- DENY
X-Request-ID:
- fd715a797aabb2eddf49823db3e54209
X-SCA-Engine-Version:
- 2.2.0
X-Secrets-Engine-Version:
- 2.127.0
status:
code: 204
message: No Content
version: 1
58 changes: 58 additions & 0 deletions tests/cassettes/test_list_invitations.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
interactions:
- request:
body: null
headers:
Accept:
- '*/*'
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
User-Agent:
- pygitguardian/1.18.0 (Darwin;py3.11.8)
method: GET
uri: https://api.gitguardian.com/v1/invitations
response:
body:
string: '[{"id":1,"date":"2024-12-05T17:35:12.273332Z","email":"toto+test@gg.com","role":"member","access_level":"member"}]'
headers:
Access-Control-Expose-Headers:
- X-App-Version
Allow:
- GET, POST, HEAD, OPTIONS
Connection:
- keep-alive
Content-Length:
- '114'
Content-Type:
- application/json
Cross-Origin-Opener-Policy:
- same-origin
Date:
- Fri, 06 Dec 2024 13:33:31 GMT
Link:
- ''
Referrer-Policy:
- same-origin
Server:
- nginx/1.24.0
Vary:
- Cookie
X-App-Version:
- dev
X-Content-Type-Options:
- nosniff
X-Frame-Options:
- DENY
X-Per-Page:
- '20'
X-Request-ID:
- 182ad8123736b9315def7a957569ef89
X-SCA-Engine-Version:
- 2.2.0
X-Secrets-Engine-Version:
- 2.127.0
status:
code: 200
message: OK
version: 1
58 changes: 58 additions & 0 deletions tests/cassettes/test_list_members_parameters.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
interactions:
- request:
body: null
headers:
Accept:
- '*/*'
Accept-Encoding:
- gzip, deflate
Connection:
- keep-alive
User-Agent:
- pygitguardian/1.18.0 (Darwin;py3.11.8)
method: GET
uri: https://api.gitguardian.com/v1/members?access_level=manager
response:
body:
string: '[]'
headers:
Access-Control-Expose-Headers:
- X-App-Version
Allow:
- GET, HEAD, OPTIONS
Connection:
- keep-alive
Content-Length:
- '2'
Content-Type:
- application/json
Cross-Origin-Opener-Policy:
- same-origin
Date:
- Fri, 06 Dec 2024 13:53:52 GMT
Link:
- ''
Referrer-Policy:
- same-origin
Server:
- nginx/1.24.0
Vary:
- Cookie
X-App-Version:
- dev
X-Content-Type-Options:
- nosniff
X-Frame-Options:
- DENY
X-Per-Page:
- '20'
X-Request-ID:
- 345625b0c1e6c814a9b997bd7ea3ea96
X-SCA-Engine-Version:
- 2.2.0
X-Secrets-Engine-Version:
- 2.127.0
status:
code: 200
message: OK
version: 1
Loading