Merge pull request #465 from mesosphere/ack-rename-secret

Rename iam secret to private_key
mesosphere · Aug 25, 2016 · ea801fa · ea801fa
2 parents bfcd401 + 956db97
commit ea801fa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/httpcli/config_test.go b/httpcli/config_test.go
@@ -34,7 +34,7 @@ func TestValidate(t *testing.T) {
 			am: AuthIAM,
 			cm: ConfigMapOptions{iam.Configuration(iam.Config{
 				ID:            "foo",
-				Secret:        "bar",
+				PrivateKey:    "bar",
 				LoginEndpoint: "blah",
 			})}.ToConfigMap(),
 		},

diff --git a/httpcli/iam/config.go b/httpcli/iam/config.go
@@ -13,7 +13,7 @@ var ErrInvalidConfiguration = errors.New("invalid HTTP IAM configuration")
 // IAM endpoint.
 type Config struct {
 	ID            string `json:"uid"`            // ID
-	Secret        string `json:"secret"`         // Secret
+	PrivateKey    string `json:"private_key"`    // PrivateKey
 	LoginEndpoint string `json:"login_endpoint"` // LoginEndpoint
 }
 

diff --git a/httpcli/iam/iam.go b/httpcli/iam/iam.go
@@ -29,7 +29,7 @@ func Register() {
 }
 
 func validate(c Config) {
-	if c.ID == "" || c.Secret == "" || c.LoginEndpoint == "" {
+	if c.ID == "" || c.PrivateKey == "" || c.LoginEndpoint == "" {
 		panic(ErrInvalidConfiguration)
 	}
 }
@@ -42,7 +42,7 @@ func Doer(client *http.Client, config Config) httpcli.Doer {
 		token.Claims["uid"] = config.ID
 		token.Claims["exp"] = time.Now().Add(time.Hour).Unix()
 		// SignedString will treat secret as PEM-encoded key
-		tokenStr, err := token.SignedString([]byte(config.Secret))
+		tokenStr, err := token.SignedString([]byte(config.PrivateKey))
 		if err != nil {
 			return nil, err
 		}