ducky/devices
ducky/devices/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go
Begin implementation on apiv1. Begin implementing the apiv1 package, which will define the first iteration of our API endpoints and logic. Each API package should be self-contained and able to run without depending on each other. Think of them as interfaces into manipulating the business logic defined in the devices package. The point is to have total control over backwards compatibility, as long as our business logic doesn't change. If that happens, we're in a bad place, but not as bad as it could be. This required us to pull in all our API tools; the api package, its dependencies, the scopeTypes package (so we can define scopes for our API), the trout router, etc. We also updated uuid to the latest, which now includes a license. Hooray? The new apiv1 package consists of a few things: * The devices.go file defines the types the API will use to communicate, along with some helpers to convert from API types to devices types. There's also a stub for validating the device creation requests, which I haven't implemented yet because I'm a pretty bad person. * endpoints.go just contains a helper function that builds our routes and assigns handlers to them, giving us an http.Handler in the returns that we can listen with. * handlers.go defines our HTTP handlers, which will read requests and write responses, after doing the appropriate validation and executing the appropriating business logic. Right now, we only have a handler for creating devices, and it doesn't actually do any validation. Also, we have some user-correctable errors being returned as 500s right now, which is Bad. Fortunately, they're all marked with BUG, so I can at least come back to them. * response.go defines the Response type that will be used for returning information after a request is executed. It may eventually get some helpers, but for now it's pretty basic. * scopes.go defines the Scopes that we're going to be using in the package to control access. It should probably (eventually) include a helper to register the Scopes, or we should have a collector service that pulls in all the packages, finds all their Scopes, and registers them. I haven't decided how I want to manage Scope registration just yet. We exported the getStorer function (now GetStorer) so other packages can use it. I'm not sure how I feel about this just yet. We also had to create a WithStorer helper method that embeds the Storer into a context.Context, so we can bootstrap in devicesd. We erroneously had Created in the DeviceChange struct, but there's no reason the Created property of a Device should ever change, so it was removed from the logic, from the struct, and from the tests. Our CreateMany helper was erroneously creating the un-modified Devices that were passed in, instead of the Devices that had sensible defaults filled. We created a _very minimal_ (e.g., needs some work before it's ready for production) devicesd package that will spin up a simple server, just so we could take a peek at our apiv1 endpoints as they'd actually be used. (It worked. Yay?) We should continue to expand on this with configuration, more information being logged, etc.
| paddy@0 | 1 // Copyright 2015 The Go Authors. All rights reserved. |
| paddy@0 | 2 // Use of this source code is governed by a BSD-style |
| paddy@0 | 3 // license that can be found in the LICENSE file. |
| paddy@0 | 4 |
| paddy@0 | 5 // Package ctxhttp provides helper functions for performing context-aware HTTP requests. |
| paddy@0 | 6 package ctxhttp |
| paddy@0 | 7 |
| paddy@0 | 8 import ( |
| paddy@0 | 9 "io" |
| paddy@0 | 10 "net/http" |
| paddy@0 | 11 "net/url" |
| paddy@0 | 12 "strings" |
| paddy@0 | 13 |
| paddy@0 | 14 "golang.org/x/net/context" |
| paddy@0 | 15 ) |
| paddy@0 | 16 |
| paddy@0 | 17 // Do sends an HTTP request with the provided http.Client and returns an HTTP response. |
| paddy@0 | 18 // If the client is nil, http.DefaultClient is used. |
| paddy@0 | 19 // If the context is canceled or times out, ctx.Err() will be returned. |
| paddy@0 | 20 func Do(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error) { |
| paddy@0 | 21 if client == nil { |
| paddy@0 | 22 client = http.DefaultClient |
| paddy@0 | 23 } |
| paddy@0 | 24 |
| paddy@0 | 25 // Request cancelation changed in Go 1.5, see cancelreq.go and cancelreq_go14.go. |
| paddy@0 | 26 cancel := canceler(client, req) |
| paddy@0 | 27 |
| paddy@0 | 28 type responseAndError struct { |
| paddy@0 | 29 resp *http.Response |
| paddy@0 | 30 err error |
| paddy@0 | 31 } |
| paddy@0 | 32 result := make(chan responseAndError, 1) |
| paddy@0 | 33 |
| paddy@0 | 34 go func() { |
| paddy@0 | 35 resp, err := client.Do(req) |
| paddy@0 | 36 result <- responseAndError{resp, err} |
| paddy@0 | 37 }() |
| paddy@0 | 38 |
| paddy@0 | 39 select { |
| paddy@0 | 40 case <-ctx.Done(): |
| paddy@0 | 41 cancel() |
| paddy@0 | 42 return nil, ctx.Err() |
| paddy@0 | 43 case r := <-result: |
| paddy@0 | 44 return r.resp, r.err |
| paddy@0 | 45 } |
| paddy@0 | 46 } |
| paddy@0 | 47 |
| paddy@0 | 48 // Get issues a GET request via the Do function. |
| paddy@0 | 49 func Get(ctx context.Context, client *http.Client, url string) (*http.Response, error) { |
| paddy@0 | 50 req, err := http.NewRequest("GET", url, nil) |
| paddy@0 | 51 if err != nil { |
| paddy@0 | 52 return nil, err |
| paddy@0 | 53 } |
| paddy@0 | 54 return Do(ctx, client, req) |
| paddy@0 | 55 } |
| paddy@0 | 56 |
| paddy@0 | 57 // Head issues a HEAD request via the Do function. |
| paddy@0 | 58 func Head(ctx context.Context, client *http.Client, url string) (*http.Response, error) { |
| paddy@0 | 59 req, err := http.NewRequest("HEAD", url, nil) |
| paddy@0 | 60 if err != nil { |
| paddy@0 | 61 return nil, err |
| paddy@0 | 62 } |
| paddy@0 | 63 return Do(ctx, client, req) |
| paddy@0 | 64 } |
| paddy@0 | 65 |
| paddy@0 | 66 // Post issues a POST request via the Do function. |
| paddy@0 | 67 func Post(ctx context.Context, client *http.Client, url string, bodyType string, body io.Reader) (*http.Response, error) { |
| paddy@0 | 68 req, err := http.NewRequest("POST", url, body) |
| paddy@0 | 69 if err != nil { |
| paddy@0 | 70 return nil, err |
| paddy@0 | 71 } |
| paddy@0 | 72 req.Header.Set("Content-Type", bodyType) |
| paddy@0 | 73 return Do(ctx, client, req) |
| paddy@0 | 74 } |
| paddy@0 | 75 |
| paddy@0 | 76 // PostForm issues a POST request via the Do function. |
| paddy@0 | 77 func PostForm(ctx context.Context, client *http.Client, url string, data url.Values) (*http.Response, error) { |
| paddy@0 | 78 return Post(ctx, client, url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode())) |
| paddy@0 | 79 } |