update UPAPI calls

src/SelfServe/SelfServe.tsx

@@ -97,9 +97,6 @@ const handleMessage = async (event: MessageEvent): Promise<void> => {
   }
 
   const inputs = event.data.data.inputs as SelfServeFrameInputs;
-  // Test
-  console.log("catalogAPIKey" + inputs.catalogAPIKey);
-  // End Test 
   if (!inputs) {
     return;
   }

src/SelfServe/SqlX/SqlX.rp.ts

@@ -1,5 +1,6 @@
 import { configContext } from "../../ConfigContext";
 import { userContext } from "../../UserContext";
+import { get } from "../../Utils/arm/generatedClients/cosmos/locations";
 import { armRequestWithoutPolling, getOfferingIdsRequest } from "../../Utils/arm/request";
 import { selfServeTraceFailure, selfServeTraceStart, selfServeTraceSuccess } from "../SelfServeTelemetryProcessor";
 import { RefreshResult } from "../SelfServeTypes";
@@ -169,6 +170,16 @@ export const getRegions = async (): Promise<Array<RegionItem>> => {
   }
 };
 
+export const getRegionShortName = async (regionDisplayName: string) : Promise<string> => {
+  const locationsList = await get(userContext.subscriptionId, regionDisplayName);
+
+  if ('id' in locationsList) {
+      const locationId = locationsList.id;
+      return locationId.substring(locationId.lastIndexOf('/') + 1);
+  }
+  return undefined;
+}
+
 const getFetchPricesPathForRegion = (subscriptionId: string): string => {
   return `/subscriptions/${subscriptionId}/providers/Microsoft.CostManagement/fetchPrices`;
 };
@@ -187,9 +198,10 @@ export const getPriceMapAndCurrencyCode = async (map: OfferingIdMap): Promise<Pr
     let pricingCurrency;
     for (const region of map.keys()) {
       const regionPriceMap = new Map<string, number>();
+      const regionShortName = await getRegionShortName(region);
       const requestBody: OfferingIdRequest = {
-        location: region,
+        location: regionShortName,
-        ids: Array.from(map.get(region).values()),
+        ids: Array.from(map.get(region).keys()),
       };
 
       const response = await armRequestWithoutPolling<FetchPricesResponse>({
@@ -200,16 +212,20 @@ export const getPriceMapAndCurrencyCode = async (map: OfferingIdMap): Promise<Pr
         body: requestBody,
       });
 
-      for (const item of response.result.Items) {
+      for (const item of response.result) {
         if (pricingCurrency === undefined) {
           pricingCurrency = item.pricingCurrency;
         } else if (item.pricingCurrency !== pricingCurrency) {
           throw Error("Currency Code Mismatch: Currency code not same for all regions / skus.");
         }
 
+        if (item.error) {
+          throw Error(`Get price error ${item.error.type} for ${item.id}: ${item.error.description}`);
+        }
+
         const offeringId = item.id;        
         const skuName = map.get(region).get(offeringId);
-        const unitPrice = item.prices.find(x => x.type == "Consumption").unitPrice;
+        const unitPrice = item.prices.find(x => x.type == "Consumption")?.unitPrice;
         regionPriceMap.set(skuName, unitPrice);
       }
       priceMap.set(region, regionPriceMap);
@@ -224,6 +240,10 @@ export const getPriceMapAndCurrencyCode = async (map: OfferingIdMap): Promise<Pr
   }
 };
 
+const getOfferingIdPathForRegion = (): string => {
+  return `/skus?serviceFamily=Databases&service=Azure Cosmos DB`;
+};
+
 export const getOfferingIds = async (regions: Array<RegionItem>): Promise<OfferingIdMap> => {
   const telemetryData = {
     feature: "Get Offering Ids to calculate approximate cost",
@@ -235,25 +255,27 @@ export const getOfferingIds = async (regions: Array<RegionItem>): Promise<Offeri
 
   try {
     const offeringIdMap = new Map<string, Map<string, string>>();
-    let currencyCode;
     for (const regionItem of regions) {
       const regionOfferingIdMap = new Map<string, string>();
+      const regionShortName = await getRegionShortName(regionItem.locationName);
 
       const response = await getOfferingIdsRequest<GetOfferingIdsResponse>({
         host: configContext.CATALOG_ENDPOINT,
-        path: `/skus`,
+        path: getOfferingIdPathForRegion(),
         method: "GET",
         apiVersion: "2023-05-01-preview",
         queryParams: {
           filter:
-            "locations eq '" +
+            "armRegionName eq '" +
-            regionItem.locationName +
+            regionShortName +
-            "' and serviceFamily eq 'Databases' and service eq 'Azure Cosmos DB'",
+            "'",
         },
       });
 
-      for (const item of response.result.Items) {
+      for (const item of response.result.items) {
-        regionOfferingIdMap.set(item.skuName, item.offeringProperties.offeringId);
+        if (item.offeringProperties?.length > 0) {
+          regionOfferingIdMap.set(item.offeringProperties[0].offeringId, item.skuName);
+        }
       }
       offeringIdMap.set(regionItem.locationName, regionOfferingIdMap);
     }

src/SelfServe/SqlX/SqlX.tsx

@@ -24,6 +24,7 @@ import { BladeType, generateBladeLink } from "../SelfServeUtils";
 import {
   deleteDedicatedGatewayResource,
   getCurrentProvisioningState,
+  getOfferingIds,
   getPriceMapAndCurrencyCode,
   getRegions,
   refreshDedicatedGatewayProvisioning,
@@ -370,9 +371,10 @@ export default class SqlX extends SelfServeBaseClass {
     });
 
     regions = await getRegions();
-    const priceMapAndCurrencyCode = await getPriceMapAndCurrencyCode(regions);
+    const offeringIdMap = await getOfferingIds(regions);
+    const priceMapAndCurrencyCode = await getPriceMapAndCurrencyCode(offeringIdMap);
     priceMap = priceMapAndCurrencyCode.priceMap;
-    currencyCode = priceMapAndCurrencyCode.currencyCode;
+    currencyCode = priceMapAndCurrencyCode.pricingCurrency;
 
     const response = await getCurrentProvisioningState();
     if (response.status && response.status !== "Deleting") {

src/SelfServe/SqlX/SqlxTypes.ts

@@ -30,16 +30,13 @@ export type UpdateDedicatedGatewayRequestProperties = {
   serviceType: string;
 };
 
-export type FetchPricesResponse = {
+export type FetchPricesResponse = Array<PriceItem>;
-  Items: Array<PriceItem>;
-  NextPageLink: string | undefined;
-  Count: number;
-};
 
 export type PriceItem = {
   prices: Array<PriceType>;
   id: string;
   pricingCurrency: string;
+  error: PriceError;
 };
 
 export type PriceType = {
@@ -47,20 +44,24 @@ export type PriceType = {
   unitPrice: number;
 }
 
+export type PriceError = {
+  type: string;
+  description: string;
+}
+
 export type PriceMapAndCurrencyCode = {
   priceMap: Map<string, Map<string, number>>;
   pricingCurrency: string;
 };
 
 export type GetOfferingIdsResponse = {
-  Items: Array<OfferingIdItem>;
+  items: Array<OfferingIdItem>;
-  NextPageLink: string | undefined;
+  nextPageLink: string | undefined;
-  Count: number;
 };
 
 export type OfferingIdItem = {
   skuName: string;
-  offeringProperties: OfferingProperties;
+  offeringProperties: Array<OfferingProperties>;
 };
 
 export type OfferingProperties = {

src/Utils/arm/request.ts

@@ -181,15 +181,10 @@ export async function getOfferingIdsRequest<T>({
     throw new Error("No catalog API key provided");
   }
 
-  // TODO: delete after test
-  // console.log("config CATALOG_API_KEY: " + configContext.CATALOG_API_KEY);
-  // End Test
-
   const response = await window.fetch(url.href, {
     method,
     headers: {
-      // [HttpHeaders.xAPIKey]: configContext.CATALOG_API_KEY,
+      [HttpHeaders.xAPIKey]: configContext.CATALOG_API_KEY,
-      [HttpHeaders.xAPIKey]: "",
     },
     body: requestBody ? JSON.stringify(requestBody) : undefined,
   });