Skip to content

Commit 8ce063c

Browse files
Flanker32Flanker32
committed
Rename appSettingsStorageKey to appSettingsKey and add todo item to remove app settings
1 parent 17221f4 commit 8ce063c

File tree

9 files changed

+27
-27
lines changed

9 files changed

+27
-27
lines changed

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/IntelliJFunctionContext.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ public class IntelliJFunctionContext implements IFunctionContext {
3737

3838
private String deployment;
3939

40+
// todo: remove app settings and related codes
4041
@Deprecated
4142
private Map<String, String> appSettings = new HashMap<>();
4243

43-
private String appSettingsStorageKey;
44+
private String appSettingsKey;
4445

4546
private String moduleName;
4647

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/core/FunctionUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ public static void saveAppSettingsToSecurityStorage(String key, Map<String, Stri
8080
if (StringUtils.isEmpty(key)) {
8181
return;
8282
}
83-
final String securitySaveValue = JsonUtils.toJsonString(appSettings);
84-
IdeaSecureStore.getInstance().savePassword(FunctionApp.class.getName(), key, securitySaveValue);
83+
final String appSettingsJsonValue = JsonUtils.toJsonString(appSettings);
84+
IdeaSecureStore.getInstance().savePassword(FunctionApp.class.getName(), key, appSettingsJsonValue);
8585
}
8686

8787
public static Map<String, String> loadAppSettingsFromSecurityStorage(String key) {

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/deploy/FunctionDeployConfiguration.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,12 @@ public String getInsightsName() {
216216
return functionDeployModel.getInsightsName();
217217
}
218218

219-
public String getAppSettingsStorageKey() {
220-
return functionDeployModel.getAppSettingsStorageKey();
219+
public String getAppSettingsKey() {
220+
return functionDeployModel.getAppSettingsKey();
221221
}
222222

223-
public void setAppSettingsStorageKey(String appSettingsStorageKey) {
224-
functionDeployModel.setAppSettingsStorageKey(appSettingsStorageKey);
223+
public void setAppSettingsKey(String appSettingsStorageKey) {
224+
functionDeployModel.setAppSettingsKey(appSettingsStorageKey);
225225
}
226226

227227
public void saveModel(FunctionAppComboBoxModel functionAppComboBoxModel) {

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/deploy/ui/FunctionDeploymentPanel.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class FunctionDeploymentPanel extends AzureSettingPanel<FunctionDeployCon
4747
private FunctionAppComboBox functionAppComboBox;
4848
private AppSettingsTable appSettingsTable;
4949
private FunctionAppComboBoxModel appSettingsFunctionApp;
50-
private String appSettingsStorageKey = UUID.randomUUID().toString();
50+
private String appSettingsKey = UUID.randomUUID().toString();
5151

5252

5353
public FunctionDeploymentPanel(@NotNull Project project, @NotNull FunctionDeployConfiguration functionDeployConfiguration) {
@@ -126,9 +126,9 @@ protected void resetFromConfig(@NotNull FunctionDeployConfiguration configuratio
126126
if (MapUtils.isNotEmpty(configuration.getAppSettings())) {
127127
appSettingsTable.setAppSettings(configuration.getAppSettings());
128128
}
129-
if (StringUtils.isNotEmpty(configuration.getAppSettingsStorageKey())) {
130-
this.appSettingsStorageKey = configuration.getAppSettingsStorageKey();
131-
appSettingsTable.setAppSettings(FunctionUtils.loadAppSettingsFromSecurityStorage(appSettingsStorageKey));
129+
if (StringUtils.isNotEmpty(configuration.getAppSettingsKey())) {
130+
this.appSettingsKey = configuration.getAppSettingsKey();
131+
appSettingsTable.setAppSettings(FunctionUtils.loadAppSettingsFromSecurityStorage(appSettingsKey));
132132
}
133133
if (StringUtils.isAllEmpty(configuration.getFunctionId(), configuration.getAppName())) {
134134
functionAppComboBox.refreshItems();
@@ -153,10 +153,10 @@ protected void resetFromConfig(@NotNull FunctionDeployConfiguration configuratio
153153
@Override
154154
protected void apply(@NotNull FunctionDeployConfiguration configuration) {
155155
configuration.saveTargetModule((Module) cbFunctionModule.getSelectedItem());
156-
FunctionUtils.saveAppSettingsToSecurityStorage(appSettingsStorageKey, appSettingsTable.getAppSettings());
156+
FunctionUtils.saveAppSettingsToSecurityStorage(appSettingsKey, appSettingsTable.getAppSettings());
157157
// save app settings storage key instead of real value
158158
configuration.setAppSettings(Collections.EMPTY_MAP);
159-
configuration.setAppSettingsStorageKey(appSettingsStorageKey);
159+
configuration.setAppSettingsKey(appSettingsKey);
160160
final FunctionAppComboBoxModel functionModel = functionAppComboBox.getValue();
161161
if (functionModel != null) {
162162
configuration.saveModel(functionModel);

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/library/function/CreateFunctionHandler.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.io.IOException;
3333
import java.util.Collections;
3434
import java.util.Map;
35-
import java.util.function.Consumer;
3635

3736
import static com.microsoft.intellij.ui.messages.AzureBundle.message;
3837

@@ -214,7 +213,7 @@ private FunctionExtensionVersion getFunctionExtensionVersion() throws AzureExecu
214213
// region get App Settings
215214
private Map getAppSettingsWithDefaultValue() {
216215
final Map settings =
217-
com.microsoft.azure.toolkit.intellij.function.runner.core.FunctionUtils.loadAppSettingsFromSecurityStorage(ctx.getAppSettingsStorageKey());
216+
com.microsoft.azure.toolkit.intellij.function.runner.core.FunctionUtils.loadAppSettingsFromSecurityStorage(ctx.getAppSettingsKey());
218217
overrideDefaultAppSetting(settings, FUNCTIONS_WORKER_RUNTIME_NAME, message("function.hint.setFunctionWorker"),
219218
FUNCTIONS_WORKER_RUNTIME_VALUE, message("function.hint.changeFunctionWorker"));
220219
setDefaultAppSetting(settings, FUNCTIONS_EXTENSION_VERSION_NAME, message("function.hint.setFunctionVersion"),

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/library/function/DeployFunctionHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ private FunctionApp getFunctionApp() {
195195
// region get App Settings
196196
private Map getAppSettingsWithDefaultValue() {
197197
final Map settings =
198-
com.microsoft.azure.toolkit.intellij.function.runner.core.FunctionUtils.loadAppSettingsFromSecurityStorage(model.getAppSettingsStorageKey());
198+
com.microsoft.azure.toolkit.intellij.function.runner.core.FunctionUtils.loadAppSettingsFromSecurityStorage(model.getAppSettingsKey());
199199
overrideDefaultAppSetting(settings, FUNCTIONS_WORKER_RUNTIME_NAME, message("function.hint.setFunctionWorker"),
200200
FUNCTIONS_WORKER_RUNTIME_VALUE, message("function.hint.changeFunctionWorker"));
201201
setDefaultAppSetting(settings, FUNCTIONS_EXTENSION_VERSION_NAME, message("function.hint.setFunctionVersion"),

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/localrun/FunctionRunConfiguration.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ public void setAppSettingsJsonObject(JsonObject appSettingsJsonObject) {
149149
this.appSettingsJsonObject = appSettingsJsonObject;
150150
}
151151

152-
public String getAppSettingsStorageKey() {
153-
return functionRunModel.getAppSettingsStorageKey();
152+
public String getAppSettingsKey() {
153+
return functionRunModel.getAppSettingsKey();
154154
}
155155

156-
public void setAppSettingsStorageKey(String appSettingsStorageKey) {
157-
functionRunModel.setAppSettingsStorageKey(appSettingsStorageKey);
156+
public void setAppSettingsKey(String appSettingsStorageKey) {
157+
functionRunModel.setAppSettingsKey(appSettingsStorageKey);
158158
}
159159

160160
public void saveModule(Module module) {

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/localrun/FunctionRunState.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ private void prepareStagingFolder(File stagingFolder, RunProcessHandler processH
284284
try {
285285
Map<String, FunctionConfiguration> configMap =
286286
FunctionUtils.prepareStagingFolder(folder, hostJsonPath, functionRunConfiguration.getModule(), methods);
287-
final Map<String, String> appSettings = FunctionUtils.loadAppSettingsFromSecurityStorage(functionRunConfiguration.getAppSettingsStorageKey());
287+
final Map<String, String> appSettings = FunctionUtils.loadAppSettingsFromSecurityStorage(functionRunConfiguration.getAppSettingsKey());
288288
FunctionUtils.copyLocalSettingsToStagingFolder(folder, localSettingsJson, appSettings);
289289

290290
final Set<BindingEnum> bindingClasses = getFunctionBindingEnums(configMap);

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/localrun/ui/FunctionRunPanel.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class FunctionRunPanel extends AzureSettingPanel<FunctionRunConfiguration
4343
private JPanel pnlAppSettings;
4444
private JComboBox<Module> cbFunctionModule;
4545
private AppSettingsTable appSettingsTable;
46-
private String appSettingsStorageKey = UUID.randomUUID().toString();
46+
private String appSettingsKey = UUID.randomUUID().toString();
4747

4848
private FunctionRunConfiguration functionRunConfiguration;
4949

@@ -88,9 +88,9 @@ protected void resetFromConfig(@NotNull FunctionRunConfiguration configuration)
8888
if (MapUtils.isNotEmpty(configuration.getAppSettings())) {
8989
appSettingsTable.setAppSettings(configuration.getAppSettings());
9090
}
91-
if (StringUtils.isNotEmpty(configuration.getAppSettingsStorageKey())) {
92-
this.appSettingsStorageKey = configuration.getAppSettingsStorageKey();
93-
appSettingsTable.setAppSettings(FunctionUtils.loadAppSettingsFromSecurityStorage(appSettingsStorageKey));
91+
if (StringUtils.isNotEmpty(configuration.getAppSettingsKey())) {
92+
this.appSettingsKey = configuration.getAppSettingsKey();
93+
appSettingsTable.setAppSettings(FunctionUtils.loadAppSettingsFromSecurityStorage(appSettingsKey));
9494
}
9595
// In case `FUNCTIONS_WORKER_RUNTIME` or `AZURE_WEB_JOB_STORAGE_KEY` was missed in configuration
9696
appSettingsTable.loadRequiredSettings();
@@ -110,10 +110,10 @@ protected void resetFromConfig(@NotNull FunctionRunConfiguration configuration)
110110
protected void apply(@NotNull FunctionRunConfiguration configuration) {
111111
configuration.setFuncPath(txtFunc.getText());
112112
configuration.saveModule((Module) cbFunctionModule.getSelectedItem());
113-
FunctionUtils.saveAppSettingsToSecurityStorage(appSettingsStorageKey, appSettingsTable.getAppSettings());
113+
FunctionUtils.saveAppSettingsToSecurityStorage(appSettingsKey, appSettingsTable.getAppSettings());
114114
// save app settings storage key instead of real value
115115
configuration.setAppSettings(Collections.EMPTY_MAP);
116-
configuration.setAppSettingsStorageKey(appSettingsStorageKey);
116+
configuration.setAppSettingsKey(appSettingsKey);
117117
}
118118

119119
@NotNull

0 commit comments

Comments
 (0)