From e92a42b57f9e9833b26940a3373824ee50ac722a Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Mon, 18 May 2015 13:19:43 -0700 Subject: [PATCH] Renaming StatusDetails.ID to Name --- pkg/api/v1/conversion.go | 67 +++++++++++++++++++++++++++++- pkg/api/v1/conversion_generated.go | 64 ---------------------------- pkg/api/v1/types.go | 6 +-- 3 files changed, 69 insertions(+), 68 deletions(-) diff --git a/pkg/api/v1/conversion.go b/pkg/api/v1/conversion.go index 1276ef5d1cb..bd066e7f784 100644 --- a/pkg/api/v1/conversion.go +++ b/pkg/api/v1/conversion.go @@ -18,12 +18,17 @@ package v1 import ( "fmt" + "reflect" "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" ) func addConversionFuncs() { - err := api.Scheme.AddConversionFuncs() + err := api.Scheme.AddConversionFuncs( + convert_api_StatusDetails_To_v1_StatusDetails, + convert_v1_StatusDetails_To_api_StatusDetails, + ) if err != nil { // If one of the conversion functions is malformed, detect it immediately. panic(err) @@ -110,3 +115,63 @@ func addConversionFuncs() { panic(err) } } + +func convert_v1_StatusDetails_To_api_StatusDetails(in *StatusDetails, out *api.StatusDetails, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*StatusDetails))(in) + } + out.ID = in.Name + out.Kind = in.Kind + if in.Causes != nil { + out.Causes = make([]api.StatusCause, len(in.Causes)) + for i := range in.Causes { + if err := convert_v1_StatusCause_To_api_StatusCause(&in.Causes[i], &out.Causes[i], s); err != nil { + return err + } + } + } else { + out.Causes = nil + } + out.RetryAfterSeconds = in.RetryAfterSeconds + return nil +} + +func convert_api_StatusDetails_To_v1_StatusDetails(in *api.StatusDetails, out *StatusDetails, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*api.StatusDetails))(in) + } + out.Name = in.ID + out.Kind = in.Kind + if in.Causes != nil { + out.Causes = make([]StatusCause, len(in.Causes)) + for i := range in.Causes { + if err := convert_api_StatusCause_To_v1_StatusCause(&in.Causes[i], &out.Causes[i], s); err != nil { + return err + } + } + } else { + out.Causes = nil + } + out.RetryAfterSeconds = in.RetryAfterSeconds + return nil +} + +func convert_v1_StatusCause_To_api_StatusCause(in *StatusCause, out *api.StatusCause, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*StatusCause))(in) + } + out.Type = api.CauseType(in.Type) + out.Message = in.Message + out.Field = in.Field + return nil +} + +func convert_api_StatusCause_To_v1_StatusCause(in *api.StatusCause, out *StatusCause, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*api.StatusCause))(in) + } + out.Type = CauseType(in.Type) + out.Message = in.Message + out.Field = in.Field + return nil +} diff --git a/pkg/api/v1/conversion_generated.go b/pkg/api/v1/conversion_generated.go index 7e38d19f2f2..087f0bb8d72 100644 --- a/pkg/api/v1/conversion_generated.go +++ b/pkg/api/v1/conversion_generated.go @@ -4197,66 +4197,6 @@ func convert_api_Status_To_v1_Status(in *api.Status, out *Status, s conversion.S return nil } -func convert_v1_StatusCause_To_api_StatusCause(in *StatusCause, out *api.StatusCause, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*StatusCause))(in) - } - out.Type = api.CauseType(in.Type) - out.Message = in.Message - out.Field = in.Field - return nil -} - -func convert_api_StatusCause_To_v1_StatusCause(in *api.StatusCause, out *StatusCause, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*api.StatusCause))(in) - } - out.Type = CauseType(in.Type) - out.Message = in.Message - out.Field = in.Field - return nil -} - -func convert_v1_StatusDetails_To_api_StatusDetails(in *StatusDetails, out *api.StatusDetails, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*StatusDetails))(in) - } - out.ID = in.ID - out.Kind = in.Kind - if in.Causes != nil { - out.Causes = make([]api.StatusCause, len(in.Causes)) - for i := range in.Causes { - if err := convert_v1_StatusCause_To_api_StatusCause(&in.Causes[i], &out.Causes[i], s); err != nil { - return err - } - } - } else { - out.Causes = nil - } - out.RetryAfterSeconds = in.RetryAfterSeconds - return nil -} - -func convert_api_StatusDetails_To_v1_StatusDetails(in *api.StatusDetails, out *StatusDetails, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*api.StatusDetails))(in) - } - out.ID = in.ID - out.Kind = in.Kind - if in.Causes != nil { - out.Causes = make([]StatusCause, len(in.Causes)) - for i := range in.Causes { - if err := convert_api_StatusCause_To_v1_StatusCause(&in.Causes[i], &out.Causes[i], s); err != nil { - return err - } - } - } else { - out.Causes = nil - } - out.RetryAfterSeconds = in.RetryAfterSeconds - return nil -} - func convert_v1_TCPSocketAction_To_api_TCPSocketAction(in *TCPSocketAction, out *api.TCPSocketAction, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*TCPSocketAction))(in) @@ -4616,8 +4556,6 @@ func init() { convert_api_ServiceSpec_To_v1_ServiceSpec, convert_api_ServiceStatus_To_v1_ServiceStatus, convert_api_Service_To_v1_Service, - convert_api_StatusCause_To_v1_StatusCause, - convert_api_StatusDetails_To_v1_StatusDetails, convert_api_Status_To_v1_Status, convert_api_TCPSocketAction_To_v1_TCPSocketAction, convert_api_TypeMeta_To_v1_TypeMeta, @@ -4727,8 +4665,6 @@ func init() { convert_v1_ServiceSpec_To_api_ServiceSpec, convert_v1_ServiceStatus_To_api_ServiceStatus, convert_v1_Service_To_api_Service, - convert_v1_StatusCause_To_api_StatusCause, - convert_v1_StatusDetails_To_api_StatusDetails, convert_v1_Status_To_api_Status, convert_v1_TCPSocketAction_To_api_TCPSocketAction, convert_v1_TypeMeta_To_api_TypeMeta, diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index b1945feab0f..498c10ada37 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -1415,9 +1415,9 @@ type Status struct { // and should assume that any attribute may be empty, invalid, or under // defined. type StatusDetails struct { - // The ID attribute of the resource associated with the status StatusReason - // (when there is a single ID which can be described). - ID string `json:"id,omitempty" description:"the ID attribute of the resource associated with the status StatusReason (when there is a single ID which can be described)"` + // The name attribute of the resource associated with the status StatusReason + // (when there is a single name which can be described). + Name string `json:"name,omitempty" description:"the name attribute of the resource associated with the status StatusReason (when there is a single name which can be described)"` // The kind attribute of the resource associated with the status StatusReason. // On some operations may differ from the requested resource Kind. Kind string `json:"kind,omitempty" description:"the kind attribute of the resource associated with the status StatusReason; on some operations may differ from the requested resource Kind"`