fix(Designer): Only resolve app settings if they are used in resource…

… ids (#4354) * Only resolve app settings if they are used in subscription ids * Only resolving app settings in resource ids
Azure · Mar 13, 2024 · 04b6f29 · 04b6f29
1 parent b4e0212
commit 04b6f29
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 16 deletions.
diff --git a/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Utilities/Workflow.ts b/apps/designer-standalone/src/app/AzureLogicAppsDesigner/Utilities/Workflow.ts
@@ -76,8 +76,8 @@ export class WorkflowUtility {
     if (appsettings) {
       for (const settingName of Object.keys(appsettings)) {
         const settingValue = appsettings[settingName] !== undefined ? appsettings[settingName] : '';
-        result = replaceAllOccurrences(result, `@appsetting('${settingName}')`, settingValue);
-        result = replaceAllOccurrences(result, `@{appsetting('${settingName}')}`, settingValue);
+        result = replaceOccurrenceInResourceIds(result, `@appsetting('${settingName}')`, settingValue);
+        result = replaceOccurrenceInResourceIds(result, `@{appsetting('${settingName}')}`, settingValue);
       }
     }
 
@@ -116,3 +116,21 @@ function replaceIfFoundAndVerifyJson(stringifiedJson: string, searchValue: strin
     return undefined;
   }
 }
+
+function replaceOccurrenceInResourceIds(_inputString: string, settingName: string, settingValue: string): string {
+  let inputString = _inputString;
+  const resourceIdRegex = /\/subscriptions\/[^"]+"/g;
+  const resourceIds = inputString.match(resourceIdRegex);
+
+  // If no resource ids are found, return the original string
+  if (!resourceIds) return inputString;
+
+  for (const resourceId of resourceIds) {
+    if (resourceId.includes(settingName)) {
+      const replacedString = resourceId.replace(settingName, settingValue);
+      // Replace the original resource id in the input string with the replaced string
+      inputString = inputString.replace(resourceId, replacedString);
+    }
+  }
+  return inputString;
+}
diff --git a/libs/designer/src/lib/core/actions/bjsworkflow/operationdeserializer.ts b/libs/designer/src/lib/core/actions/bjsworkflow/operationdeserializer.ts
@@ -66,6 +66,7 @@ import {
   aggregate,
   equals,
   getRecordEntry,
+  parseErrorMessage,
 } from '@microsoft/logic-apps-shared';
 import type { InputParameter, OutputParameter, LogicAppsV2, OperationManifest } from '@microsoft/logic-apps-shared';
 import type { Dispatch } from '@reduxjs/toolkit';
@@ -276,7 +277,8 @@ export const initializeOperationDetailsForManifest = async (
       ...childGraphInputs,
     ];
   } catch (error: any) {
-    const message = `Unable to initialize operation details for operation - ${nodeId}. Error details - ${error}`;
+    const errorMessage = parseErrorMessage(error);
+    const message = `Unable to initialize operation details for operation - ${nodeId}. Error details - ${errorMessage}`;
     LoggerService().log({
       level: LogEntryLevel.Error,
       area: 'operation deserializer',

diff --git a/libs/designer/src/lib/core/utils/swagger/operation.ts b/libs/designer/src/lib/core/utils/swagger/operation.ts
@@ -40,6 +40,7 @@ import {
   isDynamicSchemaExtension,
   isTemplateExpression,
   map,
+  parseErrorMessage,
   parsePathnameAndQueryKeyFromUri,
   removeConnectionPrefix,
   startsWith,
@@ -124,12 +125,7 @@ export const initializeOperationDetailsForSwagger = async (
 
     throw new Error('Operation info could not be found for a swagger operation');
   } catch (error: any) {
-    let errorString = '';
-    try {
-      errorString = error?.toString() ?? error;
-    } catch (_: any) {
-      errorString = 'Could not convert error to string';
-    }
+    const errorString = parseErrorMessage(error);
     const message = `Unable to initialize operation details for swagger based operation - ${nodeId}. Error details - ${errorString}`;
     LoggerService().log({
       level: LogEntryLevel.Error,

diff --git a/libs/logic-apps-shared/src/utils/src/lib/helpers/http.ts b/libs/logic-apps-shared/src/utils/src/lib/helpers/http.ts
@@ -8,13 +8,17 @@ export const HTTP_METHODS = {
 } as const;
 
 export const parseErrorMessage = (error: any, defaultErrorMessage?: string): string => {
-  let message = error?.message ?? error?.Message ?? error?.error?.message ?? error?.content?.message ?? undefined;
-  if (message) return message;
+  try {
+    let message = error?.message ?? error?.Message ?? error?.error?.message ?? error?.content?.message ?? undefined;
+    if (message) return message;
 
-  // Response text needs to be parsed to get internal error message
-  if (error?.responseText) {
-    message = parseErrorMessage(JSON.parse(error.responseText), defaultErrorMessage);
-  }
+    // Response text needs to be parsed to get internal error message
+    if (error?.responseText) {
+      message = parseErrorMessage(JSON.parse(error.responseText), defaultErrorMessage);
+    }
 
-  return message ?? defaultErrorMessage ?? 'Unknown error';
+    return message ?? defaultErrorMessage ?? error ?? 'Unknown error';
+  } catch (e) {
+    return 'Could not parse error message.';
+  }
 };