better way to initialize subscriptionId

VeryEarly · VeryEarly · commit 60daabca5edf · 2019-11-08T15:56:14.000+08:00
diff --git a/src/Resources/Resources/ActiveDirectory/Cmdlets/NewAzureADServicePrincipalCommand.cs b/src/Resources/Resources/ActiveDirectory/Cmdlets/NewAzureADServicePrincipalCommand.cs
@@ -251,6 +251,7 @@ public override void ExecuteCmdlet()
 
         private void CreateSimpleServicePrincipal()
         {
+            var subscriptionId = DefaultContext.Subscription?.Id;
             if (!this.IsParameterBound(c => c.StartDate))
             {
                 DateTime currentTime = DateTime.UtcNow;
@@ -320,7 +321,6 @@ private void CreateSimpleServicePrincipal()
 
             if (!SkipRoleAssignment())
             {
-                var subscriptionId = DefaultContext.Subscription.Id;
                 if (!this.IsParameterBound(c => c.Scope))
                 {
                     Scope = string.Format("/subscriptions/{0}", subscriptionId);
@@ -350,7 +350,6 @@ private void CreateSimpleServicePrincipal()
                     return;
                 }
 
-                var subscriptionId = DefaultContext.Subscription.Id;
                 WriteWarning(string.Format("Assigning role '{0}' over scope '{1}' to the new service principal.", this.Role, this.Scope));
                 FilterRoleAssignmentsOptions parameters = new FilterRoleAssignmentsOptions()
                 {

Original file line number	Diff line number	Diff line change
`@@ -251,6 +251,7 @@ public override void ExecuteCmdlet()`
`251`	`251`
`252`	`252`	`private void CreateSimpleServicePrincipal()`
`253`	`253`	`{`
	`254`	`+ var subscriptionId = DefaultContext.Subscription?.Id;`
`254`	`255`	`if (!this.IsParameterBound(c => c.StartDate))`
`255`	`256`	`{`
`256`	`257`	`DateTime currentTime = DateTime.UtcNow;`
`@@ -320,7 +321,6 @@ private void CreateSimpleServicePrincipal()`
`320`	`321`
`321`	`322`	`if (!SkipRoleAssignment())`
`322`	`323`	`{`
`323`		`- var subscriptionId = DefaultContext.Subscription.Id;`
`324`	`324`	`if (!this.IsParameterBound(c => c.Scope))`
`325`	`325`	`{`
`326`	`326`	`Scope = string.Format("/subscriptions/{0}", subscriptionId);`
`@@ -350,7 +350,6 @@ private void CreateSimpleServicePrincipal()`
`350`	`350`	`return;`
`351`	`351`	`}`
`352`	`352`
`353`		`- var subscriptionId = DefaultContext.Subscription.Id;`
`354`	`353`	`WriteWarning(string.Format("Assigning role '{0}' over scope '{1}' to the new service principal.", this.Role, this.Scope));`
`355`	`354`	`FilterRoleAssignmentsOptions parameters = new FilterRoleAssignmentsOptions()`
`356`	`355`	`{`