Skip to content

Commit bb69777

Browse files
committed
Fix test fail in ActionConfirm
1 parent a5f1772 commit bb69777

File tree

3 files changed

+51
-4
lines changed

3 files changed

+51
-4
lines changed

src/Common/Commands.Common/AzurePSCmdlet.cs

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -527,15 +527,29 @@ protected void InitializeQosEvent()
527527
{
528528
CmdletType = this.GetType().Name,
529529
IsSuccess = true,
530-
Uid = MetricHelper.GenerateSha256HashString(this.Profile.DefaultSubscription.Id.ToString())
531530
};
531+
532+
if (this.Profile != null && this.Profile.DefaultSubscription != null)
533+
{
534+
QosEvent.Uid = MetricHelper.GenerateSha256HashString(
535+
this.Profile.DefaultSubscription.Id.ToString());
536+
}
537+
else
538+
{
539+
QosEvent.Uid = "defaultid";
540+
}
532541
}
533542

534543
/// <summary>
535544
/// Invoke this method when the cmdlet is completed or terminated.
536545
/// </summary>
537546
protected void LogQosEvent(bool waitForMetricSending = false)
538547
{
548+
if (QosEvent == null)
549+
{
550+
return;
551+
}
552+
539553
QosEvent.FinishQosEvent();
540554
//TODO change to debug
541555
WriteVerbose(QosEvent.ToString());
@@ -568,12 +582,19 @@ protected void LogQosEvent(bool waitForMetricSending = false)
568582
/// <param name="action">The action code</param>
569583
protected void ConfirmAction(bool force, string actionMessage, string processMessage, string target, Action action)
570584
{
571-
QosEvent.PauseQoSTimer();
585+
if (QosEvent != null)
586+
{
587+
QosEvent.PauseQoSTimer();
588+
}
589+
572590
if (force || ShouldContinue(actionMessage, ""))
573591
{
574592
if (ShouldProcess(target, processMessage))
575-
{
576-
QosEvent.ResumeQosTimer();
593+
{
594+
if (QosEvent != null)
595+
{
596+
QosEvent.ResumeQosTimer();
597+
}
577598
action();
578599
}
579600
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<BackupVaultCreds xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.datacontract.org/2004/07/Microsoft.Azure.Portal.RecoveryServices.Models.Common">
3+
<SubscriptionId>f5303a0b-fae4-4cdb-b44d-0e4c032dde26</SubscriptionId>
4+
<ResourceType>BackupVault</ResourceType>
5+
<ResourceName>backuprn1</ResourceName>
6+
<ManagementCert>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</ManagementCert>
7+
<AcsNamespace>
8+
<HostName>accesscontrol.windows.net</HostName>
9+
<Namespace>seadev01rrp1users</Namespace>
10+
<ResourceProviderRealm>http://windowscloudbackup/m3</ResourceProviderRealm>
11+
</AcsNamespace>
12+
<AgentLinks>WABUpdateKBLink,http://go.microsoft.com/fwlink/p/?LinkId=229525;StorageQuotaPurchaseLink,http://go.microsoft.com/fwlink/?LinkId=205490;WebPortalLink,http://go.microsoft.com/fwlink/?LinkId=252913;WABprivacyStatement,http://go.microsoft.com/fwlink/?LinkId=221308</AgentLinks>
13+
</BackupVaultCreds>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<BackupVaultCreds xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.datacontract.org/2004/07/Microsoft.Azure.Portal.RecoveryServices.Models.Common">
3+
<SubscriptionId>f5303a0b-fae4-4cdb-b44d-0e4c032dde26</SubscriptionId>
4+
<ResourceType>BackupVault</ResourceType>
5+
<ResourceName>backuprn1</ResourceName>
6+
<ManagementCert>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</ManagementCert>
7+
<AcsNamespace>
8+
<HostName>accesscontrol.windows.net</HostName>
9+
<Namespace>seadev01rrp1users</Namespace>
10+
<ResourceProviderRealm>http://windowscloudbackup/m3</ResourceProviderRealm>
11+
</AcsNamespace>
12+
<AgentLinks>WABUpdateKBLink,http://go.microsoft.com/fwlink/p/?LinkId=229525;StorageQuotaPurchaseLink,http://go.microsoft.com/fwlink/?LinkId=205490;WebPortalLink,http://go.microsoft.com/fwlink/?LinkId=252913;WABprivacyStatement,http://go.microsoft.com/fwlink/?LinkId=221308</AgentLinks>
13+
</BackupVaultCreds>

0 commit comments

Comments
 (0)