Fix Travis build. Adapt code and tests to go-marathon 0.1

x-cray · Sep 14, 2016 · 84d648d · 84d648d
1 parent 741d2db
commit 84d648d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,9 @@
 language: go
 
 go:
-  - 1.4
   - 1.5
+  - 1.6
+  - 1.7
 
 install:
   - make deps

diff --git a/marathon/marathon_adapter.go b/marathon/marathon_adapter.go
@@ -147,8 +147,12 @@ func extractServiceMetadata(source, destination map[string]string, port string)
 func serviceMetadata(application *marathonClient.Application, port int) map[string]string {
 	result := make(map[string]string)
 	stringPort := strconv.Itoa(port)
-	extractServiceMetadata(*application.Env, result, stringPort)
-	extractServiceMetadata(*application.Labels, result, stringPort)
+	if application.Env != nil {
+		extractServiceMetadata(*application.Env, result, stringPort)
+	}
+	if application.Labels != nil {
+		extractServiceMetadata(*application.Labels, result, stringPort)
+	}
 	return result
 }
 
@@ -173,6 +177,11 @@ func originalPorts(app *marathonClient.Application) []int {
 }
 
 func isHealthy(task *marathonClient.Task, app *marathonClient.Application) bool {
+	// Task has no healthchecks. Assume healthy.
+	if (app.HealthChecks == nil) || (len(*app.HealthChecks) == 0) {
+		return true;
+	}
+
 	// Tasks' health has not yet been checked.
 	if len(*app.HealthChecks) != len(task.HealthCheckResults) {
 		return false

diff --git a/marathon/marathon_adapter_test.go b/marathon/marathon_adapter_test.go
@@ -53,13 +53,13 @@ var _ = Describe("MarathonAdapter", func() {
 			// Healthy 2. Healthchecks are passing.
 			{
 				Ports: []int{3000},
-				HealthChecks: []*marathonClient.HealthCheck{
+				HealthChecks: &[]marathonClient.HealthCheck{
 					{},
 				},
 				Tasks: []*marathonClient.Task{
 					{
 						Ports: []int{3000},
-						HealthCheckResult: []*marathonClient.HealthCheckResult{
+						HealthCheckResults: []*marathonClient.HealthCheckResult{
 							{
 								Alive: true,
 							},
@@ -70,13 +70,13 @@ var _ = Describe("MarathonAdapter", func() {
 			// Unhealthy 1. Healthchecks are not passing.
 			{
 				Ports: []int{3000},
-				HealthChecks: []*marathonClient.HealthCheck{
+				HealthChecks: &[]marathonClient.HealthCheck{
 					{},
 				},
 				Tasks: []*marathonClient.Task{
 					{
 						Ports: []int{3000},
-						HealthCheckResult: []*marathonClient.HealthCheckResult{
+						HealthCheckResults: []*marathonClient.HealthCheckResult{
 							{
 								Alive: false,
 							},
@@ -87,13 +87,13 @@ var _ = Describe("MarathonAdapter", func() {
 			// Unhealthy 2. Healthchecks are either not passing or missing healthcheck results.
 			{
 				Ports: []int{3000},
-				HealthChecks: []*marathonClient.HealthCheck{
+				HealthChecks: &[]marathonClient.HealthCheck{
 					{},
 				},
 				Tasks: []*marathonClient.Task{
 					{
 						Ports: []int{3000},
-						HealthCheckResult: []*marathonClient.HealthCheckResult{
+						HealthCheckResults: []*marathonClient.HealthCheckResult{
 							{
 								Alive: false,
 							},
@@ -111,7 +111,7 @@ var _ = Describe("MarathonAdapter", func() {
 		Apps: []marathonClient.Application{
 			{
 				ID: "/app/staging/web-app",
-				Env: map[string]string{
+				Env: &map[string]string{
 					"NODE_ENV":     "production",
 					"SERVICE_TAGS": "production",
 					"SERVICE_NAME": "web-app",
@@ -133,11 +133,11 @@ var _ = Describe("MarathonAdapter", func() {
 		Apps: []marathonClient.Application{
 			{
 				ID: "/app/staging/web-app",
-				Env: map[string]string{
+				Env: &map[string]string{
 					"SERVICE_TAGS": "production",
 					"SERVICE_NAME": "web-app",
 				},
-				Labels: map[string]string{
+				Labels: &map[string]string{
 					"SERVICE_TAGS": "production-labelled",
 					"SERVICE_NAME": "web-app-labelled",
 				},
@@ -158,7 +158,7 @@ var _ = Describe("MarathonAdapter", func() {
 		Apps: []marathonClient.Application{
 			{
 				ID: "/app/staging/web-app",
-				Env: map[string]string{
+				Env: &map[string]string{
 					"SERVICE_TAGS": "staging",
 				},
 				Ports: []int{
@@ -184,14 +184,14 @@ var _ = Describe("MarathonAdapter", func() {
 		Apps: []marathonClient.Application{
 			{
 				ID: "/app/staging/web-app",
-				Env: map[string]string{
+				Env: &map[string]string{
 					"SERVICE_TAGS":      "production",
 					"SERVICE_80_NAME":   "web-app-1",
 					"SERVICE_8080_NAME": "web-app-2",
 				},
 				Container: &marathonClient.Container{
 					Docker: &marathonClient.Docker{
-						PortMappings: []*marathonClient.PortMapping{
+						PortMappings: &[]marathonClient.PortMapping{
 							{
 								ContainerPort: 80,
 							},