Dotnet env vars (#17)

Co-authored-by: Kerem Beygo <kerem.beygo@saucelabs.com>
saucelabs · Apr 9, 2024 · c5608f9 · c5608f9
1 parent 2eae6e6
commit c5608f9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/visual-dotnet/SauceLabs.Visual/BuildFactory.cs b/visual-dotnet/SauceLabs.Visual/BuildFactory.cs
@@ -144,11 +144,11 @@ private static async Task<VisualBuild> Create(VisualApi api, CreateBuildOptions
             options.CustomId ??= EnvVars.CustomId;
             var result = (await api.CreateBuild(new CreateBuildIn
             {
-                Name = options.Name,
-                Project = options.Project,
-                Branch = options.Branch,
+                Name = StringUtils.ValueOrDefault(EnvVars.BuildName, options.Name),
+                Project = StringUtils.ValueOrDefault(EnvVars.Project, options.Project),
+                Branch = StringUtils.ValueOrDefault(EnvVars.Branch, options.Branch),
+                DefaultBranch = StringUtils.ValueOrDefault(EnvVars.DefaultBranch, options.DefaultBranch),
                 CustomId = options.CustomId,
-                DefaultBranch = options.DefaultBranch,
             })).EnsureValidResponse();
 
             build = new VisualBuild(result.Result.Id, result.Result.Url, result.Result.Mode)

diff --git a/visual-dotnet/SauceLabs.Visual/Utils/EnvVars.cs b/visual-dotnet/SauceLabs.Visual/Utils/EnvVars.cs
@@ -4,6 +4,13 @@ namespace SauceLabs.Visual.Utils
 {
     internal class EnvVars
     {
+        internal static string Project => Environment.GetEnvironmentVariable("SAUCE_VISUAL_PROJECT") ?? "";
+        internal static string Branch => Environment.GetEnvironmentVariable("SAUCE_VISUAL_BRANCH") ?? "";
+
+        internal static string DefaultBranch =>
+            Environment.GetEnvironmentVariable("SAUCE_VISUAL_DEFAULT_BRANCH") ?? "";
+
+        internal static string BuildName => Environment.GetEnvironmentVariable("SAUCE_VISUAL_BUILD_NAME") ?? "";
         internal static string CustomId => Environment.GetEnvironmentVariable("SAUCE_VISUAL_CUSTOM_ID") ?? "";
         internal static string BuildId => Environment.GetEnvironmentVariable("SAUCE_VISUAL_BUILD_ID") ?? "";
         internal static string Username => Environment.GetEnvironmentVariable("SAUCE_USERNAME") ?? "";

diff --git a/visual-dotnet/SauceLabs.Visual/Utils/StringUtils.cs b/visual-dotnet/SauceLabs.Visual/Utils/StringUtils.cs
@@ -11,5 +11,10 @@ public static bool IsNullOrEmpty(string? value)
         {
             return string.IsNullOrEmpty(value?.Trim());
         }
+
+        public static string? ValueOrDefault(string? value, string? defaultValue)
+        {
+            return !IsNullOrEmpty(value) ? value : defaultValue;
+        }
     }
 }