Skip to content

Remember the certificate algorithm so we can check it in the health check #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matt-richardson merged 4 commits into from
Jun 2, 2017
Merged

Remember the certificate algorithm so we can check it in the health check #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d85db1b
Update to latest Octopus.Shared
matt-richardson Jun 2, 2017
be0ebc3
Set cert signature algorithm variable
matt-richardson Jun 2, 2017
5821853
Fix test
matt-richardson Jun 2, 2017
cca35c3
Merge branch 'master' into enh-sha256-ui
matt-richardson Jun 2, 2017
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/Octopus.Manager.Tentacle/Octopus.Manager.Tentacle.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@
<Reference Include="Octopus.Manager.Core, Version=3.13.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Octopus.Manager.Core.3.13.9-tentsplit0048\lib\Octopus.Manager.Core.dll</HintPath>
</Reference>
<Reference Include="Octopus.Shared, Version=3.13.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Octopus.Shared.3.13.9-tentsplit0048\lib\Octopus.Shared.dll</HintPath>
<Reference Include="Octopus.Shared, Version=3.14.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Octopus.Shared.3.14.1-enh-sha256-ui0002\lib\Octopus.Shared.dll</HintPath>
</Reference>
<Reference Include="Octopus.Time, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Octopus.Time.1.0.8\lib\netstandard1.0\Octopus.Time.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion source/Octopus.Manager.Tentacle/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<package id="Octopus.Configuration" version="1.0.10" targetFramework="net45" />
<package id="Octopus.Diagnostics" version="1.0.11" targetFramework="net45" />
<package id="Octopus.Manager.Core" version="3.13.9-tentsplit0048" targetFramework="net45" />
<package id="Octopus.Shared" version="3.13.9-tentsplit0048" targetFramework="net45" />
<package id="Octopus.Shared" version="3.14.1-enh-sha256-ui0002" targetFramework="net45" />
<package id="Octopus.Time" version="1.0.8" targetFramework="net45" />
<package id="System.Net.Http" version="4.1.0" targetFramework="net45" />
<package id="System.Runtime" version="4.1.0" targetFramework="net45" />
Expand Down
6 changes: 4 additions & 2 deletions source/Octopus.Tentacle.Tests/Commands/RunAgentCommandFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
using System.Security.Cryptography.X509Certificates;
using NSubstitute;
using NUnit.Framework;
using Octopus.Diagnostics;
using Octopus.Shared.Configuration;
using Octopus.Shared.Security;
using Octopus.Shared.Versioning;
using Octopus.Tentacle.Versioning;
using Octopus.Tentacle.Commands;
using Octopus.Tentacle.Communications;
Expand All @@ -27,7 +28,8 @@ public override void SetUp()

halibut = Substitute.For<IHalibutInitializer>();
tentacleConfiguration = Substitute.For<ITentacleConfiguration>();
tentacleConfiguration.TentacleCertificate.Returns(new X509Certificate2());
var certificate = new CertificateGenerator().GenerateNew("cn=Test.Cert.For.Octopus.Tests");
tentacleConfiguration.TentacleCertificate.Returns(certificate);
home = Substitute.For<IHomeConfiguration>();
sleep = Substitute.For<ISleep>();
Command = new RunAgentCommand(
Expand Down
6 changes: 3 additions & 3 deletions source/Octopus.Tentacle.Tests/Octopus.Tentacle.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<Reference Include="NuGet.Versioning, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.Versioning.3.6.0-octopus-58455\lib\net45\NuGet.Versioning.dll</HintPath>
<Private>True</Private>
</Reference>
</Reference>
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
Expand All @@ -127,8 +127,8 @@
<HintPath>..\packages\Octopus.Diagnostics.1.0.11\lib\netstandard1.0\Octopus.Diagnostics.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Octopus.Shared, Version=3.13.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Octopus.Shared.3.13.9-tentsplit0048\lib\Octopus.Shared.dll</HintPath>
<Reference Include="Octopus.Shared, Version=3.14.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Octopus.Shared.3.14.1-enh-sha256-ui0002\lib\Octopus.Shared.dll</HintPath>
</Reference>
<Reference Include="Octopus.Time, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Octopus.Time.1.0.8\lib\netstandard1.0\Octopus.Time.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion source/Octopus.Tentacle.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<package id="Octopus.Diagnostics" version="1.0.11" targetFramework="net452" />
<package id="Octopus.Server.Extensibility" version="2.0.2" targetFramework="net452" />
<package id="Octopus.Server.Extensibility.Authentication" version="3.0.0" targetFramework="net452" />
<package id="Octopus.Shared" version="3.13.9-tentsplit0048" targetFramework="net452" />
<package id="Octopus.Shared" version="3.14.1-enh-sha256-ui0002" targetFramework="net452" />
<package id="Octopus.Time" version="1.0.8" targetFramework="net452" />
<package id="Octostache" version="2.1.5" targetFramework="net452" />
<package id="Polly" version="5.1.0" targetFramework="net452" />
Expand Down
1 change: 1 addition & 0 deletions source/Octopus.Tentacle/Commands/RunAgentCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ protected override void Start()
Environment.SetEnvironmentVariable(EnvironmentVariables.TentacleProgramDirectoryPath, Path.GetDirectoryName(exePath));
Environment.SetEnvironmentVariable(EnvironmentVariables.AgentProgramDirectoryPath, Path.GetDirectoryName(exePath));
Environment.SetEnvironmentVariable(EnvironmentVariables.TentacleVersion, appVersion.ToString());
Environment.SetEnvironmentVariable(EnvironmentVariables.TentacleCertificateSignatureAlgorithm, configuration.TentacleCertificate.SignatureAlgorithm.FriendlyName);
Environment.SetEnvironmentVariable(EnvironmentVariables.TentacleProxyUsername, proxyConfiguration.CustomProxyUsername);
Environment.SetEnvironmentVariable(EnvironmentVariables.TentacleProxyPassword, proxyConfiguration.CustomProxyPassword);
Environment.SetEnvironmentVariable(EnvironmentVariables.TentacleProxyHost, proxyConfiguration.CustomProxyHost);
Expand Down
2 changes: 1 addition & 1 deletion source/Octopus.Tentacle/Octopus.Tentacle.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="Autofac" Version="3.5.2" />
<PackageReference Include="Octopus.Client" Version="4.15.2" />
<PackageReference Include="Octopus.Shared" Version="3.13.9-tentsplit0048" />
<PackageReference Include="Octopus.Shared" Version="3.14.1-enh-sha256-ui0002" />
<PackageReference Include="System.Net.Http" Version="4.1.0" />
</ItemGroup>

Expand Down