Merge branch 'main' into v1.6412.0

Author: jremy42

packages/clients/src/api/product_catalog/v2alpha1/marshalling.gen.ts

@@ -8,6 +8,7 @@ import {
 import type {
   ListPublicCatalogProductsResponse,
   PublicCatalogProduct,
+  PublicCatalogProductEnvironmentalImpact,
   PublicCatalogProductLocality,
   PublicCatalogProductPrice,
   PublicCatalogProductPriceUnitOfMeasure,
@@ -246,6 +247,21 @@ const unmarshalPublicCatalogProductPropertiesInstance = (
   } as PublicCatalogProductPropertiesInstance
 }
 
+const unmarshalPublicCatalogProductEnvironmentalImpact = (
+  data: unknown,
+): PublicCatalogProductEnvironmentalImpact => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'PublicCatalogProductEnvironmentalImpact' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    kgCo2Equivalent: data.kg_co2_equivalent,
+    m3WaterUsage: data.m3_water_usage,
+  } as PublicCatalogProductEnvironmentalImpact
+}
+
 const unmarshalPublicCatalogProductLocality = (
   data: unknown,
 ): PublicCatalogProductLocality => {
@@ -319,6 +335,11 @@ const unmarshalPublicCatalogProduct = (data: unknown): PublicCatalogProduct => {
 
   return {
     description: data.description,
+    environmentalImpact: data.environmental_impact
+      ? unmarshalPublicCatalogProductEnvironmentalImpact(
+          data.environmental_impact,
+        )
+      : undefined,
     locality: data.locality
       ? unmarshalPublicCatalogProductLocality(data.locality)
       : undefined,

packages/clients/src/api/product_catalog/v2alpha1/types.gen.ts

@@ -224,6 +224,17 @@ export interface PublicCatalogProductPropertiesInstance {
   range: string
 }
 
+export interface PublicCatalogProductEnvironmentalImpact {
+  /**
+   * Kilograms of CO2 that would need to be released to produce the equivalent warming impact.
+   */
+  kgCo2Equivalent?: number
+  /**
+   * Cubic meters of water used.
+   */
+  m3WaterUsage?: number
+}
+
 export interface PublicCatalogProductLocality {
   /**
    * Whether or not the product is global.
@@ -326,6 +337,10 @@ export interface PublicCatalogProduct {
    * The properties of the product.
    */
   properties?: PublicCatalogProductProperties
+  /**
+   * The environmental impact of the product.
+   */
+  environmentalImpact?: PublicCatalogProductEnvironmentalImpact
 }
 
 export interface ListPublicCatalogProductsResponse {