update repo clone to checkout default branch override

imgbot · Oct 27, 2019 · dc4f40b · dc4f40b
1 parent d12740f
commit dc4f40b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/CompressImagesFunction/CompressImages.cs b/CompressImagesFunction/CompressImages.cs
@@ -60,6 +60,29 @@ public static bool Run(CompressimagesParameters parameters, ILogger logger)
                 logger.LogWarning(e, "CompressImagesFunction: issue checking for existing branch or empty repo for {Owner}/{RepoName}", parameters.RepoOwner, parameters.RepoName);
             }
 
+            // check if we should switch away from the default branch
+            if (parameters.Settings != null && !string.IsNullOrEmpty(parameters.Settings.DefaultBranchOverride))
+            {
+                logger.LogInformation(
+                    "CompressImagesFunction: default branch override for {Owner}/{RepoName} is {DefaultBranchOverride}",
+                    parameters.RepoOwner,
+                    parameters.RepoName,
+                    parameters.Settings.DefaultBranchOverride);
+
+                var baseBranch = repo.Branches[parameters.Settings.DefaultBranchOverride];
+                if (baseBranch == null)
+                {
+                    logger.LogWarning(
+                        "CompressImagesFunction: default branch ({DefaultBranchOverride}) not found for {Owner}/{RepoName}",
+                        parameters.Settings.DefaultBranchOverride,
+                        parameters.RepoOwner,
+                        parameters.RepoName);
+                    return false;
+                }
+
+                Commands.Checkout(repo, baseBranch);
+            }
+
             var repoConfiguration = new RepoConfiguration();
 
             try

diff --git a/CompressImagesFunction/CompressImagesFunction.cs b/CompressImagesFunction/CompressImagesFunction.cs
@@ -1,12 +1,12 @@
 using System;
 using System.IO;
-using System.Text;
 using System.Threading.Tasks;
 using Common;
 using Common.Messages;
 using Install;
 using Microsoft.Azure.WebJobs;
 using Microsoft.Extensions.Logging;
+using Microsoft.WindowsAzure.Storage.Table;
 
 namespace CompressImagesFunction
 {
@@ -17,13 +17,14 @@ public static async Task Trigger(
             [QueueTrigger("compressimagesmessage")]CompressImagesMessage compressImagesMessage,
             [Queue("longrunningcompressmessage")] ICollector<CompressImagesMessage> longRunningCompressMessages,
             [Queue("openprmessage")] ICollector<OpenPrMessage> openPrMessages,
+            [Table("settings")] CloudTable settingsTable,
             ILogger logger,
             ExecutionContext context)
         {
             logger.LogInformation($"Starting compress");
             var installationTokenProvider = new InstallationTokenProvider();
             var repoChecks = new RepoChecks();
-            var task = RunAsync(installationTokenProvider, compressImagesMessage, openPrMessages, repoChecks, logger, context);
+            var task = RunAsync(installationTokenProvider, compressImagesMessage, openPrMessages, settingsTable, repoChecks, logger, context);
             if (await Task.WhenAny(task, Task.Delay(570000)) == task)
             {
                 await task;
@@ -39,20 +40,22 @@ public static async Task Trigger(
         public static async Task LongTrigger(
             [QueueTrigger("longrunningcompressmessage")]CompressImagesMessage compressImagesMessage,
             [Queue("openprmessage")] ICollector<OpenPrMessage> openPrMessages,
+            [Table("settings")] CloudTable settingsTable,
             ILogger logger,
             ExecutionContext context)
         {
             logger.LogInformation($"Starting long compress");
             var installationTokenProvider = new InstallationTokenProvider();
             var repoChecks = new RepoChecks();
-            var task = RunAsync(installationTokenProvider, compressImagesMessage, openPrMessages, repoChecks, logger, context);
+            var task = RunAsync(installationTokenProvider, compressImagesMessage, openPrMessages, settingsTable, repoChecks, logger, context);
             await task;
         }
 
         public static async Task RunAsync(
             IInstallationTokenProvider installationTokenProvider,
             CompressImagesMessage compressImagesMessage,
             ICollector<OpenPrMessage> openPrMessages,
+            CloudTable settingsTable,
             IRepoChecks repoChecks,
             ILogger logger,
             ExecutionContext context)
@@ -106,6 +109,7 @@ public static async Task RunAsync(
                 PgpPrivateKey = KnownEnvironmentVariables.PGP_PRIVATE_KEY,
                 PgPPassword = KnownEnvironmentVariables.PGP_PASSWORD,
                 CompressImagesMessage = compressImagesMessage,
+                Settings = await Common.TableModels.SettingsHelper.GetSettings(settingsTable, compressImagesMessage.InstallationId, compressImagesMessage.RepoName),
             };
 
             var didCompress = CompressImages.Run(compressImagesParameters, logger);

diff --git a/CompressImagesFunction/CompressimagesParameters.cs b/CompressImagesFunction/CompressimagesParameters.cs
@@ -19,6 +19,8 @@ public class CompressimagesParameters
 
         public string PgPPassword { get; set; }
 
+        public Common.TableModels.Settings Settings { get; set; }
+
         public CompressImagesMessage CompressImagesMessage { get; set; }
   }
 }