fixed comments from diogo

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

Author: kencochrane

aws/dockerfiles/build_and_push_all.sh

@@ -5,7 +5,7 @@ set -e
 NAMESPACE="${NAMESPACE:-docker4x}"
 VERSION="${VERSION:-latest}"
 
-for IMAGE in shell init guide ddc-init cloud
+for IMAGE in shell init guide ddc-init cloud meta
 do
 	FINAL_IMAGE="${NAMESPACE}/${IMAGE}-aws:${VERSION}"
 	docker build -t "${FINAL_IMAGE}" -f "Dockerfile.${IMAGE}" .

aws/release/full_aws_release.sh

@@ -172,6 +172,10 @@ echo "= Build Buoy ="
 cd ../../tools/buoy
 ./build_buoy.sh
 
+echo "= Build Metaserver ="
+cd ../metaserver
+./build.sh
+
 cd $BASE_DIR
 cd ../dockerfiles
 

aws/release/nightly.sh

@@ -78,6 +78,9 @@ export VERSION=aws-v$DOCKER_VERSION-$EDITION_VERSION
 cd $BUILD_HOME/code/editions/tools/buoy/
 ./build_buoy.sh
 
+cd $BUILD_HOME/code/editions/tools/metaserver/
+./build.sh
+
 cd $BUILD_HOME/code/editions/aws/dockerfiles/
 
 # build images

aws/release/run_ddc_release.sh

@@ -113,6 +113,9 @@ CURRPATH=`pwd`
 cd ../../tools/buoy/
 ./build_buoy.sh
 
+cd ../metaserver/
+./build.sh
+
 echo "=== CURRPATH=$CURRPATH ==="
 # back to release dir
 cd $CURRPATH

tools/metaserver/Makefile

@@ -0,0 +1,4 @@
+default: build
+
+build:
+	./build.sh

tools/metaserver/compile.sh

@@ -3,5 +3,6 @@
 set -e
 
 cd /go/src/metaserver
+go vet
 go build
 cp metaserver /go/bin

tools/metaserver/src/metaserver/aws.go

@@ -11,7 +11,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 )
 
-type AwsInstance struct {
+type awsInstance struct {
 	InstanceID       string
 	InstanceType     string
 	PublicIPAddress  string
@@ -27,10 +27,11 @@ 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
 	RequestInfo(r)
-	found := alreadyInSwarm(r)
-	isManager := isManagerNode(r)
+	ip := RequestIP(r)
+	inSwarm := alreadyInSwarm(ip)
+	isManager := isManagerNode(ip)
 
-	if found || !isManager {
+	if inSwarm || !isManager {
 		// they are either already in the swarm, or they are not a manager
 		w.WriteHeader(http.StatusForbidden)
 		fmt.Fprintln(w, "Access Denied")
@@ -43,6 +44,7 @@ func (a AWSWeb) TokenManager(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		fmt.Fprintf(w, "%v", err)
+		return
 	}
 
 	fmt.Fprintf(w, swarm.JoinTokens.Manager)
@@ -53,10 +55,11 @@ func (a AWSWeb) TokenWorker(w http.ResponseWriter, r *http.Request) {
 	// and are not already in the swarm. block otherwise
 	RequestInfo(r)
 
-	found := alreadyInSwarm(r)
-	isWorker := isWorkerNode(r)
+	ip := RequestIP(r)
+	inSwarm := alreadyInSwarm(ip)
+	isWorker := isWorkerNode(ip)
 
-	if found || !isWorker {
+	if inSwarm || !isWorker {
 		// they are either already in the swarm, or they are not a worker
 		w.WriteHeader(http.StatusForbidden)
 		fmt.Fprintln(w, "Access Denied")
@@ -69,40 +72,36 @@ func (a AWSWeb) TokenWorker(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		fmt.Fprintf(w, "%v", err)
+		return
 	}
 
 	fmt.Fprintf(w, swarm.JoinTokens.Worker)
 }
 
-func alreadyInSwarm(r *http.Request) bool {
+func alreadyInSwarm(ip string) bool {
 	// Is the node making the request, already in the swarm.
-	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(ip string) bool {
 	// Is the node making the request a manager node
-	ip := RequestIP(r)
-	instances := awsManagers()
-	for _, instance := range instances {
-		if ip == instance.PrivateIPAddress {
-			return true
-		}
-	}
-	return false
+	return isNodeInList(ip, awsManagers())
 }
 
-func isWorkerNode(r *http.Request) bool {
+func isWorkerNode(ip string) bool {
 	// Is the node making the request a worker node
-	ip := RequestIP(r)
-	instances := awsWorkers()
+	return isNodeInList(ip, awsWorkers())
+}
+
+func isNodeInList(ip string, instances []awsInstance) bool {
+	// given an IP, find out if it is in the instance list.
 	for _, instance := range instances {
 		if ip == instance.PrivateIPAddress {
 			return true
@@ -111,9 +110,8 @@ func isWorkerNode(r *http.Request) bool {
 	return false
 }
 
-func awsWorkers() []AwsInstance {
+func awsWorkers() []awsInstance {
 	// get the instances from AWS worker security group
-
 	customFilter := []*ec2.Filter{
 		&ec2.Filter{
 			Name:   aws.String("tag:swarm-node-type"),
@@ -130,9 +128,8 @@ func awsWorkers() []AwsInstance {
 	return awsInstances(customFilter)
 }
 
-func awsManagers() []AwsInstance {
+func awsManagers() []awsInstance {
 	// get the instances from AWS Manager security group
-
 	customFilter := []*ec2.Filter{
 		&ec2.Filter{
 			Name:   aws.String("tag:swarm-node-type"),
@@ -149,9 +146,8 @@ func awsManagers() []AwsInstance {
 	return awsInstances(customFilter)
 }
 
-func awsInstances(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{}))
 
 	// Only grab instances that are running or just started
@@ -177,24 +173,24 @@ func awsInstances(customFilters []*ec2.Filter) []AwsInstance {
 		fmt.Println(err.Error())
 	}
 
-	var instances []AwsInstance
+	var instances []awsInstance
 	for _, reservation := range result.Reservations {
 		for _, instance := range reservation.Instances {
-			awsInstance := AwsInstance{
+			aInstance := awsInstance{
 				InstanceID:       *instance.InstanceId,
 				InstanceType:     *instance.InstanceType,
 				PublicIPAddress:  *instance.PublicIpAddress,
 				PrivateIPAddress: *instance.PrivateIpAddress,
 				InstanceState:    *instance.State.Name,
 				InstanceAZ:       *instance.Placement.AvailabilityZone,
 			}
-			instances = append(instances, awsInstance)
+			instances = append(instances, aInstance)
 		}
 	}
 	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/aws_test.go

@@ -0,0 +1,12 @@
+package main
+
+import "testing"
+
+func TestConvertAWSHostToIP(t *testing.T) {
+	if ConvertAWSHostToIP("ip-10-0-3-149.ec2.internal") != "10.0.3.149" {
+		t.Error("Expected 10.0.3.149")
+	}
+	if ConvertAWSHostToIP("ip-10-0-3-149") != "10.0.3.149" {
+		t.Error("Expected 10.0.3.149")
+	}
+}

tools/metaserver/src/metaserver/main.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"os"
 	"time"
 
 	"github.com/gorilla/mux"
@@ -77,12 +78,39 @@ func handleRequests(flavor string) {
 	log.Fatal(srv.ListenAndServe())
 }
 
+func validate(flavor string) {
+	// validate that we have everything we need in order to start. If anything is missing.
+	// Then exit.
+	if flavor == "aws" {
+		// make sure our required ENV variables are available, if not fail.
+		workerGroupId := os.Getenv("WORKER_SECURITY_GROUP_ID")
+		managerGroupId := os.Getenv("MANAGER_SECURITY_GROUP_ID")
+		if workerGroupId == "" {
+			fmt.Printf("ERROR: Missing environment variable: WORKER_SECURITY_GROUP_ID.")
+			os.Exit(1)
+		}
+		if managerGroupId == "" {
+			fmt.Printf("ERROR: Missing environment variable: MANAGER_SECURITY_GROUP_ID")
+			os.Exit(1)
+		}
+	} else if flavor == "azure" {
+		// add azure validation code here.
+
+	} else {
+		fmt.Printf("ERROR: -flavor %v was not a valid option. please pick either 'aws' or 'azure'", flavor)
+		os.Exit(1)
+	}
+
+}
+
 func main() {
 	// pass in the flavor to determine which IAAS provider we are on.
 	// currently defaults to AWS, since that is the only one implemnted
 	flavor := flag.String("flavor", "aws", "IAAS Flavor (aws, azure, etc)")
 	flag.Parse()
 
+	// make sure we are good to go, before we fully start up.
+	validate(*flavor)
 	// lets handle those requests
 	handleRequests(*flavor)
 }