Fix error message

maddieclayton · maddieclayton · commit ae651ccb14da · 2018-03-22T10:54:19.000-07:00
diff --git a/src/ResourceManager/Network/Commands.Network/Properties/Resources.Designer.cs b/src/ResourceManager/Network/Commands.Network/Properties/Resources.Designer.cs
diff --git a/src/ResourceManager/Network/Commands.Network/Properties/Resources.resx b/src/ResourceManager/Network/Commands.Network/Properties/Resources.resx
@@ -168,7 +168,7 @@
     <value>ResourceGroupNotSet</value>
   </data>
   <data name="ResourceNotFound" xml:space="preserve">
-    <value>Resource : {0}, not found</value>
+    <value>Resource '{0}' not found</value>
   </data>
   <data name="SetByResource" xml:space="preserve">
     <value>SetByResource</value>
diff --git a/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/AddAzureVpnClientRevokedCertificateCommand.cs b/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/AddAzureVpnClientRevokedCertificateCommand.cs
@@ -63,7 +63,7 @@ public override void Execute()
             base.Execute();
             if (!this.IsVirtualNetworkGatewayPresent(ResourceGroupName, VirtualNetworkGatewayName))
             {
-                throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);
+                throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, VirtualNetworkGatewayName));
             }
 
             var vnetGateway = this.GetVirtualNetworkGateway(this.ResourceGroupName, this.VirtualNetworkGatewayName);
diff --git a/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/AddAzureVpnClientRootCertificateCommand.cs b/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/AddAzureVpnClientRootCertificateCommand.cs
@@ -64,7 +64,7 @@ public override void Execute()
             base.Execute();
             if (!this.IsVirtualNetworkGatewayPresent(ResourceGroupName, VirtualNetworkGatewayName))
             {
-                throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);
+                throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, VirtualNetworkGatewayName));
             }
 
             var vnetGateway = this.GetVirtualNetworkGateway(this.ResourceGroupName, this.VirtualNetworkGatewayName);
diff --git a/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/GenerateAzureVpnClientPackage.cs b/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/GenerateAzureVpnClientPackage.cs
@@ -55,7 +55,7 @@ public override void Execute()
 
             if (!this.IsVirtualNetworkGatewayPresent(ResourceGroupName, VirtualNetworkGatewayName))
             {
-                throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);
+                throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, VirtualNetworkGatewayName));
             }
 
             PSVpnClientParameters vpnClientParams = new PSVpnClientParameters();
diff --git a/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/RemoveAzureVirtualNetworkGatewayDefaultSiteCommand.cs b/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/RemoveAzureVirtualNetworkGatewayDefaultSiteCommand.cs
@@ -37,7 +37,7 @@ public override void Execute()
             base.Execute();
             if (!this.IsVirtualNetworkGatewayPresent(this.VirtualNetworkGateway.ResourceGroupName, this.VirtualNetworkGateway.Name))
             {
-                throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);
+                throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, this.VirtualNetworkGateway.Name);
             }
 
             this.VirtualNetworkGateway.GatewayDefaultSite = null;
diff --git a/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/RemoveAzureVpnClientRevokedCertificateCommand.cs b/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/RemoveAzureVpnClientRevokedCertificateCommand.cs
@@ -61,7 +61,7 @@ public override void Execute()
             base.Execute();
             if (!this.IsVirtualNetworkGatewayPresent(ResourceGroupName, VirtualNetworkGatewayName))
             {
-                throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);
+                throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, VirtualNetworkGatewayName));
             }
 
             var vnetGateway = this.GetVirtualNetworkGateway(this.ResourceGroupName, this.VirtualNetworkGatewayName);
diff --git a/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/RemoveAzureVpnClientRootCertificateCommand.cs b/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/RemoveAzureVpnClientRootCertificateCommand.cs
@@ -62,7 +62,7 @@ public override void Execute()
             base.Execute();
             if (!this.IsVirtualNetworkGatewayPresent(ResourceGroupName, VirtualNetworkGatewayName))
             {
-                throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);
+                throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, VirtualNetworkGatewayName));
             }
 
             var vnetGateway = this.GetVirtualNetworkGateway(this.ResourceGroupName, this.VirtualNetworkGatewayName);
diff --git a/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/SetAzureVirtualNetworkGatewayDefaultSiteCommand.cs b/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/SetAzureVirtualNetworkGatewayDefaultSiteCommand.cs
@@ -45,7 +45,7 @@ public override void Execute()
             base.Execute();
             if (!this.IsVirtualNetworkGatewayPresent(this.VirtualNetworkGateway.ResourceGroupName, this.VirtualNetworkGateway.Name))
             {
-                throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);
+                throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, this.VirtualNetworkGateway.Name));
             }
 
             this.VirtualNetworkGateway.GatewayDefaultSite = new PSResourceId();
diff --git a/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/SetAzureVirtualNetworkGatewayVpnClientConfig.cs b/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/SetAzureVirtualNetworkGatewayVpnClientConfig.cs
@@ -81,7 +81,7 @@ public override void Execute()
 
             if (!this.IsVirtualNetworkGatewayPresent(this.VirtualNetworkGateway.ResourceGroupName, this.VirtualNetworkGateway.Name))
             {
-                throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);
+                throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, this.VirtualNetworkGateway.Name));
             }
 
             if (this.VirtualNetworkGateway.VpnClientConfiguration == null)
diff --git a/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/UpdateAzureVirtualNetworkGatewayCommand.cs b/src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/UpdateAzureVirtualNetworkGatewayCommand.cs
@@ -141,7 +141,7 @@ public override void Execute()
 
             if (!this.IsVirtualNetworkGatewayPresent(this.VirtualNetworkGateway.ResourceGroupName, this.VirtualNetworkGateway.Name))
             {
-                throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);
+                throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, this.VirtualNetworkGateway.Name));
             }
 
             if (this.EnableActiveActiveFeature.IsPresent && this.DisableActiveActiveFeature.IsPresent)

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public override void Execute()`
`63`	`63`	`base.Execute();`
`64`	`64`	`if (!this.IsVirtualNetworkGatewayPresent(ResourceGroupName, VirtualNetworkGatewayName))`
`65`	`65`	`{`
`66`		`- throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);`
	`66`	`+ throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, VirtualNetworkGatewayName));`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`var vnetGateway = this.GetVirtualNetworkGateway(this.ResourceGroupName, this.VirtualNetworkGatewayName);`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public override void Execute()`
`64`	`64`	`base.Execute();`
`65`	`65`	`if (!this.IsVirtualNetworkGatewayPresent(ResourceGroupName, VirtualNetworkGatewayName))`
`66`	`66`	`{`
`67`		`- throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);`
	`67`	`+ throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, VirtualNetworkGatewayName));`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`var vnetGateway = this.GetVirtualNetworkGateway(this.ResourceGroupName, this.VirtualNetworkGatewayName);`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public override void Execute()`
`55`	`55`
`56`	`56`	`if (!this.IsVirtualNetworkGatewayPresent(ResourceGroupName, VirtualNetworkGatewayName))`
`57`	`57`	`{`
`58`		`- throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);`
	`58`	`+ throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, VirtualNetworkGatewayName));`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`PSVpnClientParameters vpnClientParams = new PSVpnClientParameters();`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public override void Execute()`
`37`	`37`	`base.Execute();`
`38`	`38`	`if (!this.IsVirtualNetworkGatewayPresent(this.VirtualNetworkGateway.ResourceGroupName, this.VirtualNetworkGateway.Name))`
`39`	`39`	`{`
`40`		`- throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);`
	`40`	`+ throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, this.VirtualNetworkGateway.Name);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`this.VirtualNetworkGateway.GatewayDefaultSite = null;`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public override void Execute()`
`61`	`61`	`base.Execute();`
`62`	`62`	`if (!this.IsVirtualNetworkGatewayPresent(ResourceGroupName, VirtualNetworkGatewayName))`
`63`	`63`	`{`
`64`		`- throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);`
	`64`	`+ throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, VirtualNetworkGatewayName));`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`var vnetGateway = this.GetVirtualNetworkGateway(this.ResourceGroupName, this.VirtualNetworkGatewayName);`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public override void Execute()`
`62`	`62`	`base.Execute();`
`63`	`63`	`if (!this.IsVirtualNetworkGatewayPresent(ResourceGroupName, VirtualNetworkGatewayName))`
`64`	`64`	`{`
`65`		`- throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);`
	`65`	`+ throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, VirtualNetworkGatewayName));`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`var vnetGateway = this.GetVirtualNetworkGateway(this.ResourceGroupName, this.VirtualNetworkGatewayName);`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public override void Execute()`
`45`	`45`	`base.Execute();`
`46`	`46`	`if (!this.IsVirtualNetworkGatewayPresent(this.VirtualNetworkGateway.ResourceGroupName, this.VirtualNetworkGateway.Name))`
`47`	`47`	`{`
`48`		`- throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);`
	`48`	`+ throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, this.VirtualNetworkGateway.Name));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`this.VirtualNetworkGateway.GatewayDefaultSite = new PSResourceId();`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public override void Execute()`
`81`	`81`
`82`	`82`	`if (!this.IsVirtualNetworkGatewayPresent(this.VirtualNetworkGateway.ResourceGroupName, this.VirtualNetworkGateway.Name))`
`83`	`83`	`{`
`84`		`- throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);`
	`84`	`+ throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, this.VirtualNetworkGateway.Name));`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`if (this.VirtualNetworkGateway.VpnClientConfiguration == null)`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public override void Execute()`
`141`	`141`
`142`	`142`	`if (!this.IsVirtualNetworkGatewayPresent(this.VirtualNetworkGateway.ResourceGroupName, this.VirtualNetworkGateway.Name))`
`143`	`143`	`{`
`144`		`- throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);`
	`144`	`+ throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound, this.VirtualNetworkGateway.Name));`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`if (this.EnableActiveActiveFeature.IsPresent && this.DisableActiveActiveFeature.IsPresent)`