clarify error messages and format console output

Xynoclafe · Xynoclafe · commit 74efcff449a5 · 2021-07-15T18:05:31.000-04:00
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzResourceGroupDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzResourceGroupDeploymentStack.cs
@@ -105,7 +105,7 @@ public override void ExecuteCmdlet()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
-                        TemplateUri = TemplateFile;
+                        TemplateUri = filePath;
                         break;
                     case ParameterFileTemplateSpecParameterSetName:
                     case ParameterFileTemplateUriParameterSetName:
@@ -119,7 +119,7 @@ public override void ExecuteCmdlet()
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
                         parameters = this.GetParameterObject(ParameterFile);
-                        TemplateUri = TemplateFile;
+                        TemplateUri = templatePath;
                         break;
                 }
 
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzSubscriptionDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzSubscriptionDeploymentStack.cs
@@ -103,7 +103,7 @@ public override void ExecuteCmdlet()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
-                        TemplateUri = TemplateFile;
+                        TemplateUri = filePath;
                         break;
                     case ParameterFileTemplateSpecParameterSetName:
                     case ParameterFileTemplateUriParameterSetName:
@@ -117,7 +117,7 @@ public override void ExecuteCmdlet()
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
                         parameters = this.GetParameterObject(ParameterFile);
-                        TemplateUri = TemplateFile;
+                        TemplateUri = templatePath;
                         break;
                 }
 
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzSubscriptionDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzSubscriptionDeploymentStack.cs
@@ -38,10 +38,6 @@ public override void ExecuteCmdlet()
         {
             try
             {
-                ResourceIdentifier resourceIdentifier = (ResourceId != null)
-                    ? new ResourceIdentifier(ResourceId)
-                    : null;
-
                 Name = Name ?? ResourceIdUtility.GetResourceName(ResourceId);
 
                 string confirmationMessage = $"Are you sure you want to remove DeploymentStack '{Name}'";
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzResourceGroupDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzResourceGroupDeploymentStack.cs
@@ -109,7 +109,7 @@ public override void ExecuteCmdlet()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
-                        TemplateUri = TemplateFile;
+                        TemplateUri = filePath;
                         break;
                     case ParameterFileTemplateSpecParameterSetName:
                     case ParameterFileTemplateUriParameterSetName:
@@ -123,7 +123,7 @@ public override void ExecuteCmdlet()
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
                         parameters = this.GetParameterObject(ParameterFile);
-                        TemplateUri = TemplateFile;
+                        TemplateUri = templatePath;
                         break;
                 }
 
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzSubscriptionDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzSubscriptionDeploymentStack.cs
@@ -107,7 +107,7 @@ public override void ExecuteCmdlet()
                             throw new PSInvalidOperationException(
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
-                        TemplateUri = TemplateFile;
+                        TemplateUri = filePath;
                         break;
                     case ParameterFileTemplateSpecParameterSetName:
                     case ParameterFileTemplateUriParameterSetName:
@@ -121,7 +121,7 @@ public override void ExecuteCmdlet()
                                 string.Format(ProjectResources.InvalidFilePath, TemplateFile));
                         }
                         parameters = this.GetParameterObject(ParameterFile);
-                        TemplateUri = TemplateFile;
+                        TemplateUri = templatePath;
                         break;
                 }
 
diff --git a/src/Resources/ResourceManager/SdkClient/DeploymentStacksSdkClient.cs b/src/Resources/ResourceManager/SdkClient/DeploymentStacksSdkClient.cs
@@ -57,12 +57,22 @@ public PSDeploymentStack GetResourceGroupDeploymentStack(
             }
             catch (Exception ex)
             {
-                if (!throwIfNotExists &&
-                    ex is DeploymentStacksErrorException dex &&
-                    dex.Response.StatusCode == System.Net.HttpStatusCode.NotFound)
+                if (ex is DeploymentStacksErrorException dex)
                 {
-                    // Deployment Stack does not exist
-                    return null;
+                    if (dex.Response.StatusCode == System.Net.HttpStatusCode.NotFound)
+                    {
+                        // Deployment Stack does not exist
+                        if (!throwIfNotExists)
+                            return null;
+                        else
+                            throw new PSArgumentException(
+                            $"DeploymentStack '{deploymentStackName}' in Resource Group '{resourceGroupName}' not found."
+                        );
+                    }
+                    else
+                    {
+                        throw new PSArgumentException(dex.Body.Error.Message);
+                    }
                 }
 
                 throw;
@@ -89,15 +99,13 @@ public IEnumerable<PSDeploymentStack> ListResourceGroupDeploymentStack(string re
             }
             catch (Exception ex)
             {
-                if (!throwIfNotExists &&
-                    ex is DeploymentStacksErrorException dex &&
-                    dex.Response.StatusCode == System.Net.HttpStatusCode.NotFound)
-                {
-                    // Deployment Stack does not exist
+                if (!throwIfNotExists)
                     return null;
-                }
 
-                throw;
+                if (ex is DeploymentStacksErrorException dex)
+                    throw new PSArgumentException(dex.Body.Error.Message);
+
+                throw ex;
             }
         }
 
@@ -121,15 +129,13 @@ public IEnumerable<PSDeploymentStackSnapshot> ListResourceGroupDeploymentStackSn
             }
             catch (Exception ex)
             {
-                if (!throwIfNotExists &&
-                    ex is DeploymentStacksErrorException dex &&
-                    dex.Response.StatusCode == System.Net.HttpStatusCode.NotFound)
-                {
-                    // Deployment Stack does not exist
+                if (!throwIfNotExists)
                     return null;
-                }
 
-                throw;
+                if (ex is DeploymentStacksErrorException dex)
+                    throw new PSArgumentException(dex.Body.Error.Message);
+
+                throw ex;
             }
         }
 
@@ -153,15 +159,13 @@ internal object ListSubscriptionDeploymentStackSnapshot(string stackName, bool t
             }
             catch (Exception ex)
             {
-                if (!throwIfNotExists &&
-                    ex is DeploymentStacksErrorException dex &&
-                    dex.Response.StatusCode == System.Net.HttpStatusCode.NotFound)
-                {
-                    // Deployment Stack does not exist
+                if (!throwIfNotExists)
                     return null;
-                }
 
-                throw;
+                if (ex is DeploymentStacksErrorException dex)
+                    throw new PSArgumentException(dex.Body.Error.Message);
+
+                throw ex;
             }
         }
 
@@ -176,12 +180,22 @@ public PSDeploymentStack GetSubscriptionDeploymentStack(string stackName, bool t
 
             catch (Exception ex)
             {
-                if (!throwIfNotExists &&
-                    ex is DeploymentStacksErrorException dex &&
-                    dex.Response.StatusCode == System.Net.HttpStatusCode.NotFound)
+                if (ex is DeploymentStacksErrorException dex)
                 {
-                    // Deployment Stack does not exist
-                    return null;
+                    if (dex.Response.StatusCode == System.Net.HttpStatusCode.NotFound)
+                    {
+                        // Deployment Stack does not exist
+                        if (!throwIfNotExists)
+                            return null;
+                        else
+                            throw new PSArgumentException(
+                            $"DeploymentStack '{stackName}' not found in current subscription."
+                        );
+                    }
+                    else
+                    {
+                        throw new PSArgumentException(dex.Body.Error.Message);
+                    }
                 }
 
                 throw;
@@ -208,15 +222,13 @@ public IEnumerable<PSDeploymentStack> ListSubscriptionDeploymentStack(bool throw
             }
             catch (Exception ex)
             {
-                if (!throwIfNotExists &&
-                    ex is DeploymentStacksErrorException dex &&
-                    dex.Response.StatusCode == System.Net.HttpStatusCode.NotFound)
-                {
-                    // Deployment Stack does not exist
+                if (!throwIfNotExists)
                     return null;
-                }
 
-                throw;
+                if (ex is DeploymentStacksErrorException dex)
+                    throw new PSArgumentException(dex.Body.Error.Message);
+
+                throw ex;
             }
         }
 
@@ -230,12 +242,22 @@ public PSDeploymentStackSnapshot GetResourceGroupDeploymentStackSnapshot(string
 
             catch (Exception ex)
             {
-                if (!throwIfNotExists &&
-                    ex is DeploymentStacksErrorException dex &&
-                    dex.Response.StatusCode == System.Net.HttpStatusCode.NotFound)
+                if (ex is DeploymentStacksErrorException dex)
                 {
-                    // Deployment Stack does not exist
-                    return null;
+                    if (dex.Response.StatusCode == System.Net.HttpStatusCode.NotFound)
+                    {
+                        // Deployment Stack does not exist
+                        if (!throwIfNotExists)
+                            return null;
+                        else
+                            throw new PSArgumentException(
+                            $"DeploymentStackSnapshot '{snapshotName}' of DeploymentStack '{stackName}' in Resource Group '{resourceGroupName}' not found.."
+                        );
+                    }
+                    else
+                    {
+                        throw new PSArgumentException(dex.Body.Error.Message);
+                    }
                 }
 
                 throw;
@@ -252,12 +274,22 @@ public PSDeploymentStackSnapshot GetSubscriptionDeploymentStackSnapshot(string s
             }
             catch (Exception ex)
             {
-                if (!throwIfNotExists &&
-                    ex is DeploymentStacksErrorException dex &&
-                    dex.Response.StatusCode == System.Net.HttpStatusCode.NotFound)
+                if (ex is DeploymentStacksErrorException dex)
                 {
-                    // Deployment Stack does not exist
-                    return null;
+                    if (dex.Response.StatusCode == System.Net.HttpStatusCode.NotFound)
+                    {
+                        // Deployment Stack does not exist
+                        if (!throwIfNotExists)
+                            return null;
+                        else
+                            throw new PSArgumentException(
+                            $"DeploymentStackSnapshot '{snapshotName}' of DeploymentStack '{stackName}' not found in current subscription."
+                        );
+                    }
+                    else
+                    {
+                        throw new PSArgumentException(dex.Body.Error.Message);
+                    }
                 }
 
                 throw;
diff --git a/src/Resources/ResourceManager/SdkModels/DeploymentStacks/PSDeploymentStack.cs b/src/Resources/ResourceManager/SdkModels/DeploymentStacks/PSDeploymentStack.cs
@@ -19,7 +19,7 @@ public class PSDeploymentStack
 
         public string type { get; set; }
 
-        public DateTime? creationTime { get; set; }
+        public SystemData systemData { get; set; }
 
         public string location { get; set; }
 
@@ -56,7 +56,8 @@ internal PSDeploymentStack(DeploymentStack deploymentStack)
             this.id = deploymentStack.Id;
             this.name = deploymentStack.Name;
             this.type = deploymentStack.Type;
-            this.creationTime = (deploymentStack.SystemData != null) ? deploymentStack.SystemData.CreatedAt : null;
+            this.systemData = deploymentStack.SystemData;
+            this.updateBehavior = deploymentStack.UpdateBehavior;
             this.location = deploymentStack.Location;
             this.template = deploymentStack.Template;
             this.templateLink = deploymentStack.TemplateLink;
diff --git a/src/Resources/ResourceManager/SdkModels/DeploymentStacks/PSDeploymentStackSnapshot.cs b/src/Resources/ResourceManager/SdkModels/DeploymentStacks/PSDeploymentStackSnapshot.cs
@@ -15,7 +15,7 @@ public class PSDeploymentStackSnapshot
 
         public string type { get; set; }
 
-        public DateTime? creationTime { get; set; }
+        public SystemData systemData { get; set; }
 
         public object template { get; set; }
 
@@ -54,7 +54,8 @@ internal PSDeploymentStackSnapshot(DeploymentStackSnapshot deploymentStackSnapsh
             this.id = deploymentStackSnapshot.Id;
             this.name = deploymentStackSnapshot.Name;
             this.type = deploymentStackSnapshot.Type;
-            this.creationTime = deploymentStackSnapshot.SystemData.CreatedAt;
+            this.systemData = deploymentStackSnapshot.SystemData;
+            this.updateBehavior = deploymentStackSnapshot.UpdateBehavior;
             this.template = deploymentStackSnapshot.Template;
             this.templateLink = deploymentStackSnapshot.TemplateLink;
             this.parameters = deploymentStackSnapshot.Parameters;
diff --git a/src/Resources/Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.TemplateSpecTests/TestTemplateSpecCreate.json b/src/Resources/Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.TemplateSpecTests/TestTemplateSpecCreate.json
diff --git a/src/Resources/Resources/Resources.format.ps1xml b/src/Resources/Resources/Resources.format.ps1xml

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public override void ExecuteCmdlet()`
`105`	`105`	`throw new PSInvalidOperationException(`
`106`	`106`	`string.Format(ProjectResources.InvalidFilePath, TemplateFile));`
`107`	`107`	`}`
`108`		`- TemplateUri = TemplateFile;`
	`108`	`+ TemplateUri = filePath;`
`109`	`109`	`break;`
`110`	`110`	`case ParameterFileTemplateSpecParameterSetName:`
`111`	`111`	`case ParameterFileTemplateUriParameterSetName:`
`@@ -119,7 +119,7 @@ public override void ExecuteCmdlet()`
`119`	`119`	`string.Format(ProjectResources.InvalidFilePath, TemplateFile));`
`120`	`120`	`}`
`121`	`121`	`parameters = this.GetParameterObject(ParameterFile);`
`122`		`- TemplateUri = TemplateFile;`
	`122`	`+ TemplateUri = templatePath;`
`123`	`123`	`break;`
`124`	`124`	`}`
`125`	`125`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public override void ExecuteCmdlet()`
`103`	`103`	`throw new PSInvalidOperationException(`
`104`	`104`	`string.Format(ProjectResources.InvalidFilePath, TemplateFile));`
`105`	`105`	`}`
`106`		`- TemplateUri = TemplateFile;`
	`106`	`+ TemplateUri = filePath;`
`107`	`107`	`break;`
`108`	`108`	`case ParameterFileTemplateSpecParameterSetName:`
`109`	`109`	`case ParameterFileTemplateUriParameterSetName:`
`@@ -117,7 +117,7 @@ public override void ExecuteCmdlet()`
`117`	`117`	`string.Format(ProjectResources.InvalidFilePath, TemplateFile));`
`118`	`118`	`}`
`119`	`119`	`parameters = this.GetParameterObject(ParameterFile);`
`120`		`- TemplateUri = TemplateFile;`
	`120`	`+ TemplateUri = templatePath;`
`121`	`121`	`break;`
`122`	`122`	`}`
`123`	`123`
Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,6 @@ public override void ExecuteCmdlet()`
`38`	`38`	`{`
`39`	`39`	`try`
`40`	`40`	`{`
`41`		`- ResourceIdentifier resourceIdentifier = (ResourceId != null)`
`42`		`- ? new ResourceIdentifier(ResourceId)`
`43`		`- : null;`
`44`		`-`
`45`	`41`	`Name = Name ?? ResourceIdUtility.GetResourceName(ResourceId);`
`46`	`42`
`47`	`43`	`string confirmationMessage = $"Are you sure you want to remove DeploymentStack '{Name}'";`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public override void ExecuteCmdlet()`
`109`	`109`	`throw new PSInvalidOperationException(`
`110`	`110`	`string.Format(ProjectResources.InvalidFilePath, TemplateFile));`
`111`	`111`	`}`
`112`		`- TemplateUri = TemplateFile;`
	`112`	`+ TemplateUri = filePath;`
`113`	`113`	`break;`
`114`	`114`	`case ParameterFileTemplateSpecParameterSetName:`
`115`	`115`	`case ParameterFileTemplateUriParameterSetName:`
`@@ -123,7 +123,7 @@ public override void ExecuteCmdlet()`
`123`	`123`	`string.Format(ProjectResources.InvalidFilePath, TemplateFile));`
`124`	`124`	`}`
`125`	`125`	`parameters = this.GetParameterObject(ParameterFile);`
`126`		`- TemplateUri = TemplateFile;`
	`126`	`+ TemplateUri = templatePath;`
`127`	`127`	`break;`
`128`	`128`	`}`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public override void ExecuteCmdlet()`
`107`	`107`	`throw new PSInvalidOperationException(`
`108`	`108`	`string.Format(ProjectResources.InvalidFilePath, TemplateFile));`
`109`	`109`	`}`
`110`		`- TemplateUri = TemplateFile;`
	`110`	`+ TemplateUri = filePath;`
`111`	`111`	`break;`
`112`	`112`	`case ParameterFileTemplateSpecParameterSetName:`
`113`	`113`	`case ParameterFileTemplateUriParameterSetName:`
`@@ -121,7 +121,7 @@ public override void ExecuteCmdlet()`
`121`	`121`	`string.Format(ProjectResources.InvalidFilePath, TemplateFile));`
`122`	`122`	`}`
`123`	`123`	`parameters = this.GetParameterObject(ParameterFile);`
`124`		`- TemplateUri = TemplateFile;`
	`124`	`+ TemplateUri = templatePath;`
`125`	`125`	`break;`
`126`	`126`	`}`
`127`	`127`