Service account description uses patch for updates. (#2650)

Merged PR #2650.
GoogleCloudPlatform · Nov 12, 2019 · 88c0178 · 88c0178
1 parent 35cba66
commit 88c0178
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 20 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/third_party/terraform/resources/resource_google_service_account.go b/third_party/terraform/resources/resource_google_service_account.go
@@ -126,23 +126,31 @@ func resourceGoogleServiceAccountDelete(d *schema.ResourceData, meta interface{}
 
 func resourceGoogleServiceAccountUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
-	if d.HasChange("display_name") || d.HasChange("description") {
-		sa, err := config.clientIAM.Projects.ServiceAccounts.Get(d.Id()).Do()
-		if err != nil {
-			return fmt.Errorf("Error retrieving service account %q: %s", d.Id(), err)
-		}
-		_, err = config.clientIAM.Projects.ServiceAccounts.Update(d.Id(),
-			&iam.ServiceAccount{
+	sa, err := config.clientIAM.Projects.ServiceAccounts.Get(d.Id()).Do()
+	if err != nil {
+		return fmt.Errorf("Error retrieving service account %q: %s", d.Id(), err)
+	}
+	updateMask := make([]string, 0)
+	if d.HasChange("description") {
+		updateMask = append(updateMask, "description")
+	}
+	if d.HasChange("display_name") {
+		updateMask = append(updateMask, "display_name")
+	}
+	_, err = config.clientIAM.Projects.ServiceAccounts.Patch(d.Id(),
+		&iam.PatchServiceAccountRequest{
+			UpdateMask: strings.Join(updateMask, ","),
+			ServiceAccount: &iam.ServiceAccount{
 				DisplayName: d.Get("display_name").(string),
 				Description: d.Get("description").(string),
 				Etag:        sa.Etag,
-			}).Do()
-		if err != nil {
-			return fmt.Errorf("Error updating service account %q: %s", d.Id(), err)
-		}
-		// See comment in Create.
-		time.Sleep(time.Second)
+			},
+		}).Do()
+	if err != nil {
+		return err
 	}
+	// See comment in Create.
+	time.Sleep(time.Second)
 
 	return nil
 }

diff --git a/third_party/terraform/tests/resource_google_service_account_test.go b/third_party/terraform/tests/resource_google_service_account_test.go
@@ -17,6 +17,8 @@ func TestAccServiceAccount_basic(t *testing.T) {
 	uniqueId := ""
 	displayName := "Terraform Test"
 	displayName2 := "Terraform Test Update"
+	desc := "test description"
+	desc2 := "test description update"
 	project := getTestProjectFromEnv()
 	expectedEmail := fmt.Sprintf("%s@%s.iam.gserviceaccount.com", accountId, project)
 	resource.Test(t, resource.TestCase{
@@ -25,7 +27,7 @@ func TestAccServiceAccount_basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			// The first step creates a basic service account
 			{
-				Config: testAccServiceAccountBasic(accountId, displayName),
+				Config: testAccServiceAccountBasic(accountId, displayName, desc),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(
 						"google_service_account.acceptance", "project", project),
@@ -51,7 +53,7 @@ func TestAccServiceAccount_basic(t *testing.T) {
 			},
 			// The second step updates the service account
 			{
-				Config: testAccServiceAccountBasic(accountId, displayName2),
+				Config: testAccServiceAccountBasic(accountId, displayName2, desc2),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(
 						"google_service_account.acceptance", "project", project),
@@ -90,14 +92,14 @@ func testAccStoreServiceAccountUniqueId(uniqueId *string) resource.TestCheckFunc
 	}
 }
 
-func testAccServiceAccountBasic(account, name string) string {
+func testAccServiceAccountBasic(account, name, desc string) string {
 	return fmt.Sprintf(`
 resource "google_service_account" "acceptance" {
     account_id = "%v"
     display_name = "%v"
-    description = "foo"
+    description = "%v"
 }
-`, account, name)
+`, account, name, desc)
 }
 
 func testAccServiceAccountWithProject(project, account, name string) string {