diff --git a/mmv1/products/appengine/FlexibleAppVersion.yaml b/mmv1/products/appengine/FlexibleAppVersion.yaml index 176e6850c19b..7c49ae86f6a2 100644 --- a/mmv1/products/appengine/FlexibleAppVersion.yaml +++ b/mmv1/products/appengine/FlexibleAppVersion.yaml @@ -502,7 +502,7 @@ properties: name: 'deployment' description: | Code and application artifacts that make up this version. - custom_flatten: templates/terraform/custom_flatten/app_version.go.erb + ignore_read: true properties: - !ruby/object:Api::Type::NestedObject name: 'zip' diff --git a/mmv1/templates/terraform/custom_flatten/app_version.go.erb b/mmv1/templates/terraform/custom_flatten/app_version.go.erb deleted file mode 100644 index 745563b1382e..000000000000 --- a/mmv1/templates/terraform/custom_flatten/app_version.go.erb +++ /dev/null @@ -1,68 +0,0 @@ -<%# The license inside this block applies to this file. - # Copyright 2022 Google Inc. - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. --%> -func flatten<%= prefix -%><%= titlelize_property(property) -%>(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 -} diff --git a/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go b/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go index 14111114306f..f3aec88b7bdd 100644 --- a/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go +++ b/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go @@ -29,7 +29,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), @@ -38,7 +38,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"}, }, }, })