Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Save Azure configurations in json instead of save them individually #7766

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Save Azure configurations in json instead of save them individually #7766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ...res/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/AzureInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@
public class AzureInitializer {
public static void initialize() {
ProxyUtils.initProxy();
initializeAzureConfiguration();
}

private static void initializeAzureConfiguration() {
IntellijConfigInitializer.initialize();
initializeTelemetry();
}
Expand Down
1 change: 1 addition & 0 deletions ...-toolkit-for-intellij/src/main/java/com/microsoft/intellij/IntellijConfigInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public static void initialize() {

AzureConfigInitializer.initialize(installId, "Azure Toolkit for IntelliJ", AzurePlugin.PLUGIN_VERSION);
CommonSettings.setUserAgent(Azure.az().config().getUserAgent());
Azure.az().setSaveConfigurationHandler(c -> AzureConfigInitializer.saveAzConfig());
if (StringUtils.isNotBlank(Azure.az().config().getCloud())) {
Azure.az(AzureCloud.class).setByName(Azure.az().config().getCloud());
}
Expand Down
2 changes: 1 addition & 1 deletion ...atures/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/ui/AzurePanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ public boolean doOKAction() {
if (StringUtils.isNotBlank(newConfig.getCloud())) {
Azure.az(AzureCloud.class).setByName(newConfig.getCloud());
}
AzureConfigInitializer.saveAzConfig();
Azure.az().saveConfiguration();
return true;
}

Expand Down
13 changes: 9 additions & 4 deletions .../microsoft/azure/toolkit/ide/appservice/function/coretools/FunctionsCoreToolsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

package com.microsoft.azure.toolkit.ide.appservice.function.coretools;

import com.microsoft.azure.toolkit.ide.common.store.AzureConfigInitializer;
import com.microsoft.azure.toolkit.lib.Azure;
import com.microsoft.azure.toolkit.lib.common.event.AzureEventBus;
import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
Expand All @@ -14,12 +13,18 @@
import org.apache.commons.lang3.StringUtils;

import javax.annotation.Nullable;
import java.io.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.OutputStream;
import java.net.URL;
import java.nio.channels.Channels;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.*;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.IntStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
Expand Down Expand Up @@ -98,7 +103,7 @@ private void doDownloadReleaseTools(@Nullable ReleaseInfo releaseInfo, String do
throw new AzureToolkitRuntimeException(e);
}
Azure.az().config().setFunctionCoreToolsPath(executionFilePath);
AzureConfigInitializer.saveAzConfig();
Azure.az().saveConfiguration();
AzureEventBus.emit("function.download_func_core_tools_succeed.version", releaseInfo.releaseVersion);
}

Expand Down
6 changes: 2 additions & 4 deletions .../java/com/microsoft/azure/toolkit/ide/common/action/ResourceCommonActionsContributor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import com.microsoft.azure.toolkit.ide.common.IActionsContributor;
import com.microsoft.azure.toolkit.ide.common.favorite.Favorites;
import com.microsoft.azure.toolkit.ide.common.icon.AzureIcons;
import com.microsoft.azure.toolkit.ide.common.store.AzureConfigInitializer;
import com.microsoft.azure.toolkit.lib.AzService;
import com.microsoft.azure.toolkit.lib.Azure;
import com.microsoft.azure.toolkit.lib.account.IAccount;
Expand Down Expand Up @@ -111,8 +110,7 @@ public void registerActions(AzureActionManager am) {
.withShortcut(shortcuts.delete())
.visibleWhen((s, place) -> s instanceof AzResource && s instanceof Deletable)
.enableWhen(s -> {
if (s instanceof AbstractAzResource) {
final AbstractAzResource<?, ?, ?> r = (AbstractAzResource<?, ?, ?>) s;
if (s instanceof AbstractAzResource<?, ?, ?> r) {
return !r.getFormalStatus().isDeleted() && !r.isDraftForCreating();
}
return true;
Expand Down Expand Up @@ -301,7 +299,7 @@ public void registerActions(AzureActionManager am) {
.visibleWhen(s -> Azure.az().config().isAuthPersistenceEnabled())
.withHandler((s) -> {
Azure.az().config().setAuthPersistenceEnabled(false);
AzureConfigInitializer.saveAzConfig();
Azure.az().saveConfiguration();
final AzureAccount az = Azure.az(AzureAccount.class);
if (az.isLoggedIn()) {
az.logout();
Expand Down
3 changes: 1 addition & 2 deletions ...lib/src/main/java/com/microsoft/azure/toolkit/ide/common/dotnet/DotnetRuntimeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package com.microsoft.azure.toolkit.ide.common.dotnet;

import com.microsoft.azure.toolkit.ide.common.action.ResourceCommonActionsContributor;
import com.microsoft.azure.toolkit.ide.common.store.AzureConfigInitializer;
import com.microsoft.azure.toolkit.lib.Azure;
import com.microsoft.azure.toolkit.lib.common.action.Action;
import com.microsoft.azure.toolkit.lib.common.action.AzureActionManager;
Expand Down Expand Up @@ -97,7 +96,7 @@ public static void installDotnet(final String path) {
CommandUtils.exec(INSTALL_COMMAND, path);
}
Azure.az().config().setDotnetRuntimePath(path);
AzureConfigInitializer.saveAzConfig();
Azure.az().saveConfiguration();
AzureEventBus.emit("dotnet_runtime.updated");
final String INSTALL_SUCCEED_MESSAGE = ".NET runtime is installed and configured successfully.";
AzureMessager.getMessager().success(INSTALL_SUCCEED_MESSAGE, null, openSettingsAction, ResourceCommonActionsContributor.RESTART_IDE);
Expand Down
70 changes: 35 additions & 35 deletions ...ib/src/main/java/com/microsoft/azure/toolkit/ide/common/store/AzureConfigInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@

import com.microsoft.azure.toolkit.lib.Azure;
import com.microsoft.azure.toolkit.lib.AzureConfiguration;
import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
import com.microsoft.azure.toolkit.lib.common.utils.InstallationIdUtils;
import com.microsoft.azure.toolkit.lib.common.utils.JsonUtils;
import com.microsoft.azure.toolkit.lib.common.utils.Utils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;

import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Optional;
import java.util.stream.Collectors;

import static com.microsoft.azure.toolkit.ide.common.dotnet.DotnetRuntimeHandler.getDotnetRuntimePath;
Expand Down Expand Up @@ -44,18 +49,39 @@ public class AzureConfigInitializer {
public static final String AZURITE_PATH = "azurite_path";
public static final String AZURITE_WORKSPACE = "azurite_workspace";
public static final String ENABLE_LEASE_MODE = "enable_lease_mode";
public static final String SYSTEM = "system";
public static final String AZURE_CONFIGURATION = "azure_configuration";

public static void initialize(String defaultMachineId, String pluginName, String pluginVersion) {
String machineId = AzureStoreManager.getInstance().getMachineStore().getProperty(TELEMETRY,
TELEMETRY_INSTALLATION_ID);
if (StringUtils.isBlank(machineId) || !InstallationIdUtils.isValidHashMac(machineId)) {
machineId = defaultMachineId;
}

final String machineId = Optional.ofNullable(AzureStoreManager.getInstance().getMachineStore().getProperty(TELEMETRY, TELEMETRY_INSTALLATION_ID))
.filter(StringUtils::isNotBlank)
.filter(InstallationIdUtils::isValidHashMac)
.orElse(defaultMachineId);
final AzureConfiguration config = Azure.az().config();
config.setMachineId(machineId);
config.setProduct(pluginName);
config.setVersion(pluginVersion);
config.setLogLevel("NONE");
final String userAgent = String.format("%s, v%s, machineid:%s", pluginName, pluginVersion,
BooleanUtils.isNotFalse(config.getTelemetryEnabled()) ? config.getMachineId() : StringUtils.EMPTY);
config.setUserAgent(userAgent);

final IIdeStore ideStore = AzureStoreManager.getInstance().getIdeStore();
final String property = ideStore.getProperty(SYSTEM, AZURE_CONFIGURATION);
if (StringUtils.isBlank(property)) {
loadLegacyData(ideStore, config);
} else {
final AzureConfiguration azureConfiguration = JsonUtils.fromJson(property, AzureConfiguration.class);
try {
Utils.copyProperties(config, azureConfiguration, false);
} catch (IllegalAccessException e) {
AzureMessager.getMessager().warning("Failed to load azure configuration from store.", e);
}
}
saveAzConfig();
}

private static void loadLegacyData(final IIdeStore ideStore, final AzureConfiguration config) {
final String allowTelemetry = ideStore.getProperty(TELEMETRY, TELEMETRY_ALLOW_TELEMETRY, "true");
config.setTelemetryEnabled(Boolean.parseBoolean(allowTelemetry));
final String enableAuthPersistence = ideStore.getProperty(OTHER, ENABLE_AUTH_PERSISTENCE, "true");
Expand Down Expand Up @@ -113,38 +139,12 @@ public static void initialize(String defaultMachineId, String pluginName, String

final Boolean enableLeaseMode = Boolean.valueOf(ideStore.getProperty(AZURITE, ENABLE_LEASE_MODE, "false"));
config.setEnableLeaseMode(enableLeaseMode);

ideStore.getProperty(TELEMETRY, TELEMETRY_PLUGIN_VERSION, "");

final String userAgent = String.format("%s, v%s, machineid:%s", pluginName, pluginVersion,
config.getTelemetryEnabled() ? config.getMachineId() : StringUtils.EMPTY);
config.setUserAgent(userAgent);
config.setProduct(pluginName);
config.setLogLevel("NONE");
config.setVersion(pluginVersion);
saveAzConfig();
}

public static void saveAzConfig() {
final AzureConfiguration config = Azure.az().config();
final IIdeStore ideStore = AzureStoreManager.getInstance().getIdeStore();

AzureStoreManager.getInstance().getMachineStore().setProperty(TELEMETRY, TELEMETRY_INSTALLATION_ID,
config.getMachineId());

ideStore.setProperty(TELEMETRY, TELEMETRY_ALLOW_TELEMETRY, Boolean.toString(config.getTelemetryEnabled()));
ideStore.setProperty(OTHER, ENABLE_AUTH_PERSISTENCE, Boolean.toString(config.isAuthPersistenceEnabled()));
ideStore.setProperty(MONITOR, MONITOR_TABLE_ROWS, String.valueOf(config.getMonitorQueryRowNumber()));
ideStore.setProperty(ACCOUNT, AZURE_ENVIRONMENT_KEY, config.getCloud());
ideStore.setProperty(FUNCTION, FUNCTION_CORE_TOOLS_PATH, config.getFunctionCoreToolsPath());
ideStore.setProperty(STORAGE, STORAGE_EXPLORER_PATH, config.getStorageExplorerPath());
ideStore.setProperty(COMMON, PAGE_SIZE, String.valueOf(config.getPageSize()));
ideStore.setProperty(COSMOS, DOCUMENTS_LABEL_FIELDS, String.join(";", config.getDocumentsLabelFields()));
// don't save pluginVersion, it is saved in AzurePlugin class
ideStore.setProperty(BICEP, DOTNET_RUNTIME_PATH, config.getDotnetRuntimePath());
ideStore.setProperty(EVENT_HUBS, CONSUMER_GROUP_NAME, config.getEventHubsConsumerGroup());
ideStore.setProperty(AZURITE, AZURITE_PATH, config.getAzuritePath());
ideStore.setProperty(AZURITE, AZURITE_WORKSPACE, config.getAzuriteWorkspace());
ideStore.setProperty(AZURITE, ENABLE_LEASE_MODE, String.valueOf(config.getEnableLeaseMode()));
final AzureStoreManager storeManager = AzureStoreManager.getInstance();
storeManager.getIdeStore().setProperty(SYSTEM, AZURE_CONFIGURATION, JsonUtils.toJson(config));
storeManager.getMachineStore().setProperty(TELEMETRY, TELEMETRY_INSTALLATION_ID, config.getMachineId());
}
}