Updated travis and bascule (#444)

* Updated travis and bascule

* fixed travis

Author: kristinapathak

.travis.yml

@@ -4,14 +4,13 @@ go:
   - 1.13.x
   - tip
 
-matrix:
-  allow_failures:
-    - go: tip
-  fast_finish: true
+os:
+  - linux
 
 branches:
   only:
     - master
+    - /^v[0-9]+\.[0-9]+\.[0-9]+$/
 
 before_install:
   - curl -s https://codecov.io/bash > codecov.sh	
@@ -23,3 +22,30 @@ install:
 script:
   - go test ./... -race -coverprofile=coverage.txt 
   - ./codecov.sh
+
+jobs:
+  include:
+    - stage: tag
+      name: "Tag For Release"
+      if: branch = master && type = push
+      before_script:
+        - echo -e "machine github.com\n  login $GH_TOKEN" > ~/.netrc
+      script:
+        - export OLD_VERSION=$(git describe --tags `git rev-list --tags --max-count=1` | tail -1 | sed 's/v\(.*\)/\1/')
+        - git config --global user.name "kristinaspring"
+        - git config --global user.email "kmspring57@gmail.com"
+        - export TAG=$(cat CHANGELOG.md | perl -0777 -ne 'print "$1" if /.*## \[Unreleased\]\s+## \[(v\d+.\d+.\d+)\].*/s')
+        - export TODAY=`date +'%m/%d/%Y'`
+        - export NOTES=$(cat CHANGELOG.md | perl -0777 -ne 'print "$ENV{TODAY}\n\n$1\n" if /.*## \[$ENV{TAG}\]\s(.*?)\s+## \[(v\d+.\d+.\d+)\].*/s')
+        - if [[ "$TAG" != "" && "$TAG" != "$OLD_VERSION" ]]; then git tag -a "$TAG" -m "$NOTES"; git push origin --tags; echo $?; fi
+    - stage: release
+      name: "Make a Release"
+      if: branch != master
+      script: skip
+      deploy:
+        on:
+          all_branches: true
+          tags: true
+        provider: releases
+        api_key: "$GH_TOKEN"
+        skip_cleanup: true

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [v1.5.1]
+- Added automated releases using travis [#444](https://github.com/xmidt-org/webpa-common/pull/444)
+- Bumped bascule version to v0.7.0 and updated basculechecks to match [#444](https://github.com/xmidt-org/webpa-common/pull/444)
+
 ## [v1.5.0]
 - reduced logging for xhttp retry #441
 - modified capabilities check to be more restrictive #440
@@ -48,6 +52,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
    moving forward.
 
 [Unreleased]: https://github.com/xmidt-org/webpa-common/compare/v1.5.0...HEAD
+[v1.5.1]: https://github.com/xmidt-org/webpa-common/compare/v1.5.0...v1.5.1
 [v1.5.0]: https://github.com/xmidt-org/webpa-common/compare/v1.4.0...v1.5.0
 [v1.4.0]: https://github.com/xmidt-org/webpa-common/compare/v1.3.2...v1.4.0
 [v1.3.2]: https://github.com/xmidt-org/webpa-common/compare/v1.3.1...v1.3.2

basculechecks/basculechecks.go

@@ -49,7 +49,7 @@ func CreateValidCapabilityCheck(prefix string, acceptAllMethod string) (func(con
 			}
 
 			re := regexp.MustCompile(matches[1])
-			matchIdxs := re.FindStringIndex(reqVal.URL)
+			matchIdxs := re.FindStringIndex(reqVal.URL.EscapedPath())
 			if matchIdxs == nil {
 				continue
 			}

basculechecks/basculechecks_test.go

@@ -2,6 +2,7 @@ package basculechecks
 
 import (
 	"context"
+	"net/url"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -19,11 +20,13 @@ func TestValidCapabilityCheck(t *testing.T) {
 	prefix := "a:b:c:"
 	check, err := CreateValidCapabilityCheck(prefix, acceptAll)
 	assert.Nil(t, err)
+	u, err := url.Parse("/test")
+	assert.Nil(t, err)
 	goodAuth := bascule.Authentication{
 		Authorization: "jwt",
 		Token:         bascule.NewToken("Bearer", "jwt", bascule.Attributes{}),
 		Request: bascule.Request{
-			URL:    "/test",
+			URL:    u,
 			Method: "GET",
 		},
 	}

go.mod

@@ -45,7 +45,7 @@ require (
 	github.com/spf13/viper v1.3.1
 	github.com/stretchr/testify v1.3.0
 	github.com/ugorji/go/codec v1.1.7
-	github.com/xmidt-org/bascule v0.5.0
+	github.com/xmidt-org/bascule v0.7.0
 	github.com/xmidt-org/wrp-go v1.3.3
 	gopkg.in/ini.v1 v1.46.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3

go.sum

@@ -184,8 +184,8 @@ github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 h1:3SVOIvH7Ae1KRYy
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/xmidt-org/bascule v0.5.0 h1:cpg0iX992y6VM+EQuI0qV4y3xzSrGL+eAh7dq2n0FTo=
-github.com/xmidt-org/bascule v0.5.0/go.mod h1:D2DuXSMa5+OpveCtaSWp0+/tmnxZqfYhkCC1oCzLZdI=
+github.com/xmidt-org/bascule v0.7.0 h1:TUbSKq68CzutTXYh5hq8mhMCHeYdIXaUffx3qCMo1yE=
+github.com/xmidt-org/bascule v0.7.0/go.mod h1:D2DuXSMa5+OpveCtaSWp0+/tmnxZqfYhkCC1oCzLZdI=
 github.com/xmidt-org/webpa-common v1.1.0/go.mod h1:oCpKzOC+9h2vYHVzAU/06tDTQuBN4RZz+rhgIXptpOI=
 github.com/xmidt-org/webpa-common v1.3.1/go.mod h1:oCpKzOC+9h2vYHVzAU/06tDTQuBN4RZz+rhgIXptpOI=
 github.com/xmidt-org/wrp-go v1.3.3 h1:WvODdrtxPwHEUqwfwHpu+kNUfBzLBfAIdrKCQjoCblc=