Ignore read on FlexibleAppVersion deployment (#10330) (#7175)

[upstream:212645a45ef33eac7d1b85b3eadad7216c86a5ea]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/10330.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+appengine: fixed a crash in `google_app_engine_flexible_app_version` due to the `deployment` field not being returned by the API
+```

google-beta/services/appengine/resource_app_engine_flexible_app_version.go

@@ -1209,9 +1209,6 @@ func resourceAppEngineFlexibleAppVersionRead(d *schema.ResourceData, meta interf
 	if err := d.Set("nobuild_files_regex", flattenAppEngineFlexibleAppVersionNobuildFilesRegex(res["nobuildFilesRegex"], d, config)); err != nil {
 		return fmt.Errorf("Error reading FlexibleAppVersion: %s", err)
 	}
-	if err := d.Set("deployment", flattenAppEngineFlexibleAppVersionDeployment(res["deployment"], d, config)); err != nil {
-		return fmt.Errorf("Error reading FlexibleAppVersion: %s", err)
-	}
 	if err := d.Set("endpoints_api_service", flattenAppEngineFlexibleAppVersionEndpointsApiService(res["endpointsApiService"], d, config)); err != nil {
 		return fmt.Errorf("Error reading FlexibleAppVersion: %s", err)
 	}
@@ -2016,61 +2013,6 @@ func flattenAppEngineFlexibleAppVersionNobuildFilesRegex(v interface{}, d *schem
 	return v
 }
 
-func flattenAppEngineFlexibleAppVersionDeployment(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
-	original := v.(map[string]interface{})
-	transformed := make(map[string]interface{})
-	transformed["zip"] = d.Get("deployment.0.zip")
-	transformed["files"] = d.Get("deployment.0.files")
-	transformed["container"] =
-		flattenAppEngineFlexibleAppVersionDeploymentContainer(original["container"], d, config)
-	transformed["cloud_build_options"] =
-		flattenAppEngineFlexibleAppVersionDeploymentCloudBuildOptions(original["cloudBuildOptions"], d, config)
-
-	return []interface{}{transformed}
-}
-
-func flattenAppEngineFlexibleAppVersionDeploymentContainer(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
-	if v == nil {
-		return nil
-	}
-	original := v.(map[string]interface{})
-	if len(original) == 0 {
-		return nil
-	}
-	transformed := make(map[string]interface{})
-	transformed["image"] =
-		flattenAppEngineFlexibleAppVersionDeploymentContainerImage(original["image"], d, config)
-	return []interface{}{transformed}
-}
-
-func flattenAppEngineFlexibleAppVersionDeploymentContainerImage(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
-	return v
-}
-
-func flattenAppEngineFlexibleAppVersionDeploymentCloudBuildOptions(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
-	if v == nil {
-		return nil
-	}
-	original := v.(map[string]interface{})
-	if len(original) == 0 {
-		return nil
-	}
-	transformed := make(map[string]interface{})
-	transformed["app_yaml_path"] =
-		flattenAppEngineFlexibleAppVersionDeploymentCloudBuildOptionsAppYamlPath(original["appYamlPath"], d, config)
-	transformed["cloud_build_timeout"] =
-		flattenAppEngineFlexibleAppVersionDeploymentCloudBuildOptionsCloudBuildTimeout(original["cloudBuildTimeout"], d, config)
-	return []interface{}{transformed}
-}
-
-func flattenAppEngineFlexibleAppVersionDeploymentCloudBuildOptionsAppYamlPath(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
-	return v
-}
-
-func flattenAppEngineFlexibleAppVersionDeploymentCloudBuildOptionsCloudBuildTimeout(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
-	return v
-}
-
 func flattenAppEngineFlexibleAppVersionEndpointsApiService(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return nil

google-beta/services/appengine/resource_app_engine_flexible_app_version_generated_test.go

@@ -50,7 +50,7 @@ func TestAccAppEngineFlexibleAppVersion_appEngineFlexibleAppVersionExample(t *te
 				ResourceName:            "google_app_engine_flexible_app_version.myapp_v1",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"beta_settings", "env_variables", "entrypoint", "service", "noop_on_destroy", "deployment.0.zip"},
+				ImportStateVerifyIgnore: []string{"beta_settings", "env_variables", "deployment", "entrypoint", "service", "noop_on_destroy", "deployment.0.zip"},
 			},
 		},
 	})

google-beta/services/appengine/resource_app_engine_flexible_app_version_test.go

@@ -31,7 +31,7 @@ func TestAccAppEngineFlexibleAppVersion_update(t *testing.T) {
 				ResourceName:            "google_app_engine_flexible_app_version.foo",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"env_variables", "deployment.0.files", "entrypoint", "service", "noop_on_destroy"},
+				ImportStateVerifyIgnore: []string{"env_variables", "deployment", "entrypoint", "service", "noop_on_destroy"},
 			},
 			{
 				Config: testAccAppEngineFlexibleAppVersion_pythonUpdate(context),
@@ -40,7 +40,7 @@ func TestAccAppEngineFlexibleAppVersion_update(t *testing.T) {
 				ResourceName:            "google_app_engine_flexible_app_version.foo",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"env_variables", "deployment.0.files", "entrypoint", "service", "noop_on_destroy"},
+				ImportStateVerifyIgnore: []string{"env_variables", "deployment", "entrypoint", "service", "noop_on_destroy"},
 			},
 		},
 	})