sync: master to develop

ovh · Nov 4, 2024 · 4778ebe · 4778ebe
2 parents 0aa8181 + 11c884e
commit 4778ebe
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/packages/manager/modules/pci/src/projects/project/instances/instances.service.js b/packages/manager/modules/pci/src/projects/project/instances/instances.service.js
@@ -327,8 +327,16 @@ export default class PciProjectInstanceService {
       catalogEndpoint,
     ).then((catalog) =>
       instance.isLocalZone
-        ? catalog[`snapshot.consumption.${instance.region}`] ??
-          catalog['snapshot.consumption.LZ']
+        ? this.getProductAvailability(projectId).then(
+            ({ plans }) =>
+              catalog[
+                plans.find(
+                  ({ code, regions }) =>
+                    code.startsWith('snapshot.consumption') &&
+                    regions.find(({ name }) => name === instance.region),
+                )?.code
+              ] ?? catalog['snapshot.consumption.LZ'],
+          )
         : get(
             catalog,
             `snapshot.monthly.postpaid.${instance.region}`,
@@ -546,7 +554,10 @@ export default class PciProjectInstanceService {
       });
   }
 
-  getProductAvailability(projectId, ovhSubsidiary) {
+  getProductAvailability(
+    projectId,
+    ovhSubsidiary = this.coreConfig.getUser().ovhSubsidiary,
+  ) {
     return this.$http
       .get(`/cloud/project/${projectId}/capabilities/productAvailability`, {
         params: {