Skip to content

Remove custom JsonStreamConfigurationProvider/Source #1576

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

Merged
bart-vmware merged 1 commit into from
Aug 25, 2025
Merged

Remove custom JsonStreamConfigurationProvider/Source #1576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions src/Configuration/src/CloudFoundry/CloudFoundryConfigurationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information.

using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Json;

namespace Steeltoe.Configuration.CloudFoundry;

Expand Down Expand Up @@ -68,7 +69,12 @@ private void Process()
{
using Stream stream = GetStream(applicationJson);
var builder = new ConfigurationBuilder();
builder.Add(new JsonStreamConfigurationSource(stream));

builder.Add(new JsonStreamConfigurationSource
{
Stream = stream
});

IConfigurationRoot applicationData = builder.Build();

LoadData("vcap:application", applicationData.GetChildren(), data);
Expand All @@ -85,7 +91,12 @@ private void Process()
{
using Stream stream = GetStream(servicesJson);
var builder = new ConfigurationBuilder();
builder.Add(new JsonStreamConfigurationSource(stream));

builder.Add(new JsonStreamConfigurationSource
{
Stream = stream
});

IConfigurationRoot servicesData = builder.Build();

LoadData("vcap:services", servicesData.GetChildren(), data);
Expand Down
25 changes: 0 additions & 25 deletions src/Configuration/src/CloudFoundry/JsonStreamConfigurationProvider.cs
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/Configuration/src/CloudFoundry/JsonStreamConfigurationSource.cs
View file
Open in desktop

This file was deleted.

8 changes: 7 additions & 1 deletion ...ation/src/CloudFoundry/ServiceBindings/CloudFoundryServiceBindingConfigurationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information.

using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Json;

namespace Steeltoe.Configuration.CloudFoundry.ServiceBindings;

Expand Down Expand Up @@ -41,7 +42,12 @@ private static IConfigurationRoot BuildConfiguration(string json)
{
using MemoryStream stream = GetStream(json);
var builder = new ConfigurationBuilder();
builder.Add(new JsonStreamConfigurationSource(stream));

builder.Add(new JsonStreamConfigurationSource
{
Stream = stream
});

return builder.Build();
}

Expand Down
25 changes: 0 additions & 25 deletions src/Configuration/src/CloudFoundry/ServiceBindings/JsonStreamConfigurationProvider.cs
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/Configuration/src/CloudFoundry/ServiceBindings/JsonStreamConfigurationSource.cs
View file
Open in desktop

This file was deleted.

146 changes: 146 additions & 0 deletions src/Configuration/test/CloudFoundry.Test/CloudfoundryConfigurationProviderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Json;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Steeltoe.Common.TestResources;
Expand Down Expand Up @@ -322,6 +323,151 @@ public async Task ForwardedHeadersMiddleware_uses_customized_options_when_runnin
await host.StopAsync(TestContext.Current.CancellationToken);
}

[Fact]
public void Loads_VCAP_APPLICATION_from_stream()
{
const string environment = """
{
"application_id": "fa05c1a9-0fc1-4fbd-bae1-139850dec7a3",
"application_name": "my-app",
"application_uris": ["my-app.10.244.0.34.xip.io"],
"application_version": "fb8fbcc6-8d58-479e-bcc7-3b4ce5a7f0ca",
"limits": {
"disk": 1024,
"fds": 16384,
"mem": 256
},
"name": "my-app",
"space_id": "06450c72-4669-4dc6-8096-45f9777db68a",
"space_name": "my-space",
"uris": [
"my-app.10.244.0.34.xip.io",
"my-app2.10.244.0.34.xip.io"
],
"users": null,
"version": "fb8fbcc6-8d58-479e-bcc7-3b4ce5a7f0ca"
}
""";

using Stream stream = CloudFoundryConfigurationProvider.GetStream(environment);

var source = new JsonStreamConfigurationSource
{
Stream = stream
};

var builder = new ConfigurationBuilder();
builder.Add(source);
IConfigurationRoot root = builder.Build();

root["application_id"].Should().Be("fa05c1a9-0fc1-4fbd-bae1-139850dec7a3");
root["limits:disk"].Should().Be("1024");
root["uris:0"].Should().Be("my-app.10.244.0.34.xip.io");
root["uris:1"].Should().Be("my-app2.10.244.0.34.xip.io");
}

[Fact]
public void Loads_VCAP_SERVICES_from_stream()
{
const string environment = """
{
"p-config-server": [{
"name": "myConfigServer",
"label": "p-config-server",
"tags": [
"configuration",
"spring-cloud"
],
"plan": "standard",
"credentials": {
"uri": "https://config-eafc353b-77e2-4dcc-b52a-25777e996ed9.apps.test-cloud.com",
"client_id": "p-config-server-9bff4c87-7ffd-4536-9e76-e67ea3ec81d0",
"client_secret": "AJUAjyxP3nO9",
"access_token_uri": "https://p-spring-cloud-services.uaa.system.test-cloud.com/oauth/token"
}
}],
"p-service-registry": [{
"name": "myServiceRegistry",
"label": "p-service-registry",
"tags": [
"eureka",
"discovery",
"registry",
"spring-cloud"
],
"plan": "standard",
"credentials": {
"uri": "https://eureka-f4b98d1c-3166-4741-b691-79abba5b2d51.apps.test-cloud.com",
"client_id": "p-service-registry-9121b185-cd3b-497c-99f7-8e8064d4a6f0",
"client_secret": "3Rv1U79siLDa",
"access_token_uri": "https://p-spring-cloud-services.uaa.system.test-cloud.com/oauth/token"
}
}],
"p-mysql": [{
"name": "mySql1",
"label": "p-mysql",
"tags": [
"mysql",
"relational"
],
"plan": "100mb-dev",
"credentials": {
"hostname": "192.168.0.97",
"port": 3306,
"name": "cf_0f5dda44_e678_4727_993f_30e6d455cc31",
"username": "9vD0Mtk3wFFuaaaY",
"password": "Cjn4HsAiKV8sImst",
"uri": "mysql://9vD0Mtk3wFFuaaaY:Cjn4HsAiKV8sImst@192.168.0.97:3306/cf_0f5dda44_e678_4727_993f_30e6d455cc31?reconnect=true",
"jdbcUrl": "jdbc:mysql://192.168.0.97:3306/cf_0f5dda44_e678_4727_993f_30e6d455cc31?user=9vD0Mtk3wFFuaaaY&password=Cjn4HsAiKV8sImst"
}
},
{
"name": "mySql2",
"label": "p-mysql",
"tags": ["mysql","relational"],
"plan": "100mb-dev",
"credentials": {
"hostname": "192.168.0.97",
"port": 3306,
"name": "cf_b2d83697_5fa1_4a51_991b_975c9d7e5515",
"username": "gxXQb2pMbzFsZQW8",
"password": "lvMkGf6oJQvKSOwn",
"uri": "mysql://gxXQb2pMbzFsZQW8:lvMkGf6oJQvKSOwn@192.168.0.97:3306/cf_b2d83697_5fa1_4a51_991b_975c9d7e5515?reconnect=true",
"jdbcUrl": "jdbc:mysql://192.168.0.97:3306/cf_b2d83697_5fa1_4a51_991b_975c9d7e5515?user=gxXQb2pMbzFsZQW8&password=lvMkGf6oJQvKSOwn"
}
}]
}
""";

using Stream stream = CloudFoundryConfigurationProvider.GetStream(environment);

var source = new JsonStreamConfigurationSource
{
Stream = stream
};

var provider = new JsonStreamConfigurationProvider(source);
provider.Load();

provider.TryGet("p-config-server:0:name", out string? value).Should().BeTrue();
value.Should().Be("myConfigServer");

provider.TryGet("p-config-server:0:credentials:uri", out value).Should().BeTrue();
value.Should().Be("https://config-eafc353b-77e2-4dcc-b52a-25777e996ed9.apps.test-cloud.com");

provider.TryGet("p-service-registry:0:name", out value).Should().BeTrue();
value.Should().Be("myServiceRegistry");

provider.TryGet("p-service-registry:0:credentials:uri", out value).Should().BeTrue();
value.Should().Be("https://eureka-f4b98d1c-3166-4741-b691-79abba5b2d51.apps.test-cloud.com");

provider.TryGet("p-mysql:1:name", out value).Should().BeTrue();
value.Should().Be("mySql2");

provider.TryGet("p-mysql:1:credentials:uri", out value).Should().BeTrue();
value.Should().Be("mysql://gxXQb2pMbzFsZQW8:lvMkGf6oJQvKSOwn@192.168.0.97:3306/cf_b2d83697_5fa1_4a51_991b_975c9d7e5515?reconnect=true");
}

private sealed class VcapApp
{
#pragma warning disable S3459 // Unassigned members should be removed
Expand Down
Loading