Merge pull request #605 from 3ofcoins/unbreak-validator

ace/validator.go: small fixes

ace/validator.go

@@ -243,8 +243,8 @@ func metadataRequest(req *http.Request, expectedContentType string) ([]byte, err
 	}
 
 	if respContentType := resp.Header.Get("Content-Type"); respContentType != expectedContentType {
-		return nil, fmt.Errorf("`%s` did not respond with expected Content-Type header.  Expected %s, received %s",
-			req.RequestURI, expectedContentType, respContentType)
+		return nil, fmt.Errorf("`%v` did not respond with expected Content-Type header.  Expected %s, received %s",
+			req.URL, expectedContentType, respContentType)
 	}
 
 	body, err := ioutil.ReadAll(resp.Body)
@@ -292,12 +292,12 @@ func validatePodAnnotations(metadataURL string, pm *schema.PodManifest) results
 
 	var actualAnnots types.Annotations
 
-	annotJson, err := metadataGet(metadataURL, "/pod/annotations/", "application/json")
+	annotJson, err := metadataGet(metadataURL, "/pod/annotations", "application/json")
 	if err != nil {
 		return append(r, err)
 	}
 
-	err = json.Unmarshal(annotJson, actualAnnots)
+	err = json.Unmarshal(annotJson, &actualAnnots)
 	if err != nil {
 		return append(r, err)
 	}
@@ -338,6 +338,9 @@ func validateAppAnnotations(metadataURL string, pm *schema.PodManifest, app *sch
 	for _, annot := range a.Annotations {
 		expectedAnnots.Set(annot.Name, annot.Value)
 	}
+	if len(expectedAnnots) == 0 {
+		expectedAnnots = nil
+	}
 
 	var actualAnnots types.Annotations
 
@@ -346,10 +349,13 @@ func validateAppAnnotations(metadataURL string, pm *schema.PodManifest, app *sch
 		return append(r, err)
 	}
 
-	err = json.Unmarshal(annotJson, actualAnnots)
+	err = json.Unmarshal(annotJson, &actualAnnots)
 	if err != nil {
 		return append(r, err)
 	}
+	if len(actualAnnots) == 0 {
+		actualAnnots = nil
+	}
 
 	if !reflect.DeepEqual(actualAnnots, expectedAnnots) {
 		err := fmt.Errorf("%v annotations mismatch: %v vs %v", app.Name, actualAnnots, expectedAnnots)