Add nil check to recurring_schedule in google_os_config_patch_deploym…

…ent (#3974) (#2481) Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Sep 14, 2020 · efd2322 · efd2322
1 parent 0a81851
commit efd2322
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 29 deletions.
diff --git a/.changelog/3974.txt b/.changelog/3974.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+osconfig: fixed a potential crash in `google_os_config_patch_deployment` due to an unchecked nil value in `recurring_schedule`
+````
diff --git a/google-beta/resource_os_config_patch_deployment.go b/google-beta/resource_os_config_patch_deployment.go
@@ -3243,11 +3243,13 @@ func expandOSConfigPatchDeploymentRolloutDisruptionBudgetPercentage(v interface{
 }
 
 func resourceOSConfigPatchDeploymentEncoder(d *schema.ResourceData, meta interface{}, obj map[string]interface{}) (map[string]interface{}, error) {
-	schedule := obj["recurringSchedule"].(map[string]interface{})
-	if schedule["monthly"] != nil {
-		obj["recurringSchedule"].(map[string]interface{})["frequency"] = "MONTHLY"
-	} else if schedule["weekly"] != nil {
-		obj["recurringSchedule"].(map[string]interface{})["frequency"] = "WEEKLY"
+	if obj["recurringSchedule"] != nil {
+		schedule := obj["recurringSchedule"].(map[string]interface{})
+		if schedule["monthly"] != nil {
+			obj["recurringSchedule"].(map[string]interface{})["frequency"] = "MONTHLY"
+		} else if schedule["weekly"] != nil {
+			obj["recurringSchedule"].(map[string]interface{})["frequency"] = "WEEKLY"
+		}
 	}
 
 	if obj["patchConfig"] != nil {

diff --git a/google-beta/resource_os_config_patch_deployment_generated_test.go b/google-beta/resource_os_config_patch_deployment_generated_test.go
@@ -57,18 +57,8 @@ resource "google_os_config_patch_deployment" "patch" {
     all = true
   }
 
-  recurring_schedule {
-    time_zone {
-      id = "America/New_York"
-    }
-
-    time_of_day {
-      hours = 1
-    }
-
-    weekly {
-      day_of_week = "MONDAY"
-    }
+  one_time_schedule {
+    execute_time = "2020-10-10T10:10:10.045123456Z"
   }
 }
 `, context)

diff --git a/website/docs/r/os_config_patch_deployment.html.markdown b/website/docs/r/os_config_patch_deployment.html.markdown
@@ -48,18 +48,8 @@ resource "google_os_config_patch_deployment" "patch" {
     all = true
   }
 
-  recurring_schedule {
-    time_zone {
-      id = "America/New_York"
-    }
-
-    time_of_day {
-      hours = 1
-    }
-
-    weekly {
-      day_of_week = "MONDAY"
-    }
+  one_time_schedule {
+    execute_time = "2020-10-10T10:10:10.045123456Z"
   }
 }
 ```