Skip to content

Commit fbd1dbe

Browse files
APErebusOctobob
authored andcommitted
Changed ObservabilityRepository.GetResourceManifest to ObservabilityRepository.GetLiveKubernetesResourceManifest in preparation for live Argo CD resources
+semver: breaking GitOrigin-RevId: 318c8943e99bae6d420295b445aba08afaa0631b
1 parent 32797ef commit fbd1dbe

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7963,6 +7963,15 @@ Octopus.Client.Model.Observability.LiveStatus
79637963
String Label { get; set; }
79647964
String Uri { get; set; }
79657965
}
7966+
class GetLiveKubernetesResourceManifestRequest
7967+
{
7968+
.ctor()
7969+
Guid DesiredOrKubernetesMonitoredResourceId { get; set; }
7970+
String EnvironmentId { get; set; }
7971+
String ProjectId { get; set; }
7972+
String SourceId { get; set; }
7973+
String TenantId { get; set; }
7974+
}
79667975
class GetLiveKubernetesResourceRequest
79677976
{
79687977
.ctor()
@@ -7986,15 +7995,6 @@ Octopus.Client.Model.Observability.LiveStatus
79867995
IReadOnlyCollection<KubernetesMachineLiveStatusResource> MachineStatuses { get; set; }
79877996
Octopus.Client.Model.Observability.LiveStatus.LiveStatusSummaryResource Summary { get; set; }
79887997
}
7989-
class GetResourceManifestRequest
7990-
{
7991-
.ctor()
7992-
Guid DesiredOrKubernetesMonitoredResourceId { get; set; }
7993-
String EnvironmentId { get; set; }
7994-
String MachineId { get; set; }
7995-
String ProjectId { get; set; }
7996-
String TenantId { get; set; }
7997-
}
79987998
class GetResourceManifestResponse
79997999
{
80008000
.ctor()
@@ -9268,8 +9268,8 @@ Octopus.Client.Repositories
92689268
Octopus.Client.Model.Observability.LiveStatus.GetLiveStatusResponse Get(Octopus.Client.Model.Observability.LiveStatus.GetLiveStatusRequest)
92699269
Octopus.Client.Model.Observability.ContainerLogs.GetContainerLogsResponse GetContainerLogs(Octopus.Client.Model.Observability.ContainerLogs.GetContainerLogsRequest)
92709270
Octopus.Client.Model.Observability.LiveStatus.GetResourceResponse GetLiveKubernetesResource(Octopus.Client.Model.Observability.LiveStatus.GetLiveKubernetesResourceRequest)
9271+
Octopus.Client.Model.Observability.LiveStatus.GetResourceManifestResponse GetLiveKubernetesResourceManifest(Octopus.Client.Model.Observability.LiveStatus.GetLiveKubernetesResourceManifestRequest)
92719272
Octopus.Client.Model.Observability.ResourceEvents.GetResourceEventsResponse GetResourceEvents(Octopus.Client.Model.Observability.ResourceEvents.GetResourceEventsRequest)
9272-
Octopus.Client.Model.Observability.LiveStatus.GetResourceManifestResponse GetResourceManifest(Octopus.Client.Model.Observability.LiveStatus.GetResourceManifestRequest)
92739273
}
92749274
interface IOctopusServerNodeRepository
92759275
Octopus.Client.Repositories.IModify<OctopusServerNodeResource>
@@ -9694,8 +9694,8 @@ Octopus.Client.Repositories
96949694
Octopus.Client.Model.Observability.LiveStatus.GetLiveStatusResponse Get(Octopus.Client.Model.Observability.LiveStatus.GetLiveStatusRequest)
96959695
Octopus.Client.Model.Observability.ContainerLogs.GetContainerLogsResponse GetContainerLogs(Octopus.Client.Model.Observability.ContainerLogs.GetContainerLogsRequest)
96969696
Octopus.Client.Model.Observability.LiveStatus.GetResourceResponse GetLiveKubernetesResource(Octopus.Client.Model.Observability.LiveStatus.GetLiveKubernetesResourceRequest)
9697+
Octopus.Client.Model.Observability.LiveStatus.GetResourceManifestResponse GetLiveKubernetesResourceManifest(Octopus.Client.Model.Observability.LiveStatus.GetLiveKubernetesResourceManifestRequest)
96979698
Octopus.Client.Model.Observability.ResourceEvents.GetResourceEventsResponse GetResourceEvents(Octopus.Client.Model.Observability.ResourceEvents.GetResourceEventsRequest)
9698-
Octopus.Client.Model.Observability.LiveStatus.GetResourceManifestResponse GetResourceManifest(Octopus.Client.Model.Observability.LiveStatus.GetResourceManifestRequest)
96999699
}
97009700
class PerformanceConfigurationRepository
97019701
Octopus.Client.Repositories.IPerformanceConfigurationRepository
@@ -10123,8 +10123,8 @@ Octopus.Client.Repositories.Async
1012310123
Task<GetLiveStatusResponse> Get(Octopus.Client.Model.Observability.LiveStatus.GetLiveStatusRequest, CancellationToken)
1012410124
Task<GetContainerLogsResponse> GetContainerLogs(Octopus.Client.Model.Observability.ContainerLogs.GetContainerLogsRequest, CancellationToken)
1012510125
Task<GetResourceResponse> GetLiveKubernetesResource(Octopus.Client.Model.Observability.LiveStatus.GetLiveKubernetesResourceRequest, CancellationToken)
10126+
Task<GetResourceManifestResponse> GetLiveKubernetesResourceManifest(Octopus.Client.Model.Observability.LiveStatus.GetLiveKubernetesResourceManifestRequest, CancellationToken)
1012610127
Task<GetResourceEventsResponse> GetResourceEvents(Octopus.Client.Model.Observability.ResourceEvents.GetResourceEventsRequest, CancellationToken)
10127-
Task<GetResourceManifestResponse> GetResourceManifest(Octopus.Client.Model.Observability.LiveStatus.GetResourceManifestRequest, CancellationToken)
1012810128
}
1012910129
interface IOctopusServerNodeRepository
1013010130
Octopus.Client.Repositories.Async.IModify<OctopusServerNodeResource>
@@ -10626,8 +10626,8 @@ Octopus.Client.Repositories.Async
1062610626
Task<GetLiveStatusResponse> Get(Octopus.Client.Model.Observability.LiveStatus.GetLiveStatusRequest, CancellationToken)
1062710627
Task<GetContainerLogsResponse> GetContainerLogs(Octopus.Client.Model.Observability.ContainerLogs.GetContainerLogsRequest, CancellationToken)
1062810628
Task<GetResourceResponse> GetLiveKubernetesResource(Octopus.Client.Model.Observability.LiveStatus.GetLiveKubernetesResourceRequest, CancellationToken)
10629+
Task<GetResourceManifestResponse> GetLiveKubernetesResourceManifest(Octopus.Client.Model.Observability.LiveStatus.GetLiveKubernetesResourceManifestRequest, CancellationToken)
1062910630
Task<GetResourceEventsResponse> GetResourceEvents(Octopus.Client.Model.Observability.ResourceEvents.GetResourceEventsRequest, CancellationToken)
10630-
Task<GetResourceManifestResponse> GetResourceManifest(Octopus.Client.Model.Observability.LiveStatus.GetResourceManifestRequest, CancellationToken)
1063110631
}
1063210632
class SpaceDefaultRetentionPolicyRepository
1063310633
Octopus.Client.Repositories.Async.ISpaceDefaultRetentionPolicyRepository

source/Octopus.Server.Client/Model/Observability/LiveStatus/GetResourceManifestRequest.cs renamed to source/Octopus.Server.Client/Model/Observability/LiveStatus/GetLiveKubernetesResourceManifestRequest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Octopus.Client.Model.Observability.LiveStatus;
55

6-
public class GetResourceManifestRequest
6+
public class GetLiveKubernetesResourceManifestRequest
77
{
88
[Required]
99
public string ProjectId { get; set; }
@@ -14,8 +14,8 @@ public class GetResourceManifestRequest
1414
public string TenantId { get; set; }
1515

1616
[Required]
17-
public string MachineId { get; set; }
17+
public string SourceId { get; set; }
1818

1919
[Required]
2020
public Guid DesiredOrKubernetesMonitoredResourceId { get; set; }
21-
}
21+
}

source/Octopus.Server.Client/Repositories/Async/ObservabilityRepository.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ public interface IObservabilityRepository
1212
Task<GetLiveStatusResponse> Get(GetLiveStatusRequest request, CancellationToken cancellationToken);
1313
Task<GetResourceResponse> GetLiveKubernetesResource(GetLiveKubernetesResourceRequest request, CancellationToken cancellationToken);
1414

15-
Task<GetResourceManifestResponse> GetResourceManifest(
16-
GetResourceManifestRequest request,
15+
Task<GetResourceManifestResponse> GetLiveKubernetesResourceManifest(
16+
GetLiveKubernetesResourceManifestRequest request,
1717
CancellationToken cancellationToken);
1818

1919
Task<BeginContainerLogsSessionResponse> BeginContainerLogsSession(
@@ -55,13 +55,13 @@ public async Task<GetResourceResponse> GetLiveKubernetesResource(GetLiveKubernet
5555
return await repository.Client.Get<GetResourceResponse>(link, request, cancellationToken).ConfigureAwait(false);
5656
}
5757

58-
public async Task<GetResourceManifestResponse> GetResourceManifest(
59-
GetResourceManifestRequest request,
58+
public async Task<GetResourceManifestResponse> GetLiveKubernetesResourceManifest(
59+
GetLiveKubernetesResourceManifestRequest request,
6060
CancellationToken cancellationToken)
6161
{
6262
var link = string.IsNullOrWhiteSpace(request.TenantId)
63-
? await repository.Link("ResourceManifest").ConfigureAwait(false)
64-
: await repository.Link("TenantedResourceManifest").ConfigureAwait(false);
63+
? await repository.Link("KubernetesResourceManifest").ConfigureAwait(false)
64+
: await repository.Link("TenantedKubernetesResourceManifest").ConfigureAwait(false);
6565

6666
return await repository.Client.Get<GetResourceManifestResponse>(link, request, cancellationToken);
6767
}

source/Octopus.Server.Client/Repositories/ObservabilityRepository.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public interface IObservabilityRepository
1010
{
1111
GetLiveStatusResponse Get(GetLiveStatusRequest request);
1212
GetResourceResponse GetLiveKubernetesResource(GetLiveKubernetesResourceRequest request);
13-
GetResourceManifestResponse GetResourceManifest(GetResourceManifestRequest request);
13+
GetResourceManifestResponse GetLiveKubernetesResourceManifest(GetLiveKubernetesResourceManifestRequest request);
1414
BeginContainerLogsSessionResponse BeginContainerLogsSession(BeginContainerLogsSessionCommand command);
1515
GetContainerLogsResponse GetContainerLogs(GetContainerLogsRequest request);
1616
BeginResourceEventsSessionResponse BeginResourceEventsSession(BeginResourceEventsSessionCommand command);
@@ -38,11 +38,11 @@ public GetResourceResponse GetLiveKubernetesResource(GetLiveKubernetesResourceRe
3838
return repository.Client.Get<GetResourceResponse>(link, request);
3939
}
4040

41-
public GetResourceManifestResponse GetResourceManifest(GetResourceManifestRequest request)
41+
public GetResourceManifestResponse GetLiveKubernetesResourceManifest(GetLiveKubernetesResourceManifestRequest request)
4242
{
4343
var link = string.IsNullOrWhiteSpace(request.TenantId)
44-
? repository.Link("ResourceManifest")
45-
: repository.Link("TenantedResourceManifest");
44+
? repository.Link("KubernetesResourceManifest")
45+
: repository.Link("TenantedKubernetesResourceManifest");
4646

4747
return repository.Client.Get<GetResourceManifestResponse>(link, request);
4848
}

0 commit comments

Comments
 (0)