diff --git a/controllers/network.go b/controllers/network.go index 8121ef8f..608afb70 100644 --- a/controllers/network.go +++ b/controllers/network.go @@ -22,7 +22,6 @@ func networkHandlers(r *mux.Router) { r.HandleFunc("/api/networks", logic.SecurityCheck(true, checkFreeTierLimits(networks_l, http.HandlerFunc(createNetwork)))).Methods("POST") r.HandleFunc("/api/networks/{networkname}", logic.SecurityCheck(false, http.HandlerFunc(getNetwork))).Methods("GET") r.HandleFunc("/api/networks/{networkname}", logic.SecurityCheck(false, http.HandlerFunc(updateNetwork))).Methods("PUT") - r.HandleFunc("/api/networks/{networkname}/nodelimit", logic.SecurityCheck(true, http.HandlerFunc(updateNetworkNodeLimit))).Methods("PUT") r.HandleFunc("/api/networks/{networkname}", logic.SecurityCheck(true, http.HandlerFunc(deleteNetwork))).Methods("DELETE") r.HandleFunc("/api/networks/{networkname}/keyupdate", logic.SecurityCheck(true, http.HandlerFunc(keyUpdate))).Methods("POST") r.HandleFunc("/api/networks/{networkname}/keys", logic.SecurityCheck(false, http.HandlerFunc(createAccessKey))).Methods("POST") @@ -278,56 +277,6 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) { json.NewEncoder(w).Encode(newNetwork) } -// swagger:route PUT /api/networks/{networkname}/nodelimit networks updateNetworkNodeLimit -// -// Update a network's node limit. -// -// Schemes: https -// -// Security: -// oauth -// -// Responses: -// 200: networkBodyResponse -func updateNetworkNodeLimit(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Content-Type", "application/json") - var params = mux.Vars(r) - var network models.Network - netname := params["networkname"] - network, err := logic.GetParentNetwork(netname) - if err != nil { - logger.Log(0, r.Header.Get("user"), - fmt.Sprintf("failed to get network [%s] nodes: %v", - network.NetID, err.Error())) - logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) - return - } - - var networkChange models.Network - - err = json.NewDecoder(r.Body).Decode(&networkChange) - if err != nil { - logger.Log(0, r.Header.Get("user"), "error decoding request body: ", - err.Error()) - logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest")) - return - } - if networkChange.NodeLimit != 0 { - network.NodeLimit = networkChange.NodeLimit - data, err := json.Marshal(&network) - if err != nil { - logger.Log(0, r.Header.Get("user"), - "error marshalling resp: ", err.Error()) - logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest")) - return - } - database.Insert(network.NetID, string(data), database.NETWORKS_TABLE_NAME) - logger.Log(1, r.Header.Get("user"), "updated network node limit on", netname) - } - w.WriteHeader(http.StatusOK) - json.NewEncoder(w).Encode(network) -} - // swagger:route PUT /api/networks/{networkname}/acls networks updateNetworkACL // // Update a network ACL (Access Control List). diff --git a/controllers/node.go b/controllers/node.go index 95245f93..8cd13dfe 100644 --- a/controllers/node.go +++ b/controllers/node.go @@ -33,7 +33,6 @@ func nodeHandlers(r *mux.Router) { r.HandleFunc("/api/nodes/{network}/{nodeid}/deleteingress", logic.SecurityCheck(false, http.HandlerFunc(deleteIngressGateway))).Methods("DELETE") r.HandleFunc("/api/nodes/{network}/{nodeid}/approve", authorize(false, true, "user", http.HandlerFunc(uncordonNode))).Methods("POST") r.HandleFunc("/api/nodes/{network}", nodeauth(checkFreeTierLimits(node_l, http.HandlerFunc(createNode)))).Methods("POST") - r.HandleFunc("/api/nodes/adm/{network}/lastmodified", authorize(false, true, "network", http.HandlerFunc(getLastModified))).Methods("GET") r.HandleFunc("/api/nodes/adm/{network}/authenticate", authenticate).Methods("POST") } @@ -493,38 +492,6 @@ func getNode(w http.ResponseWriter, r *http.Request) { json.NewEncoder(w).Encode(response) } -// swagger:route GET /api/nodes/adm/{network}/lastmodified nodes getLastModified -// -// Get the time that a network of nodes was last modified. -// -// Schemes: https -// -// Security: -// oauth -// -// Responses: -// 200: nodeLastModifiedResponse -// TODO: This needs to be refactored -// Potential way to do this: On UpdateNode, set a new field for "LastModified" -// If we go with the existing way, we need to at least set network.NodesLastModified on UpdateNode -func getLastModified(w http.ResponseWriter, r *http.Request) { - // set header. - w.Header().Set("Content-Type", "application/json") - - var params = mux.Vars(r) - networkName := params["network"] - network, err := logic.GetNetwork(networkName) - if err != nil { - logger.Log(0, r.Header.Get("user"), - fmt.Sprintf("error fetching network [%s] info: %v", networkName, err)) - logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) - return - } - logger.Log(2, r.Header.Get("user"), "called last modified") - w.WriteHeader(http.StatusOK) - json.NewEncoder(w).Encode(network.NodesLastModified) -} - // swagger:route POST /api/nodes/{network} nodes createNode // // Create a node on a network. diff --git a/swagger.yaml b/swagger.yaml index a096ea19..cf3dff3b 100644 --- a/swagger.yaml +++ b/swagger.yaml @@ -1272,24 +1272,6 @@ paths: summary: Update keys for a network. tags: - networks - /api/networks/{networkname}/nodelimit: - put: - operationId: updateNetworkNodeLimit - parameters: - - description: Network Name - in: path - name: networkname - required: true - type: string - x-go-name: NetworkName - responses: - "200": - $ref: '#/responses/networkBodyResponse' - schemes: - - https - summary: Update a network's node limit. - tags: - - networks /api/nodes: get: operationId: getAllNodes @@ -1602,17 +1584,6 @@ paths: summary: Authenticate to make further API calls related to a network. tags: - nodes - /api/nodes/adm/{network}/lastmodified: - get: - operationId: getLastModified - responses: - "200": - $ref: '#/responses/nodeLastModifiedResponse' - schemes: - - https - summary: Get the time that a network of nodes was last modified. - tags: - - nodes /api/oauth/login: get: operationId: HandleAuthLogin