Fix google_apigee_developer_app: do not delete credentials block in decoder (#15440)

Author: LucaPrete

mmv1/templates/terraform/decoders/apigee_developer_app.go.tmpl

@@ -33,8 +33,6 @@ if obj, ok := res["credentials"]; ok {
 					res["apiProducts"] = flattenedProducts
 				}
 			}
-
-			delete(res, "credentials")
 		} else {
 			return nil, fmt.Errorf("Unable to decode the first element of the credentials array.")
 		}

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

@@ -12,6 +12,8 @@ import (
 func TestAccApigeeDeveloperApp_apigeeDeveloperAppUpdateTest(t *testing.T) {
 	t.Parallel()
 
+	resourceName := "google_apigee_developer_app.apigee_developer_app"
+
 	context := map[string]interface{}{
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
 		"org_id":          envvar.GetTestOrgFromEnv(t),
@@ -28,18 +30,26 @@ func TestAccApigeeDeveloperApp_apigeeDeveloperAppUpdateTest(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: testAccApigeeDeveloperApp_apigeeDeveloperAppBasicTest(context),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resourceName, "credentials.0.consumer_key"),
+					resource.TestCheckResourceAttrSet(resourceName, "credentials.0.consumer_secret"),
+				),
 			},
 			{
-				ResourceName:            "google_apigee_developer_app.apigee_developer_app",
+				ResourceName:            resourceName,
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"org_id"},
 			},
 			{
 				Config: testAccApigeeDeveloperApp_apigeeDeveloperAppUpdateTest(context),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resourceName, "credentials.0.consumer_key"),
+					resource.TestCheckResourceAttrSet(resourceName, "credentials.0.consumer_secret"),
+				),
 			},
 			{
-				ResourceName:            "google_apigee_developer_app.apigee_developer_app",
+				ResourceName:            resourceName,
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"org_id"},