Merge pull request #2468 from carcer/feature/codebuild-source-version

Adds CodeBuild support for builds that are not initiated via a webhook

Author: asbjornu

src/GitVersionCore.Tests/BuildAgents/CodeBuildTests.cs

@@ -31,16 +31,30 @@ public void SetUp()
         }
 
         [Test]
-        public void CorrectlyIdentifiesCodeBuildPresence()
+        public void CorrectlyIdentifiesCodeBuildPresenceFromSourceVersion()
         {
-            environment.SetEnvironmentVariable(CodeBuild.EnvironmentVariableName, "a value");
+            environment.SetEnvironmentVariable(CodeBuild.SourceVersionEnvironmentVariableName, "a value");
             buildServer.CanApplyToCurrentContext().ShouldBe(true);
         }
 
         [Test]
-        public void PicksUpBranchNameFromEnvironment()
+        public void PicksUpBranchNameFromEnvironmentFromSourceVersion()
         {
-            environment.SetEnvironmentVariable(CodeBuild.EnvironmentVariableName, "refs/heads/master");
+            environment.SetEnvironmentVariable(CodeBuild.SourceVersionEnvironmentVariableName, "refs/heads/master");
+            buildServer.GetCurrentBranch(false).ShouldBe("refs/heads/master");
+        }
+
+        [Test]
+        public void CorrectlyIdentifiesCodeBuildPresenceFromWebHook()
+        {
+            environment.SetEnvironmentVariable(CodeBuild.WebHookEnvironmentVariableName, "a value");
+            buildServer.CanApplyToCurrentContext().ShouldBe(true);
+        }
+
+        [Test]
+        public void PicksUpBranchNameFromEnvironmentFromWebHook()
+        {
+            environment.SetEnvironmentVariable(CodeBuild.WebHookEnvironmentVariableName, "refs/heads/master");
             buildServer.GetCurrentBranch(false).ShouldBe("refs/heads/master");
         }
 

src/GitVersionCore/BuildAgents/CodeBuild.cs

@@ -8,7 +8,8 @@ namespace GitVersion.BuildAgents
     public sealed class CodeBuild : BuildAgentBase
     {
         private string file;
-        public const string EnvironmentVariableName = "CODEBUILD_WEBHOOK_HEAD_REF";
+        public const string WebHookEnvironmentVariableName = "CODEBUILD_WEBHOOK_HEAD_REF";
+        public const string SourceVersionEnvironmentVariableName = "CODEBUILD_SOURCE_VERSION";
 
         public CodeBuild(IEnvironment environment, ILog log) : base(environment, log)
         {
@@ -20,7 +21,7 @@ public void WithPropertyFile(string propertiesFileName)
             file = propertiesFileName;
         }
 
-        protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+        protected override string EnvironmentVariable => throw new NotSupportedException($"Accessing {nameof(EnvironmentVariable)} is not supported as {nameof(CodeBuild)} supports two environment variables for branch names.");
 
         public override string GenerateSetVersionMessage(VersionVariables variables)
         {
@@ -37,7 +38,15 @@ public override string[] GenerateSetParameterMessage(string name, string value)
 
         public override string GetCurrentBranch(bool usingDynamicRepos)
         {
-            return Environment.GetEnvironmentVariable(EnvironmentVariableName);
+
+            var currentBranch = Environment.GetEnvironmentVariable(WebHookEnvironmentVariableName);
+
+            if (string.IsNullOrEmpty(currentBranch))
+            {
+                return Environment.GetEnvironmentVariable(SourceVersionEnvironmentVariableName);
+            }
+
+            return currentBranch;
         }
 
         public override void WriteIntegration(Action<string> writer, VersionVariables variables, bool updateBuildNumber = true)
@@ -48,5 +57,8 @@ public override void WriteIntegration(Action<string> writer, VersionVariables va
         }
 
         public override bool PreventFetch() => true;
+
+        public override bool CanApplyToCurrentContext()
+            => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(WebHookEnvironmentVariableName)) || !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(SourceVersionEnvironmentVariableName));
     }
 }

src/GitVersionExe.Tests/PullRequestInBuildAgentTest.cs

@@ -38,7 +38,7 @@ public async Task VerifyCodeBuildPullRequest(string pullRequestRef)
         {
             var env = new Dictionary<string, string>
             {
-                { CodeBuild.EnvironmentVariableName, PullRequestBranchName },
+                { CodeBuild.WebHookEnvironmentVariableName, PullRequestBranchName },
             };
             await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
         }