Rename uri to connection_uri

This commit is contained in:
Kevin Pike 2016-04-08 09:04:42 -07:00
parent 48d1f99afb
commit 070fe56648

View file

@ -12,7 +12,7 @@ func pathConfigConnection(b *backend) *framework.Path {
return &framework.Path{ return &framework.Path{
Pattern: "config/connection", Pattern: "config/connection",
Fields: map[string]*framework.FieldSchema{ Fields: map[string]*framework.FieldSchema{
"uri": &framework.FieldSchema{ "connection_uri": &framework.FieldSchema{
Type: framework.TypeString, Type: framework.TypeString,
Description: "RabbitMQ Management URI", Description: "RabbitMQ Management URI",
}, },
@ -36,13 +36,13 @@ func pathConfigConnection(b *backend) *framework.Path {
} }
func (b *backend) pathConnectionWrite(req *logical.Request, data *framework.FieldData) (*logical.Response, error) { func (b *backend) pathConnectionWrite(req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
uri := data.Get("uri").(string) uri := data.Get("connection_uri").(string)
username := data.Get("username").(string) username := data.Get("username").(string)
password := data.Get("password").(string) password := data.Get("password").(string)
if uri == "" { if uri == "" {
return logical.ErrorResponse(fmt.Sprintf( return logical.ErrorResponse(fmt.Sprintf(
"'uri' is a required parameter.")), nil "'connection_uri' is a required parameter.")), nil
} }
if username == "" { if username == "" {
@ -88,22 +88,22 @@ func (b *backend) pathConnectionWrite(req *logical.Request, data *framework.Fiel
} }
type connectionConfig struct { type connectionConfig struct {
URI string `json:"uri"` URI string `json:"connection_uri"`
Username string `json:"username"` Username string `json:"username"`
Password string `json:"password"` Password string `json:"password"`
} }
const pathConfigConnectionHelpSyn = ` const pathConfigConnectionHelpSyn = `
Configure the URI, username, and password to talk to RabbitMQ management HTTP API. Configure the connection URI, username, and password to talk to RabbitMQ management HTTP API.
` `
const pathConfigConnectionHelpDesc = ` const pathConfigConnectionHelpDesc = `
This path configures the connection properties used to connect to RabbitMQ management HTTP API. This path configures the connection properties used to connect to RabbitMQ management HTTP API.
The "uri" parameter is a string that is be used to connect to the API. The "username" The "connection_uri" parameter is a string that is be used to connect to the API. The "username"
and "password" parameters are strings and used as credentials to the API. and "password" parameters are strings and used as credentials to the API.
The URI looks like: The URI looks like:
"http://localhost:15672" "http://localhost:15672"
When configuring the URI, username, and password, the backend will verify their validity. When configuring the connection URI, username, and password, the backend will verify their validity.
` `