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

sast/si/disposal-debug #1005

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

sast/si/disposal-debug #1005

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
7fc3c2a
Await each part of the disposal process
samdanaei Sep 23, 2024
82e8c20
Comment out everything except ListInstances
samdanaei Sep 23, 2024
9a766ea
Second half only
samdanaei Sep 23, 2024
477b3e5
Whole test file
samdanaei Sep 23, 2024
9173c72
Only run HelpForInstanceSpecificCommandsAlwaysWorks
samdanaei Sep 23, 2024
597b790
Put extra logging into RunCommand
samdanaei Sep 23, 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
252 changes: 126 additions & 126 deletions source/Octopus.Tentacle.Tests.Integration/CapabilitiesServiceV2Test.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,126 +1,126 @@
#nullable enable
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using FluentAssertions;
using Halibut;
using NUnit.Framework;
using Octopus.Tentacle.Contracts;
using Octopus.Tentacle.Contracts.Capabilities;
using Octopus.Tentacle.Contracts.KubernetesScriptServiceV1;
using Octopus.Tentacle.Contracts.ScriptServiceV2;
using Octopus.Tentacle.Tests.Integration.Common.Builders.Decorators;
using Octopus.Tentacle.Tests.Integration.Support;
using Octopus.Tentacle.Tests.Integration.Util.Builders;

namespace Octopus.Tentacle.Tests.Integration
{
[IntegrationTestTimeout]
public class CapabilitiesServiceV2Test : IntegrationTest
{
[Test]
[TentacleConfigurations(testCapabilitiesServiceVersions: true)]
public async Task CapabilitiesFromAnOlderTentacleWhichHasNoCapabilitiesService_WorksWithTheBackwardsCompatabilityDecorator(TentacleConfigurationTestCase tentacleConfigurationTestCase)
{
Version? version = tentacleConfigurationTestCase.Version;

await using var clientAndTentacle = await tentacleConfigurationTestCase.CreateLegacyBuilder().Build(CancellationToken);

var capabilities = (await clientAndTentacle.TentacleClient.CapabilitiesServiceV2.GetCapabilitiesAsync(new(CancellationToken))).SupportedCapabilities;

capabilities.Should().Contain(nameof(IScriptService));
capabilities.Should().Contain(nameof(IFileTransferService));

//all versions have ScriptServiceV1 & IFileTransferService
var expectedCapabilitiesCount = 2;
if (version.HasScriptServiceV2())
{
capabilities.Should().Contain(nameof(IScriptServiceV2));
expectedCapabilitiesCount++;
}

capabilities.Count.Should().Be(expectedCapabilitiesCount);
}

[Test]
[TentacleConfigurations]
public async Task CapabilitiesServiceDoesNotReturnKubernetesScriptServiceForNonKubernetesTentacle(TentacleConfigurationTestCase tentacleConfigurationTestCase)
{
var version = tentacleConfigurationTestCase.Version;

await using var clientAndTentacle = await tentacleConfigurationTestCase.CreateLegacyBuilder().Build(CancellationToken);

var capabilities = (await clientAndTentacle.TentacleClient.CapabilitiesServiceV2.GetCapabilitiesAsync(new(CancellationToken))).SupportedCapabilities;

capabilities.Should().Contain(nameof(IScriptService));
capabilities.Should().Contain(nameof(IFileTransferService));

//all versions have ScriptServiceV1 & IFileTransferService
var expectedCapabilitiesCount = 2;
if (version.HasScriptServiceV2())
{
capabilities.Should().Contain(nameof(IScriptServiceV2));
expectedCapabilitiesCount++;
}

capabilities.Should().NotContain(nameof(IKubernetesScriptServiceV1));

capabilities.Count.Should().Be(expectedCapabilitiesCount);
}

[Test]
[TentacleConfigurations(testCapabilitiesServiceVersions: true)]
public async Task CapabilitiesResponseShouldBeCached(TentacleConfigurationTestCase tentacleConfigurationTestCase)
{
var capabilitiesResponses = new List<CapabilitiesResponseV2>();
var resumePortForwarder = false;

await using var clientAndTentacle = await tentacleConfigurationTestCase.CreateBuilder()
.WithPortForwarder(out var portForwarder)
.WithTentacleServiceDecorator(new TentacleServiceDecoratorBuilder()
.DecorateCapabilitiesServiceV2With(d => d
.DecorateGetCapabilitiesWith(
async (inner, options) =>
{
var response = await inner.GetCapabilitiesAsync(options);

capabilitiesResponses.Add(response);

if (resumePortForwarder)
{
// (2) Once a get capabilities call has been made which uses the cached response then resume normal RPC calls
// to allow script execution to continue
portForwarder.Value.ReturnToNormalMode();
}

return response;
}))
.Build())
.Build(CancellationToken);

var startScriptCommand = new TestExecuteShellScriptCommandBuilder()
.SetScriptBody(b => b
.Print("Running..."))
.Build();

await clientAndTentacle.TentacleClient.ExecuteScript(startScriptCommand, CancellationToken);

// (1) Kill new and existing connections to ensure no RPC calls can be made
clientAndTentacle.PortForwarder!.EnterKillNewAndExistingConnectionsMode();
resumePortForwarder = true;

try
{
await clientAndTentacle.TentacleClient.ExecuteScript(startScriptCommand, CancellationToken);
}
catch (HalibutClientException) when (tentacleConfigurationTestCase.TentacleType == TentacleType.Polling && tentacleConfigurationTestCase.Version != null)
{
// For script execution on a tentacle without ScriptServiceV2 and retries a polling request can be de-queued into a broken TCP Connection
// By the time this happens we will have already called gt capabilities and got the cached response so we can safely ignore.
}

capabilitiesResponses.Should().HaveCount(2);
capabilitiesResponses[0].Should().BeEquivalentTo(capabilitiesResponses[1]);
}
}
}
// #nullable enable
// using System;
// using System.Collections.Generic;
// using System.Threading.Tasks;
// using FluentAssertions;
// using Halibut;
// using NUnit.Framework;
// using Octopus.Tentacle.Contracts;
// using Octopus.Tentacle.Contracts.Capabilities;
// using Octopus.Tentacle.Contracts.KubernetesScriptServiceV1;
// using Octopus.Tentacle.Contracts.ScriptServiceV2;
// using Octopus.Tentacle.Tests.Integration.Common.Builders.Decorators;
// using Octopus.Tentacle.Tests.Integration.Support;
// using Octopus.Tentacle.Tests.Integration.Util.Builders;
//
// namespace Octopus.Tentacle.Tests.Integration
// {
// [IntegrationTestTimeout]
// public class CapabilitiesServiceV2Test : IntegrationTest
// {
// [Test]
// [TentacleConfigurations(testCapabilitiesServiceVersions: true)]
// public async Task CapabilitiesFromAnOlderTentacleWhichHasNoCapabilitiesService_WorksWithTheBackwardsCompatabilityDecorator(TentacleConfigurationTestCase tentacleConfigurationTestCase)
// {
// Version? version = tentacleConfigurationTestCase.Version;
//
// await using var clientAndTentacle = await tentacleConfigurationTestCase.CreateLegacyBuilder().Build(CancellationToken);
//
// var capabilities = (await clientAndTentacle.TentacleClient.CapabilitiesServiceV2.GetCapabilitiesAsync(new(CancellationToken))).SupportedCapabilities;
//
// capabilities.Should().Contain(nameof(IScriptService));
// capabilities.Should().Contain(nameof(IFileTransferService));
//
// //all versions have ScriptServiceV1 & IFileTransferService
// var expectedCapabilitiesCount = 2;
// if (version.HasScriptServiceV2())
// {
// capabilities.Should().Contain(nameof(IScriptServiceV2));
// expectedCapabilitiesCount++;
// }
//
// capabilities.Count.Should().Be(expectedCapabilitiesCount);
// }
//
// [Test]
// [TentacleConfigurations]
// public async Task CapabilitiesServiceDoesNotReturnKubernetesScriptServiceForNonKubernetesTentacle(TentacleConfigurationTestCase tentacleConfigurationTestCase)
// {
// var version = tentacleConfigurationTestCase.Version;
//
// await using var clientAndTentacle = await tentacleConfigurationTestCase.CreateLegacyBuilder().Build(CancellationToken);
//
// var capabilities = (await clientAndTentacle.TentacleClient.CapabilitiesServiceV2.GetCapabilitiesAsync(new(CancellationToken))).SupportedCapabilities;
//
// capabilities.Should().Contain(nameof(IScriptService));
// capabilities.Should().Contain(nameof(IFileTransferService));
//
// //all versions have ScriptServiceV1 & IFileTransferService
// var expectedCapabilitiesCount = 2;
// if (version.HasScriptServiceV2())
// {
// capabilities.Should().Contain(nameof(IScriptServiceV2));
// expectedCapabilitiesCount++;
// }
//
// capabilities.Should().NotContain(nameof(IKubernetesScriptServiceV1));
//
// capabilities.Count.Should().Be(expectedCapabilitiesCount);
// }
//
// [Test]
// [TentacleConfigurations(testCapabilitiesServiceVersions: true)]
// public async Task CapabilitiesResponseShouldBeCached(TentacleConfigurationTestCase tentacleConfigurationTestCase)
// {
// var capabilitiesResponses = new List<CapabilitiesResponseV2>();
// var resumePortForwarder = false;
//
// await using var clientAndTentacle = await tentacleConfigurationTestCase.CreateBuilder()
// .WithPortForwarder(out var portForwarder)
// .WithTentacleServiceDecorator(new TentacleServiceDecoratorBuilder()
// .DecorateCapabilitiesServiceV2With(d => d
// .DecorateGetCapabilitiesWith(
// async (inner, options) =>
// {
// var response = await inner.GetCapabilitiesAsync(options);
//
// capabilitiesResponses.Add(response);
//
// if (resumePortForwarder)
// {
// // (2) Once a get capabilities call has been made which uses the cached response then resume normal RPC calls
// // to allow script execution to continue
// portForwarder.Value.ReturnToNormalMode();
// }
//
// return response;
// }))
// .Build())
// .Build(CancellationToken);
//
// var startScriptCommand = new TestExecuteShellScriptCommandBuilder()
// .SetScriptBody(b => b
// .Print("Running..."))
// .Build();
//
// await clientAndTentacle.TentacleClient.ExecuteScript(startScriptCommand, CancellationToken);
//
// // (1) Kill new and existing connections to ensure no RPC calls can be made
// clientAndTentacle.PortForwarder!.EnterKillNewAndExistingConnectionsMode();
// resumePortForwarder = true;
//
// try
// {
// await clientAndTentacle.TentacleClient.ExecuteScript(startScriptCommand, CancellationToken);
// }
// catch (HalibutClientException) when (tentacleConfigurationTestCase.TentacleType == TentacleType.Polling && tentacleConfigurationTestCase.Version != null)
// {
// // For script execution on a tentacle without ScriptServiceV2 and retries a polling request can be de-queued into a broken TCP Connection
// // By the time this happens we will have already called gt capabilities and got the cached response so we can safely ignore.
// }
//
// capabilitiesResponses.Should().HaveCount(2);
// capabilitiesResponses[0].Should().BeEquivalentTo(capabilitiesResponses[1]);
// }
// }
// }
Loading