Skip to content

Commit c6ca818

Browse files
markcowlmarkcowl
authored
Merge pull request Azure#4981 from yantang-msft/Fix4948
Fix issue 4948. SetServiceDiagnosticsExtension should use IStorageContext
2 parents 9c9771b + 98d5abd commit c6ca818

File tree

6 files changed

+14
-15
lines changed

6 files changed

+14
-15
lines changed

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/PaasCmdletInfo/SetAzureServiceDiagnosticsExtensionCmdletInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414

1515
using System.Security.Cryptography.X509Certificates;
1616
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.PowershellCore;
17-
using Microsoft.WindowsAzure.Commands.Common.Storage;
17+
using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
1818

1919
namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.PaasCmdletInfo
2020
{
2121
public class SetAzureServiceDiagnosticsExtensionCmdletInfo : CmdletsInfo
2222
{
2323

24-
public SetAzureServiceDiagnosticsExtensionCmdletInfo(string service, AzureStorageContext storageContext, string config, string[] roles, string slot)
24+
public SetAzureServiceDiagnosticsExtensionCmdletInfo(string service, IStorageContext storageContext, string config, string[] roles, string slot)
2525
{
2626
this.cmdletName = Utilities.SetAzureServiceDiagnosticsExtensionCmdletName;
2727
this.cmdletParams.Add(new CmdletParam("ServiceName", service));
@@ -37,13 +37,13 @@ public SetAzureServiceDiagnosticsExtensionCmdletInfo(string service, AzureStorag
3737
}
3838
}
3939

40-
public SetAzureServiceDiagnosticsExtensionCmdletInfo(string service, AzureStorageContext storageContext, X509Certificate2 cert, string config, string[] roles, string slot)
40+
public SetAzureServiceDiagnosticsExtensionCmdletInfo(string service, IStorageContext storageContext, X509Certificate2 cert, string config, string[] roles, string slot)
4141
: this(service, storageContext, config, roles, slot)
4242
{
4343
this.cmdletParams.Add(new CmdletParam("X509Certificate", cert));
4444
}
4545

46-
public SetAzureServiceDiagnosticsExtensionCmdletInfo(string service, AzureStorageContext storageContext, string thumbprint, string algorithm, string config, string[] roles, string slot)
46+
public SetAzureServiceDiagnosticsExtensionCmdletInfo(string service, IStorageContext storageContext, string thumbprint, string algorithm, string config, string[] roles, string slot)
4747
: this(service, storageContext, config, roles, slot)
4848
{
4949
this.cmdletParams.Add(new CmdletParam("CertificateThumbprint", thumbprint));

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
using Microsoft.Azure.Commands.Common.Authentication.Models;
1616
using Microsoft.VisualStudio.TestTools.UnitTesting;
17-
using Microsoft.WindowsAzure.Commands.Common.Storage;
1817
using Microsoft.WindowsAzure.Commands.Profile.Models;
1918
using Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions;
2019
using Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS.Extensions;
@@ -1200,17 +1199,17 @@ public ExtensionConfigurationInput NewAzureServiceDiagnosticsExtensionConfig
12001199

12011200
// Set-AzureServiceDiagnosticsExtension
12021201
public ManagementOperationContext SetAzureServiceDiagnosticsExtension
1203-
(string service, AzureStorageContext storageContext, string config = null, string[] roles = null, string slot = null)
1202+
(string service, IStorageContext storageContext, string config = null, string[] roles = null, string slot = null)
12041203
{
12051204
return RunPSCmdletAndReturnFirst<ManagementOperationContext>(new SetAzureServiceDiagnosticsExtensionCmdletInfo(service, storageContext, config, roles, slot));
12061205
}
12071206

1208-
public ManagementOperationContext SetAzureServiceDiagnosticsExtension(string service, AzureStorageContext storageContext, X509Certificate2 cert, string config = null, string[] roles = null, string slot = null)
1207+
public ManagementOperationContext SetAzureServiceDiagnosticsExtension(string service, IStorageContext storageContext, X509Certificate2 cert, string config = null, string[] roles = null, string slot = null)
12091208
{
12101209
return RunPSCmdletAndReturnFirst<ManagementOperationContext>(new SetAzureServiceDiagnosticsExtensionCmdletInfo(service, storageContext, cert, config, roles, slot));
12111210
}
12121211

1213-
public ManagementOperationContext SetAzureServiceDiagnosticsExtension(string service, AzureStorageContext storageContext, string thumbprint, string algorithm = null, string config = null, string[] roles = null, string slot = null)
1212+
public ManagementOperationContext SetAzureServiceDiagnosticsExtension(string service, IStorageContext storageContext, string thumbprint, string algorithm = null, string config = null, string[] roles = null, string slot = null)
12141213
{
12151214
return RunPSCmdletAndReturnFirst<ManagementOperationContext>(new SetAzureServiceDiagnosticsExtensionCmdletInfo(service, storageContext, thumbprint, algorithm, config, roles, slot));
12161215
}

‎src/ServiceManagement/Compute/Commands.ServiceManagement/Common/DiagnosticsHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ private static bool TryGetStorageAccount(IStorageManagementClient storageClient,
551551
return storageAccount != null;
552552
}
553553

554-
private static AzureStorageContext CreateStorageContext(Uri blobEndpoint, Uri queueEndpoint, Uri tableEndpoint, Uri fileEndpoint,
554+
private static IStorageContext CreateStorageContext(Uri blobEndpoint, Uri queueEndpoint, Uri tableEndpoint, Uri fileEndpoint,
555555
string storageAccountName, string storageAccountKey)
556556
{
557557
var credentials = new StorageCredentials(storageAccountName, storageAccountKey);

‎src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/BaseAzureServiceDiagnosticsExtension.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
using System.Linq;
1515
using System.Xml;
1616
using System.Xml.Linq;
17-
using Microsoft.WindowsAzure.Commands.Common.Storage;
1817
using Microsoft.WindowsAzure.Commands.ServiceManagement.Common;
1918
using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties;
2019
using Microsoft.WindowsAzure.Management.Compute;
20+
using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
2121

2222
namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions
2323
{
@@ -33,7 +33,7 @@ public abstract class BaseAzureServiceDiagnosticsExtensionCmdlet : BaseAzureServ
3333
protected string ConnectionQualifiers { get; set; }
3434
protected string DefaultEndpointsProtocol { get; set; }
3535

36-
public virtual AzureStorageContext StorageContext { get; set; }
36+
public virtual IStorageContext StorageContext { get; set; }
3737
public virtual string StorageAccountName { get; set; }
3838
public virtual string StorageAccountKey { get; set; }
3939
public virtual string StorageAccountEndpoint { get; set; }

‎src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/NewAzureServiceDiagnosticsExtensionConfig.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using System.Linq;
1616
using System.Management.Automation;
1717
using System.Security.Cryptography.X509Certificates;
18-
using Microsoft.WindowsAzure.Commands.Common.Storage;
18+
using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
1919

2020
namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions
2121
{
@@ -89,7 +89,7 @@ public override string StorageAccountEndpoint
8989
[Parameter(Position = 6, ValueFromPipelineByPropertyName = true, ParameterSetName = NewExtensionParameterSetName, HelpMessage = "Diagnostics Storage Name")]
9090
[Parameter(Position = 6, ValueFromPipelineByPropertyName = true, ParameterSetName = NewExtensionUsingThumbprintParameterSetName, HelpMessage = "Diagnostics Storage Name")]
9191
[ValidateNotNullOrEmpty]
92-
public override AzureStorageContext StorageContext
92+
public override IStorageContext StorageContext
9393
{
9494
get;
9595
set;

‎src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/SetAzureServiceDiagnosticsExtension.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
using System.Linq;
1717
using System.Management.Automation;
1818
using System.Security.Cryptography.X509Certificates;
19-
using Microsoft.WindowsAzure.Commands.Common.Storage;
2019
using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
2120
using Microsoft.WindowsAzure.Commands.Utilities.Common;
21+
using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
2222

2323
namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions
2424
{
@@ -119,7 +119,7 @@ public override string StorageAccountEndpoint
119119
[Parameter(Position = 8, ValueFromPipelineByPropertyName = true, ParameterSetName = SetExtensionParameterSetName, HelpMessage = "Diagnostics Storage Account Context")]
120120
[Parameter(Position = 8, ValueFromPipelineByPropertyName = true, ParameterSetName = SetExtensionUsingThumbprintParameterSetName, HelpMessage = "Diagnostics Storage Account Context")]
121121
[ValidateNotNullOrEmpty]
122-
public override AzureStorageContext StorageContext
122+
public override IStorageContext StorageContext
123123
{
124124
get;
125125
set;

0 commit comments

Comments
 (0)