Skip to content

Commit f0a7d7d

Browse files
authored
Merge branch 'main' into manual_1762171910
2 parents a341155 + b5d2b4d commit f0a7d7d

File tree

22 files changed

+1153
-251
lines changed

22 files changed

+1153
-251
lines changed

scaleway-async/poetry.lock

Lines changed: 40 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scaleway-async/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ scaleway-core = "*"
2828

2929
[tool.poetry.group.dev.dependencies]
3030
scaleway-core = { path = "../scaleway-core", develop = true }
31-
ruff = ">=0.5.0,<0.13.3"
31+
ruff = ">=0.5.0,<0.14.4"
3232
mypy = "^1.5.1"
3333
ty = "^0.0.1a15"
3434
pytest = "^8.4.1"

scaleway-async/scaleway_async/cockpit/v1/api.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,15 @@ async def create_grafana_user(
170170
role: Optional[GrafanaUserRole] = None,
171171
) -> GrafanaUser:
172172
"""
173-
Create a Grafana user.
173+
(Deprecated) EOL 2026-01-20.
174+
Create a Grafana user
174175
Create a Grafana user to connect to your Cockpit's Grafana. Upon creation, your user password displays only once, so make sure that you save it.
175176
Each Grafana user is associated with a role: viewer or editor. A viewer can only view dashboards, whereas an editor can create and edit dashboards. Note that the `admin` username is not available for creation.
176177
:param login: Username of the Grafana user. Note that the `admin` username is not available for creation.
177178
:param project_id: ID of the Project in which to create the Grafana user.
178179
:param role: Role assigned to the Grafana user.
179180
:return: :class:`GrafanaUser <GrafanaUser>`
181+
:deprecated
180182
181183
Usage:
182184
::
@@ -211,13 +213,15 @@ async def list_grafana_users(
211213
project_id: Optional[str] = None,
212214
) -> ListGrafanaUsersResponse:
213215
"""
214-
List Grafana users.
216+
(Deprecated) EOL 2026-01-20.
217+
List Grafana users
215218
List all Grafana users created in your Cockpit's Grafana. By default, the Grafana users returned in the list are ordered in ascending order.
216219
:param page: Page number.
217220
:param page_size: Page size.
218221
:param order_by: Order of the Grafana users.
219222
:param project_id: ID of the Project to target.
220223
:return: :class:`ListGrafanaUsersResponse <ListGrafanaUsersResponse>`
224+
:deprecated
221225
222226
Usage:
223227
::
@@ -248,13 +252,15 @@ async def list_grafana_users_all(
248252
project_id: Optional[str] = None,
249253
) -> list[GrafanaUser]:
250254
"""
251-
List Grafana users.
255+
(Deprecated) EOL 2026-01-20.
256+
List Grafana users
252257
List all Grafana users created in your Cockpit's Grafana. By default, the Grafana users returned in the list are ordered in ascending order.
253258
:param page: Page number.
254259
:param page_size: Page size.
255260
:param order_by: Order of the Grafana users.
256261
:param project_id: ID of the Project to target.
257262
:return: :class:`list[GrafanaUser] <list[GrafanaUser]>`
263+
:deprecated
258264
259265
Usage:
260266
::
@@ -281,10 +287,12 @@ async def delete_grafana_user(
281287
grafana_user_id: int,
282288
) -> None:
283289
"""
284-
Delete a Grafana user.
290+
(Deprecated) EOL 2026-01-20.
291+
Delete a Grafana user
285292
Delete a Grafana user from your Cockpit's Grafana, specified by the ID of the Project the Cockpit belongs to, and the ID of the Grafana user.
286293
:param project_id: ID of the Project to target.
287294
:param grafana_user_id: ID of the Grafana user.
295+
:deprecated
288296
289297
Usage:
290298
::
@@ -313,12 +321,14 @@ async def reset_grafana_user_password(
313321
grafana_user_id: int,
314322
) -> GrafanaUser:
315323
"""
316-
Reset a Grafana user password.
324+
(Deprecated) EOL 2026-01-20.
325+
Reset a Grafana user password
317326
Reset the password of a Grafana user, specified by the ID of the Project the Cockpit belongs to, and the ID of the Grafana user.
318327
A new password regenerates and only displays once. Make sure that you save it.
319328
:param project_id: ID of the Project to target.
320329
:param grafana_user_id: ID of the Grafana user.
321330
:return: :class:`GrafanaUser <GrafanaUser>`
331+
:deprecated
322332
323333
Usage:
324334
::

scaleway-async/scaleway_async/iam/v1alpha1/__init__.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from .types import ListPoliciesRequestOrderBy
1212
from .types import ListQuotaRequestOrderBy
1313
from .types import ListSSHKeysRequestOrderBy
14+
from .types import ListScimTokensRequestOrderBy
1415
from .types import ListUsersRequestOrderBy
1516
from .types import LocalityType
1617
from .types import LogAction
@@ -26,6 +27,7 @@
2627
from .types import QuotumLimit
2728
from .types import JWT
2829
from .types import RuleSpecs
30+
from .types import ScimToken
2931
from .types import CreateUserRequestMember
3032
from .types import Connection
3133
from .types import APIKey
@@ -51,6 +53,8 @@
5153
from .types import CreateJWTRequest
5254
from .types import CreatePolicyRequest
5355
from .types import CreateSSHKeyRequest
56+
from .types import CreateScimTokenRequest
57+
from .types import CreateScimTokenResponse
5458
from .types import CreateUserMFAOTPRequest
5559
from .types import CreateUserRequest
5660
from .types import DeleteAPIKeyRequest
@@ -61,9 +65,12 @@
6165
from .types import DeleteSSHKeyRequest
6266
from .types import DeleteSamlCertificateRequest
6367
from .types import DeleteSamlRequest
68+
from .types import DeleteScimRequest
69+
from .types import DeleteScimTokenRequest
6470
from .types import DeleteUserMFAOTPRequest
6571
from .types import DeleteUserRequest
6672
from .types import EnableOrganizationSamlRequest
73+
from .types import EnableOrganizationScimRequest
6774
from .types import EncodedJWT
6875
from .types import GetAPIKeyRequest
6976
from .types import GetApplicationRequest
@@ -106,6 +113,8 @@
106113
from .types import ListSSHKeysResponse
107114
from .types import ListSamlCertificatesRequest
108115
from .types import ListSamlCertificatesResponse
116+
from .types import ListScimTokensRequest
117+
from .types import ListScimTokensResponse
109118
from .types import ListUsersRequest
110119
from .types import ListUsersResponse
111120
from .types import LockUserRequest
@@ -117,6 +126,7 @@
117126
from .types import RemoveGroupMemberRequest
118127
from .types import RemoveUserConnectionRequest
119128
from .types import Saml
129+
from .types import Scim
120130
from .types import SetGroupMembersRequest
121131
from .types import SetOrganizationAliasRequest
122132
from .types import SetRulesRequest
@@ -149,6 +159,7 @@
149159
"ListPoliciesRequestOrderBy",
150160
"ListQuotaRequestOrderBy",
151161
"ListSSHKeysRequestOrderBy",
162+
"ListScimTokensRequestOrderBy",
152163
"ListUsersRequestOrderBy",
153164
"LocalityType",
154165
"LogAction",
@@ -164,6 +175,7 @@
164175
"QuotumLimit",
165176
"JWT",
166177
"RuleSpecs",
178+
"ScimToken",
167179
"CreateUserRequestMember",
168180
"Connection",
169181
"APIKey",
@@ -189,6 +201,8 @@
189201
"CreateJWTRequest",
190202
"CreatePolicyRequest",
191203
"CreateSSHKeyRequest",
204+
"CreateScimTokenRequest",
205+
"CreateScimTokenResponse",
192206
"CreateUserMFAOTPRequest",
193207
"CreateUserRequest",
194208
"DeleteAPIKeyRequest",
@@ -199,9 +213,12 @@
199213
"DeleteSSHKeyRequest",
200214
"DeleteSamlCertificateRequest",
201215
"DeleteSamlRequest",
216+
"DeleteScimRequest",
217+
"DeleteScimTokenRequest",
202218
"DeleteUserMFAOTPRequest",
203219
"DeleteUserRequest",
204220
"EnableOrganizationSamlRequest",
221+
"EnableOrganizationScimRequest",
205222
"EncodedJWT",
206223
"GetAPIKeyRequest",
207224
"GetApplicationRequest",
@@ -244,6 +261,8 @@
244261
"ListSSHKeysResponse",
245262
"ListSamlCertificatesRequest",
246263
"ListSamlCertificatesResponse",
264+
"ListScimTokensRequest",
265+
"ListScimTokensResponse",
247266
"ListUsersRequest",
248267
"ListUsersResponse",
249268
"LockUserRequest",
@@ -255,6 +274,7 @@
255274
"RemoveGroupMemberRequest",
256275
"RemoveUserConnectionRequest",
257276
"Saml",
277+
"Scim",
258278
"SetGroupMembersRequest",
259279
"SetOrganizationAliasRequest",
260280
"SetRulesRequest",

0 commit comments

Comments
 (0)