Skip to content

Commit

Permalink
Fix regression with dependencies (#44)
Browse files Browse the repository at this point in the history
* fix issue with regression to briankassouf/jose, by re-pinning to master

* changes after running gofmt -w $(find . -name '*.go' | grep -v vendor)
  • Loading branch information
catsby committed Oct 30, 2018
1 parent 8bfe988 commit 5355438
Show file tree
Hide file tree
Showing 24 changed files with 318 additions and 34 deletions.
14 changes: 7 additions & 7 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,9 @@
# go-tests = true
# unused-packages = true


[[constraint]]
branch = "master"
name = "github.com/SermoDigital/jose"

[[constraint]]
name = "github.com/briankassouf/jose"
version = "1.1.0"
branch = "master"

[[constraint]]
branch = "master"
Expand Down
2 changes: 1 addition & 1 deletion path_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"encoding/pem"
"errors"

"github.com/SermoDigital/jose/jws"
"github.com/briankassouf/jose/jws"
"github.com/hashicorp/vault/logical"
"github.com/hashicorp/vault/logical/framework"
)
Expand Down
2 changes: 1 addition & 1 deletion path_login.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func (b *kubeAuthBackend) pathLogin() framework.OperationFunc {
"service_account_name": serviceAccount.Name,
"service_account_namespace": serviceAccount.Namespace,
"service_account_secret_name": serviceAccount.SecretName,
"role": roleName,
"role": roleName,
},
DisplayName: fmt.Sprintf("%s-%s", serviceAccount.Namespace, serviceAccount.Name),
LeaseOptions: logical.LeaseOptions{
Expand Down
8 changes: 4 additions & 4 deletions path_role_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ func TestPath_Create(t *testing.T) {
Period: 3 * time.Second,
ServiceAccountNames: []string{"name"},
ServiceAccountNamespaces: []string{"namespace"},
TTL: 1 * time.Second,
MaxTTL: 5 * time.Second,
NumUses: 12,
BoundCIDRs: []*sockaddr.SockAddrMarshaler{},
TTL: 1 * time.Second,
MaxTTL: 5 * time.Second,
NumUses: 12,
BoundCIDRs: []*sockaddr.SockAddrMarshaler{},
}

req := &logical.Request{
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/SermoDigital/jose/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions vendor/github.com/briankassouf/jose/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions vendor/github.com/briankassouf/jose/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 40 additions & 0 deletions vendor/github.com/briankassouf/jose/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions vendor/github.com/briankassouf/jose/_test.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 44 additions & 0 deletions vendor/github.com/briankassouf/jose/base64.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 22 additions & 1 deletion vendor/github.com/briankassouf/jose/crypto/ecdsa.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/briankassouf/jose/crypto/signature.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/github.com/briankassouf/jose/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5355438

Please sign in to comment.