From ce6245821b7c3d1f88337a06646aea975f86f65d Mon Sep 17 00:00:00 2001 From: slewis74 Date: Tue, 9 Mar 2021 15:51:08 +1000 Subject: [PATCH 1/3] new logging infra --- source/Calamari/Calamari.csproj | 6 +++--- source/Sashimi.Tests/Sashimi.Tests.csproj | 2 +- source/Sashimi/AzureResourceGroupActionHandler.cs | 7 ++++--- source/Sashimi/Sashimi.csproj | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/source/Calamari/Calamari.csproj b/source/Calamari/Calamari.csproj index 7a24b79..c606348 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..7ae0bce 100644 --- a/source/Sashimi.Tests/Sashimi.Tests.csproj +++ b/source/Sashimi.Tests/Sashimi.Tests.csproj @@ -14,7 +14,7 @@ - + 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..3929564 100644 --- a/source/Sashimi/Sashimi.csproj +++ b/source/Sashimi/Sashimi.csproj @@ -15,7 +15,7 @@ - - + + \ No newline at end of file From f34642daf2e989e2176fafa868b90f264017564e Mon Sep 17 00:00:00 2001 From: Shannon Lewis Date: Wed, 10 Mar 2021 15:59:40 +1000 Subject: [PATCH 2/3] fixing reference to correct Autofac version --- source/Calamari/Calamari.csproj | 2 +- source/Sashimi.Tests/Sashimi.Tests.csproj | 2 +- source/Sashimi/Sashimi.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/Calamari/Calamari.csproj b/source/Calamari/Calamari.csproj index c606348..6a299b2 100644 --- a/source/Calamari/Calamari.csproj +++ b/source/Calamari/Calamari.csproj @@ -11,7 +11,7 @@ - + diff --git a/source/Sashimi.Tests/Sashimi.Tests.csproj b/source/Sashimi.Tests/Sashimi.Tests.csproj index 7ae0bce..6807829 100644 --- a/source/Sashimi.Tests/Sashimi.Tests.csproj +++ b/source/Sashimi.Tests/Sashimi.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/source/Sashimi/Sashimi.csproj b/source/Sashimi/Sashimi.csproj index 3929564..2d9ae11 100644 --- a/source/Sashimi/Sashimi.csproj +++ b/source/Sashimi/Sashimi.csproj @@ -16,6 +16,6 @@ - + \ No newline at end of file From 374acd07e7a5aedd52382ad2bf6ea23105e193e0 Mon Sep 17 00:00:00 2001 From: slewis74 Date: Thu, 18 Mar 2021 22:11:31 +1000 Subject: [PATCH 3/3] package updates --- source/Calamari/Calamari.csproj | 6 +++--- source/Sashimi.Tests/Sashimi.Tests.csproj | 4 ++-- source/Sashimi/Sashimi.csproj | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/Calamari/Calamari.csproj b/source/Calamari/Calamari.csproj index 6a299b2..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 6807829..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/Sashimi.csproj b/source/Sashimi/Sashimi.csproj index 2d9ae11..9148012 100644 --- a/source/Sashimi/Sashimi.csproj +++ b/source/Sashimi/Sashimi.csproj @@ -15,7 +15,7 @@ - - + + \ No newline at end of file