Skip to content
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

Use GetUserMessage() for resource errors #223

Merged
merged 2 commits into from
Sep 7, 2023
Merged

Use GetUserMessage() for resource errors #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0124d7e
Use GetUserMessage() for resource errors
matthew-richerson Sep 7, 2023
1a822a2
re-vendor
matthew-richerson Sep 7, 2023
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
2 changes: 1 addition & 1 deletion controllers/nnf_workflow_controller_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ func handleWorkflowError(err error, driverStatus *dwsv1alpha2.WorkflowDriverStat
driverStatus.Error = err.Error()
} else {
driverStatus.Status = status
driverStatus.Message = e.UserMessage
driverStatus.Message = e.GetUserMessage()
driverStatus.Error = e.Error()
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/NearNodeFlash/nnf-sos
go 1.19

require (
github.com/HewlettPackard/dws v0.0.1-0.20230815174614-998c6ad6bd1d
github.com/HewlettPackard/dws v0.0.1-0.20230907181649-2f6d9fca4249
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20230613180840-6178f2b04900
github.com/NearNodeFlash/nnf-ec v0.0.0-20230526161255-cfb2d89b35d7
github.com/ghodss/yaml v1.0.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/HewlettPackard/dws v0.0.1-0.20230815174614-998c6ad6bd1d h1:QZKgq7r+4ZUOGV5IPT/HUYWxVMT7vLrYmOV5yvwB6IA=
github.com/HewlettPackard/dws v0.0.1-0.20230815174614-998c6ad6bd1d/go.mod h1:YvNzcgAPmwhl/YQj6dMwsB9OpwbI5bp/41kINfFiXX8=
github.com/HewlettPackard/dws v0.0.1-0.20230907181649-2f6d9fca4249 h1:t5ibQcHcEL374lxAVVXtHqXOZbPvDVSDSrrAVl7yzBA=
github.com/HewlettPackard/dws v0.0.1-0.20230907181649-2f6d9fca4249/go.mod h1:YvNzcgAPmwhl/YQj6dMwsB9OpwbI5bp/41kINfFiXX8=
github.com/HewlettPackard/structex v1.0.4 h1:RVTdN5FWhDWr1IkjllU8wxuLjISo4gr6u5ryZpzyHcA=
github.com/HewlettPackard/structex v1.0.4/go.mod h1:3frC4RY/cPsP/4+N8rkxsNAGlQwHV+zDC7qvrN+N+rE=
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20230613180840-6178f2b04900 h1:jOrP2H+D5amgHIONcucYS3/kJm6QfmqAG23Ke7elunI=
Expand Down
4 changes: 4 additions & 0 deletions vendor/github.com/HewlettPackard/dws/api/v1alpha2/resource_error.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 vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# github.com/HewlettPackard/dws v0.0.1-0.20230815174614-998c6ad6bd1d
# github.com/HewlettPackard/dws v0.0.1-0.20230907181649-2f6d9fca4249
## explicit; go 1.19
github.com/HewlettPackard/dws/api/v1alpha2
github.com/HewlettPackard/dws/config/crd/bases
Expand Down
Loading