Fix parameter file password prompt

nuke-build · Aug 4, 2021 · 44f7f5f · 44f7f5f
1 parent a945642
commit 44f7f5f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/source/Nuke.Common/Constants.cs b/source/Nuke.Common/Constants.cs
@@ -102,17 +102,22 @@ internal static AbsolutePath GetBuildSchemaFile(AbsolutePath rootDirectory)
 
         internal static AbsolutePath GetDefaultParametersFile(AbsolutePath rootDirectory)
         {
-            return GetNukeDirectory(rootDirectory) / $"{ParametersFilePrefix}.json";
+            return GetNukeDirectory(rootDirectory) / GetParametersFileName(DefaultProfileName);
         }
 
         internal static IEnumerable<AbsolutePath> GetParametersProfileFiles(AbsolutePath rootDirectory)
         {
             return GetNukeDirectory(rootDirectory).GlobFiles($"{ParametersFilePrefix}.*.json");
         }
 
-        internal static AbsolutePath GetParametersProfileFile(AbsolutePath rootDirectory, string name)
+        internal static AbsolutePath GetParametersProfileFile(AbsolutePath rootDirectory, string profile)
         {
-            return GetNukeDirectory(rootDirectory) / $"{ParametersFilePrefix}.{name}.json";
+            return GetNukeDirectory(rootDirectory) / GetParametersFileName(profile);
+        }
+
+        internal static string GetParametersFileName(string profile)
+        {
+            return profile == DefaultProfileName ? $"{ParametersFilePrefix}.json" : $"{ParametersFilePrefix}.{profile}.json";
         }
 
         public static IEnumerable<string> GetProfileNames(AbsolutePath rootDirectory)

diff --git a/source/Nuke.Common/Utilities/EncryptionUtility.cs b/source/Nuke.Common/Utilities/EncryptionUtility.cs
@@ -115,7 +115,7 @@ public static string GetPassword(string profile)
         {
             string PromptForPassword()
             {
-                Logger.Info($"Enter password for {profile} parameters:");
+                Logger.Info($"Enter password for {Constants.GetParametersFileName(profile)}:");
                 return ConsoleUtility.ReadSecret();
             }