ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow underscores in IAM user and group names (#9684) 

* Allow underscores in IAM user and group names

* Add notes to iam_user and iam_group docs that names are not distinguished by case
This commit is contained in:
Andras Ferencz-Szabo 2016-10-28 13:40:04 +01:00 committed by Paul Stack
parent 990a1ba204
commit 46cb7b4710
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/aws/resource_aws_iam_group.go
View File

@ -132,9 +132,9 @@ func resourceAwsIamGroupDelete(d *schema.ResourceData, meta interface{}) error {
func validateAwsIamGroupName(v interface{}, k string) (ws []string, errors []error) { func validateAwsIamGroupName(v interface{}, k string) (ws []string, errors []error) {
value := v.(string) value := v.(string)
if !regexp.MustCompile(`^[0-9A-Za-z=,.@-]+$`).MatchString(value) { if !regexp.MustCompile(`^[0-9A-Za-z=,.@\-_]+$`).MatchString(value) {
errors = append(errors, fmt.Errorf( errors = append(errors, fmt.Errorf(
"only alphanumeric characters, hyphens, commas, periods, @ symbols and equals signs allowed in %q: %q", "only alphanumeric characters, hyphens, underscores, commas, periods, @ symbols and equals signs allowed in %q: %q",
k, value)) k, value))
} }
return return

2
builtin/providers/aws/resource_aws_iam_group_test.go
View File

@ -14,6 +14,7 @@ import (
func TestValidateIamGroupName(t *testing.T) { func TestValidateIamGroupName(t *testing.T) {
validNames := []string{ validNames := []string{
"test-group", "test-group",
"test_group",
"testgroup123", "testgroup123",
"TestGroup", "TestGroup",
"Test-Group", "Test-Group",
@ -34,7 +35,6 @@ func TestValidateIamGroupName(t *testing.T) {
" ", " ",
":", ":",
";", ";",
"testgroup_123",
"test name", "test name",
"/slash-at-the-beginning", "/slash-at-the-beginning",
"slash-at-the-end/", "slash-at-the-end/",

4
builtin/providers/aws/resource_aws_iam_user.go
View File

@ -217,9 +217,9 @@ func resourceAwsIamUserDelete(d *schema.ResourceData, meta interface{}) error {
func validateAwsIamUserName(v interface{}, k string) (ws []string, errors []error) { func validateAwsIamUserName(v interface{}, k string) (ws []string, errors []error) {
value := v.(string) value := v.(string)
if !regexp.MustCompile(`^[0-9A-Za-z=,.@-]+$`).MatchString(value) { if !regexp.MustCompile(`^[0-9A-Za-z=,.@\-_]+$`).MatchString(value) {
errors = append(errors, fmt.Errorf( errors = append(errors, fmt.Errorf(
"only alphanumeric characters, hyphens, commas, periods, @ symbols and equals signs allowed in %q: %q", "only alphanumeric characters, hyphens, underscores, commas, periods, @ symbols and equals signs allowed in %q: %q",
k, value)) k, value))
} }
return return

2
builtin/providers/aws/resource_aws_iam_user_test.go
View File

@ -15,6 +15,7 @@ import (
func TestValidateIamUserName(t *testing.T) { func TestValidateIamUserName(t *testing.T) {
validNames := []string{ validNames := []string{
"test-user", "test-user",
"test_user",
"testuser123", "testuser123",
"TestUser", "TestUser",
"Test-User", "Test-User",
@ -35,7 +36,6 @@ func TestValidateIamUserName(t *testing.T) {
" ", " ",
":", ":",
";", ";",
"testuser_123",
"test name", "test name",
"/slash-at-the-beginning", "/slash-at-the-beginning",
"slash-at-the-end/", "slash-at-the-end/",

8
website/source/docs/providers/aws/r/iam_group.html.markdown
View File

@ -23,7 +23,7 @@ resource "aws_iam_group" "developers" {
The following arguments are supported: The following arguments are supported:
* `name` - (Required) The group's name. The name must consist of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: `=,.@-.`. * `name` - (Required) The group's name. The name must consist of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: `=,.@-_.`. Group names are not distinguished by case. For example, you cannot create groups named both "ADMINS" and "admins".
* `path` - (Optional, default "/") Path in which to create the group. * `path` - (Optional, default "/") Path in which to create the group.
## Attributes Reference ## Attributes Reference
@ -37,11 +37,11 @@ The following attributes are exported:
* `unique_id` - The [unique ID][1] assigned by AWS. * `unique_id` - The [unique ID][1] assigned by AWS.
[1]: https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html#GUIDs [1]: https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html#GUIDs
## Import ## Import
IAM Groups can be imported using the `name`, e.g. IAM Groups can be imported using the `name`, e.g.
``` ```
$ terraform import aws_iam_group.developers developers $ terraform import aws_iam_group.developers developers
``` ```

4
website/source/docs/providers/aws/r/iam_user.html.markdown
View File

@ -46,7 +46,7 @@ EOF
The following arguments are supported: The following arguments are supported:
* `name` - (Required) The user's name. The name must consist of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: `=,.@-.`. * `name` - (Required) The user's name. The name must consist of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: `=,.@-_.`. User names are not distinguished by case. For example, you cannot create users named both "TESTUSER" and "testuser".
* `path` - (Optional, default "/") Path in which to create the user. * `path` - (Optional, default "/") Path in which to create the user.
* `force_destroy` - (Optional, default false) When destroying this user, destroy * `force_destroy` - (Optional, default false) When destroying this user, destroy
even if it has non-Terraform-managed IAM access keys. Without `force_destroy` even if it has non-Terraform-managed IAM access keys. Without `force_destroy`
@ -64,7 +64,7 @@ The following attributes are exported:
## Import ## Import
IAM Users can be imported using the `name`, e.g. IAM Users can be imported using the `name`, e.g.
``` ```
$ terraform import aws_iam_user.lb loadbalancer $ terraform import aws_iam_user.lb loadbalancer