Skip to content

Returned full error to browser. #897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 26, 2021
Merged

Returned full error to browser. #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions models/error.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions operatorapi/embedded_spec.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion operatorapi/error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func prepareError(err ...error) *models.Error {
errorMessage = err[0].Error()
}
}
return &models.Error{Code: errorCode, Message: swag.String(errorMessage)}
return &models.Error{Code: errorCode, Message: swag.String(errorMessage), DetailedMessage: swag.String(err[0].Error())}
}

func getFrame(skipFrames int) runtime.Frame {
Expand Down
2 changes: 2 additions & 0 deletions portal-ui/src/reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ const initialState: SystemState = {
loadingProgress: 100,
snackBar: {
message: "",
detailedErrorMsg: "",
type: "message",
},
modalSnackBar: {
message: "",
detailedErrorMsg: "",
type: "message",
},
serverDiagnosticStatus: "",
Expand Down
1 change: 1 addition & 0 deletions portal-ui/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
export interface snackBarMessage {
message: string;
detailedErrorMsg?: string;
type: "message" | "error";
}

Expand Down
12 changes: 10 additions & 2 deletions restapi/embedded_spec.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion restapi/error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func prepareError(err ...error) *models.Error {
errorMessage = err[0].Error()
}
}
return &models.Error{Code: errorCode, Message: swag.String(errorMessage)}
return &models.Error{Code: errorCode, Message: swag.String(errorMessage), DetailedMessage: swag.String(err[0].Error())}
}

func getFrame(skipFrames int) runtime.Frame {
Expand Down
3 changes: 3 additions & 0 deletions swagger-console.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2294,12 +2294,15 @@ definitions:
type: object
required:
- message
- detailedMessage
properties:
code:
type: integer
format: int32
message:
type: string
detailedMessage:
type: string
user:
type: object
properties:
Expand Down
3 changes: 3 additions & 0 deletions swagger-operator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,12 +1079,15 @@ definitions:
type: object
required:
- message
- detailedMessage
properties:
code:
type: integer
format: int32
message:
type: string
detailedMessage:
type: string
user:
type: object
properties:
Expand Down