Merge pull request Azure#10552 from filizt/crossPlatformFileNames

[Blueprint] Blueprint and artifact folder/file names should be platform agnostic

Author: VeryEarly

src/Blueprint/Blueprint/Cmdlets/BlueprintCmdletBase.cs

@@ -24,6 +24,7 @@
 using Microsoft.Azure.Management.Internal.Resources.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using Provider = Microsoft.Azure.Management.Internal.ResourceManager.Version2018_05_01.Models.Provider;
+using System.Linq;
 
 namespace Microsoft.Azure.Commands.Blueprint.Cmdlets
 {
@@ -175,44 +176,37 @@ protected string GetValidatedFilePath(string fileFullName)
         }
 
         /// <summary>
-        ///  This overloaded function expects a folder path and a file name and combines them. Checks if resulting full file name exist.
+        ///  Returns the blueprint file path.
         /// </summary>
-        /// <param name="inputPath"></param>
-        /// <param name="fileName"></param>
+        /// <param name="path"></param>
         /// <returns></returns>
-        protected string GetValidatedFilePath(string path, string fileName)
+        protected string GetValidatedFilePathForBlueprint(string path)
         {
-            var resolvedPath = ResolveUserPath(path);
-
-            var blueprintPath = Path.Combine(resolvedPath, fileName + ".json");
-
-            if (!AzureSession.Instance.DataStore.FileExists(blueprintPath))
+            var blueprintFileName = AzureSession.Instance.DataStore.GetFiles(path, "*.*", SearchOption.TopDirectoryOnly)
+                .Select(file => Path.GetFileName(file))
+                .FirstOrDefault(name => String.Equals(name, "blueprint.json", StringComparison.OrdinalIgnoreCase));
+                    
+            if (blueprintFileName == null)
             {
                 throw new Exception(
-                    $"Cannot locate a file with the name {fileName} in: {resolvedPath}.");
+                    $"Cannot locate Blueprint.json in: {path}.");
             }
 
-            return blueprintPath;
+            return Path.Combine(path, blueprintFileName);
         }
 
         /// <summary>
-        /// Combines input folder path and folder name and check if the resulting path exists. 
+        /// Returns the artifacts folder path. 
         /// </summary>
-        /// <param name="inputPath"></param>
-        /// <param name="folderName"></param>
+        /// <param name="path"></param>
         /// <returns></returns>
-        protected string GetValidatedFolderPath(string path, string folderName)
+        protected string GetValidatedFolderPathForArtifacts(string path)
         {
-            var resolvedPath = ResolveUserPath(path);
-
-            var artifactsPath = Path.Combine(resolvedPath, folderName);
-
-            if (!AzureSession.Instance.DataStore.DirectoryExists(artifactsPath))
-            {
-                artifactsPath = null;
-            }
+            var artifactsFolderName = AzureSession.Instance.DataStore.GetDirectories(path)
+                .Select(folder => Path.GetFileName(folder))
+                .FirstOrDefault(name => String.Equals(name, "artifacts", StringComparison.OrdinalIgnoreCase));
 
-            return artifactsPath;
+            return artifactsFolderName == null ? null : Path.Combine(path, artifactsFolderName);
         }
     }
 }

src/Blueprint/Blueprint/Cmdlets/BlueprintDefinition/BlueprintDefinitionCmdletBase.cs

@@ -101,8 +101,7 @@ private async Task<string> GetManagementGroupAncestorsAsync(string subscriptionI
 
         protected void ImportBlueprint(string blueprintName, string scope, string inputPath, bool force)
         {
-            const string blueprintFileName = "Blueprint";
-            var blueprintPath = GetValidatedFilePath(inputPath, blueprintFileName);
+            var blueprintPath = GetValidatedFilePathForBlueprint(ResolveUserPath(inputPath));
 
             BlueprintModel bpObject;
             try
@@ -170,9 +169,7 @@ protected string CreateFolderIfNotExist(string path, string folderName)
 
         protected void ImportArtifacts(string blueprintName, string scope, string inputPath)
         {
-            const string artifacts = "Artifacts";
-
-            var artifactsPath = GetValidatedFolderPath(inputPath, artifacts);
+            var artifactsPath = GetValidatedFolderPathForArtifacts(ResolveUserPath(inputPath));
 
             if (artifactsPath == null)
             {