Skip to content

Commit 759d1a9

Browse files
committed
More error cleanup
1 parent 2ccc89d commit 759d1a9

8 files changed

Lines changed: 2 additions & 59 deletions

File tree

pkg/platform/api/buildplanner/request/commit.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ query ($commitID: String!, $organization: String!, $project: String!, $target: S
162162
__typename
163163
subErrors {
164164
__typename
165-
buildExprPath
166165
... on GenericSolveError {
167166
message
168167
isTransient

pkg/platform/api/buildplanner/request/createproject.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ mutation ($organization: String!, $project: String!, $private: Boolean!, $expr:
3636
__typename
3737
subErrors {
3838
__typename
39-
buildExprPath
4039
... on GenericSolveError {
4140
message
4241
isTransient

pkg/platform/api/buildplanner/request/evaluate.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ mutation ($organization: String!, $project: String!, $commitId: String!, $target
3131
__typename
3232
subErrors {
3333
__typename
34-
buildExprPath
3534
... on GenericSolveError {
3635
message
3736
isTransient

pkg/platform/api/buildplanner/request/mergecommit.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ mutation ($organization: String!, $project: String!, $targetRef: String!, $other
3838
__typename
3939
subErrors {
4040
__typename
41-
buildExprPath
4241
... on GenericSolveError {
4342
message
4443
isTransient

pkg/platform/api/buildplanner/request/revertcommit.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ mutation ($organization: String!, $project: String!, $commitId: String!, $target
4343
__typename
4444
subErrors {
4545
__typename
46-
buildExprPath
4746
... on GenericSolveError {
4847
message
4948
isTransient

pkg/platform/api/buildplanner/request/stagecommit.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ mutation ($organization: String!, $project: String!, $parentCommit: ID!, $descri
166166
__typename
167167
subErrors {
168168
__typename
169-
buildExprPath
170169
... on GenericSolveError {
171170
message
172171
isTransient
@@ -196,7 +195,6 @@ mutation ($organization: String!, $project: String!, $parentCommit: ID!, $descri
196195
__typename
197196
subErrors {
198197
__typename
199-
buildExprPath
200198
... on GenericSolveError {
201199
message
202200
isTransient

pkg/platform/api/buildplanner/response/shared.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,10 @@ type ErrorWithSubErrors struct {
104104

105105
// BuildExprError represents a location in the build script where an error occurred.
106106
type BuildExprError struct {
107-
Type string `json:"__typename"`
108-
Message string `json:"message"`
109-
BuildExprPath []string `json:"buildExprPath"`
107+
Type string `json:"__typename"`
108+
Message string `json:"message"`
110109
*TargetNotFoundError
111-
*RemediableError
112110
*GenericSolveError
113-
*RemediableSolveError
114111
}
115112

116113
type TargetNotFoundError struct {
Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
package response
22

3-
import "github.com/ActiveState/cli/pkg/platform/api/buildplanner/types"
4-
5-
// RemediableSolveError represents a solver error that can be remediated.
6-
type RemediableError struct {
7-
Remediations []*SolverErrorRemediation `json:"possibleRemediations"`
8-
}
9-
103
type GenericSolveError struct {
114
IsTransient bool `json:"isTransient"`
125
ValidationErrors []*SolverErrorValidationError `json:"validationErrors"`
@@ -17,43 +10,3 @@ type SolverErrorValidationError struct {
1710
JSONPath string `json:"jsonPath"`
1811
Error string `json:"error"`
1912
}
20-
21-
// SolverErrorRemediation contains the recommeneded remediation for remediable error.
22-
type SolverErrorRemediation struct {
23-
Description string `json:"description"`
24-
SuggestedPriority string `json:"suggestedPriority"`
25-
}
26-
27-
type RemediableSolveError struct {
28-
ErrorType string `json:"errorType"`
29-
Incompatibilities []*SolveErrorIncompatibility `json:"incompatibilities"`
30-
Requirements []*types.Requirement `json:"requirements"`
31-
SuggestedRemediations []*SolverErrorRemediation `json:"suggestedRemediations"`
32-
}
33-
34-
// SolverErrorIncompatibility represents a solver incompatibility error.
35-
type SolveErrorIncompatibility struct {
36-
Type string `json:"type"`
37-
*SolveErrorPackageIncompatibility
38-
*SolveErrorPlatformIncompatibility
39-
}
40-
41-
// SolveErrorPackageIncompatibility represents a package incompatibility error.
42-
type SolveErrorPackageIncompatibility struct {
43-
Type string `json:"type"`
44-
Feature string `json:"feature"`
45-
Namespace string `json:"namespace"`
46-
}
47-
48-
// SolveErrorPlatformIncompatibility represents a platform incompatibility error.
49-
type SolveErrorPlatformIncompatibility struct {
50-
Type string `json:"type"`
51-
PlatformID string `json:"platformID"`
52-
PlatformKernel string `json:"platformKernel"`
53-
}
54-
55-
const (
56-
SolveErrorIncompatibilityTypeDependency = "DEPENDENCY"
57-
SolveErrorIncompatibilityTypePlatform = "PLATFORM"
58-
SolveErrorIncompatibilityTypeRequirement = "REQUIREMENT"
59-
)

0 commit comments

Comments
 (0)