sync(*): master to develop

sync(*): master to develop

Author: ovh-cds

packages/manager/apps/pci-block-storage/public/translations/common/Messages_de_DE.json

@@ -26,6 +26,8 @@
   "pci_projects_project_storages_blocks_encryption_unavailable": "Verschlüsselung nicht verfügbar",
   "pci_projects_project_storages_blocks_guaranteed": "garantiert",
   "pci_projects_project_storages_blocks_up_to": "bis zu",
+  "pci_projects_project_storages_blocks_iops_base_range": "Basis von {{min}} IOPS zwischen {{minSize}} {{sizeUnit}} und {{maxSize}} {{sizeUnit}}",
+  "pci_projects_project_storages_blocks_bandwidth_base_range": "Basis von {{min}} {{unit}} zwischen {{minSize}} {{sizeUnit}} und {{maxSize}} {{sizeUnit}}",
   "pci_projects_project_storages_blocks_guides_header": "Guides",
   "pci_projects_project_storages_blocks_guides_all_block_storage_guides": "Alle Guides zu Block Storage",
   "pci_projects_project_storages_blocks_guides_first_steps_with_volumes": "Erste Schritte mit Volumes",

packages/manager/apps/pci-block-storage/public/translations/common/Messages_en_GB.json

@@ -26,6 +26,8 @@
   "pci_projects_project_storages_blocks_encryption_unavailable": "Encryption not available",
   "pci_projects_project_storages_blocks_guaranteed": "guaranteed",
   "pci_projects_project_storages_blocks_up_to": "up to",
+  "pci_projects_project_storages_blocks_iops_base_range": "Base of {{min}} IOPS between {{minSize}} {{sizeUnit}} and {{maxSize}} {{sizeUnit}}",
+  "pci_projects_project_storages_blocks_bandwidth_base_range": "Base of {{min}} {{unit}} between {{minSize}} {{sizeUnit}} and {{maxSize}} {{sizeUnit}}",
   "pci_projects_project_storages_blocks_guides_header": "Guides",
   "pci_projects_project_storages_blocks_guides_all_block_storage_guides": "All block storage guides",
   "pci_projects_project_storages_blocks_guides_first_steps_with_volumes": "Getting started with volumes",

packages/manager/apps/pci-block-storage/public/translations/common/Messages_es_ES.json

@@ -26,6 +26,8 @@
   "pci_projects_project_storages_blocks_encryption_unavailable": "Cifrado no disponible",
   "pci_projects_project_storages_blocks_guaranteed": "garantizada",
   "pci_projects_project_storages_blocks_up_to": "hasta",
+  "pci_projects_project_storages_blocks_iops_base_range": "Base de {{min}} IOPS entre {{minSize}} {{sizeUnit}} y {{maxSize}} {{sizeUnit}}",
+  "pci_projects_project_storages_blocks_bandwidth_base_range": "Base de {{min}} {{unit}} entre {{minSize}} {{sizeUnit}} y {{maxSize}} {{sizeUnit}}",
   "pci_projects_project_storages_blocks_guides_header": "Guías",
   "pci_projects_project_storages_blocks_guides_all_block_storage_guides": "Todas las guías del block storage",
   "pci_projects_project_storages_blocks_guides_first_steps_with_volumes": "Primeros pasos con los volúmenes",

packages/manager/apps/pci-block-storage/public/translations/common/Messages_fr_CA.json

@@ -27,6 +27,8 @@
   "pci_projects_project_storages_blocks_encryption_unavailable": "Chiffrement indisponible",
   "pci_projects_project_storages_blocks_guaranteed": "garantie",
   "pci_projects_project_storages_blocks_up_to": "jusqu'à",
+  "pci_projects_project_storages_blocks_iops_base_range": "Base de {{min}} IOPS entre {{minSize}} {{sizeUnit}} et {{maxSize}} {{sizeUnit}}",
+  "pci_projects_project_storages_blocks_bandwidth_base_range": "Base de {{min}} {{unit}} entre {{minSize}} {{sizeUnit}} et {{maxSize}} {{sizeUnit}}",
   "pci_projects_project_storages_blocks_guides_header": "Guides",
   "pci_projects_project_storages_blocks_guides_all_block_storage_guides": "Tous les guides block storage",
   "pci_projects_project_storages_blocks_guides_first_steps_with_volumes": "Premiers pas avec les volumes"

packages/manager/apps/pci-block-storage/public/translations/common/Messages_fr_FR.json

@@ -27,6 +27,8 @@
   "pci_projects_project_storages_blocks_encryption_unavailable": "Chiffrement indisponible",
   "pci_projects_project_storages_blocks_guaranteed": "garantie",
   "pci_projects_project_storages_blocks_up_to": "jusqu'à",
+  "pci_projects_project_storages_blocks_iops_base_range": "Base de {{min}} IOPS entre {{minSize}} {{sizeUnit}} et {{maxSize}} {{sizeUnit}}",
+  "pci_projects_project_storages_blocks_bandwidth_base_range": "Base de {{min}} {{unit}} entre {{minSize}} {{sizeUnit}} et {{maxSize}} {{sizeUnit}}",
   "pci_projects_project_storages_blocks_guides_header": "Guides",
   "pci_projects_project_storages_blocks_guides_all_block_storage_guides": "Tous les guides block storage",
   "pci_projects_project_storages_blocks_guides_first_steps_with_volumes": "Premiers pas avec les volumes"

packages/manager/apps/pci-block-storage/public/translations/common/Messages_it_IT.json

@@ -26,6 +26,8 @@
   "pci_projects_project_storages_blocks_encryption_unavailable": "Crittografia non disponibile",
   "pci_projects_project_storages_blocks_guaranteed": "garantita",
   "pci_projects_project_storages_blocks_up_to": "fino a",
+  "pci_projects_project_storages_blocks_iops_base_range": "Base di {{min}} IOPS tra {{minSize}} {{sizeUnit}} e {{maxSize}} {{sizeUnit}}",
+  "pci_projects_project_storages_blocks_bandwidth_base_range": "Base di {{min}} {{unit}} tra {{minSize}} {{sizeUnit}} e {{maxSize}} {{sizeUnit}}",
   "pci_projects_project_storages_blocks_guides_header": "Guide",
   "pci_projects_project_storages_blocks_guides_all_block_storage_guides": "Tutte le guide Block Storage",
   "pci_projects_project_storages_blocks_guides_first_steps_with_volumes": "Iniziare a utilizzare i volumi",

packages/manager/apps/pci-block-storage/public/translations/common/Messages_pl_PL.json

@@ -26,6 +26,8 @@
   "pci_projects_project_storages_blocks_encryption_unavailable": "Szyfrowanie niedostępne",
   "pci_projects_project_storages_blocks_guaranteed": "o gwarantowanej przepustowości",
   "pci_projects_project_storages_blocks_up_to": "do",
+  "pci_projects_project_storages_blocks_iops_base_range": "Podstawa {{min}} IOPS między {{minSize}} {{sizeUnit}} a {{maxSize}} {{sizeUnit}}",
+  "pci_projects_project_storages_blocks_bandwidth_base_range": "Podstawa {{min}} {{unit}} między {{minSize}} {{sizeUnit}} a {{maxSize}} {{sizeUnit}}",
   "pci_projects_project_storages_blocks_guides_header": "Przewodniki",
   "pci_projects_project_storages_blocks_guides_all_block_storage_guides": "Przewodniki dotyczące block storage",
   "pci_projects_project_storages_blocks_guides_first_steps_with_volumes": "Pierwsze kroki z wolumenami",

packages/manager/apps/pci-block-storage/public/translations/common/Messages_pt_PT.json

@@ -26,6 +26,8 @@
   "pci_projects_project_storages_blocks_encryption_unavailable": "Encriptação indisponível",
   "pci_projects_project_storages_blocks_guaranteed": "garantida",
   "pci_projects_project_storages_blocks_up_to": "até",
+  "pci_projects_project_storages_blocks_iops_base_range": "Base de {{min}} IOPS entre {{minSize}} {{sizeUnit}} e {{maxSize}} {{sizeUnit}}",
+  "pci_projects_project_storages_blocks_bandwidth_base_range": "Base de {{min}} {{unit}} entre {{minSize}} {{sizeUnit}} e {{maxSize}} {{sizeUnit}}",
   "pci_projects_project_storages_blocks_guides_header": "Manuais",
   "pci_projects_project_storages_blocks_guides_all_block_storage_guides": "Todos os guias Block Storage",
   "pci_projects_project_storages_blocks_guides_first_steps_with_volumes": "Introdução aos volumes",

packages/manager/apps/pci-block-storage/src/api/data/catalog-spec-overrides.spec.ts

@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: BSD-3-Clause
+// Copyright (c) OVH SAS
+
+import { describe, expect, it } from 'vitest';
+import { applyHardcodedSpecOverrides } from './catalog-spec-overrides';
+import { TVolumeCatalog, TVolumePricing } from './catalog';
+
+const makePricing = (
+  overrides: Partial<TVolumePricing['specs']['volume']['iops']> = {},
+  bandwidthOverrides: Partial<
+    NonNullable<TVolumePricing['specs']['bandwidth']>
+  > | null = {},
+): TVolumePricing =>
+  ({
+    price: 0,
+    regions: [],
+    showAvailabilityZones: false,
+    interval: 'hour',
+    areIOPSDynamic: true,
+    isBandwidthDynamic: true,
+    specs: {
+      name: 'spec',
+      maxAttachedInstances: 1,
+      bandwidth:
+        bandwidthOverrides === null
+          ? null
+          : {
+              guaranteed: false,
+              level: 1,
+              max: 1000,
+              ...bandwidthOverrides,
+            },
+      volume: {
+        iops: {
+          level: 1,
+          max: 10000,
+          guaranteed: false,
+          unit: 'u',
+          maxUnit: 'u',
+          ...overrides,
+        },
+        capacity: { max: 4000 },
+      },
+    },
+  } as TVolumePricing);
+
+const makeCatalog = (
+  modelName: string,
+  pricings: TVolumePricing[],
+): TVolumeCatalog =>
+  (({
+    filters: { deployment: [], region: [] },
+    regions: [],
+    models: [
+      {
+        name: modelName,
+        tags: [],
+        filters: {},
+        pricings,
+      },
+    ],
+  } as unknown) as TVolumeCatalog);
+
+describe('applyHardcodedSpecOverrides', () => {
+  it('injects iops min and bandwidth min on high-speed-gen2 when not guaranteed', () => {
+    const catalog = makeCatalog('high-speed-gen2', [makePricing()]);
+
+    const result = applyHardcodedSpecOverrides(catalog);
+
+    const pricing = result.models[0].pricings[0];
+    expect(pricing.specs.volume.iops.min).toBe(3000);
+    expect(pricing.specs.bandwidth?.min).toBe(50);
+  });
+
+  it('injects iops min and bandwidth min on high-speed-gen2-luks when not guaranteed', () => {
+    const catalog = makeCatalog('high-speed-gen2-luks', [makePricing()]);
+
+    const result = applyHardcodedSpecOverrides(catalog);
+
+    const pricing = result.models[0].pricings[0];
+    expect(pricing.specs.volume.iops.min).toBe(3000);
+    expect(pricing.specs.bandwidth?.min).toBe(50);
+  });
+
+  it('does not override iops or bandwidth when the spec is guaranteed', () => {
+    const catalog = makeCatalog('high-speed-gen2', [
+      makePricing({ guaranteed: true }, { guaranteed: true }),
+    ]);
+
+    const result = applyHardcodedSpecOverrides(catalog);
+
+    const pricing = result.models[0].pricings[0];
+    expect(pricing.specs.volume.iops.min).toBeUndefined();
+    expect(pricing.specs.bandwidth?.min).toBeUndefined();
+  });
+
+  it('does not override when the API already returned a positive min', () => {
+    const catalog = makeCatalog('high-speed-gen2', [
+      makePricing({ min: 9999 }, { min: 999 }),
+    ]);
+
+    const result = applyHardcodedSpecOverrides(catalog);
+
+    const pricing = result.models[0].pricings[0];
+    expect(pricing.specs.volume.iops.min).toBe(9999);
+    expect(pricing.specs.bandwidth?.min).toBe(999);
+  });
+
+  it('overrides when the API returned a non-positive min (0 or null)', () => {
+    const catalog = makeCatalog('high-speed-gen2', [
+      makePricing({ min: 0 }, { min: null }),
+    ]);
+
+    const result = applyHardcodedSpecOverrides(catalog);
+
+    const pricing = result.models[0].pricings[0];
+    expect(pricing.specs.volume.iops.min).toBe(3000);
+    expect(pricing.specs.bandwidth?.min).toBe(50);
+  });
+
+  it('leaves non-overridden models untouched', () => {
+    const catalog = makeCatalog('classic', [makePricing()]);
+
+    const result = applyHardcodedSpecOverrides(catalog);
+
+    const pricing = result.models[0].pricings[0];
+    expect(pricing.specs.volume.iops.min).toBeUndefined();
+    expect(pricing.specs.bandwidth?.min).toBeUndefined();
+  });
+
+  it('handles a null bandwidth spec without throwing', () => {
+    const catalog = makeCatalog('high-speed-gen2', [makePricing({}, null)]);
+
+    const result = applyHardcodedSpecOverrides(catalog);
+
+    const pricing = result.models[0].pricings[0];
+    expect(pricing.specs.volume.iops.min).toBe(3000);
+    expect(pricing.specs.bandwidth).toBeNull();
+  });
+});

packages/manager/apps/pci-block-storage/src/api/data/catalog-spec-overrides.ts

@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: BSD-3-Clause
+// Copyright (c) OVH SAS
+
+// TEMPORARY — hard-coded overrides for gen2 / gen2-luks volume specs.
+// /cloud/project/{id}/catalog/volume will eventually return a `min` value on
+// iops and bandwidth specs for these models. Until then, we inject the values
+// client-side here so the rest of the app can consume the catalog as if `min`
+// were always provided.
+//
+// The override never replaces a positive `min` already returned by the API:
+// once the catalog ships its own value the patch becomes inert, and removal
+// becomes purely cosmetic.
+//
+// To remove: delete this file and the call in catalog.ts:getVolumeCatalog.
+
+import { TVolumeCatalog } from './catalog';
+
+const HARDCODED_IOPS_MIN = 3000;
+const HARDCODED_BANDWIDTH_MIN = 50; // MiB/s
+const OVERRIDDEN_MODEL_NAMES = ['high-speed-gen2', 'high-speed-gen2-luks'];
+
+const hasPositiveMin = (value: number | null | undefined): boolean =>
+  typeof value === 'number' && value > 0;
+
+export const applyHardcodedSpecOverrides = (
+  catalog: TVolumeCatalog,
+): TVolumeCatalog => {
+  catalog.models
+    .filter((model) => OVERRIDDEN_MODEL_NAMES.includes(model.name))
+    .forEach((model) => {
+      model.pricings.forEach((pricing) => {
+        const iops = pricing.specs.volume.iops;
+        if (iops && !iops.guaranteed && !hasPositiveMin(iops.min)) {
+          iops.min = HARDCODED_IOPS_MIN;
+        }
+        const bandwidth = pricing.specs.bandwidth;
+        if (
+          bandwidth &&
+          !bandwidth.guaranteed &&
+          !hasPositiveMin(bandwidth.min)
+        ) {
+          bandwidth.min = HARDCODED_BANDWIDTH_MIN;
+        }
+      });
+    });
+  return catalog;
+};