Allow sending start_time with default values. (#14779) (#23993)

[upstream:5297b9425edca63d1fec7c229ba207916f674549]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/14779.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+clouddeploy: allowed sending `start_time` with default values in `weekly_windows` in  `google_clouddeploy_deploy_policy` resource. `start_time 00:00` means the policy will start at midnight.
+```

google/services/clouddeploy/resource_clouddeploy_deploy_policy.go

@@ -74,25 +74,25 @@ func ResourceClouddeployDeployPolicy() *schema.Resource {
 			"rules": {
 				Type:        schema.TypeList,
 				Required:    true,
-				Description: `Required. Rules to apply. At least one rule must be present.`,
+				Description: `Rules to apply. At least one rule must be present.`,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"rollout_restriction": {
 							Type:        schema.TypeList,
 							Optional:    true,
-							Description: `Optional. Rollout restrictions.`,
+							Description: `Rollout restrictions.`,
 							MaxItems:    1,
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"id": {
 										Type:        schema.TypeString,
 										Required:    true,
-										Description: `Required. ID of the rule. This id must be unique in the 'DeployPolicy' resource to which this rule belongs. The format is 'a-z{0,62}'.`,
+										Description: `ID of the rule. This id must be unique in the 'DeployPolicy' resource to which this rule belongs. The format is 'a-z{0,62}'.`,
 									},
 									"actions": {
 										Type:        schema.TypeList,
 										Optional:    true,
-										Description: `Optional. Rollout actions to be restricted as part of the policy. If left empty, all actions will be restricted. Possible values: ["ADVANCE", "APPROVE", "CANCEL", "CREATE", "IGNORE_JOB", "RETRY_JOB", "ROLLBACK", "TERMINATE_JOBRUN"]`,
+										Description: `Rollout actions to be restricted as part of the policy. If left empty, all actions will be restricted. Possible values: ["ADVANCE", "APPROVE", "CANCEL", "CREATE", "IGNORE_JOB", "RETRY_JOB", "ROLLBACK", "TERMINATE_JOBRUN"]`,
 										Elem: &schema.Schema{
 											Type:         schema.TypeString,
 											ValidateFunc: verify.ValidateEnum([]string{"ADVANCE", "APPROVE", "CANCEL", "CREATE", "IGNORE_JOB", "RETRY_JOB", "ROLLBACK", "TERMINATE_JOBRUN"}),
@@ -101,7 +101,7 @@ func ResourceClouddeployDeployPolicy() *schema.Resource {
 									"invokers": {
 										Type:        schema.TypeList,
 										Optional:    true,
-										Description: `Optional. What invoked the action. If left empty, all invoker types will be restricted. Possible values: ["USER", "DEPLOY_AUTOMATION"]`,
+										Description: `What invoked the action. If left empty, all invoker types will be restricted. Possible values: ["USER", "DEPLOY_AUTOMATION"]`,
 										Elem: &schema.Schema{
 											Type:         schema.TypeString,
 											ValidateFunc: verify.ValidateEnum([]string{"USER", "DEPLOY_AUTOMATION"}),
@@ -110,25 +110,25 @@ func ResourceClouddeployDeployPolicy() *schema.Resource {
 									"time_windows": {
 										Type:        schema.TypeList,
 										Optional:    true,
-										Description: `Required. Time window within which actions are restricted.`,
+										Description: `Time window within which actions are restricted.`,
 										MaxItems:    1,
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{
 												"time_zone": {
 													Type:        schema.TypeString,
 													Required:    true,
-													Description: `Required. The time zone in IANA format IANA Time Zone Database (e.g. America/New_York).`,
+													Description: `The time zone in IANA format IANA Time Zone Database (e.g. America/New_York).`,
 												},
 												"one_time_windows": {
 													Type:        schema.TypeList,
 													Optional:    true,
-													Description: `Optional. One-time windows within which actions are restricted.`,
+													Description: `One-time windows within which actions are restricted.`,
 													Elem: &schema.Resource{
 														Schema: map[string]*schema.Schema{
 															"end_date": {
 																Type:        schema.TypeList,
 																Required:    true,
-																Description: `Required. End date.`,
+																Description: `End date.`,
 																MaxItems:    1,
 																Elem: &schema.Resource{
 																	Schema: map[string]*schema.Schema{
@@ -153,7 +153,7 @@ func ResourceClouddeployDeployPolicy() *schema.Resource {
 															"end_time": {
 																Type:        schema.TypeList,
 																Required:    true,
-																Description: `Required. End time (exclusive). You may use 24:00 for the end of the day.`,
+																Description: `End time (exclusive). You may use 24:00 for the end of the day.`,
 																MaxItems:    1,
 																Elem: &schema.Resource{
 																	Schema: map[string]*schema.Schema{
@@ -183,7 +183,7 @@ func ResourceClouddeployDeployPolicy() *schema.Resource {
 															"start_date": {
 																Type:        schema.TypeList,
 																Required:    true,
-																Description: `Required. Start date.`,
+																Description: `Start date.`,
 																MaxItems:    1,
 																Elem: &schema.Resource{
 																	Schema: map[string]*schema.Schema{
@@ -208,7 +208,7 @@ func ResourceClouddeployDeployPolicy() *schema.Resource {
 															"start_time": {
 																Type:        schema.TypeList,
 																Required:    true,
-																Description: `Required. Start time (inclusive). Use 00:00 for the beginning of the day.`,
+																Description: `Start time (inclusive). Use 00:00 for the beginning of the day.`,
 																MaxItems:    1,
 																Elem: &schema.Resource{
 																	Schema: map[string]*schema.Schema{
@@ -241,13 +241,13 @@ func ResourceClouddeployDeployPolicy() *schema.Resource {
 												"weekly_windows": {
 													Type:        schema.TypeList,
 													Optional:    true,
-													Description: `Optional. Recurring weekly windows within which actions are restricted.`,
+													Description: `Recurring weekly windows within which actions are restricted.`,
 													Elem: &schema.Resource{
 														Schema: map[string]*schema.Schema{
 															"days_of_week": {
 																Type:        schema.TypeList,
 																Optional:    true,
-																Description: `Optional. Days of week. If left empty, all days of the week will be included. Possible values: ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY", "SUNDAY"]`,
+																Description: `Days of week. If left empty, all days of the week will be included. Possible values: ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY", "SUNDAY"]`,
 																Elem: &schema.Schema{
 																	Type:         schema.TypeString,
 																	ValidateFunc: verify.ValidateEnum([]string{"MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY", "SUNDAY"}),
@@ -256,7 +256,7 @@ func ResourceClouddeployDeployPolicy() *schema.Resource {
 															"end_time": {
 																Type:        schema.TypeList,
 																Optional:    true,
-																Description: `Optional. End time (exclusive). Use 24:00 to indicate midnight. If you specify endTime you must also specify startTime. If left empty, this will block for the entire day for the days specified in daysOfWeek.`,
+																Description: `End time (exclusive). Use 24:00 to indicate midnight. If you specify endTime you must also specify startTime. If left empty, this will block for the entire day for the days specified in daysOfWeek.`,
 																MaxItems:    1,
 																Elem: &schema.Resource{
 																	Schema: map[string]*schema.Schema{
@@ -286,7 +286,7 @@ func ResourceClouddeployDeployPolicy() *schema.Resource {
 															"start_time": {
 																Type:        schema.TypeList,
 																Optional:    true,
-																Description: `Optional. Start time (inclusive). Use 00:00 for the beginning of the day. If you specify startTime you must also specify endTime. If left empty, this will block for the entire day for the days specified in daysOfWeek.`,
+																Description: `Start time (inclusive). Use 00:00 for the beginning of the day. If you specify startTime you must also specify endTime. If left empty, this will block for the entire day for the days specified in daysOfWeek.`,
 																MaxItems:    1,
 																Elem: &schema.Resource{
 																	Schema: map[string]*schema.Schema{
@@ -328,7 +328,7 @@ func ResourceClouddeployDeployPolicy() *schema.Resource {
 			"selectors": {
 				Type:        schema.TypeList,
 				Required:    true,
-				Description: `Required. Selected resources to which the policy will be applied. At least one selector is required. If one selector matches the resource the policy applies. For example, if there are two selectors and the action being attempted matches one of them, the policy will apply to that action.`,
+				Description: `Selected resources to which the policy will be applied. At least one selector is required. If one selector matches the resource the policy applies. For example, if there are two selectors and the action being attempted matches one of them, the policy will apply to that action.`,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"delivery_pipeline": {
@@ -341,7 +341,7 @@ func ResourceClouddeployDeployPolicy() *schema.Resource {
 									"id": {
 										Type:     schema.TypeString,
 										Optional: true,
-										Description: `Optional. ID of the DeliveryPipeline. The value of this field could be one of the following:
+										Description: `ID of the DeliveryPipeline. The value of this field could be one of the following:
 - The last segment of a pipeline name
 - "*", all delivery pipelines in a location`,
 									},
@@ -383,7 +383,7 @@ func ResourceClouddeployDeployPolicy() *schema.Resource {
 			"annotations": {
 				Type:     schema.TypeMap,
 				Optional: true,
-				Description: `Optional. User annotations. These attributes can only be set and used by the user, and not by Cloud Deploy. Annotations must meet the following constraints: * Annotations are key/value pairs. * Valid annotation keys have two segments: an optional prefix and name, separated by a slash ('/'). * The name segment is required and must be 63 characters or less, beginning and ending with an alphanumeric character ('[a-z0-9A-Z]') with dashes ('-'), underscores ('_'), dots ('.'), and alphanumerics between. * The prefix is optional. If specified, the prefix must be a DNS subdomain: a series of DNS labels separated by dots('.'), not longer than 253 characters in total, followed by a slash ('/'). See https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/#syntax-and-character-set for more details.
+				Description: `User annotations. These attributes can only be set and used by the user, and not by Cloud Deploy. Annotations must meet the following constraints: * Annotations are key/value pairs. * Valid annotation keys have two segments: an optional prefix and name, separated by a slash ('/'). * The name segment is required and must be 63 characters or less, beginning and ending with an alphanumeric character ('[a-z0-9A-Z]') with dashes ('-'), underscores ('_'), dots ('.'), and alphanumerics between. * The prefix is optional. If specified, the prefix must be a DNS subdomain: a series of DNS labels separated by dots('.'), not longer than 253 characters in total, followed by a slash ('/'). See https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/#syntax-and-character-set for more details.
 
 **Note**: This field is non-authoritative, and will only manage the annotations present in your configuration.
 Please refer to the field 'effective_annotations' for all of the annotations present on the resource.`,
@@ -392,12 +392,12 @@ Please refer to the field 'effective_annotations' for all of the annotations pre
 			"description": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Description: `Optional. Description of the 'DeployPolicy'. Max length is 255 characters.`,
+				Description: `Description of the 'DeployPolicy'. Max length is 255 characters.`,
 			},
 			"labels": {
 				Type:     schema.TypeMap,
 				Optional: true,
-				Description: `Optional. Labels are attributes that can be set and used by both the user and by Cloud Deploy. Labels must meet the following constraints: * Keys and values can contain only lowercase letters, numeric characters, underscores, and dashes. * All characters must use UTF-8 encoding, and international characters are allowed. * Keys must start with a lowercase letter or international character. * Each resource is limited to a maximum of 64 labels. Both keys and values are additionally constrained to be <= 63 characters.
+				Description: `Labels are attributes that can be set and used by both the user and by Cloud Deploy. Labels must meet the following constraints: * Keys and values can contain only lowercase letters, numeric characters, underscores, and dashes. * All characters must use UTF-8 encoding, and international characters are allowed. * Keys must start with a lowercase letter or international character. * Each resource is limited to a maximum of 64 labels. Both keys and values are additionally constrained to be <= 63 characters.
 
 **Note**: This field is non-authoritative, and will only manage the labels present in your configuration.
 Please refer to the field 'effective_labels' for all of the labels present on the resource.`,
@@ -406,7 +406,7 @@ Please refer to the field 'effective_labels' for all of the labels present on th
 			"suspended": {
 				Type:        schema.TypeBool,
 				Optional:    true,
-				Description: `Optional. When suspended, the policy will not prevent actions from occurring, even if the action violates the policy.`,
+				Description: `When suspended, the policy will not prevent actions from occurring, even if the action violates the policy.`,
 			},
 			"create_time": {
 				Type:        schema.TypeString,
@@ -428,7 +428,7 @@ Please refer to the field 'effective_labels' for all of the labels present on th
 			"etag": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: `Optional. The weak etag of the 'DeployPolicy' resource. This checksum is computed by the server based on the value of other fields, and may be sent on update and delete requests to ensure the client has an up-to-date value before proceeding.`,
+				Description: `The weak etag of the 'DeployPolicy' resource. This checksum is computed by the server based on the value of other fields, and may be sent on update and delete requests to ensure the client has an up-to-date value before proceeding.`,
 			},
 			"terraform_labels": {
 				Type:     schema.TypeMap,
@@ -1199,9 +1199,6 @@ func flattenClouddeployDeployPolicyRulesRolloutRestrictionTimeWindowsOneTimeWind
 		return nil
 	}
 	original := v.(map[string]interface{})
-	if len(original) == 0 {
-		return nil
-	}
 	transformed := make(map[string]interface{})
 	transformed["hours"] =
 		flattenClouddeployDeployPolicyRulesRolloutRestrictionTimeWindowsOneTimeWindowsStartTimeHours(original["hours"], d, config)
@@ -1397,9 +1394,6 @@ func flattenClouddeployDeployPolicyRulesRolloutRestrictionTimeWindowsWeeklyWindo
 		return nil
 	}
 	original := v.(map[string]interface{})
-	if len(original) == 0 {
-		return nil
-	}
 	transformed := make(map[string]interface{})
 	transformed["hours"] =
 		flattenClouddeployDeployPolicyRulesRolloutRestrictionTimeWindowsWeeklyWindowsStartTimeHours(original["hours"], d, config)
@@ -1846,7 +1840,7 @@ func expandClouddeployDeployPolicyRulesRolloutRestrictionTimeWindowsOneTimeWindo
 		transformedStartTime, err := expandClouddeployDeployPolicyRulesRolloutRestrictionTimeWindowsOneTimeWindowsStartTime(original["start_time"], d, config)
 		if err != nil {
 			return nil, err
-		} else if val := reflect.ValueOf(transformedStartTime); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		} else {
 			transformed["startTime"] = transformedStartTime
 		}
 
@@ -1954,9 +1948,14 @@ func expandClouddeployDeployPolicyRulesRolloutRestrictionTimeWindowsOneTimeWindo
 
 func expandClouddeployDeployPolicyRulesRolloutRestrictionTimeWindowsOneTimeWindowsStartTime(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	l := v.([]interface{})
-	if len(l) == 0 || l[0] == nil {
+	if len(l) == 0 {
 		return nil, nil
 	}
+
+	if l[0] == nil {
+		transformed := make(map[string]interface{})
+		return transformed, nil
+	}
 	raw := l[0]
 	original := raw.(map[string]interface{})
 	transformed := make(map[string]interface{})
@@ -2084,7 +2083,7 @@ func expandClouddeployDeployPolicyRulesRolloutRestrictionTimeWindowsWeeklyWindow
 		transformedStartTime, err := expandClouddeployDeployPolicyRulesRolloutRestrictionTimeWindowsWeeklyWindowsStartTime(original["start_time"], d, config)
 		if err != nil {
 			return nil, err
-		} else if val := reflect.ValueOf(transformedStartTime); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		} else {
 			transformed["startTime"] = transformedStartTime
 		}
 
@@ -2106,9 +2105,14 @@ func expandClouddeployDeployPolicyRulesRolloutRestrictionTimeWindowsWeeklyWindow
 
 func expandClouddeployDeployPolicyRulesRolloutRestrictionTimeWindowsWeeklyWindowsStartTime(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	l := v.([]interface{})
-	if len(l) == 0 || l[0] == nil {
+	if len(l) == 0 {
 		return nil, nil
 	}
+
+	if l[0] == nil {
+		transformed := make(map[string]interface{})
+		return transformed, nil
+	}
 	raw := l[0]
 	original := raw.(map[string]interface{})
 	transformed := make(map[string]interface{})

google/services/clouddeploy/resource_clouddeploy_deploy_policy_generated_test.go

@@ -72,11 +72,11 @@ resource "google_clouddeploy_deploy_policy" "b-deploy-policy" {
         time_zone = "America/Los_Angeles"
         weekly_windows {
             start_time {
-                hours = "12"
-                minutes = "00"
+                hours = 0
+                minutes = 0
             }
             end_time {
-                hours = "13"
+                hours = "24"
                 minutes = "00"
             }
         }
@@ -150,16 +150,12 @@ resource "google_clouddeploy_deploy_policy" "f-deploy-policy" {
         time_zone = "America/Los_Angeles"
         weekly_windows {
             start_time {
-                hours = "12"
-                minutes = "00"
-                seconds = "00"
-                nanos = "00"
+                hours = 0
+                minutes = 0
             }
             end_time {
                 hours = "13"
                 minutes = "00"
-                seconds = "00"
-                nanos = "00"
             }
         }
       }
@@ -176,8 +172,6 @@ resource "google_clouddeploy_deploy_policy" "f-deploy-policy" {
             start_time {
                 hours = "13"
                 minutes = "00"
-                seconds = "00"
-                nanos = "00"
             }
             end_time {
                 hours = "14"
@@ -190,16 +184,12 @@ resource "google_clouddeploy_deploy_policy" "f-deploy-policy" {
 
         one_time_windows {
         start_time {
-            hours = "15"
+            hours = "00"
             minutes = "00"
-            seconds = "00"
-            nanos = "00"
         }
         end_time {
             hours = "16"
             minutes = "00"
-            seconds = "00"
-            nanos = "00"
         }
         start_date {
             year = "2019"