Merge pull request Azure#122 from t-alguer/ignite_dev

ogail · ogail · commit 5d46f6f34f20 · 2015-04-20T09:28:00.000-07:00
Adding warning when trailing dot + Adding the project to the ResourceManager
diff --git a/src/ResourceManager.sln b/src/ResourceManager.sln
@@ -55,6 +55,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites.Test", "R
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights.Test", "ResourceManager\Insights\Commands.Insights.Test\Commands.Insights.Test.csproj", "{469F20E0-9D40-41AD-94C3-B47AD15A4C00}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns", "ResourceManager\Dns\Commands.Dns\Commands.Dns.csproj", "{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns.Test", "ResourceManager\Dns\Commands.Dns.Test\Commands.Dns.Test.csproj", "{133561EC-99AF-4ADC-AF41-39C4D3AD323B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -149,6 +153,14 @@ Global
 		{469F20E0-9D40-41AD-94C3-B47AD15A4C00}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{469F20E0-9D40-41AD-94C3-B47AD15A4C00}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{469F20E0-9D40-41AD-94C3-B47AD15A4C00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -162,7 +174,8 @@ Global
 		{080B0477-7E52-4455-90AB-23BD13D1B1CE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
-		{469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{F4ABAD68-64A5-4B23-B09C-42559A7524DE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{133561EC-99AF-4ADC-AF41-39C4D3AD323B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 	EndGlobalSection
 EndGlobal
diff --git a/src/ResourceManager/Dns/Commands.Dns/Records/GetAzureDnsRescordSet.cs b/src/ResourceManager/Dns/Commands.Dns/Records/GetAzureDnsRescordSet.cs
@@ -63,6 +63,12 @@ public override void ExecuteCmdlet()
 
             if (this.ParameterSetName == "Fields")
             {
+                if (this.ZoneName.EndsWith("."))
+                {
+                    this.ZoneName = this.ZoneName.TrimEnd('.');
+                    this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'.  Zone name used is \"{0}\".", this.ZoneName));
+                }
+
                 zoneName = this.ZoneName;
                 resourceGroupName = this.ResourceGroupName;
             }
@@ -79,6 +85,12 @@ public override void ExecuteCmdlet()
                     throw new PSArgumentException("If you specify the Name parameter you must also specify the RecordType parameter.");
                 }
 
+                if (this.Name.EndsWith("."))
+                {
+                    this.Name = this.Name.TrimEnd('.');
+                    this.WriteWarning(string.Format("Modifying recordset name to remove terminating '.'.  Recordset name used is \"{0}\".", this.Name));
+                }
+
                 DnsRecordSet result = this.DnsClient.GetDnsRecordSet(this.Name, zoneName, resourceGroupName, recordType);
                 this.WriteObject(result);
             }
diff --git a/src/ResourceManager/Dns/Commands.Dns/Records/NewAzureDnsRescordSet.cs b/src/ResourceManager/Dns/Commands.Dns/Records/NewAzureDnsRescordSet.cs
@@ -69,6 +69,12 @@ public override void ExecuteCmdlet()
 
             if (ParameterSetName == "Fields")
             {
+                if (this.ZoneName.EndsWith("."))
+                {
+                    this.ZoneName = this.ZoneName.TrimEnd('.');
+                    this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'.  Zone name used is \"{0}\".", this.ZoneName));
+                }
+
                 zoneName = this.ZoneName;
                 resourceGroupname = this.ResourceGroupName;
             }
@@ -78,6 +84,12 @@ public override void ExecuteCmdlet()
                 resourceGroupname = this.Zone.ResourceGroupName;
             }
 
+            if (this.Name.EndsWith("."))
+            {
+                this.Name = this.Name.TrimEnd('.');
+                this.WriteWarning(string.Format("Modifying recordset name to remove terminating '.'.  Recordset name used is \"{0}\".", this.Name));
+            }
+
             ConfirmAction(
                 !Overwrite.IsPresent || Force.IsPresent,
                 string.Format(ProjectResources.Confirm_OverwriteRecord, this.Name, this.RecordType, zoneName),
diff --git a/src/ResourceManager/Dns/Commands.Dns/Records/RemoveAzureDnsRecordSet.cs b/src/ResourceManager/Dns/Commands.Dns/Records/RemoveAzureDnsRecordSet.cs
@@ -69,6 +69,18 @@ public override void ExecuteCmdlet()
 
             if (this.ParameterSetName == "Fields")
             {
+                if (this.Name.EndsWith("."))
+                {
+                    this.Name = this.Name.TrimEnd('.');
+                    this.WriteWarning(string.Format("Modifying recordset name to remove terminating '.'.  Recordset name used is \"{0}\".", this.Name));
+                }
+
+                if (this.ZoneName.EndsWith("."))
+                {
+                    this.ZoneName = this.ZoneName.TrimEnd('.');
+                    this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'.  Zone name used is \"{0}\".", this.ZoneName));
+                }
+
                 recordSetToDelete = new DnsRecordSet
                 {
                     Name = this.Name,
@@ -80,6 +92,12 @@ public override void ExecuteCmdlet()
             }
             else if (this.ParameterSetName == "Mixed")
             {
+                if (this.Name.EndsWith("."))
+                {
+                    this.Name = this.Name.TrimEnd('.');
+                    this.WriteWarning(string.Format("Modifying recordset name to remove terminating '.'.  Recordset name used is \"{0}\".", this.Name));
+                }
+
                 recordSetToDelete = new DnsRecordSet
                 {
                     Name = this.Name,
diff --git a/src/ResourceManager/Dns/Commands.Dns/Zones/GetAzureDnsZone.cs b/src/ResourceManager/Dns/Commands.Dns/Zones/GetAzureDnsZone.cs
@@ -36,11 +36,17 @@ public override void ExecuteCmdlet()
         {
             if (this.Name != null)
             {
-                WriteObject(this.DnsClient.GetDnsZone(this.Name, this.ResourceGroupName));
+                if (this.Name.EndsWith("."))
+                {
+                    this.Name = this.Name.TrimEnd('.');
+                    this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'.  Zone name used is \"{0}\".", this.Name));
+                }
+
+                this.WriteObject(this.DnsClient.GetDnsZone(this.Name, this.ResourceGroupName));
             }
             else
             {
-                WriteObject(this.DnsClient.ListDnsZones(this.ResourceGroupName));
+                this.WriteObject(this.DnsClient.ListDnsZones(this.ResourceGroupName));
             }
         }
     }
diff --git a/src/ResourceManager/Dns/Commands.Dns/Zones/NewAzureDnsZone.cs b/src/ResourceManager/Dns/Commands.Dns/Zones/NewAzureDnsZone.cs
@@ -40,10 +40,16 @@ public class NewAzureDnsZone : DnsBaseCmdlet
 
         public override void ExecuteCmdlet()
         {
+            if (this.Name.EndsWith("."))
+            {
+                this.Name = this.Name.TrimEnd('.');
+                this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'.  Zone name used is \"{0}\".", this.Name));
+            }
+
             DnsZone result = this.DnsClient.CreateDnsZone(this.Name, this.ResourceGroupName, this.Tag);
-            WriteVerbose(ProjectResources.Success);
-            WriteVerbose(string.Format(ProjectResources.Success_NewZone, this.Name, this.ResourceGroupName));
-            WriteObject(result);
+            this.WriteVerbose(ProjectResources.Success);
+            this.WriteVerbose(string.Format(ProjectResources.Success_NewZone, this.Name, this.ResourceGroupName));
+            this.WriteObject(result);
         }
     }
 }
diff --git a/src/ResourceManager/Dns/Commands.Dns/Zones/RemoveAzureDnsZone.cs b/src/ResourceManager/Dns/Commands.Dns/Zones/RemoveAzureDnsZone.cs
@@ -55,6 +55,12 @@ public override void ExecuteCmdlet()
 
             if (this.ParameterSetName == "Fields")
             {
+                if (this.Name.EndsWith("."))
+                {
+                    this.Name = this.Name.TrimEnd('.');
+                    this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'.  Zone name used is \"{0}\".", this.Name));
+                }
+
                 zoneToDelete = new DnsZone 
                 {
                     Name = this.Name,
@@ -64,12 +70,12 @@ public override void ExecuteCmdlet()
             }
             else if (this.ParameterSetName == "Object")
             {
-                zoneToDelete = this.Zone;
-
                 if ((string.IsNullOrWhiteSpace(this.Zone.Etag) || this.Zone.Etag == "*") && !this.IgnoreEtag.IsPresent)
                 {
                     throw new PSArgumentException(string.Format(ProjectResources.Error_EtagNotSpecified, typeof(DnsZone).Name));
                 }
+
+                zoneToDelete = this.Zone;
             }
 
             bool ignoreEtag = this.IgnoreEtag.IsPresent || this.ParameterSetName != "Object";
diff --git a/src/ResourceManager/Dns/Commands.Dns/Zones/SetAzureDnsZone.cs b/src/ResourceManager/Dns/Commands.Dns/Zones/SetAzureDnsZone.cs
@@ -52,6 +52,12 @@ public override void ExecuteCmdlet()
 
             if (this.ParameterSetName == "Fields")
             {
+                if (this.Name.EndsWith("."))
+                {
+                    this.Name = this.Name.TrimEnd('.');
+                    this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'.  Zone name used is \"{0}\".", this.Name));
+                }
+
                 zoneToUpdate = new DnsZone
                 {
                     Name = this.Name,
diff --git a/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1 b/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1
@@ -77,7 +77,7 @@ NestedModules = @(
     '.\DataFactories\Microsoft.Azure.Commands.DataFactories.dll',
     '.\RedisCache\Microsoft.Azure.Commands.RedisCache.dll',
     '.\Batch\Microsoft.Azure.Commands.Batch.dll',
-    '.\Dns\Microsoft.Azure.Commands.Dns.dll'
+    '.\Dns\Microsoft.Azure.Commands.Dns.dll',
     '.\KeyVault\Microsoft.Azure.Commands.KeyVault.dll',
     '.\StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.dll',
     '.\Insights\Microsoft.Azure.Commands.Insights.dll',

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,12 @@ public override void ExecuteCmdlet()`
`63`	`63`
`64`	`64`	`if (this.ParameterSetName == "Fields")`
`65`	`65`	`{`
	`66`	`+ if (this.ZoneName.EndsWith("."))`
	`67`	`+ {`
	`68`	`+ this.ZoneName = this.ZoneName.TrimEnd('.');`
	`69`	`+ this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'. Zone name used is \"{0}\".", this.ZoneName));`
	`70`	`+ }`
	`71`	`+`
`66`	`72`	`zoneName = this.ZoneName;`
`67`	`73`	`resourceGroupName = this.ResourceGroupName;`
`68`	`74`	`}`
`@@ -79,6 +85,12 @@ public override void ExecuteCmdlet()`
`79`	`85`	`throw new PSArgumentException("If you specify the Name parameter you must also specify the RecordType parameter.");`
`80`	`86`	`}`
`81`	`87`
	`88`	`+ if (this.Name.EndsWith("."))`
	`89`	`+ {`
	`90`	`+ this.Name = this.Name.TrimEnd('.');`
	`91`	`+ this.WriteWarning(string.Format("Modifying recordset name to remove terminating '.'. Recordset name used is \"{0}\".", this.Name));`
	`92`	`+ }`
	`93`	`+`
`82`	`94`	`DnsRecordSet result = this.DnsClient.GetDnsRecordSet(this.Name, zoneName, resourceGroupName, recordType);`
`83`	`95`	`this.WriteObject(result);`
`84`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,17 @@ public override void ExecuteCmdlet()`
`36`	`36`	`{`
`37`	`37`	`if (this.Name != null)`
`38`	`38`	`{`
`39`		`- WriteObject(this.DnsClient.GetDnsZone(this.Name, this.ResourceGroupName));`
	`39`	`+ if (this.Name.EndsWith("."))`
	`40`	`+ {`
	`41`	`+ this.Name = this.Name.TrimEnd('.');`
	`42`	`+ this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'. Zone name used is \"{0}\".", this.Name));`
	`43`	`+ }`
	`44`	`+`
	`45`	`+ this.WriteObject(this.DnsClient.GetDnsZone(this.Name, this.ResourceGroupName));`
`40`	`46`	`}`
`41`	`47`	`else`
`42`	`48`	`{`
`43`		`- WriteObject(this.DnsClient.ListDnsZones(this.ResourceGroupName));`
	`49`	`+ this.WriteObject(this.DnsClient.ListDnsZones(this.ResourceGroupName));`
`44`	`50`	`}`
`45`	`51`	`}`
`46`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,16 @@ public class NewAzureDnsZone : DnsBaseCmdlet`
`40`	`40`
`41`	`41`	`public override void ExecuteCmdlet()`
`42`	`42`	`{`
	`43`	`+ if (this.Name.EndsWith("."))`
	`44`	`+ {`
	`45`	`+ this.Name = this.Name.TrimEnd('.');`
	`46`	`+ this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'. Zone name used is \"{0}\".", this.Name));`
	`47`	`+ }`
	`48`	`+`
`43`	`49`	`DnsZone result = this.DnsClient.CreateDnsZone(this.Name, this.ResourceGroupName, this.Tag);`
`44`		`- WriteVerbose(ProjectResources.Success);`
`45`		`- WriteVerbose(string.Format(ProjectResources.Success_NewZone, this.Name, this.ResourceGroupName));`
`46`		`- WriteObject(result);`
	`50`	`+ this.WriteVerbose(ProjectResources.Success);`
	`51`	`+ this.WriteVerbose(string.Format(ProjectResources.Success_NewZone, this.Name, this.ResourceGroupName));`
	`52`	`+ this.WriteObject(result);`
`47`	`53`	`}`
`48`	`54`	`}`
`49`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,12 @@ public override void ExecuteCmdlet()`
`55`	`55`
`56`	`56`	`if (this.ParameterSetName == "Fields")`
`57`	`57`	`{`
	`58`	`+ if (this.Name.EndsWith("."))`
	`59`	`+ {`
	`60`	`+ this.Name = this.Name.TrimEnd('.');`
	`61`	`+ this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'. Zone name used is \"{0}\".", this.Name));`
	`62`	`+ }`
	`63`	`+`
`58`	`64`	`zoneToDelete = new DnsZone`
`59`	`65`	`{`
`60`	`66`	`Name = this.Name,`
`@@ -64,12 +70,12 @@ public override void ExecuteCmdlet()`
`64`	`70`	`}`
`65`	`71`	`else if (this.ParameterSetName == "Object")`
`66`	`72`	`{`
`67`		`- zoneToDelete = this.Zone;`
`68`		`-`
`69`	`73`	`if ((string.IsNullOrWhiteSpace(this.Zone.Etag) \|\| this.Zone.Etag == "*") && !this.IgnoreEtag.IsPresent)`
`70`	`74`	`{`
`71`	`75`	`throw new PSArgumentException(string.Format(ProjectResources.Error_EtagNotSpecified, typeof(DnsZone).Name));`
`72`	`76`	`}`
	`77`	`+`
	`78`	`+ zoneToDelete = this.Zone;`
`73`	`79`	`}`
`74`	`80`
`75`	`81`	`bool ignoreEtag = this.IgnoreEtag.IsPresent \|\| this.ParameterSetName != "Object";`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,12 @@ public override void ExecuteCmdlet()`
`52`	`52`
`53`	`53`	`if (this.ParameterSetName == "Fields")`
`54`	`54`	`{`
	`55`	`+ if (this.Name.EndsWith("."))`
	`56`	`+ {`
	`57`	`+ this.Name = this.Name.TrimEnd('.');`
	`58`	`+ this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'. Zone name used is \"{0}\".", this.Name));`
	`59`	`+ }`
	`60`	`+`
`55`	`61`	`zoneToUpdate = new DnsZone`
`56`	`62`	`{`
`57`	`63`	`Name = this.Name,`