Skip to content

Commit 6fa97c4

Browse files
authored
Merge branch 'main' into fix/generateAlias-script-stability
2 parents 3c7a467 + b0db04d commit 6fa97c4

File tree

9 files changed

+74
-2
lines changed

9 files changed

+74
-2
lines changed

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

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
urlParams,
88
validatePathParam,
99
} from '@scaleway/sdk-client'
10-
1110
import {
1211
marshalAddGroupMemberRequest,
1312
marshalAddGroupMembersRequest,
@@ -20,6 +19,7 @@ import {
2019
marshalCreateSSHKeyRequest,
2120
marshalCreateUserRequest,
2221
marshalJoinUserConnectionRequest,
22+
marshalParseSamlMetadataRequest,
2323
marshalRemoveGroupMemberRequest,
2424
marshalRemoveUserConnectionRequest,
2525
marshalSetGroupMembersRequest,
@@ -61,6 +61,7 @@ import {
6161
unmarshalMFAOTP,
6262
unmarshalOrganization,
6363
unmarshalOrganizationSecuritySettings,
64+
unmarshalParseSamlMetadataResponse,
6465
unmarshalPolicy,
6566
unmarshalQuotum,
6667
unmarshalSSHKey,
@@ -147,6 +148,8 @@ import type {
147148
MFAOTP,
148149
Organization,
149150
OrganizationSecuritySettings,
151+
ParseSamlMetadataRequest,
152+
ParseSamlMetadataResponse,
150153
Policy,
151154
Quotum,
152155
RemoveGroupMemberRequest,
@@ -1482,6 +1485,25 @@ export class API extends ParentAPI {
14821485
path: `/iam/v1alpha1/saml/${validatePathParam('samlId', request.samlId)}`,
14831486
})
14841487

1488+
/**
1489+
* Parse SAML xml metadata file.
1490+
*
1491+
* @param request - The request {@link ParseSamlMetadataRequest}
1492+
* @returns A Promise of ParseSamlMetadataResponse
1493+
*/
1494+
parseSamlMetadata = async (request: Readonly<ParseSamlMetadataRequest>) =>
1495+
this.client.fetch<ParseSamlMetadataResponse>(
1496+
{
1497+
body: JSON.stringify(
1498+
await marshalParseSamlMetadataRequest(request, this.client.settings),
1499+
),
1500+
headers: jsonContentHeaders,
1501+
method: 'POST',
1502+
path: `/iam/v1alpha1/parse-saml-metadata`,
1503+
},
1504+
unmarshalParseSamlMetadataResponse,
1505+
)
1506+
14851507
/**
14861508
* List SAML certificates.
14871509
*

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ export type {
9999
MFAOTP,
100100
Organization,
101101
OrganizationSecuritySettings,
102+
ParseSamlMetadataRequest,
103+
ParseSamlMetadataResponse,
102104
PermissionSet,
103105
PermissionSetScopeType,
104106
Policy,

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import randomName from '@scaleway/random-name'
44
import {
55
isJSONObject,
6+
marshalBlobToScwFile,
67
resolveOneOf,
78
unmarshalArrayOfObject,
89
unmarshalDate,
@@ -49,6 +50,8 @@ import type {
4950
MFAOTP,
5051
Organization,
5152
OrganizationSecuritySettings,
53+
ParseSamlMetadataRequest,
54+
ParseSamlMetadataResponse,
5255
PermissionSet,
5356
Policy,
5457
Quotum,
@@ -703,6 +706,22 @@ export const unmarshalOrganizationSecuritySettings = (
703706
} as OrganizationSecuritySettings
704707
}
705708

709+
export const unmarshalParseSamlMetadataResponse = (
710+
data: unknown,
711+
): ParseSamlMetadataResponse => {
712+
if (!isJSONObject(data)) {
713+
throw new TypeError(
714+
`Unmarshalling the type 'ParseSamlMetadataResponse' failed as data isn't a dictionary.`,
715+
)
716+
}
717+
718+
return {
719+
entityId: data.entity_id,
720+
signingCertificates: data.signing_certificates,
721+
singleSignOnUrl: data.single_sign_on_url,
722+
} as ParseSamlMetadataResponse
723+
}
724+
706725
const unmarshalSamlServiceProvider = (data: unknown): SamlServiceProvider => {
707726
if (!isJSONObject(data)) {
708727
throw new TypeError(
@@ -908,6 +927,13 @@ export const marshalJoinUserConnectionRequest = (
908927
token: request.token,
909928
})
910929

930+
export const marshalParseSamlMetadataRequest = async (
931+
request: ParseSamlMetadataRequest,
932+
defaults: DefaultValues,
933+
): Promise<Record<string, unknown>> => ({
934+
file: await marshalBlobToScwFile(request.file),
935+
})
936+
911937
export const marshalRemoveGroupMemberRequest = (
912938
request: RemoveGroupMemberRequest,
913939
defaults: DefaultValues,

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,6 +1814,16 @@ export interface OrganizationSecuritySettings {
18141814
maxLoginSessionDuration?: string
18151815
}
18161816

1817+
export type ParseSamlMetadataRequest = {
1818+
file: Blob
1819+
}
1820+
1821+
export interface ParseSamlMetadataResponse {
1822+
singleSignOnUrl: string
1823+
entityId: string
1824+
signingCertificates: string[]
1825+
}
1826+
18171827
export type RemoveGroupMemberRequest = {
18181828
/**
18191829
* ID of the group.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
validatePathParam,
99
} from '@scaleway/sdk-client'
1010
import type { ApiLocality } from '@scaleway/sdk-client'
11-
1211
import {
1312
marshalApplyBlockMigrationRequest,
1413
marshalAttachServerFileSystemRequest,

packages_generated/instance/src/v1/marshalling.gen.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ export const unmarshalPrivateNIC = (data: unknown): PrivateNIC => {
164164
serverId: data.server_id,
165165
state: data.state,
166166
tags: data.tags,
167+
zone: data.zone,
167168
} as PrivateNIC
168169
}
169170

@@ -2268,6 +2269,7 @@ const marshalPrivateNIC = (
22682269
server_id: request.serverId,
22692270
state: request.state,
22702271
tags: request.tags,
2272+
zone: request.zone,
22712273
})
22722274

22732275
const marshalSecurityGroupSummary = (

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,10 @@ export interface PrivateNIC {
339339
* Private NIC creation date.
340340
*/
341341
creationDate?: Date
342+
/**
343+
* The zone in which the Private NIC is located.
344+
*/
345+
zone: ScwZone
342346
}
343347

344348
export interface SecurityGroupSummary {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ export const unmarshalBooking = (data: unknown): Booking => {
8686
progressMessage: data.progress_message,
8787
startedAt: unmarshalDate(data.started_at),
8888
status: data.status,
89+
timeZone: data.time_zone,
8990
updatedAt: unmarshalDate(data.updated_at),
9091
} as Booking
9192
}
@@ -498,6 +499,7 @@ const marshalCreateSessionRequestBookingDemand = (
498499
description: request.description,
499500
finished_at: request.finishedAt,
500501
started_at: request.startedAt,
502+
time_zone: request.timeZone,
501503
})
502504

503505
export const marshalCreateSessionRequest = (

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ export interface CreateSessionRequestBookingDemand {
210210
startedAt?: Date
211211
finishedAt?: Date
212212
description?: string
213+
timeZone?: string
213214
}
214215

215216
export interface Application {
@@ -268,6 +269,10 @@ export interface Booking {
268269
* Any progress message of the booking.
269270
*/
270271
progressMessage: string
272+
/**
273+
* Time zone for the booking schedule, in tz database format (e.g. 'Europe/Paris').
274+
*/
275+
timeZone?: string
271276
}
272277

273278
export interface JobResult {

0 commit comments

Comments
 (0)