Added configuration name validation. Improved error handling for Import-AzAutomationDscConfiguration

Author: Leandro Wajswajn Pereyra

src/Automation/Automation/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Added configuration name validation to Import-AzAutomationDscConfiguration cmdlet
+* Improved error handling for Import-AzAutomationDscConfiguration cmdlet
 
 ## Version 1.1.0
 * Added support for Python 2 runbooks

src/Automation/Automation/Common/AutomationPSClientDSC.cs

@@ -173,15 +173,11 @@ public Model.DscConfiguration CreateConfiguration(
                 string fileContent = null;
                 string configurationName = String.Empty;
 
-                try
+                if (File.Exists(Path.GetFullPath(sourcePath)))
                 {
-                    if (File.Exists(Path.GetFullPath(sourcePath)))
-                    {
-                        fileContent = System.IO.File.ReadAllText(sourcePath);
-                    }
+                    fileContent = System.IO.File.ReadAllText(sourcePath);
                 }
-                catch (Exception)
-                {
+                else {
                     // exception in accessing the file path
                     throw new FileNotFoundException(
                                         string.Format(
@@ -192,6 +188,10 @@ public Model.DscConfiguration CreateConfiguration(
                 // configuration name is same as filename
                 configurationName = Path.GetFileNameWithoutExtension(sourcePath);
 
+                if (!System.Text.RegularExpressions.Regex.IsMatch(configurationName, "^([a-zA-Z]{1}([a-zA-Z0-9]|_){0,63})$")) {
+                    throw new PSInvalidOperationException("Invalid configuration name. Valid configuration names can contain only letters, numbers, and underscores. The name must start with a letter. The length of the name must be between 1 and 64 characters. ");
+                }
+
                 // for the private preview, configuration can be imported in Published mode only
                 // Draft mode is not implemented
                 if (!published)
@@ -238,14 +238,30 @@ public Model.DscConfiguration CreateConfiguration(
                         }
                 };
 
-                var configuration =
-                    this.automationManagementClient.DscConfiguration.CreateOrUpdate(
+                try
+                {
+                    var configuration =
+                        this.automationManagementClient.DscConfiguration.CreateOrUpdate(
                         resourceGroupName,
                         automationAccountName,
                         configurationName,
                         configurationCreateParameters);
 
-                return new Model.DscConfiguration(resourceGroupName, automationAccountName, configuration);
+                    return new Model.DscConfiguration(resourceGroupName, automationAccountName, configuration);
+                }
+                catch (Microsoft.Azure.Management.Automation.Models.ErrorResponseException ex)
+                {
+                    if (ex.Response.Content != null)
+                    {
+                        throw new Microsoft.Azure.Management.Automation.Models.ErrorResponseException(ex.Response.Content, ex);
+                    }
+                    else {
+                        throw ex;
+                    }
+                }
+                catch (Exception ex) {
+                    throw ex;
+                }
             }
         }