Fix a couple bugs in proxy and alert handlers (#650)

This commit is contained in:
Karl Burtram
2018-07-05 10:29:33 -07:00
committed by GitHub
parent d86a1ce1d3
commit 21cccd7eaa

View File

@@ -645,13 +645,9 @@ namespace Microsoft.SqlTools.ServiceLayer.Agent
var proxy = dataContainer.Server.JobServer.ProxyAccounts[i]; var proxy = dataContainer.Server.JobServer.ProxyAccounts[i];
proxies[i] = new AgentProxyInfo proxies[i] = new AgentProxyInfo
{ {
Id = proxy.ID,
AccountName = proxy.Name, AccountName = proxy.Name,
Description = proxy.Description, Description = proxy.Description,
CredentialName = proxy.CredentialName, CredentialName = proxy.CredentialName
CredentialIdentity = proxy.CredentialIdentity,
CredentialId = proxy.CredentialID,
IsEnabled = proxy.IsEnabled,
}; };
} }
result.Proxies = proxies; result.Proxies = proxies;
@@ -897,9 +893,9 @@ namespace Microsoft.SqlTools.ServiceLayer.Agent
ConnectionServiceInstance.TryFindConnection(ownerUri, out connInfo); ConnectionServiceInstance.TryFindConnection(ownerUri, out connInfo);
CDataContainer dataContainer = CDataContainer.CreateDataContainer(connInfo, databaseExists: true); CDataContainer dataContainer = CDataContainer.CreateDataContainer(connInfo, databaseExists: true);
STParameters param = new STParameters(dataContainer.Document); STParameters param = new STParameters(dataContainer.Document);
param.SetParam("alert", alert.JobName); param.SetParam("alert", alert.Name);
if (alert != null && !string.IsNullOrWhiteSpace(alert.JobName)) if (alert != null)
{ {
using (AgentAlertActions agentAlert = new AgentAlertActions(dataContainer, alert, configAction)) using (AgentAlertActions agentAlert = new AgentAlertActions(dataContainer, alert, configAction))
{ {