Skip to content

Commit

Permalink
use _op_publishTargetSiteHostName to remove host name (dotnet#6184)
Browse files Browse the repository at this point in the history
  • Loading branch information
v-pegao authored Jul 3, 2020
1 parent d8eab27 commit 2bd47af
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Microsoft.DocAsCode.Build.Engine/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ internal static class Constants
public static class OPSEnvironmentVariable
{
public const string SystemMetadata = "_op_systemMetadata";
public const string OpCurrentBranchSiteHostName = "_op_currentBranchSiteHostName";
public const string OpPublishTargetSiteHostName = "_op_publishTargetSiteHostName";
}
}
}
8 changes: 4 additions & 4 deletions src/Microsoft.DocAsCode.Build.Engine/DocumentBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ private List<IDocumentProcessor> LoadSchemaDrivenDocumentProcessors(DocumentBuil
return result;
}

var siteHostName = TryGetCurrentBranchSiteHostNameFromEnvironment();
var siteHostName = TryGetPublishTargetSiteHostNameFromEnvironment();
var markdigMarkdownService = CreateMarkdigMarkdownService(parameter);
foreach (var pair in resource.GetResourceStreams(@"^schemas/.*\.schema\.json"))
{
Expand Down Expand Up @@ -499,16 +499,16 @@ orderby assembly.FullName
return result;
}

private static string TryGetCurrentBranchSiteHostNameFromEnvironment()
private static string TryGetPublishTargetSiteHostNameFromEnvironment()
{
string metadataString = Environment.GetEnvironmentVariable(Constants.OPSEnvironmentVariable.SystemMetadata);

if (metadataString != null)
{
var metadata = JsonUtility.FromJsonString<Dictionary<string, object>>(metadataString)?.ToImmutableDictionary();
if (metadata.TryGetValue(Constants.OPSEnvironmentVariable.OpCurrentBranchSiteHostName, out object currentBranchSiteHostName))
if (metadata.TryGetValue(Constants.OPSEnvironmentVariable.OpPublishTargetSiteHostName, out object publishTargetSiteHostName))
{
return (string)currentBranchSiteHostName;
return (string)publishTargetSiteHostName;
}
}
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public void TestCaseFromSchemaSpec()
public void TestContextObjectSDP()
{
Environment.SetEnvironmentVariable("_op_systemMetadata",
JsonUtility.ToJsonString(new Dictionary<string, object> { { "_op_currentBranchSiteHostName", "ppe.docs.microsoft.com" } }));
JsonUtility.ToJsonString(new Dictionary<string, object> { { "_op_publishTargetSiteHostName", "ppe.docs.microsoft.com" } }));

using var listener = new TestListenerScope("TestContextObjectSDP");
var schemaFile = CreateFile("template/schemas/contextobject.schema.json", File.ReadAllText("TestData/schemas/contextobject.test.schema.json"), _templateFolder);
Expand Down

0 comments on commit 2bd47af

Please sign in to comment.