Skip to content

Commit 1dfe4b6

Browse files
authored
Merge branch 'main' into v1.7010.0
2 parents d7f6ceb + 32ebc5c commit 1dfe4b6

File tree

18 files changed

+2511
-5
lines changed

18 files changed

+2511
-5
lines changed

packages/sdk/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
"@scaleway/sdk-registry": "workspace:*",
6767
"@scaleway/sdk-secret": "workspace:*",
6868
"@scaleway/sdk-serverless-sqldb": "workspace:*",
69+
"@scaleway/sdk-s2s-vpn": "workspace:*",
6970
"@scaleway/sdk-std": "workspace:*",
7071
"@scaleway/sdk-tem": "workspace:*",
7172
"@scaleway/sdk-test": "workspace:*",

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ import type {
203203
MigrationPlan,
204204
PlanBlockMigrationRequest,
205205
PrivateNIC,
206+
ReleaseIpToIpamRequest,
206207
ServerActionRequest,
207208
ServerActionResponse,
208209
ServerCompatibleTypes,
@@ -1646,4 +1647,17 @@ The endpoint also returns the validation_key, which must be provided to the [Mig
16461647
method: 'POST',
16471648
path: `/instance/v1/zones/${validatePathParam('zone', request.zone ?? this.client.settings.defaultZone)}/block-migration/check-organization-quotas`,
16481649
})
1650+
1651+
/**
1652+
* Releases the reserved IP without deleting the reservation.. **The IP remains available in IPAM**, which means that it is still reserved by the Organization, and can be reattached to another resource (Instance or other product).
1653+
*
1654+
* @param request - The request {@link ReleaseIpToIpamRequest}
1655+
*/
1656+
releaseIpToIpam = (request: Readonly<ReleaseIpToIpamRequest>) =>
1657+
this.client.fetch<void>({
1658+
body: '{}',
1659+
headers: jsonContentHeaders,
1660+
method: 'POST',
1661+
path: `/instance/v1/zones/${validatePathParam('zone', request.zone ?? this.client.settings.defaultZone)}/ips/${validatePathParam('ipId', request.ipId)}/release-to-ipam`,
1662+
})
16491663
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,18 @@ export const TASK_TRANSIENT_STATUSES: TaskStatus[] = [
5757
/** Lists transient statutes of the enum {@link VolumeServerState}. */
5858
export const VOLUME_SERVER_TRANSIENT_STATUSES: VolumeServerState[] = [
5959
'snapshotting',
60-
'fetching',
6160
'resizing',
61+
'fetching',
6262
'saving',
6363
'hotsyncing',
64+
'attaching',
6465
]
6566

6667
/** Lists transient statutes of the enum {@link VolumeState}. */
6768
export const VOLUME_TRANSIENT_STATUSES: VolumeState[] = [
6869
'snapshotting',
6970
'fetching',
70-
'resizing',
7171
'saving',
72+
'resizing',
7273
'hotsyncing',
7374
]

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,11 @@ export type TaskStatus = 'pending' | 'started' | 'success' | 'failure' | 'retry'
108108
export type VolumeServerState =
109109
| 'available'
110110
| 'snapshotting'
111-
| 'fetching'
112111
| 'resizing'
112+
| 'fetching'
113113
| 'saving'
114114
| 'hotsyncing'
115+
| 'attaching'
115116
| 'error'
116117

117118
export type VolumeServerVolumeType =
@@ -124,8 +125,8 @@ export type VolumeState =
124125
| 'available'
125126
| 'snapshotting'
126127
| 'fetching'
127-
| 'resizing'
128128
| 'saving'
129+
| 'resizing'
129130
| 'hotsyncing'
130131
| 'error'
131132

@@ -2447,6 +2448,17 @@ export type PlanBlockMigrationRequest = {
24472448
snapshotId?: string
24482449
}
24492450

2451+
export type ReleaseIpToIpamRequest = {
2452+
/**
2453+
* Zone to target. If none is passed will use default zone from the config.
2454+
*/
2455+
zone?: ScwZone
2456+
/**
2457+
* ID of the IP you want to release from the Instance but retain in IPAM.
2458+
*/
2459+
ipId: string
2460+
}
2461+
24502462
export type ServerActionRequest = {
24512463
/**
24522464
* Zone to target. If none is passed will use default zone from the config.

packages_generated/product_catalog/src/v2alpha1/types.gen.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ export type PublicCatalogProductUnitOfMeasureCountableUnit =
5959
| 'setup'
6060
| 'day'
6161
| 'second'
62+
| 'sample_day'
63+
| 'gigabyte_day'
6264

6365
export interface PublicCatalogProductPropertiesHardwareCPUPhysical {
6466
/**
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"name": "@scaleway/sdk-s2s-vpn",
3+
"version": "1.0.0",
4+
"description": "Scaleway SDK s2s-vpn",
5+
"license": "Apache-2.0",
6+
"files": [
7+
"dist"
8+
],
9+
"type": "module",
10+
"exports": {
11+
".": {
12+
"types": "./dist/index.gen.d.ts",
13+
"import": "./dist/index.gen.js",
14+
"require": "./dist/index.gen.cjs",
15+
"default": "./dist/index.gen.js"
16+
},
17+
"./*": {
18+
"types": "./dist/*/index.gen.d.ts",
19+
"import": "./dist/*/index.gen.js",
20+
"require": "./dist/*/index.gen.cjs",
21+
"default": "./dist/*/index.gen.js"
22+
}
23+
},
24+
"repository": {
25+
"type": "git",
26+
"directory": "packages_generated/s2s-vpn"
27+
},
28+
"engines": {
29+
"node": ">=20.18.3"
30+
},
31+
"scripts": {
32+
"package:check": "pnpm publint",
33+
"typecheck": "tsc --noEmit",
34+
"type:generate": "tsc --declaration -p tsconfig.build.json",
35+
"build": "vite build --config vite.config.ts && pnpm run type:generate",
36+
"build:profile": "npx vite-bundle-visualizer -c vite.config.ts"
37+
},
38+
"dependencies": {
39+
"@scaleway/sdk-std": "workspace:*",
40+
"@scaleway/random-name": "5.1.1"
41+
},
42+
"peerDependencies": {
43+
"@scaleway/sdk-client": "workspace:^"
44+
},
45+
"devDependencies": {
46+
"@scaleway/sdk-client": "workspace:^"
47+
}
48+
}

0 commit comments

Comments
 (0)