Skip to content
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

Include version in log output #930

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Include version in log output #930

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f27d4b7
Include version in log output
samdanaei May 15, 2024
f47fd33
Move log to capabilities service
samdanaei May 15, 2024
944df32
Append version information to Capabilities Service
samdanaei May 15, 2024
f44510d
Delete unnecessary imports
samdanaei May 15, 2024
1f9cad6
Delete more unnecessary imports
samdanaei May 15, 2024
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
7 changes: 5 additions & 2 deletions source/Octopus.Tentacle/Services/Capabilities/CapabilitiesServiceV2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Octopus.Tentacle.Contracts.KubernetesScriptServiceV1;
using Octopus.Tentacle.Contracts.KubernetesScriptServiceV1Alpha;
using Octopus.Tentacle.Contracts.ScriptServiceV2;
using Octopus.Tentacle.Properties;
using Octopus.Tentacle.Util;

namespace Octopus.Tentacle.Services.Capabilities
Expand All @@ -17,14 +18,16 @@ public async Task<CapabilitiesResponseV2> GetCapabilitiesAsync(CancellationToken
{
await Task.CompletedTask;

var versionInformation = $"Tentacle_Version_{OctopusTentacle.InformationalVersion}";

//the kubernetes agent only supports the kubernetes script services
if (PlatformDetection.Kubernetes.IsRunningAsKubernetesAgent)
{
return new CapabilitiesResponseV2(new List<string> { nameof(IFileTransferService), nameof(IKubernetesScriptServiceV1Alpha), nameof(IKubernetesScriptServiceV1) });
return new CapabilitiesResponseV2(new List<string> { nameof(IFileTransferService), nameof(IKubernetesScriptServiceV1Alpha), nameof(IKubernetesScriptServiceV1), versionInformation });
}

//non-kubernetes agent tentacles only support the standard script services
return new CapabilitiesResponseV2(new List<string> { nameof(IScriptService), nameof(IFileTransferService), nameof(IScriptServiceV2) });
return new CapabilitiesResponseV2(new List<string> { nameof(IScriptService), nameof(IFileTransferService), nameof(IScriptServiceV2), versionInformation });
}
}
}