👌 Sensible annotations save/gtg endpoint defaults. Return the full ur…

…l in case of PUT failure.

annotations/writer.go

@@ -31,7 +31,8 @@ func (p *pacWriter) Write(uuid string, tid string, body map[string]interface{})
 		return nil, err
 	}
 
-	req, err := http.NewRequest("PUT", fmt.Sprintf(p.saveEndpoint, uuid), bytes.NewReader(bodyJSON))
+	uri := fmt.Sprintf(p.saveEndpoint, uuid)
+	req, err := http.NewRequest("PUT", uri, bytes.NewReader(bodyJSON))
 	if err != nil {
 		return nil, err
 	}
@@ -48,7 +49,7 @@ func (p *pacWriter) Write(uuid string, tid string, body map[string]interface{})
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("Save to %v returned a %v status code", p.saveEndpoint, resp.StatusCode)
+		return nil, fmt.Errorf("Save to %v returned a %v status code", uri, resp.StatusCode)
 	}
 
 	dec := json.NewDecoder(resp.Body)

annotations/writer_test.go

@@ -63,7 +63,7 @@ func TestWriteResponseFails(t *testing.T) {
 
 	body := make(map[string]interface{})
 	_, err := writer.Write(uuid, "tid_"+uuid, body)
-	assert.EqualError(t, err, fmt.Sprintf("Save to %v/drafts/content/%%v/annotations returned a 503 status code", server.URL))
+	assert.EqualError(t, err, fmt.Sprintf("Save to %v/drafts/content/%v/annotations returned a 503 status code", server.URL, uuid))
 }
 
 func TestWriteResponseInvalidJSON(t *testing.T) {

main.go

@@ -77,12 +77,14 @@ func main() {
 	saveEndpoint := app.String(cli.StringOpt{
 		Name:   "annotations-save-endpoint",
 		Desc:   "Endpoint to save annotations to PAC",
+		Value:  "http://draft-annotations-api:8080/drafts/content/%v/annotations",
 		EnvVar: "ANNOTATIONS_SAVE_ENDPOINT",
 	})
 
 	saveGTGEndpoint := app.String(cli.StringOpt{
 		Name:   "annotations-save-gtg-endpoint",
 		Desc:   "GTG Endpoint for the service which saves PAC annotations (usually draft-annotations-api)",
+		Value:  "http://draft-annotations-api:8080/__gtg",
 		EnvVar: "ANNOTATIONS_SAVE_GTG_ENDPOINT",
 	})