Skip to content

Commit 2839d0e

Browse files
Allows empty value and sets default value for maxRetries of cloud run job (#7425) (#14223)
* send empty value * add client side default * remove defaul_from_api Signed-off-by: Modular Magician <[email protected]>
1 parent 7689179 commit 2839d0e

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

.changelog/7425.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
```release-note:breaking-change
2+
cloudrunv2: set a default value of 3 for `max_retries` in `google_cloud_run_v2_job`. This should match the API's existing default, but may show a diff at plan time
3+
```
4+
```release-note:bug
5+
cloudrunv2: fixed the bug where setting `max_retries` to 0 in `google_cloud_run_v2_job` was not respected.
6+
```

google/resource_cloud_run_v2_job.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -400,9 +400,9 @@ This field is not supported in Cloud Run Job currently.`,
400400
},
401401
"max_retries": {
402402
Type: schema.TypeInt,
403-
Computed: true,
404403
Optional: true,
405404
Description: `Number of retries allowed per Task, before marking this Task failed.`,
405+
Default: 3,
406406
},
407407
"service_account": {
408408
Type: schema.TypeString,
@@ -2278,7 +2278,7 @@ func expandCloudRunV2JobTemplateTemplate(v interface{}, d TerraformResourceData,
22782278
transformedMaxRetries, err := expandCloudRunV2JobTemplateTemplateMaxRetries(original["max_retries"], d, config)
22792279
if err != nil {
22802280
return nil, err
2281-
} else if val := reflect.ValueOf(transformedMaxRetries); val.IsValid() && !isEmptyValue(val) {
2281+
} else {
22822282
transformed["maxRetries"] = transformedMaxRetries
22832283
}
22842284

google/resource_cloud_run_v2_job_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ resource "google_cloud_run_v2_job" "default" {
157157
connector = google_vpc_access_connector.connector.id
158158
egress = "ALL_TRAFFIC"
159159
}
160-
max_retries = 2
160+
max_retries = 0
161161
}
162162
}
163163

0 commit comments

Comments
 (0)