Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 15:59:41 +02:00
Code Issues Releases Activity

feat(edge-stack): relative path support for edge stack EE-5521 (#9103)

Browse source
This commit is contained in:
cmeng 2023-06-23 09:41:50 +12:00 • committed by GitHub
parent 4cc96b4b30
commit 7cb6e3f66a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 163 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
api/http/handler/endpointedge/endpoint_edgestack_inspect.go
View file

@ -2,18 +2,17 @@ package endpointedge
import (
"errors"
"net/http"
"os"
"path"
httperror "github.com/portainer/libhttp/error"
"github.com/portainer/libhttp/request"
"github.com/portainer/libhttp/response"
portainer "github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/edge"
"github.com/portainer/portainer/api/filesystem"
"github.com/portainer/portainer/api/http/middlewares"
"github.com/portainer/portainer/api/internal/endpointutils"
"github.com/portainer/portainer/api/kubernetes"
"net/http"
)
// @summary Inspect an Edge Stack for an Environment(Endpoint)
@ -69,26 +68,19 @@ func (handler *Handler) endpointEdgeStackInspect(w http.ResponseWriter, r *http.
if fileName == "" {
return httperror.BadRequest("Kubernetes is not supported by this stack", errors.New("Kubernetes is not supported by this stack"))
}
}
stackFileContent, err := handler.FileService.GetFileContent(edgeStack.ProjectPath, fileName)
dirEntries, err := filesystem.LoadDir(edgeStack.ProjectPath)
if err != nil {
return httperror.InternalServerError("Unable to retrieve Compose file from disk", err)
return httperror.InternalServerError("Unable to load repository", err)
}
var dotEnvFileContent []byte
if _, err = os.Stat(path.Join(edgeStack.ProjectPath, ".env")); err == nil {
dotEnvFileContent, err = handler.FileService.GetFileContent(edgeStack.ProjectPath, ".env")
if err != nil {
return httperror.InternalServerError("Unable to retrieve .env file from disk", err)
}
}
dirEntries = filesystem.FilterDirForEntryFile(dirEntries, fileName)
return response.JSON(w, edge.StackPayload{
DotEnvFileContent: string(dotEnvFileContent),
FileContent: string(stackFileContent),
Name: edgeStack.Name,
Namespace: namespace,
DirEntries: dirEntries,
EntryFileName: fileName,
Name: edgeStack.Name,
Namespace: namespace,
})
}