Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Force-send min_ready_sec #5402

Merged
merged 1 commit into from
Oct 29, 2021
Merged

Force-send min_ready_sec #5402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions mmv1/third_party/terraform/resources/resource_compute_instance_group_manager.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,6 +928,10 @@ func expandUpdatePolicy(configured []interface{}) *compute.InstanceGroupManagerU
updatePolicy.MinimalAction = data["minimal_action"].(string)
updatePolicy.Type = data["type"].(string)
updatePolicy.ReplacementMethod = data["replacement_method"].(string)
<% unless version == "ga" -%>
updatePolicy.MinReadySec = int64(data["min_ready_sec"].(int))
updatePolicy.ForceSendFields = []string{"MinReadySec"}
<% end -%>

// percent and fixed values are conflicting
// when the percent values are set, the fixed values will be ignored
Expand Down Expand Up @@ -958,12 +962,6 @@ func expandUpdatePolicy(configured []interface{}) *compute.InstanceGroupManagerU
NullFields: []string{"Percent"},
}
}

<% unless version == "ga" -%>
if v, ok := data["min_ready_sec"]; ok {
updatePolicy.MinReadySec = int64(v.(int))
}
<% end -%>
}
return updatePolicy
}
Expand Down
10 changes: 4 additions & 6 deletions mmv1/third_party/terraform/resources/resource_compute_region_instance_group_manager.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,10 @@ func expandRegionUpdatePolicy(configured []interface{}) *compute.InstanceGroupMa
updatePolicy.Type = data["type"].(string)
updatePolicy.InstanceRedistributionType = data["instance_redistribution_type"].(string)
updatePolicy.ReplacementMethod = data["replacement_method"].(string)
<% unless version == "ga" -%>
updatePolicy.MinReadySec = int64(data["min_ready_sec"].(int))
updatePolicy.ForceSendFields = []string{"MinReadySec"}
<% end -%>

// percent and fixed values are conflicting
// when the percent values are set, the fixed values will be ignored
Expand Down Expand Up @@ -815,12 +819,6 @@ func expandRegionUpdatePolicy(configured []interface{}) *compute.InstanceGroupMa
NullFields: []string{"Percent"},
}
}

<% unless version == "ga" -%>
if v, ok := data["min_ready_sec"]; ok {
updatePolicy.MinReadySec = int64(v.(int))
}
<% end -%>
}
return updatePolicy
}
Expand Down