github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(edge/jobs): fix get edge job file content [EE-2702] (#6622)

pull/6714/head
Marcelo Rydel 2022-03-28 12:02:09 -03:00 committed by GitHub
parent b846c8e6d2
commit 8860d72f70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/dataservices/edgejob/edgejob.go
View File

@ -67,14 +67,14 @@ func (service *Service) EdgeJob(ID portainer.EdgeJobID) (*portainer.EdgeJob, err
return &edgeJob, nil return &edgeJob, nil
} }
// CreateEdgeJob creates a new Edge job // Create creates a new EdgeJob
func (service *Service) Create(edgeJob *portainer.EdgeJob) error { func (service *Service) Create(ID portainer.EdgeJobID, edgeJob *portainer.EdgeJob) error {
return service.connection.CreateObject( edgeJob.ID = ID
return service.connection.CreateObjectWithId(
BucketName, BucketName,
func(id uint64) (int, interface{}) { int(edgeJob.ID),
edgeJob.ID = portainer.EdgeJobID(id) edgeJob,
return int(edgeJob.ID), edgeJob
},
) )
} }

2
api/dataservices/interface.go
View File

@ -74,7 +74,7 @@ type (
EdgeJobService interface { EdgeJobService interface {
EdgeJobs() ([]portainer.EdgeJob, error) EdgeJobs() ([]portainer.EdgeJob, error)
EdgeJob(ID portainer.EdgeJobID) (*portainer.EdgeJob, error) EdgeJob(ID portainer.EdgeJobID) (*portainer.EdgeJob, error)
Create(edgeJob *portainer.EdgeJob) error Create(ID portainer.EdgeJobID, edgeJob *portainer.EdgeJob) error
UpdateEdgeJob(ID portainer.EdgeJobID, edgeJob *portainer.EdgeJob) error UpdateEdgeJob(ID portainer.EdgeJobID, edgeJob *portainer.EdgeJob) error
DeleteEdgeJob(ID portainer.EdgeJobID) error DeleteEdgeJob(ID portainer.EdgeJobID) error
GetNextIdentifier() int GetNextIdentifier() int

2
api/http/handler/edgejobs/edgejob_create.go
View File

@ -219,7 +219,7 @@ func (handler *Handler) addAndPersistEdgeJob(edgeJob *portainer.EdgeJob, file []
handler.ReverseTunnelService.AddEdgeJob(endpointID, edgeJob) handler.ReverseTunnelService.AddEdgeJob(endpointID, edgeJob)
} }
return handler.DataStore.EdgeJob().Create(edgeJob) return handler.DataStore.EdgeJob().Create(edgeJob.ID, edgeJob)
} }
func convertEndpointsToMetaObject(endpoints []portainer.EndpointID) map[portainer.EndpointID]portainer.EdgeJobEndpointMeta { func convertEndpointsToMetaObject(endpoints []portainer.EndpointID) map[portainer.EndpointID]portainer.EdgeJobEndpointMeta {

2
api/http/handler/edgejobs/edgejob_file.go
View File

@ -39,7 +39,7 @@ func (handler *Handler) edgeJobFile(w http.ResponseWriter, r *http.Request) *htt
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find an Edge job with the specified identifier inside the database", err} return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find an Edge job with the specified identifier inside the database", err}
} }
edgeJobFileContent, err := handler.FileService.GetFileContent("", edgeJob.ScriptPath) edgeJobFileContent, err := handler.FileService.GetFileContent(edgeJob.ScriptPath, "")
if err != nil { if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve Edge job script file from disk", err} return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve Edge job script file from disk", err}
} }

2
api/http/handler/endpoints/endpoint_status_inspect.go
View File

@ -130,7 +130,7 @@ func (handler *Handler) endpointStatusInspect(w http.ResponseWriter, r *http.Req
Version: job.Version, Version: job.Version,
} }
file, err := handler.FileService.GetFileContent("", job.ScriptPath) file, err := handler.FileService.GetFileContent(job.ScriptPath, "")
if err != nil { if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve Edge job script file", err} return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve Edge job script file", err}

4
api/internal/testhelpers/datastore.go
View File

@ -153,7 +153,9 @@ func (s *stubEdgeJobService) EdgeJobs() ([]portainer.EdgeJob, error) { return s.
func (s *stubEdgeJobService) EdgeJob(ID portainer.EdgeJobID) (*portainer.EdgeJob, error) { func (s *stubEdgeJobService) EdgeJob(ID portainer.EdgeJobID) (*portainer.EdgeJob, error) {
return nil, nil return nil, nil
} }
func (s *stubEdgeJobService) Create(edgeJob *portainer.EdgeJob) error { return nil } func (s *stubEdgeJobService) Create(ID portainer.EdgeJobID, edgeJob *portainer.EdgeJob) error {
return nil
}
func (s *stubEdgeJobService) UpdateEdgeJob(ID portainer.EdgeJobID, edgeJob *portainer.EdgeJob) error { func (s *stubEdgeJobService) UpdateEdgeJob(ID portainer.EdgeJobID, edgeJob *portainer.EdgeJob) error {
return nil return nil
} }

4
app/edge/views/edge-jobs/edgeJob/edgeJobController.js
View File

@ -126,7 +126,7 @@ export class EdgeJobController {
} }
async uiCanExit() { async uiCanExit() {
if (this.edgeJob.FileContent !== this.oldFileContent && this.state.isEditorDirty) { if (this.edgeJob && this.edgeJob.FileContent !== this.oldFileContent && this.state.isEditorDirty) {
return this.ModalService.confirmWebEditorDiscard(); return this.ModalService.confirmWebEditorDiscard();
} }
} }
@ -165,7 +165,7 @@ export class EdgeJobController {
} }
this.$window.onbeforeunload = () => { this.$window.onbeforeunload = () => {
if (this.edgeJob.FileContent !== this.oldFileContent && this.state.isEditorDirty) { if (this.edgeJob && this.edgeJob.FileContent !== this.oldFileContent && this.state.isEditorDirty) {
return ''; return '';
} }
}; };