Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validate account_id length in google_service_account #793

Merged
merged 4 commits into from
Nov 28, 2017
+56 −6
Merged

Validate account_id length in google_service_account #793

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00886b7
Validate account_id length in google_service_account
rosbo Nov 27, 2017
2559159
Validation service_account_id length in google_service_account_key
rosbo Nov 27, 2017
9722bf9
make fmt
rosbo Nov 27, 2017
5568ed9
Add validation method for RFC1025 names
rosbo Nov 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions google/resource_google_service_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"strings"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"google.golang.org/api/iam/v1"
)

Expand All @@ -33,9 +34,10 @@ func resourceGoogleServiceAccount() *schema.Resource {
Computed: true,
},
"account_id": &schema.Schema{
Type: schema.TypeString,
Required: true,
ForceNew: true,
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringLenBetween(6, 30),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we do have some more information on what a valid id is, let's just go ahead and check the regexp: https://cloud.google.com/iam/reference/rest/v1/projects.serviceAccounts/create

It is unique within a project, must be 6-30 characters long, and match the regular expression a-z to comply with RFC1035.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

},
"display_name": &schema.Schema{
Type: schema.TypeString,
Expand Down
7 changes: 4 additions & 3 deletions google/resource_google_service_account_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ func resourceGoogleServiceAccountKey() *schema.Resource {
Schema: map[string]*schema.Schema{
// Required
"service_account_id": &schema.Schema{
Type: schema.TypeString,
Required: true,
ForceNew: true,
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringLenBetween(6, 30),
},
// Optional
"key_algorithm": &schema.Schema{
Expand Down