DEVPROD-5460: Remove deprecated arguments from GraphQL API (#7711)

evergreen-ci · Apr 8, 2024 · 9c1cb68 · 9c1cb68
1 parent 602d17b
commit 9c1cb68
Show file tree

Hide file tree

Showing 98 changed files with 175 additions and 279 deletions.
diff --git a/graphql/generated.go b/graphql/generated.go
diff --git a/graphql/mutation_resolver.go b/graphql/mutation_resolver.go
@@ -1123,7 +1123,7 @@ func (r *mutationResolver) RestartTask(ctx context.Context, taskID string, faile
 }
 
 // ScheduleTasks is the resolver for the scheduleTasks field.
-func (r *mutationResolver) ScheduleTasks(ctx context.Context, taskIds []string, versionID *string) ([]*restModel.APITask, error) {
+func (r *mutationResolver) ScheduleTasks(ctx context.Context, taskIds []string, versionID string) ([]*restModel.APITask, error) {
 	scheduledTasks := []*restModel.APITask{}
 	scheduled, err := setManyTasksScheduled(ctx, r.sc.GetURL(), true, taskIds...)
 	if err != nil {

diff --git a/graphql/project_settings_resolver.go b/graphql/project_settings_resolver.go
@@ -41,8 +41,8 @@ func (r *projectSettingsResolver) Vars(ctx context.Context, obj *restModel.APIPr
 }
 
 // ProjectID is the resolver for the projectId field.
-func (r *projectSettingsInputResolver) ProjectID(ctx context.Context, obj *restModel.APIProjectSettings, data *string) error {
-	obj.Id = data
+func (r *projectSettingsInputResolver) ProjectID(ctx context.Context, obj *restModel.APIProjectSettings, data string) error {
+	obj.Id = utility.ToStringPtr(data)
 	return nil
 }
 

diff --git a/graphql/query_resolver.go b/graphql/query_resolver.go
@@ -21,7 +21,6 @@ import (
 	"github.com/evergreen-ci/evergreen/rest/data"
 	restModel "github.com/evergreen-ci/evergreen/rest/model"
 	"github.com/evergreen-ci/evergreen/thirdparty"
-	"github.com/evergreen-ci/evergreen/util"
 	"github.com/evergreen-ci/plank"
 	"github.com/evergreen-ci/utility"
 	"github.com/mongodb/anser/bsonutil"
@@ -374,16 +373,14 @@ func (r *queryResolver) Pod(ctx context.Context, podID string) (*restModel.APIPo
 }
 
 // Patch is the resolver for the patch field.
-func (r *queryResolver) Patch(ctx context.Context, id *string, patchID *string) (*restModel.APIPatch, error) {
-	// TODO: Remove this temporary workaround.
-	patchId := util.CoalesceString(utility.FromStringPtr(id), utility.FromStringPtr(patchID))
-	patch, err := data.FindPatchById(patchId)
+func (r *queryResolver) Patch(ctx context.Context, patchID string) (*restModel.APIPatch, error) {
+	patch, err := data.FindPatchById(patchID)
 	if err != nil {
 		return nil, InternalServerError.Send(ctx, err.Error())
 	}
 
 	if evergreen.IsFinishedVersionStatus(*patch.Status) {
-		statuses, err := task.GetTaskStatusesByVersion(ctx, patchId, false)
+		statuses, err := task.GetTaskStatusesByVersion(ctx, patchID, false)
 		if err != nil {
 			return nil, InternalServerError.Send(ctx, fmt.Sprintf("fetching task statuses for patch: %s", err.Error()))
 		}
@@ -495,14 +492,12 @@ func (r *queryResolver) ProjectSettings(ctx context.Context, identifier string)
 }
 
 // RepoEvents is the resolver for the repoEvents field.
-func (r *queryResolver) RepoEvents(ctx context.Context, repoID *string, id *string, limit *int, before *time.Time) (*ProjectEvents, error) {
-	// TODO: Remove this temporary workaround.
-	repoId := util.CoalesceString(utility.FromStringPtr(id), utility.FromStringPtr(repoID))
+func (r *queryResolver) RepoEvents(ctx context.Context, repoID string, limit *int, before *time.Time) (*ProjectEvents, error) {
 	timestamp := time.Now()
 	if before != nil {
 		timestamp = *before
 	}
-	events, err := data.GetEventsById(repoId, timestamp, utility.FromIntPtr(limit))
+	events, err := data.GetEventsById(repoID, timestamp, utility.FromIntPtr(limit))
 	res := &ProjectEvents{
 		EventLogEntries: getPointerEventList(events),
 		Count:           len(events),
@@ -511,10 +506,8 @@ func (r *queryResolver) RepoEvents(ctx context.Context, repoID *string, id *stri
 }
 
 // RepoSettings is the resolver for the repoSettings field.
-func (r *queryResolver) RepoSettings(ctx context.Context, repoID *string, id *string) (*restModel.APIProjectSettings, error) {
-	// TODO: Remove this temporary workaround.
-	repoId := util.CoalesceString(utility.FromStringPtr(id), utility.FromStringPtr(repoID))
-	repoRef, err := model.FindOneRepoRef(repoId)
+func (r *queryResolver) RepoSettings(ctx context.Context, repoID string) (*restModel.APIProjectSettings, error) {
+	repoRef, err := model.FindOneRepoRef(repoID)
 	if err != nil {
 		return nil, InternalServerError.Send(ctx, fmt.Sprintf("error looking in repo collection: %s", err.Error()))
 	}
@@ -976,40 +969,35 @@ func (r *queryResolver) TaskNamesForBuildVariant(ctx context.Context, projectIde
 }
 
 // HasVersion is the resolver for the hasVersion field.
-func (r *queryResolver) HasVersion(ctx context.Context, id *string, patchID *string) (bool, error) {
-	// TODO: Remove this temporary workaround.
-	patchId := util.CoalesceString(utility.FromStringPtr(id), utility.FromStringPtr(patchID))
-
-	v, err := model.VersionFindOne(model.VersionById(patchId))
+func (r *queryResolver) HasVersion(ctx context.Context, patchID string) (bool, error) {
+	v, err := model.VersionFindOne(model.VersionById(patchID))
 	if err != nil {
-		return false, InternalServerError.Send(ctx, fmt.Sprintf("finding version '%s': %s", patchId, err.Error()))
+		return false, InternalServerError.Send(ctx, fmt.Sprintf("finding version '%s': %s", patchID, err.Error()))
 	}
 	if v != nil {
 		return true, nil
 	}
 
-	if patch.IsValidId(patchId) {
-		p, err := patch.FindOneId(patchId)
+	if patch.IsValidId(patchID) {
+		p, err := patch.FindOneId(patchID)
 		if err != nil {
-			return false, InternalServerError.Send(ctx, fmt.Sprintf("finding patch '%s': %s", patchId, err.Error()))
+			return false, InternalServerError.Send(ctx, fmt.Sprintf("finding patch '%s': %s", patchID, err.Error()))
 		}
 		if p != nil {
 			return false, nil
 		}
 	}
-	return false, ResourceNotFound.Send(ctx, fmt.Sprintf("Unable to find patch or version %s", patchId))
+	return false, ResourceNotFound.Send(ctx, fmt.Sprintf("Unable to find patch or version %s", patchID))
 }
 
 // Version is the resolver for the version field.
-func (r *queryResolver) Version(ctx context.Context, id *string, versionID *string) (*restModel.APIVersion, error) {
-	// TODO: Remove this temporary workaround.
-	versionId := util.CoalesceString(utility.FromStringPtr(id), utility.FromStringPtr(versionID))
-	v, err := model.VersionFindOneId(versionId)
+func (r *queryResolver) Version(ctx context.Context, versionID string) (*restModel.APIVersion, error) {
+	v, err := model.VersionFindOneId(versionID)
 	if err != nil {
-		return nil, InternalServerError.Send(ctx, fmt.Sprintf("finding version '%s': %s", versionId, err.Error()))
+		return nil, InternalServerError.Send(ctx, fmt.Sprintf("finding version '%s': %s", versionID, err.Error()))
 	}
 	if v == nil {
-		return nil, ResourceNotFound.Send(ctx, fmt.Sprintf("version '%s' not found", versionId))
+		return nil, ResourceNotFound.Send(ctx, fmt.Sprintf("version '%s' not found", versionID))
 	}
 	apiVersion := restModel.APIVersion{}
 	apiVersion.BuildFromService(*v)

diff --git a/graphql/repo_settings_resolver.go b/graphql/repo_settings_resolver.go
@@ -41,8 +41,8 @@ func (r *repoSettingsResolver) Vars(ctx context.Context, obj *restModel.APIProje
 }
 
 // RepoID is the resolver for the repoId field.
-func (r *repoSettingsInputResolver) RepoID(ctx context.Context, obj *restModel.APIProjectSettings, data *string) error {
-	obj.Id = data
+func (r *repoSettingsInputResolver) RepoID(ctx context.Context, obj *restModel.APIProjectSettings, data string) error {
+	obj.Id = utility.ToStringPtr(data)
 	return nil
 }
 

diff --git a/graphql/schema/mutation.graphql b/graphql/schema/mutation.graphql
@@ -91,7 +91,7 @@ type Mutation {
   abortTask(taskId: String!): Task!
   overrideTaskDependencies(taskId: String!): Task!
   restartTask(taskId: String!, failedOnly: Boolean!): Task!
-  scheduleTasks(taskIds: [String!]!, versionId: String): [Task!]!
+  scheduleTasks(taskIds: [String!]!, versionId: String!): [Task!]!
   setTaskPriority(taskId: String!, priority: Int!): Task!
   unscheduleTask(taskId: String!): Task!
 

diff --git a/graphql/schema/query.graphql b/graphql/schema/query.graphql
@@ -42,7 +42,7 @@ type Query {
   pod(podId: String!): Pod!
 
   # patch
-  patch(id: String @deprecated(reason: "use patchId instead"), patchId: String): Patch!
+  patch(patchId: String!): Patch!
 
   # project
   githubProjectConflicts(projectId: String!): GithubProjectConflicts!
@@ -55,8 +55,8 @@ type Query {
     @requireProjectAccess(access: VIEW)
   ): ProjectEvents!
   projectSettings(identifier: String! @requireProjectAccess(access: VIEW)): ProjectSettings!
-  repoEvents(repoId: String @requireProjectAccess(access: VIEW), id: String @deprecated(reason: "use repoId instead"), limit: Int = 0, before: Time): ProjectEvents!
-  repoSettings(repoId: String @requireProjectAccess(access: VIEW), id: String @deprecated(reason: "use repoId instead")): RepoSettings!
+  repoEvents(repoId: String! @requireProjectAccess(access: VIEW), limit: Int = 0, before: Time): ProjectEvents!
+  repoSettings(repoId: String! @requireProjectAccess(access: VIEW)): RepoSettings!
   viewableProjectRefs: [GroupedProjects]!
 
   # spawn
@@ -89,6 +89,6 @@ type Query {
   taskNamesForBuildVariant(projectIdentifier: String!, buildVariant: String!): [String!]
 
   # version
-  hasVersion(id: String @deprecated(reason: "use patchId instead"), patchId: String): Boolean!
-  version(id: String @deprecated(reason: "use versionId instead"), versionId: String): Version!
+  hasVersion(patchId: String!): Boolean!
+  version(versionId: String!): Version!
 }
diff --git a/graphql/schema/types/project_settings.graphql b/graphql/schema/types/project_settings.graphql
@@ -20,7 +20,7 @@ It contains information about project settings (e.g. Build Baron configurations,
 update the settings for a given project.
 """
 input ProjectSettingsInput {
-  projectId: String # TODO: Make this required.
+  projectId: String!
   aliases: [ProjectAliasInput!]
   githubWebhooksEnabled: Boolean
   projectRef: ProjectInput

diff --git a/graphql/schema/types/repo_settings.graphql b/graphql/schema/types/repo_settings.graphql
@@ -5,7 +5,7 @@ It contains information about repo settings (e.g. Build Baron configurations, su
 update the settings for a given project.
 """
 input RepoSettingsInput {
-  repoId: String # TODO: Make this required.
+  repoId: String!
   aliases: [ProjectAliasInput!]
   githubWebhooksEnabled: Boolean
   projectRef: RepoRefInput ## use the repo ref here in order to have stronger types

diff --git a/graphql/tests/mutation/saveProjectSettingsForSection/queries/change_identifier.graphql b/graphql/tests/mutation/saveProjectSettingsForSection/queries/change_identifier.graphql
@@ -1,8 +1,9 @@
 mutation {
     saveProjectSettingsForSection(
         projectSettings: {
+            projectId: "second_project_id"
             projectRef: {
-                id: "second_project_id",
+                id: "second_project_id"
                 identifier: "sandbox"
             }
         },

diff --git a/graphql/tests/mutation/saveProjectSettingsForSection/queries/commit_queue_section.graphql b/graphql/tests/mutation/saveProjectSettingsForSection/queries/commit_queue_section.graphql
@@ -1,6 +1,7 @@
 mutation {
   saveProjectSettingsForSection(
     projectSettings: {
+      projectId: "sandbox_project_id"
       projectRef: {
         id: "sandbox_project_id"
         commitQueue: {

diff --git a/graphql/tests/mutation/saveProjectSettingsForSection/queries/general_section.graphql b/graphql/tests/mutation/saveProjectSettingsForSection/queries/general_section.graphql
@@ -1,10 +1,11 @@
 mutation {
     saveProjectSettingsForSection(
         projectSettings: {
+            projectId: "sandbox_project_id"
             projectRef: {
-                id: "sandbox_project_id",
-                identifier: "sandbox",
-                enabled: true,
+                id: "sandbox_project_id"
+                identifier: "sandbox"
+                enabled: true
                 remotePath: "my_path_is_new"
                 owner: "evergreen-ci"
                 repo: "commit-queue-sandbox"

diff --git a/graphql/tests/mutation/saveProjectSettingsForSection/queries/notifications_section.graphql b/graphql/tests/mutation/saveProjectSettingsForSection/queries/notifications_section.graphql
@@ -1,6 +1,7 @@
 mutation {
   saveProjectSettingsForSection(
     projectSettings: {
+      projectId: "sandbox_project_id"
       projectRef: {
         id: "sandbox_project_id"
         banner: { theme: WARNING, text: "banner text!!" }

diff --git a/graphql/tests/mutation/saveProjectSettingsForSection/queries/patch_alias_section.graphql b/graphql/tests/mutation/saveProjectSettingsForSection/queries/patch_alias_section.graphql
@@ -1,6 +1,7 @@
 mutation {
   saveProjectSettingsForSection(
     projectSettings: {
+      projectId: "sandbox_project_id"
       projectRef: {
         id: "sandbox_project_id"
         patchTriggerAliases: []

diff --git a/graphql/tests/mutation/saveProjectSettingsForSection/queries/plugins_section.graphql b/graphql/tests/mutation/saveProjectSettingsForSection/queries/plugins_section.graphql
@@ -1,6 +1,7 @@
 mutation {
   saveProjectSettingsForSection(
     projectSettings: {
+      projectId: "sandbox_project_id"
       projectRef: {
         id: "sandbox_project_id"
         patchTriggerAliases: []

diff --git a/graphql/tests/mutation/saveProjectSettingsForSection/queries/vars_section.graphql b/graphql/tests/mutation/saveProjectSettingsForSection/queries/vars_section.graphql
@@ -1,8 +1,9 @@
 mutation {
     saveProjectSettingsForSection(
         projectSettings: {
+            projectId: "sandbox_project_id"
             projectRef: {
-                    id: "sandbox_project_id"
+                id: "sandbox_project_id"
             }
             vars: {
                 vars: {goodbye: "now"},

diff --git a/...ql/tests/mutation/saveProjectSettingsForSection/queries/views_and_filters_section.graphql b/...ql/tests/mutation/saveProjectSettingsForSection/queries/views_and_filters_section.graphql
@@ -1,6 +1,7 @@
 mutation {
   saveProjectSettingsForSection(
     projectSettings: {
+      projectId: "sandbox_project_id"
       projectRef: {
         id: "sandbox_project_id"
         parsleyFilters: [

diff --git a/graphql/tests/mutation/saveRepoSettingsForSection/queries/commit_queue_section.graphql b/graphql/tests/mutation/saveRepoSettingsForSection/queries/commit_queue_section.graphql
@@ -1,6 +1,7 @@
 mutation {
   saveRepoSettingsForSection(
     repoSettings: {
+      repoId: "repo_id"
       projectRef: {
         id: "repo_id"
         commitQueue: {

diff --git a/graphql/tests/mutation/saveRepoSettingsForSection/queries/general_section.graphql b/graphql/tests/mutation/saveRepoSettingsForSection/queries/general_section.graphql
@@ -1,6 +1,7 @@
 mutation {
     saveRepoSettingsForSection(
         repoSettings: {
+            repoId: "repo_id"
             projectRef: {
                 id: "repo_id"
                 owner: "hello",

diff --git a/graphql/tests/mutation/saveRepoSettingsForSection/queries/vars_section.graphql b/graphql/tests/mutation/saveRepoSettingsForSection/queries/vars_section.graphql
@@ -1,6 +1,7 @@
 mutation {
     saveRepoSettingsForSection(
         repoSettings: {
+            repoId: "repo_id"
             projectRef: {
                 id: "repo_id"
             }

diff --git a/graphql/tests/mutation/scheduleTasks/queries/schedule_tasks.graphql b/graphql/tests/mutation/scheduleTasks/queries/schedule_tasks.graphql
@@ -1,5 +1,5 @@
 mutation {
-    scheduleTasks(taskIds: ["wuzzup"]) {
+    scheduleTasks(taskIds: ["wuzzup"], versionId: "version") {
       status
     }
-}
+}
diff --git a/graphql/tests/mutation/scheduleTasks/queries/schedule_tasks_failure.graphql b/graphql/tests/mutation/scheduleTasks/queries/schedule_tasks_failure.graphql
@@ -1,5 +1,5 @@
 mutation {
-    scheduleTasks(taskIds: ["non-existent"]) {
+    scheduleTasks(taskIds: ["non-existent"], versionId: "version") {
       status
     }
-}
+}
diff --git a/graphql/tests/patch/baseTaskStatuses/queries/base_task_statuses.graphql b/graphql/tests/patch/baseTaskStatuses/queries/base_task_statuses.graphql
@@ -1,5 +1,5 @@
 {
-  patch(id: "5dd2e89cd1fe07048e43bb9c") {
+  patch(patchId: "5dd2e89cd1fe07048e43bb9c") {
     baseTaskStatuses
   }
 }
diff --git a/graphql/tests/patch/baseVersion/queries/base_version.graphql b/graphql/tests/patch/baseVersion/queries/base_version.graphql
@@ -1,5 +1,5 @@
 {
-  patch(id: "5e4ff3abe3c3317e352062e4") {
+  patch(patchId: "5e4ff3abe3c3317e352062e4") {
     id
     versionFull { 
       baseVersion {

diff --git a/graphql/tests/patch/baseVersion/queries/base_version_null.graphql b/graphql/tests/patch/baseVersion/queries/base_version_null.graphql
@@ -1,5 +1,5 @@
 {
-  patch(id: "5d7288d91f8c8a403bc34a7d") {
+  patch(patchId: "5d7288d91f8c8a403bc34a7d") {
     id
     versionFull { 
       baseVersion {

diff --git a/graphql/tests/patch/builds/queries/builds_do_not_exist.graphql b/graphql/tests/patch/builds/queries/builds_do_not_exist.graphql
@@ -1,5 +1,5 @@
 {
-  patch(id: "9e4ff3abe3c3317e352062e4") {
+  patch(patchId: "9e4ff3abe3c3317e352062e4") {
     builds {
       id
       buildVariant

diff --git a/graphql/tests/patch/builds/queries/builds_exist.graphql b/graphql/tests/patch/builds/queries/builds_exist.graphql
@@ -1,5 +1,5 @@
 {
-  patch(id: "5e94c8213e8e8651bee37561") {
+  patch(patchId: "5e94c8213e8e8651bee37561") {
     builds {
       id
       buildVariant

diff --git a/graphql/tests/patch/childPatchAliases/queries/child_patch_aliases.graphql b/graphql/tests/patch/childPatchAliases/queries/child_patch_aliases.graphql
@@ -1,5 +1,5 @@
 {
-  patch(id: "5e4ff3abe3c3317e352062e1") {
+  patch(patchId: "5e4ff3abe3c3317e352062e1") {
     childPatchAliases {
       alias
       patchId

diff --git a/graphql/tests/patch/childPatches/queries/child_patches.graphql b/graphql/tests/patch/childPatches/queries/child_patches.graphql
@@ -1,5 +1,5 @@
 {
-  patch(id: "5e4ff3abe3c3317e352062e1") {
+  patch(patchId: "5e4ff3abe3c3317e352062e1") {
     id
     childPatches {
       id

diff --git a/graphql/tests/patch/childPatches/queries/child_patches_null.graphql b/graphql/tests/patch/childPatches/queries/child_patches_null.graphql
@@ -1,5 +1,5 @@
 {
-  patch(id: "5d7288d91f8c8a403bc34a7d") {
+  patch(patchId: "5d7288d91f8c8a403bc34a7d") {
     id
     childPatches {
       id

diff --git a/graphql/tests/patch/commitQueuePosition/queries/commit_queue_patch.graphql b/graphql/tests/patch/commitQueuePosition/queries/commit_queue_patch.graphql
@@ -1,5 +1,5 @@
 {
-  patch(id: "5c74085f32f41738270aeba8") {
+  patch(patchId: "5c74085f32f41738270aeba8") {
     commitQueuePosition
   }
 }
diff --git a/graphql/tests/patch/commitQueuePosition/queries/github_merge_patch.graphql b/graphql/tests/patch/commitQueuePosition/queries/github_merge_patch.graphql
@@ -1,5 +1,5 @@
 {
-  patch(id: "64db7d48b237368d9eea0d10") {
+  patch(patchId: "64db7d48b237368d9eea0d10") {
     commitQueuePosition
   }
 }
diff --git a/graphql/tests/patch/commitQueuePosition/queries/github_pr_patch.graphql b/graphql/tests/patch/commitQueuePosition/queries/github_pr_patch.graphql
@@ -1,5 +1,5 @@
 {
-  patch(id: "9e4ff3abe3c3317e352062e4") {
+  patch(patchId: "9e4ff3abe3c3317e352062e4") {
     commitQueuePosition
   }
 }
diff --git a/graphql/tests/patch/createTime/queries/create_time.graphql b/graphql/tests/patch/createTime/queries/create_time.graphql
@@ -1,5 +1,5 @@
 {
-  patch(id: "5e94c8213e8e8651bee37561") {
+  patch(patchId: "5e94c8213e8e8651bee37561") {
     createTime
   }
 }