Skip to content

Commit 8729122

Browse files
author
Jay Kumar
committed
fix(registry/coder/modules/coder-utils): return empty string instead of null for unused outputs
1 parent fadaee8 commit 8729122

2 files changed

Lines changed: 27 additions & 27 deletions

File tree

registry/coder/modules/coder-utils/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,20 +197,20 @@ resource "coder_script" "start_script" {
197197

198198
output "pre_install_script_name" {
199199
description = "The name of the pre-install script for sync."
200-
value = var.pre_install_script != null ? local.pre_install_script_name : null
200+
value = var.pre_install_script != null ? local.pre_install_script_name : ""
201201
}
202202

203203
output "install_script_name" {
204204
description = "The name of the install script for sync."
205-
value = var.install_script != null ? local.install_script_name : null
205+
value = var.install_script != null ? local.install_script_name : ""
206206
}
207207

208208
output "post_install_script_name" {
209209
description = "The name of the post-install script for sync."
210-
value = var.post_install_script != null ? local.post_install_script_name : null
210+
value = var.post_install_script != null ? local.post_install_script_name : ""
211211
}
212212

213213
output "start_script_name" {
214214
description = "The name of the start script for sync."
215-
value = var.start_script != null ? local.start_script_name : null
215+
value = var.start_script != null ? local.start_script_name : ""
216216
}

registry/coder/modules/coder-utils/main.tftest.hcl

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ run "test_without_optional_pre_post_scripts" {
167167

168168
# Verify outputs are null for unprovided scripts
169169
assert {
170-
condition = output.pre_install_script_name == null
171-
error_message = "Pre-install script name output should be null when script is not provided"
170+
condition = output.pre_install_script_name == ""
171+
error_message = "Pre-install script name output should be empty when script is not provided"
172172
}
173173

174174
assert {
@@ -177,8 +177,8 @@ run "test_without_optional_pre_post_scripts" {
177177
}
178178

179179
assert {
180-
condition = output.post_install_script_name == null
181-
error_message = "Post-install script name output should be null when script is not provided"
180+
condition = output.post_install_script_name == ""
181+
error_message = "Post-install script name output should be empty when script is not provided"
182182
}
183183

184184
assert {
@@ -218,25 +218,25 @@ run "test_no_scripts" {
218218
error_message = "Start script should not be created when not provided"
219219
}
220220

221-
# Verify all outputs are null
221+
# Verify all outputs are empty strings
222222
assert {
223-
condition = output.pre_install_script_name == null
224-
error_message = "Pre-install script name output should be null"
223+
condition = output.pre_install_script_name == ""
224+
error_message = "Pre-install script name output should be empty"
225225
}
226226

227227
assert {
228-
condition = output.install_script_name == null
229-
error_message = "Install script name output should be null"
228+
condition = output.install_script_name == ""
229+
error_message = "Install script name output should be empty"
230230
}
231231

232232
assert {
233-
condition = output.post_install_script_name == null
234-
error_message = "Post-install script name output should be null"
233+
condition = output.post_install_script_name == ""
234+
error_message = "Post-install script name output should be empty"
235235
}
236236

237237
assert {
238-
condition = output.start_script_name == null
239-
error_message = "Start script name output should be null"
238+
condition = output.start_script_name == ""
239+
error_message = "Start script name output should be empty"
240240
}
241241
}
242242

@@ -267,8 +267,8 @@ run "test_start_only" {
267267
}
268268

269269
assert {
270-
condition = output.install_script_name == null
271-
error_message = "Install script name output should be null"
270+
condition = output.install_script_name == ""
271+
error_message = "Install script name output should be empty"
272272
}
273273

274274
assert {
@@ -304,8 +304,8 @@ run "test_install_only" {
304304
}
305305

306306
assert {
307-
condition = output.start_script_name == null
308-
error_message = "Start script name output should be null"
307+
condition = output.start_script_name == ""
308+
error_message = "Start script name output should be empty"
309309
}
310310
}
311311

@@ -392,8 +392,8 @@ run "test_script_naming" {
392392

393393
# Verify outputs use custom agent_name
394394
assert {
395-
condition = output.pre_install_script_name == null
396-
error_message = "Pre-install script name output should be null when not provided"
395+
condition = output.pre_install_script_name == ""
396+
error_message = "Pre-install script name output should be empty when not provided"
397397
}
398398

399399
assert {
@@ -402,8 +402,8 @@ run "test_script_naming" {
402402
}
403403

404404
assert {
405-
condition = output.post_install_script_name == null
406-
error_message = "Post-install script name output should be null when not provided"
405+
condition = output.post_install_script_name == ""
406+
error_message = "Post-install script name output should be empty when not provided"
407407
}
408408

409409
assert {
@@ -463,7 +463,7 @@ run "test_post_install_without_install" {
463463
}
464464

465465
assert {
466-
condition = output.install_script_name == null
467-
error_message = "Install script name output should be null"
466+
condition = output.install_script_name == ""
467+
error_message = "Install script name output should be empty"
468468
}
469469
}

0 commit comments

Comments
 (0)