Skip to content

Commit 4f3c5d2

Browse files
Update deployment tab description for clarity
1 parent ef41dd3 commit 4f3c5d2

File tree

3 files changed

+46
-40
lines changed

3 files changed

+46
-40
lines changed

src/Certify.Core/Management/PreviewManager.cs

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.Diagnostics;
44
using System.Linq;
@@ -218,8 +218,6 @@ ICredentialsManager credentialsManager
218218
$"{newLine}**This challenge type will be selected for all identifiers.**");
219219
}
220220
}
221-
222-
challengeInfo.AppendLine($"{newLine}---{newLine}");
223221
}
224222

225223
steps.Add(new ActionStep
@@ -281,51 +279,59 @@ ICredentialsManager credentialsManager
281279
{
282280
// deploying to single or multiple Site
283281

284-
if (item.RequestConfig.DeploymentBindingMatchHostname)
282+
if (serverProvider == null)
285283
{
286-
deploymentDescription.AppendLine(
287-
"* Deploy to hostname bindings matching certificate domains.");
284+
deploymentDescription.AppendLine($"* Target instance has no supported targets for auto-deployment (e.g. IIS). Deployment Tasks may still apply.");
288285
}
289-
290-
if (item.RequestConfig.DeploymentBindingBlankHostname)
286+
else
291287
{
292-
deploymentDescription.AppendLine("* Deploy to bindings with blank hostname.");
293-
}
294288

295-
if (item.RequestConfig.DeploymentBindingReplacePrevious)
296-
{
297-
deploymentDescription.AppendLine("* Deploy to bindings with previous certificate.");
298-
}
289+
if (item.RequestConfig.DeploymentBindingMatchHostname)
290+
{
291+
deploymentDescription.AppendLine(
292+
"* Deploy to hostname bindings matching certificate domains.");
293+
}
299294

300-
if (item.RequestConfig.DeploymentBindingOption == DeploymentBindingOption.AddOrUpdate)
301-
{
302-
deploymentDescription.AppendLine("* Add or Update https bindings as required");
303-
}
295+
if (item.RequestConfig.DeploymentBindingBlankHostname)
296+
{
297+
deploymentDescription.AppendLine("* Deploy to bindings with blank hostname.");
298+
}
304299

305-
if (item.RequestConfig.DeploymentBindingOption == DeploymentBindingOption.UpdateOnly)
306-
{
307-
deploymentDescription.AppendLine("* Update https bindings as required (no auto-created https bindings)");
308-
}
300+
if (item.RequestConfig.DeploymentBindingReplacePrevious)
301+
{
302+
deploymentDescription.AppendLine("* Deploy to bindings with previous certificate.");
303+
}
309304

310-
if (item.RequestConfig.DeploymentSiteOption == DeploymentOption.SingleSite)
311-
{
312-
if (!string.IsNullOrEmpty(item.ServerSiteId))
305+
if (item.RequestConfig.DeploymentBindingOption == DeploymentBindingOption.AddOrUpdate)
313306
{
314-
try
315-
{
316-
var siteInfo = await serverProvider.GetSiteById(item.ServerSiteId);
317-
deploymentDescription.AppendLine($"## Deploying to Site" + newLine + newLine +
318-
$"`{siteInfo.Name}`" + newLine);
319-
}
320-
catch (Exception exp)
307+
deploymentDescription.AppendLine("* Add or Update https bindings as required");
308+
}
309+
310+
if (item.RequestConfig.DeploymentBindingOption == DeploymentBindingOption.UpdateOnly)
311+
{
312+
deploymentDescription.AppendLine("* Update https bindings as required (no auto-created https bindings)");
313+
}
314+
315+
if (item.RequestConfig.DeploymentSiteOption == DeploymentOption.SingleSite)
316+
{
317+
if (!string.IsNullOrEmpty(item.ServerSiteId))
321318
{
322-
deploymentDescription.AppendLine($"Error: **cannot identify selected site.** {exp.Message} ");
319+
try
320+
{
321+
var siteInfo = await serverProvider.GetSiteById(item.ServerSiteId);
322+
deploymentDescription.AppendLine($"## Deploying to Site" + newLine + newLine +
323+
$"`{siteInfo.Name}`" + newLine);
324+
}
325+
catch (Exception exp)
326+
{
327+
deploymentDescription.AppendLine($"Error: **cannot identify selected site.** {exp.Message} ");
328+
}
323329
}
324330
}
325-
}
326-
else
327-
{
328-
deploymentDescription.AppendLine($"## Deploying to all matching sites:");
331+
else
332+
{
333+
deploymentDescription.AppendLine($"## Deploying to all matching sites:");
334+
}
329335
}
330336

331337
// add deployment sub-steps (if any)
@@ -366,7 +372,7 @@ ICredentialsManager credentialsManager
366372
}
367373
else if (item.RequestConfig.DeploymentSiteOption == DeploymentOption.NoDeployment)
368374
{
369-
deploymentDescription.AppendLine("* The certificate will be saved to local disk only.");
375+
deploymentDescription.AppendLine("* The certificate will be saved to local storage.");
370376
}
371377

372378
deploymentStep.Description = deploymentDescription.ToString();

src/Certify.Locales/SR.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Certify.Locales/SR.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@
672672
<value>Stored credentials are required to make automated calls to APIs and other resources during certificate renewal and deployment. These credentials are protected using the Windows Data Protection APIs and stored on this machine.</value>
673673
</data>
674674
<data name="ManagedCertificates_Deployment_Intro" xml:space="preserve">
675-
<value> Deployment of your certificate can be automatic or you can perform your own deployment tasks (see the Tasks tab).</value>
675+
<value>Deployment of your certificate can be automatic (if targeting IIS) or you can perform your own deployment tasks (see the Tasks tab).</value>
676676
</data>
677677
<data name="ManagedCertificates_Tasks_Intro" xml:space="preserve">
678678
<value>Tasks are an optional way to work with your latest certificate or trigger other actions before or after renewal. </value>

0 commit comments

Comments
 (0)