diff --git a/source/Calamari/Calamari.csproj b/source/Calamari/Calamari.csproj index 7a24b79..eea72b5 100644 --- a/source/Calamari/Calamari.csproj +++ b/source/Calamari/Calamari.csproj @@ -9,9 +9,9 @@ win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 - - - + + + diff --git a/source/Sashimi.Tests/Sashimi.Tests.csproj b/source/Sashimi.Tests/Sashimi.Tests.csproj index a7b6c5f..dc5a0b1 100644 --- a/source/Sashimi.Tests/Sashimi.Tests.csproj +++ b/source/Sashimi.Tests/Sashimi.Tests.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/source/Sashimi/AzureResourceGroupActionHandler.cs b/source/Sashimi/AzureResourceGroupActionHandler.cs index 67cd927..4691abe 100644 --- a/source/Sashimi/AzureResourceGroupActionHandler.cs +++ b/source/Sashimi/AzureResourceGroupActionHandler.cs @@ -1,4 +1,5 @@ using System; +using Octopus.Server.Extensibility.HostServices.Diagnostics; using Sashimi.AzureScripting; using Sashimi.Server.Contracts.ActionHandlers; @@ -16,14 +17,14 @@ class AzureResourceGroupActionHandler : IActionHandlerWithAccount public ActionHandlerCategory[] Categories => new[] { ActionHandlerCategory.BuiltInStep, AzureConstants.AzureActionHandlerCategory, ActionHandlerCategory.Script }; public string[] StepBasedVariableNameForAccountIds { get; } = {SpecialVariables.Action.Azure.AccountId}; - public IActionHandlerResult Execute(IActionHandlerContext context) + public IActionHandlerResult Execute(IActionHandlerContext context, ITaskLog taskLog) { var templateInPackage = context.Variables.Get(SpecialVariables.Action.AzureResourceGroup.TemplateSource, String.Empty) == "Package"; var template = context.Variables.Get(SpecialVariables.Action.AzureResourceGroup.ResourceGroupTemplate)!; var templateParameters = GetTemplateParameters(); var builder = context.CalamariCommand(AzureConstants.CalamariAzure, "deploy-azure-resource-group") - .WithAzureTools(context); + .WithAzureTools(context, taskLog); if (templateInPackage) builder.WithStagedPackageArgument(); @@ -32,7 +33,7 @@ public IActionHandlerResult Execute(IActionHandlerContext context) .WithDataFile(template, "template.json") .WithDataFile(templateParameters, "parameters.json"); - return builder.Execute(); + return builder.Execute(taskLog); string GetTemplateParameters() { diff --git a/source/Sashimi/Sashimi.csproj b/source/Sashimi/Sashimi.csproj index 55049b4..9148012 100644 --- a/source/Sashimi/Sashimi.csproj +++ b/source/Sashimi/Sashimi.csproj @@ -15,7 +15,7 @@ - - + + \ No newline at end of file