Skip to content

Commit cee73ab

Browse files
authored
Merge branch 'main' into v1.6592.0
2 parents 9173b26 + eed20a9 commit cee73ab

File tree

5 files changed

+2224
-5876
lines changed

5 files changed

+2224
-5876
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_generated/ipam/src/v1/api.gen.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ export class API extends ParentAPI {
155155
{ param: 'zonal', value: request.zonal },
156156
{ param: 'private_network_id', value: request.privateNetworkId },
157157
{ param: 'subnet_id', value: request.subnetId },
158+
{ param: 'source_vpc_id', value: request.sourceVpcId },
158159
]),
159160
),
160161
),

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ const unmarshalSource = (data: unknown): Source => {
6060
return {
6161
privateNetworkId: data.private_network_id,
6262
subnetId: data.subnet_id,
63+
vpcId: data.vpc_id,
6364
zonal: data.zonal,
6465
} as Source
6566
}
@@ -123,6 +124,7 @@ const marshalSource = (
123124
{ param: 'zonal', value: request.zonal },
124125
{ param: 'private_network_id', value: request.privateNetworkId },
125126
{ param: 'subnet_id', value: request.subnetId },
127+
{ param: 'vpc_id', value: request.vpcId },
126128
]),
127129
})
128130

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,26 @@ export interface Source {
6969
/**
7070
* This source is global.
7171
*
72-
* One-of ('source'): at most one of 'zonal', 'privateNetworkId', 'subnetId' could be set.
72+
* One-of ('source'): at most one of 'zonal', 'privateNetworkId', 'subnetId', 'vpcId' could be set.
7373
*/
7474
zonal?: string
7575
/**
7676
* This source is specific.
7777
*
78-
* One-of ('source'): at most one of 'zonal', 'privateNetworkId', 'subnetId' could be set.
78+
* One-of ('source'): at most one of 'zonal', 'privateNetworkId', 'subnetId', 'vpcId' could be set.
7979
*/
8080
privateNetworkId?: string
8181
/**
8282
* This source is specific.
8383
*
84-
* One-of ('source'): at most one of 'zonal', 'privateNetworkId', 'subnetId' could be set.
84+
* One-of ('source'): at most one of 'zonal', 'privateNetworkId', 'subnetId', 'vpcId' could be set.
8585
*/
8686
subnetId?: string
87+
/**
88+
*
89+
* One-of ('source'): at most one of 'zonal', 'privateNetworkId', 'subnetId', 'vpcId' could be set.
90+
*/
91+
vpcId?: string
8792
}
8893

8994
export interface CustomResource {
@@ -244,19 +249,19 @@ export type ListIPsRequest = {
244249
/**
245250
* Zone to filter for. Only IPs that are zonal, and in this zone, will be returned.
246251
*
247-
* One-of ('source'): at most one of 'zonal', 'privateNetworkId', 'subnetId' could be set.
252+
* One-of ('source'): at most one of 'zonal', 'privateNetworkId', 'subnetId', 'sourceVpcId' could be set.
248253
*/
249254
zonal?: string
250255
/**
251256
* Only IPs that are private, and in this Private Network, will be returned.
252257
*
253-
* One-of ('source'): at most one of 'zonal', 'privateNetworkId', 'subnetId' could be set.
258+
* One-of ('source'): at most one of 'zonal', 'privateNetworkId', 'subnetId', 'sourceVpcId' could be set.
254259
*/
255260
privateNetworkId?: string
256261
/**
257262
* Only IPs inside this exact subnet will be returned.
258263
*
259-
* One-of ('source'): at most one of 'zonal', 'privateNetworkId', 'subnetId' could be set.
264+
* One-of ('source'): at most one of 'zonal', 'privateNetworkId', 'subnetId', 'sourceVpcId' could be set.
260265
*/
261266
subnetId?: string
262267
/**
@@ -307,6 +312,11 @@ export type ListIPsRequest = {
307312
* IP IDs to filter for. Only IPs with these UUIDs will be returned.
308313
*/
309314
ipIds?: string[]
315+
/**
316+
*
317+
* One-of ('source'): at most one of 'zonal', 'privateNetworkId', 'subnetId', 'sourceVpcId' could be set.
318+
*/
319+
sourceVpcId?: string
310320
}
311321

312322
export interface ListIPsResponse {

0 commit comments

Comments
 (0)