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

refactor(http): remove unused Config.AgentOptions parameter [EE-2841] #281

Merged
merged 1 commit into from
Apr 12, 2022
Merged

refactor(http): remove unused Config.AgentOptions parameter [EE-2841] #281

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
7 changes: 2 additions & 5 deletions http/handler/browse/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"net/http"

"github.com/gorilla/mux"
"github.com/portainer/agent"
"github.com/portainer/agent/http/proxy"
"github.com/portainer/agent/http/security"
httperror "github.com/portainer/libhttp/error"
Expand All @@ -13,15 +12,13 @@ import (
// Handler is the HTTP handler used to handle volume browsing operations.
type Handler struct {
*mux.Router
agentOptions *agent.Options
}

// NewHandler returns a pointer to an Handler
// It sets the associated handle functions for all the Browse related HTTP endpoints.
func NewHandler(agentProxy *proxy.AgentProxy, notaryService *security.NotaryService, agentOptions *agent.Options) *Handler {
func NewHandler(agentProxy *proxy.AgentProxy, notaryService *security.NotaryService) *Handler {
h := &Handler{
Router: mux.NewRouter(),
agentOptions: agentOptions,
Router: mux.NewRouter(),
}

h.Handle("/browse/ls",
Expand Down
3 changes: 1 addition & 2 deletions http/handler/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ type Config struct {
KubernetesDeployer *exec.KubernetesDeployer
EdgeManager *edge.Manager
RuntimeConfiguration *agent.RuntimeConfiguration
AgentOptions *agent.Options
Secured bool
ContainerPlatform agent.ContainerPlatform
}
Expand All @@ -65,7 +64,7 @@ func NewHandler(config *Config) *Handler {

return &Handler{
agentHandler: httpagenthandler.NewHandler(config.ClusterService, notaryService),
browseHandler: browse.NewHandler(agentProxy, notaryService, config.AgentOptions),
browseHandler: browse.NewHandler(agentProxy, notaryService),
browseHandlerV1: browse.NewHandlerV1(agentProxy, notaryService),
dockerProxyHandler: docker.NewHandler(config.ClusterService, config.RuntimeConfiguration, notaryService, config.Secured),
dockerhubHandler: dockerhub.NewHandler(notaryService),
Expand Down
6 changes: 2 additions & 4 deletions http/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ func (server *APIServer) StartUnsecured(edgeMode bool) error {
ClusterService: server.clusterService,
SignatureService: server.signatureService,
RuntimeConfiguration: server.agentTags,
AgentOptions: server.agentOptions,
EdgeManager: server.edgeManager,
KubeClient: server.kubeClient,
KubernetesDeployer: server.kubernetesDeployer,
Expand Down Expand Up @@ -118,7 +117,6 @@ func (server *APIServer) StartSecured(edgeMode bool) error {
ClusterService: server.clusterService,
SignatureService: server.signatureService,
RuntimeConfiguration: server.agentTags,
AgentOptions: server.agentOptions,
EdgeManager: server.edgeManager,
KubeClient: server.kubeClient,
KubernetesDeployer: server.kubernetesDeployer,
Expand Down Expand Up @@ -157,9 +155,9 @@ func (server *APIServer) StartSecured(edgeMode bool) error {
TLSConfig: tlsConfig,
WriteTimeout: 30 * time.Minute,
}

go func() {
securityShutdown := config.AgentOptions.AgentSecurityShutdown
securityShutdown := server.agentOptions.AgentSecurityShutdown
time.Sleep(securityShutdown)

if !server.signatureService.IsAssociated() {
Expand Down