Skip to content

Commit dd60980

Browse files
authored
Merge branch 'main' into v1.5912.0
2 parents ee47f3d + d2f2279 commit dd60980

File tree

13 files changed

+125
-17
lines changed

13 files changed

+125
-17
lines changed

packages/clients/src/api/applesilicon/v1alpha1/content.gen.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
// This file was automatically generated. DO NOT EDIT.
22
// If you have any remark or suggestion do not hesitate to open an issue.
3-
import type { ServerStatus } from './types.gen'
3+
import type { ServerPrivateNetworkStatus, ServerStatus } from './types.gen'
4+
5+
/** Lists transient statutes of the enum {@link ServerPrivateNetworkStatus}. */
6+
export const SERVER_PRIVATE_NETWORK_TRANSIENT_STATUSES: ServerPrivateNetworkStatus[] =
7+
['vpc_updating']
48

59
/** Lists transient statutes of the enum {@link ServerStatus}. */
610
export const SERVER_TRANSIENT_STATUSES: ServerStatus[] = [

packages/clients/src/api/applesilicon/v1alpha1/marshalling.gen.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ export const unmarshalServer = (data: unknown): Server => {
159159
updatedAt: unmarshalDate(data.updated_at),
160160
vncPort: data.vnc_port,
161161
vncUrl: data.vnc_url,
162+
vpcStatus: data.vpc_status,
162163
zone: data.zone,
163164
} as Server
164165
}
@@ -263,6 +264,7 @@ export const marshalCreateServerRequest = (
263264
request: CreateServerRequest,
264265
defaults: DefaultValues,
265266
): Record<string, unknown> => ({
267+
enable_vpc: request.enableVpc,
266268
name: request.name || randomName('as'),
267269
os_id: request.osId,
268270
project_id: request.projectId ?? defaults.defaultProjectId,
@@ -287,6 +289,7 @@ export const marshalUpdateServerRequest = (
287289
request: UpdateServerRequest,
288290
defaults: DefaultValues,
289291
): Record<string, unknown> => ({
292+
enable_vpc: request.enableVpc,
290293
name: request.name,
291294
schedule_deletion: request.scheduleDeletion,
292295
})

packages/clients/src/api/applesilicon/v1alpha1/types.gen.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ export type ConnectivityDiagnosticDiagnosticStatus =
1414

1515
export type ListServersRequestOrderBy = 'created_at_asc' | 'created_at_desc'
1616

17+
export type ServerPrivateNetworkStatus =
18+
| 'vpc_unknown_status'
19+
| 'vpc_enabled'
20+
| 'vpc_updating'
21+
| 'vpc_disabled'
22+
1723
export type ServerStatus =
1824
| 'unknown_status'
1925
| 'starting'
@@ -158,6 +164,11 @@ export interface Server {
158164
* using the server status.
159165
*/
160166
delivered: boolean
167+
/**
168+
* Activation status of optional Private Network feature support for this
169+
* server.
170+
*/
171+
vpcStatus: ServerPrivateNetworkStatus
161172
}
162173

163174
export interface ConnectivityDiagnostic {
@@ -184,6 +195,11 @@ export type CreateServerRequest = {
184195
* induce an extended delivery time.
185196
*/
186197
osId?: string
198+
/**
199+
* Activate the Private Network feature for this server. This feature is
200+
* configured through the Apple Silicon - Private Networks API.
201+
*/
202+
enableVpc: boolean
187203
}
188204

189205
export type DeleteServerRequest = {
@@ -319,4 +335,6 @@ export type UpdateServerRequest = {
319335
name?: string
320336
/** Specify whether the server should be flagged for automatic deletion. */
321337
scheduleDeletion?: boolean
338+
/** Activate or deactivate Private Network support for this server. */
339+
enableVpc?: boolean
322340
}

packages/clients/src/api/ipam/v1/api.gen.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ export class API extends ParentAPI {
131131
path: `/ipam/v1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/ips`,
132132
urlParams: urlParams(
133133
['attached', request.attached],
134+
['ip_ids', request.ipIds],
134135
['is_ipv6', request.isIpv6],
135136
['mac_address', request.macAddress],
136137
['order_by', request.orderBy],

packages/clients/src/api/ipam/v1/types.gen.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,11 @@ export type ListIPsRequest = {
225225
vpcId?: string
226226
/** Defines whether to filter only for IPs which are attached to a resource. */
227227
attached?: boolean
228+
/**
229+
* Attached resource name to filter for, only IPs attached to a resource with
230+
* this string within their name will be returned.
231+
*/
232+
resourceName?: string
228233
/**
229234
* Resource ID to filter for. Only IPs attached to this resource will be
230235
* returned.
@@ -240,6 +245,11 @@ export type ListIPsRequest = {
240245
* will be returned.
241246
*/
242247
resourceType?: ResourceType
248+
/**
249+
* Resource types to filter for. Only IPs attached to these types of resources
250+
* will be returned.
251+
*/
252+
resourceTypes?: ResourceType[]
243253
/**
244254
* MAC address to filter for. Only IPs attached to a resource with this MAC
245255
* address will be returned.
@@ -257,16 +267,8 @@ export type ListIPsRequest = {
257267
organizationId?: string
258268
/** Defines whether to filter only for IPv4s or IPv6s. */
259269
isIpv6?: boolean
260-
/**
261-
* Attached resource name to filter for, only IPs attached to a resource with
262-
* this string within their name will be returned.
263-
*/
264-
resourceName?: string
265-
/**
266-
* Resource types to filter for. Only IPs attached to these types of resources
267-
* will be returned.
268-
*/
269-
resourceTypes?: ResourceType[]
270+
/** IP IDs to filter for. Only IPs with these UUIDs will be returned. */
271+
ipIds?: string[]
270272
}
271273

272274
export interface ListIPsResponse {

packages/clients/src/api/lb/v1/types.gen.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ export interface HealthCheck {
271271
*/
272272
tcpConfig?: HealthCheckTcpConfig
273273
/**
274-
* Object to configure a MySQL health check. The check requires MySQL >=3.22,
275-
* for older versions, use a TCP health check.
274+
* Object to configure a MySQL health check. The check requires MySQL >=3.22
275+
* or <9.0. For older or newer versions, use a TCP health check.
276276
*
277277
* One-of ('config'): at most one of 'tcpConfig', 'mysqlConfig',
278278
* 'pgsqlConfig', 'ldapConfig', 'redisConfig', 'httpConfig', 'httpsConfig'
@@ -1848,8 +1848,8 @@ export type UpdateHealthCheckRequest = {
18481848
*/
18491849
tcpConfig?: HealthCheckTcpConfig
18501850
/**
1851-
* Object to configure a MySQL health check. The check requires MySQL >=3.22,
1852-
* for older versions, use a TCP health check.
1851+
* Object to configure a MySQL health check. The check requires MySQL >=3.22
1852+
* or <9.0. For older or newer versions, use a TCP health check.
18531853
*
18541854
* One-of ('config'): at most one of 'tcpConfig', 'mysqlConfig',
18551855
* 'pgsqlConfig', 'ldapConfig', 'redisConfig', 'httpConfig', 'httpsConfig'
@@ -2864,8 +2864,8 @@ export type ZonedApiUpdateHealthCheckRequest = {
28642864
*/
28652865
tcpConfig?: HealthCheckTcpConfig
28662866
/**
2867-
* Object to configure a MySQL health check. The check requires MySQL >=3.22,
2868-
* for older versions, use a TCP health check.
2867+
* Object to configure a MySQL health check. The check requires MySQL >=3.22
2868+
* or <9.0. For older or newer versions, use a TCP health check.
28692869
*
28702870
* One-of ('config'): at most one of 'tcpConfig', 'mysqlConfig',
28712871
* 'pgsqlConfig', 'ldapConfig', 'redisConfig', 'httpConfig', 'httpsConfig'

packages/clients/src/api/secret/v1beta1/marshalling.gen.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ export const unmarshalSecretVersion = (data: unknown): SecretVersion => {
5050

5151
return {
5252
createdAt: unmarshalDate(data.created_at),
53+
deletedAt: unmarshalDate(data.deleted_at),
5354
description: data.description,
5455
ephemeralProperties: data.ephemeral_properties
5556
? unmarshalEphemeralProperties(data.ephemeral_properties)

packages/clients/src/api/secret/v1beta1/types.gen.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ export interface SecretVersion {
103103
createdAt?: Date
104104
/** Last update of the version. */
105105
updatedAt?: Date
106+
/** Date and time of the version's deletion. */
107+
deletedAt?: Date
106108
/** Description of the version. */
107109
description?: string
108110
/** Returns `true` if the version is the latest. */

packages/clients/src/api/vpcgw/v2/api.gen.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ export class API extends ParentAPI {
222222
{
223223
method: 'DELETE',
224224
path: `/vpc-gw/v2/zones/${validatePathParam('zone', request.zone ?? this.client.settings.defaultZone)}/gateways/${validatePathParam('gatewayId', request.gatewayId)}`,
225+
urlParams: urlParams(['delete_ip', request.deleteIp]),
225226
},
226227
unmarshalGateway,
227228
)

packages/clients/src/api/vpcgw/v2/types.gen.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,8 @@ export type DeleteGatewayRequest = {
271271
zone?: Zone
272272
/** ID of the gateway to delete. */
273273
gatewayId: string
274+
/** Defines whether the PGW's IP should be deleted. */
275+
deleteIp: boolean
274276
}
275277

276278
export type DeleteIPRequest = {

0 commit comments

Comments
 (0)