From fd210dfd3076187e875a882d7bd3a13f9dff76c8 Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Thu, 2 Feb 2017 19:45:13 -0800 Subject: [PATCH] ref(hapi): remove never used proto field --- _proto/hapi/release/status.proto | 3 +- cmd/helm/status.go | 3 -- pkg/proto/hapi/release/status.pb.go | 47 ++++++++++++----------------- 3 files changed, 21 insertions(+), 32 deletions(-) diff --git a/_proto/hapi/release/status.proto b/_proto/hapi/release/status.proto index 84a744991..6bfebe832 100644 --- a/_proto/hapi/release/status.proto +++ b/_proto/hapi/release/status.proto @@ -39,7 +39,8 @@ message Status { Code code = 1; - google.protobuf.Any details = 2; + // Deprecated + // google.protobuf.Any details = 2; // Cluster resources as kubectl would print them. string resources = 3; diff --git a/cmd/helm/status.go b/cmd/helm/status.go index 400429625..4e57b8768 100644 --- a/cmd/helm/status.go +++ b/cmd/helm/status.go @@ -92,9 +92,6 @@ func PrintStatus(out io.Writer, res *services.GetReleaseStatusResponse) { } fmt.Fprintf(out, "NAMESPACE: %s\n", res.Namespace) fmt.Fprintf(out, "STATUS: %s\n", res.Info.Status.Code) - if res.Info.Status.Details != nil { - fmt.Fprintf(out, "Details: %s\n", res.Info.Status.Details) - } fmt.Fprintf(out, "\n") if len(res.Info.Status.Resources) > 0 { re := regexp.MustCompile(" +") diff --git a/pkg/proto/hapi/release/status.pb.go b/pkg/proto/hapi/release/status.pb.go index 7a919cdc0..1a8e137f4 100644 --- a/pkg/proto/hapi/release/status.pb.go +++ b/pkg/proto/hapi/release/status.pb.go @@ -7,7 +7,7 @@ package release import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import google_protobuf1 "github.com/golang/protobuf/ptypes/any" +import _ "github.com/golang/protobuf/ptypes/any" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -55,8 +55,7 @@ func (Status_Code) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, [] // Status defines the status of a release. type Status struct { - Code Status_Code `protobuf:"varint,1,opt,name=code,enum=hapi.release.Status_Code" json:"code,omitempty"` - Details *google_protobuf1.Any `protobuf:"bytes,2,opt,name=details" json:"details,omitempty"` + Code Status_Code `protobuf:"varint,1,opt,name=code,enum=hapi.release.Status_Code" json:"code,omitempty"` // Cluster resources as kubectl would print them. Resources string `protobuf:"bytes,3,opt,name=resources" json:"resources,omitempty"` // Contains the rendered templates/NOTES.txt if available @@ -68,13 +67,6 @@ func (m *Status) String() string { return proto.CompactTextString(m) func (*Status) ProtoMessage() {} func (*Status) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} } -func (m *Status) GetDetails() *google_protobuf1.Any { - if m != nil { - return m.Details - } - return nil -} - func init() { proto.RegisterType((*Status)(nil), "hapi.release.Status") proto.RegisterEnum("hapi.release.Status_Code", Status_Code_name, Status_Code_value) @@ -83,22 +75,21 @@ func init() { func init() { proto.RegisterFile("hapi/release/status.proto", fileDescriptor3) } var fileDescriptor3 = []byte{ - // 269 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x4c, 0x8f, 0x4d, 0x6f, 0x82, 0x40, - 0x10, 0x86, 0xbb, 0x8a, 0x50, 0x46, 0x63, 0x36, 0x1b, 0x0f, 0xd0, 0xf4, 0x40, 0x3c, 0x71, 0xe9, - 0x92, 0xd8, 0x5f, 0x60, 0xbb, 0xdb, 0xc6, 0x94, 0xa0, 0x01, 0x4d, 0x3f, 0x6e, 0x28, 0x53, 0x6b, - 0x42, 0x58, 0xc3, 0xc2, 0xc1, 0x1f, 0xde, 0x7b, 0x03, 0x68, 0xea, 0x71, 0xf7, 0x79, 0xde, 0x79, - 0x67, 0xc0, 0xfd, 0x49, 0x8f, 0x87, 0xa0, 0xc4, 0x1c, 0x53, 0x8d, 0x81, 0xae, 0xd2, 0xaa, 0xd6, - 0xfc, 0x58, 0xaa, 0x4a, 0xb1, 0x51, 0x83, 0xf8, 0x19, 0xdd, 0xb9, 0x7b, 0xa5, 0xf6, 0x39, 0x06, - 0x2d, 0xdb, 0xd6, 0xdf, 0x41, 0x5a, 0x9c, 0x3a, 0x71, 0xfa, 0x4b, 0xc0, 0x4c, 0xda, 0x24, 0x7b, - 0x00, 0x63, 0xa7, 0x32, 0x74, 0x88, 0x47, 0xfc, 0xf1, 0xcc, 0xe5, 0xd7, 0x23, 0x78, 0xe7, 0xf0, - 0x67, 0x95, 0x61, 0xdc, 0x6a, 0x8c, 0x83, 0x95, 0x61, 0x95, 0x1e, 0x72, 0xed, 0xf4, 0x3c, 0xe2, - 0x0f, 0x67, 0x13, 0xde, 0xd5, 0xf0, 0x4b, 0x0d, 0x9f, 0x17, 0xa7, 0xf8, 0x22, 0xb1, 0x7b, 0xb0, - 0x4b, 0xd4, 0xaa, 0x2e, 0x77, 0xa8, 0x9d, 0xbe, 0x47, 0x7c, 0x3b, 0xfe, 0xff, 0x60, 0x13, 0x18, - 0x14, 0xaa, 0x42, 0xed, 0x18, 0x2d, 0xe9, 0x1e, 0xd3, 0x0f, 0x30, 0x9a, 0x46, 0x36, 0x04, 0x6b, - 0x13, 0xbd, 0x45, 0xcb, 0xf7, 0x88, 0xde, 0xb0, 0x11, 0xdc, 0x0a, 0xb9, 0x0a, 0x97, 0x9f, 0x52, - 0x50, 0xd2, 0x20, 0x21, 0x43, 0xb9, 0x96, 0x82, 0xf6, 0xd8, 0x18, 0x20, 0xd9, 0xac, 0x64, 0x9c, - 0x48, 0x21, 0x05, 0xed, 0x33, 0x00, 0xf3, 0x65, 0xbe, 0x08, 0xa5, 0xa0, 0x46, 0x17, 0x0b, 0xe5, - 0x7a, 0x11, 0xbd, 0xd2, 0xc1, 0x93, 0xfd, 0x65, 0x9d, 0x4f, 0xdb, 0x9a, 0xed, 0xbe, 0x8f, 0x7f, - 0x01, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x7b, 0x5f, 0x3b, 0x4f, 0x01, 0x00, 0x00, + // 244 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x4c, 0x8f, 0xcf, 0x4a, 0xc3, 0x40, + 0x10, 0xc6, 0x5d, 0x9b, 0xa6, 0x66, 0x2c, 0x65, 0x59, 0x3c, 0x24, 0xe2, 0xa1, 0xf4, 0xd4, 0x8b, + 0x1b, 0xd0, 0x27, 0x50, 0x77, 0x94, 0x62, 0x48, 0x4b, 0xd2, 0xe2, 0x9f, 0x5b, 0xda, 0x8e, 0x55, + 0x28, 0x9d, 0x92, 0x4d, 0x0e, 0x3e, 0xa0, 0xef, 0x25, 0xd9, 0x04, 0xf4, 0x38, 0xf3, 0xfb, 0x7d, + 0x1f, 0x33, 0x10, 0x7d, 0x16, 0xc7, 0xaf, 0xb8, 0xa4, 0x3d, 0x15, 0x96, 0x62, 0x5b, 0x15, 0x55, + 0x6d, 0xf5, 0xb1, 0xe4, 0x8a, 0xd5, 0xb0, 0x41, 0xba, 0x43, 0x97, 0xd1, 0x8e, 0x79, 0xb7, 0xa7, + 0xd8, 0xb1, 0x75, 0xfd, 0x11, 0x17, 0x87, 0xef, 0x56, 0x9c, 0xfc, 0x08, 0xf0, 0x73, 0x97, 0x54, + 0xd7, 0xe0, 0x6d, 0x78, 0x4b, 0xa1, 0x18, 0x8b, 0xe9, 0xe8, 0x26, 0xd2, 0xff, 0x2b, 0x74, 0xeb, + 0xe8, 0x07, 0xde, 0x52, 0xe6, 0x34, 0x75, 0x05, 0x41, 0x49, 0x96, 0xeb, 0x72, 0x43, 0x36, 0xec, + 0x8d, 0xc5, 0x34, 0xc8, 0xfe, 0x16, 0xea, 0x02, 0xfa, 0x07, 0xae, 0xc8, 0x86, 0x9e, 0x23, 0xed, + 0x30, 0x79, 0x05, 0xaf, 0x69, 0x50, 0xe7, 0x30, 0x58, 0xa5, 0xcf, 0xe9, 0xfc, 0x25, 0x95, 0x27, + 0x6a, 0x08, 0x67, 0x06, 0x17, 0xc9, 0xfc, 0x0d, 0x8d, 0x14, 0x0d, 0x32, 0x98, 0xe0, 0x12, 0x8d, + 0x3c, 0x55, 0x23, 0x80, 0x7c, 0xb5, 0xc0, 0x2c, 0x47, 0x83, 0x46, 0xf6, 0x14, 0x80, 0xff, 0x78, + 0x37, 0x4b, 0xd0, 0x48, 0xaf, 0x8d, 0x25, 0xb8, 0x9c, 0xa5, 0x4f, 0xb2, 0x7f, 0x1f, 0xbc, 0x0f, + 0xba, 0x53, 0xd7, 0xbe, 0xfb, 0xec, 0xf6, 0x37, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xab, 0xfe, 0xbf, + 0x1f, 0x01, 0x00, 0x00, }