manually add changes (#4446) (#2917)

Co-authored-by: Seth Vargo <[email protected]>
Signed-off-by: Modular Magician <[email protected]>

Co-authored-by: Seth Vargo <[email protected]>

Author: modular-magician

.changelog/4446.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+serviceaccount: loosened restrictions on `account_id` for datasource `google_service_account`
+```

google-beta/data_source_google_service_account.go

@@ -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,

website/docs/d/service_account.html.markdown

@@ -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.
+      `[email protected]`)
 
 * `project` - (Optional) The ID of the project that the service account is present in.
     Defaults to the provider project configuration.