feat(): add support for AWS codebuild PR

gkampitakis · Nov 23, 2024 · 19400e7 · 19400e7
1 parent c5d6eb1
commit 19400e7
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ Officially supported CI servers:
 | Name                                                                            | Constant                    | isPR |
 | ------------------------------------------------------------------------------- | --------------------------- | ---- |
 | [Agola CI](https://agola.io/)                                                   | `ci.AGOLA`                  | ✅   |
-| [AWS CodeBuild](https://aws.amazon.com/codebuild/)                              | `ciinfo.CODEBUILD`          | 🚫   |
+| [AWS CodeBuild](https://aws.amazon.com/codebuild/)                              | `ciinfo.CODEBUILD`          | ✅   |
 | [AppVeyor](http://www.appveyor.com)                                             | `ciinfo.APPVEYOR`           | ✅   |
 | [Azure Pipelines](https://azure.microsoft.com/en-us/services/devops/pipelines/) | `ciinfo.AZURE_PIPELINES`    | ✅   |
 | [Appcircle](https://appcircle.io/)                                              | `ciinfo.APPCIRCLE`          | 🚫   |

diff --git a/ciinfo.go b/ciinfo.go
@@ -52,12 +52,7 @@ func initialize() {
 		}
 
 		Name = vendor.name
-
-		for _, pr := range vendor.pr {
-			if IsPr = verifyPr(pr); IsPr {
-				break
-			}
-		}
+		IsPr = anyPr(vendor.pr)
 	}
 
 	IsCI = os.Getenv("CI") != "false" && (Name != "" || isCI())
@@ -107,6 +102,16 @@ func verifyCI(e env) bool {
 	return true
 }
 
+func anyPr(pr []pr) bool {
+	for _, p := range pr {
+		if verifyPr(p) {
+			return true
+		}
+	}
+
+	return false
+}
+
 func verifyPr(p pr) bool {
 	value, exists := os.LookupEnv(p.key)
 	if !exists {

diff --git a/ciinfo_test.go b/ciinfo_test.go
@@ -112,6 +112,54 @@ func TestCI(t *testing.T) {
 	})
 
 	for _, scenario := range []TestScenario{
+		{
+			description: "AWS CodeBuild - PR",
+			expected: ScenarioExpected{
+				isPR:     true,
+				name:     "AWS CodeBuild",
+				constant: "CODEBUILD",
+			},
+			setup: func(t *testing.T) {
+				t.Setenv("CODEBUILD_BUILD_ARN", "arn")
+				t.Setenv("CODEBUILD_WEBHOOK_EVENT", "PULL_REQUEST_CREATED")
+			},
+		},
+		{
+			description: "AWS CodeBuild - PR",
+			expected: ScenarioExpected{
+				isPR:     true,
+				name:     "AWS CodeBuild",
+				constant: "CODEBUILD",
+			},
+			setup: func(t *testing.T) {
+				t.Setenv("CODEBUILD_BUILD_ARN", "arn")
+				t.Setenv("CODEBUILD_WEBHOOK_EVENT", "PULL_REQUEST_UPDATED")
+			},
+		},
+		{
+			description: "AWS CodeBuild - PR",
+			expected: ScenarioExpected{
+				isPR:     true,
+				name:     "AWS CodeBuild",
+				constant: "CODEBUILD",
+			},
+			setup: func(t *testing.T) {
+				t.Setenv("CODEBUILD_BUILD_ARN", "arn")
+				t.Setenv("CODEBUILD_WEBHOOK_EVENT", "PULL_REQUEST_REOPENED")
+			},
+		},
+		{
+			description: "AWS CodeBuild - Not PR",
+			expected: ScenarioExpected{
+				isPR:     false,
+				name:     "AWS CodeBuild",
+				constant: "CODEBUILD",
+			},
+			setup: func(t *testing.T) {
+				t.Setenv("CODEBUILD_BUILD_ARN", "arn")
+				t.Setenv("CODEBUILD_WEBHOOK_EVENT", "some-event")
+			},
+		},
 		{
 			description: "AppVeyor - PR",
 			expected: ScenarioExpected{

diff --git a/vendors.go b/vendors.go
@@ -47,6 +47,11 @@ var vendors = []vendor{
 		name:     "AWS CodeBuild",
 		constant: "CODEBUILD",
 		env:      []env{{key: "CODEBUILD_BUILD_ARN"}},
+		pr: []pr{
+			{key: "CODEBUILD_WEBHOOK_EVENT", eq: "PULL_REQUEST_CREATED"},
+			{key: "CODEBUILD_WEBHOOK_EVENT", eq: "PULL_REQUEST_UPDATED"},
+			{key: "CODEBUILD_WEBHOOK_EVENT", eq: "PULL_REQUEST_REOPENED"},
+		},
 	},
 	{
 		name:     "Azure Pipelines",