Skip to content

Commit 2a71d2a

Browse files
authored
Merge branch 'main' into v1.7057.0
2 parents 34064ab + de42af9 commit 2a71d2a

File tree

9 files changed

+131
-10
lines changed

9 files changed

+131
-10
lines changed

packages/sdk/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"build:profile": "npx vite-bundle-visualizer -c vite.config.ts"
3232
},
3333
"dependencies": {
34+
"@scaleway/sdk-client": "workspace:^",
3435
"@scaleway/sdk-account": "workspace:*",
3536
"@scaleway/sdk-applesilicon": "workspace:*",
3637
"@scaleway/sdk-audit-trail": "workspace:*",

packages/sdk/src/index.gen.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ import { Testv1 } from '@scaleway/sdk-test'
4444
import { Vpcv2 } from '@scaleway/sdk-vpc'
4545
import { Vpcgwv1, Vpcgwv2 } from '@scaleway/sdk-vpcgw'
4646
import { Webhostingv1 } from '@scaleway/sdk-webhosting'
47+
48+
export { createAdvancedClient, createClient } from '@scaleway/sdk-client'
49+
4750
/**
4851
* @deprecated Direct version exports are deprecated. Use the 'Account' namespace instead (e.g., Account.v1).
4952
*/

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ export class API extends ParentAPI {
252252
path: `/s2s-vpn/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/connections`,
253253
urlParams: urlParams(
254254
['customer_gateway_ids', request.customerGatewayIds],
255+
['is_ipv6', request.isIpv6],
255256
['name', request.name],
256257
['order_by', request.orderBy],
257258
['page', request.page],

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,21 @@ export const unmarshalConnection = (data: unknown): Connection => {
9494
unmarshalConnectionCipher,
9595
),
9696
initiationPolicy: data.initiation_policy,
97+
isIpv6: data.is_ipv6,
9798
name: data.name,
9899
organizationId: data.organization_id,
99100
projectId: data.project_id,
100101
region: data.region,
101102
routePropagationEnabled: data.route_propagation_enabled,
102103
status: data.status,
103104
tags: data.tags,
104-
tunnelStatusIpv4: data.tunnel_status_ipv4,
105-
tunnelStatusIpv6: data.tunnel_status_ipv6,
105+
tunnelStatus: data.tunnel_status,
106+
tunnelStatusIpv4: data.tunnel_status_ipv4
107+
? data.tunnel_status_ipv4
108+
: undefined,
109+
tunnelStatusIpv6: data.tunnel_status_ipv6
110+
? data.tunnel_status_ipv6
111+
: undefined,
106112
updatedAt: unmarshalDate(data.updated_at),
107113
vpnGatewayId: data.vpn_gateway_id,
108114
} as Connection
@@ -377,6 +383,7 @@ export const marshalCreateConnectionRequest = (
377383
marshalConnectionCipher(elt, defaults),
378384
),
379385
initiation_policy: request.initiationPolicy,
386+
is_ipv6: request.isIpv6,
380387
name: request.name,
381388
project_id: request.projectId ?? defaults.defaultProjectId,
382389
tags: request.tags,

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ export interface Connection {
145145
* Status of the connection.
146146
*/
147147
status: ConnectionStatus
148+
/**
149+
* IP version of the IPSec Tunnel.
150+
*/
151+
isIpv6: boolean
148152
/**
149153
* Who initiates the IPsec tunnel.
150154
*/
@@ -170,13 +174,17 @@ export interface Connection {
170174
*/
171175
customerGatewayId: string
172176
/**
173-
* Status of the IPv4 IPsec tunnel.
177+
* Status of the IPsec tunnel.
178+
*/
179+
tunnelStatus: TunnelStatus
180+
/**
181+
* @deprecated Status of the IPv4 IPsec tunnel.
174182
*/
175-
tunnelStatusIpv4: TunnelStatus
183+
tunnelStatusIpv4?: TunnelStatus
176184
/**
177-
* Status of the IPv6 IPsec tunnel.
185+
* @deprecated Status of the IPv6 IPsec tunnel.
178186
*/
179-
tunnelStatusIpv6: TunnelStatus
187+
tunnelStatusIpv6?: TunnelStatus
180188
/**
181189
* Status of the BGP IPv4 session.
182190
*/
@@ -395,6 +403,10 @@ export type CreateConnectionRequest = {
395403
* List of tags to apply to the connection.
396404
*/
397405
tags?: string[]
406+
/**
407+
* Defines IP version of the IPSec Tunnel.
408+
*/
409+
isIpv6: boolean
398410
/**
399411
* Who initiates the IPsec tunnel.
400412
*/
@@ -713,6 +725,10 @@ export type ListConnectionsRequest = {
713725
* Connection statuses to filter for.
714726
*/
715727
statuses?: ConnectionStatus[]
728+
/**
729+
* Filter connections with IP version of IPSec tunnel.
730+
*/
731+
isIpv6?: boolean
716732
/**
717733
* Filter for connections using these routing policies.
718734
*/

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ import type {
2626
DomainLastStatusMXRecord,
2727
DomainLastStatusSpfRecord,
2828
DomainRecords,
29+
DomainRecordsDKIM,
2930
DomainRecordsDMARC,
31+
DomainRecordsMX,
32+
DomainRecordsSPF,
3033
DomainReputation,
3134
DomainStatistics,
3235
Email,
@@ -96,6 +99,19 @@ export const unmarshalEmail = (data: unknown): Email => {
9699
} as Email
97100
}
98101

102+
const unmarshalDomainRecordsDKIM = (data: unknown): DomainRecordsDKIM => {
103+
if (!isJSONObject(data)) {
104+
throw new TypeError(
105+
`Unmarshalling the type 'DomainRecordsDKIM' failed as data isn't a dictionary.`,
106+
)
107+
}
108+
109+
return {
110+
name: data.name,
111+
value: data.value,
112+
} as DomainRecordsDKIM
113+
}
114+
99115
const unmarshalDomainRecordsDMARC = (data: unknown): DomainRecordsDMARC => {
100116
if (!isJSONObject(data)) {
101117
throw new TypeError(
@@ -109,6 +125,32 @@ const unmarshalDomainRecordsDMARC = (data: unknown): DomainRecordsDMARC => {
109125
} as DomainRecordsDMARC
110126
}
111127

128+
const unmarshalDomainRecordsMX = (data: unknown): DomainRecordsMX => {
129+
if (!isJSONObject(data)) {
130+
throw new TypeError(
131+
`Unmarshalling the type 'DomainRecordsMX' failed as data isn't a dictionary.`,
132+
)
133+
}
134+
135+
return {
136+
name: data.name,
137+
value: data.value,
138+
} as DomainRecordsMX
139+
}
140+
141+
const unmarshalDomainRecordsSPF = (data: unknown): DomainRecordsSPF => {
142+
if (!isJSONObject(data)) {
143+
throw new TypeError(
144+
`Unmarshalling the type 'DomainRecordsSPF' failed as data isn't a dictionary.`,
145+
)
146+
}
147+
148+
return {
149+
name: data.name,
150+
value: data.value,
151+
} as DomainRecordsSPF
152+
}
153+
112154
const unmarshalDomainRecords = (data: unknown): DomainRecords => {
113155
if (!isJSONObject(data)) {
114156
throw new TypeError(
@@ -117,7 +159,10 @@ const unmarshalDomainRecords = (data: unknown): DomainRecords => {
117159
}
118160

119161
return {
162+
dkim: data.dkim ? unmarshalDomainRecordsDKIM(data.dkim) : undefined,
120163
dmarc: data.dmarc ? unmarshalDomainRecordsDMARC(data.dmarc) : undefined,
164+
mx: data.mx ? unmarshalDomainRecordsMX(data.mx) : undefined,
165+
spf: data.spf ? unmarshalDomainRecordsSPF(data.spf) : undefined,
121166
} as DomainRecords
122167
}
123168

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,17 @@ export type WebhookEventType =
114114
| 'email_blocklisted'
115115
| 'blocklist_created'
116116

117+
export interface DomainRecordsDKIM {
118+
/**
119+
* Name of the DKIM TXT record.
120+
*/
121+
name: string
122+
/**
123+
* Value of the DKIM TXT record.
124+
*/
125+
value: string
126+
}
127+
117128
export interface DomainRecordsDMARC {
118129
/**
119130
* Name of the DMARC TXT record.
@@ -125,6 +136,28 @@ export interface DomainRecordsDMARC {
125136
value: string
126137
}
127138

139+
export interface DomainRecordsMX {
140+
/**
141+
* Name of the MX record.
142+
*/
143+
name: string
144+
/**
145+
* Value of the MX record.
146+
*/
147+
value: string
148+
}
149+
150+
export interface DomainRecordsSPF {
151+
/**
152+
* Name of the SPF TXT record.
153+
*/
154+
name: string
155+
/**
156+
* Value of the SPF TXT record.
157+
*/
158+
value: string
159+
}
160+
128161
export interface EmailTry {
129162
/**
130163
* Rank number of this attempt to send the email.
@@ -149,6 +182,18 @@ export interface DomainRecords {
149182
* DMARC TXT record specification.
150183
*/
151184
dmarc?: DomainRecordsDMARC
185+
/**
186+
* DKIM TXT record specification.
187+
*/
188+
dkim?: DomainRecordsDKIM
189+
/**
190+
* SPF TXT record specification.
191+
*/
192+
spf?: DomainRecordsSPF
193+
/**
194+
* MX record specification.
195+
*/
196+
mx?: DomainRecordsMX
152197
}
153198

154199
export interface DomainReputation {

pnpm-lock.yaml

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

scripts/generateAlias.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,9 @@ for (const service of services) {
7272
}
7373
}
7474
appendFileSync(OUTPUT_PATH, importsOutput)
75+
appendFileSync(
76+
OUTPUT_PATH,
77+
"export { createClient, createAdvancedClient } from '@scaleway/sdk-client'\n\n",
78+
)
7579
appendFileSync(OUTPUT_PATH, output)
7680
console.log(`✅ File generated: ${OUTPUT_PATH}`)

0 commit comments

Comments
 (0)