Skip to content

Commit

Permalink
fixes for bugs.
Browse files Browse the repository at this point in the history
  • Loading branch information
Dummy committed Jan 17, 2019
1 parent d6f3f7d commit 71dad8f
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,18 @@ public class AzureAppServiceSslBindingCertificatePersistenceStrategy : ICertific
private readonly ILogger<IAzureAppServiceSslBindingCertificatePersistenceStrategy> logger;
private readonly IAzure client;

private const string TagName = "FluffySpoonAspNetLetsEncrypt";
private string TagName
{
get
{
const string prefix = "FluffySpoonAspNetLetsEncrypt";

var domainsTag = letsEncryptOptions
.Domains
.Aggregate(string.Empty, (a, b) => a + "," + b);
return prefix + "_" + domainsTag;
}
}

public AzureAppServiceSslBindingCertificatePersistenceStrategy(
AzureOptions azureOptions,
Expand Down Expand Up @@ -75,16 +86,18 @@ public async Task PersistAsync(PersistenceType persistenceType, byte[] bytes)
continue;

relevantApps.Add((app, null));
} else {
}
else
{
var slots = app.DeploymentSlots
.List()
.Where(x => x
.HostNames
.Any(domains.Contains));
if(!slots.Any())
if (!slots.Any())
continue;

foreach(var slot in slots)
foreach (var slot in slots)
relevantApps.Add((app, slot));
}

Expand Down Expand Up @@ -149,14 +162,16 @@ await client.WebApps.Manager
foreach (var appTuple in relevantApps)
{
string[] domainsToUpgrade;
if(azureOptions.Slot == null) {
if (azureOptions.Slot == null)
{
logger.LogInformation("Updating host name bindings for app {0}", appTuple.App.Name);
domainsToUpgrade = appTuple
.App
.HostNames
.Where(domains.Contains)
.ToArray();
} else
}
else
{
logger.LogInformation("Updating host name bindings for app {0}/{1}", appTuple.App.Name, appTuple.Slot.Name);
domainsToUpgrade = appTuple
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public async Task RunOnceAsync()

await AuthenticateAsync();

var domains = _options.Domains.ToArray();
var domains = _options.Domains?.ToArray() ?? Array.Empty<string>();
await AcquireNewCertificateForDomains(domains);
}
catch (Exception ex)
Expand Down

0 comments on commit 71dad8f

Please sign in to comment.