Skip to content

Commit

Permalink
Inline method
Browse files Browse the repository at this point in the history
  • Loading branch information
@drewnoakes
drewnoakes committed Dec 8, 2023
1 parent 75fd0a4 commit caac146
Showing 1 changed file with 12 additions and 17 deletions.
29 changes: 12 additions & 17 deletions src/Aspire.Hosting/Dashboard/KubernetesDataSource.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ internal sealed class KubernetesDataSource
{
private readonly KubernetesService _kubernetesService;
private readonly DistributedApplicationModel _applicationModel;
private readonly Func<ResourceViewModel, ObjectChangeType, ValueTask> _callback;
private readonly Func<ResourceViewModel, ObjectChangeType, ValueTask> _onResourceChanged;
private readonly CancellationToken _cancellationToken;
private readonly ILogger _logger;

Expand All @@ -40,12 +40,12 @@ public KubernetesDataSource(
KubernetesService kubernetesService,
DistributedApplicationModel applicationModel,
ILoggerFactory loggerFactory,
Func<ResourceViewModel, ObjectChangeType, ValueTask> callback,
Func<ResourceViewModel, ObjectChangeType, ValueTask> onResourceChanged,
CancellationToken cancellationToken)
{
_kubernetesService = kubernetesService;
_applicationModel = applicationModel;
_callback = callback;
_onResourceChanged = onResourceChanged;
_cancellationToken = cancellationToken;

_logger = loggerFactory.CreateLogger<ResourceService>();
Expand Down Expand Up @@ -130,7 +130,7 @@ private async Task ProcessContainerChange(WatchEventType watchEventType, Contain

var containerViewModel = ConvertToContainerViewModel(container, extraEnvVars);

await WriteChange(containerViewModel, objectChangeType).ConfigureAwait(false);
await _onResourceChanged(containerViewModel, objectChangeType).ConfigureAwait(false);
}

private async Task ProcessExecutableChange(WatchEventType watchEventType, Executable executable)
Expand All @@ -145,7 +145,7 @@ private async Task ProcessExecutableChange(WatchEventType watchEventType, Execut
var objectChangeType = ToObjectChangeType(watchEventType);
var executableViewModel = ConvertToExecutableViewModel(executable);

await WriteChange(executableViewModel, objectChangeType).ConfigureAwait(false);
await _onResourceChanged(executableViewModel, objectChangeType).ConfigureAwait(false);
}

private async Task ProcessProjectChange(WatchEventType watchEventType, Executable executable)
Expand All @@ -160,7 +160,7 @@ private async Task ProcessProjectChange(WatchEventType watchEventType, Executabl
var objectChangeType = ToObjectChangeType(watchEventType);
var projectViewModel = ConvertToProjectViewModel(executable);

await WriteChange(projectViewModel, objectChangeType).ConfigureAwait(false);
await _onResourceChanged(projectViewModel, objectChangeType).ConfigureAwait(false);
}

private async Task ProcessEndpointChange(WatchEventType watchEventType, Endpoint endpoint)
Expand All @@ -186,7 +186,7 @@ private async Task ProcessEndpointChange(WatchEventType watchEventType, Endpoint
var extraEnvVars = GetContainerEnvVars(container.Status?.ContainerId);
var containerViewModel = ConvertToContainerViewModel(container, extraEnvVars);

await WriteChange(containerViewModel).ConfigureAwait(false);
await _onResourceChanged(containerViewModel, ObjectChangeType.Modified).ConfigureAwait(false);
}
break;

Expand All @@ -198,14 +198,14 @@ private async Task ProcessEndpointChange(WatchEventType watchEventType, Endpoint
// Project
var projectViewModel = ConvertToProjectViewModel(executable);

await WriteChange(projectViewModel).ConfigureAwait(false);
await _onResourceChanged(projectViewModel, ObjectChangeType.Modified).ConfigureAwait(false);
}
else
{
// Executable
var executableViewModel = ConvertToExecutableViewModel(executable);

await WriteChange(executableViewModel).ConfigureAwait(false);
await _onResourceChanged(executableViewModel, ObjectChangeType.Modified).ConfigureAwait(false);
}
}
break;
Expand All @@ -230,7 +230,7 @@ private async Task ProcessServiceChange(WatchEventType watchEventType, Service s
var extraEnvVars = GetContainerEnvVars(container.Status?.ContainerId);
var containerViewModel = ConvertToContainerViewModel(container, extraEnvVars);

await WriteChange(containerViewModel).ConfigureAwait(false);
await _onResourceChanged(containerViewModel, ObjectChangeType.Modified).ConfigureAwait(false);
}
break;

Expand All @@ -242,26 +242,21 @@ private async Task ProcessServiceChange(WatchEventType watchEventType, Service s
// Project
var projectViewModel = ConvertToProjectViewModel(executable);

await WriteChange(projectViewModel).ConfigureAwait(false);
await _onResourceChanged(projectViewModel, ObjectChangeType.Modified).ConfigureAwait(false);
}
else
{
// Executable
var executableViewModel = ConvertToExecutableViewModel(executable);

await WriteChange(executableViewModel).ConfigureAwait(false);
await _onResourceChanged(executableViewModel, ObjectChangeType.Modified).ConfigureAwait(false);
}
}
break;
}
}
}

private ValueTask WriteChange(ResourceViewModel resourceViewModel, ObjectChangeType changeType = ObjectChangeType.Modified)
{
return _callback(resourceViewModel, changeType);
}

private ContainerViewModel ConvertToContainerViewModel(Container container, List<EnvVar>? additionalEnvVars)
{
var model = new ContainerViewModel
Expand Down

0 comments on commit caac146

Please sign in to comment.