Skip to content

Commit 2c7ad38

Browse files
test fix
1 parent 7fd0e3f commit 2c7ad38

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

lib/krane/deploy_task.rb

+5-3
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ def validate_resources(resources)
305305
end
306306
raise FatalDeploymentError
307307
end
308-
rescue FatalDeploymentError
308+
rescue FatalDeploymentError => err
309309
raise FatalDeploymentError, "Template validation failed"
310310
end
311311
measure_method(:validate_resources)
@@ -317,9 +317,11 @@ def validate_globals(resources)
317317
end
318318
global_names = FormattedLogger.indent_four(global_names.join("\n"))
319319

320+
message = "This command is namespaced and cannot be used to deploy global resources. "\
321+
"Use GlobalDeployTask instead."
322+
@logger.summary.add_paragraph(ColorizedString.new(message).yellow)
320323
@logger.summary.add_paragraph(ColorizedString.new("Global resources:\n#{global_names}").yellow)
321-
raise FatalDeploymentError, "This command is namespaced and cannot be used to deploy global resources. "\
322-
"Use GlobalDeployTask instead."
324+
raise FatalDeploymentError
323325
end
324326

325327
def validate_dry_run(resources)

test/integration/krane_deploy_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ def test_output_when_switching_labels_incorrectly
789789
assert_deploy_failure(result)
790790

791791
assert_logs_match_all([
792-
"Command failed: apply -f",
792+
"Template validation failed",
793793
/The Deployment "web" is invalid.*`selector` does not match template `labels`/,
794794
], in_order: true)
795795
end

0 commit comments

Comments
 (0)