Skip to content

Commit 4b725ad

Browse files
authored
Merge branch 'main' into v1.6514.0
2 parents b28b16a + ffb89e8 commit 4b725ad

File tree

5 files changed

+2190
-5855
lines changed

5 files changed

+2190
-5855
lines changed

.github/renovate.json

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
"helpers:disableTypesNodeMajor"
88
],
99
"updateNotScheduled": true,
10-
"lockFileMaintenance": { "enabled": false },
10+
"lockFileMaintenance": {
11+
"enabled": false
12+
},
1113
"enabledManagers": ["github-actions", "npm"],
1214
"prCreation": "not-pending",
1315
"prHourlyLimit": 5,
@@ -23,60 +25,60 @@
2325
},
2426
{
2527
"automerge": false,
26-
"matchPackagePatterns": ["^@scaleway/"],
27-
"stabilityDays": 0,
28-
"matchUpdateTypes": ["major", "minor", "patch"]
28+
"minimumReleaseAge": null,
29+
"matchUpdateTypes": ["major", "minor", "patch"],
30+
"matchPackageNames": ["/^@scaleway//"]
2931
},
3032
{
3133
"labels": ["UPDATE-MAJOR"],
32-
"stabilityDays": 14,
34+
"minimumReleaseAge": "14 days",
3335
"matchUpdateTypes": ["major"]
3436
},
3537
{
3638
"labels": ["UPDATE-MINOR"],
37-
"stabilityDays": 5,
39+
"minimumReleaseAge": "5 days",
3840
"matchUpdateTypes": ["minor"]
3941
},
4042
{
4143
"labels": ["UPDATE-PATCH"],
42-
"stabilityDays": 1,
44+
"minimumReleaseAge": "1 day",
4345
"matchUpdateTypes": ["patch"]
4446
},
4547
{
46-
"matchPackagePatterns": [
47-
"^@babel/",
48-
"^@commitlint/",
49-
"^babel-",
50-
"cz-conventional-changelog",
51-
"eslint",
52-
"husky",
53-
"jest",
54-
"lint-staged"
55-
],
5648
"automerge": true,
5749
"automergeType": "branch",
5850
"semanticCommitScope": "minor-deps",
59-
"stabilityDays": 3,
60-
"matchUpdateTypes": ["minor"]
51+
"minimumReleaseAge": "3 days",
52+
"matchUpdateTypes": ["minor"],
53+
"matchPackageNames": [
54+
"/^@babel//",
55+
"/^@commitlint//",
56+
"/^babel-/",
57+
"/cz-conventional-changelog/",
58+
"/eslint/",
59+
"/husky/",
60+
"/jest/",
61+
"/lint-staged/"
62+
]
6163
},
6264
{
63-
"matchPackagePatterns": [
64-
"^@babel/",
65-
"^@commitlint/",
66-
"^@semantic-release/",
67-
"^@types/",
68-
"^babel-",
69-
"^eslint",
70-
"cz-conventional-changelog",
71-
"husky",
72-
"jest",
73-
"lint-staged"
74-
],
7565
"automerge": true,
7666
"automergeType": "branch",
7767
"semanticCommitScope": "patch-deps",
78-
"stabilityDays": 1,
79-
"matchUpdateTypes": ["patch"]
68+
"minimumReleaseAge": "1 day",
69+
"matchUpdateTypes": ["patch"],
70+
"matchPackageNames": [
71+
"/^@babel//",
72+
"/^@commitlint//",
73+
"/^@semantic-release//",
74+
"/^@types//",
75+
"/^babel-/",
76+
"/^eslint/",
77+
"/cz-conventional-changelog/",
78+
"/husky/",
79+
"/jest/",
80+
"/lint-staged/"
81+
]
8082
}
8183
]
8284
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"husky": "9.1.7",
7777
"jsdom": "26.1.0",
7878
"lerna": "8.2.2",
79-
"lint-staged": "15.5.1",
79+
"lint-staged": "15.5.2",
8080
"prettier": "3.5.3",
8181
"react": "^19.1.0",
8282
"read-pkg": "9.0.1",

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import {
44
isJSONObject,
55
unmarshalArrayOfObject,
6+
unmarshalDate,
67
unmarshalMoney,
78
} from '@scaleway/sdk-client'
89
import type {
@@ -228,7 +229,9 @@ const unmarshalPublicCatalogProductPropertiesInstance = (
228229
}
229230

230231
return {
232+
offerId: data.offer_id,
231233
range: data.range,
234+
recommendedReplacementOfferIds: data.recommended_replacement_offer_ids,
232235
} as PublicCatalogProductPropertiesInstance
233236
}
234237

@@ -332,6 +335,7 @@ const unmarshalPublicCatalogProduct = (data: unknown): PublicCatalogProduct => {
332335

333336
return {
334337
description: data.description,
338+
endOfLifeAt: unmarshalDate(data.end_of_life_at),
335339
environmentalImpactEstimation: data.environmental_impact_estimation
336340
? unmarshalPublicCatalogProductEnvironmentalImpactEstimation(
337341
data.environmental_impact_estimation,
@@ -349,6 +353,7 @@ const unmarshalPublicCatalogProduct = (data: unknown): PublicCatalogProduct => {
349353
: undefined,
350354
serviceCategory: data.service_category,
351355
sku: data.sku,
356+
status: data.status,
352357
unitOfMeasure: data.unit_of_measure
353358
? unmarshalPublicCatalogProductUnitOfMeasure(data.unit_of_measure)
354359
: undefined,

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ export type PublicCatalogProductPropertiesHardwareCPUArch =
1313
| 'riscv'
1414
| 'apple_silicon'
1515

16+
export type PublicCatalogProductStatus =
17+
| 'unknown_status'
18+
| 'public_beta'
19+
| 'preview'
20+
| 'general_availability'
21+
| 'end_of_deployment'
22+
| 'end_of_support'
23+
1624
export type PublicCatalogProductUnitOfMeasureCountableUnit =
1725
| 'unknown_countable_unit'
1826
| 'chunk'
@@ -211,6 +219,14 @@ export interface PublicCatalogProductPropertiesInstance {
211219
* The range of the Instance server.
212220
*/
213221
range: string
222+
/**
223+
* The offer ID of the Instance server.
224+
*/
225+
offerId: string
226+
/**
227+
* The recommended replacement offer IDs of the Instance server.
228+
*/
229+
recommendedReplacementOfferIds: string[]
214230
}
215231

216232
export interface PublicCatalogProductEnvironmentalImpactEstimation {
@@ -329,6 +345,14 @@ export interface PublicCatalogProduct {
329345
* The unit of measure of the product.
330346
*/
331347
unitOfMeasure?: PublicCatalogProductUnitOfMeasure
348+
/**
349+
* The status of the product.
350+
*/
351+
status: PublicCatalogProductStatus
352+
/**
353+
* The end of life date of the product.
354+
*/
355+
endOfLifeAt?: Date
332356
}
333357

334358
export interface ListPublicCatalogProductsResponse {

0 commit comments

Comments
 (0)