internal/v4: implement stats endpoint #52
Conversation
internal/charmstore: move mongojs condition into storetesting. internal/router: universal ParseForm. internal/router: strip prefix from global handlers internal/router: add ServeMux, NotFoundHandler
| }), | ||
| }, | ||
| }, | ||
| urlStr: "http://example.com/foo", | ||
| urlStr: "http://0.1.2.3/foo", |
There was a problem hiding this comment.
consider using a valid test or documentation IP address range. 198.18/15 is reserved for test. 192.0.2.0/24 is reserved for documentation. See rfc5737 and rfc2544 for more.
There was a problem hiding this comment.
Unfortunately, most machines' router tables do not special-case either of the above two ranges, so they don't help to guard against accidental network access from tests. 0.1.2.3, on the other hand is (at least on Linux) picked up immediately by the network stack as an invalid IP address, and generates an error without touching the network.
That's why we use 0.1.2.3 (or similar) as a testing IP address in juju-core too.
|
LGTM |
| err = counters.Update(filter, bson.D{{"$set", bson.D{{"t", stamp}}}}) | ||
| c.Check(err, gc.IsNil) | ||
| err := s.store.IncCounterAtTime(inc.key, t) | ||
| c.Assert(err, gc.IsNil) | ||
| } |
There was a problem hiding this comment.
Getting rid of hardcoded stuff, nice ;)
|
👍 with a few comments. |
|
|
|
Status: merge request accepted. Url: http://ci.jujugui.org:8080/job/charmstore-merge |
internal/v4: implement stats endpoint manual merge because 'bot is down.
|
Test FAILed. |
|
Test FAILed. |
|
Build failed: Attempt to land pull request failed |
|
Test PASSed. |
internal/v4/stats.go and internal/v4/stats_test.go are directly derived from
code in _old, although simplified to return only JSON-formatted results.
This required a fair number of fixes to other code, which
unfortunately aren't that easy to pick apart now, including the
following:
Because the internal/v4 tests are outside charmstore, delving
directly into the database to tweak the time stamps seemed unwarranted,
so added IncCounterAtTime and changed internal/v4 tests and existing
internal/charmstore tests to use it.
This avoids duplicating the logic to determine whether tests requiring
mongodb embedded javascript can be run.
This clears up responsibility for who should call ParseForm.
This makes the global handlers (including /stats/counters) consistent
with other handlers in router.Handlers.
The original /stats/counter tests tested http status of paths which previously
returned an http.StatusNotFound status but with a non-JSON body.
The above two handlers make the not-found pages consistent
with the rest of the API.
The original /stats/counter tests tested for statuses which our
current code was incapable of generating. The above two
errors make it capable.