Skip to content

Commit d44dfac

Browse files
committed
chore(jobs): add support for consistency errors
1 parent d888258 commit d44dfac

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

internal/services/jobs/jobs.go

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ func ResourceDefinition() *schema.Resource {
126126
"secret_reference_id": {
127127
Type: schema.TypeString,
128128
Computed: true,
129+
Optional: true,
129130
Description: "The secret reference UUID",
130131
},
131132
"secret_version": {
@@ -150,6 +151,8 @@ func ResourceDefinition() *schema.Resource {
150151
},
151152
},
152153
},
154+
EnableLegacyTypeSystemPlanErrors: true,
155+
EnableLegacyTypeSystemApplyErrors: true,
153156
}
154157
}
155158

@@ -234,14 +237,22 @@ func ResourceJobDefinitionRead(ctx context.Context, d *schema.ResourceData, m an
234237
_ = d.Set("cpu_limit", int(definition.CPULimit))
235238
_ = d.Set("memory_limit", int(definition.MemoryLimit))
236239
_ = d.Set("image_uri", definition.ImageURI)
237-
_ = d.Set("command", definition.Command)
238-
_ = d.Set("env", types.FlattenMap(definition.EnvironmentVariables))
239-
_ = d.Set("description", definition.Description)
240+
if _, ok := d.GetOk("command"); ok {
241+
d.Set("command", definition.Command)
242+
}
243+
if _, ok := d.GetOk("env"); ok {
244+
_ = d.Set("env", types.FlattenMap(definition.EnvironmentVariables))
245+
}
246+
if _, ok := d.GetOk("description"); ok {
247+
_ = d.Set("description", definition.Description)
248+
}
240249
_ = d.Set("timeout", definition.JobTimeout.ToTimeDuration().String())
241250
_ = d.Set("cron", flattenJobDefinitionCron(definition.CronSchedule))
242251
_ = d.Set("region", definition.Region)
243252
_ = d.Set("project_id", definition.ProjectID)
244-
_ = d.Set("secret_reference", flattenJobDefinitionSecret(rawSecretRefs.Secrets))
253+
if _, ok := d.GetOk("secret_reference"); ok {
254+
_ = d.Set("secret_reference", flattenJobDefinitionSecret(rawSecretRefs.Secrets))
255+
}
245256

246257
return nil
247258
}

internal/services/jobs/jobs_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestAccJobDefinition_Timeout(t *testing.T) {
6161
cpu_limit = 120
6262
memory_limit = 256
6363
image_uri = "docker.io/alpine:latest"
64-
timeout = "20m"
64+
timeout = "20m0s"
6565
}
6666
`,
6767
Check: resource.ComposeTestCheckFunc(
@@ -78,7 +78,7 @@ func TestAccJobDefinition_Timeout(t *testing.T) {
7878
cpu_limit = 120
7979
memory_limit = 256
8080
image_uri = "docker.io/alpine:latest"
81-
timeout = "1h30m"
81+
timeout = "1h30m0s"
8282
}
8383
`,
8484
Check: resource.ComposeTestCheckFunc(

0 commit comments

Comments
 (0)