ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused test server types (#1699)

Browse Source 
* Remove unused test server types

* Don't use secure file

* Correct password
This commit is contained in:
Charles Gagnon
2022-09-16 16:58:06 -07:00
committed by GitHub
parent 5e0302a95f
commit e763d2463d
5 changed files with 31 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestConfigPersistenceHelper.cs
View File

@@ -25,7 +25,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
/// "user": "sa",
/// "password": "[putvaluehere]",
/// "serverType":"OnPrem",
/// "VersionKey": "defaultSql2016"
/// "VersionKey": "sqlOnPrem"
/// }
/// ]
/// }

59
test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestConnectionProfileService.cs
View File

@@ -21,19 +21,8 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
private static Dictionary<string, InstanceInfo> connectionProfilesCache = new Dictionary<string, InstanceInfo>();
private static TestConnectionProfileService instance = new TestConnectionProfileService();
public const string DefaultSql2005InstanceKey = "defaultSql2005";
public const string DefaultSql2008InstanceKey = "defaultSql2008";
public const string DefaultSql2011InstanceKey = "defaultSql2011";
public const string DefaultSql2012Pcu1InstanceKey = "defaultSql2012pcu1";
public const string DefaultSql2014InstanceKey = "defaultSql2014";
public const string DefaultSqlAzureInstanceKey = "defaultSqlAzure";
public const string DefaultServerlessInstanceKey = "defaultServerless";
public const string DefaultSqlPdwInstanceKey = "defaultSqlPdw";
public const string DefaultSqlAzureV12InstanceKey = "defaultSqlAzureV12";
public const string DefaultSql2016InstanceKey = "defaultSql2016";
public const string DefaultSql2019InstanceKey = "defaultSql2019";
public const string DefaultSql2022InstanceKey = "defaultSql2022";
public const string DefaultSqlvNextInstanceKey = "defaultSqlvNext";
public const string SqlAzureInstanceKey = "sqlAzure";
public const string SqlOnPremInstanceKey = "sqlOnPrem";
private TestConnectionProfileService()
{
@@ -48,44 +37,14 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
}
}
public static InstanceInfo DefaultSql2012Pcu1
public static InstanceInfo SqlAzure
{
get { return GetInstance(DefaultSql2012Pcu1InstanceKey); }
get { return GetInstance(SqlAzureInstanceKey); }
}
public static InstanceInfo DefaultSql2014
public static InstanceInfo SqlOnPrem
{
get { return GetInstance(DefaultSql2014InstanceKey); }
}
public static InstanceInfo DefaultSqlAzure
{
get { return GetInstance(DefaultSqlAzureInstanceKey); }
}
public static InstanceInfo DefaultSqlAzureV12
{
get { return GetInstance(DefaultSqlAzureV12InstanceKey); }
}
public static InstanceInfo DefaultSql2016
{
get { return GetInstance(DefaultSql2016InstanceKey); }
}
public static InstanceInfo DefaultSql2019
{
get { return GetInstance(DefaultSql2019InstanceKey); }
}
public static InstanceInfo DefaultSql2022
{
get { return GetInstance(DefaultSql2022InstanceKey); }
}
public static InstanceInfo DefaultSqlvNext
{
get { return GetInstance(DefaultSqlvNextInstanceKey); }
get { return GetInstance(SqlOnPremInstanceKey); }
}
/// <summary>
@@ -99,7 +58,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
return instanceInfo;
}
public ConnectParams GetConnectionParameters(string key = DefaultSql2022InstanceKey, string databaseName = null)
public ConnectParams GetConnectionParameters(string key = SqlOnPremInstanceKey, string databaseName = null)
{
InstanceInfo instanceInfo = GetInstance(key);
if (instanceInfo != null)
@@ -192,7 +151,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
private static string ConvertServerTypeToVersionKey(TestServerType serverType)
{
return serverType == TestServerType.OnPrem ? DefaultSql2022InstanceKey : DefaultSqlAzureV12InstanceKey;
return serverType == TestServerType.OnPrem ? SqlOnPremInstanceKey : SqlAzureInstanceKey;
}
/// <summary>
@@ -214,7 +173,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
connectParams.Connection.DatabaseName = databaseName;
connectParams.Connection.DatabaseDisplayName = databaseName;
}
if (key == DefaultSqlAzureInstanceKey || key == DefaultSqlAzureV12InstanceKey)
if (key == SqlAzureInstanceKey || key == SqlAzureInstanceKey)
{
connectParams.Connection.ConnectTimeout = 30;
connectParams.Connection.Encrypt = true;

20
test/Microsoft.SqlTools.ServiceLayer.TestEnvConfig/Program.cs
View File

@@ -67,23 +67,13 @@ namespace Microsoft.SqlTools.ServiceLayer.TestEnvConfig
The following is an example of a setting_file:
<Configuration>
<Instance Name=""defaultSql2005"">
<DataSource>SQL2005 servername</DataSource>
<Instance Name=""sqlOnPrem"">
<DataSource>SQL On-Prem servername</DataSource>
<BackupMethod>RemoteShare</BackupMethod>
<RemoteShare>SQL 2005 remote share</RemoteShare>
<RemoteShare>SQL remote share</RemoteShare>
</Instance>
<Instance Name=""defaultSql2008"">
<DataSource>SQL2008 servername</DataSource>
<BackupMethod>RemoteShare</BackupMethod>
<RemoteShare>SQL 2008 remote share</RemoteShare>
</Instance>
<Instance Name=""defaultSql2011"">
<DataSource>SQL2011 servername</DataSource>
<BackupMethod>RemoteShare</BackupMethod>
<RemoteShare>SQL 20011 remote share</RemoteShare>
</Instance>
<Instance Name=""defaultSqlAzureV12"">
<DataSource>SQLAzure servername</DataSource>
<Instance Name=""sqlAzure"">
<DataSource>SQL Azure servername</DataSource>
<BackupMethod>RemoteShare</BackupMethod>
<RemoteShare>SQLAzure remote share</RemoteShare>
<UserId>user id</UserId>

4
test/Microsoft.SqlTools.ServiceLayer.TestEnvConfig/SQLConnectionInstancesTemplate.xml
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Instances>
<Instance VersionKey="defaultSql2022">
<Instance VersionKey="sqlOnPrem">
<DataSource>[server name]</DataSource>
<UserId>[user name for SQL authentication]</UserId>
<Password>[password for SQL authentication]</Password>
</Instance>
<Instance VersionKey="defaultSqlAzureV12">
<Instance VersionKey="sqlAzure">
<DataSource>[server name]</DataSource>
<UserId>[user name for SQL authentication]</UserId>
<Password>[password for SQL authentication]</Password>