Skip to content

Cosmos DB - Correctly fallback to AppSettings #749

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
ealsur merged 2 commits into from
Oct 18, 2021
Merged

Cosmos DB - Correctly fallback to AppSettings #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89e70cb
Allow for settings fallback
ealsur Oct 18, 2021
2c0d17e
tests
ealsur Oct 18, 2021
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
6 changes: 5 additions & 1 deletion src/WebJobs.Extensions.CosmosDB/WebJobsConfigurationExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ public static IConfigurationSection GetConnectionStringOrSetting(this IConfigura
{
if (configuration.GetSection("ConnectionStrings").Exists())
{
return configuration.GetSection("ConnectionStrings").GetSection(connectionName);
IConfigurationSection onConnectionStrings = configuration.GetSection("ConnectionStrings").GetSection(connectionName);
if (onConnectionStrings.Exists())
{
return onConnectionStrings;
}
}

return configuration.GetSection(connectionName);
Expand Down
57 changes: 57 additions & 0 deletions test/WebJobs.Extensions.CosmosDB.Tests/DefaultCosmosDBServiceFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,63 @@ public void UsesDefaultConnection()
Assert.Equal(options.ApplicationName, client.ClientOptions.ApplicationName);
}

[Fact]
public void UsesDefaultConnection_EvenIfConnectionStringSectionExists()
{
// Arrange
var myConfiguration = new Dictionary<string, string>
{
{ Constants.DefaultConnectionStringName, "AccountEndpoint=https://defaultUri;AccountKey=c29tZV9rZXk=;" },
{ "ConnectionStrings:SomeConnectionString", "NotAValidConnectionString" },
};

var configuration = new ConfigurationBuilder()
.AddInMemoryCollection(myConfiguration)
.Build();

var factory = new DefaultCosmosDBServiceFactory(configuration, Mock.Of<AzureComponentFactory>());
var options = new CosmosClientOptions()
{
ApplicationName = Guid.NewGuid().ToString()
};

// Act
var client = factory.CreateService(null, options);

// Assert
Assert.NotNull(client);
Assert.True(client.Endpoint.ToString().Contains("default"));
Assert.Equal(options.ApplicationName, client.ClientOptions.ApplicationName);
}

[Fact]
public void UsesDefaultConnection_FromConnectionStrings()
{
// Arrange
var myConfiguration = new Dictionary<string, string>
{
{ $"ConnectionStrings:{Constants.DefaultConnectionStringName}", "AccountEndpoint=https://defaultUri;AccountKey=c29tZV9rZXk=;" },
};

var configuration = new ConfigurationBuilder()
.AddInMemoryCollection(myConfiguration)
.Build();

var factory = new DefaultCosmosDBServiceFactory(configuration, Mock.Of<AzureComponentFactory>());
var options = new CosmosClientOptions()
{
ApplicationName = Guid.NewGuid().ToString()
};

// Act
var client = factory.CreateService(null, options);

// Assert
Assert.NotNull(client);
Assert.True(client.Endpoint.ToString().Contains("default"));
Assert.Equal(options.ApplicationName, client.ClientOptions.ApplicationName);
}

[Fact]
public void UsesConfig()
{
Expand Down