Skip to content

Show warning instead of throw exception when StorageAccountName doesn… #1811

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
merged 1 commit into from
Feb 17, 2016
Merged

Show warning instead of throw exception when StorageAccountName doesn… #1811

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 20 additions & 31 deletions ...Commands.ServiceManagement/Extensions/Diagnostics/BaseAzureServiceDiagnosticsExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,59 +115,48 @@ protected override void ValidateConfiguration()
}
}

var publicConfigElem = DiagnosticsHelper.GetPublicConfigXElementFromXmlFile(this.DiagnosticsConfigurationPath);
if (publicConfigElem == null)
{
throw new ArgumentException(Resources.DiagnosticsExtensionNullPublicConfig);
}
publicConfigElem.SetAttributeValue("xmlns", XmlNamespace);
PublicConfiguration = publicConfigElem.ToString();

XmlDocument doc = new XmlDocument();
XmlNamespaceManager ns = new XmlNamespaceManager(doc.NameTable);
ns.AddNamespace("ns", XmlNamespace);
doc.Load(DiagnosticsConfigurationPath);

// Make sure the configuration element exist
var configElement = doc.SelectSingleNode("//ns:WadCfg", ns) ?? doc.SelectSingleNode("//ns:WadCfgBlob", ns);
if (configElement == null)
// Make sure the configuration elements exist
var publicConfigElement = doc.SelectSingleNode("//ns:PublicConfig", ns);
if (publicConfigElement == null)
{
throw new ArgumentException(Resources.DiagnosticsExtensionNullPublicConfig);
}

var wadConfigElement = doc.SelectSingleNode("//ns:WadCfg", ns) ?? doc.SelectSingleNode("//ns:WadCfgBlob", ns);
if (wadConfigElement == null)
{
throw new ArgumentException(Resources.DiagnosticsExtensionPaaSConfigElementNotDefined);
}

// The element <StorageAccount> is not meant to be set by the user in the public config.
// Make sure it matches the storage account in the private config.
var storageAccountElement = doc.SelectSingleNode("//ns:StorageAccount", ns);
if(storageAccountElement != null)
if (storageAccountElement == null)
{
// The StorageAccount is empty, we must set it
if (string.IsNullOrEmpty(storageAccountElement.InnerText))
{
storageAccountElement.InnerText = StorageAccountName;
PublicConfiguration = doc.OuterXml;
}
else if (!string.IsNullOrEmpty(storageAccountElement.InnerText) && string.Compare(storageAccountElement.InnerText, StorageAccountName, true) != 0)
{
throw new ArgumentException(Resources.DiagnosticsExtensionNoMatchStorageAccount);
}
}
else
{
// The StorageAccount is not there. we must set it
// The StorageAccount element is not there, we create one
storageAccountElement = doc.CreateElement("StorageAccount", XmlNamespace);
storageAccountElement.InnerText = StorageAccountName;
wadConfigElement.ParentNode.AppendChild(storageAccountElement);
}

// Insert it after <WadCfg> or <WadCfgBlob>
configElement.ParentNode.AppendChild(storageAccountElement);
PublicConfiguration = doc.OuterXml;
if (!string.IsNullOrEmpty(storageAccountElement.InnerText) && string.Compare(storageAccountElement.InnerText, StorageAccountName, true) != 0)
{
WriteWarning(Resources.DiagnosticsExtensionNoMatchStorageAccount);
}

storageAccountElement.InnerText = StorageAccountName;
PublicConfiguration = publicConfigElement.OuterXml;

// Make sure the storage account name in PrivateConfig matches.
var privateConfigStorageAccountName = DiagnosticsHelper.GetStorageAccountInfoFromPrivateConfig(this.DiagnosticsConfigurationPath, DiagnosticsHelper.PrivConfNameAttr);
if (!string.IsNullOrEmpty(privateConfigStorageAccountName)
&& !string.Equals(StorageAccountName, privateConfigStorageAccountName, StringComparison.OrdinalIgnoreCase))
{
throw new ArgumentException(Resources.DiagnosticsExtensionNoMatchPrivateStorageAccount);
WriteWarning(Resources.DiagnosticsExtensionNoMatchPrivateStorageAccount);
}

PrivateConfigurationXml = new XDocument(PrivateConfigurationXmlTemplate);
Expand Down