Simplify sub errors

MDrakos · MDrakos · commit 2ccc89d0db20 · 2024-11-18T15:55:25.000-08:00
diff --git a/pkg/platform/api/buildplanner/request/commit.go b/pkg/platform/api/buildplanner/request/commit.go
@@ -163,14 +163,7 @@ query ($commitID: String!, $organization: String!, $project: String!, $target: S
               subErrors {
                 __typename
                 buildExprPath
-                ... on RemediableError {
-                  possibleRemediations {
-                    description
-                    suggestedPriority
-                  }
-                }
                 ... on GenericSolveError {
-                  path
                   message
                   isTransient
                   validationErrors {
@@ -179,19 +172,13 @@ query ($commitID: String!, $organization: String!, $project: String!, $target: S
                   }
                 }
                 ... on RemediableSolveError {
-                  path
                   message
                   isTransient
                   errorType
                   validationErrors {
                     error
                     jsonPath
                   }
-                  suggestedRemediations {
-                    remediationType
-                    command
-                    parameters
-                  }
                 }
               }
             }
diff --git a/pkg/platform/api/buildplanner/request/createproject.go b/pkg/platform/api/buildplanner/request/createproject.go
@@ -37,14 +37,7 @@ mutation ($organization: String!, $project: String!, $private: Boolean!, $expr:
       subErrors {
         __typename
         buildExprPath
-        ... on RemediableError {
-          possibleRemediations {
-            description
-            suggestedPriority
-          }
-        }
         ... on GenericSolveError {
-          path
           message
           isTransient
           validationErrors {
@@ -53,19 +46,13 @@ mutation ($organization: String!, $project: String!, $private: Boolean!, $expr:
           }
         }
         ... on RemediableSolveError {
-          path
           message
           isTransient
           errorType
           validationErrors {
             error
             jsonPath
           }
-          suggestedRemediations {
-            remediationType
-            command
-            parameters
-          }
         }
       }
     }
diff --git a/pkg/platform/api/buildplanner/request/evaluate.go b/pkg/platform/api/buildplanner/request/evaluate.go
@@ -32,14 +32,7 @@ mutation ($organization: String!, $project: String!, $commitId: String!, $target
       subErrors {
         __typename
         buildExprPath
-        ... on RemediableError {
-          possibleRemediations {
-            description
-            suggestedPriority
-          }
-        }
         ... on GenericSolveError {
-          path
           message
           isTransient
           validationErrors {
@@ -48,19 +41,13 @@ mutation ($organization: String!, $project: String!, $commitId: String!, $target
           }
         }
         ... on RemediableSolveError {
-          path
           message
           isTransient
           errorType
           validationErrors {
             error
             jsonPath
           }
-          suggestedRemediations {
-            remediationType
-            command
-            parameters
-          }
         }
       }
     }
diff --git a/pkg/platform/api/buildplanner/request/mergecommit.go b/pkg/platform/api/buildplanner/request/mergecommit.go
@@ -39,14 +39,7 @@ mutation ($organization: String!, $project: String!, $targetRef: String!, $other
       subErrors {
         __typename
         buildExprPath
-        ... on RemediableError {
-          possibleRemediations {
-            description
-            suggestedPriority
-          }
-        }
         ... on GenericSolveError {
-          path
           message
           isTransient
           validationErrors {
@@ -55,19 +48,13 @@ mutation ($organization: String!, $project: String!, $targetRef: String!, $other
           }
         }
         ... on RemediableSolveError {
-          path
           message
           isTransient
           errorType
           validationErrors {
             error
             jsonPath
           }
-          suggestedRemediations {
-            remediationType
-            command
-            parameters
-          }
         }
       }
     }
diff --git a/pkg/platform/api/buildplanner/request/revertcommit.go b/pkg/platform/api/buildplanner/request/revertcommit.go
@@ -44,14 +44,7 @@ mutation ($organization: String!, $project: String!, $commitId: String!, $target
       subErrors {
         __typename
         buildExprPath
-        ... on RemediableError {
-          possibleRemediations {
-            description
-            suggestedPriority
-          }
-        }
         ... on GenericSolveError {
-          path
           message
           isTransient
           validationErrors {
@@ -60,19 +53,13 @@ mutation ($organization: String!, $project: String!, $commitId: String!, $target
           }
         }
         ... on RemediableSolveError {
-          path
           message
           isTransient
           errorType
           validationErrors {
             error
             jsonPath
           }
-          suggestedRemediations {
-            remediationType
-            command
-            parameters
-          }
         }
       }
     }
diff --git a/pkg/platform/api/buildplanner/request/stagecommit.go b/pkg/platform/api/buildplanner/request/stagecommit.go
@@ -167,14 +167,7 @@ mutation ($organization: String!, $project: String!, $parentCommit: ID!, $descri
           subErrors {
             __typename
             buildExprPath
-            ... on RemediableError {
-              possibleRemediations {
-                description
-                suggestedPriority
-              }
-            }
             ... on GenericSolveError {
-              path
               message
               isTransient
               validationErrors {
@@ -183,19 +176,13 @@ mutation ($organization: String!, $project: String!, $parentCommit: ID!, $descri
               }
             }
             ... on RemediableSolveError {
-              path
               message
               isTransient
               errorType
               validationErrors {
                 error
                 jsonPath
               }
-              suggestedRemediations {
-                remediationType
-                command
-                parameters
-              }
             }
           }
         }
@@ -210,14 +197,7 @@ mutation ($organization: String!, $project: String!, $parentCommit: ID!, $descri
       subErrors {
         __typename
         buildExprPath
-        ... on RemediableError {
-          possibleRemediations {
-            description
-            suggestedPriority
-          }
-        }
         ... on GenericSolveError {
-          path
           message
           isTransient
           validationErrors {
@@ -226,19 +206,13 @@ mutation ($organization: String!, $project: String!, $parentCommit: ID!, $descri
           }
         }
         ... on RemediableSolveError {
-          path
           message
           isTransient
           errorType
           validationErrors {
             error
             jsonPath
           }
-          suggestedRemediations {
-            remediationType
-            command
-            parameters
-          }
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -163,14 +163,7 @@ query ($commitID: String!, $organization: String!, $project: String!, $target: S`
`163`	`163`	`subErrors {`
`164`	`164`	`__typename`
`165`	`165`	`buildExprPath`
`166`		`- ... on RemediableError {`
`167`		`- possibleRemediations {`
`168`		`- description`
`169`		`- suggestedPriority`
`170`		`- }`
`171`		`- }`
`172`	`166`	`... on GenericSolveError {`
`173`		`- path`
`174`	`167`	`message`
`175`	`168`	`isTransient`
`176`	`169`	`validationErrors {`
`@@ -179,19 +172,13 @@ query ($commitID: String!, $organization: String!, $project: String!, $target: S`
`179`	`172`	`}`
`180`	`173`	`}`
`181`	`174`	`... on RemediableSolveError {`
`182`		`- path`
`183`	`175`	`message`
`184`	`176`	`isTransient`
`185`	`177`	`errorType`
`186`	`178`	`validationErrors {`
`187`	`179`	`error`
`188`	`180`	`jsonPath`
`189`	`181`	`}`
`190`		`- suggestedRemediations {`
`191`		`- remediationType`
`192`		`- command`
`193`		`- parameters`
`194`		`- }`
`195`	`182`	`}`
`196`	`183`	`}`
`197`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,7 @@ mutation ($organization: String!, $project: String!, $private: Boolean!, $expr:`
`37`	`37`	`subErrors {`
`38`	`38`	`__typename`
`39`	`39`	`buildExprPath`
`40`		`- ... on RemediableError {`
`41`		`- possibleRemediations {`
`42`		`- description`
`43`		`- suggestedPriority`
`44`		`- }`
`45`		`- }`
`46`	`40`	`... on GenericSolveError {`
`47`		`- path`
`48`	`41`	`message`
`49`	`42`	`isTransient`
`50`	`43`	`validationErrors {`
`@@ -53,19 +46,13 @@ mutation ($organization: String!, $project: String!, $private: Boolean!, $expr:`
`53`	`46`	`}`
`54`	`47`	`}`
`55`	`48`	`... on RemediableSolveError {`
`56`		`- path`
`57`	`49`	`message`
`58`	`50`	`isTransient`
`59`	`51`	`errorType`
`60`	`52`	`validationErrors {`
`61`	`53`	`error`
`62`	`54`	`jsonPath`
`63`	`55`	`}`
`64`		`- suggestedRemediations {`
`65`		`- remediationType`
`66`		`- command`
`67`		`- parameters`
`68`		`- }`
`69`	`56`	`}`
`70`	`57`	`}`
`71`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,7 @@ mutation ($organization: String!, $project: String!, $commitId: String!, $target`
`32`	`32`	`subErrors {`
`33`	`33`	`__typename`
`34`	`34`	`buildExprPath`
`35`		`- ... on RemediableError {`
`36`		`- possibleRemediations {`
`37`		`- description`
`38`		`- suggestedPriority`
`39`		`- }`
`40`		`- }`
`41`	`35`	`... on GenericSolveError {`
`42`		`- path`
`43`	`36`	`message`
`44`	`37`	`isTransient`
`45`	`38`	`validationErrors {`
`@@ -48,19 +41,13 @@ mutation ($organization: String!, $project: String!, $commitId: String!, $target`
`48`	`41`	`}`
`49`	`42`	`}`
`50`	`43`	`... on RemediableSolveError {`
`51`		`- path`
`52`	`44`	`message`
`53`	`45`	`isTransient`
`54`	`46`	`errorType`
`55`	`47`	`validationErrors {`
`56`	`48`	`error`
`57`	`49`	`jsonPath`
`58`	`50`	`}`
`59`		`- suggestedRemediations {`
`60`		`- remediationType`
`61`		`- command`
`62`		`- parameters`
`63`		`- }`
`64`	`51`	`}`
`65`	`52`	`}`
`66`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,14 +39,7 @@ mutation ($organization: String!, $project: String!, $targetRef: String!, $other`
`39`	`39`	`subErrors {`
`40`	`40`	`__typename`
`41`	`41`	`buildExprPath`
`42`		`- ... on RemediableError {`
`43`		`- possibleRemediations {`
`44`		`- description`
`45`		`- suggestedPriority`
`46`		`- }`
`47`		`- }`
`48`	`42`	`... on GenericSolveError {`
`49`		`- path`
`50`	`43`	`message`
`51`	`44`	`isTransient`
`52`	`45`	`validationErrors {`
`@@ -55,19 +48,13 @@ mutation ($organization: String!, $project: String!, $targetRef: String!, $other`
`55`	`48`	`}`
`56`	`49`	`}`
`57`	`50`	`... on RemediableSolveError {`
`58`		`- path`
`59`	`51`	`message`
`60`	`52`	`isTransient`
`61`	`53`	`errorType`
`62`	`54`	`validationErrors {`
`63`	`55`	`error`
`64`	`56`	`jsonPath`
`65`	`57`	`}`
`66`		`- suggestedRemediations {`
`67`		`- remediationType`
`68`		`- command`
`69`		`- parameters`
`70`		`- }`
`71`	`58`	`}`
`72`	`59`	`}`
`73`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,14 +44,7 @@ mutation ($organization: String!, $project: String!, $commitId: String!, $target`
`44`	`44`	`subErrors {`
`45`	`45`	`__typename`
`46`	`46`	`buildExprPath`
`47`		`- ... on RemediableError {`
`48`		`- possibleRemediations {`
`49`		`- description`
`50`		`- suggestedPriority`
`51`		`- }`
`52`		`- }`
`53`	`47`	`... on GenericSolveError {`
`54`		`- path`
`55`	`48`	`message`
`56`	`49`	`isTransient`
`57`	`50`	`validationErrors {`
`@@ -60,19 +53,13 @@ mutation ($organization: String!, $project: String!, $commitId: String!, $target`
`60`	`53`	`}`
`61`	`54`	`}`
`62`	`55`	`... on RemediableSolveError {`
`63`		`- path`
`64`	`56`	`message`
`65`	`57`	`isTransient`
`66`	`58`	`errorType`
`67`	`59`	`validationErrors {`
`68`	`60`	`error`
`69`	`61`	`jsonPath`
`70`	`62`	`}`
`71`		`- suggestedRemediations {`
`72`		`- remediationType`
`73`		`- command`
`74`		`- parameters`
`75`		`- }`
`76`	`63`	`}`
`77`	`64`	`}`
`78`	`65`	`}`