Client: Gatekeeper wasn't merged correctly; fix dockerfile.

nemosupremo · Sep 2, 2016 · 928e2c8 · 928e2c8
1 parent c75d624
commit 928e2c8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,8 @@
+vault
+vault-gatekeeper-mesos
+vltgatekeeper
+.DS_Store
+.minimesos/
+dist/builds/
+dist/release/
+.git/
diff --git a/dockerfile/Dockerfile → Dockerfile b/dockerfile/Dockerfile → Dockerfile
diff --git a/gatekeeper/gatekeeper.go b/gatekeeper/gatekeeper.go
@@ -162,10 +162,21 @@ func (c *Client) requestPermToken(tempToken string) (string, error) {
 		return "", err
 	}
 
-	cubbyholeSecret := &cubbyholeSecret{}
-	if err := json.NewDecoder(vaultResp.Body).Decode(cubbyholeSecret); err != nil {
+	var vaultWrappedResp vaultWrappedResponse
+
+	if err := json.NewDecoder(vaultResp.Body).Decode(&vaultWrappedResp); err != nil {
+		return "", err
+	}
+
+	secretResp := struct {
+		Auth struct {
+			ClientToken string `json:"client_token"`
+		} `json:"auth"`
+	}{}
+
+	if err := vaultWrappedResp.Unwrap(&secretResp); err != nil {
 		return "", err
 	}
 
-	return cubbyholeSecret.Data.WrappedSecret.Token, nil
+	return secretResp.Auth.ClientToken, nil
 }