Merge master into feature/emr

aws-toolkit-automation · web-flow · commit 47663c313783 · 2025-05-06T17:09:16.000-04:00
diff --git a/packages/core/src/shared/settings.ts b/packages/core/src/shared/settings.ts
@@ -389,6 +389,10 @@ function createSettingsClass<T extends TypeDescriptor>(section: string, descript
         public _getOrThrow<K extends keyof Inner>(key: K & string, defaultValue?: Inner[K]) {
             const value = this.#config.get(key, defaultValue)
 
+            if (defaultValue !== undefined && (value === undefined || value === null)) {
+                return defaultValue
+            }
+
             return cast<Inner[K]>(value, descriptor[key])
         }
 

Original file line number	Diff line number	Diff line change
`@@ -389,6 +389,10 @@ function createSettingsClass<T extends TypeDescriptor>(section: string, descript`
`389`	`389`	`public _getOrThrow<K extends keyof Inner>(key: K & string, defaultValue?: Inner[K]) {`
`390`	`390`	`const value = this.#config.get(key, defaultValue)`
`391`	`391`
	`392`	`+ if (defaultValue !== undefined && (value === undefined \|\| value === null)) {`
	`393`	`+ return defaultValue`
	`394`	`+ }`
	`395`	`+`
`392`	`396`	`return cast<Inner[K]>(value, descriptor[key])`
`393`	`397`	`}`
`394`	`398`