Skip to content

Commit 5b6b9cb

Browse files
authored
fixed maintenance_exclusion deletion (#4541)
1 parent d5380c2 commit 5b6b9cb

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

mmv1/third_party/terraform/resources/resource_container_cluster.go.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2928,6 +2928,9 @@ func expandMaintenancePolicy(d *schema.ResourceData, meta interface{}) *containe
29282928
maintenancePolicy := l[0].(map[string]interface{})
29292929

29302930
if maintenanceExclusions, ok := maintenancePolicy["maintenance_exclusion"]; ok && len(maintenanceExclusions.(*schema.Set).List()) > 0 {
2931+
for k := range exclusions {
2932+
delete(exclusions, k)
2933+
}
29312934
for _, me := range maintenanceExclusions.(*schema.Set).List() {
29322935
exclusion := me.(map[string]interface{})
29332936
exclusions[exclusion["exclusion_name"].(string)] = containerBeta.TimeWindow{

mmv1/third_party/terraform/tests/resource_container_cluster_test.go.erb

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,7 +1450,7 @@ func TestAccContainerCluster_withMaintenanceExclusionWindow(t *testing.T) {
14501450
ImportStateVerify: true,
14511451
},
14521452
{
1453-
Config: testAccContainerCluster_withExclusion_DailyMaintenanceWindow(cluster, "2020-01-01T00:00:00Z", "2020-01-02T00:00:00Z", "2020-05-01T00:00:00Z", "2020-05-02T00:00:00Z"),
1453+
Config: testAccContainerCluster_withExclusion_DailyMaintenanceWindow(cluster, "2020-01-01T00:00:00Z", "2020-01-02T00:00:00Z"),
14541454
},
14551455
{
14561456
ResourceName: resourceName,
@@ -3759,7 +3759,7 @@ resource "google_container_cluster" "with_maintenance_exclusion_window" {
37593759
`, clusterName, w1startTime, w1endTime, w1startTime, w1endTime, w2startTime, w2endTime)
37603760
}
37613761

3762-
func testAccContainerCluster_withExclusion_DailyMaintenanceWindow(clusterName string, w1startTime, w1endTime, w2startTime, w2endTime string) string {
3762+
func testAccContainerCluster_withExclusion_DailyMaintenanceWindow(clusterName string, w1startTime, w1endTime string) string {
37633763

37643764
return fmt.Sprintf(`
37653765
resource "google_container_cluster" "with_maintenance_exclusion_window" {
@@ -3776,14 +3776,9 @@ resource "google_container_cluster" "with_maintenance_exclusion_window" {
37763776
start_time = "%s"
37773777
end_time = "%s"
37783778
}
3779-
maintenance_exclusion {
3780-
exclusion_name = "holiday data load"
3781-
start_time = "%s"
3782-
end_time = "%s"
3783-
}
37843779
}
37853780
}
3786-
`, clusterName, w1startTime, w1endTime, w2startTime, w2endTime)
3781+
`, clusterName, w1startTime, w1endTime)
37873782
}
37883783

37893784
func testAccContainerCluster_withIPAllocationPolicy_existingSecondaryRanges(containerNetName string, clusterName string) string {

0 commit comments

Comments
 (0)