From 056536ff83d42716ae928a8d8228e934d95fde53 Mon Sep 17 00:00:00 2001 From: Hongchao Deng Date: Thu, 5 Nov 2015 13:26:03 -0800 Subject: [PATCH] component status: nil error should return empty string If error is nil, it should return empty string instead of \"nil\". JSON marshalling will omit empty error in such case. --- pkg/kubectl/cmd/get_test.go | 2 +- pkg/registry/componentstatus/rest.go | 4 +--- pkg/registry/componentstatus/rest_test.go | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/kubectl/cmd/get_test.go b/pkg/kubectl/cmd/get_test.go index 98864021b9e..514d313aff8 100644 --- a/pkg/kubectl/cmd/get_test.go +++ b/pkg/kubectl/cmd/get_test.go @@ -88,7 +88,7 @@ func testData() (*api.PodList, *api.ServiceList, *api.ReplicationControllerList) func testComponentStatusData() *api.ComponentStatusList { good := api.ComponentStatus{ Conditions: []api.ComponentCondition{ - {Type: api.ComponentHealthy, Status: api.ConditionTrue, Message: "ok", Error: "nil"}, + {Type: api.ComponentHealthy, Status: api.ConditionTrue, Message: "ok"}, }, ObjectMeta: api.ObjectMeta{Name: "servergood"}, } diff --git a/pkg/registry/componentstatus/rest.go b/pkg/registry/componentstatus/rest.go index c4c14f26fce..b8be2a6daed 100644 --- a/pkg/registry/componentstatus/rest.go +++ b/pkg/registry/componentstatus/rest.go @@ -85,11 +85,9 @@ func ToConditionStatus(s probe.Result) api.ConditionStatus { func (rs *REST) getComponentStatus(name string, server apiserver.Server) *api.ComponentStatus { transport := rs.rt status, msg, err := server.DoServerCheck(transport) - var errorMsg string + errorMsg := "" if err != nil { errorMsg = err.Error() - } else { - errorMsg = "nil" } c := &api.ComponentCondition{ diff --git a/pkg/registry/componentstatus/rest_test.go b/pkg/registry/componentstatus/rest_test.go index abe0c3f89da..09dda6df256 100644 --- a/pkg/registry/componentstatus/rest_test.go +++ b/pkg/registry/componentstatus/rest_test.go @@ -81,7 +81,7 @@ func TestList_NoError(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } expect := &api.ComponentStatusList{ - Items: []api.ComponentStatus{*(createTestStatus("test1", api.ConditionTrue, "ok", "nil"))}, + Items: []api.ComponentStatus{*(createTestStatus("test1", api.ConditionTrue, "ok", ""))}, } if e, a := expect, got; !reflect.DeepEqual(e, a) { t.Errorf("Got unexpected object. Diff: %s", util.ObjectDiff(e, a)) @@ -124,7 +124,7 @@ func TestGet_NoError(t *testing.T) { if err != nil { t.Fatalf("Unexpected error: %v", err) } - expect := createTestStatus("test1", api.ConditionTrue, "ok", "nil") + expect := createTestStatus("test1", api.ConditionTrue, "ok", "") if e, a := expect, got; !reflect.DeepEqual(e, a) { t.Errorf("Got unexpected object. Diff: %s", util.ObjectDiff(e, a)) }