From d099b79dba20ba356dc7decf084f527153e0d490 Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Mon, 25 Mar 2024 16:20:37 +1100
Subject: [PATCH] WIP

---
 .../AzurePostgresExtensions.cs                         |  1 -
 src/Aspire.Hosting/Dcp/KubernetesService.cs            | 10 ++++++----
 .../TestProject.IntegrationServiceA/appsettings.json   |  3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Aspire.Hosting.Azure.PostgreSql/AzurePostgresExtensions.cs b/src/Aspire.Hosting.Azure.PostgreSql/AzurePostgresExtensions.cs
index 056d70ca7e..8d8d1f6258 100644
--- a/src/Aspire.Hosting.Azure.PostgreSql/AzurePostgresExtensions.cs
+++ b/src/Aspire.Hosting.Azure.PostgreSql/AzurePostgresExtensions.cs
@@ -91,7 +91,6 @@ internal static IResourceBuilder<PostgresServerResource> PublishAsAzurePostgresF
 
         var resource = new AzurePostgresResource(builder.Resource, configureConstruct);
         var resourceBuilder = builder.ApplicationBuilder.CreateResourceBuilder(resource)
-                                                        .WithParameter(AzureBicepResource.KnownParameters.PrincipalId)
                                                         .WithParameter(AzureBicepResource.KnownParameters.KeyVaultName)
                                                         .WithManifestPublishingCallback(resource.WriteToManifest)
                                                         .WithLoginAndPassword(builder.Resource);
diff --git a/src/Aspire.Hosting/Dcp/KubernetesService.cs b/src/Aspire.Hosting/Dcp/KubernetesService.cs
index a99014b8f8..817f7b5c7f 100644
--- a/src/Aspire.Hosting/Dcp/KubernetesService.cs
+++ b/src/Aspire.Hosting/Dcp/KubernetesService.cs
@@ -8,6 +8,7 @@
 using k8s.Exceptions;
 using k8s.Models;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Polly;
 using Polly.Retry;
 
@@ -42,7 +43,7 @@ Task<Stream> GetLogStreamAsync<T>(
         CancellationToken cancellationToken = default) where T : CustomResource;
 }
 
-internal sealed class KubernetesService(ILogger<KubernetesService> logger, DcpOptions dcpOptions, Locations locations) : IKubernetesService, IDisposable
+internal sealed class KubernetesService(ILogger<KubernetesService> logger, IOptions<DcpOptions> dcpOptions, Locations locations) : IKubernetesService, IDisposable
 {
     private static readonly TimeSpan s_initialRetryDelay = TimeSpan.FromMilliseconds(100);
     private static GroupVersion GroupVersion => Model.Dcp.GroupVersion;
@@ -309,8 +310,8 @@ private void EnsureKubernetes()
             {
                 ShouldHandle = new PredicateBuilder().Handle<IOException>(e => e.Message.StartsWith("The process cannot access the file")),
                 BackoffType = DelayBackoffType.Constant,
-                MaxRetryAttempts = dcpOptions.KubernetesConfigReadRetryCount,
-                MaxDelay = TimeSpan.FromSeconds(dcpOptions.KubernetesConfigReadRetryIntervalSeconds),
+                MaxRetryAttempts = dcpOptions.Value.KubernetesConfigReadRetryCount,
+                MaxDelay = TimeSpan.FromSeconds(dcpOptions.Value.KubernetesConfigReadRetryIntervalSeconds),
                 OnRetry = (retry) =>
                 {
                     logger.LogDebug(
@@ -326,10 +327,11 @@ private void EnsureKubernetes()
 
             pipeline.Execute(() =>
             {
+                logger.LogDebug("Reading Kubernetes configuration from '{DcpKubeconfigPath}' on thread {ThreadId}.", locations.DcpKubeconfigPath, Environment.CurrentManagedThreadId);
                 var config = KubernetesClientConfiguration.BuildConfigFromConfigFile(kubeconfigPath: locations.DcpKubeconfigPath, useRelativePaths: false);
+                logger.LogDebug("Successfully read Kubernetes configuration from '{DcpKubeconfigPath}'.", locations.DcpKubeconfigPath);
                 _kubernetes = new DcpKubernetesClient(config);
             });
-
         }
     }
 }
diff --git a/tests/testproject/TestProject.IntegrationServiceA/appsettings.json b/tests/testproject/TestProject.IntegrationServiceA/appsettings.json
index 10f68b8c8b..ed7831892b 100644
--- a/tests/testproject/TestProject.IntegrationServiceA/appsettings.json
+++ b/tests/testproject/TestProject.IntegrationServiceA/appsettings.json
@@ -2,7 +2,8 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning",
+      "Aspire.Hosting.Dcp": "Debug"
     }
   },
   "AllowedHosts": "*"