From 9e596fcef265a9faa30768f7fec5ccd531e40c11 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 19 Mar 2018 11:47:42 -0400 Subject: [PATCH] Update path-help to make clear you shouldn't put things in the URL. Remove from website docs as those have been long deprecated. --- vault/token_store.go | 12 ++++++------ website/source/api/auth/token/index.html.md | 14 +++++--------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/vault/token_store.go b/vault/token_store.go index 0f6e00d28b..1cf84092ce 100644 --- a/vault/token_store.go +++ b/vault/token_store.go @@ -277,7 +277,7 @@ func NewTokenStore(ctx context.Context, c *Core, config *logical.BackendConfig) Fields: map[string]*framework.FieldSchema{ "urltoken": &framework.FieldSchema{ Type: framework.TypeString, - Description: "Token to lookup (URL parameter)", + Description: "DEPRECATED: Token to lookup (URL parameter). Do not use this; use the POST version instead with the token in the body.", }, "token": &framework.FieldSchema{ Type: framework.TypeString, @@ -300,7 +300,7 @@ func NewTokenStore(ctx context.Context, c *Core, config *logical.BackendConfig) Fields: map[string]*framework.FieldSchema{ "urlaccessor": &framework.FieldSchema{ Type: framework.TypeString, - Description: "Accessor of the token to look up (URL parameter)", + Description: "DEPRECATED: Accessor of the token to lookup (URL parameter). Do not use this; use the POST version instead with the accessor in the body.", }, "accessor": &framework.FieldSchema{ Type: framework.TypeString, @@ -341,7 +341,7 @@ func NewTokenStore(ctx context.Context, c *Core, config *logical.BackendConfig) Fields: map[string]*framework.FieldSchema{ "urlaccessor": &framework.FieldSchema{ Type: framework.TypeString, - Description: "Accessor of the token (URL parameter)", + Description: "DEPRECATED: Accessor of the token to revoke (URL parameter). Do not use this; use the POST version instead with the accessor in the body.", }, "accessor": &framework.FieldSchema{ Type: framework.TypeString, @@ -374,7 +374,7 @@ func NewTokenStore(ctx context.Context, c *Core, config *logical.BackendConfig) Fields: map[string]*framework.FieldSchema{ "urltoken": &framework.FieldSchema{ Type: framework.TypeString, - Description: "Token to revoke (URL parameter)", + Description: "DEPRECATED: Token to revoke (URL parameter). Do not use this; use the POST version instead with the token in the body.", }, "token": &framework.FieldSchema{ Type: framework.TypeString, @@ -396,7 +396,7 @@ func NewTokenStore(ctx context.Context, c *Core, config *logical.BackendConfig) Fields: map[string]*framework.FieldSchema{ "urltoken": &framework.FieldSchema{ Type: framework.TypeString, - Description: "Token to revoke (URL parameter)", + Description: "DEPRECATED: Token to revoke (URL parameter). Do not use this; use the POST version instead with the token in the body.", }, "token": &framework.FieldSchema{ Type: framework.TypeString, @@ -441,7 +441,7 @@ func NewTokenStore(ctx context.Context, c *Core, config *logical.BackendConfig) Fields: map[string]*framework.FieldSchema{ "urltoken": &framework.FieldSchema{ Type: framework.TypeString, - Description: "Token to renew (URL parameter)", + Description: "DEPRECATED: Token to renew (URL parameter). Do not use this; use the POST version instead with the token in the body.", }, "token": &framework.FieldSchema{ Type: framework.TypeString, diff --git a/website/source/api/auth/token/index.html.md b/website/source/api/auth/token/index.html.md index 1eb7870f40..aacae7f005 100644 --- a/website/source/api/auth/token/index.html.md +++ b/website/source/api/auth/token/index.html.md @@ -140,7 +140,7 @@ $ curl \ "user": "armon" }, "lease_duration": 3600, - "renewable": true, + "renewable": true } } ``` @@ -152,7 +152,6 @@ Returns information about the client token. | Method | Path | Produces | | :------- | :--------------------------- | :--------------------- | | `POST` | `/auth/token/lookup` | `200 application/json` | -| `GET` | `/auth/token/lookup/:token` | `200 application/json` | ### Parameters @@ -192,7 +191,7 @@ $ curl \ "organization": "hashicorp" }, "display_name": "github-armon", - "num_uses": 0, + "num_uses": 0 } } ``` @@ -229,7 +228,7 @@ $ curl \ "organization": "hashicorp" }, "display_name": "github-armon", - "num_uses": 0, + "num_uses": 0 } } ``` @@ -241,7 +240,6 @@ Returns information about the client token from the accessor. | Method | Path | Produces | | :------- | :--------------------------- | :--------------------- | | `POST` | `/auth/token/lookup-accessor` | `200 application/json` | -| `GET` | `/auth/token/lookup-accessor/:accessor` | `200 application/json` | ### Parameters @@ -300,7 +298,6 @@ if there is a lease associated with it. | Method | Path | Produces | | :------- | :--------------------------- | :--------------------- | | `POST` | `/auth/token/renew` | `200 application/json` | -| `POST` | `/auth/token/renew/:token` | `200 application/json` | ### Parameters @@ -341,7 +338,7 @@ $ curl \ "user": "armon" }, "lease_duration": 3600, - "renewable": true, + "renewable": true } } ``` @@ -393,7 +390,7 @@ $ curl \ "user": "armon" }, "lease_duration": 3600, - "renewable": true, + "renewable": true } } ``` @@ -489,7 +486,6 @@ endpoint. | Method | Path | Produces | | :------- | :--------------------------- | :--------------------- | | `POST` | `/auth/token/revoke-orphan` | `204 (empty body)` | -| `POST` | `/auth/token/revoke-orphan/:token` | `204 (empty body)` | ### Parameters