Skip to content

Commit

Permalink
fix drone build
Browse files Browse the repository at this point in the history
  • Loading branch information
casualjim committed Jun 19, 2016
1 parent b707e97 commit b1e36b5
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .drone.sec
Original file line number Diff line number Diff line change
@@ -1 +1 @@
eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.Np4HUUR21CknfsiUaG8r2-pkSHcvrK7JhEF_aWiyeJyXnhR7egN0MFGPLgKazfwQ2-V-O66bB1z0T7LtMtwqjUFSBkBvX_eWhXxSEyN-RZyGyztEkZwPSz3HD-mnnSB7QJq-_cVwZLCBTqB4UAutBA8WwGlDHw2SxNOy2Uq2d8fRFrbLwS8yceIldBBhZXATkki4s0sO9Wb15GkDEkI5hMLrI2AOteraXYyTMv0mTzYNEVxQdubcjieuPjvZrT69It6ZyQyP9g0DrXODiBSHBLK4syMoQgF34n3oR4n3cgq13vY694xeKbggnKdacc-9cdRT8LwKjXVgxReOnZFn-w.16EX_O_JmdJ7Bvy3.wxoi9zoQWYpdLEe4sJOIcUtQqoYir08jyZHr0m1j7jUrlRe8kDaYghTHD7w7yloYiaBtdmvDnbr4_Ul9LDKQwD9aZvBIdCCIqEYd4xVGhLxiuAYsmrNVJeiSQ2PXXkgDC4PYsHcY2VurXFVjGzyc8jmuXCAMcnL9X39KtoaImiTj3xQuViQUJGgUs9DwSMUwkLQlD1xS58ZhQHjO2umQvTdKy-VSKmNQBeQykJ56VtH3_S1q1azVSyKUlF3tvdrYN33wvhAlOQHhcv0IN9ZGQCjrAcPbKV7KL0qR3M7MpGH-uOFHLzr-Jhi8lRsIo1U-y1DG5-obp3O3grd4U2DZVfOlhnAJUlz_r9sNUCOYNB9hpz4-gp8fks6YhS0mqP9VSRIP0nzihcYT40IGI7Qrx9XzQAjbeXx8C1NXlp3ZBsLrGfWs5feTp8bVHIskptrgdqterKJd2JISAlLLK36mlKOM4zdJTPlTVU_iePyKBZzIzO7EInO_JlZdHHcj1a_ItKpRXReH4IM-6p77UvyS9joeGXPS9kftvGKvwnGVOsDf4cWSF700ShnffB1aq4_hyA1k_1KTRtjujvqYsxtYzReH-L4CR4xSY3kTTYEeVaLWNo77Kqd0splOW_AGTcQS1Sk.R7m9jlWf1l99QKUTu66M0g
eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.iqckSzdtSrgoiDWEr7EXNizVWMIXSb2amVgk5ly9yvB_AMa0WBD2r0BMury5RTXer8cSXKwGZzpgA4NH2XpbYCjbukH55-YGFTGRkS6agzifZknB9Vm4saQgqY8YUAxQevPgdA8-5A1tmCJqYT381lgHu4XrH0NRAd-FiLHs2ja0PNHO7HDrdDRK2VWLucqSNcv_r4ubOnDuegtBH6LHfT2zy8OWwXb7lFro4eqtYFsb5Bz-3001tTTMTT7w93KSbJvQxIQUJBDdN_3ni6MOhuqNcJATjGazUup3duJ-4mbkYpDtvbJI-t-PjBQD8JtlRxLmgXesLPBE6L4cOgC0kg.sSCgwk54gQse555Y.l2kNRwTn-_0P7jGCDpxGk_L9SFcPD3RWGjSE0PdluX9zv3GHplqVj7n9qjuhpyjpTNfyRzh6CAbwVy5VhGzn0-eKP9MT5dw64n6JpXZDpxVlEMEeHI8K-Pw5JLsACi9rYpPG72vZInh0QhXkA3JtoijYSWa6Dal7BP3Kl8s6LqnFUmfbdK0igqLIShcujpAwLjFTMuXlj5uQoAbecsF2in8uqz3v7ohaOsRaOvpPR98xsDmRPDK20RbwAyl2btCSSgcMhUQ8hq4uxzmhU6IffqT762Xj6iYfR0LmFKvNDMVKId633RlpPw1Y66XzIlj710Tve1XX_XwsZkecs393N4LGu9Y7PlRfARtu4LKyXX0T76ZP95NgPuFU6E4_zNt6EE0oidKgZn-lfP0Ss9Gd54LS_Xg5SiJYaM3XvJcV8pH9n4fdbyhx06eAYQ9OfIc9VjzAx3PqaKquUluMBfRiL95mzz0BrMDHAv5JHrYDuG07j7KCzbJY3Oz4w-X7fxVyQLnOBR4vDsa6sUDx9raFoySlqQ88okOmx9omBE1wlvIT4eafh9IHt5Gx9avYurxdCH2D5_GVuwaEo9wPnVDagEbD3_GMThkrw0ck9VvVGzbAXhNsfOHYmUtWYZ03NqXvFl4.Xd9zJw9fK-TfQHrSpTRt8w
3 changes: 1 addition & 2 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ build:
- go get -u github.com/go-openapi/errors
- go get -u github.com/go-openapi/loads
- go get -u github.com/go-openapi/strfmt
- mkdir -p /drone/src/github.com/go-openapi/validate
- git clone https://github.com/go-openapi/validate /drone/src/github.com/go-openapi/validate
- go get -u github.com/go-openapi/validate
- ./hack/build-drone.sh

notify:
Expand Down
2 changes: 1 addition & 1 deletion headers.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

// ContentType parses a content type header
func ContentType(headers http.Header) (string, string, *errors.ParseError) {
func ContentType(headers http.Header) (string, string, error) {
ct := headers.Get(HeaderContentType)
orig := ct
if ct == "" {
Expand Down
6 changes: 3 additions & 3 deletions headers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ func TestParseContentType(t *testing.T) {
headers := http.Header(map[string][]string{})
for _, v := range data {
if v.hdr != "" {
headers.Set("content-type", v.hdr)
headers.Set("Content-Type", v.hdr)
} else {
headers.Del("content-type")
headers.Del("Content-Type")
}
ct, cs, err := ContentType(headers)
if v.err == nil {
assert.NoError(t, err, "input: %q", v.hdr)
assert.NoError(t, err, "input: %q, err: %v", v.hdr, err)
} else {
assert.Error(t, err, "input: %q", v.hdr)
assert.IsType(t, &errors.ParseError{}, err, "input: %q", v.hdr)
Expand Down
2 changes: 1 addition & 1 deletion middleware/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ func (c *Context) BindValidRequest(request *http.Request, route *MatchedRoute, b
}

// ContentType gets the parsed value of a content type
func (c *Context) ContentType(request *http.Request) (string, string, *errors.ParseError) {
func (c *Context) ContentType(request *http.Request) (string, string, error) {
if v, ok := context.GetOk(request, ctxContentType); ok {
if val, ok := v.(*contentTypeValue); ok {
return val.MediaType, val.Charset, nil
Expand Down
2 changes: 1 addition & 1 deletion middleware/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (ub untypedBinder) BindRequest(r *http.Request, route *MatchedRoute, consum
}

// ContentType validates the content type of a request
func validateContentType(allowed []string, actual string) *errors.Validation {
func validateContentType(allowed []string, actual string) error {
if len(allowed) == 0 {
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion middleware/validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func TestValidateContentType(t *testing.T) {
assert.Error(t, err, "input: %q", v.hdr)
assert.IsType(t, &errors.Validation{}, err, "input: %q", v.hdr)
assert.Equal(t, v.err.Error(), err.Error(), "input: %q", v.hdr)
assert.EqualValues(t, http.StatusUnsupportedMediaType, err.Code())
assert.EqualValues(t, http.StatusUnsupportedMediaType, err.(*errors.Validation).Code())
}
}
}

0 comments on commit b1e36b5

Please sign in to comment.