Skip to content

Commit

Permalink
Revert "add description field to service_account for Terraform (#5138)…
Browse files Browse the repository at this point in the history
…" (#5144)

This reverts commit e5d9824.
  • Loading branch information
Ty Larrabee authored Dec 11, 2019
1 parent b536fe6 commit 3d8c561
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
6 changes: 2 additions & 4 deletions google/resource_google_service_account.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"time"

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

Expand Down Expand Up @@ -43,9 +42,8 @@ func resourceGoogleServiceAccount() *schema.Resource {
Optional: true,
},
"description": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringLenBetween(0, 256),
Type: schema.TypeString,
Optional: true,
},
"project": {
Type: schema.TypeString,
Expand Down
2 changes: 1 addition & 1 deletion google/resource_google_service_account_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestAccServiceAccount_basic(t *testing.T) {
displayName := "Terraform Test"
displayName2 := "Terraform Test Update"
desc := "test description"
desc2 := ""
desc2 := "test description update"
project := getTestProjectFromEnv()
expectedEmail := fmt.Sprintf("%s@%s.iam.gserviceaccount.com", accountId, project)
resource.Test(t, resource.TestCase{
Expand Down
1 change: 0 additions & 1 deletion website/docs/r/google_service_account.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ The following arguments are supported:
Can be updated without creating a new resource.

* `description` - (Optional) A text description of the service account.
Must be less than or equal to 256 UTF-8 bytes.

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

0 comments on commit 3d8c561

Please sign in to comment.