diff: Fix crash when remote object doesn't exist

Since we're saving nil in an interface rather than the implementation, we can't compare to nil to check if the remote object exists or not. Change the struct to save in the implementation.

diff: Fix crash when remote object doesn't exist
a3417fe6 · Antoine Pelisse · 0e31372b · a3417fe6 · a3417fe6
Commit a3417fe6 authored Aug 22, 2018 by Antoine Pelisse
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

diff.go pkg/kubectl/cmd/diff.go +1 -1

diff.sh test/cmd/diff.sh +4 -0

No files found.
--- a/pkg/kubectl/cmd/diff.go
+++ b/pkg/kubectl/cmd/diff.go
@@ -265,7 +265,7 @@ type Object interface {
 // InfoObject is an implementation of the Object interface. It gets all
 // the information from the Info object.
 type InfoObject struct {
-	Remote  runtime.Unstructured
+	Remote  *unstructured.Unstructured
 	Info    *resource.Info
 	Encoder runtime.Encoder
 	Parser  *parse.Factory

--- a/test/cmd/diff.sh
+++ b/test/cmd/diff.sh
@@ -26,6 +26,10 @@ run_kubectl_diff_tests() {
    create_and_use_new_namespace
    kube::log::status "Testing kubectl alpha diff"

+    # Test that it works when the live object doesn't exist
+    output_message=$(kubectl alpha diff LOCAL LIVE -f hack/testdata/pod.yaml)
+    kube::test::if_has_string "${output_message}" 'test-pod'
+
    kubectl apply -f hack/testdata/pod.yaml

    # Ensure that selfLink has been added, and shown in the diff