Skip to content

Commit caf33c2

Browse files
Merge pull request #7134 from microsoft/yuwei/bugfix-202211
functions core tools run in mac
2 parents d5ae57d + 40a6b6d commit caf33c2

File tree

3 files changed

+8
-3
lines changed
  • PluginsAndFeatures/azure-toolkit-for-intellij
    • azure-intellij-plugin-applicationinsights/src/main/java/com/microsoft/azure/toolkit/intellij/applicationinsights/creation
    • azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/component
  • Utils/azure-toolkit-ide-libs/azure-toolkit-ide-appservice-lib/src/main/java/com/microsoft/azure/toolkit/ide/appservice/function/coretools

3 files changed

+8
-3
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-applicationinsights/src/main/java/com/microsoft/azure/toolkit/intellij/applicationinsights/creation/WorkspaceComboBox.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void setRegion(Region region) {
4444
}
4545
this.region = region;
4646
final String defaultWorkspaceName = String.format("DefaultWorkspace-%s-%s", subscription.getId(), region.getAbbreviation());
47-
final String finalWorkspaceName = defaultWorkspaceName.length() > 64 ? defaultWorkspaceName.substring(0, 64) : defaultWorkspaceName;
47+
final String finalWorkspaceName = defaultWorkspaceName.length() > 63 ? defaultWorkspaceName.substring(0, 63) : defaultWorkspaceName;
4848
final Optional<LogAnalyticsWorkspaceConfig> item = this.getItems().stream()
4949
.filter(config -> Objects.equals(config.getName(), finalWorkspaceName)).findFirst();
5050
item.ifPresentOrElse(

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/component/CreateApplicationInsightsDialog.form

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
3939
</constraints>
4040
<properties>
41-
<labelFor value="35fba"/>
41+
<labelFor value="975eb"/>
4242
<text value="Log Analytics workspace: "/>
4343
</properties>
4444
</component>

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-appservice-lib/src/main/java/com/microsoft/azure/toolkit/ide/appservice/function/coretools/FunctionsCoreToolsManager.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ private void doDownloadReleaseTools(@Nullable ReleaseInfo releaseInfo, String do
8282
return;
8383
}
8484
final String unzipRootDir = Paths.get(downloadDirPath, extractFileNameFromUrl(releaseInfo.downloadLink)).toString();
85+
final String executionFilePath = Paths.get(unzipRootDir, "windows".equalsIgnoreCase(generateFilter().os) ? "func.exe" : "func").toString();
8586
final String AZURE_FUNCTIONS = "AzureFunctions";
8687
try {
8788
final File tempFile = File.createTempFile(
@@ -91,10 +92,14 @@ private void doDownloadReleaseTools(@Nullable ReleaseInfo releaseInfo, String do
9192
outputStream.getChannel().transferFrom(Channels.newChannel(new URL(releaseInfo.downloadLink).openStream()), 0, Long.MAX_VALUE);
9293
unzip(tempFile, unzipRootDir);
9394
tempFile.deleteOnExit();
95+
final File executionFile = new File(executionFilePath);
96+
if (executionFile.exists() && !executionFile.canExecute()) {
97+
executionFile.setExecutable(true);
98+
}
9499
} catch (final Exception e) {
95100
throw new AzureToolkitRuntimeException(e);
96101
}
97-
Azure.az().config().setFunctionCoreToolsPath(Paths.get(unzipRootDir, "func.exe").toString());
102+
Azure.az().config().setFunctionCoreToolsPath(executionFilePath);
98103
AzureConfigInitializer.saveAzConfig();
99104
AzureEventBus.emit("function.download_func_core_tools_succeed.version", releaseInfo.releaseVersion);
100105
}

0 commit comments

Comments
 (0)