Skip to content

Commit 770f49e

Browse files
authored
Merge branch 'main' into v1.6468.0
2 parents 8971f7e + 9507acb commit 770f49e

File tree

11 files changed

+2109
-5705
lines changed

11 files changed

+2109
-5705
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"turbo": "2.5.1",
8585
"typedoc": "0.27.6",
8686
"typescript": "5.8.3",
87-
"vite": "6.3.3",
87+
"vite": "6.3.4",
8888
"vitest": "3.1.2"
8989
},
9090
"packageManager": "[email protected]"

packages_generated/container/src/v1beta1/marshalling.gen.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ export const unmarshalContainer = (data: unknown): Container => {
163163
unmarshalSecretHashedValue,
164164
),
165165
status: data.status,
166+
tags: data.tags,
166167
timeout: data.timeout,
167168
updatedAt: unmarshalDate(data.updated_at),
168169
} as Container
@@ -511,6 +512,7 @@ export const marshalCreateContainerRequest = (
511512
marshalSecret(elt, defaults),
512513
)
513514
: undefined,
515+
tags: request.tags,
514516
timeout: request.timeout,
515517
})
516518

@@ -664,6 +666,7 @@ export const marshalUpdateContainerRequest = (
664666
marshalSecret(elt, defaults),
665667
)
666668
: undefined,
669+
tags: request.tags,
667670
timeout: request.timeout,
668671
})
669672

packages_generated/container/src/v1beta1/types.gen.ts

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,10 @@ export interface Container {
364364
* Region in which the container will be deployed.
365365
*/
366366
region: ScwRegion
367+
/**
368+
* List of tags applied to the Serverless Container.
369+
*/
370+
tags: string[]
367371
}
368372

369373
export interface Cron {
@@ -470,7 +474,7 @@ export interface Namespace {
470474
*/
471475
region: ScwRegion
472476
/**
473-
* [ALPHA] List of tags applied to the Serverless Container Namespace.
477+
* List of tags applied to the Serverless Container Namespace.
474478
*/
475479
tags: string[]
476480
/**
@@ -666,6 +670,10 @@ export type CreateContainerRequest = {
666670
* Health check configuration of the container.
667671
*/
668672
healthCheck?: ContainerHealthCheckSpec
673+
/**
674+
* Tags of the Serverless Container.
675+
*/
676+
tags?: string[]
669677
}
670678

671679
export type CreateCronRequest = {
@@ -732,7 +740,7 @@ export type CreateNamespaceRequest = {
732740
*/
733741
secretEnvironmentVariables?: Secret[]
734742
/**
735-
* [ALPHA] Tags of the Serverless Container Namespace.
743+
* Tags of the Serverless Container Namespace.
736744
*/
737745
tags?: string[]
738746
}
@@ -1261,6 +1269,10 @@ export type UpdateContainerRequest = {
12611269
* Health check configuration of the container.
12621270
*/
12631271
healthCheck?: ContainerHealthCheckSpec
1272+
/**
1273+
* Tags of the Serverless Container.
1274+
*/
1275+
tags?: string[]
12641276
}
12651277

12661278
export type UpdateCronRequest = {
@@ -1312,7 +1324,7 @@ export type UpdateNamespaceRequest = {
13121324
*/
13131325
secretEnvironmentVariables?: Secret[]
13141326
/**
1315-
* [ALPHA] Tags of the Serverless Container Namespace.
1327+
* Tags of the Serverless Container Namespace.
13161328
*/
13171329
tags?: string[]
13181330
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ This can be modified using the `order_by` field.
175175

176176
/**
177177
* Update filesystem properties. Update the technical details of a filesystem, such as its name, tags or its new size.
178-
You can only resize a filesystem to a larger size.
179178
*
180179
* @param request - The request {@link UpdateFileSystemRequest}
181180
* @returns A Promise of FileSystem

packages_generated/function/src/v1beta1/marshalling.gen.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ export const unmarshalFunction = (data: unknown): Function => {
127127
unmarshalSecretHashedValue,
128128
),
129129
status: data.status,
130+
tags: data.tags,
130131
timeout: data.timeout,
131132
updatedAt: unmarshalDate(data.updated_at),
132133
} as Function
@@ -459,6 +460,7 @@ export const marshalCreateFunctionRequest = (
459460
marshalSecret(elt, defaults),
460461
)
461462
: undefined,
463+
tags: request.tags,
462464
timeout: request.timeout,
463465
})
464466

@@ -592,6 +594,7 @@ export const marshalUpdateFunctionRequest = (
592594
marshalSecret(elt, defaults),
593595
)
594596
: undefined,
597+
tags: request.tags,
595598
timeout: request.timeout,
596599
})
597600

packages_generated/function/src/v1beta1/types.gen.ts

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,10 @@ export interface Function {
405405
* Last date when the function was successfully deployed and set to ready.
406406
*/
407407
readyAt?: Date
408+
/**
409+
* List of tags applied to the Serverless Function.
410+
*/
411+
tags: string[]
408412
}
409413

410414
export interface Namespace {
@@ -457,7 +461,7 @@ export interface Namespace {
457461
*/
458462
region: ScwRegion
459463
/**
460-
* [ALPHA] List of tags applied to the Serverless Function Namespace.
464+
* List of tags applied to the Serverless Function Namespace.
461465
*/
462466
tags: string[]
463467
/**
@@ -661,6 +665,10 @@ export type CreateFunctionRequest = {
661665
* Execution environment of the function.
662666
*/
663667
sandbox?: FunctionSandbox
668+
/**
669+
* Tags of the Serverless Function.
670+
*/
671+
tags?: string[]
664672
}
665673

666674
export type CreateNamespaceRequest = {
@@ -686,7 +694,7 @@ export type CreateNamespaceRequest = {
686694
*/
687695
secretEnvironmentVariables?: Secret[]
688696
/**
689-
* [ALPHA] Tags of the Serverless Function Namespace.
697+
* Tags of the Serverless Function Namespace.
690698
*/
691699
tags?: string[]
692700
}
@@ -1270,6 +1278,10 @@ export type UpdateFunctionRequest = {
12701278
* Execution environment of the function.
12711279
*/
12721280
sandbox?: FunctionSandbox
1281+
/**
1282+
* Tags of the Serverless Function.
1283+
*/
1284+
tags?: string[]
12731285
}
12741286

12751287
export type UpdateNamespaceRequest = {
@@ -1294,7 +1306,7 @@ export type UpdateNamespaceRequest = {
12941306
*/
12951307
secretEnvironmentVariables?: Secret[]
12961308
/**
1297-
* [ALPHA] Tags of the Serverless Function Namespace.
1309+
* Tags of the Serverless Function Namespace.
12981310
*/
12991311
tags?: string[]
13001312
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ export const unmarshalCluster = (data: unknown): Cluster => {
230230
privateNetworkId: data.private_network_id,
231231
projectId: data.project_id,
232232
region: data.region,
233-
sbsCsiEnabled: data.sbs_csi_enabled,
234233
status: data.status,
235234
tags: data.tags,
236235
type: data.type,

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -710,10 +710,6 @@ export interface Cluster {
710710
* Date on which it will be possible to switch to a smaller offer.
711711
*/
712712
commitmentEndsAt?: Date
713-
/**
714-
* @deprecated Defines whether the SBS-enabled CSI starting from v0.3 is installed on the cluster.
715-
*/
716-
sbsCsiEnabled?: boolean
717713
/**
718714
* @deprecated Defines whether ACL is available on the cluster.
719715
*/

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import type {
1111
PublicCatalogProductEnvironmentalImpactEstimation,
1212
PublicCatalogProductLocality,
1313
PublicCatalogProductPrice,
14-
PublicCatalogProductPriceUnitOfMeasure,
1514
PublicCatalogProductProperties,
1615
PublicCatalogProductPropertiesAppleSilicon,
1716
PublicCatalogProductPropertiesDedibox,
@@ -149,21 +148,6 @@ const unmarshalPublicCatalogProductPropertiesHardwareStorage = (
149148
} as PublicCatalogProductPropertiesHardwareStorage
150149
}
151150

152-
const unmarshalPublicCatalogProductPriceUnitOfMeasure = (
153-
data: unknown,
154-
): PublicCatalogProductPriceUnitOfMeasure => {
155-
if (!isJSONObject(data)) {
156-
throw new TypeError(
157-
`Unmarshalling the type 'PublicCatalogProductPriceUnitOfMeasure' failed as data isn't a dictionary.`,
158-
)
159-
}
160-
161-
return {
162-
size: data.size,
163-
unit: data.unit,
164-
} as PublicCatalogProductPriceUnitOfMeasure
165-
}
166-
167151
const unmarshalPublicCatalogProductPropertiesAppleSilicon = (
168152
data: unknown,
169153
): PublicCatalogProductPropertiesAppleSilicon => {
@@ -293,9 +277,6 @@ const unmarshalPublicCatalogProductPrice = (
293277
retailPrice: data.retail_price
294278
? unmarshalMoney(data.retail_price)
295279
: undefined,
296-
unitOfMeasure: data.unit_of_measure
297-
? unmarshalPublicCatalogProductPriceUnitOfMeasure(data.unit_of_measure)
298-
: undefined,
299280
} as PublicCatalogProductPrice
300281
}
301282

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

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,6 @@ import type {
66
Zone as ScwZone,
77
} from '@scaleway/sdk-client'
88

9-
export type PublicCatalogProductPriceUnitOfMeasureCountableUnit =
10-
| 'unknown_countable_unit'
11-
| 'chunk'
12-
| 'core'
13-
| 'currency'
14-
| 'device'
15-
| 'domain'
16-
| 'email'
17-
| 'gb_s'
18-
| 'gigabyte'
19-
| 'hour'
20-
| 'iops_gigabyte'
21-
| 'ip'
22-
| 'month'
23-
| 'node'
24-
| 'plan'
25-
| 'query'
26-
| 'request'
27-
| 'session'
28-
| 'vcpu_s'
29-
| 'version'
30-
| 'year'
31-
| 'key'
32-
| 'token'
33-
| 'minute'
34-
| 'setup'
35-
| 'day'
36-
379
export type PublicCatalogProductPropertiesHardwareCPUArch =
3810
| 'unknown_arch'
3911
| 'x64'
@@ -190,17 +162,6 @@ export interface PublicCatalogProductPropertiesHardwareStorage {
190162
total: number
191163
}
192164

193-
export interface PublicCatalogProductPriceUnitOfMeasure {
194-
/**
195-
* The unit of measure.
196-
*/
197-
unit: PublicCatalogProductPriceUnitOfMeasureCountableUnit
198-
/**
199-
* The size of the unit.
200-
*/
201-
size: number
202-
}
203-
204165
export interface PublicCatalogProductPropertiesAppleSilicon {
205166
/**
206167
* The range of the Apple Silicon server.
@@ -289,10 +250,6 @@ export interface PublicCatalogProductPrice {
289250
* The retail price of the product.
290251
*/
291252
retailPrice?: Money
292-
/**
293-
* @deprecated The unit of measure of the price (deprecated).
294-
*/
295-
unitOfMeasure?: PublicCatalogProductPriceUnitOfMeasure
296253
}
297254

298255
export interface PublicCatalogProductProperties {

0 commit comments

Comments
 (0)