mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-07-03 12:35:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2411 from praxist/fix-vault-k8s

Browse source 
Fix vault-k8s expected response type
This commit is contained in:
Brad Rydzewski 2018-05-02 17:02:25 -07:00 committed by GitHub
parent 4063d29b44 75fbaf91d9
commit 29785b86f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/secrets/vault/kubernetes.go
View file

@ -12,13 +12,13 @@ Vault JSON Response
{
"auth": {
"client_token" = "token",
"lease_duration" = "1234s"
"lease_duration" = 1234
}
}
*/
type vaultAuth struct {
Token string `json:"client_token"`
Lease string `json:"lease_duration"`
Lease int `json:"lease_duration"`
}
type vaultResp struct {
Auth vaultAuth
@ -42,10 +42,7 @@ func getKubernetesToken(addr, role, mount, tokenFile string) (string, time.Durat
return "", 0, err
}
ttl, err := time.ParseDuration(resp.Auth.Lease)
if err != nil {
return "", 0, err
}
ttl := time.Duration(resp.Auth.Lease) * time.Second
return resp.Auth.Token, ttl, nil
}

6
plugins/secrets/vault/kubernetes_test.go
View file

@ -17,9 +17,9 @@ func TestGetKubernetesToken(t *testing.T) {
b, _ := ioutil.ReadFile(fakeJwtFile)
fakeJwt := string(b)
fakeClientToken := "fakeClientToken"
fakeLeaseMinutes := "10m"
fakeLeaseDuration, _ := time.ParseDuration(fakeLeaseMinutes)
fakeResp := fmt.Sprintf("{\"auth\": {\"client_token\": \"%s\", \"lease_duration\": \"%s\"}}", fakeClientToken, fakeLeaseMinutes)
fakeLeaseSeconds := 86400
fakeLeaseDuration := time.Duration(fakeLeaseSeconds) * time.Second
fakeResp := fmt.Sprintf("{\"auth\": {\"client_token\": \"%s\", \"lease_duration\": %d}}", fakeClientToken, fakeLeaseSeconds)
expectedPath := "/v1/auth/kubernetes/login"
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {