Merge pull request #19 from felixcho-msft/dev

New Graphical Runbook types

Author: safeermohammed

src/ResourceManager/Automation/Commands.Automation/Cmdlet/ImportAzureAutomationRunbook.cs

@@ -61,7 +61,12 @@ public class ImportAzureAutomationRunbook : AzureAutomationBaseCmdlet
         /// Gets or sets the runbook version type
         /// </summary>
         [Parameter(Mandatory = true, HelpMessage = "Runbook definition type.")]
-        [ValidateSet(Constants.RunbookType.Graph, Constants.RunbookType.PowerShell, Constants.RunbookType.PowerShellWorkflow, IgnoreCase = true)]
+        [ValidateSet(Constants.RunbookType.Graph,
+            Constants.RunbookType.GraphPowerShell,
+            Constants.RunbookType.GraphPowerShellWorkflow,
+            Constants.RunbookType.PowerShell,
+            Constants.RunbookType.PowerShellWorkflow,
+            IgnoreCase = true)]
         [ValidateNotNullOrEmpty]
         public string Type { get; set; }
 

src/ResourceManager/Automation/Commands.Automation/Cmdlet/NewAzureAutomationRunbook.cs

@@ -53,7 +53,12 @@ public class NewAzureAutomationRunbook : AzureAutomationBaseCmdlet
         /// Gets or sets the runbook version type
         /// </summary>
         [Parameter(Mandatory = true, HelpMessage = "Runbook definition type.")]
-        [ValidateSet(Constants.RunbookType.Graph, Constants.RunbookType.PowerShell, Constants.RunbookType.PowerShellWorkflow, IgnoreCase = true)]
+        [ValidateSet(Constants.RunbookType.Graph,
+            Constants.RunbookType.GraphPowerShell,
+            Constants.RunbookType.GraphPowerShellWorkflow,
+            Constants.RunbookType.PowerShell,
+            Constants.RunbookType.PowerShellWorkflow,
+            IgnoreCase = true)]
         [ValidateNotNullOrEmpty]
         public string Type { get; set; }
 

src/ResourceManager/Automation/Commands.Automation/Common/AutomationClient.cs

@@ -454,7 +454,7 @@ public Runbook CreateRunbookByName(string resourceGroupName, string automationAc
                 var rdcprop = new RunbookCreateOrUpdateDraftProperties()
                 {
                     Description = description,
-                    RunbookType = String.IsNullOrWhiteSpace(type) ? RunbookTypeEnum.Script : (0 == string.Compare(type, Constants.RunbookType.PowerShellWorkflow, StringComparison.OrdinalIgnoreCase)) ? RunbookTypeEnum.Script : type,
+                    RunbookType = String.IsNullOrWhiteSpace(type) ? RunbookTypeEnum.Script : type,
                     LogProgress =  logProgress.HasValue && logProgress.Value,
                     LogVerbose = logVerbose.HasValue && logVerbose.Value,
                     Draft = new RunbookDraft(),
@@ -476,7 +476,6 @@ public Runbook CreateRunbookByName(string resourceGroupName, string automationAc
 
         public Runbook ImportRunbook(string resourceGroupName, string automationAccountName, string runbookPath, string description, IDictionary tags, string type, bool? logProgress, bool? logVerbose, bool published, bool overwrite, string name)
         {
-
             var fileExtension = Path.GetExtension(runbookPath);
 
             if (0 !=
@@ -492,14 +491,12 @@ public Runbook ImportRunbook(string resourceGroupName, string automationAccountN
 
             // if graph runbook make sure type is not null and has right value
             if (0 == string.Compare(fileExtension, Constants.SupportedFileExtensions.Graph, StringComparison.OrdinalIgnoreCase) 
-                && string.IsNullOrWhiteSpace(type) 
-                && (0 != string.Compare(type, Constants.RunbookType.Graph,StringComparison.OrdinalIgnoreCase)))
+                && (string.IsNullOrWhiteSpace(type) || !IsGraphRunbook(type)))
             {
                 throw new ResourceCommonException(typeof(Runbook),
                         string.Format(CultureInfo.CurrentCulture, Resources.InvalidRunbookTypeForExtension, fileExtension));
             }
 
-
             var runbookName = Path.GetFileNameWithoutExtension(runbookPath);
 
             if (String.IsNullOrWhiteSpace(name) == false)
@@ -1786,7 +1783,7 @@ private DirectoryInfo WriteRunbookToFile(string outputFolder, string runbookName
                 outputFolderFullPath = this.ValidateAndGetFullPath(outputFolder);
             }
 
-            var fileExtension = (0 == string.Compare(runbookType, Constants.RunbookType.Graph, StringComparison.OrdinalIgnoreCase)) ? Constants.SupportedFileExtensions.Graph : Constants.SupportedFileExtensions.PowerShellScript;
+            var fileExtension = IsGraphRunbook(runbookType) ? Constants.SupportedFileExtensions.Graph : Constants.SupportedFileExtensions.PowerShellScript;
 
             var outputFilePath = outputFolderFullPath + "\\" + runbookName + fileExtension;
 
@@ -1803,6 +1800,13 @@ private DirectoryInfo WriteRunbookToFile(string outputFolder, string runbookName
             return new DirectoryInfo(runbookName + fileExtension);
         }
 
+        private static bool IsGraphRunbook(string runbookType)
+        {
+            return (string.Equals(runbookType, Constants.RunbookType.Graph, StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(runbookType, Constants.RunbookType.GraphPowerShell, StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(runbookType, Constants.RunbookType.GraphPowerShellWorkflow, StringComparison.OrdinalIgnoreCase));
+        }
+
         #endregion
     }
 }

src/ResourceManager/Automation/Commands.Automation/Common/Constants.cs

@@ -81,6 +81,10 @@ public static class RunbookType
             public const string PowerShellWorkflow = "PowerShellWorkflow";
 
             public const string Graph = "Graph";
+
+            public const string GraphPowerShell = "GraphPowerShell";
+
+            public const string GraphPowerShellWorkflow = "GraphPowerShellWorkflow";
         }
 
         public static class SupportedFileExtensions