Skip to content

Commit 1169ad1

Browse files
Merge pull request #7734 from microsoft/hanli/fixes-202307
Resolve issues in end game
2 parents 136b81b + d95db9a commit 1169ad1

File tree

3 files changed

+5
-1
lines changed
  • PluginsAndFeatures/azure-toolkit-for-intellij
    • azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/core
    • azure-intellij-plugin-cosmos/src/main/java/com/microsoft/azure/toolkit/intellij/cosmos/actions
  • Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/src/main/resources/bundles/com/microsoft/azure/toolkit

3 files changed

+5
-1
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/core/FunctionUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public class FunctionUtils {
115115
REQUIRED_ATTRIBUTE_MAP.put(BindingEnum.HttpTrigger, Arrays.asList("authLevel"));
116116
}
117117

118+
@AzureOperation(name = "internal/function.save_app_settings_to_security_storage")
118119
public static void saveAppSettingsToSecurityStorage(String key, Map<String, String> appSettings) {
119120
if (StringUtils.isEmpty(key)) {
120121
return;
@@ -123,6 +124,7 @@ public static void saveAppSettingsToSecurityStorage(String key, Map<String, Stri
123124
IntelliJSecureStore.getInstance().savePassword(AZURE_FUNCTIONS_APP_SETTINGS, key, null, appSettingsJsonValue);
124125
}
125126

127+
@AzureOperation(name = "internal/function.load_app_settings_from_security_storage")
126128
public static Map<String, String> loadAppSettingsFromSecurityStorage(String key) {
127129
if (StringUtils.isEmpty(key)) {
128130
return new HashMap<>();

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/src/main/java/com/microsoft/azure/toolkit/intellij/cosmos/actions/CreateNewDocumentAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private static synchronized VirtualFile getOrCreateVirtualFile(@Nonnull final IC
8686
@SneakyThrows
8787
private static VirtualFile createVirtualFile(@Nonnull final ICosmosDocumentContainer<?> container,
8888
final FileEditorManager manager, final String content) {
89-
final File tempFile = FileUtil.createTempFile(String.format("%s:New Document", container.getName()), ".json", true);
89+
final File tempFile = FileUtil.createTempFile(String.format("New Document - %s", container.getName()), ".json", true);
9090
FileUtil.writeToFile(tempFile, content);
9191
return VirtualFileActions.createVirtualFile(container.getId(), tempFile.getName(), tempFile, manager);
9292
}

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/src/main/resources/bundles/com/microsoft/azure/toolkit/operation.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ boundary/function.prepare_staging_folder.folder|app=prepare staging folder({0})
7979
boundary/function.prepare_staging_folder=prepare staging folder for function method
8080
boundary/function.validate_jre=validate version of local jre
8181
internal/function.validate_runtime=validate Azure Functions Core Tools
82+
internal/function.load_app_settings_from_security_storage=load app settings from security storage
83+
internal/function.save_app_settings_to_security_storage=save app settings to security storage
8284
boundary/function.run_cli.folder=run function CLI command from staging folder({0})
8385
user/redis.open_portal.redis=open configuration page of Redis instance({0}) in portal
8486
user/redis.show_properties.redis=show properties of Redis instance({0})

0 commit comments

Comments
 (0)