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.

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

Remove validation on data.google_service_account account_id #2917

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .changelog/4446.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
serviceaccount: loosened restrictions on `account_id` for datasource `google_service_account`
```
5 changes: 2 additions & 3 deletions google-beta/data_source_google_service_account.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ func dataSourceGoogleServiceAccount() *schema.Resource {
Read: dataSourceGoogleServiceAccountRead,
Schema: map[string]*schema.Schema{
"account_id": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validateRFC1035Name(6, 30),
Type: schema.TypeString,
Required: true,
},
"project": {
Type: schema.TypeString,
Expand Down
10 changes: 9 additions & 1 deletion website/docs/d/service_account.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,15 @@ resource "kubernetes_secret" "google-application-credentials" {

The following arguments are supported:

* `account_id` - (Required) The Service account id. (This is the part of the service account's email field that comes before the @ symbol.)
* `account_id` - (Required) The Google service account ID. This be one of:

* The name of the service account within the project (e.g. `my-service`)

* The fully-qualified path to a service account resource (e.g.
`projects/my-project/serviceAccounts/...`)

* The email address of the service account (e.g.
`my-service@my-project.iam.gserviceaccount.com`)

* `project` - (Optional) The ID of the project that the service account is present in.
Defaults to the provider project configuration.
Expand Down