Skip to content

Commit c42f44f

Browse files
fix(product_catalog): update environmental impact (#2032)
Co-authored-by: devtools-ci-cd <[email protected]>
1 parent 4b2c11a commit c42f44f

File tree

3 files changed

+71
-19
lines changed

3 files changed

+71
-19
lines changed

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export type {
66
ListPublicCatalogProductsResponse,
77
PublicCatalogApiListPublicCatalogProductsRequest,
88
PublicCatalogProduct,
9-
PublicCatalogProductEnvironmentalImpact,
9+
PublicCatalogProductEnvironmentalImpactEstimation,
1010
PublicCatalogProductLocality,
1111
PublicCatalogProductPrice,
1212
PublicCatalogProductPriceUnitOfMeasure,
@@ -25,5 +25,7 @@ export type {
2525
PublicCatalogProductPropertiesHardwareRAM,
2626
PublicCatalogProductPropertiesHardwareStorage,
2727
PublicCatalogProductPropertiesInstance,
28+
PublicCatalogProductUnitOfMeasure,
29+
PublicCatalogProductUnitOfMeasureCountableUnit,
2830
} from './types.gen'
2931
export * as ValidationRules from './validation-rules.gen'

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

+27-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
import type {
99
ListPublicCatalogProductsResponse,
1010
PublicCatalogProduct,
11-
PublicCatalogProductEnvironmentalImpact,
11+
PublicCatalogProductEnvironmentalImpactEstimation,
1212
PublicCatalogProductLocality,
1313
PublicCatalogProductPrice,
1414
PublicCatalogProductPriceUnitOfMeasure,
@@ -25,6 +25,7 @@ import type {
2525
PublicCatalogProductPropertiesHardwareRAM,
2626
PublicCatalogProductPropertiesHardwareStorage,
2727
PublicCatalogProductPropertiesInstance,
28+
PublicCatalogProductUnitOfMeasure,
2829
} from './types.gen'
2930

3031
const unmarshalPublicCatalogProductPropertiesHardwareCPUPhysical = (
@@ -247,19 +248,19 @@ const unmarshalPublicCatalogProductPropertiesInstance = (
247248
} as PublicCatalogProductPropertiesInstance
248249
}
249250

250-
const unmarshalPublicCatalogProductEnvironmentalImpact = (
251+
const unmarshalPublicCatalogProductEnvironmentalImpactEstimation = (
251252
data: unknown,
252-
): PublicCatalogProductEnvironmentalImpact => {
253+
): PublicCatalogProductEnvironmentalImpactEstimation => {
253254
if (!isJSONObject(data)) {
254255
throw new TypeError(
255-
`Unmarshalling the type 'PublicCatalogProductEnvironmentalImpact' failed as data isn't a dictionary.`,
256+
`Unmarshalling the type 'PublicCatalogProductEnvironmentalImpactEstimation' failed as data isn't a dictionary.`,
256257
)
257258
}
258259

259260
return {
260261
kgCo2Equivalent: data.kg_co2_equivalent,
261262
m3WaterUsage: data.m3_water_usage,
262-
} as PublicCatalogProductEnvironmentalImpact
263+
} as PublicCatalogProductEnvironmentalImpactEstimation
263264
}
264265

265266
const unmarshalPublicCatalogProductLocality = (
@@ -326,6 +327,21 @@ const unmarshalPublicCatalogProductProperties = (
326327
} as PublicCatalogProductProperties
327328
}
328329

330+
const unmarshalPublicCatalogProductUnitOfMeasure = (
331+
data: unknown,
332+
): PublicCatalogProductUnitOfMeasure => {
333+
if (!isJSONObject(data)) {
334+
throw new TypeError(
335+
`Unmarshalling the type 'PublicCatalogProductUnitOfMeasure' failed as data isn't a dictionary.`,
336+
)
337+
}
338+
339+
return {
340+
size: data.size,
341+
unit: data.unit,
342+
} as PublicCatalogProductUnitOfMeasure
343+
}
344+
329345
const unmarshalPublicCatalogProduct = (data: unknown): PublicCatalogProduct => {
330346
if (!isJSONObject(data)) {
331347
throw new TypeError(
@@ -335,9 +351,9 @@ const unmarshalPublicCatalogProduct = (data: unknown): PublicCatalogProduct => {
335351

336352
return {
337353
description: data.description,
338-
environmentalImpact: data.environmental_impact
339-
? unmarshalPublicCatalogProductEnvironmentalImpact(
340-
data.environmental_impact,
354+
environmentalImpactEstimation: data.environmental_impact_estimation
355+
? unmarshalPublicCatalogProductEnvironmentalImpactEstimation(
356+
data.environmental_impact_estimation,
341357
)
342358
: undefined,
343359
locality: data.locality
@@ -352,6 +368,9 @@ const unmarshalPublicCatalogProduct = (data: unknown): PublicCatalogProduct => {
352368
: undefined,
353369
serviceCategory: data.service_category,
354370
sku: data.sku,
371+
unitOfMeasure: data.unit_of_measure
372+
? unmarshalPublicCatalogProductUnitOfMeasure(data.unit_of_measure)
373+
: undefined,
355374
variant: data.variant,
356375
} as PublicCatalogProduct
357376
}

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

+41-10
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,34 @@ export type PublicCatalogProductPropertiesHardwareCPUArch =
4141
| 'riscv'
4242
| 'apple_silicon'
4343

44+
export type PublicCatalogProductUnitOfMeasureCountableUnit =
45+
| 'unknown_countable_unit'
46+
| 'chunk'
47+
| 'core'
48+
| 'currency'
49+
| 'device'
50+
| 'domain'
51+
| 'email'
52+
| 'gb_s'
53+
| 'gigabyte'
54+
| 'hour'
55+
| 'iops_gigabyte'
56+
| 'ip'
57+
| 'month'
58+
| 'node'
59+
| 'plan'
60+
| 'query'
61+
| 'request'
62+
| 'session'
63+
| 'vcpu_s'
64+
| 'version'
65+
| 'year'
66+
| 'key'
67+
| 'token'
68+
| 'minute'
69+
| 'setup'
70+
| 'day'
71+
4472
export interface PublicCatalogProductPropertiesHardwareCPUPhysical {
4573
/**
4674
* The number of sockets of the CPU.
@@ -224,14 +252,8 @@ export interface PublicCatalogProductPropertiesInstance {
224252
range: string
225253
}
226254

227-
export interface PublicCatalogProductEnvironmentalImpact {
228-
/**
229-
* Kilograms of CO2 that would need to be released to produce the equivalent warming impact.
230-
*/
255+
export interface PublicCatalogProductEnvironmentalImpactEstimation {
231256
kgCo2Equivalent?: number
232-
/**
233-
* Cubic meters of water used.
234-
*/
235257
m3WaterUsage?: number
236258
}
237259

@@ -268,7 +290,7 @@ export interface PublicCatalogProductPrice {
268290
*/
269291
retailPrice?: Money
270292
/**
271-
* The unit of measure of the price.
293+
* @deprecated The unit of measure of the price (deprecated).
272294
*/
273295
unitOfMeasure?: PublicCatalogProductPriceUnitOfMeasure
274296
}
@@ -304,6 +326,11 @@ export interface PublicCatalogProductProperties {
304326
instance?: PublicCatalogProductPropertiesInstance
305327
}
306328

329+
export interface PublicCatalogProductUnitOfMeasure {
330+
unit: PublicCatalogProductUnitOfMeasureCountableUnit
331+
size: number
332+
}
333+
307334
export interface PublicCatalogProduct {
308335
/**
309336
* The unique identifier of the product.
@@ -338,9 +365,13 @@ export interface PublicCatalogProduct {
338365
*/
339366
properties?: PublicCatalogProductProperties
340367
/**
341-
* The environmental impact of the product.
368+
* The environmental impact estimation of the product.
369+
*/
370+
environmentalImpactEstimation?: PublicCatalogProductEnvironmentalImpactEstimation
371+
/**
372+
* The unit of measure of the product.
342373
*/
343-
environmentalImpact?: PublicCatalogProductEnvironmentalImpact
374+
unitOfMeasure?: PublicCatalogProductUnitOfMeasure
344375
}
345376

346377
export interface ListPublicCatalogProductsResponse {

0 commit comments

Comments
 (0)