Skip to content

Commit 662a92e

Browse files
bart-vmwarebart-vmware
committed
Centralize "appsettings.json" constant
1 parent fbdf746 commit 662a92e

27 files changed

+106
-130
lines changed

‎src/Common/test/Common.Test/ApplicationInstanceInfoTest.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Microsoft.Extensions.Configuration;
77
using Microsoft.Extensions.DependencyInjection;
88
using Steeltoe.Common.Extensions;
9+
using Steeltoe.Common.TestResources;
910
using Steeltoe.Common.TestResources.IO;
1011

1112
namespace Steeltoe.Common.Test;
@@ -34,7 +35,7 @@ public async Task ReadsApplicationConfiguration()
3435
""";
3536

3637
using var sandbox = new Sandbox();
37-
string path = sandbox.CreateFile("appsettings.json", configJson);
38+
string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, configJson);
3839
string directory = Path.GetDirectoryName(path)!;
3940
string fileName = Path.GetFileName(path);
4041
var builder = new ConfigurationBuilder();

‎src/Common/test/TestResources/MemoryFileProvider.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ namespace Steeltoe.Common.TestResources;
1212

1313
public sealed class MemoryFileProvider : IFileProvider
1414
{
15+
public const string DefaultAppSettingsFileName = "appsettings.json";
16+
1517
private static readonly char[] DirectorySeparators =
1618
[
1719
Path.DirectorySeparatorChar,

‎src/Configuration/test/ConfigServer.Integration.Test/ConfigServerConfigurationExtensionsIntegrationTest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void SpringCloudConfigServer_ReturnsExpectedDefaultData()
4242
""";
4343

4444
using var sandbox = new Sandbox();
45-
string path = sandbox.CreateFile("appsettings.json", appSettings);
45+
string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
4646
string directory = Path.GetDirectoryName(path)!;
4747
string fileName = Path.GetFileName(path);
4848
var configurationBuilder = new ConfigurationBuilder();
@@ -86,7 +86,7 @@ public async Task SpringCloudConfigServer_ReturnsExpectedDefaultData_AsInjectedO
8686
""";
8787

8888
using var sandbox = new Sandbox();
89-
string path = sandbox.CreateFile("appsettings.json", appSettings);
89+
string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
9090
string directory = Path.GetDirectoryName(path)!;
9191
string fileName = Path.GetFileName(path);
9292

@@ -177,7 +177,7 @@ public async Task SpringCloudConfigServer_ConfiguredViaCloudfoundryEnv_ReturnsEx
177177
""";
178178

179179
using var sandbox = new Sandbox();
180-
string path = sandbox.CreateFile("appsettings.json", appSettings);
180+
string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
181181
string directory = Path.GetDirectoryName(path)!;
182182
string fileName = Path.GetFileName(path);
183183

@@ -232,7 +232,7 @@ public void SpringCloudConfigServer_DiscoveryFirst_ReturnsExpectedDefaultData()
232232
""";
233233

234234
using var sandbox = new Sandbox();
235-
string path = sandbox.CreateFile("appsettings.json", appSettings);
235+
string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
236236
string directory = Path.GetDirectoryName(path)!;
237237
string fileName = Path.GetFileName(path);
238238

@@ -276,7 +276,7 @@ public async Task SpringCloudConfigServer_WithHealthEnabled_ReturnsHealth()
276276
""";
277277

278278
using var sandbox = new Sandbox();
279-
string path = sandbox.CreateFile("appsettings.json", appSettings);
279+
string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
280280
string directory = Path.GetDirectoryName(path)!;
281281
string fileName = Path.GetFileName(path);
282282

‎src/Configuration/test/ConfigServer.Test/ConfigServerClientOptionsTest.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Microsoft.Extensions.Configuration;
77
using Microsoft.Extensions.DependencyInjection;
88
using Microsoft.Extensions.Options;
9+
using Steeltoe.Common.TestResources;
910
using Steeltoe.Common.TestResources.IO;
1011

1112
namespace Steeltoe.Configuration.ConfigServer.Test;
@@ -69,7 +70,7 @@ public async Task ConfigureConfigServerClientOptions_WithValues()
6970
""";
7071

7172
using var sandbox = new Sandbox();
72-
string path = sandbox.CreateFile("appsettings.json", appSettings);
73+
string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
7374
string directory = Path.GetDirectoryName(path)!;
7475
string fileName = Path.GetFileName(path);
7576
var builder = new ConfigurationBuilder();

‎src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationBuilderExtensionsCoreTest.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void AddConfigServer_JsonAppSettingsConfiguresClient()
8383
""";
8484

8585
using var sandbox = new Sandbox();
86-
string path = sandbox.CreateFile("appsettings.json", appSettings);
86+
string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
8787
string directory = Path.GetDirectoryName(path)!;
8888
string fileName = Path.GetFileName(path);
8989

@@ -137,7 +137,7 @@ public void AddConfigServer_ValidateCertificates_DisablesCertValidation()
137137
""";
138138

139139
using var sandbox = new Sandbox();
140-
string path = sandbox.CreateFile("appsettings.json", appSettings);
140+
string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
141141
string directory = Path.GetDirectoryName(path)!;
142142
string fileName = Path.GetFileName(path);
143143

@@ -171,7 +171,7 @@ public void AddConfigServer_Validate_Certificates_DisablesCertValidation()
171171
""";
172172

173173
using var sandbox = new Sandbox();
174-
string path = sandbox.CreateFile("appsettings.json", appSettings);
174+
string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
175175
string directory = Path.GetDirectoryName(path)!;
176176
string fileName = Path.GetFileName(path);
177177

@@ -349,7 +349,7 @@ public void AddConfigServer_SubstitutesPlaceholders()
349349
""";
350350

351351
using var sandbox = new Sandbox();
352-
string path = sandbox.CreateFile("appsettings.json", appSettings);
352+
string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
353353

354354
string directory = Path.GetDirectoryName(path)!;
355355
string fileName = Path.GetFileName(path);
@@ -444,7 +444,7 @@ public void AddConfigServer_WithCloudfoundryEnvironment_ConfiguresClientCorrectl
444444
""";
445445

446446
using var sandbox = new Sandbox();
447-
string appSettingsPath = sandbox.CreateFile("appsettings.json", appSettings);
447+
string appSettingsPath = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
448448
string appSettingsFileName = Path.GetFileName(appSettingsPath);
449449

450450
string vcapAppPath = sandbox.CreateFile("vcapapp.json", vcapApplication);
@@ -552,7 +552,7 @@ public void AddConfigServer_WithCloudfoundryEnvironmentSCS3_ConfiguresClientCorr
552552
""";
553553

554554
using var sandbox = new Sandbox();
555-
string appSettingsPath = sandbox.CreateFile("appsettings.json", appSettings);
555+
string appSettingsPath = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
556556
string appSettingsFileName = Path.GetFileName(appSettingsPath);
557557

558558
string vcapAppPath = sandbox.CreateFile("vcapapp.json", vcapApplication);

‎src/Configuration/test/Placeholder.Test/PlaceholderConfigurationTest.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,10 +331,9 @@ public void Throws_on_circular_reference()
331331
[InlineData(3)]
332332
public void Reloads_options_on_change(int placeholderCount)
333333
{
334-
const string fileName = "appsettings.json";
335334
MemoryFileProvider fileProvider = new();
336335

337-
fileProvider.IncludeFile(fileName, """
336+
fileProvider.IncludeFile(MemoryFileProvider.DefaultAppSettingsFileName, """
338337
{
339338
"TestRoot": {
340339
"Value": "valueA"
@@ -343,7 +342,7 @@ public void Reloads_options_on_change(int placeholderCount)
343342
""");
344343

345344
var builder = new ConfigurationBuilder();
346-
builder.AddJsonFile(fileProvider, fileName, false, true);
345+
builder.AddJsonFile(fileProvider, MemoryFileProvider.DefaultAppSettingsFileName, false, true);
347346

348347
#pragma warning disable SA1312 // Variable names should begin with lower-case letter
349348
foreach (int _ in Enumerable.Repeat(0, placeholderCount))
@@ -373,7 +372,7 @@ public void Reloads_options_on_change(int placeholderCount)
373372
_ = optionsMonitor.CurrentValue;
374373
configurer.ConfigureCount.Should().Be(1);
375374

376-
fileProvider.ReplaceFile(fileName, """
375+
fileProvider.ReplaceFile(MemoryFileProvider.DefaultAppSettingsFileName, """
377376
{
378377
"TestRoot": {
379378
"Value": "valueB"

‎src/Configuration/test/Placeholder.Test/PlaceholderWebApplicationTest.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ public async Task Reloads_options_on_change()
3434
}
3535
""";
3636

37-
const string fileName = "appsettings.json";
3837
using var sandbox = new Sandbox();
39-
string path = sandbox.CreateFile(fileName, appSettings);
38+
string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
4039

4140
var memorySettings = new Dictionary<string, string?>
4241
{
@@ -47,7 +46,7 @@ public async Task Reloads_options_on_change()
4746
builder.Services.AddSingleton<ILoggerFactory>(_loggerFactory);
4847
builder.Configuration.SetBasePath(sandbox.FullPath);
4948
builder.Configuration.AddInMemoryCollection(memorySettings);
50-
builder.Configuration.AddJsonFile(fileName, false, true);
49+
builder.Configuration.AddJsonFile(MemoryFileProvider.DefaultAppSettingsFileName, false, true);
5150
builder.Configuration.AddPlaceholderResolver(_loggerFactory);
5251
builder.Services.Configure<TestOptions>(builder.Configuration.GetSection("TestRoot"));
5352
builder.Services.AddSingleton<IConfigureOptions<TestOptions>, ConfigureTestOptions>();

‎src/Connectors/test/Connectors.Test/ConfigurationChangeDetectionTest.cs‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ public async Task Applies_local_configuration_changes_using_WebApplicationBuilde
2020
{
2121
WebApplicationBuilder builder = TestWebApplicationBuilderFactory.Create();
2222

23-
const string fileName = "appsettings.json";
24-
2523
string fileContents = """
2624
{
2725
"Steeltoe": {
@@ -37,9 +35,9 @@ public async Task Applies_local_configuration_changes_using_WebApplicationBuilde
3735
""";
3836

3937
var fileProvider = new MemoryFileProvider();
40-
fileProvider.IncludeFile(fileName, fileContents);
38+
fileProvider.IncludeFile(MemoryFileProvider.DefaultAppSettingsFileName, fileContents);
4139

42-
builder.Configuration.AddJsonFile(fileProvider, fileName, false, true);
40+
builder.Configuration.AddJsonFile(fileProvider, MemoryFileProvider.DefaultAppSettingsFileName, false, true);
4341
builder.AddPostgreSql(configureOptions => configureOptions.DetectConfigurationChanges = true, null);
4442

4543
await using WebApplication app = builder.Build();
@@ -66,7 +64,7 @@ public async Task Applies_local_configuration_changes_using_WebApplicationBuilde
6664
}
6765
""";
6866

69-
fileProvider.ReplaceFile(fileName, fileContents);
67+
fileProvider.ReplaceFile(MemoryFileProvider.DefaultAppSettingsFileName, fileContents);
7068
fileProvider.NotifyChanged();
7169

7270
connectionString = connectorFactory.Get("examplePostgreSqlService").Options.ConnectionString;
@@ -86,7 +84,7 @@ public async Task Applies_local_configuration_changes_using_WebApplicationBuilde
8684
}
8785
""";
8886

89-
fileProvider.ReplaceFile(fileName, fileContents);
87+
fileProvider.ReplaceFile(MemoryFileProvider.DefaultAppSettingsFileName, fileContents);
9088
fileProvider.NotifyChanged();
9189

9290
connectionString = connectorFactory.Get("examplePostgreSqlService").Options.ConnectionString;
@@ -98,8 +96,6 @@ public void Applies_local_configuration_changes_using_WebHostBuilder()
9896
{
9997
WebHostBuilder builder = TestWebHostBuilderFactory.Create();
10098

101-
const string fileName = "appsettings.json";
102-
10399
string fileContents = """
104100
{
105101
"Steeltoe": {
@@ -115,11 +111,11 @@ public void Applies_local_configuration_changes_using_WebHostBuilder()
115111
""";
116112

117113
var fileProvider = new MemoryFileProvider();
118-
fileProvider.IncludeFile(fileName, fileContents);
114+
fileProvider.IncludeFile(MemoryFileProvider.DefaultAppSettingsFileName, fileContents);
119115

120116
builder.ConfigureAppConfiguration(configurationBuilder =>
121117
{
122-
configurationBuilder.AddJsonFile(fileProvider, fileName, false, true);
118+
configurationBuilder.AddJsonFile(fileProvider, MemoryFileProvider.DefaultAppSettingsFileName, false, true);
123119
configurationBuilder.ConfigurePostgreSql(options => options.DetectConfigurationChanges = true);
124120
});
125121

@@ -148,7 +144,7 @@ public void Applies_local_configuration_changes_using_WebHostBuilder()
148144
}
149145
""";
150146

151-
fileProvider.ReplaceFile(fileName, fileContents);
147+
fileProvider.ReplaceFile(MemoryFileProvider.DefaultAppSettingsFileName, fileContents);
152148
fileProvider.NotifyChanged();
153149

154150
connectionString = connectorFactory.Get("examplePostgreSqlService").Options.ConnectionString;
@@ -168,7 +164,7 @@ public void Applies_local_configuration_changes_using_WebHostBuilder()
168164
}
169165
""";
170166

171-
fileProvider.ReplaceFile(fileName, fileContents);
167+
fileProvider.ReplaceFile(MemoryFileProvider.DefaultAppSettingsFileName, fileContents);
172168
fileProvider.NotifyChanged();
173169

174170
connectionString = connectorFactory.Get("examplePostgreSqlService").Options.ConnectionString;
@@ -180,8 +176,6 @@ public void Applies_local_configuration_changes_using_HostBuilder()
180176
{
181177
HostBuilder builder = TestHostBuilderFactory.Create();
182178

183-
const string fileName = "appsettings.json";
184-
185179
string fileContents = """
186180
{
187181
"Steeltoe": {
@@ -197,11 +191,11 @@ public void Applies_local_configuration_changes_using_HostBuilder()
197191
""";
198192

199193
var fileProvider = new MemoryFileProvider();
200-
fileProvider.IncludeFile(fileName, fileContents);
194+
fileProvider.IncludeFile(MemoryFileProvider.DefaultAppSettingsFileName, fileContents);
201195

202196
builder.ConfigureAppConfiguration(configurationBuilder =>
203197
{
204-
configurationBuilder.AddJsonFile(fileProvider, fileName, false, true);
198+
configurationBuilder.AddJsonFile(fileProvider, MemoryFileProvider.DefaultAppSettingsFileName, false, true);
205199
configurationBuilder.ConfigurePostgreSql(options => options.DetectConfigurationChanges = true);
206200
});
207201

@@ -230,7 +224,7 @@ public void Applies_local_configuration_changes_using_HostBuilder()
230224
}
231225
""";
232226

233-
fileProvider.ReplaceFile(fileName, fileContents);
227+
fileProvider.ReplaceFile(MemoryFileProvider.DefaultAppSettingsFileName, fileContents);
234228
fileProvider.NotifyChanged();
235229

236230
connectionString = connectorFactory.Get("examplePostgreSqlService").Options.ConnectionString;
@@ -250,7 +244,7 @@ public void Applies_local_configuration_changes_using_HostBuilder()
250244
}
251245
""";
252246

253-
fileProvider.ReplaceFile(fileName, fileContents);
247+
fileProvider.ReplaceFile(MemoryFileProvider.DefaultAppSettingsFileName, fileContents);
254248
fileProvider.NotifyChanged();
255249

256250
connectionString = connectorFactory.Get("examplePostgreSqlService").Options.ConnectionString;

‎src/Discovery/test/Configuration.Test/ConfigurationDiscoveryClientTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public async Task AddConfigurationDiscoveryClient_AddsClientWithOptions()
121121
""";
122122

123123
using var sandbox = new Sandbox();
124-
string path = sandbox.CreateFile("appsettings.json", appSettings);
124+
string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
125125
string directory = Path.GetDirectoryName(path)!;
126126
string fileName = Path.GetFileName(path);
127127
var configurationBuilder = new ConfigurationBuilder();

‎src/Discovery/test/Eureka.Test/EurekaClientOptionsTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void Constructor_ConfiguresEurekaDiscovery_Correctly()
9999
""";
100100

101101
using var sandbox = new Sandbox();
102-
string path = sandbox.CreateFile("appsettings.json", appSettings);
102+
string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
103103
string directory = Path.GetDirectoryName(path)!;
104104
string fileName = Path.GetFileName(path);
105105
var configurationBuilder = new ConfigurationBuilder();

0 commit comments

Comments
 (0)