Skip to content

Commit ef9b6ef

Browse files
authored
Merge branch 'main' into feat/new_locality_type
2 parents 32ee1aa + ba1119f commit ef9b6ef

File tree

22 files changed

+2405
-5880
lines changed

22 files changed

+2405
-5880
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
"@commitlint/config-conventional": "19.8.1",
6161
"@manypkg/cli": "0.24.0",
6262
"@scaleway/eslint-config-react": "4.0.9",
63-
"@typescript-eslint/eslint-plugin": "8.32.0",
64-
"@typescript-eslint/parser": "8.32.0",
63+
"@typescript-eslint/eslint-plugin": "8.33.0",
64+
"@typescript-eslint/parser": "8.33.0",
6565
"@vitest/coverage-istanbul": "3.1.2",
6666
"@vitest/coverage-v8": "3.1.2",
6767
"@vitest/ui": "3.1.2",

packages/sdk/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [2.76.4](https://github.com/scaleway/scaleway-sdk-js/compare/@scaleway/[email protected]...@scaleway/[email protected]) (2025-06-02)
7+
8+
**Note:** Version bump only for package @scaleway/sdk
9+
610
## [2.76.3](https://github.com/scaleway/scaleway-sdk-js/compare/@scaleway/[email protected]...@scaleway/[email protected]) (2025-05-26)
711

812
**Note:** Version bump only for package @scaleway/sdk

packages/sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@scaleway/sdk",
3-
"version": "2.76.3",
3+
"version": "2.76.4",
44
"description": "Scaleway SDK TS.",
55
"license": "Apache-2.0",
66
"files": [

packages_generated/cockpit/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.3.1](https://github.com/scaleway/scaleway-sdk-js/compare/@scaleway/[email protected]...@scaleway/[email protected]) (2025-06-02)
7+
8+
### Bug Fixes
9+
10+
- **cockpit:** add small precisions in documentation ([#2159](https://github.com/scaleway/scaleway-sdk-js/issues/2159)) ([6b1f723](https://github.com/scaleway/scaleway-sdk-js/commit/6b1f723bb4b6d157b3c8365055ef46c1006c8041))
11+
612
# [1.3.0](https://github.com/scaleway/scaleway-sdk-js/compare/@scaleway/[email protected]...@scaleway/[email protected]) (2025-05-26)
713

814
### Features

packages_generated/cockpit/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@scaleway/sdk-cockpit",
3-
"version": "1.3.0",
3+
"version": "1.3.1",
44
"description": "Scaleway SDK cockpit",
55
"license": "Apache-2.0",
66
"files": [

packages_generated/cockpit/src/v1/api.gen.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ If you need to receive alerts for other receivers, you can create additional con
790790
})
791791

792792
/**
793-
* List alerts. List preconfigured and/or custom alerts for the specified Project.
793+
* List alerts. List preconfigured and/or custom alerts for the specified Project and data source.
794794
*
795795
* @param request - The request {@link RegionalApiListAlertsRequest}
796796
* @returns A Promise of ListAlertsResponse

packages_generated/cockpit/src/v1/types.gen.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ export type RegionalApiListAlertsRequest = {
977977
*/
978978
state?: AlertState
979979
/**
980-
* If omitted, only alerts from the default scaleway data source will be listed.
980+
* If omitted, only alerts from the default Scaleway metrics data source will be listed.
981981
*/
982982
dataSourceId?: string
983983
}

packages_generated/iam/src/v1alpha1/api.gen.ts

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ import {
1717
marshalCreatePolicyRequest,
1818
marshalCreateSSHKeyRequest,
1919
marshalCreateUserRequest,
20+
marshalJoinUserConnectionRequest,
2021
marshalRemoveGroupMemberRequest,
22+
marshalRemoveUserConnectionRequest,
2123
marshalSetGroupMembersRequest,
2224
marshalSetRulesRequest,
2325
marshalUpdateAPIKeyRequest,
@@ -35,6 +37,7 @@ import {
3537
unmarshalEncodedJWT,
3638
unmarshalGetUserConnectionsResponse,
3739
unmarshalGroup,
40+
unmarshalInitiateUserConnectionResponse,
3841
unmarshalJWT,
3942
unmarshalListAPIKeysResponse,
4043
unmarshalListApplicationsResponse,
@@ -94,7 +97,10 @@ import type {
9497
GetUserConnectionsResponse,
9598
GetUserRequest,
9699
Group,
100+
InitiateUserConnectionRequest,
101+
InitiateUserConnectionResponse,
97102
JWT,
103+
JoinUserConnectionRequest,
98104
ListAPIKeysRequest,
99105
ListAPIKeysResponse,
100106
ListApplicationsRequest,
@@ -127,6 +133,7 @@ import type {
127133
Policy,
128134
Quotum,
129135
RemoveGroupMemberRequest,
136+
RemoveUserConnectionRequest,
130137
SSHKey,
131138
SetGroupMembersRequest,
132139
SetRulesRequest,
@@ -495,6 +502,37 @@ export class API extends ParentAPI {
495502
unmarshalGetUserConnectionsResponse,
496503
)
497504

505+
initiateUserConnection = (request: Readonly<InitiateUserConnectionRequest>) =>
506+
this.client.fetch<InitiateUserConnectionResponse>(
507+
{
508+
body: '{}',
509+
headers: jsonContentHeaders,
510+
method: 'POST',
511+
path: `/iam/v1alpha1/users/${validatePathParam('userId', request.userId)}/initiate-connection`,
512+
},
513+
unmarshalInitiateUserConnectionResponse,
514+
)
515+
516+
joinUserConnection = (request: Readonly<JoinUserConnectionRequest>) =>
517+
this.client.fetch<void>({
518+
body: JSON.stringify(
519+
marshalJoinUserConnectionRequest(request, this.client.settings),
520+
),
521+
headers: jsonContentHeaders,
522+
method: 'POST',
523+
path: `/iam/v1alpha1/users/${validatePathParam('userId', request.userId)}/join-connection`,
524+
})
525+
526+
removeUserConnection = (request: Readonly<RemoveUserConnectionRequest>) =>
527+
this.client.fetch<void>({
528+
body: JSON.stringify(
529+
marshalRemoveUserConnectionRequest(request, this.client.settings),
530+
),
531+
headers: jsonContentHeaders,
532+
method: 'POST',
533+
path: `/iam/v1alpha1/users/${validatePathParam('userId', request.userId)}/remove-connection`,
534+
})
535+
498536
protected pageOfListApplications = (
499537
request: Readonly<ListApplicationsRequest> = {},
500538
) =>

packages_generated/iam/src/v1alpha1/index.gen.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ export type {
4545
GracePeriod,
4646
GracePeriodType,
4747
Group,
48+
InitiateUserConnectionRequest,
49+
InitiateUserConnectionResponse,
4850
JWT,
51+
JoinUserConnectionRequest,
4952
ListAPIKeysRequest,
5053
ListAPIKeysRequestOrderBy,
5154
ListAPIKeysResponse,
@@ -94,6 +97,7 @@ export type {
9497
Quotum,
9598
QuotumLimit,
9699
RemoveGroupMemberRequest,
100+
RemoveUserConnectionRequest,
97101
Rule,
98102
RuleSpecs,
99103
SSHKey,

packages_generated/iam/src/v1alpha1/marshalling.gen.ts

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ import type {
2828
GetUserConnectionsResponse,
2929
GracePeriod,
3030
Group,
31+
InitiateUserConnectionResponse,
3132
JWT,
33+
JoinUserConnectionRequest,
3234
ListAPIKeysResponse,
3335
ListApplicationsResponse,
3436
ListGracePeriodsResponse,
@@ -49,6 +51,7 @@ import type {
4951
Quotum,
5052
QuotumLimit,
5153
RemoveGroupMemberRequest,
54+
RemoveUserConnectionRequest,
5255
Rule,
5356
RuleSpecs,
5457
SSHKey,
@@ -365,6 +368,20 @@ export const unmarshalGetUserConnectionsResponse = (
365368
} as GetUserConnectionsResponse
366369
}
367370

371+
export const unmarshalInitiateUserConnectionResponse = (
372+
data: unknown,
373+
): InitiateUserConnectionResponse => {
374+
if (!isJSONObject(data)) {
375+
throw new TypeError(
376+
`Unmarshalling the type 'InitiateUserConnectionResponse' failed as data isn't a dictionary.`,
377+
)
378+
}
379+
380+
return {
381+
token: data.token,
382+
} as InitiateUserConnectionResponse
383+
}
384+
368385
export const unmarshalListAPIKeysResponse = (
369386
data: unknown,
370387
): ListAPIKeysResponse => {
@@ -784,6 +801,13 @@ export const marshalCreateUserRequest = (
784801
]),
785802
})
786803

804+
export const marshalJoinUserConnectionRequest = (
805+
request: JoinUserConnectionRequest,
806+
defaults: DefaultValues,
807+
): Record<string, unknown> => ({
808+
token: request.token,
809+
})
810+
787811
export const marshalRemoveGroupMemberRequest = (
788812
request: RemoveGroupMemberRequest,
789813
defaults: DefaultValues,
@@ -794,6 +818,13 @@ export const marshalRemoveGroupMemberRequest = (
794818
]),
795819
})
796820

821+
export const marshalRemoveUserConnectionRequest = (
822+
request: RemoveUserConnectionRequest,
823+
defaults: DefaultValues,
824+
): Record<string, unknown> => ({
825+
target_user_id: request.targetUserId,
826+
})
827+
797828
export const marshalSetGroupMembersRequest = (
798829
request: SetGroupMembersRequest,
799830
defaults: DefaultValues,

0 commit comments

Comments
 (0)