Skip to content

Commit 1c6c321

Browse files
authored
Merge branch 'main' into v1.6919.0
2 parents 5bc5b67 + 652228e commit 1c6c321

File tree

12 files changed

+231
-579
lines changed

12 files changed

+231
-579
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"cross-fetch": "4.1.0",
7272
"cz-conventional-changelog": "3.3.0",
7373
"esbuild-plugin-browserslist": "1.0.1",
74-
"eslint": "9.26.0",
74+
"eslint": "9.33.0",
7575
"eslint-plugin-tsdoc": "0.4.0",
7676
"husky": "9.1.7",
7777
"jsdom": "26.1.0",

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,13 @@ export class API extends ParentAPI {
103103
listVolumeTypes = (request: Readonly<ListVolumeTypesRequest> = {}) =>
104104
enrichForPagination('volumeTypes', this.pageOfListVolumeTypes, request)
105105

106-
protected pageOfListVolumes = (request: Readonly<ListVolumesRequest> = {}) =>
106+
protected pageOfListVolumes = (request: Readonly<ListVolumesRequest>) =>
107107
this.client.fetch<ListVolumesResponse>(
108108
{
109109
method: 'GET',
110110
path: `/block/v1/zones/${validatePathParam('zone', request.zone ?? this.client.settings.defaultZone)}/volumes`,
111111
urlParams: urlParams(
112+
['include_deleted', request.includeDeleted],
112113
['name', request.name],
113114
['order_by', request.orderBy],
114115
['organization_id', request.organizationId],
@@ -131,7 +132,7 @@ export class API extends ParentAPI {
131132
* @param request - The request {@link ListVolumesRequest}
132133
* @returns A Promise of ListVolumesResponse
133134
*/
134-
listVolumes = (request: Readonly<ListVolumesRequest> = {}) =>
135+
listVolumes = (request: Readonly<ListVolumesRequest>) =>
135136
enrichForPagination('volumes', this.pageOfListVolumes, request)
136137

137138
/**
@@ -222,14 +223,13 @@ You can only resize a volume to a larger size. It is currently not possible to c
222223
unmarshalVolume,
223224
)
224225

225-
protected pageOfListSnapshots = (
226-
request: Readonly<ListSnapshotsRequest> = {},
227-
) =>
226+
protected pageOfListSnapshots = (request: Readonly<ListSnapshotsRequest>) =>
228227
this.client.fetch<ListSnapshotsResponse>(
229228
{
230229
method: 'GET',
231230
path: `/block/v1/zones/${validatePathParam('zone', request.zone ?? this.client.settings.defaultZone)}/snapshots`,
232231
urlParams: urlParams(
232+
['include_deleted', request.includeDeleted],
233233
['name', request.name],
234234
['order_by', request.orderBy],
235235
['organization_id', request.organizationId],
@@ -252,7 +252,7 @@ You can only resize a volume to a larger size. It is currently not possible to c
252252
* @param request - The request {@link ListSnapshotsRequest}
253253
* @returns A Promise of ListSnapshotsResponse
254254
*/
255-
listSnapshots = (request: Readonly<ListSnapshotsRequest> = {}) =>
255+
listSnapshots = (request: Readonly<ListSnapshotsRequest>) =>
256256
enrichForPagination('snapshots', this.pageOfListSnapshots, request)
257257

258258
/**

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,10 @@ export type ListSnapshotsRequest = {
451451
* Filter by tags. Only snapshots with one or more matching tags will be returned.
452452
*/
453453
tags?: string[]
454+
/**
455+
* Display deleted snapshots not erased yet.
456+
*/
457+
includeDeleted: boolean
454458
}
455459

456460
export interface ListSnapshotsResponse {
@@ -527,6 +531,10 @@ export type ListVolumesRequest = {
527531
* Filter by tags. Only volumes with one or more matching tags will be returned.
528532
*/
529533
tags?: string[]
534+
/**
535+
* Display deleted volumes not erased yet.
536+
*/
537+
includeDeleted: boolean
530538
}
531539

532540
export interface ListVolumesResponse {

packages_generated/container/src/v1beta1/api.gen.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ export class API extends ParentAPI {
179179
* @param request - The request {@link CreateNamespaceRequest}
180180
* @returns A Promise of Namespace
181181
*/
182-
createNamespace = (request: Readonly<CreateNamespaceRequest>) =>
182+
createNamespace = (request: Readonly<CreateNamespaceRequest> = {}) =>
183183
this.client.fetch<Namespace>(
184184
{
185185
body: JSON.stringify(

packages_generated/container/src/v1beta1/types.gen.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,7 @@ export interface Namespace {
498498
*/
499499
updatedAt?: Date
500500
/**
501-
* @deprecated When activated, containers in the namespace can be connected to a Private Network.
502-
Note that activating the VPC integration can only be done when creating a new namespace.
501+
* @deprecated The value of this field doesn't matter anymore, and will be removed in a near future.
503502
*/
504503
vpcIntegrationActivated?: boolean
505504
}
@@ -693,8 +692,6 @@ export type CreateContainerRequest = {
693692
tags?: string[]
694693
/**
695694
* When connected to a Private Network, the container can access other Scaleway resources in this Private Network.
696-
697-
Note: this feature is currently in beta and requires a namespace with VPC integration activated, using the `activate_vpc_integration` flag.
698695
*/
699696
privateNetworkId?: string
700697
/**
@@ -775,9 +772,9 @@ export type CreateNamespaceRequest = {
775772
*/
776773
tags?: string[]
777774
/**
778-
* When activated, containers in the namespace can be connected to a Private Network.
775+
* @deprecated Setting this field to true doesn't matter anymore. It will be removed in a near future.
779776
*/
780-
activateVpcIntegration: boolean
777+
activateVpcIntegration?: boolean
781778
}
782779

783780
export type CreateTokenRequest = {
@@ -1319,8 +1316,6 @@ export type UpdateContainerRequest = {
13191316
tags?: string[]
13201317
/**
13211318
* When connected to a Private Network, the container can access other Scaleway resources in this Private Network.
1322-
1323-
Note: this feature is currently in beta and requires a namespace with VPC integration activated, using the `activate_vpc_integration` flag.
13241319
*/
13251320
privateNetworkId?: string
13261321
/**

packages_generated/function/src/v1beta1/api.gen.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ export class API extends ParentAPI {
188188
* @param request - The request {@link CreateNamespaceRequest}
189189
* @returns A Promise of Namespace
190190
*/
191-
createNamespace = (request: Readonly<CreateNamespaceRequest>) =>
191+
createNamespace = (request: Readonly<CreateNamespaceRequest> = {}) =>
192192
this.client.fetch<Namespace>(
193193
{
194194
body: JSON.stringify(

packages_generated/function/src/v1beta1/types.gen.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -477,8 +477,7 @@ export interface Namespace {
477477
*/
478478
updatedAt?: Date
479479
/**
480-
* @deprecated When activated, functions in the namespace can be connected to a Private Network.
481-
Note that activating the VPC integration can only be done when creating a new namespace.
480+
* @deprecated The value of this field doesn't matter anymore, and will be removed in a near future.
482481
*/
483482
vpcIntegrationActivated?: boolean
484483
}
@@ -680,8 +679,6 @@ export type CreateFunctionRequest = {
680679
tags?: string[]
681680
/**
682681
* When connected to a Private Network, the function can access other Scaleway resources in this Private Network.
683-
684-
Note: this feature is currently in beta and requires a namespace with VPC integration activated, using the `activate_vpc_integration` flag.
685682
*/
686683
privateNetworkId?: string
687684
}
@@ -713,9 +710,9 @@ export type CreateNamespaceRequest = {
713710
*/
714711
tags?: string[]
715712
/**
716-
* When activated, functions in the namespace can be connected to a Private Network.
713+
* @deprecated Setting this field to true doesn't matter anymore. It will be removed in a near future.
717714
*/
718-
activateVpcIntegration: boolean
715+
activateVpcIntegration?: boolean
719716
}
720717

721718
export type CreateTokenRequest = {
@@ -1303,8 +1300,6 @@ export type UpdateFunctionRequest = {
13031300
tags?: string[]
13041301
/**
13051302
* When connected to a Private Network, the function can access other Scaleway resources in this Private Network.
1306-
1307-
Note: this feature is currently in beta and requires a namespace with VPC integration activated, using the `activate_vpc_integration` flag.
13081303
*/
13091304
privateNetworkId?: string
13101305
}

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ import {
6464
unmarshalQuotum,
6565
unmarshalSaml,
6666
unmarshalSamlCertificate,
67+
unmarshalSamlInformation,
6768
unmarshalSetRulesResponse,
6869
unmarshalSSHKey,
6970
unmarshalUser,
@@ -106,6 +107,7 @@ import type {
106107
GetOrganizationSecuritySettingsRequest,
107108
GetPolicyRequest,
108109
GetQuotumRequest,
110+
GetSamlInformationRequest,
109111
GetSSHKeyRequest,
110112
GetUserConnectionsRequest,
111113
GetUserConnectionsResponse,
@@ -153,6 +155,7 @@ import type {
153155
RemoveUserConnectionRequest,
154156
Saml,
155157
SamlCertificate,
158+
SamlInformation,
156159
SetGroupMembersRequest,
157160
SetOrganizationAliasRequest,
158161
SetRulesRequest,
@@ -1518,4 +1521,19 @@ export class API extends ParentAPI {
15181521
method: 'DELETE',
15191522
path: `/iam/v1alpha1/saml-certificates/${validatePathParam('certificateId', request.certificateId)}`,
15201523
})
1524+
1525+
/**
1526+
* Get SAML information.
1527+
*
1528+
* @param request - The request {@link GetSamlInformationRequest}
1529+
* @returns A Promise of SamlInformation
1530+
*/
1531+
getSamlInformation = (request: Readonly<GetSamlInformationRequest> = {}) =>
1532+
this.client.fetch<SamlInformation>(
1533+
{
1534+
method: 'GET',
1535+
path: `/iam/v1alpha1/saml-information`,
1536+
},
1537+
unmarshalSamlInformation,
1538+
)
15211539
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ import type {
6060
RuleSpecs,
6161
Saml,
6262
SamlCertificate,
63+
SamlInformation,
6364
SetGroupMembersRequest,
6465
SetOrganizationAliasRequest,
6566
SetRulesRequest,
@@ -711,6 +712,19 @@ export const unmarshalSaml = (data: unknown): Saml => {
711712
} as Saml
712713
}
713714

715+
export const unmarshalSamlInformation = (data: unknown): SamlInformation => {
716+
if (!isJSONObject(data)) {
717+
throw new TypeError(
718+
`Unmarshalling the type 'SamlInformation' failed as data isn't a dictionary.`,
719+
)
720+
}
721+
722+
return {
723+
assertionConsumerServiceUrl: data.assertion_consumer_service_url,
724+
entityId: data.entity_id,
725+
} as SamlInformation
726+
}
727+
714728
export const unmarshalSetRulesResponse = (data: unknown): SetRulesResponse => {
715729
if (!isJSONObject(data)) {
716730
throw new TypeError(

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,6 +1191,8 @@ export type GetSSHKeyRequest = {
11911191
sshKeyId: string
11921192
}
11931193

1194+
export type GetSamlInformationRequest = Record<string, never>
1195+
11941196
export type GetUserConnectionsRequest = {
11951197
/**
11961198
* ID of the user to list connections for.
@@ -1842,6 +1844,17 @@ export interface Saml {
18421844
singleSignOnUrl: string
18431845
}
18441846

1847+
export interface SamlInformation {
1848+
/**
1849+
* Entity ID.
1850+
*/
1851+
entityId: string
1852+
/**
1853+
* SAML Assertion Consumer Service url.
1854+
*/
1855+
assertionConsumerServiceUrl: string
1856+
}
1857+
18451858
export type SetGroupMembersRequest = {
18461859
groupId: string
18471860
userIds: string[]

0 commit comments

Comments
 (0)