diff --git a/vault/resource_aws_secret_backend_role.go b/vault/resource_aws_secret_backend_role.go index 416e74874..c2c018e0f 100644 --- a/vault/resource_aws_secret_backend_role.go +++ b/vault/resource_aws_secret_backend_role.go @@ -38,7 +38,7 @@ func awsSecretBackendRoleResource() *schema.Resource { "policy_arns": { Type: schema.TypeSet, Optional: true, - ConflictsWith: []string{"policy", "policy_arn", "role_arns"}, + ConflictsWith: []string{"policy", "policy_arn"}, Description: "ARN for an existing IAM policy the role should use.", Elem: &schema.Schema{ Type: schema.TypeString, @@ -78,7 +78,7 @@ func awsSecretBackendRoleResource() *schema.Resource { }, Optional: true, ForceNew: true, - ConflictsWith: []string{"policy", "policy_arn", "policy_arns"}, + ConflictsWith: []string{"policy", "policy_arn"}, Description: "ARNs of AWS roles allowed to be assumed. Only valid when credential_type is 'assumed_role'", }, "default_sts_ttl": { diff --git a/website/docs/r/aws_secret_backend_role.html.md b/website/docs/r/aws_secret_backend_role.html.md index d949c437c..44c8838db 100644 --- a/website/docs/r/aws_secret_backend_role.html.md +++ b/website/docs/r/aws_secret_backend_role.html.md @@ -29,7 +29,7 @@ resource "vault_aws_secret_backend" "aws" { resource "vault_aws_secret_backend_role" "role" { backend = "${vault_aws_secret_backend.aws.path}" name = "deploy" - credential_type = "assumed_role" + credential_type = "iam_user" policy_document = <