diff --git a/pkg/apiclient/events/events.pb.go b/pkg/apiclient/events/events.pb.go index e3ba9854ffd2f..71ea24084b18b 100644 --- a/pkg/apiclient/events/events.pb.go +++ b/pkg/apiclient/events/events.pb.go @@ -163,10 +163,11 @@ type EventPayload struct { // The object source information Source *ObjectSource `protobuf:"bytes,3,req,name=source" json:"source,omitempty"` // The errors of this object - Errors []*ObjectError `protobuf:"bytes,4,rep,name=errors" json:"errors,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Errors []*ObjectError `protobuf:"bytes,4,rep,name=errors" json:"errors,omitempty"` + AppVersions *ApplicationVersions `protobuf:"bytes,24,opt,name=appVersions" json:"appVersions,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *EventPayload) Reset() { *m = EventPayload{} } @@ -230,36 +231,42 @@ func (m *EventPayload) GetErrors() []*ObjectError { return nil } +func (m *EventPayload) GetAppVersions() *ApplicationVersions { + if m != nil { + return m.AppVersions + } + return nil +} + // * // Holds information about the object source type ObjectSource struct { - DesiredManifest string `protobuf:"bytes,1,opt,name=desiredManifest" json:"desiredManifest"` - ActualManifest string `protobuf:"bytes,2,opt,name=actualManifest" json:"actualManifest"` - GitManifest string `protobuf:"bytes,3,opt,name=gitManifest" json:"gitManifest"` - RepoURL string `protobuf:"bytes,4,opt,name=repoURL" json:"repoURL"` - Path string `protobuf:"bytes,5,opt,name=path" json:"path"` - Revision string `protobuf:"bytes,6,opt,name=revision" json:"revision"` - CommitMessage string `protobuf:"bytes,7,opt,name=commitMessage" json:"commitMessage"` - CommitAuthor string `protobuf:"bytes,8,opt,name=commitAuthor" json:"commitAuthor"` - CommitDate *v1.Time `protobuf:"bytes,9,opt,name=commitDate" json:"commitDate,omitempty"` - AppName string `protobuf:"bytes,10,opt,name=appName" json:"appName"` - AppLabels map[string]string `protobuf:"bytes,11,rep,name=appLabels" json:"appLabels" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - SyncStatus string `protobuf:"bytes,12,opt,name=syncStatus" json:"syncStatus"` - SyncStartedAt v1.Time `protobuf:"bytes,13,opt,name=syncStartedAt" json:"syncStartedAt"` - SyncFinishedAt *v1.Time `protobuf:"bytes,14,opt,name=syncFinishedAt" json:"syncFinishedAt,omitempty"` - HealthStatus *string `protobuf:"bytes,15,opt,name=healthStatus" json:"healthStatus,omitempty"` - HealthMessage *string `protobuf:"bytes,16,opt,name=healthMessage" json:"healthMessage,omitempty"` - Cluster string `protobuf:"bytes,17,opt,name=cluster" json:"cluster"` - HistoryId int64 `protobuf:"varint,18,opt,name=historyId" json:"historyId"` - OperationSyncRevision string `protobuf:"bytes,19,opt,name=operationSyncRevision" json:"operationSyncRevision"` - AppUID string `protobuf:"bytes,20,opt,name=appUID" json:"appUID"` - AppNamespace string `protobuf:"bytes,21,opt,name=appNamespace" json:"appNamespace"` - AppInstanceLabelKey string `protobuf:"bytes,22,opt,name=appInstanceLabelKey" json:"appInstanceLabelKey"` - TrackingMethod string `protobuf:"bytes,23,opt,name=trackingMethod" json:"trackingMethod"` - AppVersions *ApplicationVersions `protobuf:"bytes,24,opt,name=appVersions" json:"appVersions,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + DesiredManifest string `protobuf:"bytes,1,opt,name=desiredManifest" json:"desiredManifest"` + ActualManifest string `protobuf:"bytes,2,opt,name=actualManifest" json:"actualManifest"` + GitManifest string `protobuf:"bytes,3,opt,name=gitManifest" json:"gitManifest"` + RepoURL string `protobuf:"bytes,4,opt,name=repoURL" json:"repoURL"` + Path string `protobuf:"bytes,5,opt,name=path" json:"path"` + Revision string `protobuf:"bytes,6,opt,name=revision" json:"revision"` + CommitMessage string `protobuf:"bytes,7,opt,name=commitMessage" json:"commitMessage"` + CommitAuthor string `protobuf:"bytes,8,opt,name=commitAuthor" json:"commitAuthor"` + CommitDate *v1.Time `protobuf:"bytes,9,opt,name=commitDate" json:"commitDate,omitempty"` + AppName string `protobuf:"bytes,10,opt,name=appName" json:"appName"` + AppLabels map[string]string `protobuf:"bytes,11,rep,name=appLabels" json:"appLabels" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + SyncStatus string `protobuf:"bytes,12,opt,name=syncStatus" json:"syncStatus"` + SyncStartedAt v1.Time `protobuf:"bytes,13,opt,name=syncStartedAt" json:"syncStartedAt"` + SyncFinishedAt *v1.Time `protobuf:"bytes,14,opt,name=syncFinishedAt" json:"syncFinishedAt,omitempty"` + HealthStatus *string `protobuf:"bytes,15,opt,name=healthStatus" json:"healthStatus,omitempty"` + HealthMessage *string `protobuf:"bytes,16,opt,name=healthMessage" json:"healthMessage,omitempty"` + Cluster string `protobuf:"bytes,17,opt,name=cluster" json:"cluster"` + HistoryId int64 `protobuf:"varint,18,opt,name=historyId" json:"historyId"` + OperationSyncRevision string `protobuf:"bytes,19,opt,name=operationSyncRevision" json:"operationSyncRevision"` + AppUID string `protobuf:"bytes,20,opt,name=appUID" json:"appUID"` + AppNamespace string `protobuf:"bytes,21,opt,name=appNamespace" json:"appNamespace"` + AppInstanceLabelKey string `protobuf:"bytes,22,opt,name=appInstanceLabelKey" json:"appInstanceLabelKey"` + TrackingMethod string `protobuf:"bytes,23,opt,name=trackingMethod" json:"trackingMethod"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ObjectSource) Reset() { *m = ObjectSource{} } @@ -456,13 +463,6 @@ func (m *ObjectSource) GetTrackingMethod() string { return "" } -func (m *ObjectSource) GetAppVersions() *ApplicationVersions { - if m != nil { - return m.AppVersions - } - return nil -} - // * // Holds error information type ObjectError struct { @@ -669,71 +669,70 @@ func init() { func init() { proto.RegisterFile("server/application/events.proto", fileDescriptor_3ad9267ec62b112f) } var fileDescriptor_3ad9267ec62b112f = []byte{ - // 1011 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x6e, 0x1b, 0xb7, - 0x13, 0xfe, 0xad, 0xfc, 0x7f, 0x24, 0x3b, 0xf9, 0xd1, 0x76, 0x42, 0x18, 0xae, 0x23, 0x08, 0x46, - 0x21, 0x04, 0xc9, 0xaa, 0x76, 0xff, 0x20, 0x09, 0x8a, 0x02, 0x0e, 0xec, 0xa2, 0x6e, 0xed, 0xb6, - 0x58, 0x37, 0x01, 0x9a, 0x1b, 0xbd, 0x3b, 0x59, 0x31, 0xda, 0x25, 0x59, 0x92, 0x12, 0xa0, 0x6b, - 0x5f, 0xa1, 0x0f, 0xd1, 0x73, 0xdf, 0xa1, 0x87, 0x1c, 0x0b, 0xf4, 0x5e, 0x14, 0x46, 0x1f, 0xa4, - 0x20, 0x77, 0x25, 0x73, 0x5d, 0x1f, 0x9a, 0xde, 0xc8, 0x6f, 0xbe, 0x99, 0xe5, 0x70, 0x3e, 0xce, - 0x2c, 0x3c, 0x30, 0xa8, 0x27, 0xa8, 0x07, 0x4c, 0xa9, 0x82, 0xa7, 0xcc, 0x72, 0x29, 0x06, 0x38, - 0x41, 0x61, 0x4d, 0xac, 0xb4, 0xb4, 0x92, 0xac, 0xe4, 0x28, 0x50, 0xf3, 0x74, 0xe7, 0x2c, 0xe7, - 0x76, 0x38, 0xbe, 0x8c, 0x53, 0x59, 0x0e, 0x98, 0xce, 0xa5, 0xd2, 0xf2, 0x8d, 0x5f, 0x3c, 0x4e, - 0xb3, 0xc1, 0xe4, 0x70, 0xa0, 0x46, 0xf9, 0x80, 0x29, 0x6e, 0x1a, 0xa1, 0x26, 0x07, 0xac, 0x50, - 0x43, 0x76, 0x30, 0xf0, 0x51, 0x98, 0xc5, 0xac, 0x0a, 0xbb, 0xf3, 0xd1, 0xe8, 0x89, 0x89, 0xb9, - 0x74, 0x1e, 0x25, 0x4b, 0x87, 0x5c, 0xa0, 0x9e, 0x5e, 0x87, 0x28, 0xd1, 0xb2, 0xc1, 0xe4, 0x9f, - 0x5e, 0x5b, 0xb9, 0xf4, 0x1f, 0xb6, 0x72, 0xe0, 0x56, 0x35, 0xba, 0x9b, 0x4b, 0x99, 0x17, 0xe8, - 0x5c, 0x07, 0x4c, 0x08, 0x69, 0xfd, 0xb7, 0xeb, 0x04, 0x7a, 0x4f, 0xa1, 0x7d, 0xe2, 0x12, 0xba, - 0x90, 0x63, 0x9d, 0x22, 0x21, 0xb0, 0x28, 0x58, 0x89, 0x34, 0xea, 0xb6, 0xfa, 0x6b, 0x89, 0x5f, - 0x93, 0x7b, 0xb0, 0x9c, 0x4a, 0xf1, 0x9a, 0xe7, 0xb4, 0xd5, 0x8d, 0xfa, 0x9d, 0xa4, 0xde, 0xf5, - 0x3e, 0x86, 0x25, 0xef, 0x7a, 0xab, 0x13, 0x85, 0x15, 0xc5, 0xa6, 0x85, 0x64, 0x19, 0x6d, 0x75, - 0x5b, 0xfd, 0x4e, 0x32, 0xdb, 0xf6, 0x7e, 0x8e, 0xa0, 0xe3, 0xfd, 0xbe, 0xad, 0x00, 0xd2, 0x83, - 0x35, 0xcb, 0x4b, 0x34, 0x96, 0x95, 0xaa, 0x8a, 0xf1, 0x7c, 0xf1, 0xed, 0x1f, 0x0f, 0xfe, 0x97, - 0x5c, 0xc3, 0xee, 0x0c, 0xf2, 0xf2, 0x0d, 0xa6, 0xb6, 0x8e, 0x56, 0xef, 0xc8, 0x63, 0x58, 0x36, - 0xfe, 0xe4, 0x74, 0xa1, 0xdb, 0xea, 0xb7, 0x0f, 0xb7, 0xe3, 0xba, 0x20, 0xf1, 0x37, 0x9e, 0x50, - 0xa5, 0x95, 0xd4, 0x24, 0xf2, 0x08, 0x96, 0x51, 0x6b, 0xa9, 0x0d, 0x5d, 0xec, 0x2e, 0xf4, 0xdb, - 0x87, 0x5b, 0x37, 0xe8, 0x27, 0xce, 0x98, 0xd4, 0x9c, 0xde, 0xaf, 0x6b, 0xd0, 0x09, 0xc3, 0x90, - 0x18, 0xee, 0x64, 0x68, 0xb8, 0xc6, 0xec, 0x9c, 0x09, 0xfe, 0x1a, 0x8d, 0xa5, 0x51, 0x37, 0x9a, - 0x9f, 0xf7, 0xa6, 0x91, 0x3c, 0x82, 0x0d, 0x96, 0xda, 0x31, 0x2b, 0xe6, 0xf4, 0x56, 0x40, 0xbf, - 0x61, 0x23, 0xef, 0x43, 0x3b, 0xe7, 0x76, 0x4e, 0x5d, 0x08, 0xa8, 0xa1, 0x81, 0xec, 0xc1, 0x8a, - 0x46, 0x25, 0x5f, 0x24, 0x67, 0x74, 0x31, 0xe0, 0xcc, 0x40, 0x42, 0x61, 0x51, 0x31, 0x3b, 0xa4, - 0x4b, 0x81, 0xd1, 0x23, 0xa4, 0x0b, 0xab, 0x1a, 0x27, 0xdc, 0x70, 0x29, 0xe8, 0x72, 0x60, 0x9d, - 0xa3, 0xe4, 0x21, 0xac, 0xa7, 0xb2, 0x2c, 0xb9, 0x3d, 0x47, 0x63, 0x58, 0x8e, 0x74, 0x25, 0xa0, - 0x35, 0x4d, 0xa4, 0x0f, 0x9d, 0x0a, 0x38, 0x1a, 0xdb, 0xa1, 0xd4, 0x74, 0x35, 0xa0, 0x36, 0x2c, - 0xe4, 0x4b, 0x80, 0x6a, 0x7f, 0xcc, 0x2c, 0xd2, 0xb5, 0x6e, 0xd4, 0x6f, 0x1f, 0x3e, 0x8c, 0x2b, - 0x8d, 0xc7, 0xa1, 0xc6, 0x63, 0x35, 0xca, 0x1d, 0x60, 0x62, 0xa7, 0xf1, 0x78, 0x72, 0x10, 0x7f, - 0xc7, 0x4b, 0x4c, 0x02, 0x6f, 0x97, 0x3d, 0x53, 0xea, 0x6b, 0xa7, 0x37, 0x08, 0xb3, 0xaf, 0x41, - 0xf2, 0x05, 0xac, 0x31, 0xa5, 0xce, 0xd8, 0x25, 0x16, 0x86, 0xb6, 0x7d, 0x95, 0xf7, 0x6f, 0x15, - 0x45, 0x7c, 0x34, 0xa3, 0x9d, 0x08, 0xab, 0xa7, 0x33, 0xcd, 0xcd, 0x9d, 0xc9, 0x3e, 0x80, 0x99, - 0x8a, 0xf4, 0xc2, 0x32, 0x3b, 0x36, 0xb4, 0x13, 0x7c, 0x2c, 0xc0, 0xc9, 0x4b, 0x58, 0xaf, 0x77, - 0xda, 0x62, 0x76, 0x64, 0xe9, 0xfa, 0xbb, 0xa6, 0x37, 0xbb, 0xdd, 0x46, 0x18, 0x92, 0xc0, 0x86, - 0x03, 0x3e, 0xe7, 0x82, 0x9b, 0xa1, 0x0f, 0xbc, 0xf1, 0xce, 0xf7, 0x76, 0x23, 0x02, 0xe9, 0x41, - 0x67, 0x88, 0xac, 0xb0, 0xc3, 0x3a, 0xa7, 0x3b, 0x2e, 0xa7, 0xa4, 0x81, 0x91, 0x7d, 0x58, 0xaf, - 0xf6, 0x33, 0x05, 0xdc, 0xf5, 0xa4, 0x26, 0xe8, 0xaa, 0x90, 0x16, 0x63, 0x63, 0x51, 0xd3, 0xff, - 0x87, 0x55, 0xa8, 0x41, 0xf7, 0xa6, 0x87, 0xdc, 0x58, 0xa9, 0xa7, 0xa7, 0x19, 0x25, 0xdd, 0xa8, - 0xbf, 0x30, 0xbb, 0xdf, 0x39, 0x4c, 0x9e, 0xc1, 0xb6, 0x54, 0xae, 0x81, 0x71, 0x29, 0x2e, 0xa6, - 0x22, 0x4d, 0x66, 0xd2, 0xdc, 0x0c, 0x22, 0xde, 0x4e, 0x21, 0xbb, 0xb0, 0xcc, 0x94, 0x7a, 0x71, - 0x7a, 0x4c, 0xb7, 0x02, 0x72, 0x8d, 0x39, 0x65, 0xd6, 0x72, 0x30, 0x8a, 0xa5, 0x48, 0xb7, 0x43, - 0x65, 0x86, 0x16, 0xf2, 0x09, 0x6c, 0x32, 0xa5, 0x4e, 0x85, 0xb1, 0x4c, 0xa4, 0xe8, 0x0b, 0xff, - 0x15, 0x4e, 0xe9, 0xbd, 0xc0, 0xe1, 0x36, 0x82, 0x7b, 0xd9, 0x56, 0xb3, 0x74, 0xc4, 0x45, 0x7e, - 0x8e, 0x76, 0x28, 0x33, 0x7a, 0x3f, 0x7c, 0xd9, 0x4d, 0x1b, 0xf9, 0x0c, 0xda, 0x4c, 0xa9, 0x97, - 0xa8, 0xdd, 0xd9, 0x0d, 0xa5, 0xbe, 0x90, 0xbb, 0x73, 0x55, 0x1e, 0x5d, 0x8f, 0x84, 0x19, 0x27, - 0x09, 0x1d, 0x76, 0x3e, 0x85, 0x8d, 0xa6, 0x58, 0xc9, 0x5d, 0x58, 0x18, 0xe1, 0xb4, 0xea, 0x3e, - 0x89, 0x5b, 0x92, 0x2d, 0x58, 0x9a, 0xb0, 0x62, 0x8c, 0x55, 0x8b, 0x49, 0xaa, 0xcd, 0xb3, 0xd6, - 0x93, 0xa8, 0xf7, 0x4b, 0x04, 0xed, 0xa0, 0xbd, 0xb9, 0xfe, 0x60, 0xa7, 0x0a, 0x1b, 0xad, 0xcb, - 0x23, 0x64, 0x07, 0x96, 0x0a, 0x9c, 0x60, 0xd1, 0x68, 0x53, 0x15, 0xe4, 0x2a, 0x5e, 0xd6, 0x8a, - 0x08, 0x3b, 0xd3, 0x0c, 0x24, 0x67, 0xb0, 0x5a, 0x30, 0x63, 0x2f, 0x10, 0x85, 0x6f, 0x4b, 0xff, - 0xe5, 0x09, 0xcc, 0x23, 0xf4, 0x5e, 0x41, 0xe7, 0x18, 0x15, 0x8a, 0x0c, 0x45, 0xca, 0xd1, 0xb8, - 0x11, 0x53, 0xc8, 0x74, 0x54, 0x27, 0xec, 0xd7, 0x0e, 0xcb, 0x50, 0x99, 0x3a, 0x61, 0xbf, 0x76, - 0x0a, 0xd7, 0xf8, 0xc3, 0x98, 0x6b, 0x2c, 0xdd, 0x94, 0xae, 0x8e, 0x9a, 0x34, 0xb0, 0x9e, 0x82, - 0xcd, 0x5b, 0x6e, 0x9c, 0xec, 0x01, 0x5c, 0xdf, 0x79, 0xfd, 0xa1, 0x00, 0x21, 0x4f, 0xa1, 0x93, - 0x05, 0x47, 0xf2, 0x9f, 0x0d, 0x07, 0x4e, 0x78, 0xde, 0xa4, 0x41, 0x3d, 0x44, 0x58, 0xf5, 0x13, - 0x8f, 0x8b, 0x9c, 0x7c, 0x0f, 0x77, 0xfd, 0x23, 0x0f, 0xa7, 0xee, 0xf5, 0x18, 0x0a, 0xd0, 0x9d, - 0x8d, 0x26, 0xda, 0x7b, 0xef, 0xc7, 0xdf, 0xff, 0xfa, 0xa9, 0x75, 0x9f, 0x6c, 0xfb, 0x51, 0x3e, - 0x39, 0x18, 0x18, 0xab, 0x91, 0x95, 0xf5, 0x0f, 0xc9, 0x07, 0xd1, 0xf3, 0xa3, 0xb7, 0x57, 0x7b, - 0xd1, 0x6f, 0x57, 0x7b, 0xd1, 0x9f, 0x57, 0x7b, 0xd1, 0xab, 0x0f, 0xff, 0xdd, 0x1f, 0x49, 0x5a, - 0x70, 0x14, 0xb6, 0x0e, 0xf2, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2c, 0xe8, 0xc7, 0x59, 0xf1, - 0x08, 0x00, 0x00, + // 1008 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x6e, 0x1c, 0xb5, + 0x17, 0xff, 0xcf, 0xe6, 0xfb, 0xec, 0x26, 0xed, 0xdf, 0x49, 0x5a, 0x2b, 0x0a, 0xe9, 0x6a, 0x15, + 0xa1, 0x55, 0xd5, 0xce, 0x92, 0xf0, 0xa1, 0xb6, 0x42, 0x48, 0xa9, 0x12, 0x44, 0x20, 0x01, 0x34, + 0xa1, 0x95, 0xe8, 0x9d, 0x33, 0x73, 0x3a, 0xeb, 0xee, 0x8c, 0x6d, 0x6c, 0xef, 0x4a, 0x7b, 0x8b, + 0x78, 0x03, 0x9e, 0x84, 0xb7, 0xe8, 0x25, 0x12, 0xf7, 0x08, 0x45, 0x48, 0xbc, 0x06, 0xb2, 0x67, + 0x76, 0xe3, 0x09, 0xb9, 0xa0, 0xdc, 0xf9, 0xfc, 0xce, 0xef, 0x1c, 0xfb, 0xcc, 0xf9, 0x1a, 0x78, + 0x60, 0x50, 0x4f, 0x50, 0x0f, 0x98, 0x52, 0x05, 0x4f, 0x99, 0xe5, 0x52, 0x0c, 0x70, 0x82, 0xc2, + 0x9a, 0x58, 0x69, 0x69, 0x25, 0x59, 0xc9, 0x51, 0xa0, 0xe6, 0xe9, 0xce, 0x59, 0xce, 0xed, 0x70, + 0x7c, 0x19, 0xa7, 0xb2, 0x1c, 0x30, 0x9d, 0x4b, 0xa5, 0xe5, 0x1b, 0x7f, 0x78, 0x9c, 0x66, 0x83, + 0xc9, 0xe1, 0x40, 0x8d, 0xf2, 0x01, 0x53, 0xdc, 0x34, 0x5c, 0x4d, 0x0e, 0x58, 0xa1, 0x86, 0xec, + 0x60, 0xe0, 0xbd, 0x30, 0x8b, 0x59, 0xe5, 0x76, 0xe7, 0xa3, 0xd1, 0x13, 0x13, 0x73, 0xe9, 0x2c, + 0x4a, 0x96, 0x0e, 0xb9, 0x40, 0x3d, 0xbd, 0x76, 0x51, 0xa2, 0x65, 0x83, 0xc9, 0x3f, 0xad, 0xb6, + 0x72, 0xe9, 0x2f, 0xb6, 0x72, 0xe0, 0x4e, 0x35, 0xba, 0x9b, 0x4b, 0x99, 0x17, 0xe8, 0x4c, 0x07, + 0x4c, 0x08, 0x69, 0xfd, 0xdd, 0x75, 0x00, 0xbd, 0xa7, 0xd0, 0x3e, 0x71, 0x01, 0x5d, 0xc8, 0xb1, + 0x4e, 0x91, 0x10, 0x58, 0x14, 0xac, 0x44, 0x1a, 0x75, 0x5b, 0xfd, 0xb5, 0xc4, 0x9f, 0xc9, 0x3d, + 0x58, 0x4e, 0xa5, 0x78, 0xcd, 0x73, 0xda, 0xea, 0x46, 0xfd, 0x4e, 0x52, 0x4b, 0xbd, 0x8f, 0x61, + 0xc9, 0x9b, 0xde, 0x6a, 0x44, 0x61, 0x45, 0xb1, 0x69, 0x21, 0x59, 0x46, 0x5b, 0xdd, 0x56, 0xbf, + 0x93, 0xcc, 0xc4, 0xde, 0x5f, 0x11, 0x74, 0xbc, 0xdd, 0xb7, 0x15, 0x40, 0x7a, 0xb0, 0x66, 0x79, + 0x89, 0xc6, 0xb2, 0x52, 0x55, 0x3e, 0x9e, 0x2f, 0xbe, 0xfd, 0xfd, 0xc1, 0xff, 0x92, 0x6b, 0xd8, + 0xbd, 0x41, 0x5e, 0xbe, 0xc1, 0xd4, 0xd6, 0xde, 0x6a, 0x89, 0x3c, 0x86, 0x65, 0xe3, 0x5f, 0x4e, + 0x17, 0xba, 0xad, 0x7e, 0xfb, 0x70, 0x3b, 0xae, 0x13, 0x12, 0x7f, 0xe3, 0x09, 0x55, 0x58, 0x49, + 0x4d, 0x22, 0x8f, 0x60, 0x19, 0xb5, 0x96, 0xda, 0xd0, 0xc5, 0xee, 0x42, 0xbf, 0x7d, 0xb8, 0x75, + 0x83, 0x7e, 0xe2, 0x94, 0x49, 0xcd, 0x21, 0x9f, 0x41, 0x9b, 0x29, 0xf5, 0x12, 0xb5, 0x71, 0x1f, + 0x8c, 0xd2, 0x6e, 0xd4, 0x6f, 0x1f, 0xee, 0xce, 0x4d, 0x8e, 0xae, 0x33, 0x39, 0xe3, 0x24, 0xa1, + 0x41, 0xef, 0xa7, 0x35, 0xe8, 0x84, 0xcf, 0x20, 0x31, 0xdc, 0xc9, 0xd0, 0x70, 0x8d, 0xd9, 0x39, + 0x13, 0xfc, 0x35, 0x1a, 0x4b, 0xa3, 0x6e, 0x34, 0x8f, 0xf7, 0xa6, 0x92, 0x3c, 0x82, 0x0d, 0x96, + 0xda, 0x31, 0x2b, 0xe6, 0xf4, 0x56, 0x40, 0xbf, 0xa1, 0x23, 0xef, 0x43, 0x3b, 0xe7, 0x76, 0x4e, + 0x5d, 0x08, 0xa8, 0xa1, 0x82, 0xec, 0xc1, 0x8a, 0x46, 0x25, 0x5f, 0x24, 0x67, 0x74, 0x31, 0xe0, + 0xcc, 0x40, 0x42, 0x61, 0x51, 0x31, 0x3b, 0xa4, 0x4b, 0x81, 0xd2, 0x23, 0xa4, 0x0b, 0xab, 0x1a, + 0x27, 0xdc, 0x45, 0x47, 0x97, 0x03, 0xed, 0x1c, 0x25, 0x0f, 0x61, 0x3d, 0x95, 0x65, 0xc9, 0xed, + 0x39, 0x1a, 0xc3, 0x72, 0xa4, 0x2b, 0x01, 0xad, 0xa9, 0x22, 0x7d, 0xe8, 0x54, 0xc0, 0xd1, 0xd8, + 0x0e, 0xa5, 0xa6, 0xab, 0x01, 0xb5, 0xa1, 0x21, 0x5f, 0x02, 0x54, 0xf2, 0x31, 0xb3, 0x48, 0xd7, + 0x7c, 0x1e, 0x1e, 0xc6, 0x55, 0x8f, 0xc4, 0x61, 0x8f, 0xc4, 0x6a, 0x94, 0x3b, 0xc0, 0xc4, 0xae, + 0x47, 0xe2, 0xc9, 0x41, 0xfc, 0x1d, 0x2f, 0x31, 0x09, 0xac, 0x5d, 0xf4, 0x4c, 0xa9, 0xaf, 0x5d, + 0xbd, 0x42, 0x18, 0x7d, 0x0d, 0x92, 0x2f, 0x60, 0x8d, 0x29, 0x75, 0xc6, 0x2e, 0xb1, 0x30, 0xb4, + 0xed, 0xab, 0x64, 0xff, 0xd6, 0xa2, 0x72, 0xf9, 0xaf, 0x68, 0x27, 0xc2, 0xea, 0xe9, 0xac, 0x66, + 0xe7, 0xc6, 0x64, 0x1f, 0xc0, 0x4c, 0x45, 0x7a, 0x61, 0x99, 0x1d, 0x1b, 0xda, 0x09, 0x2e, 0x0b, + 0x70, 0xf2, 0x12, 0xd6, 0x6b, 0x49, 0x5b, 0xcc, 0x8e, 0x2c, 0x5d, 0x7f, 0xd7, 0xf0, 0x66, 0x5f, + 0xb7, 0xe1, 0x86, 0x24, 0xb0, 0xe1, 0x80, 0xcf, 0xb9, 0xe0, 0x66, 0xe8, 0x1d, 0x6f, 0xbc, 0xf3, + 0x77, 0xbb, 0xe1, 0x81, 0xf4, 0xa0, 0x33, 0x44, 0x56, 0xd8, 0x61, 0x1d, 0xd3, 0x1d, 0x17, 0x53, + 0xd2, 0xc0, 0xc8, 0x3e, 0xac, 0x57, 0xf2, 0xac, 0x02, 0xee, 0x7a, 0x52, 0x13, 0x74, 0x59, 0x48, + 0x8b, 0xb1, 0xb1, 0xa8, 0xe9, 0xff, 0xc3, 0x2c, 0xd4, 0xa0, 0x9b, 0x09, 0x43, 0x6e, 0xac, 0xd4, + 0xd3, 0xd3, 0x8c, 0x92, 0x6e, 0xd4, 0x5f, 0x98, 0x7d, 0xdf, 0x39, 0x4c, 0x9e, 0xc1, 0xb6, 0x54, + 0x6e, 0x00, 0x72, 0x29, 0x2e, 0xa6, 0x22, 0x4d, 0x66, 0xa5, 0xb9, 0x19, 0x78, 0xbc, 0x9d, 0x42, + 0x76, 0x61, 0x99, 0x29, 0xf5, 0xe2, 0xf4, 0x98, 0x6e, 0x05, 0xe4, 0x1a, 0x73, 0x95, 0x59, 0x97, + 0x83, 0x51, 0x2c, 0x45, 0xba, 0x1d, 0x56, 0x66, 0xa8, 0x21, 0x9f, 0xc0, 0x26, 0x53, 0xea, 0x54, + 0x18, 0xcb, 0x44, 0x8a, 0x3e, 0xf1, 0x5f, 0xe1, 0x94, 0xde, 0x0b, 0x0c, 0x6e, 0x23, 0xb8, 0xce, + 0xb6, 0x9a, 0xa5, 0x23, 0x2e, 0xf2, 0x73, 0xb4, 0x43, 0x99, 0xd1, 0xfb, 0x61, 0x67, 0x37, 0x75, + 0x3b, 0x9f, 0xc2, 0x46, 0xb3, 0xd8, 0xc8, 0x5d, 0x58, 0x18, 0xe1, 0xb4, 0x9a, 0x1e, 0x89, 0x3b, + 0x92, 0x2d, 0x58, 0x9a, 0xb0, 0x62, 0x8c, 0xd5, 0x88, 0x48, 0x2a, 0xe1, 0x59, 0xeb, 0x49, 0xd4, + 0xfb, 0x25, 0x82, 0x76, 0x30, 0xde, 0x5c, 0x7f, 0xdb, 0xa9, 0xc2, 0xc6, 0xe8, 0xf1, 0x08, 0xd9, + 0x81, 0xa5, 0x02, 0x27, 0x58, 0x34, 0xc6, 0x4c, 0x05, 0xb9, 0x8c, 0x95, 0x75, 0x46, 0xc3, 0xc9, + 0x32, 0x03, 0xc9, 0x19, 0xac, 0x16, 0xcc, 0xd8, 0x0b, 0x44, 0xe1, 0xc7, 0xca, 0x7f, 0x29, 0xe1, + 0xb9, 0x87, 0xde, 0x2b, 0xe8, 0x1c, 0xa3, 0x42, 0x91, 0xa1, 0x48, 0x39, 0x1a, 0xb7, 0x62, 0x0a, + 0x99, 0x8e, 0xea, 0x80, 0xfd, 0xd9, 0x61, 0x19, 0x2a, 0x53, 0x07, 0xec, 0xcf, 0xae, 0x42, 0x35, + 0xfe, 0x30, 0xe6, 0x1a, 0x4b, 0xb7, 0xa5, 0xab, 0xa7, 0x26, 0x0d, 0xac, 0xa7, 0x60, 0xf3, 0x96, + 0xd1, 0x4d, 0xf6, 0x00, 0xae, 0x87, 0x77, 0x7d, 0x51, 0x80, 0x90, 0xa7, 0xd0, 0xc9, 0x82, 0x27, + 0xf9, 0x6b, 0xc3, 0x85, 0x13, 0xbe, 0x37, 0x69, 0x50, 0x0f, 0x11, 0x56, 0xfd, 0xc6, 0xe3, 0x22, + 0x27, 0xdf, 0xc3, 0x5d, 0xdf, 0xa4, 0xe1, 0xd6, 0xbd, 0x5e, 0x43, 0x01, 0xba, 0xb3, 0xd1, 0x44, + 0x7b, 0xef, 0xfd, 0xf8, 0xdb, 0x9f, 0x3f, 0xb7, 0xee, 0x93, 0x6d, 0xbf, 0xca, 0x27, 0x07, 0x03, + 0x63, 0x35, 0xb2, 0xb2, 0xfe, 0x21, 0xf9, 0x20, 0x7a, 0x7e, 0xf4, 0xf6, 0x6a, 0x2f, 0xfa, 0xf5, + 0x6a, 0x2f, 0xfa, 0xe3, 0x6a, 0x2f, 0x7a, 0xf5, 0xe1, 0xbf, 0xfb, 0x23, 0x49, 0x0b, 0x8e, 0xc2, + 0xd6, 0x4e, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xeb, 0x3e, 0x33, 0xfd, 0xf1, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -955,6 +954,20 @@ func (m *EventPayload) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.AppVersions != nil { + { + size, err := m.AppVersions.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintEvents(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xc2 + } if len(m.Errors) > 0 { for iNdEx := len(m.Errors) - 1; iNdEx >= 0; iNdEx-- { { @@ -1024,20 +1037,6 @@ func (m *ObjectSource) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.AppVersions != nil { - { - size, err := m.AppVersions.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xc2 - } i -= len(m.TrackingMethod) copy(dAtA[i:], m.TrackingMethod) i = encodeVarintEvents(dAtA, i, uint64(len(m.TrackingMethod))) @@ -1426,6 +1425,10 @@ func (m *EventPayload) Size() (n int) { n += 1 + l + sovEvents(uint64(l)) } } + if m.AppVersions != nil { + l = m.AppVersions.Size() + n += 2 + l + sovEvents(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1497,10 +1500,6 @@ func (m *ObjectSource) Size() (n int) { n += 2 + l + sovEvents(uint64(l)) l = len(m.TrackingMethod) n += 2 + l + sovEvents(uint64(l)) - if m.AppVersions != nil { - l = m.AppVersions.Size() - n += 2 + l + sovEvents(uint64(l)) - } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1996,6 +1995,42 @@ func (m *EventPayload) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 24: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AppVersions", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthEvents + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthEvents + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.AppVersions == nil { + m.AppVersions = &ApplicationVersions{} + } + if err := m.AppVersions.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipEvents(dAtA[iNdEx:]) @@ -2885,42 +2920,6 @@ func (m *ObjectSource) Unmarshal(dAtA []byte) error { } m.TrackingMethod = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 24: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AppVersions", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.AppVersions == nil { - m.AppVersions = &ApplicationVersions{} - } - if err := m.AppVersions.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipEvents(dAtA[iNdEx:]) diff --git a/server/application/application_event_reporter.go b/server/application/application_event_reporter.go index e515e098906d7..3af17a6b59830 100644 --- a/server/application/application_event_reporter.go +++ b/server/application/application_event_reporter.go @@ -166,13 +166,6 @@ func (s *applicationEventReporter) streamApplicationEvents( return err } } else { - // appVersionJSON, err := json.Marshal(desiredManifests.ApplicationVersions) - // if err == nil { - // if a.Annotations == nil { - // a.Annotations = make(map[string]string) - // } - // a.Annotations["codefresh.io/appVersion"] = string(appVersionJSON) - // } // will get here only for root applications (not managed as a resource by another application) appEvent, err := s.getApplicationEventPayload(ctx, a, es, ts, appInstanceLabelKey, trackingMethod, desiredManifests.ApplicationVersions) if err != nil { @@ -302,14 +295,6 @@ func (s *applicationEventReporter) processResource( if originalApplication != nil { originalAppRevisionMetadata, _ = s.getApplicationRevisionDetails(ctx, originalApplication, getOperationRevision(originalApplication)) - - // appVersionJSON, err := json.Marshal(desiredManifests.ApplicationVersions) - // if err == nil { - // if parentApplicationToReport.Annotations == nil { - // parentApplicationToReport.Annotations = make(map[string]string) - // } - // parentApplicationToReport.Annotations["codefresh.io/appVersion"] = string(appVersionJSON) - // } } ev, err := getResourceEventPayload(parentApplicationToReport, &rs, es, actualState, desiredState, appTree, manifestGenErr, ts, originalApplication, revisionMetadataToReport, originalAppRevisionMetadata, appInstanceLabelKey, trackingMethod, desiredManifests.ApplicationVersions) @@ -594,7 +579,6 @@ func getResourceEventPayload( Cluster: parentApplication.Spec.Destination.Server, AppInstanceLabelKey: appInstanceLabelKey, TrackingMethod: string(trackingMethod), - AppVersions: applicationVersionsEvents, } if revisionMetadata != nil { @@ -612,10 +596,11 @@ func getResourceEventPayload( } payload := events.EventPayload{ - Timestamp: ts, - Object: object, - Source: &source, - Errors: errors, + Timestamp: ts, + Object: object, + Source: &source, + Errors: errors, + AppVersions: applicationVersionsEvents, } payloadBytes, err := json.Marshal(&payload) @@ -714,14 +699,14 @@ func (s *applicationEventReporter) getApplicationEventPayload( Cluster: a.Spec.Destination.Server, AppInstanceLabelKey: appInstanceLabelKey, TrackingMethod: string(trackingMethod), - AppVersions: applicationVersionsEvents, } payload := events.EventPayload{ - Timestamp: ts, - Object: object, - Source: source, - Errors: parseApplicationSyncResultErrorsFromConditions(a.Status), + Timestamp: ts, + Object: object, + Source: source, + Errors: parseApplicationSyncResultErrorsFromConditions(a.Status), + AppVersions: applicationVersionsEvents, } payloadBytes, err := json.Marshal(&payload) diff --git a/server/application/events.proto b/server/application/events.proto index 3359d6bb1c91f..7be4596e843a7 100644 --- a/server/application/events.proto +++ b/server/application/events.proto @@ -49,6 +49,7 @@ message EventPayload { required ObjectSource source = 3; // The errors of this object repeated ObjectError errors = 4; + optional ApplicationVersions appVersions = 24; } /** @@ -78,7 +79,6 @@ message ObjectSource { optional string appNamespace = 21 [(gogoproto.nullable) = false]; optional string appInstanceLabelKey = 22 [(gogoproto.nullable) = false]; optional string trackingMethod = 23 [(gogoproto.nullable) = false]; - optional ApplicationVersions appVersions = 24; } /**