Removed the debug endpoints, and cleaned up comments from Diogo, and Nathan

Signed-off-by: Ken Cochrane <[email protected]>

Author: kencochrane

tools/metaserver/src/metaserver/aws.go

@@ -26,19 +26,19 @@ type AWSWeb struct {
 func (a AWSWeb) TokenManager(w http.ResponseWriter, r *http.Request) {
 	// get the swarm manager token, if they are a manager node,
 	// and are not already in the swarm. Block otherwise
-	GetRequestInfo(r)
-	found := AlreadyInSwarm(r)
-	isManager := IsManagerNode(r)
+	RequestInfo(r)
+	found := alreadyInSwarm(r)
+	isManager := isManagerNode(r)
 
 	if found || !isManager {
 		// they are either already in the swarm, or they are not a manager
 		w.WriteHeader(http.StatusForbidden)
-		fmt.Fprintf(w, "Access Denied\n")
+		fmt.Fprintln(w, "Access Denied")
 		return
 	}
 
 	// They are not in the swarm, and they are a manager, so good to go.
-	cli, ctx := GetDockerClient()
+	cli, ctx := DockerClient()
 	swarm, err := cli.SwarmInspect(ctx)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
@@ -51,20 +51,20 @@ func (a AWSWeb) TokenManager(w http.ResponseWriter, r *http.Request) {
 func (a AWSWeb) TokenWorker(w http.ResponseWriter, r *http.Request) {
 	// get the swarm worker token, if they are a worker node,
 	// and are not already in the swarm. block otherwise
-	GetRequestInfo(r)
+	RequestInfo(r)
 
-	found := AlreadyInSwarm(r)
-	isWorker := IsWorkerNode(r)
+	found := alreadyInSwarm(r)
+	isWorker := isWorkerNode(r)
 
 	if found || !isWorker {
 		// they are either already in the swarm, or they are not a worker
 		w.WriteHeader(http.StatusForbidden)
-		fmt.Fprintf(w, "Access Denied\n")
+		fmt.Fprintln(w, "Access Denied")
 		return
 	}
 
 	// They are not in the swarm, and they are a worker, so good to go.
-	cli, ctx := GetDockerClient()
+	cli, ctx := DockerClient()
 	swarm, err := cli.SwarmInspect(ctx)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
@@ -74,84 +74,23 @@ func (a AWSWeb) TokenWorker(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprintf(w, swarm.JoinTokens.Worker)
 }
 
-func (a AWSWeb) CheckManager(w http.ResponseWriter, r *http.Request) {
-	// check if this node is a manager and already in the swarm.
-	GetRequestInfo(r)
-	ip := GetRequestIP(r)
-	found := AlreadyInSwarm(r)
-	isManager := IsManagerNode(r)
-	fmt.Fprintf(w, "IP:%s;InSwarm:%v;IsManager:%v;\n", ip, found, isManager)
-}
-
-func (a AWSWeb) CheckWorker(w http.ResponseWriter, r *http.Request) {
-	// check if this node is a worker, and already in the swarm.
-	GetRequestInfo(r)
-	ip := GetRequestIP(r)
-	found := AlreadyInSwarm(r)
-	isWorker := IsWorkerNode(r)
-	fmt.Fprintf(w, "IP:%s;InSwarm:%v;IsWorker:%v;\n", ip, found, isWorker)
-}
-
-func (a AWSWeb) Instances(w http.ResponseWriter, r *http.Request) {
-	// show both manager and worker instances
-	GetRequestInfo(r)
-	fmt.Fprintf(w, "Managers: \n")
-	instances := GetAWSManagers()
-	for _, instance := range instances {
-		fmt.Fprintf(w, "%s %s\n", instance.InstanceID, instance.PrivateIPAddress)
-	}
-	fmt.Fprintf(w, "Workers: \n")
-	instances = GetAWSWorkers()
-	for _, instance := range instances {
-		fmt.Fprintf(w, "%s %s\n", instance.InstanceID, instance.PrivateIPAddress)
-	}
-}
-
-func (a AWSWeb) ManagerInstances(w http.ResponseWriter, r *http.Request) {
-	// only show manager instances
-	GetRequestInfo(r)
-	instances := GetAWSManagers()
-	for _, instance := range instances {
-		fmt.Fprintf(w, "%s %s\n", instance.InstanceID, instance.PrivateIPAddress)
-	}
-}
-
-func (a AWSWeb) WorkerInstances(w http.ResponseWriter, r *http.Request) {
-	// only show worker instances
-	GetRequestInfo(r)
-	instances := GetAWSWorkers()
-	for _, instance := range instances {
-		fmt.Fprintf(w, "%s %s\n", instance.InstanceID, instance.PrivateIPAddress)
-	}
-}
-
-func (a AWSWeb) Nodes(w http.ResponseWriter, r *http.Request) {
-	// print the list of nodes in the swarm.
-	GetRequestInfo(r)
-	nodes := GetSwarmNodes()
-	for _, node := range nodes {
-		ip := ConvertAWSHostToIP(node.Description.Hostname)
-		fmt.Fprintf(w, "%s %s %s\n", node.ID[:15], node.Description.Hostname, ip)
-	}
-}
-
-func AlreadyInSwarm(r *http.Request) bool {
+func alreadyInSwarm(r *http.Request) bool {
 	// Is the node making the request, already in the swarm.
-	ip := GetRequestIP(r)
-	nodes := GetSwarmNodes()
+	ip := RequestIP(r)
+	nodes := SwarmNodes()
 	for _, node := range nodes {
-		nodeIP := ConvertAWSHostToIP(node.Description.Hostname)
+		nodeIP := convertAWSHostToIP(node.Description.Hostname)
 		if ip == nodeIP {
 			return true
 		}
 	}
 	return false
 }
 
-func IsManagerNode(r *http.Request) bool {
+func isManagerNode(r *http.Request) bool {
 	// Is the node making the request a manager node
-	ip := GetRequestIP(r)
-	instances := GetAWSManagers()
+	ip := RequestIP(r)
+	instances := awsManagers()
 	for _, instance := range instances {
 		if ip == instance.PrivateIPAddress {
 			return true
@@ -160,10 +99,10 @@ func IsManagerNode(r *http.Request) bool {
 	return false
 }
 
-func IsWorkerNode(r *http.Request) bool {
+func isWorkerNode(r *http.Request) bool {
 	// Is the node making the request a worker node
-	ip := GetRequestIP(r)
-	instances := GetAWSWorkers()
+	ip := RequestIP(r)
+	instances := awsWorkers()
 	for _, instance := range instances {
 		if ip == instance.PrivateIPAddress {
 			return true
@@ -172,7 +111,7 @@ func IsWorkerNode(r *http.Request) bool {
 	return false
 }
 
-func GetAWSWorkers() []AwsInstance {
+func awsWorkers() []AwsInstance {
 	// get the instances from AWS worker security group
 
 	customFilter := []*ec2.Filter{
@@ -188,10 +127,10 @@ func GetAWSWorkers() []AwsInstance {
 		Values: []*string{aws.String(os.Getenv("WORKER_SECURITY_GROUP_ID"))},
 	})
 
-	return getInstances(customFilter)
+	return awsInstances(customFilter)
 }
 
-func GetAWSManagers() []AwsInstance {
+func awsManagers() []AwsInstance {
 	// get the instances from AWS Manager security group
 
 	customFilter := []*ec2.Filter{
@@ -207,10 +146,10 @@ func GetAWSManagers() []AwsInstance {
 		Values: []*string{aws.String(os.Getenv("MANAGER_SECURITY_GROUP_ID"))},
 	})
 
-	return getInstances(customFilter)
+	return awsInstances(customFilter)
 }
 
-func getInstances(customFilters []*ec2.Filter) []AwsInstance {
+func awsInstances(customFilters []*ec2.Filter) []AwsInstance {
 	// get the instances from AWS, takes a filter to limit the results.
 
 	client := ec2.New(session.New(&aws.Config{}))
@@ -255,7 +194,7 @@ func getInstances(customFilters []*ec2.Filter) []AwsInstance {
 	return instances
 }
 
-func ConvertAWSHostToIP(hostStr string) string {
+func convertAWSHostToIP(hostStr string) string {
 	// This is risky, this assumes the following formation for hosts in swarm node ls
 	// ip-10-0-3-149.ec2.internal
 	// there was one use case when someone had an old account, and their hostnames were not

tools/metaserver/src/metaserver/azure.go

@@ -11,67 +11,19 @@ type AzureWeb struct {
 //TODO: implement these using Azure specific API's
 
 func (a AzureWeb) TokenManager(w http.ResponseWriter, r *http.Request) {
-	GetRequestInfo(r)
+	RequestInfo(r)
 
 	w.WriteHeader(http.StatusNotImplemented)
-	fmt.Fprintf(w, "Not implmented Yet\n")
+	fmt.Fprintf(w, "Not implmented Yet")
 
 	fmt.Println("Endpoint Hit: tokenManager")
 }
 
 func (a AzureWeb) TokenWorker(w http.ResponseWriter, r *http.Request) {
-	GetRequestInfo(r)
+	RequestInfo(r)
 
 	w.WriteHeader(http.StatusNotImplemented)
-	fmt.Fprintf(w, "Not implmented Yet\n")
+	fmt.Fprintf(w, "Not implmented Yet")
 
 	fmt.Println("Endpoint Hit: tokenWorker")
 }
-
-func (a AzureWeb) CheckManager(w http.ResponseWriter, r *http.Request) {
-	GetRequestInfo(r)
-
-	w.WriteHeader(http.StatusNotImplemented)
-	fmt.Fprintf(w, "Not implmented Yet\n")
-
-}
-
-func (a AzureWeb) CheckWorker(w http.ResponseWriter, r *http.Request) {
-	GetRequestInfo(r)
-
-	w.WriteHeader(http.StatusNotImplemented)
-	fmt.Fprintf(w, "Not implmented Yet\n")
-
-}
-
-func (a AzureWeb) Instances(w http.ResponseWriter, r *http.Request) {
-	GetRequestInfo(r)
-
-	w.WriteHeader(http.StatusNotImplemented)
-	fmt.Fprintf(w, "Not implmented Yet\n")
-
-}
-
-func (a AzureWeb) ManagerInstances(w http.ResponseWriter, r *http.Request) {
-	GetRequestInfo(r)
-
-	w.WriteHeader(http.StatusNotImplemented)
-	fmt.Fprintf(w, "Not implmented Yet\n")
-
-}
-
-func (a AzureWeb) WorkerInstances(w http.ResponseWriter, r *http.Request) {
-	GetRequestInfo(r)
-
-	w.WriteHeader(http.StatusNotImplemented)
-	fmt.Fprintf(w, "Not implmented Yet\n")
-
-}
-
-func (a AzureWeb) Nodes(w http.ResponseWriter, r *http.Request) {
-	GetRequestInfo(r)
-
-	w.WriteHeader(http.StatusNotImplemented)
-	fmt.Fprintf(w, "Not implmented Yet\n")
-
-}

tools/metaserver/src/metaserver/main.go

@@ -16,42 +16,24 @@ import (
 type Web interface {
 	TokenManager(w http.ResponseWriter, r *http.Request)
 	TokenWorker(w http.ResponseWriter, r *http.Request)
-	CheckManager(w http.ResponseWriter, r *http.Request)
-	CheckWorker(w http.ResponseWriter, r *http.Request)
-	Instances(w http.ResponseWriter, r *http.Request)
-	Nodes(w http.ResponseWriter, r *http.Request)
-	ManagerInstances(w http.ResponseWriter, r *http.Request)
-	WorkerInstances(w http.ResponseWriter, r *http.Request)
 }
 
 func index(w http.ResponseWriter, r *http.Request) {
 	// print the home index page.
-	GetRequestInfo(r)
-	fmt.Fprintf(w, "token/\ncheck/\nnodes/\ninstances/\n")
-}
-
-func instanceIndex(w http.ResponseWriter, r *http.Request) {
-	// print the instance index page.
-	GetRequestInfo(r)
-	fmt.Fprintf(w, "all/\nmanagers/\nworkers/\n")
+	RequestInfo(r)
+	fmt.Fprintln(w, "token/")
 }
 
 func tokenIndex(w http.ResponseWriter, r *http.Request) {
 	// print the token index page.
-	GetRequestInfo(r)
-	fmt.Fprintf(w, "manager/\nworker/\n")
-}
-
-func check(w http.ResponseWriter, r *http.Request) {
-	// print the check index page
-	GetRequestInfo(r)
-	fmt.Fprintf(w, "manager/\nworker/\n")
+	RequestInfo(r)
+	fmt.Fprintln(w, "manager/\nworker/")
 }
 
 func errorHandler(w http.ResponseWriter, r *http.Request) {
 	// handle the errors
 	w.WriteHeader(http.StatusNotFound)
-	fmt.Fprint(w, "404: Page not found")
+	fmt.Fprintln(w, "404: Page not found")
 }
 
 func handleRequests(flavor string) {
@@ -62,9 +44,7 @@ func handleRequests(flavor string) {
 
 	// common handlers
 	r.HandleFunc("/", index)
-	r.HandleFunc("/instances/", instanceIndex)
 	r.HandleFunc("/token/", tokenIndex)
-	r.HandleFunc("/check/", check)
 
 	// specific to the service
 	var w Web
@@ -83,14 +63,6 @@ func handleRequests(flavor string) {
 	r.HandleFunc("/token/manager/", w.TokenManager)
 	r.HandleFunc("/token/worker/", w.TokenWorker)
 
-	// These are for debugging
-	r.HandleFunc("/nodes/", w.Nodes)                         //swarm nodes
-	r.HandleFunc("/instances/all/", w.Instances)             //provider instances
-	r.HandleFunc("/instances/managers/", w.ManagerInstances) //provider instances
-	r.HandleFunc("/instances/workers/", w.WorkerInstances)   //provider instances
-	r.HandleFunc("/check/manager/", w.CheckManager)          //would it pass manager check
-	r.HandleFunc("/check/worker/", w.CheckWorker)            //would it pass worker check
-
 	// setup the custom server.
 	srv := &http.Server{
 		Handler: r,

tools/metaserver/src/metaserver/utils.go

@@ -21,7 +21,7 @@ const (
 	clientVersion = "1.24" // docker client version
 )
 
-func GetDockerClient() (client.APIClient, context.Context) {
+func DockerClient() (client.APIClient, context.Context) {
 	// get the docker client
 	tlsOptions := tlsconfig.Options{}
 	host := "unix:///var/run/docker.sock"
@@ -33,7 +33,7 @@ func GetDockerClient() (client.APIClient, context.Context) {
 	return dockerClient, ctx
 }
 
-func GetRequestIP(r *http.Request) string {
+func RequestIP(r *http.Request) string {
 	//given the request return the IP address of the requestor
 	ip, _, _ := net.SplitHostPort(r.RemoteAddr)
 	return ip
@@ -89,7 +89,7 @@ func clientUserAgent() string {
 	return fmt.Sprintf("Docker-Client/%s (%s)", clientVersion, runtime.GOOS)
 }
 
-func GetRequestInfo(r *http.Request) {
+func RequestInfo(r *http.Request) {
 	// Mostly used for debugging, we can cut this down,
 	// since it isn't really used much anymore.
 	fmt.Printf("Path:[%s] %s \n", r.Method, r.URL.Path)
@@ -105,11 +105,11 @@ func GetRequestInfo(r *http.Request) {
 			fmt.Println(ip)
 		}
 	}
-	fmt.Printf("\n")
+	fmt.Println("")
 }
 
-func GetSwarmNodes() []swarm.Node {
-	cli, ctx := GetDockerClient()
+func SwarmNodes() []swarm.Node {
+	cli, ctx := DockerClient()
 
 	// get the list of swarm nodes
 	nodes, err := cli.NodeList(ctx, types.NodeListOptions{})