diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go index b862c31d6ed1e..04c3c34092bcd 100644 --- a/cmd/argocd/commands/app.go +++ b/cmd/argocd/commands/app.go @@ -1146,7 +1146,9 @@ func NewApplicationHistoryCommand(clientOpts *argocdclient.ClientOptions) *cobra for _, depInfo := range app.Status.History { switch output { case "wide": - paramStr := paramString(depInfo.Params) + manifest, err := appIf.GetManifests(context.Background(), &application.ApplicationManifestQuery{Name: &appName, Revision: depInfo.Revision}) + errors.CheckError(err) + paramStr := paramString(manifest.GetParams()) fmt.Fprintf(w, "%d\t%s\t%s\t%s\n", depInfo.ID, depInfo.DeployedAt, depInfo.Revision, paramStr) default: fmt.Fprintf(w, "%d\t%s\t%s\n", depInfo.ID, depInfo.DeployedAt, depInfo.Revision) @@ -1159,7 +1161,7 @@ func NewApplicationHistoryCommand(clientOpts *argocdclient.ClientOptions) *cobra return command } -func paramString(params []argoappv1.ComponentParameter) string { +func paramString(params []*argoappv1.ComponentParameter) string { if len(params) == 0 { return "" } diff --git a/controller/state.go b/controller/state.go index 2b02010c94fc7..e92928078c7fa 100644 --- a/controller/state.go +++ b/controller/state.go @@ -394,7 +394,6 @@ func (s *appStateManager) persistDeploymentInfo( history := append(app.Status.History, v1alpha1.DeploymentInfo{ ComponentParameterOverrides: app.Spec.Source.ComponentParameterOverrides, Revision: revision, - Params: params, DeployedAt: metav1.NewTime(time.Now().UTC()), ID: nextID, }) diff --git a/pkg/apis/application/v1alpha1/generated.pb.go b/pkg/apis/application/v1alpha1/generated.pb.go index fcb9ca86c7867..cb3c758eedf5d 100644 --- a/pkg/apis/application/v1alpha1/generated.pb.go +++ b/pkg/apis/application/v1alpha1/generated.pb.go @@ -30,7 +30,7 @@ const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package func (m *AWSAuthConfig) Reset() { *m = AWSAuthConfig{} } func (*AWSAuthConfig) ProtoMessage() {} func (*AWSAuthConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{0} + return fileDescriptor_generated_639498dd9e5881d3, []int{0} } func (m *AWSAuthConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -58,7 +58,7 @@ var xxx_messageInfo_AWSAuthConfig proto.InternalMessageInfo func (m *AppProject) Reset() { *m = AppProject{} } func (*AppProject) ProtoMessage() {} func (*AppProject) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{1} + return fileDescriptor_generated_639498dd9e5881d3, []int{1} } func (m *AppProject) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -86,7 +86,7 @@ var xxx_messageInfo_AppProject proto.InternalMessageInfo func (m *AppProjectList) Reset() { *m = AppProjectList{} } func (*AppProjectList) ProtoMessage() {} func (*AppProjectList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{2} + return fileDescriptor_generated_639498dd9e5881d3, []int{2} } func (m *AppProjectList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -114,7 +114,7 @@ var xxx_messageInfo_AppProjectList proto.InternalMessageInfo func (m *AppProjectSpec) Reset() { *m = AppProjectSpec{} } func (*AppProjectSpec) ProtoMessage() {} func (*AppProjectSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{3} + return fileDescriptor_generated_639498dd9e5881d3, []int{3} } func (m *AppProjectSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -142,7 +142,7 @@ var xxx_messageInfo_AppProjectSpec proto.InternalMessageInfo func (m *Application) Reset() { *m = Application{} } func (*Application) ProtoMessage() {} func (*Application) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{4} + return fileDescriptor_generated_639498dd9e5881d3, []int{4} } func (m *Application) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -170,7 +170,7 @@ var xxx_messageInfo_Application proto.InternalMessageInfo func (m *ApplicationCondition) Reset() { *m = ApplicationCondition{} } func (*ApplicationCondition) ProtoMessage() {} func (*ApplicationCondition) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{5} + return fileDescriptor_generated_639498dd9e5881d3, []int{5} } func (m *ApplicationCondition) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -198,7 +198,7 @@ var xxx_messageInfo_ApplicationCondition proto.InternalMessageInfo func (m *ApplicationDestination) Reset() { *m = ApplicationDestination{} } func (*ApplicationDestination) ProtoMessage() {} func (*ApplicationDestination) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{6} + return fileDescriptor_generated_639498dd9e5881d3, []int{6} } func (m *ApplicationDestination) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -226,7 +226,7 @@ var xxx_messageInfo_ApplicationDestination proto.InternalMessageInfo func (m *ApplicationList) Reset() { *m = ApplicationList{} } func (*ApplicationList) ProtoMessage() {} func (*ApplicationList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{7} + return fileDescriptor_generated_639498dd9e5881d3, []int{7} } func (m *ApplicationList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -254,7 +254,7 @@ var xxx_messageInfo_ApplicationList proto.InternalMessageInfo func (m *ApplicationSource) Reset() { *m = ApplicationSource{} } func (*ApplicationSource) ProtoMessage() {} func (*ApplicationSource) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{8} + return fileDescriptor_generated_639498dd9e5881d3, []int{8} } func (m *ApplicationSource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -282,7 +282,7 @@ var xxx_messageInfo_ApplicationSource proto.InternalMessageInfo func (m *ApplicationSpec) Reset() { *m = ApplicationSpec{} } func (*ApplicationSpec) ProtoMessage() {} func (*ApplicationSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{9} + return fileDescriptor_generated_639498dd9e5881d3, []int{9} } func (m *ApplicationSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -310,7 +310,7 @@ var xxx_messageInfo_ApplicationSpec proto.InternalMessageInfo func (m *ApplicationStatus) Reset() { *m = ApplicationStatus{} } func (*ApplicationStatus) ProtoMessage() {} func (*ApplicationStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{10} + return fileDescriptor_generated_639498dd9e5881d3, []int{10} } func (m *ApplicationStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -338,7 +338,7 @@ var xxx_messageInfo_ApplicationStatus proto.InternalMessageInfo func (m *ApplicationWatchEvent) Reset() { *m = ApplicationWatchEvent{} } func (*ApplicationWatchEvent) ProtoMessage() {} func (*ApplicationWatchEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{11} + return fileDescriptor_generated_639498dd9e5881d3, []int{11} } func (m *ApplicationWatchEvent) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -366,7 +366,7 @@ var xxx_messageInfo_ApplicationWatchEvent proto.InternalMessageInfo func (m *Cluster) Reset() { *m = Cluster{} } func (*Cluster) ProtoMessage() {} func (*Cluster) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{12} + return fileDescriptor_generated_639498dd9e5881d3, []int{12} } func (m *Cluster) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -394,7 +394,7 @@ var xxx_messageInfo_Cluster proto.InternalMessageInfo func (m *ClusterConfig) Reset() { *m = ClusterConfig{} } func (*ClusterConfig) ProtoMessage() {} func (*ClusterConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{13} + return fileDescriptor_generated_639498dd9e5881d3, []int{13} } func (m *ClusterConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -422,7 +422,7 @@ var xxx_messageInfo_ClusterConfig proto.InternalMessageInfo func (m *ClusterList) Reset() { *m = ClusterList{} } func (*ClusterList) ProtoMessage() {} func (*ClusterList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{14} + return fileDescriptor_generated_639498dd9e5881d3, []int{14} } func (m *ClusterList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -450,7 +450,7 @@ var xxx_messageInfo_ClusterList proto.InternalMessageInfo func (m *ComparisonResult) Reset() { *m = ComparisonResult{} } func (*ComparisonResult) ProtoMessage() {} func (*ComparisonResult) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{15} + return fileDescriptor_generated_639498dd9e5881d3, []int{15} } func (m *ComparisonResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -478,7 +478,7 @@ var xxx_messageInfo_ComparisonResult proto.InternalMessageInfo func (m *ComponentParameter) Reset() { *m = ComponentParameter{} } func (*ComponentParameter) ProtoMessage() {} func (*ComponentParameter) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{16} + return fileDescriptor_generated_639498dd9e5881d3, []int{16} } func (m *ComponentParameter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -506,7 +506,7 @@ var xxx_messageInfo_ComponentParameter proto.InternalMessageInfo func (m *ConnectionState) Reset() { *m = ConnectionState{} } func (*ConnectionState) ProtoMessage() {} func (*ConnectionState) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{17} + return fileDescriptor_generated_639498dd9e5881d3, []int{17} } func (m *ConnectionState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -534,7 +534,7 @@ var xxx_messageInfo_ConnectionState proto.InternalMessageInfo func (m *DeploymentInfo) Reset() { *m = DeploymentInfo{} } func (*DeploymentInfo) ProtoMessage() {} func (*DeploymentInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{18} + return fileDescriptor_generated_639498dd9e5881d3, []int{18} } func (m *DeploymentInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -562,7 +562,7 @@ var xxx_messageInfo_DeploymentInfo proto.InternalMessageInfo func (m *HealthStatus) Reset() { *m = HealthStatus{} } func (*HealthStatus) ProtoMessage() {} func (*HealthStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{19} + return fileDescriptor_generated_639498dd9e5881d3, []int{19} } func (m *HealthStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -590,7 +590,7 @@ var xxx_messageInfo_HealthStatus proto.InternalMessageInfo func (m *HookStatus) Reset() { *m = HookStatus{} } func (*HookStatus) ProtoMessage() {} func (*HookStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{20} + return fileDescriptor_generated_639498dd9e5881d3, []int{20} } func (m *HookStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -618,7 +618,7 @@ var xxx_messageInfo_HookStatus proto.InternalMessageInfo func (m *JWTToken) Reset() { *m = JWTToken{} } func (*JWTToken) ProtoMessage() {} func (*JWTToken) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{21} + return fileDescriptor_generated_639498dd9e5881d3, []int{21} } func (m *JWTToken) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -646,7 +646,7 @@ var xxx_messageInfo_JWTToken proto.InternalMessageInfo func (m *Operation) Reset() { *m = Operation{} } func (*Operation) ProtoMessage() {} func (*Operation) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{22} + return fileDescriptor_generated_639498dd9e5881d3, []int{22} } func (m *Operation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -674,7 +674,7 @@ var xxx_messageInfo_Operation proto.InternalMessageInfo func (m *OperationState) Reset() { *m = OperationState{} } func (*OperationState) ProtoMessage() {} func (*OperationState) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{23} + return fileDescriptor_generated_639498dd9e5881d3, []int{23} } func (m *OperationState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -702,7 +702,7 @@ var xxx_messageInfo_OperationState proto.InternalMessageInfo func (m *ParameterOverrides) Reset() { *m = ParameterOverrides{} } func (*ParameterOverrides) ProtoMessage() {} func (*ParameterOverrides) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{24} + return fileDescriptor_generated_639498dd9e5881d3, []int{24} } func (m *ParameterOverrides) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -730,7 +730,7 @@ var xxx_messageInfo_ParameterOverrides proto.InternalMessageInfo func (m *ProjectRole) Reset() { *m = ProjectRole{} } func (*ProjectRole) ProtoMessage() {} func (*ProjectRole) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{25} + return fileDescriptor_generated_639498dd9e5881d3, []int{25} } func (m *ProjectRole) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -758,7 +758,7 @@ var xxx_messageInfo_ProjectRole proto.InternalMessageInfo func (m *Repository) Reset() { *m = Repository{} } func (*Repository) ProtoMessage() {} func (*Repository) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{26} + return fileDescriptor_generated_639498dd9e5881d3, []int{26} } func (m *Repository) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -786,7 +786,7 @@ var xxx_messageInfo_Repository proto.InternalMessageInfo func (m *RepositoryList) Reset() { *m = RepositoryList{} } func (*RepositoryList) ProtoMessage() {} func (*RepositoryList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{27} + return fileDescriptor_generated_639498dd9e5881d3, []int{27} } func (m *RepositoryList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -814,7 +814,7 @@ var xxx_messageInfo_RepositoryList proto.InternalMessageInfo func (m *ResourceDetails) Reset() { *m = ResourceDetails{} } func (*ResourceDetails) ProtoMessage() {} func (*ResourceDetails) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{28} + return fileDescriptor_generated_639498dd9e5881d3, []int{28} } func (m *ResourceDetails) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -842,7 +842,7 @@ var xxx_messageInfo_ResourceDetails proto.InternalMessageInfo func (m *ResourceNode) Reset() { *m = ResourceNode{} } func (*ResourceNode) ProtoMessage() {} func (*ResourceNode) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{29} + return fileDescriptor_generated_639498dd9e5881d3, []int{29} } func (m *ResourceNode) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -870,7 +870,7 @@ var xxx_messageInfo_ResourceNode proto.InternalMessageInfo func (m *ResourceState) Reset() { *m = ResourceState{} } func (*ResourceState) ProtoMessage() {} func (*ResourceState) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{30} + return fileDescriptor_generated_639498dd9e5881d3, []int{30} } func (m *ResourceState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -898,7 +898,7 @@ var xxx_messageInfo_ResourceState proto.InternalMessageInfo func (m *RollbackOperation) Reset() { *m = RollbackOperation{} } func (*RollbackOperation) ProtoMessage() {} func (*RollbackOperation) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{31} + return fileDescriptor_generated_639498dd9e5881d3, []int{31} } func (m *RollbackOperation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -926,7 +926,7 @@ var xxx_messageInfo_RollbackOperation proto.InternalMessageInfo func (m *SyncOperation) Reset() { *m = SyncOperation{} } func (*SyncOperation) ProtoMessage() {} func (*SyncOperation) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{32} + return fileDescriptor_generated_639498dd9e5881d3, []int{32} } func (m *SyncOperation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -954,7 +954,7 @@ var xxx_messageInfo_SyncOperation proto.InternalMessageInfo func (m *SyncOperationResult) Reset() { *m = SyncOperationResult{} } func (*SyncOperationResult) ProtoMessage() {} func (*SyncOperationResult) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{33} + return fileDescriptor_generated_639498dd9e5881d3, []int{33} } func (m *SyncOperationResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -982,7 +982,7 @@ var xxx_messageInfo_SyncOperationResult proto.InternalMessageInfo func (m *SyncPolicy) Reset() { *m = SyncPolicy{} } func (*SyncPolicy) ProtoMessage() {} func (*SyncPolicy) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{34} + return fileDescriptor_generated_639498dd9e5881d3, []int{34} } func (m *SyncPolicy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1010,7 +1010,7 @@ var xxx_messageInfo_SyncPolicy proto.InternalMessageInfo func (m *SyncPolicyAutomated) Reset() { *m = SyncPolicyAutomated{} } func (*SyncPolicyAutomated) ProtoMessage() {} func (*SyncPolicyAutomated) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{35} + return fileDescriptor_generated_639498dd9e5881d3, []int{35} } func (m *SyncPolicyAutomated) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1038,7 +1038,7 @@ var xxx_messageInfo_SyncPolicyAutomated proto.InternalMessageInfo func (m *SyncStrategy) Reset() { *m = SyncStrategy{} } func (*SyncStrategy) ProtoMessage() {} func (*SyncStrategy) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{36} + return fileDescriptor_generated_639498dd9e5881d3, []int{36} } func (m *SyncStrategy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1066,7 +1066,7 @@ var xxx_messageInfo_SyncStrategy proto.InternalMessageInfo func (m *SyncStrategyApply) Reset() { *m = SyncStrategyApply{} } func (*SyncStrategyApply) ProtoMessage() {} func (*SyncStrategyApply) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{37} + return fileDescriptor_generated_639498dd9e5881d3, []int{37} } func (m *SyncStrategyApply) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1094,7 +1094,7 @@ var xxx_messageInfo_SyncStrategyApply proto.InternalMessageInfo func (m *SyncStrategyHook) Reset() { *m = SyncStrategyHook{} } func (*SyncStrategyHook) ProtoMessage() {} func (*SyncStrategyHook) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{38} + return fileDescriptor_generated_639498dd9e5881d3, []int{38} } func (m *SyncStrategyHook) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1122,7 +1122,7 @@ var xxx_messageInfo_SyncStrategyHook proto.InternalMessageInfo func (m *TLSClientConfig) Reset() { *m = TLSClientConfig{} } func (*TLSClientConfig) ProtoMessage() {} func (*TLSClientConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_1cfd4e79e6b02f22, []int{39} + return fileDescriptor_generated_639498dd9e5881d3, []int{39} } func (m *TLSClientConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1996,18 +1996,6 @@ func (m *DeploymentInfo) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.Params) > 0 { - for _, msg := range m.Params { - dAtA[i] = 0xa - i++ - i = encodeVarintGenerated(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } - } dAtA[i] = 0x12 i++ i = encodeVarintGenerated(dAtA, i, uint64(len(m.Revision))) @@ -3168,12 +3156,6 @@ func (m *ConnectionState) Size() (n int) { func (m *DeploymentInfo) Size() (n int) { var l int _ = l - if len(m.Params) > 0 { - for _, e := range m.Params { - l = e.Size() - n += 1 + l + sovGenerated(uint64(l)) - } - } l = len(m.Revision) n += 1 + l + sovGenerated(uint64(l)) if len(m.ComponentParameterOverrides) > 0 { @@ -3734,7 +3716,6 @@ func (this *DeploymentInfo) String() string { return "nil" } s := strings.Join([]string{`&DeploymentInfo{`, - `Params:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Params), "ComponentParameter", "ComponentParameter", 1), `&`, ``, 1) + `,`, `Revision:` + fmt.Sprintf("%v", this.Revision) + `,`, `ComponentParameterOverrides:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ComponentParameterOverrides), "ComponentParameter", "ComponentParameter", 1), `&`, ``, 1) + `,`, `DeployedAt:` + strings.Replace(strings.Replace(this.DeployedAt.String(), "Time", "v1.Time", 1), `&`, ``, 1) + `,`, @@ -6784,37 +6765,6 @@ func (m *DeploymentInfo) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: DeploymentInfo: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenerated - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Params = append(m.Params, ComponentParameter{}) - if err := m.Params[len(m.Params)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Revision", wireType) @@ -9959,187 +9909,186 @@ var ( ) func init() { - proto.RegisterFile("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto", fileDescriptor_generated_1cfd4e79e6b02f22) + proto.RegisterFile("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto", fileDescriptor_generated_639498dd9e5881d3) } -var fileDescriptor_generated_1cfd4e79e6b02f22 = []byte{ - // 2834 bytes of a gzipped FileDescriptorProto +var fileDescriptor_generated_639498dd9e5881d3 = []byte{ + // 2817 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4d, 0x8c, 0x23, 0x47, 0xf5, 0x9f, 0xf6, 0xc7, 0x8c, 0xe7, 0xcd, 0xc7, 0xee, 0x56, 0x3e, 0xfe, 0xfe, 0x4f, 0xa4, 0x99, 0x51, 0x87, 0x8f, 0x80, 0x12, 0x9b, 0x5d, 0x08, 0x84, 0x80, 0x90, 0xc6, 0x9e, 0xdd, 0xec, 0x64, 0x76, 0x67, 0x87, 0xf2, 0x24, 0x2b, 0x85, 0x28, 0xd0, 0xdb, 0xae, 0xb1, 0x7b, 0x6d, 0x77, 0x77, 0xba, 0xca, 0xde, 0x58, 0x10, 0x14, 0x84, 0x40, 0x7c, 0x4a, 0x40, 0x84, 0x40, 0xe2, 0x12, 0x24, 0x4e, 0x5c, 0xb8, 0x44, 0x1c, 0xb8, 0xc1, 0x01, 0xe5, 0x98, 0x03, 0x88, 0x28, 0x44, 0x23, 0x32, - 0xb9, 0x44, 0xe2, 0xc0, 0x3d, 0x27, 0x54, 0x1f, 0xdd, 0x55, 0xdd, 0xb6, 0x33, 0xb3, 0x6b, 0xef, - 0x02, 0x37, 0x77, 0xbd, 0xd7, 0xef, 0xf7, 0xfa, 0xd5, 0xab, 0xf7, 0x55, 0x86, 0x9d, 0x96, 0xc7, - 0xda, 0xfd, 0x1b, 0x15, 0x37, 0xe8, 0x55, 0x9d, 0xa8, 0x15, 0x84, 0x51, 0x70, 0x53, 0xfc, 0x78, - 0xcc, 0x6d, 0x56, 0xc3, 0x4e, 0xab, 0xea, 0x84, 0x1e, 0xad, 0x3a, 0x61, 0xd8, 0xf5, 0x5c, 0x87, - 0x79, 0x81, 0x5f, 0x1d, 0x9c, 0x77, 0xba, 0x61, 0xdb, 0x39, 0x5f, 0x6d, 0x11, 0x9f, 0x44, 0x0e, - 0x23, 0xcd, 0x4a, 0x18, 0x05, 0x2c, 0x40, 0x9f, 0xd7, 0xa2, 0x2a, 0xb1, 0x28, 0xf1, 0xe3, 0xab, - 0x6e, 0xb3, 0x12, 0x76, 0x5a, 0x15, 0x2e, 0xaa, 0x62, 0x88, 0xaa, 0xc4, 0xa2, 0xd6, 0x1e, 0x33, - 0xb4, 0x68, 0x05, 0xad, 0xa0, 0x2a, 0x24, 0xde, 0xe8, 0x1f, 0x8a, 0x27, 0xf1, 0x20, 0x7e, 0x49, - 0xa4, 0xb5, 0xcf, 0x74, 0x9e, 0xa0, 0x15, 0x2f, 0xe0, 0xba, 0xf5, 0x1c, 0xb7, 0xed, 0xf9, 0x24, - 0x1a, 0x6a, 0x65, 0x7b, 0x84, 0x39, 0xd5, 0xc1, 0x88, 0x7e, 0x6b, 0xd5, 0x49, 0x6f, 0x45, 0x7d, - 0x9f, 0x79, 0x3d, 0x32, 0xf2, 0xc2, 0x67, 0x4f, 0x7a, 0x81, 0xba, 0x6d, 0xd2, 0x73, 0x46, 0xde, - 0xfb, 0xf4, 0xa4, 0xf7, 0xfa, 0xcc, 0xeb, 0x56, 0x3d, 0x9f, 0x51, 0x16, 0x65, 0x5f, 0xb2, 0x5f, - 0x84, 0x95, 0xad, 0xeb, 0x8d, 0xad, 0x3e, 0x6b, 0xd7, 0x03, 0xff, 0xd0, 0x6b, 0xa1, 0xc7, 0x61, - 0xc9, 0xed, 0xf6, 0x29, 0x23, 0xd1, 0x9e, 0xd3, 0x23, 0x65, 0x6b, 0xd3, 0x7a, 0x64, 0xb1, 0x76, - 0xdf, 0x1b, 0x47, 0x1b, 0x73, 0xc7, 0x47, 0x1b, 0x4b, 0x75, 0x4d, 0xc2, 0x26, 0x1f, 0xfa, 0x04, - 0x2c, 0x44, 0x41, 0x97, 0x6c, 0xe1, 0xbd, 0x72, 0x4e, 0xbc, 0x72, 0x46, 0xbd, 0xb2, 0x80, 0xe5, - 0x32, 0x8e, 0xe9, 0xf6, 0xdf, 0x2d, 0x80, 0xad, 0x30, 0xdc, 0x8f, 0x82, 0x9b, 0xc4, 0x65, 0xe8, - 0x6b, 0x50, 0xe2, 0xa6, 0x6b, 0x3a, 0xcc, 0x11, 0x68, 0x4b, 0x17, 0x3e, 0x55, 0x91, 0x5f, 0x52, - 0x31, 0xbf, 0x44, 0x6f, 0x25, 0xe7, 0xae, 0x0c, 0xce, 0x57, 0xae, 0xdd, 0xe0, 0xef, 0x5f, 0x25, - 0xcc, 0xa9, 0x21, 0x05, 0x06, 0x7a, 0x0d, 0x27, 0x52, 0x51, 0x07, 0x0a, 0x34, 0x24, 0xae, 0x50, - 0x6c, 0xe9, 0xc2, 0x4e, 0xe5, 0x8e, 0x1d, 0xa6, 0xa2, 0xd5, 0x6e, 0x84, 0xc4, 0xad, 0x2d, 0x2b, - 0xd8, 0x02, 0x7f, 0xc2, 0x02, 0xc4, 0x7e, 0xdb, 0x82, 0x55, 0xcd, 0x76, 0xc5, 0xa3, 0x0c, 0x3d, - 0x3f, 0xf2, 0x85, 0x95, 0xd3, 0x7d, 0x21, 0x7f, 0x5b, 0x7c, 0xdf, 0x59, 0x05, 0x54, 0x8a, 0x57, - 0x8c, 0xaf, 0xbb, 0x09, 0x45, 0x8f, 0x91, 0x1e, 0x2d, 0xe7, 0x36, 0xf3, 0x8f, 0x2c, 0x5d, 0xb8, - 0x38, 0x93, 0xcf, 0xab, 0xad, 0x28, 0xc4, 0xe2, 0x0e, 0x97, 0x8d, 0x25, 0x84, 0xfd, 0xab, 0xa2, - 0xf9, 0x71, 0xfc, 0xab, 0xd1, 0x79, 0x58, 0xa2, 0x41, 0x3f, 0x72, 0x09, 0x26, 0x61, 0x40, 0xcb, - 0xd6, 0x66, 0x9e, 0x6f, 0x3e, 0xf7, 0x95, 0x86, 0x5e, 0xc6, 0x26, 0x0f, 0xfa, 0xa1, 0x05, 0xcb, - 0x4d, 0x42, 0x99, 0xe7, 0x0b, 0xfc, 0x58, 0xf3, 0x2f, 0x4f, 0xa7, 0x79, 0xbc, 0xb8, 0xad, 0x25, - 0xd7, 0xee, 0x57, 0x5f, 0xb1, 0x6c, 0x2c, 0x52, 0x9c, 0x02, 0xe7, 0x0e, 0xdf, 0x24, 0xd4, 0x8d, - 0xbc, 0x90, 0x3f, 0x97, 0xf3, 0x69, 0x87, 0xdf, 0xd6, 0x24, 0x6c, 0xf2, 0xa1, 0x0e, 0x14, 0xb9, - 0x43, 0xd3, 0x72, 0x41, 0x28, 0x7f, 0x69, 0x0a, 0xe5, 0x95, 0x39, 0xf9, 0x41, 0xd1, 0x76, 0xe7, - 0x4f, 0x14, 0x4b, 0x0c, 0xf4, 0x63, 0x0b, 0xca, 0xea, 0xb4, 0x61, 0x22, 0x4d, 0x79, 0xbd, 0xed, - 0x31, 0xd2, 0xf5, 0x28, 0x2b, 0x17, 0x85, 0x02, 0xd5, 0xd3, 0xb9, 0xd4, 0x53, 0x51, 0xd0, 0x0f, - 0x77, 0x3d, 0xbf, 0x59, 0xdb, 0x54, 0x48, 0xe5, 0xfa, 0x04, 0xc1, 0x78, 0x22, 0x24, 0x7a, 0xd5, - 0x82, 0x35, 0xdf, 0xe9, 0x11, 0x1a, 0x3a, 0x7c, 0x53, 0x25, 0xb9, 0xd6, 0x75, 0xdc, 0x8e, 0xd0, - 0x68, 0xfe, 0xce, 0x34, 0xb2, 0x95, 0x46, 0x6b, 0x7b, 0x13, 0x45, 0xe3, 0x0f, 0x81, 0xb5, 0xff, - 0x9c, 0x87, 0x25, 0xc3, 0x11, 0xee, 0x41, 0x64, 0xe9, 0xa6, 0x22, 0xcb, 0xd3, 0xb3, 0x71, 0xe0, - 0x49, 0xa1, 0x05, 0x31, 0x98, 0xa7, 0xcc, 0x61, 0x7d, 0x2a, 0x9c, 0x74, 0xe9, 0xc2, 0x95, 0x19, - 0xe1, 0x09, 0x99, 0xb5, 0x55, 0x85, 0x38, 0x2f, 0x9f, 0xb1, 0xc2, 0x42, 0x2f, 0xc2, 0x62, 0x10, - 0xf2, 0x9c, 0xc1, 0x4f, 0x47, 0x41, 0x00, 0x6f, 0x4f, 0x01, 0x7c, 0x2d, 0x96, 0x55, 0x5b, 0x39, - 0x3e, 0xda, 0x58, 0x4c, 0x1e, 0xb1, 0x46, 0xb1, 0x5d, 0xb8, 0xdf, 0xd0, 0xaf, 0x1e, 0xf8, 0x4d, - 0x4f, 0x6c, 0xe8, 0x26, 0x14, 0xd8, 0x30, 0x8c, 0x93, 0x52, 0x62, 0xa2, 0x83, 0x61, 0x48, 0xb0, - 0xa0, 0xf0, 0x34, 0xd4, 0x23, 0x94, 0x3a, 0x2d, 0x92, 0x4d, 0x43, 0x57, 0xe5, 0x32, 0x8e, 0xe9, - 0xf6, 0x8b, 0xf0, 0xe0, 0xf8, 0xa8, 0x81, 0x3e, 0x06, 0xf3, 0x94, 0x44, 0x03, 0x12, 0x29, 0x20, - 0x6d, 0x19, 0xb1, 0x8a, 0x15, 0x15, 0x55, 0x61, 0x31, 0xf1, 0x46, 0x05, 0x77, 0x4e, 0xb1, 0x2e, - 0x6a, 0x17, 0xd6, 0x3c, 0xf6, 0x3b, 0x16, 0x9c, 0x31, 0x30, 0xef, 0x41, 0x72, 0xe8, 0xa4, 0x93, - 0xc3, 0xa5, 0xd9, 0x78, 0xcc, 0x84, 0xec, 0xf0, 0xc7, 0x3c, 0x9c, 0x33, 0xfd, 0x4a, 0x1c, 0x4f, - 0x51, 0x19, 0x90, 0x30, 0x78, 0x06, 0x5f, 0x51, 0xe6, 0xd4, 0x95, 0x81, 0x5c, 0xc6, 0x31, 0x9d, - 0xef, 0x6f, 0xe8, 0xb0, 0xb6, 0xb2, 0x65, 0xb2, 0xbf, 0xfb, 0x0e, 0x6b, 0x63, 0x41, 0xe1, 0xc1, - 0x9a, 0xf8, 0x03, 0x2f, 0x0a, 0xfc, 0x1e, 0xf1, 0x59, 0x36, 0x58, 0x5f, 0xd4, 0x24, 0x6c, 0xf2, - 0xa1, 0x2f, 0xc1, 0x2a, 0x73, 0xa2, 0x16, 0x61, 0x98, 0x0c, 0x3c, 0x1a, 0x3b, 0xf2, 0x62, 0xed, - 0x41, 0xf5, 0xe6, 0xea, 0x41, 0x8a, 0x8a, 0x33, 0xdc, 0xe8, 0x75, 0x0b, 0x1e, 0x72, 0x83, 0x5e, - 0x18, 0xf8, 0xc4, 0x67, 0xfb, 0x4e, 0xe4, 0xf4, 0x08, 0x23, 0xd1, 0xb5, 0x01, 0x89, 0x22, 0xaf, - 0x49, 0xa8, 0x0a, 0xc1, 0x57, 0xa7, 0xb0, 0x6e, 0x7d, 0x44, 0x7a, 0xed, 0x61, 0xa5, 0xdc, 0x43, - 0xf5, 0xc9, 0xc8, 0xf8, 0xc3, 0xd4, 0xe2, 0xb9, 0x79, 0xe0, 0x74, 0xfb, 0x84, 0x5e, 0xf2, 0x78, - 0xa6, 0x9a, 0xd7, 0xb9, 0xf9, 0x59, 0xbd, 0x8c, 0x4d, 0x1e, 0xfb, 0xf5, 0x7c, 0xca, 0x45, 0x1b, - 0x71, 0xdc, 0x11, 0x7b, 0xa9, 0x1c, 0x74, 0x56, 0x71, 0x47, 0x86, 0x6f, 0x7d, 0xba, 0x64, 0x89, - 0xa0, 0xb0, 0xd0, 0xf7, 0x2c, 0x91, 0x98, 0xe3, 0x53, 0xa9, 0x62, 0xec, 0x5d, 0x28, 0x12, 0xcc, - 0x5c, 0x1f, 0x2f, 0x62, 0x13, 0x9a, 0xbb, 0x70, 0x28, 0x73, 0xb4, 0xf2, 0xb8, 0xc4, 0x85, 0xe3, - 0xd4, 0x1d, 0xd3, 0x51, 0x1f, 0x80, 0x0e, 0x7d, 0x77, 0x3f, 0xe8, 0x7a, 0xee, 0x50, 0x85, 0xcb, - 0x69, 0x4a, 0xb2, 0x46, 0x22, 0xac, 0xb6, 0xca, 0xd3, 0x90, 0x7e, 0xc6, 0x06, 0x90, 0xfd, 0xda, - 0x7c, 0xfa, 0xe8, 0xc9, 0xd0, 0xfd, 0x53, 0x0b, 0xce, 0x72, 0xff, 0x70, 0x22, 0x8f, 0x06, 0x3e, - 0x26, 0xb4, 0xdf, 0x65, 0x6a, 0x0f, 0x77, 0xa7, 0xf4, 0x55, 0x53, 0x64, 0xad, 0xac, 0xcc, 0x71, - 0x36, 0x4b, 0xc1, 0x23, 0xf0, 0x88, 0xc1, 0x42, 0xdb, 0xa3, 0x2c, 0x88, 0x86, 0x2a, 0x26, 0x4d, - 0x53, 0x8f, 0x6f, 0x93, 0xb0, 0x1b, 0x0c, 0xf9, 0x11, 0xdf, 0xf1, 0x0f, 0x03, 0xbd, 0x2d, 0x97, - 0x25, 0x02, 0x8e, 0xa1, 0xd0, 0xb7, 0x2c, 0x80, 0x30, 0x3e, 0x20, 0x3c, 0x7f, 0xde, 0x85, 0xf3, - 0x9a, 0x94, 0x0a, 0xc9, 0x12, 0xc5, 0x06, 0x28, 0x0a, 0x60, 0xbe, 0x4d, 0x9c, 0x2e, 0x6b, 0x2b, - 0xb7, 0x78, 0x6a, 0x0a, 0xf8, 0xcb, 0x42, 0x50, 0x36, 0x73, 0xcb, 0x55, 0xac, 0x60, 0xd0, 0x77, - 0x2c, 0x58, 0x4d, 0x92, 0x2a, 0xe7, 0x25, 0xe5, 0xe2, 0xd4, 0x2d, 0xd0, 0xb5, 0x94, 0xc0, 0x1a, - 0xe2, 0xd1, 0x33, 0xbd, 0x86, 0x33, 0xa0, 0xe8, 0xdb, 0x16, 0x80, 0x1b, 0x27, 0x71, 0xaa, 0xaa, - 0xc3, 0x6b, 0xb3, 0x39, 0xc8, 0x49, 0x71, 0xa0, 0xcd, 0x9f, 0x2c, 0x51, 0x6c, 0xc0, 0xda, 0xef, - 0x59, 0xf0, 0x80, 0xf1, 0xe2, 0x75, 0x87, 0xb9, 0xed, 0x8b, 0x03, 0x9e, 0x1d, 0x76, 0x53, 0x65, - 0xc5, 0xe7, 0xcc, 0xb2, 0xe2, 0x83, 0xa3, 0x8d, 0x8f, 0x4f, 0x6a, 0xab, 0x6f, 0x71, 0x09, 0x15, - 0x21, 0xc2, 0xa8, 0x40, 0x5e, 0x86, 0x25, 0x43, 0x67, 0x15, 0xb5, 0x66, 0x95, 0x77, 0x93, 0x50, - 0x65, 0x2c, 0x62, 0x13, 0xcf, 0xfe, 0x6b, 0x0e, 0x16, 0x54, 0x41, 0x7f, 0xea, 0x3a, 0x66, 0x13, - 0x0a, 0xbc, 0x46, 0xc9, 0xa6, 0x5d, 0xd1, 0xe4, 0x0b, 0x0a, 0x0a, 0x61, 0xde, 0x15, 0xe3, 0x01, - 0x55, 0x79, 0x5e, 0x9e, 0xe6, 0xe4, 0x48, 0xed, 0xe4, 0xb8, 0x41, 0xeb, 0x24, 0x9f, 0xb1, 0xc2, - 0xe1, 0x1d, 0xcf, 0x19, 0x37, 0xf0, 0x7d, 0xe2, 0x6a, 0xe7, 0x2d, 0x4c, 0x5d, 0x65, 0xd7, 0xd3, - 0x12, 0x6b, 0xff, 0xa7, 0xd0, 0xcf, 0x64, 0x08, 0x38, 0x8b, 0x6d, 0xff, 0x3e, 0x0f, 0x2b, 0x29, - 0xcd, 0xd1, 0xa3, 0x50, 0xea, 0x53, 0x12, 0xf9, 0x7a, 0x4a, 0x92, 0x14, 0x62, 0xcf, 0xa8, 0x75, - 0x9c, 0x70, 0x70, 0xee, 0xd0, 0xa1, 0xf4, 0x56, 0x10, 0x35, 0x95, 0x9d, 0x13, 0xee, 0x7d, 0xb5, - 0x8e, 0x13, 0x0e, 0x5e, 0xe6, 0xdc, 0x20, 0x4e, 0x44, 0xa2, 0x83, 0xa0, 0x43, 0x46, 0x7a, 0xd2, - 0x9a, 0x26, 0x61, 0x93, 0x4f, 0x18, 0x8d, 0x75, 0x69, 0xbd, 0xeb, 0x11, 0x9f, 0x49, 0x35, 0x67, - 0x60, 0xb4, 0x83, 0x2b, 0x0d, 0x53, 0xa2, 0x36, 0x5a, 0x86, 0x80, 0xb3, 0xd8, 0x3c, 0xea, 0xae, - 0x38, 0xb7, 0xa8, 0x9e, 0x2e, 0xa9, 0xf8, 0x33, 0x8d, 0xfb, 0xa4, 0xa6, 0x55, 0xb5, 0x73, 0xc7, - 0x47, 0x1b, 0xe9, 0x01, 0x16, 0x4e, 0x23, 0xda, 0x7f, 0xb1, 0x20, 0x9e, 0x5a, 0xdd, 0x83, 0x7a, - 0xbb, 0x95, 0xae, 0xb7, 0x6b, 0xd3, 0x9f, 0x93, 0x09, 0xb5, 0xf6, 0xdb, 0x79, 0x18, 0xc9, 0xb6, - 0xe8, 0x05, 0x1e, 0x67, 0xf9, 0x1a, 0x69, 0x6e, 0xc5, 0x89, 0xfe, 0x93, 0xa7, 0xfb, 0xba, 0x03, - 0xaf, 0x47, 0xcc, 0x10, 0x1a, 0x4b, 0xc1, 0x86, 0x44, 0xf4, 0x8a, 0xa5, 0x01, 0x0e, 0x02, 0x15, - 0xdb, 0x66, 0x5b, 0x0d, 0x8e, 0xa8, 0x70, 0x10, 0x60, 0x03, 0x13, 0x3d, 0x99, 0xf4, 0xc0, 0x45, - 0x71, 0x28, 0xec, 0x74, 0xd7, 0xfa, 0x41, 0xaa, 0x08, 0xc9, 0x74, 0xb2, 0x43, 0x58, 0x8c, 0xd4, - 0xd0, 0x20, 0xce, 0x42, 0xd3, 0x78, 0x62, 0x3c, 0x80, 0x90, 0xa1, 0x24, 0xe9, 0xfc, 0xe2, 0x65, - 0x8a, 0x35, 0x1a, 0x3f, 0xfe, 0x51, 0xdc, 0x7a, 0x2c, 0xa4, 0x8f, 0x7f, 0xd2, 0x74, 0x24, 0x1c, - 0xf6, 0x8f, 0x2c, 0x40, 0xa3, 0x05, 0x06, 0xef, 0x37, 0x93, 0x6a, 0x5f, 0x85, 0x9c, 0x04, 0x35, - 0x61, 0xc7, 0x9a, 0xe7, 0x14, 0x81, 0xfd, 0x61, 0x28, 0x8a, 0xea, 0x5f, 0x85, 0x98, 0xc4, 0xd7, - 0x44, 0x7f, 0x80, 0x25, 0xcd, 0xfe, 0x93, 0x05, 0xd9, 0x00, 0x29, 0x72, 0x8b, 0xdc, 0x87, 0x6c, - 0x6e, 0x49, 0xdb, 0xfc, 0xf4, 0x0d, 0x39, 0x7a, 0x1e, 0x96, 0x1c, 0xc6, 0x48, 0x2f, 0x64, 0xc2, - 0x7d, 0xf3, 0xb7, 0xed, 0xbe, 0xa2, 0x40, 0xbe, 0x1a, 0x34, 0xbd, 0x43, 0x4f, 0xb8, 0xae, 0x29, - 0xce, 0x7e, 0x3f, 0x0f, 0xab, 0xe9, 0x72, 0x11, 0xf5, 0x61, 0x5e, 0x94, 0x67, 0x72, 0x6a, 0x39, - 0xf3, 0x7a, 0x30, 0x31, 0x89, 0x58, 0xa2, 0x58, 0x81, 0xa5, 0x7c, 0x21, 0x77, 0x92, 0x2f, 0x9c, - 0xd8, 0x7a, 0xe6, 0xff, 0x3b, 0x5b, 0xcf, 0x17, 0x00, 0x9a, 0xc2, 0xda, 0x62, 0x2f, 0x0b, 0x77, - 0x1e, 0x8a, 0xb6, 0x13, 0x29, 0xd8, 0x90, 0x88, 0xd6, 0x20, 0xe7, 0x35, 0x45, 0x0c, 0xc8, 0xd7, - 0x40, 0xf1, 0xe6, 0x76, 0xb6, 0x71, 0xce, 0x6b, 0xda, 0x14, 0x96, 0xcd, 0xfa, 0xf8, 0xd4, 0xbe, - 0xfa, 0x05, 0x58, 0x91, 0xbf, 0xb6, 0x09, 0x73, 0xbc, 0x2e, 0x55, 0xbb, 0xf3, 0x80, 0x62, 0x5f, - 0x69, 0x98, 0x44, 0x9c, 0xe6, 0xb5, 0x7f, 0x91, 0x03, 0xb8, 0x1c, 0x04, 0x1d, 0x85, 0x19, 0x1f, - 0x3d, 0x6b, 0xe2, 0xd1, 0xdb, 0x84, 0x42, 0xc7, 0xf3, 0x9b, 0xd9, 0xc3, 0xb9, 0xeb, 0xf9, 0x4d, - 0x2c, 0x28, 0xe8, 0x02, 0x80, 0x13, 0x7a, 0xcf, 0x92, 0x88, 0xea, 0xc1, 0x74, 0x62, 0x97, 0xad, - 0xfd, 0x1d, 0x45, 0xc1, 0x06, 0x17, 0x7a, 0x54, 0xd5, 0xb2, 0x72, 0xbe, 0x51, 0xce, 0xd4, 0xb2, - 0x25, 0xae, 0xa1, 0x51, 0xac, 0x3e, 0x91, 0x89, 0xa6, 0x9b, 0x23, 0xd1, 0x54, 0xd7, 0xf6, 0xfb, - 0x6d, 0x87, 0x92, 0x71, 0xe7, 0x7a, 0xfe, 0x84, 0x41, 0x5b, 0x03, 0x4a, 0x4f, 0x5f, 0x3f, 0x90, - 0x15, 0x8a, 0x0d, 0x79, 0xcf, 0x91, 0xc1, 0x2b, 0xaf, 0xdd, 0x7e, 0x87, 0xd2, 0xbe, 0xd8, 0x61, - 0x4e, 0x44, 0x0f, 0x43, 0x9e, 0xbc, 0x14, 0x0a, 0xbb, 0xe4, 0x75, 0x80, 0xbb, 0xf8, 0x52, 0xe8, - 0x45, 0x84, 0x72, 0x26, 0xf2, 0x52, 0x68, 0xff, 0xd3, 0x02, 0x3d, 0x3b, 0x44, 0x87, 0x50, 0xe0, - 0xcd, 0xb0, 0x4a, 0x79, 0x97, 0xa7, 0xec, 0xb7, 0xf5, 0x88, 0xb2, 0x24, 0x26, 0xb0, 0x43, 0xdf, - 0xc5, 0x42, 0x3e, 0x1a, 0x40, 0x29, 0x0a, 0xba, 0xdd, 0x1b, 0x8e, 0xdb, 0x99, 0x41, 0xf6, 0xc3, - 0x4a, 0x94, 0xc6, 0x5b, 0x16, 0x41, 0x40, 0x2d, 0xe3, 0x04, 0xcb, 0xfe, 0x5d, 0x11, 0x32, 0x4d, - 0x16, 0xea, 0x9b, 0x63, 0x59, 0x6b, 0x86, 0x63, 0xd9, 0xc4, 0xe2, 0xe3, 0x46, 0xb3, 0xe8, 0x71, - 0x28, 0x86, 0xdc, 0x11, 0x94, 0xdb, 0x6e, 0xc4, 0x09, 0x43, 0x78, 0xc7, 0x18, 0x7f, 0x91, 0xdc, - 0xa6, 0xbb, 0xe4, 0x4f, 0x48, 0x03, 0xdf, 0x94, 0x13, 0x14, 0x35, 0xad, 0x90, 0x91, 0x63, 0x6f, - 0x56, 0x3b, 0xaa, 0x06, 0x16, 0xc9, 0x28, 0x45, 0x8d, 0x29, 0x0c, 0x44, 0xf4, 0x03, 0x0b, 0x56, - 0x63, 0xc3, 0x2b, 0x25, 0x8a, 0x77, 0x45, 0x09, 0xd1, 0x3a, 0xe3, 0x14, 0x12, 0xce, 0x20, 0xa3, - 0xaf, 0xc0, 0x22, 0x65, 0x4e, 0x24, 0x33, 0xe2, 0xfc, 0x6d, 0x47, 0xd1, 0x64, 0x2f, 0x1b, 0xb1, - 0x10, 0xac, 0xe5, 0xa1, 0xe7, 0x00, 0x0e, 0x3d, 0xdf, 0xa3, 0x6d, 0x21, 0x7d, 0xe1, 0xce, 0xf2, - 0xed, 0xa5, 0x44, 0x02, 0x36, 0xa4, 0xd9, 0x3f, 0xb3, 0x00, 0x8d, 0x49, 0x0b, 0x51, 0x5c, 0x1f, - 0xdf, 0x95, 0x8c, 0x3b, 0xb6, 0x54, 0x7e, 0xb2, 0xf4, 0xcb, 0xd7, 0x36, 0xe6, 0x5e, 0x79, 0x67, - 0x73, 0xce, 0xfe, 0x6e, 0x0e, 0x96, 0x8c, 0xcb, 0xb6, 0x53, 0x04, 0xe9, 0xcc, 0xe5, 0x60, 0xee, - 0x94, 0x97, 0x83, 0x8f, 0x40, 0x29, 0x0c, 0xba, 0x9e, 0xeb, 0xa9, 0x04, 0xbd, 0x28, 0x4f, 0xf6, - 0xbe, 0x5a, 0xc3, 0x09, 0x15, 0x31, 0x58, 0xbc, 0x79, 0x8b, 0x89, 0xe0, 0x18, 0x5f, 0x25, 0xd6, - 0xa7, 0x30, 0x4a, 0x1c, 0x68, 0xf5, 0xce, 0xc7, 0x2b, 0x14, 0x6b, 0x20, 0xfb, 0x6f, 0x39, 0x00, - 0x71, 0x17, 0xeb, 0x89, 0xe9, 0xd8, 0x26, 0x14, 0x22, 0x12, 0x06, 0x59, 0x3b, 0x70, 0x0e, 0x2c, - 0x28, 0xa9, 0x66, 0x37, 0x77, 0x5b, 0xcd, 0x6e, 0xfe, 0xc4, 0x66, 0x97, 0xa7, 0x5d, 0xda, 0xde, - 0x8f, 0xbc, 0x81, 0xc3, 0xc8, 0x2e, 0x19, 0xaa, 0xdc, 0xa5, 0xd3, 0x6e, 0xe3, 0xb2, 0x26, 0xe2, - 0x34, 0xef, 0xd8, 0x39, 0x41, 0xf1, 0x3f, 0x38, 0x27, 0x78, 0xdb, 0x82, 0x55, 0x6d, 0xd9, 0xff, - 0xad, 0xeb, 0x7f, 0xad, 0xf7, 0x84, 0xa6, 0xf3, 0x5f, 0x16, 0x9c, 0x89, 0xdb, 0x1b, 0x55, 0xf7, - 0xcc, 0xa4, 0xd0, 0x49, 0x5d, 0xa4, 0xe5, 0x4f, 0xbe, 0x48, 0x33, 0xd3, 0x49, 0xe1, 0x84, 0x74, - 0xf2, 0xc5, 0x4c, 0x89, 0xf3, 0x91, 0x91, 0x12, 0x07, 0x25, 0x8d, 0xdc, 0xd0, 0x77, 0xd3, 0x25, - 0xa1, 0xfd, 0x5b, 0x0b, 0x96, 0x63, 0xf2, 0x5e, 0xd0, 0x14, 0x0d, 0x13, 0x15, 0x4e, 0x66, 0xa5, - 0x1b, 0x26, 0xe9, 0x0e, 0x92, 0x86, 0xfa, 0x50, 0x72, 0xdb, 0x5e, 0xb7, 0x19, 0x11, 0x5f, 0x6d, - 0xcb, 0x53, 0x33, 0xe8, 0x33, 0x39, 0xbe, 0x76, 0x85, 0xba, 0x02, 0xc0, 0x09, 0x94, 0xfd, 0x87, - 0x3c, 0xac, 0xa4, 0x9a, 0x52, 0x1e, 0xbe, 0xe4, 0x4d, 0x56, 0xc3, 0xd0, 0x39, 0x09, 0x5f, 0x07, - 0x9a, 0x84, 0x4d, 0x3e, 0xbe, 0x1f, 0x5d, 0x6f, 0x20, 0x65, 0x64, 0x2f, 0x36, 0xaf, 0xc4, 0x04, - 0xac, 0x79, 0x8c, 0xae, 0x3c, 0x7f, 0xdb, 0x5d, 0xf9, 0xab, 0x16, 0x20, 0xf1, 0x09, 0x5c, 0x72, - 0xd2, 0x3c, 0xab, 0x58, 0x38, 0x33, 0xbb, 0xad, 0x29, 0x8d, 0x50, 0x7d, 0x04, 0x0a, 0x8f, 0x81, - 0x37, 0x86, 0xf5, 0xc5, 0x7b, 0x32, 0xac, 0xb7, 0xbf, 0x01, 0xe7, 0x46, 0xea, 0x41, 0xd5, 0xe5, - 0x58, 0xe3, 0xba, 0x1c, 0xee, 0x89, 0x61, 0xd4, 0xf7, 0xe5, 0x06, 0x95, 0xb4, 0x27, 0xee, 0xf3, - 0x45, 0x2c, 0x69, 0xbc, 0xf5, 0x69, 0x46, 0x43, 0xdc, 0x97, 0xed, 0x43, 0x49, 0xa3, 0x6f, 0x8b, - 0x55, 0xac, 0xa8, 0xf6, 0xaf, 0xf3, 0xb0, 0x92, 0xaa, 0x51, 0x52, 0x5d, 0xaa, 0x75, 0x62, 0x97, - 0x3a, 0x4b, 0x65, 0xd0, 0xcb, 0xb0, 0x4c, 0xc5, 0x51, 0x8c, 0x1c, 0x46, 0x5a, 0xc3, 0x19, 0x5c, - 0x97, 0x34, 0x0c, 0x71, 0xb5, 0xb3, 0xc7, 0x47, 0x1b, 0xcb, 0xe6, 0x0a, 0x4e, 0xc1, 0xa1, 0x9f, - 0x5b, 0x80, 0xc2, 0x71, 0x77, 0xbc, 0xd6, 0x94, 0x15, 0xcb, 0x68, 0x3d, 0x54, 0x7b, 0x90, 0xbb, - 0xe4, 0x98, 0xde, 0x7a, 0x8c, 0x02, 0xf6, 0x6f, 0x72, 0x70, 0xdf, 0x98, 0x3a, 0x12, 0xdd, 0x32, - 0xc7, 0x5a, 0xb2, 0xae, 0x7a, 0x7a, 0x06, 0xc7, 0x46, 0x05, 0x78, 0xf9, 0x37, 0x8d, 0x13, 0x87, - 0x5a, 0x27, 0x0f, 0x32, 0x0e, 0xa1, 0xd8, 0x0e, 0x82, 0x4e, 0x3c, 0xb1, 0x98, 0x26, 0x51, 0xe9, - 0x3e, 0xbb, 0xb6, 0xc8, 0xbd, 0x8c, 0x3f, 0x53, 0x2c, 0xc5, 0xdb, 0xdf, 0xb7, 0xc0, 0xb8, 0x25, - 0x45, 0x5f, 0x87, 0x45, 0xa7, 0xcf, 0x82, 0x9e, 0xc3, 0x48, 0x53, 0xa5, 0xdf, 0xbd, 0x99, 0xdc, - 0xc7, 0x6e, 0xc5, 0x52, 0xa5, 0x85, 0x92, 0x47, 0xac, 0xf1, 0xec, 0x27, 0xe5, 0x8e, 0x65, 0x5e, - 0xd0, 0xa7, 0xc5, 0x9a, 0x7c, 0x5a, 0xec, 0xf7, 0x2d, 0x48, 0x79, 0x29, 0xea, 0x41, 0x91, 0xab, - 0x34, 0x9c, 0xc1, 0x2d, 0xbc, 0x29, 0x77, 0x8b, 0xcb, 0x94, 0x76, 0x14, 0x3f, 0xb1, 0x44, 0x41, - 0x1e, 0x14, 0xb8, 0x41, 0x55, 0x9f, 0xbb, 0x3b, 0x23, 0x34, 0xbe, 0x55, 0xb2, 0xad, 0xe6, 0xbf, - 0xb0, 0x80, 0xb0, 0x9f, 0x80, 0x73, 0x23, 0x1a, 0x71, 0x23, 0x1d, 0x06, 0xf1, 0x9f, 0x0e, 0x0c, - 0x23, 0x5d, 0xe2, 0x8b, 0x58, 0xd2, 0x78, 0x7e, 0x3e, 0x9b, 0x15, 0xcf, 0x0f, 0xf0, 0x39, 0x9a, - 0x95, 0x77, 0x57, 0xac, 0xf6, 0xff, 0x4a, 0xa9, 0x51, 0xf5, 0xf1, 0xa8, 0x06, 0x7c, 0x47, 0xb3, - 0x77, 0x26, 0xfc, 0x0c, 0x79, 0x3e, 0x25, 0x6e, 0x3f, 0x8a, 0x3f, 0x54, 0x4f, 0x45, 0xd4, 0x3a, - 0x4e, 0x38, 0xd0, 0x05, 0x00, 0x79, 0x67, 0xb7, 0xa7, 0x0b, 0xf1, 0x64, 0x22, 0xd4, 0x48, 0x28, - 0xd8, 0xe0, 0xe2, 0xbd, 0x88, 0x4b, 0x22, 0xb6, 0xcd, 0xcb, 0x4f, 0x1e, 0x77, 0x97, 0x65, 0x2f, - 0x52, 0x57, 0x6b, 0x38, 0xa1, 0xa2, 0x8f, 0xc2, 0x42, 0x87, 0x0c, 0x05, 0x63, 0x41, 0x30, 0x2e, - 0xf1, 0x8a, 0x6a, 0x57, 0x2e, 0xe1, 0x98, 0x86, 0x6c, 0x98, 0x77, 0x1d, 0xc1, 0x55, 0x14, 0x5c, - 0x20, 0xae, 0xef, 0xb6, 0x04, 0x93, 0xa2, 0xd4, 0x2a, 0x6f, 0xbc, 0xbb, 0x3e, 0xf7, 0xe6, 0xbb, - 0xeb, 0x73, 0x6f, 0xbd, 0xbb, 0x3e, 0xf7, 0xca, 0xf1, 0xba, 0xf5, 0xc6, 0xf1, 0xba, 0xf5, 0xe6, - 0xf1, 0xba, 0xf5, 0xd6, 0xf1, 0xba, 0xf5, 0x8f, 0xe3, 0x75, 0xeb, 0x27, 0xef, 0xad, 0xcf, 0x3d, - 0x57, 0x8a, 0x4d, 0xfb, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe5, 0x5f, 0xbf, 0x3f, 0x10, 0x2e, - 0x00, 0x00, + 0xb9, 0x20, 0x71, 0x40, 0x5c, 0x73, 0x42, 0xf5, 0xd1, 0x5d, 0xd5, 0x6d, 0x3b, 0x33, 0xbb, 0xf6, + 0x2e, 0x70, 0x73, 0xd7, 0x7b, 0xfd, 0x7e, 0xaf, 0x5f, 0xbd, 0x7a, 0x5f, 0x65, 0xd8, 0x69, 0x79, + 0xac, 0xdd, 0xbf, 0x51, 0x71, 0x83, 0x5e, 0xd5, 0x89, 0x5a, 0x41, 0x18, 0x05, 0x37, 0xc5, 0x8f, + 0xc7, 0xdc, 0x66, 0x35, 0xec, 0xb4, 0xaa, 0x4e, 0xe8, 0xd1, 0xaa, 0x13, 0x86, 0x5d, 0xcf, 0x75, + 0x98, 0x17, 0xf8, 0xd5, 0xc1, 0x79, 0xa7, 0x1b, 0xb6, 0x9d, 0xf3, 0xd5, 0x16, 0xf1, 0x49, 0xe4, + 0x30, 0xd2, 0xac, 0x84, 0x51, 0xc0, 0x02, 0xf4, 0x59, 0x2d, 0xaa, 0x12, 0x8b, 0x12, 0x3f, 0xbe, + 0xec, 0x36, 0x2b, 0x61, 0xa7, 0x55, 0xe1, 0xa2, 0x2a, 0x86, 0xa8, 0x4a, 0x2c, 0x6a, 0xed, 0x31, + 0x43, 0x8b, 0x56, 0xd0, 0x0a, 0xaa, 0x42, 0xe2, 0x8d, 0xfe, 0xa1, 0x78, 0x12, 0x0f, 0xe2, 0x97, + 0x44, 0x5a, 0xfb, 0x54, 0xe7, 0x09, 0x5a, 0xf1, 0x02, 0xae, 0x5b, 0xcf, 0x71, 0xdb, 0x9e, 0x4f, + 0xa2, 0xa1, 0x56, 0xb6, 0x47, 0x98, 0x53, 0x1d, 0x8c, 0xe8, 0xb7, 0x56, 0x9d, 0xf4, 0x56, 0xd4, + 0xf7, 0x99, 0xd7, 0x23, 0x23, 0x2f, 0x7c, 0xfa, 0xa4, 0x17, 0xa8, 0xdb, 0x26, 0x3d, 0x67, 0xe4, + 0xbd, 0x4f, 0x4e, 0x7a, 0xaf, 0xcf, 0xbc, 0x6e, 0xd5, 0xf3, 0x19, 0x65, 0x51, 0xf6, 0x25, 0xfb, + 0x45, 0x58, 0xd9, 0xba, 0xde, 0xd8, 0xea, 0xb3, 0x76, 0x3d, 0xf0, 0x0f, 0xbd, 0x16, 0x7a, 0x1c, + 0x96, 0xdc, 0x6e, 0x9f, 0x32, 0x12, 0xed, 0x39, 0x3d, 0x52, 0xb6, 0x36, 0xad, 0x47, 0x16, 0x6b, + 0xf7, 0xbd, 0x71, 0xb4, 0x31, 0x77, 0x7c, 0xb4, 0xb1, 0x54, 0xd7, 0x24, 0x6c, 0xf2, 0xa1, 0x8f, + 0xc1, 0x42, 0x14, 0x74, 0xc9, 0x16, 0xde, 0x2b, 0xe7, 0xc4, 0x2b, 0x67, 0xd4, 0x2b, 0x0b, 0x58, + 0x2e, 0xe3, 0x98, 0x6e, 0xff, 0xd5, 0x02, 0xd8, 0x0a, 0xc3, 0xfd, 0x28, 0xb8, 0x49, 0x5c, 0x86, + 0xbe, 0x02, 0x25, 0x6e, 0xba, 0xa6, 0xc3, 0x1c, 0x81, 0xb6, 0x74, 0xe1, 0x13, 0x15, 0xf9, 0x25, + 0x15, 0xf3, 0x4b, 0xf4, 0x56, 0x72, 0xee, 0xca, 0xe0, 0x7c, 0xe5, 0xda, 0x0d, 0xfe, 0xfe, 0x55, + 0xc2, 0x9c, 0x1a, 0x52, 0x60, 0xa0, 0xd7, 0x70, 0x22, 0x15, 0x75, 0xa0, 0x40, 0x43, 0xe2, 0x0a, + 0xc5, 0x96, 0x2e, 0xec, 0x54, 0xee, 0xd8, 0x61, 0x2a, 0x5a, 0xed, 0x46, 0x48, 0xdc, 0xda, 0xb2, + 0x82, 0x2d, 0xf0, 0x27, 0x2c, 0x40, 0xec, 0xb7, 0x2d, 0x58, 0xd5, 0x6c, 0x57, 0x3c, 0xca, 0xd0, + 0xf3, 0x23, 0x5f, 0x58, 0x39, 0xdd, 0x17, 0xf2, 0xb7, 0xc5, 0xf7, 0x9d, 0x55, 0x40, 0xa5, 0x78, + 0xc5, 0xf8, 0xba, 0x9b, 0x50, 0xf4, 0x18, 0xe9, 0xd1, 0x72, 0x6e, 0x33, 0xff, 0xc8, 0xd2, 0x85, + 0x8b, 0x33, 0xf9, 0xbc, 0xda, 0x8a, 0x42, 0x2c, 0xee, 0x70, 0xd9, 0x58, 0x42, 0xd8, 0xbf, 0x28, + 0x9a, 0x1f, 0xc7, 0xbf, 0x1a, 0x9d, 0x87, 0x25, 0x1a, 0xf4, 0x23, 0x97, 0x60, 0x12, 0x06, 0xb4, + 0x6c, 0x6d, 0xe6, 0xf9, 0xe6, 0x73, 0x5f, 0x69, 0xe8, 0x65, 0x6c, 0xf2, 0xa0, 0xef, 0x5b, 0xb0, + 0xdc, 0x24, 0x94, 0x79, 0xbe, 0xc0, 0x8f, 0x35, 0xff, 0xe2, 0x74, 0x9a, 0xc7, 0x8b, 0xdb, 0x5a, + 0x72, 0xed, 0x7e, 0xf5, 0x15, 0xcb, 0xc6, 0x22, 0xc5, 0x29, 0x70, 0xee, 0xf0, 0x4d, 0x42, 0xdd, + 0xc8, 0x0b, 0xf9, 0x73, 0x39, 0x9f, 0x76, 0xf8, 0x6d, 0x4d, 0xc2, 0x26, 0x1f, 0xea, 0x40, 0x91, + 0x3b, 0x34, 0x2d, 0x17, 0x84, 0xf2, 0x97, 0xa6, 0x50, 0x5e, 0x99, 0x93, 0x1f, 0x14, 0x6d, 0x77, + 0xfe, 0x44, 0xb1, 0xc4, 0x40, 0x3f, 0xb4, 0xa0, 0xac, 0x4e, 0x1b, 0x26, 0xd2, 0x94, 0xd7, 0xdb, + 0x1e, 0x23, 0x5d, 0x8f, 0xb2, 0x72, 0x51, 0x28, 0x50, 0x3d, 0x9d, 0x4b, 0x3d, 0x15, 0x05, 0xfd, + 0x70, 0xd7, 0xf3, 0x9b, 0xb5, 0x4d, 0x85, 0x54, 0xae, 0x4f, 0x10, 0x8c, 0x27, 0x42, 0xa2, 0x57, + 0x2d, 0x58, 0xf3, 0x9d, 0x1e, 0xa1, 0xa1, 0xc3, 0x37, 0x55, 0x92, 0x6b, 0x5d, 0xc7, 0xed, 0x08, + 0x8d, 0xe6, 0xef, 0x4c, 0x23, 0x5b, 0x69, 0xb4, 0xb6, 0x37, 0x51, 0x34, 0xfe, 0x00, 0x58, 0xfb, + 0x8f, 0x79, 0x58, 0x32, 0x1c, 0xe1, 0x1e, 0x44, 0x96, 0x6e, 0x2a, 0xb2, 0x3c, 0x3d, 0x1b, 0x07, + 0x9e, 0x14, 0x5a, 0x10, 0x83, 0x79, 0xca, 0x1c, 0xd6, 0xa7, 0xc2, 0x49, 0x97, 0x2e, 0x5c, 0x99, + 0x11, 0x9e, 0x90, 0x59, 0x5b, 0x55, 0x88, 0xf3, 0xf2, 0x19, 0x2b, 0x2c, 0xf4, 0x22, 0x2c, 0x06, + 0x21, 0xcf, 0x19, 0xfc, 0x74, 0x14, 0x04, 0xf0, 0xf6, 0x14, 0xc0, 0xd7, 0x62, 0x59, 0xb5, 0x95, + 0xe3, 0xa3, 0x8d, 0xc5, 0xe4, 0x11, 0x6b, 0x14, 0xdb, 0x85, 0xfb, 0x0d, 0xfd, 0xea, 0x81, 0xdf, + 0xf4, 0xc4, 0x86, 0x6e, 0x42, 0x81, 0x0d, 0xc3, 0x38, 0x29, 0x25, 0x26, 0x3a, 0x18, 0x86, 0x04, + 0x0b, 0x0a, 0x4f, 0x43, 0x3d, 0x42, 0xa9, 0xd3, 0x22, 0xd9, 0x34, 0x74, 0x55, 0x2e, 0xe3, 0x98, + 0x6e, 0xbf, 0x08, 0x0f, 0x8e, 0x8f, 0x1a, 0xe8, 0x23, 0x30, 0x4f, 0x49, 0x34, 0x20, 0x91, 0x02, + 0xd2, 0x96, 0x11, 0xab, 0x58, 0x51, 0x51, 0x15, 0x16, 0x13, 0x6f, 0x54, 0x70, 0xe7, 0x14, 0xeb, + 0xa2, 0x76, 0x61, 0xcd, 0x63, 0xbf, 0x63, 0xc1, 0x19, 0x03, 0xf3, 0x1e, 0x24, 0x87, 0x4e, 0x3a, + 0x39, 0x5c, 0x9a, 0x8d, 0xc7, 0x4c, 0xc8, 0x0e, 0xbf, 0xcf, 0xc3, 0x39, 0xd3, 0xaf, 0xc4, 0xf1, + 0x14, 0x95, 0x01, 0x09, 0x83, 0x67, 0xf0, 0x15, 0x65, 0x4e, 0x5d, 0x19, 0xc8, 0x65, 0x1c, 0xd3, + 0xf9, 0xfe, 0x86, 0x0e, 0x6b, 0x2b, 0x5b, 0x26, 0xfb, 0xbb, 0xef, 0xb0, 0x36, 0x16, 0x14, 0x1e, + 0xac, 0x89, 0x3f, 0xf0, 0xa2, 0xc0, 0xef, 0x11, 0x9f, 0x65, 0x83, 0xf5, 0x45, 0x4d, 0xc2, 0x26, + 0x1f, 0xfa, 0x02, 0xac, 0x32, 0x27, 0x6a, 0x11, 0x86, 0xc9, 0xc0, 0xa3, 0xb1, 0x23, 0x2f, 0xd6, + 0x1e, 0x54, 0x6f, 0xae, 0x1e, 0xa4, 0xa8, 0x38, 0xc3, 0x8d, 0x5e, 0xb7, 0xe0, 0x21, 0x37, 0xe8, + 0x85, 0x81, 0x4f, 0x7c, 0xb6, 0xef, 0x44, 0x4e, 0x8f, 0x30, 0x12, 0x5d, 0x1b, 0x90, 0x28, 0xf2, + 0x9a, 0x84, 0xaa, 0x10, 0x7c, 0x75, 0x0a, 0xeb, 0xd6, 0x47, 0xa4, 0xd7, 0x1e, 0x56, 0xca, 0x3d, + 0x54, 0x9f, 0x8c, 0x8c, 0x3f, 0x48, 0x2d, 0x9e, 0x9b, 0x07, 0x4e, 0xb7, 0x4f, 0xe8, 0x25, 0x8f, + 0x67, 0xaa, 0x79, 0x9d, 0x9b, 0x9f, 0xd5, 0xcb, 0xd8, 0xe4, 0xb1, 0x5f, 0xcf, 0xa7, 0x5c, 0xb4, + 0x11, 0xc7, 0x1d, 0xb1, 0x97, 0xca, 0x41, 0x67, 0x15, 0x77, 0x64, 0xf8, 0xd6, 0xa7, 0x4b, 0x96, + 0x08, 0x0a, 0x0b, 0x7d, 0xc7, 0x12, 0x89, 0x39, 0x3e, 0x95, 0x2a, 0xc6, 0xde, 0x85, 0x22, 0xc1, + 0xcc, 0xf5, 0xf1, 0x22, 0x36, 0xa1, 0xb9, 0x0b, 0x87, 0x32, 0x47, 0x2b, 0x8f, 0x4b, 0x5c, 0x38, + 0x4e, 0xdd, 0x31, 0x1d, 0xf5, 0x01, 0xe8, 0xd0, 0x77, 0xf7, 0x83, 0xae, 0xe7, 0x0e, 0x55, 0xb8, + 0x9c, 0xa6, 0x24, 0x6b, 0x24, 0xc2, 0x6a, 0xab, 0x3c, 0x0d, 0xe9, 0x67, 0x6c, 0x00, 0xd9, 0xaf, + 0xcd, 0xa7, 0x8f, 0x9e, 0x0c, 0xdd, 0x3f, 0xb6, 0xe0, 0x2c, 0xf7, 0x0f, 0x27, 0xf2, 0x68, 0xe0, + 0x63, 0x42, 0xfb, 0x5d, 0xa6, 0xf6, 0x70, 0x77, 0x4a, 0x5f, 0x35, 0x45, 0xd6, 0xca, 0xca, 0x1c, + 0x67, 0xb3, 0x14, 0x3c, 0x02, 0x8f, 0x18, 0x2c, 0xb4, 0x3d, 0xca, 0x82, 0x68, 0xa8, 0x62, 0xd2, + 0x34, 0xf5, 0xf8, 0x36, 0x09, 0xbb, 0xc1, 0x90, 0x1f, 0xf1, 0x1d, 0xff, 0x30, 0xd0, 0xdb, 0x72, + 0x59, 0x22, 0xe0, 0x18, 0x0a, 0x7d, 0xc3, 0x02, 0x08, 0xe3, 0x03, 0xc2, 0xf3, 0xe7, 0x5d, 0x38, + 0xaf, 0x49, 0xa9, 0x90, 0x2c, 0x51, 0x6c, 0x80, 0xa2, 0x00, 0xe6, 0xdb, 0xc4, 0xe9, 0xb2, 0xb6, + 0x72, 0x8b, 0xa7, 0xa6, 0x80, 0xbf, 0x2c, 0x04, 0x65, 0x33, 0xb7, 0x5c, 0xc5, 0x0a, 0x06, 0x7d, + 0xcb, 0x82, 0xd5, 0x24, 0xa9, 0x72, 0x5e, 0x52, 0x2e, 0x4e, 0xdd, 0x02, 0x5d, 0x4b, 0x09, 0xac, + 0x21, 0x1e, 0x3d, 0xd3, 0x6b, 0x38, 0x03, 0x8a, 0xbe, 0x69, 0x01, 0xb8, 0x71, 0x12, 0xa7, 0xaa, + 0x3a, 0xbc, 0x36, 0x9b, 0x83, 0x9c, 0x14, 0x07, 0xda, 0xfc, 0xc9, 0x12, 0xc5, 0x06, 0xac, 0xfd, + 0x9e, 0x05, 0x0f, 0x18, 0x2f, 0x5e, 0x77, 0x98, 0xdb, 0xbe, 0x38, 0xe0, 0xd9, 0x61, 0x37, 0x55, + 0x56, 0x7c, 0xc6, 0x2c, 0x2b, 0xde, 0x3f, 0xda, 0xf8, 0xe8, 0xa4, 0xb6, 0xfa, 0x16, 0x97, 0x50, + 0x11, 0x22, 0x8c, 0x0a, 0xe4, 0x65, 0x58, 0x32, 0x74, 0x56, 0x51, 0x6b, 0x56, 0x79, 0x37, 0x09, + 0x55, 0xc6, 0x22, 0x36, 0xf1, 0xec, 0x3f, 0xe7, 0x60, 0x41, 0x15, 0xf4, 0xa7, 0xae, 0x63, 0x36, + 0xa1, 0xc0, 0x6b, 0x94, 0x6c, 0xda, 0x15, 0x4d, 0xbe, 0xa0, 0xa0, 0x10, 0xe6, 0x5d, 0x31, 0x1e, + 0x50, 0x95, 0xe7, 0xe5, 0x69, 0x4e, 0x8e, 0xd4, 0x4e, 0x8e, 0x1b, 0xb4, 0x4e, 0xf2, 0x19, 0x2b, + 0x1c, 0xde, 0xf1, 0x9c, 0x71, 0x03, 0xdf, 0x27, 0xae, 0x76, 0xde, 0xc2, 0xd4, 0x55, 0x76, 0x3d, + 0x2d, 0xb1, 0xf6, 0x7f, 0x0a, 0xfd, 0x4c, 0x86, 0x80, 0xb3, 0xd8, 0xf6, 0x6f, 0xf3, 0xb0, 0x92, + 0xd2, 0x1c, 0x3d, 0x0a, 0xa5, 0x3e, 0x25, 0x91, 0xaf, 0xa7, 0x24, 0x49, 0x21, 0xf6, 0x8c, 0x5a, + 0xc7, 0x09, 0x07, 0xe7, 0x0e, 0x1d, 0x4a, 0x6f, 0x05, 0x51, 0x53, 0xd9, 0x39, 0xe1, 0xde, 0x57, + 0xeb, 0x38, 0xe1, 0xe0, 0x65, 0xce, 0x0d, 0xe2, 0x44, 0x24, 0x3a, 0x08, 0x3a, 0x64, 0xa4, 0x27, + 0xad, 0x69, 0x12, 0x36, 0xf9, 0x84, 0xd1, 0x58, 0x97, 0xd6, 0xbb, 0x1e, 0xf1, 0x99, 0x54, 0x73, + 0x06, 0x46, 0x3b, 0xb8, 0xd2, 0x30, 0x25, 0x6a, 0xa3, 0x65, 0x08, 0x38, 0x8b, 0xcd, 0xa3, 0xee, + 0x8a, 0x73, 0x8b, 0xea, 0xe9, 0x92, 0x8a, 0x3f, 0xd3, 0xb8, 0x4f, 0x6a, 0x5a, 0x55, 0x3b, 0x77, + 0x7c, 0xb4, 0x91, 0x1e, 0x60, 0xe1, 0x34, 0xa2, 0xfd, 0x27, 0x0b, 0xe2, 0xa9, 0xd5, 0x3d, 0xa8, + 0xb7, 0x5b, 0xe9, 0x7a, 0xbb, 0x36, 0xfd, 0x39, 0x99, 0x50, 0x6b, 0xbf, 0x9d, 0x87, 0x91, 0x6c, + 0x8b, 0x5e, 0xe0, 0x71, 0x96, 0xaf, 0x91, 0xe6, 0x56, 0x9c, 0xe8, 0x3f, 0x7e, 0xba, 0xaf, 0x3b, + 0xf0, 0x7a, 0xc4, 0x0c, 0xa1, 0xb1, 0x14, 0x6c, 0x48, 0x44, 0xaf, 0x58, 0x1a, 0xe0, 0x20, 0x50, + 0xb1, 0x6d, 0xb6, 0xd5, 0xe0, 0x88, 0x0a, 0x07, 0x01, 0x36, 0x30, 0xd1, 0x93, 0x49, 0x0f, 0x5c, + 0x14, 0x87, 0xc2, 0x4e, 0x77, 0xad, 0xef, 0xa7, 0x8a, 0x90, 0x4c, 0x27, 0x3b, 0x84, 0xc5, 0x48, + 0x0d, 0x0d, 0xe2, 0x2c, 0x34, 0x8d, 0x27, 0xc6, 0x03, 0x08, 0x19, 0x4a, 0x92, 0xce, 0x2f, 0x5e, + 0xa6, 0x58, 0xa3, 0xf1, 0xe3, 0x1f, 0xc5, 0xad, 0xc7, 0x42, 0xfa, 0xf8, 0x27, 0x4d, 0x47, 0xc2, + 0x61, 0xff, 0xc0, 0x02, 0x34, 0x5a, 0x60, 0xf0, 0x7e, 0x33, 0xa9, 0xf6, 0x55, 0xc8, 0x49, 0x50, + 0x13, 0x76, 0xac, 0x79, 0x4e, 0x11, 0xd8, 0x1f, 0x86, 0xa2, 0xa8, 0xfe, 0x55, 0x88, 0x49, 0x7c, + 0x4d, 0xf4, 0x07, 0x58, 0xd2, 0xec, 0x3f, 0x58, 0x90, 0x0d, 0x90, 0x22, 0xb7, 0xc8, 0x7d, 0xc8, + 0xe6, 0x96, 0xb4, 0xcd, 0x4f, 0xdf, 0x90, 0xa3, 0xe7, 0x61, 0xc9, 0x61, 0x8c, 0xf4, 0x42, 0x26, + 0xdc, 0x37, 0x7f, 0xdb, 0xee, 0x2b, 0x0a, 0xe4, 0xab, 0x41, 0xd3, 0x3b, 0xf4, 0x84, 0xeb, 0x9a, + 0xe2, 0xec, 0x7f, 0xe5, 0x60, 0x35, 0x5d, 0x2e, 0xa6, 0x36, 0x25, 0x77, 0xd2, 0xa6, 0x9c, 0xd8, + 0x03, 0xe6, 0xff, 0x3b, 0x7b, 0xc0, 0x17, 0x00, 0x9a, 0xe2, 0xb3, 0x85, 0x51, 0x0b, 0x77, 0x1e, + 0x13, 0xb6, 0x13, 0x29, 0xd8, 0x90, 0x88, 0xd6, 0x20, 0xe7, 0x35, 0xc5, 0x61, 0xcc, 0xd7, 0x40, + 0xf1, 0xe6, 0x76, 0xb6, 0x71, 0xce, 0x6b, 0xda, 0x14, 0x96, 0xcd, 0x42, 0xf5, 0xd4, 0x4e, 0xf3, + 0x39, 0x58, 0x91, 0xbf, 0xb6, 0x09, 0x73, 0xbc, 0x2e, 0x55, 0xbb, 0xf3, 0x80, 0x62, 0x5f, 0x69, + 0x98, 0x44, 0x9c, 0xe6, 0xb5, 0x7f, 0x96, 0x03, 0xb8, 0x1c, 0x04, 0x1d, 0x85, 0x19, 0x9f, 0x01, + 0x6b, 0xe2, 0x19, 0xd8, 0x84, 0x42, 0xc7, 0xf3, 0x9b, 0xd9, 0x53, 0xb2, 0xeb, 0xf9, 0x4d, 0x2c, + 0x28, 0xe8, 0x02, 0x80, 0x13, 0x7a, 0xcf, 0x92, 0x88, 0xea, 0x09, 0x71, 0x62, 0x97, 0xad, 0xfd, + 0x1d, 0x45, 0xc1, 0x06, 0x17, 0x7a, 0x54, 0x15, 0x95, 0x72, 0xd0, 0x50, 0xce, 0x14, 0x95, 0x25, + 0xae, 0xa1, 0x51, 0x35, 0x3e, 0x91, 0x09, 0x6b, 0x9b, 0x23, 0x61, 0x4d, 0x17, 0xd9, 0xfb, 0x6d, + 0x87, 0x92, 0x71, 0x07, 0x6c, 0xfe, 0x84, 0x89, 0x57, 0x03, 0x4a, 0x4f, 0x5f, 0x3f, 0x90, 0xa5, + 0x82, 0x0d, 0x79, 0xcf, 0x91, 0x51, 0x24, 0xaf, 0xdd, 0x7e, 0x87, 0xd2, 0xbe, 0xd8, 0x61, 0x4e, + 0x44, 0x0f, 0x43, 0x9e, 0xbc, 0x14, 0x0a, 0xbb, 0xe4, 0x75, 0xa4, 0xb9, 0xf8, 0x52, 0xe8, 0x45, + 0x84, 0x72, 0x26, 0xf2, 0x52, 0x68, 0xff, 0xc3, 0x02, 0x3d, 0xc4, 0x43, 0x87, 0x50, 0xe0, 0x5d, + 0xa9, 0xca, 0x3d, 0x97, 0xa7, 0x6c, 0x7c, 0xf5, 0xac, 0xb0, 0x24, 0x46, 0xa1, 0x43, 0xdf, 0xc5, + 0x42, 0x3e, 0x1a, 0x40, 0x29, 0x0a, 0xba, 0xdd, 0x1b, 0x8e, 0xdb, 0x99, 0x41, 0x1a, 0xc2, 0x4a, + 0x94, 0xc6, 0x5b, 0x16, 0x41, 0x40, 0x2d, 0xe3, 0x04, 0xcb, 0xfe, 0x4d, 0x11, 0x32, 0xdd, 0x0e, + 0xea, 0x9b, 0xf3, 0x51, 0x6b, 0x86, 0xf3, 0xd1, 0xc4, 0xe2, 0xe3, 0x66, 0xa4, 0xe8, 0x71, 0x28, + 0x86, 0xdc, 0x11, 0x94, 0xdb, 0x6e, 0xc4, 0x91, 0x5b, 0x78, 0xc7, 0x18, 0x7f, 0x91, 0xdc, 0xa6, + 0xbb, 0xe4, 0x4f, 0x88, 0xc7, 0x5f, 0x97, 0xa3, 0x0c, 0x35, 0x36, 0x90, 0x91, 0x63, 0x6f, 0x56, + 0x3b, 0xaa, 0x26, 0x07, 0xc9, 0x4c, 0x43, 0xcd, 0x0b, 0x0c, 0x44, 0xf4, 0x3d, 0x0b, 0x56, 0x63, + 0xc3, 0x2b, 0x25, 0x8a, 0x77, 0x45, 0x09, 0xd1, 0xc3, 0xe2, 0x14, 0x12, 0xce, 0x20, 0xa3, 0x2f, + 0xc1, 0x22, 0x65, 0x4e, 0x24, 0x53, 0xd3, 0xfc, 0x6d, 0x47, 0xd1, 0x64, 0x2f, 0x1b, 0xb1, 0x10, + 0xac, 0xe5, 0xa1, 0xe7, 0x00, 0x0e, 0x3d, 0xdf, 0xa3, 0x6d, 0x21, 0x7d, 0xe1, 0xce, 0x12, 0xdf, + 0xa5, 0x44, 0x02, 0x36, 0xa4, 0xd9, 0x3f, 0xb1, 0x00, 0x8d, 0x49, 0x0b, 0x51, 0x5c, 0xa8, 0x5a, + 0x77, 0x23, 0x6d, 0x8d, 0xad, 0x59, 0x9f, 0x2c, 0xfd, 0xfc, 0xb5, 0x8d, 0xb9, 0x57, 0xde, 0xd9, + 0x9c, 0xb3, 0xbf, 0x9d, 0x83, 0x25, 0xe3, 0xd6, 0xeb, 0x14, 0x41, 0x3a, 0x73, 0x4b, 0x97, 0x3b, + 0xe5, 0x2d, 0xdd, 0x23, 0x50, 0x0a, 0x83, 0xae, 0xe7, 0x7a, 0x2a, 0x41, 0x2f, 0xca, 0x93, 0xbd, + 0xaf, 0xd6, 0x70, 0x42, 0x45, 0x0c, 0x16, 0x6f, 0xde, 0x62, 0x22, 0x38, 0xc6, 0x77, 0x7a, 0xf5, + 0x29, 0x8c, 0x12, 0x07, 0x5a, 0xbd, 0xf3, 0xf1, 0x0a, 0xc5, 0x1a, 0xc8, 0xfe, 0x4b, 0x0e, 0x40, + 0x5c, 0x8a, 0x7a, 0x62, 0x4c, 0xb5, 0x09, 0x85, 0x88, 0x84, 0x41, 0xd6, 0x0e, 0x9c, 0x03, 0x0b, + 0x4a, 0xaa, 0xeb, 0xcc, 0xdd, 0x56, 0xd7, 0x99, 0x3f, 0xb1, 0xeb, 0xe4, 0x69, 0x97, 0xb6, 0xf7, + 0x23, 0x6f, 0xe0, 0x30, 0xb2, 0x4b, 0x86, 0x2a, 0x77, 0xe9, 0xb4, 0xdb, 0xb8, 0xac, 0x89, 0x38, + 0xcd, 0x3b, 0xb6, 0x61, 0x2f, 0xfe, 0x07, 0x1b, 0xf6, 0xb7, 0x2d, 0x58, 0xd5, 0x96, 0xfd, 0xdf, + 0xba, 0x87, 0xd7, 0x7a, 0x4f, 0xe8, 0xfe, 0xfe, 0x69, 0xc1, 0x99, 0xb8, 0xcf, 0x50, 0x75, 0xcf, + 0x4c, 0x0a, 0x9d, 0xd4, 0x8d, 0x56, 0xfe, 0xe4, 0x1b, 0x2d, 0x33, 0x9d, 0x14, 0x4e, 0x48, 0x27, + 0x9f, 0xcf, 0x94, 0x38, 0x1f, 0x1a, 0x29, 0x71, 0x50, 0xd2, 0x51, 0x0d, 0x7d, 0x37, 0x5d, 0x12, + 0xda, 0xbf, 0xb6, 0x60, 0x39, 0x26, 0xef, 0x05, 0x4d, 0xd1, 0xb9, 0x50, 0xe1, 0x64, 0x56, 0xba, + 0x73, 0x91, 0xee, 0x20, 0x69, 0xa8, 0x0f, 0x25, 0xb7, 0xed, 0x75, 0x9b, 0x11, 0xf1, 0xd5, 0xb6, + 0x3c, 0x35, 0x83, 0x86, 0x8f, 0xe3, 0x6b, 0x57, 0xa8, 0x2b, 0x00, 0x9c, 0x40, 0xd9, 0xbf, 0xcb, + 0xc3, 0x4a, 0xaa, 0x3b, 0xe4, 0xe1, 0x4b, 0x5e, 0x29, 0x35, 0x0c, 0x9d, 0x93, 0xf0, 0x75, 0xa0, + 0x49, 0xd8, 0xe4, 0xe3, 0xfb, 0xd1, 0xf5, 0x06, 0x52, 0x46, 0xf6, 0x86, 0xf1, 0x4a, 0x4c, 0xc0, + 0x9a, 0xc7, 0x68, 0x8f, 0xf3, 0xb7, 0xdd, 0x1e, 0xbf, 0x6a, 0x01, 0x12, 0x9f, 0xc0, 0x25, 0x27, + 0x5d, 0xac, 0x8a, 0x85, 0x33, 0xb3, 0xdb, 0x9a, 0xd2, 0x08, 0xd5, 0x47, 0xa0, 0xf0, 0x18, 0x78, + 0x63, 0x6a, 0x5e, 0xbc, 0x27, 0x53, 0x73, 0xfb, 0x6b, 0x70, 0x6e, 0xa4, 0x1e, 0x54, 0x5d, 0x8e, + 0x35, 0xae, 0xcb, 0xe1, 0x9e, 0x18, 0x46, 0x7d, 0x5f, 0x6e, 0x50, 0x49, 0x7b, 0xe2, 0x3e, 0x5f, + 0xc4, 0x92, 0xc6, 0x5b, 0x9f, 0x66, 0x34, 0xc4, 0x7d, 0xd9, 0x3e, 0x94, 0x34, 0xfa, 0xb6, 0x58, + 0xc5, 0x8a, 0x6a, 0xff, 0x32, 0x0f, 0x2b, 0xa9, 0x1a, 0x25, 0xd5, 0xa5, 0x5a, 0x27, 0x76, 0xa9, + 0xb3, 0x54, 0x06, 0xbd, 0x0c, 0xcb, 0x54, 0x1c, 0xc5, 0xc8, 0x61, 0xa4, 0x35, 0x9c, 0xc1, 0xbd, + 0x45, 0xc3, 0x10, 0x57, 0x3b, 0x7b, 0x7c, 0xb4, 0xb1, 0x6c, 0xae, 0xe0, 0x14, 0x1c, 0xfa, 0xa9, + 0x05, 0x28, 0x1c, 0x77, 0xd9, 0x6a, 0x4d, 0x59, 0xb1, 0x8c, 0xd6, 0x43, 0xb5, 0x07, 0xb9, 0x4b, + 0x8e, 0xe9, 0xad, 0xc7, 0x28, 0x60, 0xff, 0x2a, 0x07, 0xf7, 0x8d, 0xa9, 0x23, 0xd1, 0x2d, 0x73, + 0xbe, 0x24, 0xeb, 0xaa, 0xa7, 0x67, 0x70, 0x6c, 0x54, 0x80, 0x97, 0xff, 0x97, 0x38, 0x71, 0xba, + 0x74, 0xf2, 0x20, 0xe3, 0x10, 0x8a, 0xed, 0x20, 0xe8, 0xc4, 0x13, 0x8b, 0x69, 0x12, 0x95, 0xee, + 0xb3, 0x6b, 0x8b, 0xdc, 0xcb, 0xf8, 0x33, 0xc5, 0x52, 0xbc, 0xfd, 0x5d, 0x0b, 0x8c, 0xeb, 0x4a, + 0xf4, 0x55, 0x58, 0x74, 0xfa, 0x2c, 0xe8, 0x39, 0x8c, 0x34, 0x55, 0xfa, 0xdd, 0x9b, 0xc9, 0xc5, + 0xe8, 0x56, 0x2c, 0x55, 0x5a, 0x28, 0x79, 0xc4, 0x1a, 0xcf, 0x7e, 0x52, 0xee, 0x58, 0xe6, 0x05, + 0x7d, 0x5a, 0xac, 0xc9, 0xa7, 0xc5, 0xfe, 0xbb, 0x05, 0x29, 0x2f, 0x45, 0x3d, 0x28, 0x72, 0x95, + 0x86, 0x33, 0xb8, 0x0e, 0x37, 0xe5, 0x6e, 0x71, 0x99, 0xd2, 0x8e, 0xe2, 0x27, 0x96, 0x28, 0xc8, + 0x83, 0x02, 0x37, 0xa8, 0xea, 0x73, 0x77, 0x67, 0x84, 0xc6, 0xb7, 0x4a, 0xb6, 0xd5, 0xfc, 0x17, + 0x16, 0x10, 0xf6, 0x13, 0x70, 0x6e, 0x44, 0x23, 0x6e, 0xa4, 0xc3, 0x20, 0xbe, 0xfd, 0x37, 0x8c, + 0x74, 0x89, 0x2f, 0x62, 0x49, 0xe3, 0xf9, 0xf9, 0x6c, 0x56, 0x3c, 0x3f, 0xc0, 0xe7, 0x68, 0x56, + 0xde, 0x5d, 0xb1, 0xda, 0xff, 0x2b, 0xa5, 0x46, 0xd5, 0xc7, 0xa3, 0x1a, 0xf0, 0x1d, 0xcd, 0x5e, + 0x5e, 0xf0, 0x33, 0xe4, 0xf9, 0x94, 0xb8, 0xfd, 0x28, 0xfe, 0x50, 0x3d, 0x15, 0x51, 0xeb, 0x38, + 0xe1, 0x40, 0x17, 0x00, 0xe4, 0xe5, 0xd9, 0x9e, 0x2e, 0xc4, 0x93, 0x89, 0x50, 0x23, 0xa1, 0x60, + 0x83, 0x8b, 0xf7, 0x22, 0x2e, 0x89, 0xd8, 0x36, 0x2f, 0x3f, 0x79, 0xdc, 0x5d, 0x96, 0xbd, 0x48, + 0x5d, 0xad, 0xe1, 0x84, 0x8a, 0x3e, 0x0c, 0x0b, 0x1d, 0x32, 0x14, 0x8c, 0x05, 0xc1, 0xb8, 0xc4, + 0x2b, 0xaa, 0x5d, 0xb9, 0x84, 0x63, 0x1a, 0xb2, 0x61, 0xde, 0x75, 0x04, 0x57, 0x51, 0x70, 0x81, + 0xb8, 0x47, 0xdb, 0x12, 0x4c, 0x8a, 0x52, 0xab, 0xbc, 0xf1, 0xee, 0xfa, 0xdc, 0x9b, 0xef, 0xae, + 0xcf, 0xbd, 0xf5, 0xee, 0xfa, 0xdc, 0x2b, 0xc7, 0xeb, 0xd6, 0x1b, 0xc7, 0xeb, 0xd6, 0x9b, 0xc7, + 0xeb, 0xd6, 0x5b, 0xc7, 0xeb, 0xd6, 0xdf, 0x8e, 0xd7, 0xad, 0x1f, 0xbd, 0xb7, 0x3e, 0xf7, 0x5c, + 0x29, 0x36, 0xed, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xda, 0xda, 0x8a, 0x68, 0x99, 0x2d, 0x00, + 0x00, } diff --git a/pkg/apis/application/v1alpha1/generated.proto b/pkg/apis/application/v1alpha1/generated.proto index beb7702d5c674..9a2d01d346190 100644 --- a/pkg/apis/application/v1alpha1/generated.proto +++ b/pkg/apis/application/v1alpha1/generated.proto @@ -239,8 +239,6 @@ message ConnectionState { // DeploymentInfo contains information relevant to an application deployment message DeploymentInfo { - repeated ComponentParameter params = 1; - optional string revision = 2; repeated ComponentParameter componentParameterOverrides = 3; diff --git a/pkg/apis/application/v1alpha1/types.go b/pkg/apis/application/v1alpha1/types.go index f371a12dc3219..773d85a660570 100644 --- a/pkg/apis/application/v1alpha1/types.go +++ b/pkg/apis/application/v1alpha1/types.go @@ -200,7 +200,6 @@ type ResourceDetails struct { // DeploymentInfo contains information relevant to an application deployment type DeploymentInfo struct { - Params []ComponentParameter `json:"params" protobuf:"bytes,1,name=params"` Revision string `json:"revision" protobuf:"bytes,2,opt,name=revision"` ComponentParameterOverrides []ComponentParameter `json:"componentParameterOverrides,omitempty" protobuf:"bytes,3,opt,name=componentParameterOverrides"` DeployedAt metav1.Time `json:"deployedAt" protobuf:"bytes,4,opt,name=deployedAt"` diff --git a/pkg/apis/application/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/application/v1alpha1/zz_generated.deepcopy.go index 8810bf93f60e3..f155e0c01b6dd 100644 --- a/pkg/apis/application/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/application/v1alpha1/zz_generated.deepcopy.go @@ -481,11 +481,6 @@ func (in *ConnectionState) DeepCopy() *ConnectionState { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DeploymentInfo) DeepCopyInto(out *DeploymentInfo) { *out = *in - if in.Params != nil { - in, out := &in.Params, &out.Params - *out = make([]ComponentParameter, len(*in)) - copy(*out, *in) - } if in.ComponentParameterOverrides != nil { in, out := &in.ComponentParameterOverrides, &out.ComponentParameterOverrides *out = make([]ComponentParameter, len(*in)) @@ -790,6 +785,11 @@ func (in *SyncOperation) DeepCopyInto(out *SyncOperation) { (*in).DeepCopyInto(*out) } } + if in.ParameterOverrides != nil { + in, out := &in.ParameterOverrides, &out.ParameterOverrides + *out = make(ParameterOverrides, len(*in)) + copy(*out, *in) + } return } diff --git a/reposerver/repository/repository.pb.go b/reposerver/repository/repository.pb.go index 66d2bcffd6bb2..d4c5397d2301c 100644 --- a/reposerver/repository/repository.pb.go +++ b/reposerver/repository/repository.pb.go @@ -46,7 +46,7 @@ func (m *ManifestRequest) Reset() { *m = ManifestRequest{} } func (m *ManifestRequest) String() string { return proto.CompactTextString(m) } func (*ManifestRequest) ProtoMessage() {} func (*ManifestRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_49651600e73b0b40, []int{0} + return fileDescriptor_repository_e1170ea85be6baa9, []int{0} } func (m *ManifestRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -146,7 +146,7 @@ func (m *ManifestResponse) Reset() { *m = ManifestResponse{} } func (m *ManifestResponse) String() string { return proto.CompactTextString(m) } func (*ManifestResponse) ProtoMessage() {} func (*ManifestResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_49651600e73b0b40, []int{1} + return fileDescriptor_repository_e1170ea85be6baa9, []int{1} } func (m *ManifestResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -224,7 +224,7 @@ func (m *ListDirRequest) Reset() { *m = ListDirRequest{} } func (m *ListDirRequest) String() string { return proto.CompactTextString(m) } func (*ListDirRequest) ProtoMessage() {} func (*ListDirRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_49651600e73b0b40, []int{2} + return fileDescriptor_repository_e1170ea85be6baa9, []int{2} } func (m *ListDirRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -286,7 +286,7 @@ func (m *FileList) Reset() { *m = FileList{} } func (m *FileList) String() string { return proto.CompactTextString(m) } func (*FileList) ProtoMessage() {} func (*FileList) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_49651600e73b0b40, []int{3} + return fileDescriptor_repository_e1170ea85be6baa9, []int{3} } func (m *FileList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -336,7 +336,7 @@ func (m *GetFileRequest) Reset() { *m = GetFileRequest{} } func (m *GetFileRequest) String() string { return proto.CompactTextString(m) } func (*GetFileRequest) ProtoMessage() {} func (*GetFileRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_49651600e73b0b40, []int{4} + return fileDescriptor_repository_e1170ea85be6baa9, []int{4} } func (m *GetFileRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -398,7 +398,7 @@ func (m *GetFileResponse) Reset() { *m = GetFileResponse{} } func (m *GetFileResponse) String() string { return proto.CompactTextString(m) } func (*GetFileResponse) ProtoMessage() {} func (*GetFileResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_49651600e73b0b40, []int{5} + return fileDescriptor_repository_e1170ea85be6baa9, []int{5} } func (m *GetFileResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2099,10 +2099,10 @@ var ( ) func init() { - proto.RegisterFile("reposerver/repository/repository.proto", fileDescriptor_repository_49651600e73b0b40) + proto.RegisterFile("reposerver/repository/repository.proto", fileDescriptor_repository_e1170ea85be6baa9) } -var fileDescriptor_repository_49651600e73b0b40 = []byte{ +var fileDescriptor_repository_e1170ea85be6baa9 = []byte{ // 584 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xdd, 0x8a, 0xd3, 0x40, 0x14, 0xde, 0x6c, 0xbb, 0xdd, 0x76, 0x2a, 0xee, 0x3a, 0x14, 0x09, 0x69, 0x29, 0x21, 0xa0, 0xf4, diff --git a/server/account/account.pb.go b/server/account/account.pb.go index af01a1b26365b..ab3e7b80d9bb9 100644 --- a/server/account/account.pb.go +++ b/server/account/account.pb.go @@ -37,7 +37,7 @@ func (m *UpdatePasswordRequest) Reset() { *m = UpdatePasswordRequest{} } func (m *UpdatePasswordRequest) String() string { return proto.CompactTextString(m) } func (*UpdatePasswordRequest) ProtoMessage() {} func (*UpdatePasswordRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_account_d27ff2bbd0f6944b, []int{0} + return fileDescriptor_account_c227670d8e34bf5f, []int{0} } func (m *UpdatePasswordRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -90,7 +90,7 @@ func (m *UpdatePasswordResponse) Reset() { *m = UpdatePasswordResponse{} func (m *UpdatePasswordResponse) String() string { return proto.CompactTextString(m) } func (*UpdatePasswordResponse) ProtoMessage() {} func (*UpdatePasswordResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_account_d27ff2bbd0f6944b, []int{1} + return fileDescriptor_account_c227670d8e34bf5f, []int{1} } func (m *UpdatePasswordResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -566,10 +566,10 @@ var ( ) func init() { - proto.RegisterFile("server/account/account.proto", fileDescriptor_account_d27ff2bbd0f6944b) + proto.RegisterFile("server/account/account.proto", fileDescriptor_account_c227670d8e34bf5f) } -var fileDescriptor_account_d27ff2bbd0f6944b = []byte{ +var fileDescriptor_account_c227670d8e34bf5f = []byte{ // 268 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x4e, 0x2d, 0x2a, 0x4b, 0x2d, 0xd2, 0x4f, 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x81, 0xd1, 0x7a, 0x05, 0x45, 0xf9, diff --git a/server/application/application.pb.go b/server/application/application.pb.go index 14f5ebc186aa1..1a7a2915c55aa 100644 --- a/server/application/application.pb.go +++ b/server/application/application.pb.go @@ -51,7 +51,7 @@ func (m *ApplicationQuery) Reset() { *m = ApplicationQuery{} } func (m *ApplicationQuery) String() string { return proto.CompactTextString(m) } func (*ApplicationQuery) ProtoMessage() {} func (*ApplicationQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{0} + return fileDescriptor_application_7fcd602c2bf997a7, []int{0} } func (m *ApplicationQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -115,7 +115,7 @@ func (m *ApplicationResourceEventsQuery) Reset() { *m = ApplicationResou func (m *ApplicationResourceEventsQuery) String() string { return proto.CompactTextString(m) } func (*ApplicationResourceEventsQuery) ProtoMessage() {} func (*ApplicationResourceEventsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{1} + return fileDescriptor_application_7fcd602c2bf997a7, []int{1} } func (m *ApplicationResourceEventsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -178,7 +178,7 @@ func (m *ApplicationManifestQuery) Reset() { *m = ApplicationManifestQue func (m *ApplicationManifestQuery) String() string { return proto.CompactTextString(m) } func (*ApplicationManifestQuery) ProtoMessage() {} func (*ApplicationManifestQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{2} + return fileDescriptor_application_7fcd602c2bf997a7, []int{2} } func (m *ApplicationManifestQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -231,7 +231,7 @@ func (m *ApplicationResponse) Reset() { *m = ApplicationResponse{} } func (m *ApplicationResponse) String() string { return proto.CompactTextString(m) } func (*ApplicationResponse) ProtoMessage() {} func (*ApplicationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{3} + return fileDescriptor_application_7fcd602c2bf997a7, []int{3} } func (m *ApplicationResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -272,7 +272,7 @@ func (m *ApplicationCreateRequest) Reset() { *m = ApplicationCreateReque func (m *ApplicationCreateRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationCreateRequest) ProtoMessage() {} func (*ApplicationCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{4} + return fileDescriptor_application_7fcd602c2bf997a7, []int{4} } func (m *ApplicationCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -326,7 +326,7 @@ func (m *ApplicationUpdateRequest) Reset() { *m = ApplicationUpdateReque func (m *ApplicationUpdateRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationUpdateRequest) ProtoMessage() {} func (*ApplicationUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{5} + return fileDescriptor_application_7fcd602c2bf997a7, []int{5} } func (m *ApplicationUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -374,7 +374,7 @@ func (m *ApplicationDeleteRequest) Reset() { *m = ApplicationDeleteReque func (m *ApplicationDeleteRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationDeleteRequest) ProtoMessage() {} func (*ApplicationDeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{6} + return fileDescriptor_application_7fcd602c2bf997a7, []int{6} } func (m *ApplicationDeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -434,7 +434,7 @@ func (m *ApplicationSyncRequest) Reset() { *m = ApplicationSyncRequest{} func (m *ApplicationSyncRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationSyncRequest) ProtoMessage() {} func (*ApplicationSyncRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{7} + return fileDescriptor_application_7fcd602c2bf997a7, []int{7} } func (m *ApplicationSyncRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -505,6 +505,8 @@ func (m *ApplicationSyncRequest) GetParameter() *ParameterOverrides { return nil } +// ParameterOverrides is a wrapper on a list of parameters. If omitted, the application's overrides +// in the spec will be used. If set, will use the supplied list of overrides type ParameterOverrides struct { Overrides []*Parameter `protobuf:"bytes,1,rep,name=overrides" json:"overrides,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -516,7 +518,7 @@ func (m *ParameterOverrides) Reset() { *m = ParameterOverrides{} } func (m *ParameterOverrides) String() string { return proto.CompactTextString(m) } func (*ParameterOverrides) ProtoMessage() {} func (*ParameterOverrides) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{8} + return fileDescriptor_application_7fcd602c2bf997a7, []int{8} } func (m *ParameterOverrides) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -565,7 +567,7 @@ func (m *Parameter) Reset() { *m = Parameter{} } func (m *Parameter) String() string { return proto.CompactTextString(m) } func (*Parameter) ProtoMessage() {} func (*Parameter) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{9} + return fileDescriptor_application_7fcd602c2bf997a7, []int{9} } func (m *Parameter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -628,7 +630,7 @@ func (m *ApplicationUpdateSpecRequest) Reset() { *m = ApplicationUpdateS func (m *ApplicationUpdateSpecRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationUpdateSpecRequest) ProtoMessage() {} func (*ApplicationUpdateSpecRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{10} + return fileDescriptor_application_7fcd602c2bf997a7, []int{10} } func (m *ApplicationUpdateSpecRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -685,7 +687,7 @@ func (m *ApplicationRollbackRequest) Reset() { *m = ApplicationRollbackR func (m *ApplicationRollbackRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationRollbackRequest) ProtoMessage() {} func (*ApplicationRollbackRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{11} + return fileDescriptor_application_7fcd602c2bf997a7, []int{11} } func (m *ApplicationRollbackRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -756,7 +758,7 @@ func (m *ApplicationDeleteResourceRequest) Reset() { *m = ApplicationDel func (m *ApplicationDeleteResourceRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationDeleteResourceRequest) ProtoMessage() {} func (*ApplicationDeleteResourceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{12} + return fileDescriptor_application_7fcd602c2bf997a7, []int{12} } func (m *ApplicationDeleteResourceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -830,7 +832,7 @@ func (m *ApplicationPodLogsQuery) Reset() { *m = ApplicationPodLogsQuery func (m *ApplicationPodLogsQuery) String() string { return proto.CompactTextString(m) } func (*ApplicationPodLogsQuery) ProtoMessage() {} func (*ApplicationPodLogsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{13} + return fileDescriptor_application_7fcd602c2bf997a7, []int{13} } func (m *ApplicationPodLogsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -920,7 +922,7 @@ func (m *LogEntry) Reset() { *m = LogEntry{} } func (m *LogEntry) String() string { return proto.CompactTextString(m) } func (*LogEntry) ProtoMessage() {} func (*LogEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{14} + return fileDescriptor_application_7fcd602c2bf997a7, []int{14} } func (m *LogEntry) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -974,7 +976,7 @@ func (m *OperationTerminateRequest) Reset() { *m = OperationTerminateReq func (m *OperationTerminateRequest) String() string { return proto.CompactTextString(m) } func (*OperationTerminateRequest) ProtoMessage() {} func (*OperationTerminateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{15} + return fileDescriptor_application_7fcd602c2bf997a7, []int{15} } func (m *OperationTerminateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1020,7 +1022,7 @@ func (m *OperationTerminateResponse) Reset() { *m = OperationTerminateRe func (m *OperationTerminateResponse) String() string { return proto.CompactTextString(m) } func (*OperationTerminateResponse) ProtoMessage() {} func (*OperationTerminateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_application_139f86dca173329e, []int{16} + return fileDescriptor_application_7fcd602c2bf997a7, []int{16} } func (m *OperationTerminateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4875,10 +4877,10 @@ var ( ) func init() { - proto.RegisterFile("server/application/application.proto", fileDescriptor_application_139f86dca173329e) + proto.RegisterFile("server/application/application.proto", fileDescriptor_application_7fcd602c2bf997a7) } -var fileDescriptor_application_139f86dca173329e = []byte{ +var fileDescriptor_application_7fcd602c2bf997a7 = []byte{ // 1407 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcf, 0x6f, 0xdc, 0x44, 0x14, 0x66, 0x76, 0x37, 0x9b, 0xec, 0x4b, 0x85, 0x60, 0x68, 0x83, 0x31, 0x69, 0xb2, 0x9a, 0xa6, diff --git a/server/cluster/cluster.pb.go b/server/cluster/cluster.pb.go index 3b955688baba4..fa4c2ba9ebf42 100644 --- a/server/cluster/cluster.pb.go +++ b/server/cluster/cluster.pb.go @@ -45,7 +45,7 @@ func (m *ClusterQuery) Reset() { *m = ClusterQuery{} } func (m *ClusterQuery) String() string { return proto.CompactTextString(m) } func (*ClusterQuery) ProtoMessage() {} func (*ClusterQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{0} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{0} } func (m *ClusterQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -91,7 +91,7 @@ func (m *ClusterResponse) Reset() { *m = ClusterResponse{} } func (m *ClusterResponse) String() string { return proto.CompactTextString(m) } func (*ClusterResponse) ProtoMessage() {} func (*ClusterResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{1} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{1} } func (m *ClusterResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -132,7 +132,7 @@ func (m *ClusterCreateRequest) Reset() { *m = ClusterCreateRequest{} } func (m *ClusterCreateRequest) String() string { return proto.CompactTextString(m) } func (*ClusterCreateRequest) ProtoMessage() {} func (*ClusterCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{2} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{2} } func (m *ClusterCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -189,7 +189,7 @@ func (m *ClusterCreateFromKubeConfigRequest) Reset() { *m = ClusterCreat func (m *ClusterCreateFromKubeConfigRequest) String() string { return proto.CompactTextString(m) } func (*ClusterCreateFromKubeConfigRequest) ProtoMessage() {} func (*ClusterCreateFromKubeConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{3} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{3} } func (m *ClusterCreateFromKubeConfigRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -257,7 +257,7 @@ func (m *ClusterUpdateRequest) Reset() { *m = ClusterUpdateRequest{} } func (m *ClusterUpdateRequest) String() string { return proto.CompactTextString(m) } func (*ClusterUpdateRequest) ProtoMessage() {} func (*ClusterUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{4} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{4} } func (m *ClusterUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1393,10 +1393,10 @@ var ( ) func init() { - proto.RegisterFile("server/cluster/cluster.proto", fileDescriptor_cluster_0875510a34378ea0) + proto.RegisterFile("server/cluster/cluster.proto", fileDescriptor_cluster_bf8d7367dfc95a3e) } -var fileDescriptor_cluster_0875510a34378ea0 = []byte{ +var fileDescriptor_cluster_bf8d7367dfc95a3e = []byte{ // 564 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0xcd, 0x6e, 0x13, 0x31, 0x10, 0xc7, 0xe5, 0xb6, 0xda, 0x12, 0x83, 0xf8, 0xb0, 0x0a, 0x5a, 0xd2, 0x10, 0xa5, 0x3e, 0x54, diff --git a/server/project/project.pb.go b/server/project/project.pb.go index 492ce08be4a2c..cb59249682e04 100644 --- a/server/project/project.pb.go +++ b/server/project/project.pb.go @@ -46,7 +46,7 @@ func (m *ProjectCreateRequest) Reset() { *m = ProjectCreateRequest{} } func (m *ProjectCreateRequest) String() string { return proto.CompactTextString(m) } func (*ProjectCreateRequest) ProtoMessage() {} func (*ProjectCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{0} + return fileDescriptor_project_8d94583ca767d5b3, []int{0} } func (m *ProjectCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -96,7 +96,7 @@ func (m *ProjectTokenDeleteRequest) Reset() { *m = ProjectTokenDeleteReq func (m *ProjectTokenDeleteRequest) String() string { return proto.CompactTextString(m) } func (*ProjectTokenDeleteRequest) ProtoMessage() {} func (*ProjectTokenDeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{1} + return fileDescriptor_project_8d94583ca767d5b3, []int{1} } func (m *ProjectTokenDeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -162,7 +162,7 @@ func (m *ProjectTokenCreateRequest) Reset() { *m = ProjectTokenCreateReq func (m *ProjectTokenCreateRequest) String() string { return proto.CompactTextString(m) } func (*ProjectTokenCreateRequest) ProtoMessage() {} func (*ProjectTokenCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{2} + return fileDescriptor_project_8d94583ca767d5b3, []int{2} } func (m *ProjectTokenCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -231,7 +231,7 @@ func (m *ProjectTokenResponse) Reset() { *m = ProjectTokenResponse{} } func (m *ProjectTokenResponse) String() string { return proto.CompactTextString(m) } func (*ProjectTokenResponse) ProtoMessage() {} func (*ProjectTokenResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{3} + return fileDescriptor_project_8d94583ca767d5b3, []int{3} } func (m *ProjectTokenResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -279,7 +279,7 @@ func (m *ProjectQuery) Reset() { *m = ProjectQuery{} } func (m *ProjectQuery) String() string { return proto.CompactTextString(m) } func (*ProjectQuery) ProtoMessage() {} func (*ProjectQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{4} + return fileDescriptor_project_8d94583ca767d5b3, []int{4} } func (m *ProjectQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -326,7 +326,7 @@ func (m *ProjectUpdateRequest) Reset() { *m = ProjectUpdateRequest{} } func (m *ProjectUpdateRequest) String() string { return proto.CompactTextString(m) } func (*ProjectUpdateRequest) ProtoMessage() {} func (*ProjectUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{5} + return fileDescriptor_project_8d94583ca767d5b3, []int{5} } func (m *ProjectUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -372,7 +372,7 @@ func (m *EmptyResponse) Reset() { *m = EmptyResponse{} } func (m *EmptyResponse) String() string { return proto.CompactTextString(m) } func (*EmptyResponse) ProtoMessage() {} func (*EmptyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{6} + return fileDescriptor_project_8d94583ca767d5b3, []int{6} } func (m *EmptyResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1846,10 +1846,10 @@ var ( ) func init() { - proto.RegisterFile("server/project/project.proto", fileDescriptor_project_082822b5d17b8c4e) + proto.RegisterFile("server/project/project.proto", fileDescriptor_project_8d94583ca767d5b3) } -var fileDescriptor_project_082822b5d17b8c4e = []byte{ +var fileDescriptor_project_8d94583ca767d5b3 = []byte{ // 697 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x5d, 0x6b, 0x13, 0x4d, 0x14, 0x66, 0x9a, 0xbe, 0x79, 0xdf, 0x4e, 0x5e, 0xb5, 0x0c, 0xad, 0xa6, 0xb1, 0x8d, 0x61, 0x2e, diff --git a/server/repository/repository.pb.go b/server/repository/repository.pb.go index aa4eabde84f4b..803c50098f571 100644 --- a/server/repository/repository.pb.go +++ b/server/repository/repository.pb.go @@ -46,7 +46,7 @@ func (m *RepoAppsQuery) Reset() { *m = RepoAppsQuery{} } func (m *RepoAppsQuery) String() string { return proto.CompactTextString(m) } func (*RepoAppsQuery) ProtoMessage() {} func (*RepoAppsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{0} + return fileDescriptor_repository_6cfdcc280f230e64, []int{0} } func (m *RepoAppsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -102,7 +102,7 @@ func (m *AppInfo) Reset() { *m = AppInfo{} } func (m *AppInfo) String() string { return proto.CompactTextString(m) } func (*AppInfo) ProtoMessage() {} func (*AppInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{1} + return fileDescriptor_repository_6cfdcc280f230e64, []int{1} } func (m *AppInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -159,7 +159,7 @@ func (m *RepoAppDetailsQuery) Reset() { *m = RepoAppDetailsQuery{} } func (m *RepoAppDetailsQuery) String() string { return proto.CompactTextString(m) } func (*RepoAppDetailsQuery) ProtoMessage() {} func (*RepoAppDetailsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{2} + return fileDescriptor_repository_6cfdcc280f230e64, []int{2} } func (m *RepoAppDetailsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -224,7 +224,7 @@ func (m *RepoAppDetailsResponse) Reset() { *m = RepoAppDetailsResponse{} func (m *RepoAppDetailsResponse) String() string { return proto.CompactTextString(m) } func (*RepoAppDetailsResponse) ProtoMessage() {} func (*RepoAppDetailsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{3} + return fileDescriptor_repository_6cfdcc280f230e64, []int{3} } func (m *RepoAppDetailsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -293,7 +293,7 @@ func (m *RepoAppsResponse) Reset() { *m = RepoAppsResponse{} } func (m *RepoAppsResponse) String() string { return proto.CompactTextString(m) } func (*RepoAppsResponse) ProtoMessage() {} func (*RepoAppsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{4} + return fileDescriptor_repository_6cfdcc280f230e64, []int{4} } func (m *RepoAppsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -344,7 +344,7 @@ func (m *KsonnetAppSpec) Reset() { *m = KsonnetAppSpec{} } func (m *KsonnetAppSpec) String() string { return proto.CompactTextString(m) } func (*KsonnetAppSpec) ProtoMessage() {} func (*KsonnetAppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{5} + return fileDescriptor_repository_6cfdcc280f230e64, []int{5} } func (m *KsonnetAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -408,7 +408,7 @@ func (m *HelmAppSpec) Reset() { *m = HelmAppSpec{} } func (m *HelmAppSpec) String() string { return proto.CompactTextString(m) } func (*HelmAppSpec) ProtoMessage() {} func (*HelmAppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{6} + return fileDescriptor_repository_6cfdcc280f230e64, []int{6} } func (m *HelmAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -470,7 +470,7 @@ func (m *KustomizeAppSpec) Reset() { *m = KustomizeAppSpec{} } func (m *KustomizeAppSpec) String() string { return proto.CompactTextString(m) } func (*KustomizeAppSpec) ProtoMessage() {} func (*KustomizeAppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{7} + return fileDescriptor_repository_6cfdcc280f230e64, []int{7} } func (m *KustomizeAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -524,7 +524,7 @@ func (m *KsonnetEnvironment) Reset() { *m = KsonnetEnvironment{} } func (m *KsonnetEnvironment) String() string { return proto.CompactTextString(m) } func (*KsonnetEnvironment) ProtoMessage() {} func (*KsonnetEnvironment) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{8} + return fileDescriptor_repository_6cfdcc280f230e64, []int{8} } func (m *KsonnetEnvironment) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -595,7 +595,7 @@ func (m *KsonnetEnvironmentDestination) Reset() { *m = KsonnetEnvironmen func (m *KsonnetEnvironmentDestination) String() string { return proto.CompactTextString(m) } func (*KsonnetEnvironmentDestination) ProtoMessage() {} func (*KsonnetEnvironmentDestination) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{9} + return fileDescriptor_repository_6cfdcc280f230e64, []int{9} } func (m *KsonnetEnvironmentDestination) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -650,7 +650,7 @@ func (m *RepoQuery) Reset() { *m = RepoQuery{} } func (m *RepoQuery) String() string { return proto.CompactTextString(m) } func (*RepoQuery) ProtoMessage() {} func (*RepoQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{10} + return fileDescriptor_repository_6cfdcc280f230e64, []int{10} } func (m *RepoQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -696,7 +696,7 @@ func (m *RepoResponse) Reset() { *m = RepoResponse{} } func (m *RepoResponse) String() string { return proto.CompactTextString(m) } func (*RepoResponse) ProtoMessage() {} func (*RepoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{11} + return fileDescriptor_repository_6cfdcc280f230e64, []int{11} } func (m *RepoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -737,7 +737,7 @@ func (m *RepoCreateRequest) Reset() { *m = RepoCreateRequest{} } func (m *RepoCreateRequest) String() string { return proto.CompactTextString(m) } func (*RepoCreateRequest) ProtoMessage() {} func (*RepoCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{12} + return fileDescriptor_repository_6cfdcc280f230e64, []int{12} } func (m *RepoCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -791,7 +791,7 @@ func (m *RepoUpdateRequest) Reset() { *m = RepoUpdateRequest{} } func (m *RepoUpdateRequest) String() string { return proto.CompactTextString(m) } func (*RepoUpdateRequest) ProtoMessage() {} func (*RepoUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{13} + return fileDescriptor_repository_6cfdcc280f230e64, []int{13} } func (m *RepoUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3710,10 +3710,10 @@ var ( ) func init() { - proto.RegisterFile("server/repository/repository.proto", fileDescriptor_repository_31d36efd186d2b01) + proto.RegisterFile("server/repository/repository.proto", fileDescriptor_repository_6cfdcc280f230e64) } -var fileDescriptor_repository_31d36efd186d2b01 = []byte{ +var fileDescriptor_repository_6cfdcc280f230e64 = []byte{ // 911 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0x5b, 0x45, 0x10, 0xd7, 0xc6, 0xa9, 0x13, 0x8f, 0xdb, 0x2a, 0xdd, 0x96, 0x60, 0x1e, 0x8e, 0x1b, 0x2d, 0x12, diff --git a/server/session/session.pb.go b/server/session/session.pb.go index e3db19fa810ae..f594a9a3f7362 100644 --- a/server/session/session.pb.go +++ b/server/session/session.pb.go @@ -47,7 +47,7 @@ func (m *SessionCreateRequest) Reset() { *m = SessionCreateRequest{} } func (m *SessionCreateRequest) String() string { return proto.CompactTextString(m) } func (*SessionCreateRequest) ProtoMessage() {} func (*SessionCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_session_8e535ce77fc5e082, []int{0} + return fileDescriptor_session_217b926c109d1cc2, []int{0} } func (m *SessionCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -108,7 +108,7 @@ func (m *SessionDeleteRequest) Reset() { *m = SessionDeleteRequest{} } func (m *SessionDeleteRequest) String() string { return proto.CompactTextString(m) } func (*SessionDeleteRequest) ProtoMessage() {} func (*SessionDeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_session_8e535ce77fc5e082, []int{1} + return fileDescriptor_session_217b926c109d1cc2, []int{1} } func (m *SessionDeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -149,7 +149,7 @@ func (m *SessionResponse) Reset() { *m = SessionResponse{} } func (m *SessionResponse) String() string { return proto.CompactTextString(m) } func (*SessionResponse) ProtoMessage() {} func (*SessionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_session_8e535ce77fc5e082, []int{2} + return fileDescriptor_session_217b926c109d1cc2, []int{2} } func (m *SessionResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -827,10 +827,10 @@ var ( ) func init() { - proto.RegisterFile("server/session/session.proto", fileDescriptor_session_8e535ce77fc5e082) + proto.RegisterFile("server/session/session.proto", fileDescriptor_session_217b926c109d1cc2) } -var fileDescriptor_session_8e535ce77fc5e082 = []byte{ +var fileDescriptor_session_217b926c109d1cc2 = []byte{ // 356 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xb1, 0x4e, 0xeb, 0x30, 0x14, 0x86, 0xe5, 0x5e, 0xdd, 0xde, 0x7b, 0x3d, 0xdc, 0x8a, 0x28, 0x82, 0x28, 0x2a, 0x15, 0xca, diff --git a/server/settings/settings.pb.go b/server/settings/settings.pb.go index 4d870a30d4abd..00fb78fb6608b 100644 --- a/server/settings/settings.pb.go +++ b/server/settings/settings.pb.go @@ -42,7 +42,7 @@ func (m *SettingsQuery) Reset() { *m = SettingsQuery{} } func (m *SettingsQuery) String() string { return proto.CompactTextString(m) } func (*SettingsQuery) ProtoMessage() {} func (*SettingsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_settings_71506a99e4ff7448, []int{0} + return fileDescriptor_settings_0a30d430c5f54e91, []int{0} } func (m *SettingsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -83,7 +83,7 @@ func (m *Settings) Reset() { *m = Settings{} } func (m *Settings) String() string { return proto.CompactTextString(m) } func (*Settings) ProtoMessage() {} func (*Settings) Descriptor() ([]byte, []int) { - return fileDescriptor_settings_71506a99e4ff7448, []int{1} + return fileDescriptor_settings_0a30d430c5f54e91, []int{1} } func (m *Settings) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -137,7 +137,7 @@ func (m *DexConfig) Reset() { *m = DexConfig{} } func (m *DexConfig) String() string { return proto.CompactTextString(m) } func (*DexConfig) ProtoMessage() {} func (*DexConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_settings_71506a99e4ff7448, []int{2} + return fileDescriptor_settings_0a30d430c5f54e91, []int{2} } func (m *DexConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -185,7 +185,7 @@ func (m *Connector) Reset() { *m = Connector{} } func (m *Connector) String() string { return proto.CompactTextString(m) } func (*Connector) ProtoMessage() {} func (*Connector) Descriptor() ([]byte, []int) { - return fileDescriptor_settings_71506a99e4ff7448, []int{3} + return fileDescriptor_settings_0a30d430c5f54e91, []int{3} } func (m *Connector) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -974,10 +974,10 @@ var ( ) func init() { - proto.RegisterFile("server/settings/settings.proto", fileDescriptor_settings_71506a99e4ff7448) + proto.RegisterFile("server/settings/settings.proto", fileDescriptor_settings_0a30d430c5f54e91) } -var fileDescriptor_settings_71506a99e4ff7448 = []byte{ +var fileDescriptor_settings_0a30d430c5f54e91 = []byte{ // 322 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0x41, 0x4b, 0xc3, 0x40, 0x10, 0x85, 0xd9, 0x46, 0xac, 0x19, 0x91, 0xea, 0x22, 0x12, 0x8b, 0xc4, 0x92, 0x53, 0x41, 0x4c, diff --git a/server/swagger.json b/server/swagger.json index 87ded3169c1a9..85a4fadc12e5f 100644 --- a/server/swagger.json +++ b/server/swagger.json @@ -1358,6 +1358,7 @@ }, "applicationParameterOverrides": { "type": "object", + "title": "ParameterOverrides is a wrapper on a list of parameters. If omitted, the application's overrides\nin the spec will be used. If set, will use the supplied list of overrides", "properties": { "overrides": { "type": "array", @@ -2374,12 +2375,6 @@ "type": "string", "format": "int64" }, - "params": { - "type": "array", - "items": { - "$ref": "#/definitions/v1alpha1ComponentParameter" - } - }, "revision": { "type": "string" } diff --git a/server/version/version.pb.go b/server/version/version.pb.go index ae8734accdafb..a6bd3d2c48771 100644 --- a/server/version/version.pb.go +++ b/server/version/version.pb.go @@ -51,7 +51,7 @@ func (m *VersionMessage) Reset() { *m = VersionMessage{} } func (m *VersionMessage) String() string { return proto.CompactTextString(m) } func (*VersionMessage) ProtoMessage() {} func (*VersionMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_version_cdcdf9fc14514c9b, []int{0} + return fileDescriptor_version_6f54499c257f90e5, []int{0} } func (m *VersionMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -781,10 +781,10 @@ var ( ) func init() { - proto.RegisterFile("server/version/version.proto", fileDescriptor_version_cdcdf9fc14514c9b) + proto.RegisterFile("server/version/version.proto", fileDescriptor_version_6f54499c257f90e5) } -var fileDescriptor_version_cdcdf9fc14514c9b = []byte{ +var fileDescriptor_version_6f54499c257f90e5 = []byte{ // 343 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0xcf, 0x4a, 0xc3, 0x40, 0x10, 0xc6, 0x49, 0xd5, 0xfe, 0x59, 0x4a, 0x0f, 0x8b, 0xd4, 0x25, 0x96, 0x22, 0x3d, 0x88, 0x08,