From df0e2e4015c4cff4e16c8743df9d62f5ca1bdc24 Mon Sep 17 00:00:00 2001 From: Andrew Merenbach Date: Tue, 12 Jun 2018 10:54:11 -0700 Subject: [PATCH] Fail app sync if `prune` flag is required (#276) * Add status field to resource details * Update generated code * Set up const message responses * Check number of resources requiring pruning * Fix imports * Use string, thanks @alexmt * Update generated code --- cmd/argocd/commands/app.go | 22 +- controller/state.go | 6 + pkg/apis/application/v1alpha1/generated.pb.go | 301 ++++++++++-------- pkg/apis/application/v1alpha1/generated.proto | 2 + pkg/apis/application/v1alpha1/types.go | 18 +- 5 files changed, 209 insertions(+), 140 deletions(-) diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go index d05ee23221..77b9e1e6d3 100644 --- a/cmd/argocd/commands/app.go +++ b/cmd/argocd/commands/app.go @@ -643,8 +643,11 @@ func NewApplicationSyncCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co errors.CheckError(err) status, err := waitUntilOperationCompleted(appIf, appName) errors.CheckError(err) - printOperationResult(appName, status) - if !status.Phase.Successful() { + err = printOperationResult(appName, status) + if err != nil { + log.Fatal(err) + } + if !status.Phase.Successful() && !dryRun { os.Exit(1) } }, @@ -793,7 +796,10 @@ func NewApplicationRollbackCommand(clientOpts *argocdclient.ClientOptions) *cobr status, err := waitUntilOperationCompleted(appIf, appName) errors.CheckError(err) - printOperationResult(appName, status) + err = printOperationResult(appName, status) + if err != nil { + log.Fatal(err) + } if !status.Phase.Successful() { os.Exit(1) } @@ -805,7 +811,7 @@ func NewApplicationRollbackCommand(clientOpts *argocdclient.ClientOptions) *cobr const printOpFmtStr = "%-20s%s\n" -func printOperationResult(appName string, opState *argoappv1.OperationState) { +func printOperationResult(appName string, opState *argoappv1.OperationState) error { fmt.Printf(printOpFmtStr, "Application:", appName) var syncRes *argoappv1.SyncOperationResult if opState.SyncResult != nil { @@ -823,11 +829,19 @@ func printOperationResult(appName string, opState *argoappv1.OperationState) { w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0) fmt.Printf("\n") fmt.Fprintf(w, "KIND\tNAME\tMESSAGE\n") + pruningRequired := 0 for _, resDetails := range syncRes.Resources { fmt.Fprintf(w, "%s\t%s\t%s\n", resDetails.Kind, resDetails.Name, resDetails.Message) + if resDetails.Status == argoappv1.ResourceDetailsPruningRequired { + pruningRequired++ + } } _ = w.Flush() + if pruningRequired > 0 { + return fmt.Errorf("Some resources (%d) require pruning", pruningRequired) + } } + return nil } // NewApplicationManifestsCommand returns a new instance of an `argocd app manifests` command diff --git a/controller/state.go b/controller/state.go index cfdc5db534..929cb364b9 100644 --- a/controller/state.go +++ b/controller/state.go @@ -454,25 +454,31 @@ func syncObject(config *rest.Config, namespace string, targetObj, liveObj *unstr if prune { if dryRun { resDetails.Message = "pruned (dry run)" + resDetails.Status = v1alpha1.ResourceDetailsSyncedAndPruned } else { err := kubeutil.DeleteResource(config, liveObj, namespace) if err != nil { resDetails.Message = err.Error() + resDetails.Status = v1alpha1.ResourceDetailsSyncFailed successful = false } else { resDetails.Message = "pruned" + resDetails.Status = v1alpha1.ResourceDetailsSyncedAndPruned } } } else { resDetails.Message = "ignored (requires pruning)" + resDetails.Status = v1alpha1.ResourceDetailsPruningRequired } } else { message, err := kube.ApplyResource(config, targetObj, namespace, dryRun) if err != nil { resDetails.Message = err.Error() + resDetails.Status = v1alpha1.ResourceDetailsSyncFailed successful = false } else { resDetails.Message = message + resDetails.Status = v1alpha1.ResourceDetailsSynced } } return resDetails, successful diff --git a/pkg/apis/application/v1alpha1/generated.pb.go b/pkg/apis/application/v1alpha1/generated.pb.go index 4777ccb2b3..9c5e8916b0 100644 --- a/pkg/apis/application/v1alpha1/generated.pb.go +++ b/pkg/apis/application/v1alpha1/generated.pb.go @@ -1073,6 +1073,10 @@ func (m *ResourceDetails) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintGenerated(dAtA, i, uint64(len(m.Message))) i += copy(dAtA[i:], m.Message) + dAtA[i] = 0x2a + i++ + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Status))) + i += copy(dAtA[i:], m.Status) return i, nil } @@ -1646,6 +1650,8 @@ func (m *ResourceDetails) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) l = len(m.Message) n += 1 + l + sovGenerated(uint64(l)) + l = len(m.Status) + n += 1 + l + sovGenerated(uint64(l)) return n } @@ -2006,6 +2012,7 @@ func (this *ResourceDetails) String() string { `Kind:` + fmt.Sprintf("%v", this.Kind) + `,`, `Namespace:` + fmt.Sprintf("%v", this.Namespace) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, + `Status:` + fmt.Sprintf("%v", this.Status) + `,`, `}`, }, "") return s @@ -5299,6 +5306,35 @@ func (m *ResourceDetails) Unmarshal(dAtA []byte) error { } m.Message = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Status = ResourceSyncStatus(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) @@ -6239,137 +6275,138 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 2101 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xdd, 0x8f, 0x1b, 0x49, - 0x11, 0xcf, 0xf8, 0x6b, 0xed, 0xf2, 0x7e, 0x24, 0x7d, 0xdc, 0x61, 0xed, 0x49, 0xde, 0xd5, 0x44, - 0x40, 0x40, 0x9c, 0x4d, 0x02, 0xc7, 0xa7, 0x84, 0x14, 0x7b, 0x73, 0x97, 0xbd, 0xdd, 0x24, 0x4b, - 0x7b, 0x0f, 0xa4, 0xe3, 0x04, 0xcc, 0xce, 0xf4, 0xda, 0x93, 0xb5, 0x67, 0xe6, 0xba, 0xdb, 0x8e, - 0x2c, 0x01, 0x3a, 0x84, 0x90, 0xd0, 0x09, 0x4e, 0x7c, 0xfc, 0x03, 0x3c, 0xf3, 0x82, 0x40, 0x3c, - 0xf1, 0xc8, 0x03, 0xca, 0xe3, 0x21, 0x81, 0x38, 0x21, 0x14, 0x91, 0xbd, 0x97, 0x93, 0xf8, 0x0f, - 0xf2, 0x84, 0xba, 0xa7, 0xa7, 0xa7, 0x67, 0xbc, 0xcb, 0x6e, 0x62, 0x27, 0xdc, 0x9b, 0xa7, 0xaa, - 0xa6, 0x7e, 0x35, 0xd5, 0xd5, 0xd5, 0xbf, 0x6a, 0xc3, 0x76, 0xdf, 0xe7, 0x83, 0xf1, 0x41, 0xcb, - 0x0d, 0x47, 0x6d, 0x87, 0xf6, 0xc3, 0x88, 0x86, 0x77, 0xe5, 0x8f, 0x97, 0x5c, 0xaf, 0x1d, 0x1d, - 0xf5, 0xdb, 0x4e, 0xe4, 0xb3, 0xb6, 0x13, 0x45, 0x43, 0xdf, 0x75, 0xb8, 0x1f, 0x06, 0xed, 0xc9, - 0x55, 0x67, 0x18, 0x0d, 0x9c, 0xab, 0xed, 0x3e, 0x09, 0x08, 0x75, 0x38, 0xf1, 0x5a, 0x11, 0x0d, - 0x79, 0x88, 0xbe, 0x92, 0xba, 0x6a, 0x25, 0xae, 0xe4, 0x8f, 0xef, 0xba, 0x5e, 0x2b, 0x3a, 0xea, - 0xb7, 0x84, 0xab, 0x96, 0xe1, 0xaa, 0x95, 0xb8, 0x5a, 0x7f, 0xc9, 0x88, 0xa2, 0x1f, 0xf6, 0xc3, - 0xb6, 0xf4, 0x78, 0x30, 0x3e, 0x94, 0x4f, 0xf2, 0x41, 0xfe, 0x8a, 0x91, 0xd6, 0xbf, 0x70, 0xf4, - 0x65, 0xd6, 0xf2, 0x43, 0x11, 0xdb, 0xc8, 0x71, 0x07, 0x7e, 0x40, 0xe8, 0x34, 0x0d, 0x76, 0x44, - 0xb8, 0xd3, 0x9e, 0xcc, 0xc4, 0xb7, 0xde, 0x3e, 0xed, 0x2d, 0x3a, 0x0e, 0xb8, 0x3f, 0x22, 0x33, - 0x2f, 0x7c, 0xf1, 0xac, 0x17, 0x98, 0x3b, 0x20, 0x23, 0x67, 0xe6, 0xbd, 0xcf, 0x9f, 0xf6, 0xde, - 0x98, 0xfb, 0xc3, 0xb6, 0x1f, 0x70, 0xc6, 0x69, 0xfe, 0x25, 0xfb, 0x2f, 0x45, 0xa8, 0x5f, 0x4f, - 0x73, 0x83, 0xbe, 0x07, 0x55, 0xf1, 0x21, 0x9e, 0xc3, 0x9d, 0x86, 0xb5, 0x69, 0x5d, 0xa9, 0x5f, - 0xfb, 0x5c, 0x2b, 0xf6, 0xdb, 0x32, 0xfd, 0xa6, 0x89, 0x15, 0xd6, 0xad, 0xc9, 0xd5, 0xd6, 0x9d, - 0x83, 0xbb, 0xc4, 0xe5, 0xb7, 0x08, 0x77, 0x3a, 0xe8, 0xfe, 0x83, 0x8d, 0x0b, 0xc7, 0x0f, 0x36, - 0x20, 0x95, 0x61, 0xed, 0x15, 0x0d, 0xa1, 0xc4, 0x22, 0xe2, 0x36, 0x0a, 0xd2, 0xfb, 0x6b, 0xad, - 0x27, 0x5e, 0xbe, 0x96, 0x11, 0x77, 0x2f, 0x22, 0x6e, 0x67, 0x59, 0xe1, 0x96, 0xc4, 0x13, 0x96, - 0x28, 0x88, 0x43, 0x85, 0x71, 0x87, 0x8f, 0x59, 0xa3, 0x28, 0xf1, 0x76, 0x17, 0x84, 0x27, 0x7d, - 0x76, 0x56, 0x15, 0x62, 0x25, 0x7e, 0xc6, 0x0a, 0x0b, 0xbd, 0x05, 0xb5, 0x30, 0x12, 0x79, 0xf6, - 0xc3, 0xa0, 0x51, 0x92, 0xc0, 0x5b, 0x73, 0x00, 0xdf, 0x49, 0x7c, 0x75, 0x56, 0x8e, 0x1f, 0x6c, - 0xd4, 0xf4, 0x23, 0x4e, 0x51, 0x6c, 0x17, 0x3e, 0x66, 0xc4, 0xd7, 0x0d, 0x03, 0xcf, 0x97, 0x0b, - 0xba, 0x09, 0x25, 0x3e, 0x8d, 0x88, 0x5c, 0xcc, 0x5a, 0x9a, 0xa2, 0xfd, 0x69, 0x44, 0xb0, 0xd4, - 0xa0, 0x4f, 0xc3, 0xd2, 0x88, 0x30, 0xe6, 0xf4, 0x89, 0x5c, 0x93, 0x5a, 0x67, 0x4d, 0x19, 0x2d, - 0xdd, 0x8a, 0xc5, 0x38, 0xd1, 0xdb, 0x6f, 0xc1, 0x0b, 0x06, 0xc8, 0x16, 0x61, 0xdc, 0x0f, 0xe2, - 0xba, 0xf9, 0x24, 0x54, 0x18, 0xa1, 0x13, 0x42, 0x15, 0x50, 0x9a, 0x19, 0x29, 0xc5, 0x4a, 0x8b, - 0xda, 0x50, 0x0b, 0x9c, 0x11, 0x61, 0x91, 0xe3, 0x26, 0x70, 0x97, 0x94, 0x69, 0xed, 0x76, 0xa2, - 0xc0, 0xa9, 0x8d, 0xfd, 0x2f, 0x0b, 0xd6, 0x0c, 0xcc, 0x5d, 0x9f, 0x71, 0xf4, 0xe6, 0x4c, 0x91, - 0xb6, 0xce, 0x57, 0xa4, 0xe2, 0x6d, 0x59, 0xa2, 0x17, 0x15, 0x66, 0x35, 0x91, 0x18, 0x05, 0x7a, - 0x04, 0x65, 0x9f, 0x93, 0x11, 0x6b, 0x14, 0x36, 0x8b, 0x57, 0xea, 0xd7, 0x5e, 0x59, 0x4c, 0xc5, - 0x74, 0x56, 0x14, 0x64, 0x79, 0x5b, 0x38, 0xc7, 0x31, 0x86, 0xfd, 0x6e, 0x11, 0x2e, 0x99, 0x75, - 0x15, 0x8e, 0xa9, 0x2b, 0x97, 0x84, 0x92, 0x28, 0x7c, 0x1d, 0xef, 0xaa, 0x74, 0xea, 0x25, 0xc1, - 0xb1, 0x18, 0x27, 0x7a, 0xb1, 0xbe, 0x91, 0xc3, 0x07, 0x2a, 0x97, 0x7a, 0x7d, 0xf7, 0x1c, 0x3e, - 0xc0, 0x52, 0x83, 0x5e, 0x86, 0x3a, 0x09, 0x26, 0x3e, 0x0d, 0x83, 0x11, 0x09, 0xb8, 0xdc, 0x07, - 0xb5, 0xce, 0x73, 0xca, 0xb0, 0x7e, 0x23, 0x55, 0x61, 0xd3, 0x0e, 0x7d, 0x1d, 0x56, 0xb9, 0x43, - 0xfb, 0x84, 0x63, 0x32, 0xf1, 0x59, 0x52, 0xc8, 0xb5, 0xce, 0x0b, 0xea, 0xcd, 0xd5, 0xfd, 0x8c, - 0x16, 0xe7, 0xac, 0xd1, 0x1f, 0x2d, 0x78, 0xd1, 0x0d, 0x47, 0x51, 0x18, 0x90, 0x80, 0xef, 0x39, - 0xd4, 0x19, 0x11, 0x4e, 0xe8, 0x9d, 0x09, 0xa1, 0xd4, 0xf7, 0x08, 0x6b, 0x94, 0x65, 0x76, 0x6f, - 0xcd, 0x91, 0xdd, 0xee, 0x8c, 0xf7, 0xce, 0x65, 0x15, 0xdc, 0x8b, 0xdd, 0xd3, 0x91, 0xf1, 0xff, - 0x0a, 0xcb, 0xfe, 0x55, 0x21, 0x53, 0x6f, 0xbd, 0xa4, 0x89, 0xc8, 0x85, 0x51, 0xd5, 0xb6, 0xa8, - 0x26, 0x22, 0x7d, 0x1a, 0x5b, 0x45, 0x3e, 0x63, 0x85, 0x85, 0x7e, 0x6a, 0x41, 0xdd, 0x4b, 0xb7, - 0x98, 0x6a, 0x98, 0xdf, 0x58, 0x0c, 0xb6, 0xb1, 0x77, 0xd3, 0x5a, 0x30, 0x84, 0xd8, 0x84, 0xb6, - 0x7f, 0x53, 0xc9, 0x56, 0x69, 0xdc, 0xe5, 0x7e, 0x69, 0xc1, 0x45, 0x91, 0x4a, 0x87, 0xfa, 0x2c, - 0x0c, 0x30, 0x61, 0xe3, 0x21, 0x57, 0x19, 0xda, 0x99, 0x73, 0x59, 0x4d, 0x97, 0x9d, 0x86, 0x8a, - 0xef, 0x62, 0x5e, 0x83, 0x67, 0xe0, 0x11, 0x87, 0xa5, 0x81, 0xcf, 0x78, 0x48, 0xa7, 0x6a, 0xfb, - 0x6e, 0xcf, 0x11, 0xc9, 0x16, 0x89, 0x86, 0xe1, 0x54, 0xec, 0x86, 0xed, 0xe0, 0x30, 0x4c, 0x37, - 0xe1, 0xcd, 0x18, 0x01, 0x27, 0x50, 0xe8, 0x47, 0x16, 0x40, 0x94, 0xd4, 0x92, 0x38, 0x6a, 0x9e, - 0x42, 0x69, 0xeb, 0x53, 0x55, 0x8b, 0x18, 0x36, 0x40, 0x51, 0x08, 0x95, 0x01, 0x71, 0x86, 0x7c, - 0xa0, 0x0e, 0x9c, 0x57, 0xe7, 0x80, 0xbf, 0x29, 0x1d, 0xe5, 0x0f, 0xb9, 0x58, 0x8a, 0x15, 0x0c, - 0xfa, 0x89, 0x05, 0xab, 0xfa, 0xfc, 0x11, 0xb6, 0xa4, 0x51, 0x96, 0xc8, 0xdb, 0x8b, 0x38, 0xea, - 0xa4, 0xc3, 0x0e, 0x12, 0x8d, 0x26, 0x2b, 0xc3, 0x39, 0x50, 0xf4, 0x63, 0x0b, 0xc0, 0x4d, 0xce, - 0x3b, 0xd6, 0xa8, 0xc8, 0xe4, 0xdf, 0x59, 0xcc, 0x36, 0xd1, 0xe7, 0x68, 0x9a, 0x7e, 0x2d, 0x62, - 0xd8, 0x80, 0xb5, 0x3f, 0xb0, 0xe0, 0x79, 0xe3, 0xc5, 0x6f, 0x39, 0xdc, 0x1d, 0xdc, 0x98, 0x88, - 0x46, 0xba, 0x93, 0x39, 0x81, 0xbf, 0x64, 0x9e, 0xc0, 0x8f, 0x1e, 0x6c, 0x7c, 0xea, 0x34, 0xd6, - 0x76, 0x4f, 0x78, 0x68, 0x49, 0x17, 0xc6, 0x61, 0xfd, 0x03, 0xa8, 0x1b, 0x31, 0xab, 0x9e, 0xb0, - 0xa8, 0x23, 0x4a, 0x37, 0x02, 0x43, 0x88, 0x4d, 0x3c, 0xfb, 0xef, 0x05, 0x58, 0xea, 0x0e, 0xc7, - 0x8c, 0x13, 0x7a, 0xee, 0x23, 0x7f, 0x13, 0x4a, 0xe2, 0x38, 0xcf, 0x9f, 0x50, 0xe2, 0xb4, 0xc7, - 0x52, 0x83, 0x22, 0xa8, 0xb8, 0x61, 0x70, 0xe8, 0xf7, 0x15, 0x49, 0xbb, 0x39, 0xcf, 0xce, 0x89, - 0xa3, 0xeb, 0x4a, 0x7f, 0x69, 0x4c, 0xf1, 0x33, 0x56, 0x38, 0xe8, 0xe7, 0x16, 0xac, 0xb9, 0x61, - 0x10, 0x10, 0x37, 0x2d, 0xde, 0xd2, 0xdc, 0x84, 0xb4, 0x9b, 0xf5, 0xd8, 0xf9, 0xb8, 0x42, 0x5f, - 0xcb, 0x29, 0x70, 0x1e, 0xdb, 0xfe, 0x43, 0x01, 0x56, 0x32, 0x91, 0xa3, 0xcf, 0x42, 0x75, 0xcc, - 0x08, 0x95, 0x99, 0x8b, 0xf3, 0xab, 0x39, 0xcb, 0xeb, 0x4a, 0x8e, 0xb5, 0x85, 0xb0, 0x8e, 0x1c, - 0xc6, 0xee, 0x85, 0xd4, 0x53, 0x79, 0xd6, 0xd6, 0x7b, 0x4a, 0x8e, 0xb5, 0x85, 0x60, 0x04, 0x07, - 0xc4, 0xa1, 0x84, 0xee, 0x87, 0x47, 0x24, 0xc8, 0x33, 0x82, 0x4e, 0xaa, 0xc2, 0xa6, 0x9d, 0x4c, - 0x1a, 0x1f, 0xb2, 0xee, 0xd0, 0x27, 0x01, 0x8f, 0xc3, 0x5c, 0x40, 0xd2, 0xf6, 0x77, 0x7b, 0xa6, - 0xc7, 0x34, 0x69, 0x39, 0x05, 0xce, 0x63, 0xdb, 0x7f, 0xb3, 0xa0, 0xae, 0x92, 0xf6, 0x0c, 0x68, - 0x61, 0x3f, 0x4b, 0x0b, 0x3b, 0xf3, 0xd7, 0xe8, 0x29, 0x94, 0xf0, 0xaf, 0x45, 0x98, 0x39, 0xe9, - 0xd0, 0x77, 0x44, 0x8f, 0x13, 0x32, 0xe2, 0x5d, 0x4f, 0x0e, 0xd9, 0xcf, 0x9c, 0xef, 0xeb, 0xf6, - 0xfd, 0x11, 0x31, 0xdb, 0x57, 0xe2, 0x05, 0x1b, 0x1e, 0xd1, 0xdb, 0x56, 0x0a, 0xb0, 0x1f, 0xaa, - 0xbe, 0xb2, 0x58, 0x9e, 0x33, 0x13, 0xc2, 0x7e, 0x88, 0x0d, 0x4c, 0xf4, 0x55, 0x3d, 0xaa, 0x95, - 0x65, 0x41, 0xda, 0xd9, 0xe1, 0xea, 0x51, 0x86, 0x00, 0xe4, 0x06, 0xae, 0x29, 0xd4, 0x28, 0x89, - 0x79, 0x53, 0x72, 0x02, 0xcc, 0xd3, 0x44, 0xb0, 0xf2, 0x15, 0x6f, 0x63, 0x3d, 0xa0, 0x24, 0x62, - 0x86, 0x53, 0x34, 0x74, 0x19, 0xca, 0x84, 0xd2, 0x90, 0x36, 0x96, 0x64, 0xd4, 0x7a, 0x4d, 0x6f, - 0x08, 0x21, 0x8e, 0x75, 0xf6, 0xcf, 0x2c, 0x40, 0xb3, 0x67, 0xba, 0x98, 0x86, 0x34, 0x17, 0x55, - 0xbb, 0x5c, 0x83, 0x69, 0x73, 0x9c, 0xda, 0x9c, 0xa3, 0x97, 0x5e, 0x86, 0xf2, 0xc4, 0x19, 0x8e, - 0x89, 0xda, 0xd5, 0x3a, 0x9c, 0x6f, 0x0a, 0x21, 0x8e, 0x75, 0xf6, 0x9f, 0x2d, 0xc8, 0xf7, 0x24, - 0xd9, 0xce, 0xe3, 0xf4, 0xe7, 0xdb, 0x79, 0x36, 0xd5, 0xe7, 0x1f, 0x17, 0xd1, 0x9b, 0x50, 0x77, - 0x38, 0x27, 0xa3, 0x88, 0xcb, 0xaa, 0x2d, 0x3e, 0x76, 0xd5, 0xae, 0x8a, 0x72, 0xb9, 0x15, 0x7a, - 0xfe, 0xa1, 0x2f, 0x2b, 0xd6, 0x74, 0x67, 0x7f, 0x58, 0x84, 0xd5, 0x2c, 0x43, 0x43, 0x63, 0xa8, - 0x48, 0x46, 0x24, 0xbe, 0xe1, 0x29, 0x50, 0x30, 0x9d, 0x12, 0x29, 0x62, 0x58, 0x81, 0x89, 0xee, - 0x4b, 0x93, 0x21, 0x29, 0xd7, 0x7d, 0xf5, 0x78, 0xa4, 0x2d, 0xce, 0x1c, 0x8c, 0x8a, 0x1f, 0xc9, - 0xc1, 0x48, 0x74, 0x20, 0x4f, 0x66, 0x5b, 0xae, 0x65, 0xe9, 0xc9, 0x3b, 0xd0, 0x96, 0xf6, 0x82, - 0x0d, 0x8f, 0x68, 0x1d, 0x0a, 0xbe, 0x27, 0xb7, 0x7e, 0xb1, 0x03, 0xca, 0xb6, 0xb0, 0xbd, 0x85, - 0x0b, 0xbe, 0x67, 0x33, 0x58, 0x36, 0x29, 0xe9, 0xb9, 0x6b, 0xf5, 0x6b, 0xb0, 0x12, 0xff, 0xda, - 0x22, 0xdc, 0xf1, 0x87, 0x4c, 0xad, 0xce, 0xf3, 0xca, 0x7c, 0xa5, 0x67, 0x2a, 0x71, 0xd6, 0xd6, - 0xfe, 0x8f, 0x05, 0xe9, 0x55, 0x0b, 0x3a, 0x84, 0x12, 0x9b, 0x06, 0xae, 0x6a, 0xbd, 0xf3, 0x34, - 0x97, 0xde, 0x34, 0x70, 0xd3, 0x1b, 0x9d, 0xaa, 0xbc, 0xb0, 0x9a, 0x06, 0x2e, 0x96, 0xfe, 0xd1, - 0x04, 0xaa, 0x34, 0x1c, 0x0e, 0x0f, 0x1c, 0xf7, 0x68, 0x01, 0x5d, 0x18, 0x2b, 0x57, 0x29, 0xde, - 0xb2, 0xac, 0x4a, 0x25, 0xc6, 0x1a, 0xcb, 0xfe, 0x5d, 0x19, 0x72, 0x44, 0x1b, 0x8d, 0xcd, 0x5b, - 0x2c, 0x6b, 0x81, 0xb7, 0x58, 0xba, 0xc7, 0x9d, 0x74, 0x93, 0x85, 0x5e, 0x86, 0x72, 0x34, 0x70, - 0x58, 0xd2, 0x5e, 0x36, 0x92, 0x0e, 0xb6, 0x27, 0x84, 0x8f, 0xcc, 0x79, 0x40, 0x4a, 0x70, 0x6c, - 0x6d, 0xf6, 0xa5, 0xe2, 0x19, 0x7d, 0xe9, 0x87, 0x00, 0x22, 0xd7, 0x6a, 0x62, 0x8d, 0x4b, 0xf9, - 0xf6, 0xa2, 0x56, 0x54, 0x0d, 0xad, 0xb2, 0x75, 0xf5, 0x34, 0x0a, 0x36, 0x10, 0xd1, 0x3b, 0x16, - 0xac, 0x26, 0x89, 0x57, 0x41, 0x94, 0x9f, 0x4a, 0x10, 0x72, 0x7c, 0xc2, 0x19, 0x24, 0x9c, 0x43, - 0x46, 0xdf, 0x86, 0x1a, 0xe3, 0x0e, 0x8d, 0x5b, 0x74, 0xe5, 0xb1, 0xb7, 0xb5, 0x5e, 0xcb, 0x5e, - 0xe2, 0x04, 0xa7, 0xfe, 0xd0, 0x1b, 0x00, 0x87, 0x7e, 0xe0, 0xb3, 0x81, 0xf4, 0xbe, 0xf4, 0x64, - 0x07, 0xc0, 0x2b, 0xda, 0x03, 0x36, 0xbc, 0xd9, 0xff, 0x28, 0x00, 0x60, 0x12, 0x85, 0xcc, 0x97, + // 2117 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xcd, 0x8f, 0x1b, 0x49, + 0x15, 0x9f, 0xf6, 0xd7, 0xd8, 0xcf, 0xf3, 0x91, 0xd4, 0xb2, 0x8b, 0x35, 0x2b, 0xcd, 0x8c, 0x3a, + 0x7c, 0x04, 0xc4, 0xda, 0x24, 0xb0, 0x7c, 0x0b, 0x29, 0xf6, 0x64, 0x37, 0xb3, 0x33, 0x49, 0x86, + 0xf2, 0x2c, 0x48, 0xcb, 0x0a, 0xe8, 0xe9, 0xae, 0xb1, 0x3b, 0x63, 0x77, 0xf7, 0x56, 0x95, 0x1d, + 0x59, 0x02, 0xb4, 0x08, 0x21, 0xa1, 0x15, 0xac, 0xf8, 0xf8, 0x07, 0x38, 0x73, 0x41, 0x42, 0x9c, + 0x38, 0x72, 0x40, 0x39, 0x2e, 0x12, 0x88, 0x15, 0x42, 0x11, 0x99, 0xbd, 0x44, 0xe2, 0xc0, 0x3d, + 0x27, 0x54, 0xd5, 0xd5, 0xd5, 0xd5, 0xed, 0x19, 0x66, 0x12, 0x3b, 0x61, 0x6f, 0xee, 0xf7, 0x5e, + 0xbf, 0x5f, 0xf5, 0xab, 0x57, 0xef, 0xfd, 0x5e, 0x19, 0xb6, 0x7b, 0x3e, 0xef, 0x8f, 0x0e, 0x9a, + 0x6e, 0x38, 0x6c, 0x39, 0xb4, 0x17, 0x46, 0x34, 0xbc, 0x23, 0x7f, 0xbc, 0xe4, 0x7a, 0xad, 0xe8, + 0xa8, 0xd7, 0x72, 0x22, 0x9f, 0xb5, 0x9c, 0x28, 0x1a, 0xf8, 0xae, 0xc3, 0xfd, 0x30, 0x68, 0x8d, + 0xaf, 0x38, 0x83, 0xa8, 0xef, 0x5c, 0x69, 0xf5, 0x48, 0x40, 0xa8, 0xc3, 0x89, 0xd7, 0x8c, 0x68, + 0xc8, 0x43, 0xf4, 0xe5, 0xd4, 0x55, 0x33, 0x71, 0x25, 0x7f, 0x7c, 0xd7, 0xf5, 0x9a, 0xd1, 0x51, + 0xaf, 0x29, 0x5c, 0x35, 0x0d, 0x57, 0xcd, 0xc4, 0xd5, 0xda, 0x4b, 0xc6, 0x2a, 0x7a, 0x61, 0x2f, + 0x6c, 0x49, 0x8f, 0x07, 0xa3, 0x43, 0xf9, 0x24, 0x1f, 0xe4, 0xaf, 0x18, 0x69, 0xed, 0xf3, 0x47, + 0x5f, 0x62, 0x4d, 0x3f, 0x14, 0x6b, 0x1b, 0x3a, 0x6e, 0xdf, 0x0f, 0x08, 0x9d, 0xa4, 0x8b, 0x1d, + 0x12, 0xee, 0xb4, 0xc6, 0x53, 0xeb, 0x5b, 0x6b, 0x9d, 0xf6, 0x16, 0x1d, 0x05, 0xdc, 0x1f, 0x92, + 0xa9, 0x17, 0xbe, 0x70, 0xd6, 0x0b, 0xcc, 0xed, 0x93, 0xa1, 0x33, 0xf5, 0xde, 0xe7, 0x4e, 0x7b, + 0x6f, 0xc4, 0xfd, 0x41, 0xcb, 0x0f, 0x38, 0xe3, 0x34, 0xff, 0x92, 0xfd, 0xe7, 0x22, 0xd4, 0xaf, + 0xa5, 0xb1, 0x41, 0xdf, 0x83, 0xaa, 0xf8, 0x10, 0xcf, 0xe1, 0x4e, 0xc3, 0xda, 0xb4, 0x2e, 0xd7, + 0xaf, 0x7e, 0xb6, 0x19, 0xfb, 0x6d, 0x9a, 0x7e, 0xd3, 0xc0, 0x0a, 0xeb, 0xe6, 0xf8, 0x4a, 0xf3, + 0xf6, 0xc1, 0x1d, 0xe2, 0xf2, 0x9b, 0x84, 0x3b, 0x6d, 0x74, 0xef, 0xfe, 0xc6, 0xc2, 0xf1, 0xfd, + 0x0d, 0x48, 0x65, 0x58, 0x7b, 0x45, 0x03, 0x28, 0xb1, 0x88, 0xb8, 0x8d, 0x82, 0xf4, 0xfe, 0x5a, + 0xf3, 0x89, 0xb7, 0xaf, 0x69, 0xac, 0xbb, 0x1b, 0x11, 0xb7, 0xbd, 0xa4, 0x70, 0x4b, 0xe2, 0x09, + 0x4b, 0x14, 0xc4, 0xa1, 0xc2, 0xb8, 0xc3, 0x47, 0xac, 0x51, 0x94, 0x78, 0xbb, 0x73, 0xc2, 0x93, + 0x3e, 0xdb, 0x2b, 0x0a, 0xb1, 0x12, 0x3f, 0x63, 0x85, 0x85, 0xde, 0x82, 0x5a, 0x18, 0x89, 0x38, + 0xfb, 0x61, 0xd0, 0x28, 0x49, 0xe0, 0xad, 0x19, 0x80, 0x6f, 0x27, 0xbe, 0xda, 0xcb, 0xc7, 0xf7, + 0x37, 0x6a, 0xfa, 0x11, 0xa7, 0x28, 0xb6, 0x0b, 0x1f, 0x31, 0xd6, 0xd7, 0x09, 0x03, 0xcf, 0x97, + 0x1b, 0xba, 0x09, 0x25, 0x3e, 0x89, 0x88, 0xdc, 0xcc, 0x5a, 0x1a, 0xa2, 0xfd, 0x49, 0x44, 0xb0, + 0xd4, 0xa0, 0x4f, 0xc1, 0xe2, 0x90, 0x30, 0xe6, 0xf4, 0x88, 0xdc, 0x93, 0x5a, 0x7b, 0x55, 0x19, + 0x2d, 0xde, 0x8c, 0xc5, 0x38, 0xd1, 0xdb, 0x6f, 0xc1, 0x0b, 0x06, 0xc8, 0x16, 0x61, 0xdc, 0x0f, + 0xe2, 0xbc, 0xf9, 0x04, 0x54, 0x18, 0xa1, 0x63, 0x42, 0x15, 0x50, 0x1a, 0x19, 0x29, 0xc5, 0x4a, + 0x8b, 0x5a, 0x50, 0x0b, 0x9c, 0x21, 0x61, 0x91, 0xe3, 0x26, 0x70, 0x17, 0x95, 0x69, 0xed, 0x56, + 0xa2, 0xc0, 0xa9, 0x8d, 0xfd, 0x4f, 0x0b, 0x56, 0x0d, 0xcc, 0x5d, 0x9f, 0x71, 0xf4, 0xe6, 0x54, + 0x92, 0x36, 0xcf, 0x97, 0xa4, 0xe2, 0x6d, 0x99, 0xa2, 0x17, 0x14, 0x66, 0x35, 0x91, 0x18, 0x09, + 0x7a, 0x04, 0x65, 0x9f, 0x93, 0x21, 0x6b, 0x14, 0x36, 0x8b, 0x97, 0xeb, 0x57, 0x5f, 0x99, 0x4f, + 0xc6, 0xb4, 0x97, 0x15, 0x64, 0x79, 0x5b, 0x38, 0xc7, 0x31, 0x86, 0xfd, 0x6e, 0x11, 0x2e, 0x9a, + 0x79, 0x15, 0x8e, 0xa8, 0x2b, 0xb7, 0x84, 0x92, 0x28, 0x7c, 0x1d, 0xef, 0xaa, 0x70, 0xea, 0x2d, + 0xc1, 0xb1, 0x18, 0x27, 0x7a, 0xb1, 0xbf, 0x91, 0xc3, 0xfb, 0x2a, 0x96, 0x7a, 0x7f, 0xf7, 0x1c, + 0xde, 0xc7, 0x52, 0x83, 0x5e, 0x86, 0x3a, 0x09, 0xc6, 0x3e, 0x0d, 0x83, 0x21, 0x09, 0xb8, 0x3c, + 0x07, 0xb5, 0xf6, 0x73, 0xca, 0xb0, 0x7e, 0x3d, 0x55, 0x61, 0xd3, 0x0e, 0x7d, 0x1d, 0x56, 0xb8, + 0x43, 0x7b, 0x84, 0x63, 0x32, 0xf6, 0x59, 0x92, 0xc8, 0xb5, 0xf6, 0x0b, 0xea, 0xcd, 0x95, 0xfd, + 0x8c, 0x16, 0xe7, 0xac, 0xd1, 0x1f, 0x2c, 0x78, 0xd1, 0x0d, 0x87, 0x51, 0x18, 0x90, 0x80, 0xef, + 0x39, 0xd4, 0x19, 0x12, 0x4e, 0xe8, 0xed, 0x31, 0xa1, 0xd4, 0xf7, 0x08, 0x6b, 0x94, 0x65, 0x74, + 0x6f, 0xce, 0x10, 0xdd, 0xce, 0x94, 0xf7, 0xf6, 0x25, 0xb5, 0xb8, 0x17, 0x3b, 0xa7, 0x23, 0xe3, + 0xff, 0xb5, 0x2c, 0xfb, 0x57, 0x85, 0x4c, 0xbe, 0x75, 0x93, 0x22, 0x22, 0x37, 0x46, 0x65, 0xdb, + 0xbc, 0x8a, 0x88, 0xf4, 0x69, 0x1c, 0x15, 0xf9, 0x8c, 0x15, 0x16, 0xfa, 0xa9, 0x05, 0x75, 0x2f, + 0x3d, 0x62, 0xaa, 0x60, 0x7e, 0x63, 0x3e, 0xd8, 0xc6, 0xd9, 0x4d, 0x73, 0xc1, 0x10, 0x62, 0x13, + 0xda, 0xfe, 0x4d, 0x25, 0x9b, 0xa5, 0x71, 0x95, 0xfb, 0xa5, 0x05, 0x17, 0x44, 0x28, 0x1d, 0xea, + 0xb3, 0x30, 0xc0, 0x84, 0x8d, 0x06, 0x5c, 0x45, 0x68, 0x67, 0xc6, 0x6d, 0x35, 0x5d, 0xb6, 0x1b, + 0x6a, 0x7d, 0x17, 0xf2, 0x1a, 0x3c, 0x05, 0x8f, 0x38, 0x2c, 0xf6, 0x7d, 0xc6, 0x43, 0x3a, 0x51, + 0xc7, 0x77, 0x7b, 0x86, 0x95, 0x6c, 0x91, 0x68, 0x10, 0x4e, 0xc4, 0x69, 0xd8, 0x0e, 0x0e, 0xc3, + 0xf4, 0x10, 0xde, 0x88, 0x11, 0x70, 0x02, 0x85, 0x7e, 0x64, 0x01, 0x44, 0x49, 0x2e, 0x89, 0x56, + 0xf3, 0x14, 0x52, 0x5b, 0x77, 0x55, 0x2d, 0x62, 0xd8, 0x00, 0x45, 0x21, 0x54, 0xfa, 0xc4, 0x19, + 0xf0, 0xbe, 0x6a, 0x38, 0xaf, 0xce, 0x00, 0x7f, 0x43, 0x3a, 0xca, 0x37, 0xb9, 0x58, 0x8a, 0x15, + 0x0c, 0xfa, 0x89, 0x05, 0x2b, 0xba, 0xff, 0x08, 0x5b, 0xd2, 0x28, 0x4b, 0xe4, 0xed, 0x79, 0xb4, + 0x3a, 0xe9, 0xb0, 0x8d, 0x44, 0xa1, 0xc9, 0xca, 0x70, 0x0e, 0x14, 0xfd, 0xd8, 0x02, 0x70, 0x93, + 0x7e, 0xc7, 0x1a, 0x15, 0x19, 0xfc, 0xdb, 0xf3, 0x39, 0x26, 0xba, 0x8f, 0xa6, 0xe1, 0xd7, 0x22, + 0x86, 0x0d, 0x58, 0xfb, 0x03, 0x0b, 0x9e, 0x37, 0x5e, 0xfc, 0x96, 0xc3, 0xdd, 0xfe, 0xf5, 0xb1, + 0x28, 0xa4, 0x3b, 0x99, 0x0e, 0xfc, 0x45, 0xb3, 0x03, 0x3f, 0xba, 0xbf, 0xf1, 0xc9, 0xd3, 0x58, + 0xdb, 0x5d, 0xe1, 0xa1, 0x29, 0x5d, 0x18, 0xcd, 0xfa, 0x07, 0x50, 0x37, 0xd6, 0xac, 0x6a, 0xc2, + 0xbc, 0x5a, 0x94, 0x2e, 0x04, 0x86, 0x10, 0x9b, 0x78, 0xf6, 0xdf, 0x0a, 0xb0, 0xd8, 0x19, 0x8c, + 0x18, 0x27, 0xf4, 0xdc, 0x2d, 0x7f, 0x13, 0x4a, 0xa2, 0x9d, 0xe7, 0x3b, 0x94, 0xe8, 0xf6, 0x58, + 0x6a, 0x50, 0x04, 0x15, 0x37, 0x0c, 0x0e, 0xfd, 0x9e, 0x22, 0x69, 0x37, 0x66, 0x39, 0x39, 0xf1, + 0xea, 0x3a, 0xd2, 0x5f, 0xba, 0xa6, 0xf8, 0x19, 0x2b, 0x1c, 0xf4, 0x73, 0x0b, 0x56, 0xdd, 0x30, + 0x08, 0x88, 0x9b, 0x26, 0x6f, 0x69, 0x66, 0x42, 0xda, 0xc9, 0x7a, 0x6c, 0x7f, 0x54, 0xa1, 0xaf, + 0xe6, 0x14, 0x38, 0x8f, 0x6d, 0xff, 0xbe, 0x00, 0xcb, 0x99, 0x95, 0xa3, 0xcf, 0x40, 0x75, 0xc4, + 0x08, 0x95, 0x91, 0x8b, 0xe3, 0xab, 0x39, 0xcb, 0xeb, 0x4a, 0x8e, 0xb5, 0x85, 0xb0, 0x8e, 0x1c, + 0xc6, 0xee, 0x86, 0xd4, 0x53, 0x71, 0xd6, 0xd6, 0x7b, 0x4a, 0x8e, 0xb5, 0x85, 0x60, 0x04, 0x07, + 0xc4, 0xa1, 0x84, 0xee, 0x87, 0x47, 0x24, 0xc8, 0x33, 0x82, 0x76, 0xaa, 0xc2, 0xa6, 0x9d, 0x0c, + 0x1a, 0x1f, 0xb0, 0xce, 0xc0, 0x27, 0x01, 0x8f, 0x97, 0x39, 0x87, 0xa0, 0xed, 0xef, 0x76, 0x4d, + 0x8f, 0x69, 0xd0, 0x72, 0x0a, 0x9c, 0xc7, 0xb6, 0xff, 0x6a, 0x41, 0x5d, 0x05, 0xed, 0x19, 0xd0, + 0xc2, 0x5e, 0x96, 0x16, 0xb6, 0x67, 0xcf, 0xd1, 0x53, 0x28, 0xe1, 0x5f, 0x8a, 0x30, 0xd5, 0xe9, + 0xd0, 0x77, 0x44, 0x8d, 0x13, 0x32, 0xe2, 0x5d, 0x4b, 0x9a, 0xec, 0xa7, 0xcf, 0xf7, 0x75, 0xfb, + 0xfe, 0x90, 0x98, 0xe5, 0x2b, 0xf1, 0x82, 0x0d, 0x8f, 0xe8, 0x6d, 0x2b, 0x05, 0xd8, 0x0f, 0x55, + 0x5d, 0x99, 0x2f, 0xcf, 0x99, 0x5a, 0xc2, 0x7e, 0x88, 0x0d, 0x4c, 0xf4, 0x15, 0x3d, 0xaa, 0x95, + 0x65, 0x42, 0xda, 0xd9, 0xe1, 0xea, 0x51, 0x86, 0x00, 0xe4, 0x06, 0xae, 0x09, 0xd4, 0x28, 0x89, + 0x79, 0x53, 0xd2, 0x01, 0x66, 0x29, 0x22, 0x58, 0xf9, 0x8a, 0x8f, 0xb1, 0x1e, 0x50, 0x12, 0x31, + 0xc3, 0x29, 0x1a, 0xba, 0x04, 0x65, 0x42, 0x69, 0x48, 0x1b, 0x8b, 0x72, 0xd5, 0x7a, 0x4f, 0xaf, + 0x0b, 0x21, 0x8e, 0x75, 0xf6, 0xcf, 0x2c, 0x40, 0xd3, 0x3d, 0x5d, 0x4c, 0x43, 0x9a, 0x8b, 0xaa, + 0x53, 0xae, 0xc1, 0xb4, 0x39, 0x4e, 0x6d, 0xce, 0x51, 0x4b, 0x2f, 0x41, 0x79, 0xec, 0x0c, 0x46, + 0x44, 0x9d, 0x6a, 0xbd, 0x9c, 0x6f, 0x0a, 0x21, 0x8e, 0x75, 0xf6, 0x9f, 0x2c, 0xc8, 0xd7, 0x24, + 0x59, 0xce, 0xe3, 0xf0, 0xe7, 0xcb, 0x79, 0x36, 0xd4, 0xe7, 0x1f, 0x17, 0xd1, 0x9b, 0x50, 0x77, + 0x38, 0x27, 0xc3, 0x88, 0xcb, 0xac, 0x2d, 0x3e, 0x76, 0xd6, 0xae, 0x88, 0x74, 0xb9, 0x19, 0x7a, + 0xfe, 0xa1, 0x2f, 0x33, 0xd6, 0x74, 0x67, 0x3f, 0x2c, 0xc2, 0x4a, 0x96, 0xa1, 0xa1, 0x11, 0x54, + 0x24, 0x23, 0x12, 0xdf, 0xf0, 0x14, 0x28, 0x98, 0x0e, 0x89, 0x14, 0x31, 0xac, 0xc0, 0x44, 0xf5, + 0xa5, 0xc9, 0x90, 0x94, 0xab, 0xbe, 0x7a, 0x3c, 0xd2, 0x16, 0x67, 0x0e, 0x46, 0xc5, 0x0f, 0xe5, + 0x60, 0x24, 0x2a, 0x90, 0x27, 0xa3, 0x2d, 0xf7, 0xb2, 0xf4, 0xe4, 0x15, 0x68, 0x4b, 0x7b, 0xc1, + 0x86, 0x47, 0xb4, 0x06, 0x05, 0xdf, 0x93, 0x47, 0xbf, 0xd8, 0x06, 0x65, 0x5b, 0xd8, 0xde, 0xc2, + 0x05, 0xdf, 0xb3, 0x19, 0x2c, 0x99, 0x94, 0xf4, 0xdc, 0xb9, 0xfa, 0x55, 0x58, 0x8e, 0x7f, 0x6d, + 0x11, 0xee, 0xf8, 0x03, 0xa6, 0x76, 0xe7, 0x79, 0x65, 0xbe, 0xdc, 0x35, 0x95, 0x38, 0x6b, 0x6b, + 0xff, 0xdb, 0x82, 0xf4, 0xaa, 0x05, 0x1d, 0x42, 0x89, 0x4d, 0x02, 0x57, 0x95, 0xde, 0x59, 0x8a, + 0x4b, 0x77, 0x12, 0xb8, 0xe9, 0x8d, 0x4e, 0x55, 0x5e, 0x58, 0x4d, 0x02, 0x17, 0x4b, 0xff, 0x68, + 0x0c, 0x55, 0x1a, 0x0e, 0x06, 0x07, 0x8e, 0x7b, 0x34, 0x87, 0x2a, 0x8c, 0x95, 0xab, 0x14, 0x6f, + 0x49, 0x66, 0xa5, 0x12, 0x63, 0x8d, 0x65, 0xff, 0xae, 0x0c, 0x39, 0xa2, 0x8d, 0x46, 0xe6, 0x2d, + 0x96, 0x35, 0xc7, 0x5b, 0x2c, 0x5d, 0xe3, 0x4e, 0xba, 0xc9, 0x42, 0x2f, 0x43, 0x39, 0xea, 0x3b, + 0x2c, 0x29, 0x2f, 0x1b, 0x49, 0x05, 0xdb, 0x13, 0xc2, 0x47, 0xe6, 0x3c, 0x20, 0x25, 0x38, 0xb6, + 0x36, 0xeb, 0x52, 0xf1, 0x8c, 0xba, 0xf4, 0x43, 0x00, 0x11, 0x6b, 0x35, 0xb1, 0xc6, 0xa9, 0x7c, + 0x6b, 0x5e, 0x3b, 0xaa, 0x86, 0x56, 0x59, 0xba, 0xba, 0x1a, 0x05, 0x1b, 0x88, 0xe8, 0x1d, 0x0b, + 0x56, 0x92, 0xc0, 0xab, 0x45, 0x94, 0x9f, 0xca, 0x22, 0xe4, 0xf8, 0x84, 0x33, 0x48, 0x38, 0x87, + 0x8c, 0xbe, 0x0d, 0x35, 0xc6, 0x1d, 0x1a, 0x97, 0xe8, 0xca, 0x63, 0x1f, 0x6b, 0xbd, 0x97, 0xdd, + 0xc4, 0x09, 0x4e, 0xfd, 0xa1, 0x37, 0x00, 0x0e, 0xfd, 0xc0, 0x67, 0x7d, 0xe9, 0x7d, 0xf1, 0xc9, + 0x1a, 0xc0, 0x2b, 0xda, 0x03, 0x36, 0xbc, 0xd9, 0x7f, 0x2f, 0x00, 0x60, 0x12, 0x85, 0xcc, 0x97, 0x33, 0xf8, 0x26, 0x94, 0x28, 0x89, 0xc2, 0xfc, 0x45, 0xa7, 0xb0, 0xc0, 0x52, 0x93, 0xa1, 0xd4, - 0x85, 0xc7, 0xa2, 0xd4, 0xc5, 0x33, 0x29, 0xb5, 0xe8, 0x34, 0x6c, 0xb0, 0x47, 0xfd, 0x89, 0xc3, - 0xc9, 0x0e, 0x99, 0xaa, 0xcb, 0xb2, 0xb4, 0xd3, 0xf4, 0x6e, 0xa6, 0x4a, 0x9c, 0xb5, 0x3d, 0x71, - 0x1a, 0x29, 0xff, 0x1f, 0xa7, 0x91, 0x7f, 0x5a, 0xb0, 0x9a, 0x66, 0xf6, 0x19, 0x70, 0xeb, 0xbb, - 0x59, 0x6e, 0x7d, 0x63, 0x2e, 0xea, 0x96, 0xc4, 0x7d, 0x0a, 0xbd, 0xfe, 0xbd, 0x05, 0x6b, 0x09, - 0x91, 0x53, 0xad, 0x5e, 0xd3, 0x2a, 0xeb, 0x54, 0x5a, 0xb5, 0x09, 0xa5, 0x23, 0x3f, 0xf0, 0xf2, - 0xc4, 0x6b, 0xc7, 0x0f, 0x3c, 0x2c, 0x35, 0xd9, 0x9b, 0xed, 0xe2, 0xd9, 0x37, 0xdb, 0x66, 0xc3, - 0x2a, 0x9d, 0x71, 0xef, 0xfe, 0x5b, 0x0b, 0x96, 0x93, 0x98, 0x6f, 0x87, 0x9e, 0x64, 0x79, 0x4c, - 0x96, 0x89, 0x95, 0x65, 0x79, 0xf1, 0x82, 0xc6, 0x3a, 0x34, 0x86, 0xaa, 0x3b, 0xf0, 0x87, 0x1e, - 0x25, 0x81, 0x4a, 0xec, 0xab, 0x0b, 0xe0, 0xc4, 0x02, 0x3f, 0x5d, 0xcc, 0xae, 0x02, 0xc0, 0x1a, - 0xca, 0xfe, 0x53, 0x11, 0x56, 0x32, 0x04, 0x5a, 0xcc, 0x9b, 0xf1, 0xe5, 0x70, 0xcf, 0x88, 0x59, - 0xcf, 0x9b, 0xfb, 0xa9, 0x0a, 0x9b, 0x76, 0x22, 0xa3, 0x43, 0x7f, 0x12, 0xfb, 0xc8, 0xff, 0x57, - 0xb0, 0x9b, 0x28, 0x70, 0x6a, 0x63, 0x4c, 0x10, 0xc5, 0xc7, 0x9e, 0x20, 0x7e, 0x6d, 0x01, 0x92, - 0x9f, 0x20, 0x3c, 0x6b, 0xa2, 0xdf, 0x28, 0x2d, 0x36, 0x6f, 0xeb, 0x2a, 0x22, 0xd4, 0x9d, 0x81, - 0xc2, 0x27, 0xc0, 0x1b, 0x97, 0x7a, 0xe5, 0x67, 0x72, 0xa9, 0x67, 0x7f, 0x1f, 0x2e, 0xcd, 0x70, - 0x06, 0x45, 0xcd, 0xac, 0x93, 0xa8, 0x99, 0xa8, 0xc4, 0x88, 0x8e, 0x83, 0x78, 0x81, 0xaa, 0x69, - 0x25, 0xee, 0x09, 0x21, 0x8e, 0x75, 0x82, 0xaf, 0x79, 0x74, 0x8a, 0xc7, 0xf1, 0x5d, 0x43, 0x35, - 0x45, 0xdf, 0x92, 0x52, 0xac, 0xb4, 0xf6, 0x3b, 0x16, 0xac, 0x64, 0xce, 0xb1, 0x0c, 0xb5, 0xb6, - 0xce, 0xa4, 0xd6, 0x0b, 0x0d, 0xe6, 0x5d, 0x0b, 0x9e, 0x3b, 0xe1, 0x50, 0x45, 0xf7, 0xcc, 0x59, - 0x33, 0x9e, 0x33, 0x5e, 0x5b, 0x40, 0x7d, 0xa8, 0x5e, 0x14, 0xff, 0xc5, 0x77, 0xd2, 0xa4, 0x69, - 0x7f, 0x68, 0x41, 0xfe, 0x52, 0x44, 0xe4, 0xc7, 0x0f, 0x18, 0x71, 0xc7, 0x34, 0xde, 0x57, 0xd5, - 0x34, 0x3f, 0xdb, 0x4a, 0x8e, 0xb5, 0x05, 0xba, 0x06, 0x10, 0x5f, 0xca, 0xdd, 0x4e, 0xcf, 0x40, - 0xcd, 0xcb, 0x7b, 0x5a, 0x83, 0x0d, 0x2b, 0x74, 0x05, 0xaa, 0x2e, 0xa1, 0x7c, 0x4b, 0x74, 0x7e, - 0x91, 0xb0, 0xe5, 0x98, 0x42, 0x76, 0x95, 0x0c, 0x6b, 0x2d, 0xfa, 0x04, 0x2c, 0x1d, 0x91, 0xa9, - 0x34, 0x2c, 0x49, 0xc3, 0xba, 0x68, 0x66, 0x3b, 0xb1, 0x08, 0x27, 0x3a, 0x64, 0x43, 0xc5, 0x75, - 0xa4, 0x55, 0x59, 0x5a, 0x81, 0xbc, 0x9f, 0xbb, 0x2e, 0x8d, 0x94, 0xa6, 0xd3, 0xba, 0xff, 0xb0, - 0x79, 0xe1, 0xbd, 0x87, 0xcd, 0x0b, 0xef, 0x3f, 0x6c, 0x5e, 0x78, 0xfb, 0xb8, 0x69, 0xdd, 0x3f, - 0x6e, 0x5a, 0xef, 0x1d, 0x37, 0xad, 0xf7, 0x8f, 0x9b, 0xd6, 0xbf, 0x8f, 0x9b, 0xd6, 0x2f, 0x3e, - 0x68, 0x5e, 0x78, 0xa3, 0x9a, 0x24, 0xf1, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x02, 0xa9, 0xb0, - 0x44, 0x50, 0x20, 0x00, 0x00, + 0x85, 0xc7, 0xa2, 0xd4, 0xc5, 0x33, 0x29, 0xb5, 0xa8, 0x34, 0xac, 0xbf, 0x47, 0xfd, 0xb1, 0xc3, + 0xc9, 0x0e, 0x99, 0xa8, 0xcb, 0xb2, 0xb4, 0xd2, 0x74, 0x6f, 0xa4, 0x4a, 0x9c, 0xb5, 0x3d, 0x71, + 0x1a, 0x29, 0xff, 0x1f, 0xa7, 0x91, 0x7f, 0x58, 0xb0, 0x92, 0x46, 0xf6, 0x19, 0x70, 0xeb, 0x3b, + 0x59, 0x6e, 0x7d, 0x7d, 0x26, 0xea, 0x96, 0xac, 0xfb, 0x14, 0x7a, 0xfd, 0x1f, 0x0b, 0x56, 0x13, + 0x22, 0xa7, 0x4a, 0xbd, 0xa6, 0x55, 0xd6, 0xa9, 0xb4, 0x6a, 0x13, 0x4a, 0x47, 0x7e, 0xe0, 0xe5, + 0x89, 0xd7, 0x8e, 0x1f, 0x78, 0x58, 0x6a, 0xb2, 0x37, 0xdb, 0xc5, 0xb3, 0x6f, 0xb6, 0xcd, 0x82, + 0x55, 0x3a, 0xa3, 0x60, 0x7d, 0x2d, 0x47, 0x8d, 0x3f, 0x36, 0x45, 0x8d, 0x91, 0xa6, 0xac, 0x93, + 0xc0, 0xcd, 0x76, 0x41, 0xfb, 0xb7, 0x16, 0x2c, 0x25, 0xea, 0x5b, 0xa1, 0x27, 0x39, 0x22, 0x93, + 0x49, 0x66, 0x65, 0x39, 0x62, 0x9c, 0x0e, 0xb1, 0x0e, 0x8d, 0xa0, 0xea, 0xf6, 0xfd, 0x81, 0x47, + 0x49, 0xa0, 0xb6, 0xe5, 0xd5, 0x39, 0x30, 0x6a, 0x81, 0x9f, 0xa6, 0x42, 0x47, 0x01, 0x60, 0x0d, + 0x65, 0xff, 0xb1, 0x08, 0xcb, 0x19, 0xfa, 0x2d, 0xa6, 0xd5, 0xf8, 0x6a, 0xb9, 0x6b, 0xac, 0x59, + 0x4f, 0xab, 0xfb, 0xa9, 0x0a, 0x9b, 0x76, 0x62, 0x3f, 0x06, 0xfe, 0x38, 0xf6, 0x91, 0xff, 0xa7, + 0x61, 0x37, 0x51, 0xe0, 0xd4, 0xc6, 0x98, 0x3f, 0x8a, 0x8f, 0x3d, 0x7f, 0xfc, 0xda, 0x02, 0x24, + 0x3f, 0x41, 0x78, 0xd6, 0x63, 0x42, 0xa3, 0x34, 0xdf, 0xb8, 0xad, 0xa9, 0x15, 0xa1, 0xce, 0x14, + 0x14, 0x3e, 0x01, 0xde, 0xb8, 0x12, 0x2c, 0x3f, 0x93, 0x2b, 0x41, 0xfb, 0xfb, 0x70, 0x71, 0x8a, + 0x71, 0x28, 0x62, 0x67, 0x9d, 0x44, 0xec, 0x44, 0x26, 0x46, 0x74, 0x14, 0xc4, 0x1b, 0x54, 0x4d, + 0x33, 0x71, 0x4f, 0x08, 0x71, 0xac, 0x13, 0x6c, 0xcf, 0xa3, 0x13, 0x3c, 0x8a, 0x6f, 0x2a, 0xaa, + 0x29, 0xfa, 0x96, 0x94, 0x62, 0xa5, 0xb5, 0xdf, 0xb1, 0x60, 0x39, 0xd3, 0x05, 0x33, 0xc4, 0xdc, + 0x3a, 0x93, 0x98, 0xcf, 0x75, 0x31, 0xef, 0x5a, 0xf0, 0xdc, 0x09, 0x2d, 0x19, 0xdd, 0x35, 0x27, + 0xd5, 0x78, 0x4a, 0x79, 0x6d, 0x0e, 0xf9, 0xa1, 0x2a, 0x59, 0xfc, 0x07, 0xe1, 0x49, 0x73, 0xaa, + 0xfd, 0xd0, 0x82, 0xfc, 0x95, 0x8a, 0x88, 0x8f, 0x1f, 0x30, 0xe2, 0x8e, 0x68, 0x7c, 0xae, 0xaa, + 0x69, 0x7c, 0xb6, 0x95, 0x1c, 0x6b, 0x0b, 0x74, 0x15, 0x20, 0xbe, 0xd2, 0xbb, 0x95, 0x76, 0x50, + 0xcd, 0xea, 0xbb, 0x5a, 0x83, 0x0d, 0x2b, 0x74, 0x19, 0xaa, 0x2e, 0xa1, 0x7c, 0x4b, 0xf4, 0x0d, + 0x11, 0xb0, 0xa5, 0x98, 0x80, 0x76, 0x94, 0x0c, 0x6b, 0x2d, 0xfa, 0x38, 0x2c, 0x1e, 0x91, 0x89, + 0x34, 0x2c, 0x49, 0xc3, 0xba, 0x28, 0x85, 0x3b, 0xb1, 0x08, 0x27, 0x3a, 0x64, 0x43, 0xc5, 0x75, + 0xa4, 0x55, 0x59, 0x5a, 0x81, 0xbc, 0xdd, 0xbb, 0x26, 0x8d, 0x94, 0xa6, 0xdd, 0xbc, 0xf7, 0x60, + 0x7d, 0xe1, 0xbd, 0x07, 0xeb, 0x0b, 0xef, 0x3f, 0x58, 0x5f, 0x78, 0xfb, 0x78, 0xdd, 0xba, 0x77, + 0xbc, 0x6e, 0xbd, 0x77, 0xbc, 0x6e, 0xbd, 0x7f, 0xbc, 0x6e, 0xfd, 0xeb, 0x78, 0xdd, 0xfa, 0xc5, + 0x07, 0xeb, 0x0b, 0x6f, 0x54, 0x93, 0x20, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0x88, 0x76, 0xce, + 0xcf, 0x8e, 0x20, 0x00, 0x00, } diff --git a/pkg/apis/application/v1alpha1/generated.proto b/pkg/apis/application/v1alpha1/generated.proto index a406357d68..52ae88d778 100644 --- a/pkg/apis/application/v1alpha1/generated.proto +++ b/pkg/apis/application/v1alpha1/generated.proto @@ -256,6 +256,8 @@ message ResourceDetails { optional string namespace = 3; optional string message = 4; + + optional string status = 5; } // ResourceNode contains information about live resource and its children diff --git a/pkg/apis/application/v1alpha1/types.go b/pkg/apis/application/v1alpha1/types.go index b439a546ce..d1ee66a9b5 100644 --- a/pkg/apis/application/v1alpha1/types.go +++ b/pkg/apis/application/v1alpha1/types.go @@ -74,11 +74,21 @@ type SyncOperationResult struct { Resources []*ResourceDetails `json:"resources" protobuf:"bytes,1,opt,name=resources"` } +type ResourceSyncStatus string + +const ( + ResourceDetailsSynced ResourceSyncStatus = "Synced" + ResourceDetailsSyncFailed ResourceSyncStatus = "SyncFailed" + ResourceDetailsSyncedAndPruned ResourceSyncStatus = "SyncedAndPruned" + ResourceDetailsPruningRequired ResourceSyncStatus = "PruningRequired" +) + type ResourceDetails struct { - Name string `json:"name" protobuf:"bytes,1,opt,name=name"` - Kind string `json:"kind" protobuf:"bytes,2,opt,name=kind"` - Namespace string `json:"namespace" protobuf:"bytes,3,opt,name=namespace"` - Message string `json:"message,omitempty" protobuf:"bytes,4,opt,name=message"` + Name string `json:"name" protobuf:"bytes,1,opt,name=name"` + Kind string `json:"kind" protobuf:"bytes,2,opt,name=kind"` + Namespace string `json:"namespace" protobuf:"bytes,3,opt,name=namespace"` + Message string `json:"message,omitempty" protobuf:"bytes,4,opt,name=message"` + Status ResourceSyncStatus `json:"status,omitempty" protobuf:"bytes,5,opt,name=status"` } // DeploymentInfo contains information relevant to an application deployment