Squashed commit of the following:

commit 4e3ed98 Author: Zackary Santana <[email protected]> Date: Thu Jan 30 13:34:26 2025 -0500 Revert "DEVPROD-13976 Add otel to presign file func (evergreen-ci#8673)" This reverts commit c856008. commit c856008 Author: Zackary Santana <[email protected]> Date: Thu Jan 30 09:30:17 2025 -0500 DEVPROD-13976 Add otel to presign file func (evergreen-ci#8673) commit 6d420a2 Author: Sophie Stadler <[email protected]> Date: Wed Jan 29 14:35:01 2025 -0500 DEVPROD-12696: Parallelize waterfall queries (evergreen-ci#8672)
ZackarySantana · Jan 30, 2025 · 8f262b0 · 8f262b0
1 parent cad380e
commit 8f262b0
Show file tree

Hide file tree

Showing 10 changed files with 518 additions and 79 deletions.
diff --git a/graphql/generated.go b/graphql/generated.go
diff --git a/graphql/schema/types/version.graphql b/graphql/schema/types/version.graphql
@@ -74,6 +74,7 @@ type Version {
   upstreamProject: UpstreamProject
   versionTiming: VersionTiming
   warnings: [String!]!
+  waterfallBuilds: [WaterfallBuild!]
 }
 
 type VersionTasks {

diff --git a/graphql/schema/types/waterfall.graphql b/graphql/schema/types/waterfall.graphql
@@ -21,7 +21,7 @@ type WaterfallTask {
 
 type WaterfallBuild {
   id: String!
-  activated: Boolean
+  buildVariant: String!
   displayName: String!
   version: String!
   tasks: [WaterfallTask!]!

diff --git a/graphql/tests/query/waterfall/data.json b/graphql/tests/query/waterfall/data.json
@@ -24,11 +24,6 @@
       "order": 40,
       "create_time": {
         "$date": "2019-12-31T00:00:03Z"
-      },
-      "build_variants_status": {
-        "activated": false,
-        "build_id": "evergreen_version1_build",
-        "build_variant": "enterprise-ubuntu1604-64"
       }
     },
     {
@@ -47,7 +42,10 @@
         "activated": true,
         "build_id": "evergreen_version1_build",
         "build_variant": "enterprise-ubuntu1604-64"
-      }
+      },
+      "builds": [
+        "evergreen_version1_build"
+      ]
     },
     {
       "_id": "evergreen_version2",
@@ -65,7 +63,10 @@
         "activated": true,
         "build_id": "evergreen_version2_build",
         "build_variant": "enterprise-ubuntu1604-64"
-      }
+      },
+      "builds": [
+        "evergreen_version2_build"
+      ]
     },
     {
       "_id": "evergreen_version3",
@@ -109,7 +110,10 @@
       "order": 45,
       "create_time": {
         "$date": "2020-01-05T12:00:00Z"
-      }
+      },
+      "builds": [
+        "evergreen_version3_build"
+      ]
     },
     {
       "_id": "inactive1",

diff --git a/graphql/tests/query/waterfall/queries/no_filters.graphql b/graphql/tests/query/waterfall/queries/no_filters.graphql
@@ -2,7 +2,6 @@
   waterfall(options: { projectIdentifier: "spruce-identifier" }) {
     buildVariants {
       builds {
-        activated
         id
         tasks {
           id

diff --git a/graphql/tests/query/waterfall/queries/waterfall_builds.graphql b/graphql/tests/query/waterfall/queries/waterfall_builds.graphql
@@ -0,0 +1,17 @@
+{
+  waterfall(options: { projectIdentifier: "spruce-identifier" }) {
+    flattenedVersions {
+      id
+      waterfallBuilds {
+        buildVariant
+        id
+        displayName
+        version
+        tasks {
+          id
+          displayName
+        }
+      }
+    }
+  }
+}
diff --git a/graphql/tests/query/waterfall/results.json b/graphql/tests/query/waterfall/results.json
@@ -11,7 +11,6 @@
                 "displayName": "01 Ubuntu 16.04",
                 "builds": [
                   {
-                    "activated": true,
                     "id": "evergreen_version1_build",
                     "tasks": [
                       {
@@ -32,7 +31,6 @@
                     "version": "evergreen_version1"
                   },
                   {
-                    "activated": true,
                     "id": "evergreen_version2_build",
                     "tasks": [
                       {
@@ -57,7 +55,6 @@
               {
                 "builds": [
                   {
-                    "activated": true,
                     "id": "evergreen_version3_build",
                     "tasks": [
                       {
@@ -653,6 +650,92 @@
           }
         }
       }
+    },
+    {
+      "query_file": "waterfall_builds.graphql",
+      "result": {
+        "data": {
+          "waterfall": {
+            "flattenedVersions": [
+              {
+                "id": "evergreen_version5",
+                "waterfallBuilds": [
+                  {
+                    "id": "evergreen_version3_build",
+                    "buildVariant": "lint",
+                    "displayName": "03 Linter",
+                    "tasks": [
+                      {
+                        "id": "task_5",
+                        "displayName": "Task Number 5"
+                      }
+                    ],
+                    "version": "evergreen_version5"
+                  }
+                ]
+              },
+              {
+                "id": "evergreen_version4",
+                "waterfallBuilds": null
+              },
+              {
+                "id": "evergreen_version3",
+                "waterfallBuilds": []
+              },
+              {
+                "id": "evergreen_version2",
+                "waterfallBuilds": [
+                  {
+                    "id": "evergreen_version2_build",
+                    "buildVariant": "enterprise-ubuntu1604-64",
+                    "displayName": "02 Ubuntu 16.04",
+                    "tasks": [
+                      {
+                        "id": "task_3",
+                        "displayName": "Some Task"
+                      },
+                      {
+                        "id": "task_4",
+                        "displayName": "Some Other Task"
+                      }
+                    ],
+                    "version": "evergreen_version2"
+                  }
+                ]
+              },
+              {
+                "id": "evergreen_version1",
+                "waterfallBuilds": [
+                  {
+                    "id": "evergreen_version1_build",
+                    "buildVariant": "enterprise-ubuntu1604-64",
+                    "displayName": "01 Ubuntu 16.04",
+                    "tasks": [
+                      {
+                        "id": "task_1",
+                        "displayName": "Some Task"
+                      },
+                      {
+                        "id": "task_2",
+                        "displayName": "Some Other Task"
+                      }
+                    ],
+                    "version": "evergreen_version1"
+                  }
+                ]
+              },
+              {
+                "id": "evergreen_version0",
+                "waterfallBuilds": null
+              },
+              {
+                "id": "evergreen_version39",
+                "waterfallBuilds": []
+              }
+            ]
+          }
+        }
+      }
     }
   ]
 }
diff --git a/graphql/version_resolver.go b/graphql/version_resolver.go
@@ -518,6 +518,28 @@ func (r *versionResolver) Warnings(ctx context.Context, obj *restModel.APIVersio
 	return v.Warnings, nil
 }
 
+// WaterfallBuilds is the resolver for the waterfallBuilds field.
+func (r *versionResolver) WaterfallBuilds(ctx context.Context, obj *restModel.APIVersion) ([]*model.WaterfallBuild, error) {
+	versionId := utility.FromStringPtr(obj.Id)
+
+	// No need to fetch build variants for unactivated versions
+	if !utility.FromBoolPtr(obj.Activated) {
+		return nil, nil
+	}
+
+	versionBuilds := []*model.WaterfallBuild{}
+	builds, err := model.GetVersionBuilds(ctx, versionId)
+	if err != nil {
+		return nil, InternalServerError.Send(ctx, fmt.Sprintf("getting version build variants: %s", err.Error()))
+	}
+
+	for _, b := range builds {
+		bCopy := b
+		versionBuilds = append(versionBuilds, &bCopy)
+	}
+	return versionBuilds, nil
+}
+
 // Version returns VersionResolver implementation.
 func (r *Resolver) Version() VersionResolver { return &versionResolver{r} }