change scope of fallback variables

qinzhouxu · qinzhouxu · commit ad9bdf1d4f38 · 2025-07-15T16:18:12.000+08:00
diff --git a/packages/fx-core/src/component/configManager/lifecycle.ts b/packages/fx-core/src/component/configManager/lifecycle.ts
@@ -101,11 +101,18 @@ export function resolveString(
         resolved.push(envVar);
         newVal = newVal.replace(matches[0], envVal);
       }
-    } else {
+    } else if (envVar.includes("AZURE") || envVar.includes("OPENAI")) {
       if (envVal) {
         resolved.push(envVar);
         newVal = newVal.replace(matches[0], envVal);
       }
+    } else {
+      if (!envVal) {
+        unresolved.push(envVar);
+      } else {
+        resolved.push(envVar);
+        newVal = newVal.replace(matches[0], envVal);
+      }
     }
     matches = placeHolderReg.exec(val);
   }

Original file line number	Diff line number	Diff line change
`@@ -101,11 +101,18 @@ export function resolveString(`
`101`	`101`	`resolved.push(envVar);`
`102`	`102`	`newVal = newVal.replace(matches[0], envVal);`
`103`	`103`	`}`
`104`		`- } else {`
	`104`	`+ } else if (envVar.includes("AZURE") \|\| envVar.includes("OPENAI")) {`
`105`	`105`	`if (envVal) {`
`106`	`106`	`resolved.push(envVar);`
`107`	`107`	`newVal = newVal.replace(matches[0], envVal);`
`108`	`108`	`}`
	`109`	`+ } else {`
	`110`	`+ if (!envVal) {`
	`111`	`+ unresolved.push(envVar);`
	`112`	`+ } else {`
	`113`	`+ resolved.push(envVar);`
	`114`	`+ newVal = newVal.replace(matches[0], envVal);`
	`115`	`+ }`
`109`	`116`	`}`
`110`	`117`	`matches = placeHolderReg.exec(val);`
`111`	`118`	`}`