Skip to content

Commit

Permalink
scheduler: fix perm diff on appEngineRouting (#1131)
Browse files Browse the repository at this point in the history
Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician authored and emilymye committed Sep 26, 2019
1 parent 654ecdc commit d12a3df
Showing 1 changed file with 7 additions and 17 deletions.
24 changes: 7 additions & 17 deletions google-beta/resource_cloud_scheduler_job.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d12a3df

Please sign in to comment.