Skip to content

Commit

Permalink
alphabetizing
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Veverka committed Dec 9, 2019
1 parent 879bdad commit a5eea2a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ require (
github.com/google/go-querystring v1.0.0
github.com/hashicorp/go-cleanhttp v0.5.0
github.com/hashicorp/go-retryablehttp v0.5.2
github.com/hashicorp/go-service v0.0.0-20190301095854-3ec4b98dc730

This comment has been minimized.

Sign in to view

Copy link
@alisdair

alisdair Dec 9, 2019 •
edited
Loading

Contributor

@veverkap How did this get here?

Edit: I ask because I'm updating a dep in #93 and seeing an unexpected merge conflict. I also don't really understand how go.mod works or how this could've been added. Maybe it was a mistake? I honestly have no idea.

This comment has been minimized.

Sign in to view

Copy link
@veverkap

veverkap Dec 9, 2019

Contributor

I did a go build and it went and grabbed it I believe. I can revert it if need be
github.com/hashicorp/go-slug v0.4.1
github.com/hashicorp/go-uuid v1.0.1
github.com/stretchr/testify v1.3.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0 h1:wvCrVc9TjDls6+YGAF2hAifE1E5U1+b4tH6K
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
github.com/hashicorp/go-retryablehttp v0.5.2 h1:AoISa4P4IsW0/m4T6St8Yw38gTl5GtBAgfkhYh1xAz4=
github.com/hashicorp/go-retryablehttp v0.5.2/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
github.com/hashicorp/go-service v0.0.0-20190301095854-3ec4b98dc730 h1:Ag/MhdQ535cQ3INIPPdv4ov7aRa7C+RCJByJISnjtHg=
github.com/hashicorp/go-service v0.0.0-20190301095854-3ec4b98dc730/go.mod h1:/EYLpLHGVoYkKzVx7vl1hJtt08ux/s3Ia3YmvmjKnGQ=
github.com/hashicorp/go-slug v0.4.0 h1:YSz3afoEZZJVVB46NITf0+opd2cHpaYJ1XSojOyP0x8=
github.com/hashicorp/go-slug v0.4.0/go.mod h1:I5tq5Lv0E2xcNXNkmx7BSfzi1PsJ2cNjs3cC3LwyhK8=
github.com/hashicorp/go-slug v0.4.1-0.20191114211806-d9ee9eb3692a h1:EmBGX5Ja8JEKRHqTDG9+PYq0qL5qyOUmPZFQfH7VfXo=
Expand Down
6 changes: 3 additions & 3 deletions oauth_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ type OAuthClientCreateOptions struct {
// The token string you were given by your VCS provider.
OAuthToken *string `jsonapi:"attr,oauth-token-string"`

// The VCS provider being connected with.
ServiceProvider *ServiceProviderType `jsonapi:"attr,service-provider"`

// Private key associated with this vcs provider - only available for ado_server
PrivateKey *string `jsonapi:"attr,private-key"`

// The VCS provider being connected with.
ServiceProvider *ServiceProviderType `jsonapi:"attr,service-provider"`
}

func (o OAuthClientCreateOptions) valid() error {
Expand Down
1 change: 0 additions & 1 deletion oauth_client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ func TestOAuthClientsDelete(t *testing.T) {
}

func TestOAuthClientsCreateOptionsValid(t *testing.T) {

t.Run("with valid options", func(t *testing.T) {
options := OAuthClientCreateOptions{
APIURL: String("https://api.github.com"),
Expand Down

0 comments on commit a5eea2a

Please sign in to comment.