Skip to content

Commit

Permalink
Merge pull request #71 from arbourd/fix-6.0
Browse files Browse the repository at this point in the history
Fix 6.0 SkyMarshall calls
  • Loading branch information
arbourd authored Sep 13, 2020
2 parents cea4fa3 + 7f5e19f commit 0a6dd28
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions concourse/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func NewClient(atcurl, team, username, password string) (*Client, error) {
return nil, err
}

oldsky, err := semver.NewConstraint("< 6.0.0")
oldsky, err := semver.NewConstraint("< 6.1.0")
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -105,7 +105,7 @@ func NewClient(atcurl, team, username, password string) (*Client, error) {
return c, err
}

// Check if the version is less than '6.0.0'.
// Check if the version is less than '6.1.0'.
if oldsky.Check(v) {
err = c.splitToken(token.TokenType, token.AccessToken)
return c, err
Expand Down
6 changes: 3 additions & 3 deletions concourse/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ func TestNewClient(t *testing.T) {
token: "access-token",
},
"multi cookie": {
version: "5.5.0",
version: "6.0.0",
username: "admin",
password: "sup3rs3cret1",

token: "multi-cookie",
},
"skymarshal id token": {
version: "6.0.0",
version: "6.1.0",
username: "admin",
password: "sup3rs3cret1",

Expand All @@ -64,7 +64,7 @@ func TestNewClient(t *testing.T) {
token: "new-access-token",
},
"missing id token": {
version: "6.0.0",
version: "6.1.0",
username: "admin",
password: "sup3rs3cret1",

Expand Down

0 comments on commit 0a6dd28

Please sign in to comment.