Update KubernetesAgent to KubernetesTentacle (#795)

* Update KubernetesAgent to KubernetesTentacle * Fix assent tests
OctopusDeploy · Nov 1, 2023 · e5aa597 · e5aa597
1 parent 749ddb1
commit e5aa597
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 32 deletions.
diff --git a/source/Octopus.Client.Tests/Operations/RegisterKubernetesClusterOperationFixture.cs b/source/Octopus.Client.Tests/Operations/RegisterKubernetesClusterOperationFixture.cs
@@ -60,7 +60,7 @@ public void SetUp()
         }
 
         [Test]
-        public async Task ShouldCreateNewListeningKubernetesAgent()
+        public async Task ShouldCreateNewListeningKubernetesTentacle()
         {
             var machineResources = new List<MachineResource>();
             await client.Create("/api/machines", Arg.Do<MachineResource>(m => machineResources.Add(m)), Arg.Any<object>(), Arg.Any<CancellationToken>());
@@ -77,11 +77,11 @@ public async Task ShouldCreateNewListeningKubernetesAgent()
 
             await operation.ExecuteAsync(serverEndpoint).ConfigureAwait(false);
 
-            machineResources.Should().ContainSingle().Which.Endpoint.Should().BeOfType<KubernetesAgentEndpointResource>().Which.ShouldBeEquivalentTo(new KubernetesAgentEndpointResource(new ListeningTentacleEndpointConfigurationResource("ABCDEF", "https://mymachine.test.com:10930/")));
+            machineResources.Should().ContainSingle().Which.Endpoint.Should().BeOfType<KubernetesTentacleEndpointResource>().Which.ShouldBeEquivalentTo(new KubernetesTentacleEndpointResource(new ListeningTentacleEndpointConfigurationResource("ABCDEF", "https://mymachine.test.com:10930/")));
         }
 
         [Test]
-        public async Task ShouldCreateNewPollingKubernetesAgent()
+        public async Task ShouldCreateNewPollingKubernetesTentacle()
         {
             var machineResources = new List<MachineResource>();
             await client.Create("/api/machines", Arg.Do<MachineResource>(m => machineResources.Add(m)), Arg.Any<object>(), Arg.Any<CancellationToken>());
@@ -99,7 +99,7 @@ public async Task ShouldCreateNewPollingKubernetesAgent()
 
             await operation.ExecuteAsync(serverEndpoint).ConfigureAwait(false);
 
-            machineResources.Should().ContainSingle().Which.Endpoint.Should().BeOfType<KubernetesAgentEndpointResource>().Which.ShouldBeEquivalentTo(new KubernetesAgentEndpointResource(new PollingTentacleEndpointConfigurationResource("ABCDEF", "poll://ckyhfyfkcbmzjl8sfgch/")));
+            machineResources.Should().ContainSingle().Which.Endpoint.Should().BeOfType<KubernetesTentacleEndpointResource>().Which.ShouldBeEquivalentTo(new KubernetesTentacleEndpointResource(new PollingTentacleEndpointConfigurationResource("ABCDEF", "poll://ckyhfyfkcbmzjl8sfgch/")));
         }
     }
 }
diff --git a/...Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/...Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt
@@ -2392,7 +2392,7 @@ Octopus.Client.Model
       AzureServiceFabricCluster = 8
       Kubernetes = 9
       StepPackage = 10
-      KubernetesAgent = 11
+      KubernetesTentacle = 11
   }
   class CommunityActionTemplateResource
     Octopus.Client.Extensibility.IResource
@@ -6484,15 +6484,6 @@ Octopus.Client.Model.Endpoints
     String Thumbprint { get; set; }
     String Uri { get; set; }
   }
-  class KubernetesAgentEndpointResource
-    Octopus.Client.Extensibility.IResource
-    Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.EndpointResource
-  {
-    .ctor(Octopus.Client.Model.Endpoints.TentacleEndpointConfigurationResource)
-    Octopus.Client.Model.CommunicationStyle CommunicationStyle { get; }
-    Octopus.Client.Model.Endpoints.TentacleEndpointConfigurationResource TentacleEndpointConfiguration { get; set; }
-  }
   class KubernetesAwsAuthenticationResource
     Octopus.Client.Model.Endpoints.IEndpointWithMultipleAuthenticationResource
     Octopus.Client.Model.Endpoints.KubernetesStandardAccountAuthenticationResource
@@ -6568,6 +6559,15 @@ Octopus.Client.Model.Endpoints
     String AccountId { get; set; }
     String AuthenticationType { get; }
   }
+  class KubernetesTentacleEndpointResource
+    Octopus.Client.Extensibility.IResource
+    Octopus.Client.Model.IAuditedResource
+    Octopus.Client.Model.Endpoints.EndpointResource
+  {
+    .ctor(Octopus.Client.Model.Endpoints.TentacleEndpointConfigurationResource)
+    Octopus.Client.Model.CommunicationStyle CommunicationStyle { get; }
+    Octopus.Client.Model.Endpoints.TentacleEndpointConfigurationResource TentacleEndpointConfiguration { get; set; }
+  }
   class ListeningTentacleEndpointConfigurationResource
     Octopus.Client.Model.Endpoints.ITentacleEndpointResource
     Octopus.Client.Model.Endpoints.IListeningTentacleEndpointResource

diff --git a/.../PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/.../PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt
@@ -2409,7 +2409,7 @@ Octopus.Client.Model
       AzureServiceFabricCluster = 8
       Kubernetes = 9
       StepPackage = 10
-      KubernetesAgent = 11
+      KubernetesTentacle = 11
   }
   class CommunityActionTemplateResource
     Octopus.Client.Extensibility.IResource
@@ -6508,15 +6508,6 @@ Octopus.Client.Model.Endpoints
     String Thumbprint { get; set; }
     String Uri { get; set; }
   }
-  class KubernetesAgentEndpointResource
-    Octopus.Client.Extensibility.IResource
-    Octopus.Client.Model.IAuditedResource
-    Octopus.Client.Model.Endpoints.EndpointResource
-  {
-    .ctor(Octopus.Client.Model.Endpoints.TentacleEndpointConfigurationResource)
-    Octopus.Client.Model.CommunicationStyle CommunicationStyle { get; }
-    Octopus.Client.Model.Endpoints.TentacleEndpointConfigurationResource TentacleEndpointConfiguration { get; set; }
-  }
   class KubernetesAwsAuthenticationResource
     Octopus.Client.Model.Endpoints.IEndpointWithMultipleAuthenticationResource
     Octopus.Client.Model.Endpoints.KubernetesStandardAccountAuthenticationResource
@@ -6592,6 +6583,15 @@ Octopus.Client.Model.Endpoints
     String AccountId { get; set; }
     String AuthenticationType { get; }
   }
+  class KubernetesTentacleEndpointResource
+    Octopus.Client.Extensibility.IResource
+    Octopus.Client.Model.IAuditedResource
+    Octopus.Client.Model.Endpoints.EndpointResource
+  {
+    .ctor(Octopus.Client.Model.Endpoints.TentacleEndpointConfigurationResource)
+    Octopus.Client.Model.CommunicationStyle CommunicationStyle { get; }
+    Octopus.Client.Model.Endpoints.TentacleEndpointConfigurationResource TentacleEndpointConfiguration { get; set; }
+  }
   class ListeningTentacleEndpointConfigurationResource
     Octopus.Client.Model.Endpoints.ITentacleEndpointResource
     Octopus.Client.Model.Endpoints.IListeningTentacleEndpointResource

diff --git a/source/Octopus.Server.Client/Model/CommunicationStyle.cs b/source/Octopus.Server.Client/Model/CommunicationStyle.cs
@@ -33,6 +33,6 @@ [ScriptConsoleSupported] [SupportedAccountTypes(AccountType.SshKeyPair, AccountT
 
         StepPackage = 10,
 
-        [ScriptConsoleSupported] KubernetesAgent = 11
+        [ScriptConsoleSupported] KubernetesTentacle = 11
     }
 }
diff --git a/...points/KubernetesAgentEndpointResource.cs → ...nts/KubernetesTentacleEndpointResource.cs b/...points/KubernetesAgentEndpointResource.cs → ...nts/KubernetesTentacleEndpointResource.cs
@@ -1,14 +1,14 @@
 namespace Octopus.Client.Model.Endpoints;
 
-public class KubernetesAgentEndpointResource : EndpointResource
+public class KubernetesTentacleEndpointResource : EndpointResource
 {
-    public override CommunicationStyle CommunicationStyle => CommunicationStyle.KubernetesAgent;
+    public override CommunicationStyle CommunicationStyle => CommunicationStyle.KubernetesTentacle;
 
-    protected KubernetesAgentEndpointResource()
+    protected KubernetesTentacleEndpointResource()
     {
     }
 
-    public KubernetesAgentEndpointResource(TentacleEndpointConfigurationResource tentacleEndpointConfiguration)
+    public KubernetesTentacleEndpointResource(TentacleEndpointConfigurationResource tentacleEndpointConfiguration)
     {
         TentacleEndpointConfiguration = tentacleEndpointConfiguration;
     }

diff --git a/source/Octopus.Server.Client/Operations/RegisterKubernetesClusterOperation.cs b/source/Octopus.Server.Client/Operations/RegisterKubernetesClusterOperation.cs
@@ -17,9 +17,9 @@ protected override EndpointResource GenerateEndpoint(string proxyId)
     {
         return CommunicationStyle switch
         {
-            CommunicationStyle.TentaclePassive => new KubernetesAgentEndpointResource(
+            CommunicationStyle.TentaclePassive => new KubernetesTentacleEndpointResource(
                 new ListeningTentacleEndpointConfigurationResource(TentacleThumbprint, GetListeningUri()) { ProxyId = proxyId }),
-            CommunicationStyle.TentacleActive => new KubernetesAgentEndpointResource(
+            CommunicationStyle.TentacleActive => new KubernetesTentacleEndpointResource(
                 new PollingTentacleEndpointConfigurationResource(TentacleThumbprint, SubscriptionId.ToString())),
             _ => null
         };

diff --git a/source/Octopus.Server.Client/Serialization/EndpointConverter.cs b/source/Octopus.Server.Client/Serialization/EndpointConverter.cs
@@ -23,7 +23,7 @@ public class EndpointConverter : InheritedClassConverter<EndpointResource, Commu
                 {CommunicationStyle.Kubernetes, typeof (KubernetesEndpointResource)},
                 {CommunicationStyle.AzureServiceFabricCluster, typeof(ServiceFabricEndpointResource)},
                 {CommunicationStyle.StepPackage, typeof(StepPackageEndpointResource)},
-                {CommunicationStyle.KubernetesAgent, typeof(KubernetesEndpointResource)}
+                {CommunicationStyle.KubernetesTentacle, typeof(KubernetesEndpointResource)}
           };
 
         protected override IDictionary<CommunicationStyle, Type> DerivedTypeMappings => EndpointTypes;