fix(apigee): Error of update in google_apigee_developer (GoogleCloudP…

…latform#12347)

mmv1/products/apigee/Developer.yaml

@@ -24,7 +24,7 @@ base_url: "developers"
 self_link: "{{org_id}}/developers/{{email}}"
 create_url: "{{org_id}}/developers"
 delete_url: "{{org_id}}/developers/{{email}}"
-update_mask: true
+update_mask: false
 immutable: false
 import_format:
   - "{{org_id}}/developers/{{email}}"

mmv1/third_party/terraform/services/apigee/resource_apigee_developer_update_test.go

@@ -0,0 +1,123 @@
+package apigee_test
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+
+	"github.com/hashicorp/terraform-provider-google/google/acctest"
+	"github.com/hashicorp/terraform-provider-google/google/envvar"
+)
+
+func TestAccApigeeDeveloper_apigeeDeveloperUpdateTest(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
+		"random_suffix":   acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckApigeeDeveloperDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccApigeeDeveloper_apigeeDeveloperBasicTestExample(context),
+			},
+			{
+				ResourceName:            "google_apigee_developer.apigee_developer",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"org_id"},
+			},
+			{
+				Config: testAccApigeeDeveloper_apigeeDeveloperUpdateTest(context),
+			},
+			{
+				ResourceName:            "google_apigee_developer.apigee_developer",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"org_id"},
+			},
+		},
+	})
+}
+
+func testAccApigeeDeveloper_apigeeDeveloperUpdateTest(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_project" "project" {
+  project_id      = "tf-test%{random_suffix}"
+  name            = "tf-test%{random_suffix}"
+  org_id          = "%{org_id}"
+  billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
+}
+
+resource "google_project_service" "apigee" {
+  project = google_project.project.project_id
+  service = "apigee.googleapis.com"
+}
+
+resource "google_project_service" "compute" {
+  project = google_project.project.project_id
+  service = "compute.googleapis.com"
+}
+
+resource "google_project_service" "servicenetworking" {
+  project = google_project.project.project_id
+  service = "servicenetworking.googleapis.com"
+}
+
+resource "google_compute_network" "apigee_network" {
+  name       = "apigee-network"
+  project    = google_project.project.project_id
+  depends_on = [google_project_service.compute]
+}
+
+resource "google_compute_global_address" "apigee_range" {
+  name          = "apigee-range"
+  purpose       = "VPC_PEERING"
+  address_type  = "INTERNAL"
+  prefix_length = 16
+  network       = google_compute_network.apigee_network.id
+  project       = google_project.project.project_id
+}
+
+resource "google_service_networking_connection" "apigee_vpc_connection" {
+  network                 = google_compute_network.apigee_network.id
+  service                 = "servicenetworking.googleapis.com"
+  reserved_peering_ranges = [google_compute_global_address.apigee_range.name]
+  depends_on              = [google_project_service.servicenetworking]
+}
+
+resource "google_apigee_organization" "apigee_org" {
+  analytics_region   = "us-central1"
+  project_id         = google_project.project.project_id
+  authorized_network = google_compute_network.apigee_network.id
+  depends_on         = [
+    google_service_networking_connection.apigee_vpc_connection,
+    google_project_service.apigee,
+  ]
+}
+
+resource "google_apigee_instance" "apigee_instance" {
+  name               = "tf-test%{random_suffix}"
+  location           = "us-central1"
+  org_id             = google_apigee_organization.apigee_org.id
+  peering_cidr_range = "SLASH_22"
+}
+
+resource "google_apigee_developer" "apigee_developer" {
+  email      = "tf-test%{random_suffix}@acme.com"
+  first_name = "Yamada"
+  last_name  = "Taro"
+  user_name  = "yamada.taro"
+  org_id     = google_apigee_organization.apigee_org.id
+  depends_on = [
+    google_apigee_instance.apigee_instance
+  ]
+}
+`, context)
+}