From e37af1f56edf536e383393b25ef72c9a5d22393e Mon Sep 17 00:00:00 2001 From: slewis74 Date: Tue, 9 Mar 2021 10:00:05 +1000 Subject: [PATCH 1/5] new logging infra --- source/Sashimi/AzureAppServiceActionHandler.cs | 5 +++-- source/Sashimi/Sashimi.csproj | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/Sashimi/AzureAppServiceActionHandler.cs b/source/Sashimi/AzureAppServiceActionHandler.cs index 9493d6a4..f9a029dc 100644 --- a/source/Sashimi/AzureAppServiceActionHandler.cs +++ b/source/Sashimi/AzureAppServiceActionHandler.cs @@ -1,4 +1,5 @@ using Octopus.CoreUtilities; +using Octopus.Server.Extensibility.HostServices.Diagnostics; using Sashimi.AzureScripting; using Sashimi.Server.Contracts.ActionHandlers; @@ -25,7 +26,7 @@ class AzureAppServiceActionHandler : IActionHandler public ActionHandlerCategory[] Categories => new[] {ActionHandlerCategory.BuiltInStep, AzureConstants.AzureActionHandlerCategory}; - public IActionHandlerResult Execute(IActionHandlerContext context) + public IActionHandlerResult Execute(IActionHandlerContext context, ITaskLog taskLog) { if (context.DeploymentTargetType.Some()) { @@ -35,7 +36,7 @@ public IActionHandlerResult Execute(IActionHandlerContext context) } return context.CalamariCommand(AzureConstants.CalamariAzure, "deploy-azure-app-service").WithAzureTools(context) - .WithStagedPackageArgument().Execute(); + .WithStagedPackageArgument().Execute(taskLog); } } } diff --git a/source/Sashimi/Sashimi.csproj b/source/Sashimi/Sashimi.csproj index 9e2957c5..a74bb076 100644 --- a/source/Sashimi/Sashimi.csproj +++ b/source/Sashimi/Sashimi.csproj @@ -26,6 +26,7 @@ + From 75225660151693f977927f64ee07fc14aee0d037 Mon Sep 17 00:00:00 2001 From: slewis74 Date: Tue, 9 Mar 2021 10:00:05 +1000 Subject: [PATCH 2/5] new logging infra --- source/Sashimi/AzureAppServiceActionHandler.cs | 5 +++-- source/Sashimi/Sashimi.csproj | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/Sashimi/AzureAppServiceActionHandler.cs b/source/Sashimi/AzureAppServiceActionHandler.cs index 9493d6a4..f9a029dc 100644 --- a/source/Sashimi/AzureAppServiceActionHandler.cs +++ b/source/Sashimi/AzureAppServiceActionHandler.cs @@ -1,4 +1,5 @@ using Octopus.CoreUtilities; +using Octopus.Server.Extensibility.HostServices.Diagnostics; using Sashimi.AzureScripting; using Sashimi.Server.Contracts.ActionHandlers; @@ -25,7 +26,7 @@ class AzureAppServiceActionHandler : IActionHandler public ActionHandlerCategory[] Categories => new[] {ActionHandlerCategory.BuiltInStep, AzureConstants.AzureActionHandlerCategory}; - public IActionHandlerResult Execute(IActionHandlerContext context) + public IActionHandlerResult Execute(IActionHandlerContext context, ITaskLog taskLog) { if (context.DeploymentTargetType.Some()) { @@ -35,7 +36,7 @@ public IActionHandlerResult Execute(IActionHandlerContext context) } return context.CalamariCommand(AzureConstants.CalamariAzure, "deploy-azure-app-service").WithAzureTools(context) - .WithStagedPackageArgument().Execute(); + .WithStagedPackageArgument().Execute(taskLog); } } } diff --git a/source/Sashimi/Sashimi.csproj b/source/Sashimi/Sashimi.csproj index 9e2957c5..a74bb076 100644 --- a/source/Sashimi/Sashimi.csproj +++ b/source/Sashimi/Sashimi.csproj @@ -26,6 +26,7 @@ + From ad7907dac29454deade5ae47751355637cb3dc26 Mon Sep 17 00:00:00 2001 From: Shannon Lewis Date: Wed, 10 Mar 2021 11:01:24 +1000 Subject: [PATCH 3/5] latest package updates --- source/Calamari.Tests/Calamari.Tests.csproj | 4 ++-- source/Sashimi.Tests/Sashimi.Tests.csproj | 4 ++-- source/Sashimi/AzureAppServiceActionHandler.cs | 2 +- source/Sashimi/Sashimi.csproj | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/Calamari.Tests/Calamari.Tests.csproj b/source/Calamari.Tests/Calamari.Tests.csproj index bf02c2b9..b1fcb0d9 100644 --- a/source/Calamari.Tests/Calamari.Tests.csproj +++ b/source/Calamari.Tests/Calamari.Tests.csproj @@ -19,9 +19,9 @@ - + - + diff --git a/source/Sashimi.Tests/Sashimi.Tests.csproj b/source/Sashimi.Tests/Sashimi.Tests.csproj index 574b795c..ed7f621a 100644 --- a/source/Sashimi.Tests/Sashimi.Tests.csproj +++ b/source/Sashimi.Tests/Sashimi.Tests.csproj @@ -11,11 +11,11 @@ - + - + diff --git a/source/Sashimi/AzureAppServiceActionHandler.cs b/source/Sashimi/AzureAppServiceActionHandler.cs index f9a029dc..37e90406 100644 --- a/source/Sashimi/AzureAppServiceActionHandler.cs +++ b/source/Sashimi/AzureAppServiceActionHandler.cs @@ -35,7 +35,7 @@ public IActionHandlerResult Execute(IActionHandlerContext context, ITaskLog task $"The machine {context.DeploymentTargetName.SomeOr("")} will not be deployed to because it is not an Azure Web Application deployment target"); } - return context.CalamariCommand(AzureConstants.CalamariAzure, "deploy-azure-app-service").WithAzureTools(context) + return context.CalamariCommand(AzureConstants.CalamariAzure, "deploy-azure-app-service").WithAzureTools(context, taskLog) .WithStagedPackageArgument().Execute(taskLog); } } diff --git a/source/Sashimi/Sashimi.csproj b/source/Sashimi/Sashimi.csproj index a74bb076..e458b8cd 100644 --- a/source/Sashimi/Sashimi.csproj +++ b/source/Sashimi/Sashimi.csproj @@ -22,11 +22,11 @@ - - - - - + + + + + From ecf993ac6ab4edbefed4aa4b0cb0ee303d9ccc02 Mon Sep 17 00:00:00 2001 From: slewis74 Date: Wed, 10 Mar 2021 20:03:37 +1000 Subject: [PATCH 4/5] scripting update --- source/Calamari.Tests/Calamari.Tests.csproj | 2 +- source/Sashimi.Tests/Sashimi.Tests.csproj | 2 +- source/Sashimi/Sashimi.csproj | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/Calamari.Tests/Calamari.Tests.csproj b/source/Calamari.Tests/Calamari.Tests.csproj index b1fcb0d9..9a33f9ff 100644 --- a/source/Calamari.Tests/Calamari.Tests.csproj +++ b/source/Calamari.Tests/Calamari.Tests.csproj @@ -19,7 +19,7 @@ - + diff --git a/source/Sashimi.Tests/Sashimi.Tests.csproj b/source/Sashimi.Tests/Sashimi.Tests.csproj index ed7f621a..7232e17d 100644 --- a/source/Sashimi.Tests/Sashimi.Tests.csproj +++ b/source/Sashimi.Tests/Sashimi.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/source/Sashimi/Sashimi.csproj b/source/Sashimi/Sashimi.csproj index e458b8cd..680bb453 100644 --- a/source/Sashimi/Sashimi.csproj +++ b/source/Sashimi/Sashimi.csproj @@ -23,10 +23,10 @@ - - - - + + + + From 9dfa1bcedb0a7ff04c7c7f086fd2038271d35f33 Mon Sep 17 00:00:00 2001 From: slewis74 Date: Thu, 18 Mar 2021 22:14:37 +1000 Subject: [PATCH 5/5] package updates --- source/Calamari.Tests/Calamari.Tests.csproj | 2 +- source/Calamari/Calamari.csproj | 2 +- source/Sashimi.Tests/Sashimi.Tests.csproj | 4 ++-- source/Sashimi/Sashimi.csproj | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/Calamari.Tests/Calamari.Tests.csproj b/source/Calamari.Tests/Calamari.Tests.csproj index 9a33f9ff..abc24054 100644 --- a/source/Calamari.Tests/Calamari.Tests.csproj +++ b/source/Calamari.Tests/Calamari.Tests.csproj @@ -19,7 +19,7 @@ - + diff --git a/source/Calamari/Calamari.csproj b/source/Calamari/Calamari.csproj index 73e51e93..b3248118 100644 --- a/source/Calamari/Calamari.csproj +++ b/source/Calamari/Calamari.csproj @@ -16,7 +16,7 @@ netcoreapp3.1 - + diff --git a/source/Sashimi.Tests/Sashimi.Tests.csproj b/source/Sashimi.Tests/Sashimi.Tests.csproj index 7232e17d..2cbf73fc 100644 --- a/source/Sashimi.Tests/Sashimi.Tests.csproj +++ b/source/Sashimi.Tests/Sashimi.Tests.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/source/Sashimi/Sashimi.csproj b/source/Sashimi/Sashimi.csproj index 680bb453..0e6b2ee6 100644 --- a/source/Sashimi/Sashimi.csproj +++ b/source/Sashimi/Sashimi.csproj @@ -23,10 +23,10 @@ - - - - + + + +