Merge pull request #1572 from gravitl/bugfix_v0.16.0_gomod

Bugfix v0.16.0 gomod

.github/workflows/test.yml

@@ -81,7 +81,7 @@ jobs:
             sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev 
             go test -p 1 ./... -v
             go install honnef.co/go/tools/cmd/staticcheck@latest
-            { ~/go/bin/staticcheck  -tags=ee ./... ; ~/go/bin/staticcheck ./... ; } | ~/go/bin/staticcheck -merge
+            { ~/go/bin/staticcheck  -tags=ee ./... ; }
         env:
           DATABASE: sqlite
           CLIENT_MODE: "off"

controllers/server.go

@@ -50,36 +50,6 @@ func allowUsers(next http.Handler) http.HandlerFunc {
 	}
 }
 
-// swagger:route DELETE /api/server/removenetwork/{network} server removeNetwork
-//
-// Remove a network from the server.
-//
-//		Schemes: https
-//
-// 		Security:
-//   		oauth
-//
-//		Responses:
-//			200: stringJSONResponse
-func removeNetwork(w http.ResponseWriter, r *http.Request) {
-	// Set header
-	w.Header().Set("Content-Type", "application/json")
-
-	// get params
-	var params = mux.Vars(r)
-	network := params["network"]
-	err := logic.DeleteNetwork(network)
-	if err != nil {
-		logger.Log(0, r.Header.Get("user"),
-			fmt.Sprintf("failed to delete network [%s]: %v", network, err))
-		json.NewEncoder(w).Encode(fmt.Sprintf("could not remove network %s from server", network))
-		return
-	}
-	logger.Log(1, r.Header.Get("user"),
-		fmt.Sprintf("deleted network [%s]: %v", network, err))
-	json.NewEncoder(w).Encode(fmt.Sprintf("network %s removed from server", network))
-}
-
 // swagger:route GET /api/server/getserverinfo server getServerInfo
 //
 // Get the server configuration.

ee/license.go

@@ -239,13 +239,3 @@ func getCachedResponse() ([]byte, error) {
 func ClearLicenseCache() error {
 	return database.DeleteRecord(database.CACHE_TABLE_NAME, license_cache_key)
 }
-
-func getServerCount() int {
-	if record, err := database.FetchRecord(database.SERVERCONF_TABLE_NAME, server_id_key); err == nil {
-		currentServerIDs := serverIDs{}
-		if err = json.Unmarshal([]byte(record), &currentServerIDs); err == nil {
-			return len(currentServerIDs.ServerIDs)
-		}
-	}
-	return 1
-}

ee/types.go

@@ -81,7 +81,3 @@ type ValidateLicenseRequest struct {
 type licenseResponseCache struct {
 	Body []byte `json:"body" binding:"required"`
 }
-
-type serverIDs struct {
-	ServerIDs []string `json:"server_ids" binding:"required"`
-}

go.mod

@@ -40,8 +40,8 @@ require (
 )
 
 require (
-	github.com/gorilla/websocket v1.4.2
 	github.com/coreos/go-oidc/v3 v3.4.0
+	github.com/gorilla/websocket v1.4.2
 	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
 	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035
 )

models/accessToken.go

@@ -1,10 +1,12 @@
 package models
 
+// AccessToken - token used to access netmaker
 type AccessToken struct {
 	APIConnString string `json:"apiconnstring"`
 	ClientConfig
 }
 
+// ClientConfig - the config of the client
 type ClientConfig struct {
 	Network    string `json:"network"`
 	Key        string `json:"key"`

swagger.yaml

@@ -1661,17 +1661,6 @@ paths:
             summary: Registers a client with the server and return the Certificate Authority and certificate.
             tags:
                 - server
-    /api/server/removenetwork/{network}:
-        delete:
-            operationId: removeNetwork
-            responses:
-                "200":
-                    $ref: '#/responses/stringJSONResponse'
-            schemes:
-                - https
-            summary: Remove a network from the server.
-            tags:
-                - server
     /api/users:
         get:
             operationId: getUsers