zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 08:47:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/k4s0/netmaker into develop

Browse Source
This commit is contained in:
lorenzo
2022-09-01 15:49:59 +02:00
parent 18a3325175 bcddc3f3c5
commit 55cd13a6a2
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
controllers/ext_client.go
View File

@@ -251,7 +251,7 @@ func createExtClient(w http.ResponseWriter, r *http.Request) {
var params = mux.Vars(r)
networkName := params["network"]
nodeid := params["nodeid"]
clientid := params["clientid"]
ingressExists := checkIngressExists(nodeid)
if !ingressExists {
err := errors.New("ingress does not exist")
@@ -262,9 +262,16 @@ func createExtClient(w http.ResponseWriter, r *http.Request) {
}
var extclient models.ExtClient
if clientid != "" {// if clientid is passed from api call, create new extclient with custom clientid instead to generate a random one
extclient.ClientID = clientid
var CustomExtClient models.CustomExtClient
err := json.NewDecoder(r.body).Decode(&CustomExtClient);
if err != nil {
logger.Log(1, "error creating CustomExtClient"+err.Error())
} else {
extclient.ClientID = CustomExtClient.ClientID
}
extclient.Network = networkName
extclient.IngressGatewayID = nodeid
node, err := logic.GetNodeByID(nodeid)