diff --git a/libclient/nexusclient/client.go b/libclient/nexusclient/client.go index 7a09dec65074bff816d40fcd89595fa913929a2e..39d90f1094504e5d98243642d0e2ee6d5467eebd 100644 --- a/libclient/nexusclient/client.go +++ b/libclient/nexusclient/client.go @@ -10,7 +10,6 @@ import ( "time" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/params" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/response" u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils" "github.com/go-resty/resty/v2" "github.com/google/uuid" @@ -70,7 +69,7 @@ func (nc *NexusClient) Authenticate(user, pwd string) (string, error) { } return token.Token, nil } else { - return "", response.ErrorToMsg(resp) + return "", errorToMsg(resp) } } @@ -121,7 +120,7 @@ func (nc *NexusClient) RefreshToken() error { nc.client.SetAuthToken(token.Token) return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } } diff --git a/libclient/response/response.go b/libclient/nexusclient/response.go similarity index 68% rename from libclient/response/response.go rename to libclient/nexusclient/response.go index d5ba47fd48c97ff208093a743f9a0d759f73b3d9..420a64ca70f441760f41caebf4065f9a6b041f0b 100644 --- a/libclient/response/response.go +++ b/libclient/nexusclient/response.go @@ -1,4 +1,4 @@ -package response +package nexusclient import ( "encoding/json" @@ -7,12 +7,12 @@ import ( "github.com/go-resty/resty/v2" ) -type Message struct { +type message struct { Message string } -func ErrorToMsg(resp *resty.Response) error { - var msg Message +func errorToMsg(resp *resty.Response) error { + var msg message if err := json.Unmarshal(resp.Body(), &msg); err != nil { return errors.New("Error: " + err.Error()) } diff --git a/libclient/nexusclient/template.go b/libclient/nexusclient/template.go index 5c2d981e98741a83a05e25327daca50a3ed338c7..cb586b5ee957ea1fec16039e395ad3dc994637be 100644 --- a/libclient/nexusclient/template.go +++ b/libclient/nexusclient/template.go @@ -6,7 +6,6 @@ import ( "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/params" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/template" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/response" u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils" "github.com/go-resty/resty/v2" "github.com/google/uuid" @@ -20,7 +19,7 @@ func (nc *NexusClient) TemplateDel(tplID string) error { if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -37,7 +36,7 @@ func (nc *NexusClient) TemplateCreate(vmID uuid.UUID, name, access string) (*tem } return &tpl, nil } else { - return nil, response.ErrorToMsg(resp) + return nil, errorToMsg(resp) } } @@ -54,7 +53,7 @@ func (nc *NexusClient) GetTemplates() ([]template.TemplateSerialized, error) { } return templates, nil } else { - return nil, response.ErrorToMsg(resp) + return nil, errorToMsg(resp) } } @@ -71,7 +70,7 @@ func (nc *NexusClient) GetTemplate(uuid string) (*template.TemplateSerialized, e } return template, nil } else { - return nil, response.ErrorToMsg(resp) + return nil, errorToMsg(resp) } } @@ -87,7 +86,7 @@ func (nc *NexusClient) TemplateEdit(tplID string, p params.TplEdit) (*template.T } return &tpl, nil } else { - return nil, response.ErrorToMsg(resp) + return nil, errorToMsg(resp) } } @@ -100,7 +99,7 @@ func (nc *NexusClient) TemplateExportDisk(tplID, outputFile string) error { return nil } else { errorMsg, _ := u.FileToString(outputFile) - return errors.New(response.ErrorToMsg(resp).Error() + ": " + errorMsg) + return errors.New(errorToMsg(resp).Error() + ": " + errorMsg) } } } diff --git a/libclient/nexusclient/user.go b/libclient/nexusclient/user.go index 1dc97df52113c607be84a4f1cbda323d5e38cfb7..81d18ddfb75b122c93670714727f71420b610b1e 100644 --- a/libclient/nexusclient/user.go +++ b/libclient/nexusclient/user.go @@ -1,12 +1,9 @@ package nexusclient import ( - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/response" - - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/params" - "encoding/json" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/params" "github.com/go-resty/resty/v2" ) @@ -18,7 +15,7 @@ func (nc *NexusClient) UserCreate(p params.UserWithPwd) error { if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -30,7 +27,7 @@ func (nc *NexusClient) UserDelete(email string) error { if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -47,7 +44,7 @@ func (nc *NexusClient) UserResetPwd(email string) (string, error) { } return pwd, nil } else { - return "", response.ErrorToMsg(resp) + return "", errorToMsg(resp) } } @@ -59,7 +56,7 @@ func (nc *NexusClient) UserSetCaps(email string, userCaps *params.UserSetCaps) e if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -71,7 +68,7 @@ func (nc *NexusClient) UserUnlock(email string) error { if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -85,7 +82,7 @@ func (nc *NexusClient) UserUpdatePwd(newPwd string) error { if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -103,7 +100,7 @@ func (nc *NexusClient) UserWhoAmI() (*params.UserWithoutPwd, error) { } return user, nil } else { - return nil, response.ErrorToMsg(resp) + return nil, errorToMsg(resp) } } @@ -121,7 +118,7 @@ func (nc *NexusClient) GetUser(email string) (*params.UserWithoutPwd, error) { } return user, nil } else { - return nil, response.ErrorToMsg(resp) + return nil, errorToMsg(resp) } } @@ -138,7 +135,7 @@ func (nc *NexusClient) GetUsers() ([]params.UserWithoutPwd, error) { } return users, nil } else { - return nil, response.ErrorToMsg(resp) + return nil, errorToMsg(resp) } } diff --git a/libclient/nexusclient/vm.go b/libclient/nexusclient/vm.go index bbeedf264e2f62333a706b2e0f6d8369fc94759c..91c8b5d3b692c091a82fcdbfee4f5f8faea9e571 100644 --- a/libclient/nexusclient/vm.go +++ b/libclient/nexusclient/vm.go @@ -6,7 +6,6 @@ import ( "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/params" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/vm" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/response" u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils" "github.com/go-playground/validator/v10" "github.com/go-resty/resty/v2" @@ -41,7 +40,7 @@ func (nc *NexusClient) VMCreate(p params.VMCreate) (*vm.VMNetworkSerialized, err } return &vm, nil } else { - return nil, response.ErrorToMsg(resp) + return nil, errorToMsg(resp) } } @@ -57,7 +56,7 @@ func (nc *NexusClient) VMEdit(vmID string, p params.VMEdit) (*vm.VMNetworkSerial } return &vm, nil } else { - return nil, response.ErrorToMsg(resp) + return nil, errorToMsg(resp) } } @@ -69,7 +68,7 @@ func (nc *NexusClient) VMDel(vmID string) error { if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -99,7 +98,7 @@ func (nc *NexusClient) VMDelAccess(vmID, vmName, email string) error { if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -115,7 +114,7 @@ func (nc *NexusClient) VMImportArchive(vmID, vmDir, archiveFile string) error { if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -127,7 +126,7 @@ func (nc *NexusClient) VMReboot(vmID string) error { if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -139,7 +138,7 @@ func (nc *NexusClient) VMShutdown(vmID string) error { if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -151,7 +150,7 @@ func (nc *NexusClient) VMStart(vmID string) error { if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -163,7 +162,7 @@ func (nc *NexusClient) VMStartWithCreds(vmID string, p params.VMStartWithCreds) if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -175,7 +174,7 @@ func (nc *NexusClient) VMStop(vmID string) error { if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -239,7 +238,7 @@ func (nc *NexusClient) VMAddAccess(vmID, vmName, email string, vmAccessCaps *par if resp.IsSuccess() { return nil } else { - return response.ErrorToMsg(resp) + return errorToMsg(resp) } } @@ -256,7 +255,7 @@ func (nc *NexusClient) GetAttachVMsCreds() ([]vm.VMAttachCredentialsSerialized, } return vmCreds, nil } else { - return nil, response.ErrorToMsg(resp) + return nil, errorToMsg(resp) } } @@ -309,7 +308,7 @@ func (nc *NexusClient) GetListVM(vmID string) (*vm.VMNetworkSerialized, error) { } return vm, nil } else { - return nil, response.ErrorToMsg(resp) + return nil, errorToMsg(resp) } } @@ -348,7 +347,7 @@ func (nc *NexusClient) getVMs(route string) ([]vm.VMNetworkSerialized, error) { } return vms, nil } else { - return nil, response.ErrorToMsg(resp) + return nil, errorToMsg(resp) } } @@ -365,7 +364,7 @@ func (nc *NexusClient) vmIdToAttachCreds(vmID string) (*vm.VMAttachCredentialsSe } return vmCreds, nil } else { - return nil, response.ErrorToMsg(resp) + return nil, errorToMsg(resp) } } @@ -380,7 +379,7 @@ func handleResponse(resp *resty.Response) (*vm.VMSpiceCredentialsSerialized, err } return &creds, nil } else { - return nil, response.ErrorToMsg(resp) + return nil, errorToMsg(resp) } }