Skip to content
This repository was archived by the owner on May 2, 2023. It is now read-only.

Splitting system and task logs #5

Merged
slewis74 merged 6 commits into from
Mar 18, 2021
Merged

Splitting system and task logs #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e37af1f
new logging infra
slewis74 Mar 9, 2021
7522566
new logging infra
slewis74 Mar 9, 2021
ad7907d
latest package updates
slewis74 Mar 10, 2021
36fb852
Merge branch 'enh-logwithcontext' of https://github.com/OctopusDeploy…
slewis74 Mar 10, 2021
ecf993a
scripting update
slewis74 Mar 10, 2021
9dfa1bc
package updates
slewis74 Mar 18, 2021
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: 2 additions & 2 deletions source/Calamari.Tests/Calamari.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<ProjectReference Include="..\Calamari\Calamari.csproj" />
<PackageReference Include="Azure.Identity" Version="1.2.3" />
<PackageReference Include="Azure.ResourceManager.Resources" Version="1.0.0-preview.2" />
<PackageReference Include="Calamari.Tests.Shared" Version="8.3.1" />
<PackageReference Include="Calamari.Tests.Shared" Version="11.0.0" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.8" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="nunit" Version="3.13.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion source/Calamari/Calamari.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Calamari.Common" Version="19.0.1-enh-logwithconte0003" />
<PackageReference Include="Calamari.Common" Version="19.1.0" />
<PackageReference Include="Microsoft.Azure.Management.AppService.Fluent" Version="1.37.0" />
<PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.37.0" />
<PackageReference Include="Microsoft.Azure.Management.Websites" Version="3.1.0" />
Expand Down
6 changes: 3 additions & 3 deletions source/Sashimi.Tests/Sashimi.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.2.3" />
<PackageReference Include="Azure.ResourceManager.Resources" Version="1.0.0-preview.2" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="nunit" Version="3.13.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="Octopus.Server.Tests.Extensibility" Version="11.0.0" />
<PackageReference Include="Sashimi.Tests.Shared" Version="8.3.1" />
<PackageReference Include="Octopus.Server.Tests.Extensibility" Version="13.0.0" />
<PackageReference Include="Sashimi.Tests.Shared" Version="11.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions source/Sashimi/AzureAppServiceActionHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Octopus.CoreUtilities;
using Octopus.Server.Extensibility.HostServices.Diagnostics;
using Sashimi.AzureScripting;
using Sashimi.Server.Contracts.ActionHandlers;

Expand All @@ -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())
{
Expand All @@ -34,8 +35,8 @@ public IActionHandlerResult Execute(IActionHandlerContext context)
$"The machine {context.DeploymentTargetName.SomeOr("<unknown>")} 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)
.WithStagedPackageArgument().Execute();
return context.CalamariCommand(AzureConstants.CalamariAzure, "deploy-azure-app-service").WithAzureTools(context, taskLog)
.WithStagedPackageArgument().Execute(taskLog);
}
}
}
9 changes: 5 additions & 4 deletions source/Sashimi/Sashimi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Octopus.Configuration" Version="2.1.0" />
<PackageReference Include="Sashimi.Azure.Accounts" Version="8.3.1" />
<PackageReference Include="Sashimi.Azure.Common" Version="8.3.1" />
<PackageReference Include="Sashimi.AzureScripting" Version="8.3.1" />
<PackageReference Include="Octopus.Configuration" Version="4.0.0" />
<PackageReference Include="Sashimi.Azure.Accounts" Version="11.0.0" />
<PackageReference Include="Sashimi.Azure.Common" Version="11.0.0" />
<PackageReference Include="Sashimi.AzureScripting" Version="12.0.0" />
<PackageReference Include="Sashimi.Server.Contracts" Version="11.0.0" />
</ItemGroup>

</Project>