Skip to content

Commit d9e378f

Browse files
committed
More fixes
1 parent c2de90b commit d9e378f

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

src/commands/deployWorkspaceProject/DeployWorkspaceProjectSettings.ts

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,13 @@ const deployWorkspaceProjectPrefix: string = 'deployWorkspaceProject';
1919
export async function getDeployWorkspaceProjectSettings(rootFolder: WorkspaceFolder): Promise<DeployWorkspaceProjectSettings> {
2020
const settingsPath: string = settingUtils.getDefaultRootWorkspaceSettingsPath(rootFolder);
2121

22-
try {
23-
const containerAppName: string | undefined = settingUtils.getWorkspaceSetting(`${deployWorkspaceProjectPrefix}.containerAppName`, settingsPath);
24-
const containerAppResourceGroupName: string | undefined = settingUtils.getWorkspaceSetting(`${deployWorkspaceProjectPrefix}.containerAppResourceGroupName`, settingsPath);
25-
const containerRegistryName: string | undefined = settingUtils.getWorkspaceSetting(`${deployWorkspaceProjectPrefix}.containerRegistryName`, settingsPath);
22+
const containerAppName: string | undefined = settingUtils.getWorkspaceSetting(`${deployWorkspaceProjectPrefix}.containerAppName`, settingsPath);
23+
const containerAppResourceGroupName: string | undefined = settingUtils.getWorkspaceSetting(`${deployWorkspaceProjectPrefix}.containerAppResourceGroupName`, settingsPath);
24+
const containerRegistryName: string | undefined = settingUtils.getWorkspaceSetting(`${deployWorkspaceProjectPrefix}.containerRegistryName`, settingsPath);
2625

27-
return {
28-
containerAppName,
29-
containerAppResourceGroupName,
30-
containerRegistryName
31-
};
32-
} catch {
33-
// Return no matching resources if we encounter any settings path read errors
34-
return {};
35-
}
26+
return {
27+
containerAppName,
28+
containerAppResourceGroupName,
29+
containerRegistryName
30+
};
3631
}

src/utils/settingUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export namespace settingUtils {
6666
const projectConfiguration: WorkspaceConfiguration = workspace.getConfiguration(prefix, fsPath ? Uri.file(fsPath) : undefined);
6767

6868
const configurationLevel: ConfigurationTarget | undefined = getLowestConfigurationLevel(projectConfiguration, key);
69-
if (targetLimit && configurationLevel && (configurationLevel < targetLimit)) {
69+
if (!configurationLevel || (configurationLevel < targetLimit)) {
7070
return undefined;
7171
}
7272

0 commit comments

Comments
 (0)