Skip to content

Commit e9df035

Browse files
committed
refactor: logic to have service configuration instead of ConfigurationBuilder in sub-directory
1 parent 73e6af7 commit e9df035

File tree

15 files changed

+126
-130
lines changed

15 files changed

+126
-130
lines changed

src/Testcontainers.EventHubs/Configuration/ConfigurationBuilder.cs

Lines changed: 0 additions & 63 deletions
This file was deleted.

src/Testcontainers.EventHubs/Configuration/ConsumerGroup.cs

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/Testcontainers.EventHubs/Configuration/Entity.cs

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/Testcontainers.EventHubs/Configuration/LoggingConfig.cs

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/Testcontainers.EventHubs/Configuration/NamespaceConfig.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/Testcontainers.EventHubs/Configuration/RootConfiguration.cs

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/Testcontainers.EventHubs/Configuration/UserConfig.cs

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/Testcontainers.EventHubs/EventHubsBuilder.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ public EventHubsBuilder WithAzuriteContainer(
8484
/// <summary>
8585
/// Sets the Azure Event Hubs Emulator configuration.
8686
/// </summary>
87-
/// <param name="configurationBuilder">The configuration.</param>
87+
/// <param name="serviceConfiguration">The configuration.</param>
8888
/// <returns>A configured instance of <see cref="EventHubsBuilder" />.</returns>
89-
public EventHubsBuilder WithConfigurationBuilder(ConfigurationBuilder configurationBuilder)
89+
public EventHubsBuilder WithConfigurationBuilder(EventHubsServiceConfiguration serviceConfiguration)
9090
{
91-
var resourceContent = Encoding.Default.GetBytes(configurationBuilder.Build());
92-
return Merge(DockerResourceConfiguration, new EventHubsConfiguration(configurationBuilder: configurationBuilder))
91+
var resourceContent = Encoding.Default.GetBytes(serviceConfiguration.Build());
92+
return Merge(DockerResourceConfiguration, new EventHubsConfiguration(serviceConfiguration: serviceConfiguration))
9393
.WithResourceMapping(resourceContent, "Eventhubs_Emulator/ConfigFiles/Config.json");
9494
}
9595

@@ -130,7 +130,7 @@ protected override void Validate()
130130
_ = Guard.Argument(DockerResourceConfiguration, nameof(DockerResourceConfiguration.Image))
131131
.ThrowIf(argument => licenseAgreementNotAccepted(argument.Value), argument => throw new ArgumentException(string.Format(message, DockerResourceConfiguration.Image.FullName), argument.Name));
132132

133-
_ = Guard.Argument(DockerResourceConfiguration.ConfigurationBuilder, nameof(DockerResourceConfiguration.ConfigurationBuilder))
133+
_ = Guard.Argument(DockerResourceConfiguration.ServiceConfiguration, nameof(DockerResourceConfiguration.ServiceConfiguration))
134134
.NotNull()
135135
.ThrowIf(argument => !argument.Value.Validate(), _ => throw new ArgumentException("ConfigurationBuilder is invalid."));
136136
}

src/Testcontainers.EventHubs/EventHubsConfiguration.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ public sealed class EventHubsConfiguration : ContainerConfiguration
88
/// Initializes a new instance of the <see cref="EventHubsConfiguration" /> class.
99
/// </summary>
1010
/// <param name="azuriteContainer">The Azurite container.</param>
11-
/// <param name="configurationBuilder">The Azure Event Hubs Emulator configuration.</param>
11+
/// <param name="serviceConfiguration">The Azure Event Hubs Emulator configuration.</param>
1212
public EventHubsConfiguration(AzuriteContainer azuriteContainer = null,
13-
ConfigurationBuilder configurationBuilder = null)
13+
EventHubsServiceConfiguration serviceConfiguration = null)
1414
{
1515
AzuriteContainer = azuriteContainer;
16-
ConfigurationBuilder = configurationBuilder;
16+
ServiceConfiguration = serviceConfiguration;
1717
}
1818

1919
/// <summary>
@@ -55,7 +55,7 @@ public EventHubsConfiguration(EventHubsConfiguration oldValue, EventHubsConfigur
5555
: base(oldValue, newValue)
5656
{
5757
AzuriteContainer = BuildConfiguration.Combine(oldValue.AzuriteContainer, newValue.AzuriteContainer);
58-
ConfigurationBuilder = BuildConfiguration.Combine(oldValue.ConfigurationBuilder, newValue.ConfigurationBuilder);
58+
ServiceConfiguration = BuildConfiguration.Combine(oldValue.ServiceConfiguration, newValue.ServiceConfiguration);
5959
}
6060

6161
/// <summary>
@@ -66,5 +66,5 @@ public EventHubsConfiguration(EventHubsConfiguration oldValue, EventHubsConfigur
6666
/// <summary>
6767
/// Gets the Azure Event Hubs Emulator configuration.
6868
/// </summary>
69-
public ConfigurationBuilder ConfigurationBuilder { get; }
69+
public EventHubsServiceConfiguration ServiceConfiguration { get; }
7070
}

src/Testcontainers.EventHubs/EventHubsContainer.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,18 @@ public EventHubsContainer(EventHubsConfiguration configuration)
2222
/// <returns>The Event Hubs connection string.</returns>
2323
public string GetConnectionString()
2424
{
25-
var properties = new Dictionary<string, string>();
26-
properties.Add("Endpoint", new UriBuilder(Uri.UriSchemeHttp, Hostname, GetMappedPublicPort(EventHubsBuilder.EventHubsPort)).ToString());
27-
properties.Add("DefaultEndpointsProtocol", Uri.UriSchemeHttp);
28-
properties.Add("SharedAccessKeyName", "RootManageSharedAccessKey");
29-
properties.Add("SharedAccessKey", "SAS_KEY_VALUE");
30-
properties.Add("UseDevelopmentEmulator", "true");
25+
var properties = new Dictionary<string, string>
26+
{
27+
{
28+
"Endpoint",
29+
new UriBuilder(Uri.UriSchemeHttp, Hostname, GetMappedPublicPort(EventHubsBuilder.EventHubsPort))
30+
.ToString()
31+
},
32+
{ "DefaultEndpointsProtocol", Uri.UriSchemeHttp },
33+
{ "SharedAccessKeyName", "RootManageSharedAccessKey" },
34+
{ "SharedAccessKey", "SAS_KEY_VALUE" },
35+
{ "UseDevelopmentEmulator", "true" },
36+
};
3137
return string.Join(";", properties.Select(property => string.Join("=", property.Key, property.Value)));
3238
}
3339
}

0 commit comments

Comments
 (0)