From 4de62e25f85067f8dbd9b2ad41eb17f6c557773f Mon Sep 17 00:00:00 2001 From: Shinichi TAMURA Date: Thu, 26 Sep 2019 21:16:24 +0000 Subject: [PATCH] scheduler: fix perm diff on appEngineRouting Signed-off-by: Modular Magician --- google-beta/resource_cloud_scheduler_job.go | 24 ++++++--------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/google-beta/resource_cloud_scheduler_job.go b/google-beta/resource_cloud_scheduler_job.go index 7107fe80bd..693407eff2 100644 --- a/google-beta/resource_cloud_scheduler_job.go +++ b/google-beta/resource_cloud_scheduler_job.go @@ -634,34 +634,24 @@ func flattenCloudSchedulerJobAppEngineHttpTargetHttpMethod(v interface{}, d *sch return v } +// An `appEngineRouting` in API response is useless, so we set config values rather than api response to state. func flattenCloudSchedulerJobAppEngineHttpTargetAppEngineRouting(v interface{}, d *schema.ResourceData) interface{} { if v == nil { return nil } + if stateV, ok := d.GetOk("app_engine_http_target"); ok && len(stateV.([]interface{})) > 0 { + return d.Get("app_engine_http_target.0.app_engine_routing") + } original := v.(map[string]interface{}) if len(original) == 0 { return nil } transformed := make(map[string]interface{}) - transformed["service"] = - flattenCloudSchedulerJobAppEngineHttpTargetAppEngineRoutingService(original["service"], d) - transformed["version"] = - flattenCloudSchedulerJobAppEngineHttpTargetAppEngineRoutingVersion(original["version"], d) - transformed["instance"] = - flattenCloudSchedulerJobAppEngineHttpTargetAppEngineRoutingInstance(original["instance"], d) + transformed["service"] = original["service"] + transformed["version"] = original["version"] + transformed["instance"] = original["instance"] return []interface{}{transformed} } -func flattenCloudSchedulerJobAppEngineHttpTargetAppEngineRoutingService(v interface{}, d *schema.ResourceData) interface{} { - return v -} - -func flattenCloudSchedulerJobAppEngineHttpTargetAppEngineRoutingVersion(v interface{}, d *schema.ResourceData) interface{} { - return v -} - -func flattenCloudSchedulerJobAppEngineHttpTargetAppEngineRoutingInstance(v interface{}, d *schema.ResourceData) interface{} { - return v -} func flattenCloudSchedulerJobAppEngineHttpTargetRelativeUri(v interface{}, d *schema.ResourceData) interface{} { return v