Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

feat(environment): update wording when editing agent environment [EE-3081] (#7445)

Browse source 
* change wording when editing agent environment
This commit is contained in:
Matt Hook 2022-08-11 09:27:35 +12:00 • committed by GitHub
parent 02355acfa8
commit 6a4a353b92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/http/handler/endpoints/endpoint_create.go
View file

@ -259,13 +259,7 @@ func (handler *Handler) createEndpoint(payload *endpointCreatePayload) (*portain
endpointType := portainer.DockerEnvironment
if payload.EndpointCreationType == agentEnvironment {
// Case insensitive strip http or https scheme if URL entered
index := strings.Index(payload.URL, "://")
if index >= 0 {
payload.URL = payload.URL[index+3:]
}
payload.URL = "tcp://" + payload.URL
payload.URL = "tcp://" + normalizeAgentAddress(payload.URL)
agentPlatform, err := handler.pingAndCheckPlatform(payload)
if err != nil {

7
api/http/handler/endpoints/endpoint_update.go
View file

@ -105,7 +105,12 @@ func (handler *Handler) endpointUpdate(w http.ResponseWriter, r *http.Request) *
}
if payload.URL != nil {
endpoint.URL = *payload.URL
if endpoint.Type == portainer.AgentOnDockerEnvironment ||
endpoint.Type == portainer.AgentOnKubernetesEnvironment {
endpoint.URL = normalizeAgentAddress(*payload.URL)
} else {
endpoint.URL = *payload.URL
}
}
if payload.PublicURL != nil {

12
api/http/handler/endpoints/utils.go
View file

@ -1,6 +1,18 @@
package endpoints
import "strings"
func BoolAddr(b bool) *bool {
boolVar := b
return &boolVar
}
func normalizeAgentAddress(url string) string {
// Case insensitive strip http or https scheme if URL entered
index := strings.Index(url, "://")
if index >= 0 {
return url[index+3:]
}
return url
}