Skip to content

Commit 0a6dd28

Browse files
authored
Merge pull request #71 from arbourd/fix-6.0
Fix 6.0 SkyMarshall calls
2 parents cea4fa3 + 7f5e19f commit 0a6dd28

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

concourse/client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func NewClient(atcurl, team, username, password string) (*Client, error) {
7575
return nil, err
7676
}
7777

78-
oldsky, err := semver.NewConstraint("< 6.0.0")
78+
oldsky, err := semver.NewConstraint("< 6.1.0")
7979
if err != nil {
8080
return nil, err
8181
}
@@ -105,7 +105,7 @@ func NewClient(atcurl, team, username, password string) (*Client, error) {
105105
return c, err
106106
}
107107

108-
// Check if the version is less than '6.0.0'.
108+
// Check if the version is less than '6.1.0'.
109109
if oldsky.Check(v) {
110110
err = c.splitToken(token.TokenType, token.AccessToken)
111111
return c, err

concourse/client_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ func TestNewClient(t *testing.T) {
4242
token: "access-token",
4343
},
4444
"multi cookie": {
45-
version: "5.5.0",
45+
version: "6.0.0",
4646
username: "admin",
4747
password: "sup3rs3cret1",
4848

4949
token: "multi-cookie",
5050
},
5151
"skymarshal id token": {
52-
version: "6.0.0",
52+
version: "6.1.0",
5353
username: "admin",
5454
password: "sup3rs3cret1",
5555

@@ -64,7 +64,7 @@ func TestNewClient(t *testing.T) {
6464
token: "new-access-token",
6565
},
6666
"missing id token": {
67-
version: "6.0.0",
67+
version: "6.1.0",
6868
username: "admin",
6969
password: "sup3rs3cret1",
7070

0 commit comments

Comments
 (0)