From eb795c98b6684a9e887f9640457ca3d763f5487c Mon Sep 17 00:00:00 2001 From: Jalaja Ganapathy Date: Fri, 24 Sep 2021 14:20:37 -0700 Subject: [PATCH] fix serializer for unique id (#432) --- .../troubleshoot/v1beta2/analyzer_shared.go | 2 +- .../v1beta2/zz_generated.deepcopy.go | 73 +++++++++---------- 2 files changed, 35 insertions(+), 40 deletions(-) diff --git a/pkg/apis/troubleshoot/v1beta2/analyzer_shared.go b/pkg/apis/troubleshoot/v1beta2/analyzer_shared.go index f9c4a6fd..b35ead7d 100644 --- a/pkg/apis/troubleshoot/v1beta2/analyzer_shared.go +++ b/pkg/apis/troubleshoot/v1beta2/analyzer_shared.go @@ -143,7 +143,7 @@ type RegistryImagesAnalyze struct { } type AnalyzeMeta struct { - ID string `json:"id,omitempty" yaml:"id,omitempty"` + ID string `json:"id,omitempty" yaml:"id,omitempty"` CheckName string `json:"checkName,omitempty" yaml:"checkName,omitempty"` Exclude multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"` } diff --git a/pkg/apis/troubleshoot/v1beta2/zz_generated.deepcopy.go b/pkg/apis/troubleshoot/v1beta2/zz_generated.deepcopy.go index 87025c97..325c2894 100644 --- a/pkg/apis/troubleshoot/v1beta2/zz_generated.deepcopy.go +++ b/pkg/apis/troubleshoot/v1beta2/zz_generated.deepcopy.go @@ -150,7 +150,7 @@ func (in *Analyze) DeepCopyInto(out *Analyze) { if in.WeaveReport != nil { in, out := &in.WeaveReport, &out.WeaveReport *out = new(WeaveReportAnalyze) - (*in).DeepCopyInto(*out) + **out = **in } } @@ -167,7 +167,7 @@ func (in *Analyze) DeepCopy() *Analyze { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AnalyzeConfigMap) DeepCopyInto(out *AnalyzeConfigMap) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -194,11 +194,6 @@ func (in *AnalyzeConfigMap) DeepCopy() *AnalyzeConfigMap { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AnalyzeMeta) DeepCopyInto(out *AnalyzeMeta) { *out = *in - if in.ID != nil { - in, out := &in.ID, &out.ID - *out = new(string) - **out = **in - } out.Exclude = in.Exclude } @@ -215,7 +210,7 @@ func (in *AnalyzeMeta) DeepCopy() *AnalyzeMeta { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AnalyzeSecret) DeepCopyInto(out *AnalyzeSecret) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -342,7 +337,7 @@ func (in *AnalyzerStatus) DeepCopy() *AnalyzerStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *BlockDevicesAnalyze) DeepCopyInto(out *BlockDevicesAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -385,7 +380,7 @@ func (in *CPU) DeepCopy() *CPU { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CPUAnalyze) DeepCopyInto(out *CPUAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -428,7 +423,7 @@ func (in *Ceph) DeepCopy() *Ceph { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CephStatusAnalyze) DeepCopyInto(out *CephStatusAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -471,7 +466,7 @@ func (in *Certificate) DeepCopy() *Certificate { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CertificateAnalyze) DeepCopyInto(out *CertificateAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -535,7 +530,7 @@ func (in *ClusterResources) DeepCopy() *ClusterResources { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterVersion) DeepCopyInto(out *ClusterVersion) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -688,7 +683,7 @@ func (in *Collectd) DeepCopy() *Collectd { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CollectdAnalyze) DeepCopyInto(out *CollectdAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -863,7 +858,7 @@ func (in *ConfigMap) DeepCopy() *ConfigMap { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ContainerRuntime) DeepCopyInto(out *ContainerRuntime) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -932,7 +927,7 @@ func (in *CopyFromHost) DeepCopy() *CopyFromHost { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CustomResourceDefinition) DeepCopyInto(out *CustomResourceDefinition) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -991,7 +986,7 @@ func (in *Database) DeepCopy() *Database { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DatabaseAnalyze) DeepCopyInto(out *DatabaseAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -1018,7 +1013,7 @@ func (in *DatabaseAnalyze) DeepCopy() *DatabaseAnalyze { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DeploymentStatus) DeepCopyInto(out *DeploymentStatus) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -1061,7 +1056,7 @@ func (in *DiskUsage) DeepCopy() *DiskUsage { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DiskUsageAnalyze) DeepCopyInto(out *DiskUsageAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -1088,7 +1083,7 @@ func (in *DiskUsageAnalyze) DeepCopy() *DiskUsageAnalyze { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Distribution) DeepCopyInto(out *Distribution) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -1182,7 +1177,7 @@ func (in *FilesystemPerformance) DeepCopy() *FilesystemPerformance { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *FilesystemPerformanceAnalyze) DeepCopyInto(out *FilesystemPerformanceAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -1262,7 +1257,7 @@ func (in *HTTP) DeepCopy() *HTTP { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HTTPAnalyze) DeepCopyInto(out *HTTPAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -1305,7 +1300,7 @@ func (in *HTTPLoadBalancer) DeepCopy() *HTTPLoadBalancer { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HTTPLoadBalancerAnalyze) DeepCopyInto(out *HTTPLoadBalancerAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -1697,7 +1692,7 @@ func (in *HostServices) DeepCopy() *HostServices { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HostServicesAnalyze) DeepCopyInto(out *HostServicesAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -1756,7 +1751,7 @@ func (in *IPV4Interfaces) DeepCopy() *IPV4Interfaces { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *IPV4InterfacesAnalyze) DeepCopyInto(out *IPV4InterfacesAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -1783,7 +1778,7 @@ func (in *IPV4InterfacesAnalyze) DeepCopy() *IPV4InterfacesAnalyze { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ImagePullSecret) DeepCopyInto(out *ImagePullSecret) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -1832,7 +1827,7 @@ func (in *ImagePullSecrets) DeepCopy() *ImagePullSecrets { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Ingress) DeepCopyInto(out *Ingress) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -1938,7 +1933,7 @@ func (in *Longhorn) DeepCopy() *Longhorn { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *LonghornAnalyze) DeepCopyInto(out *LonghornAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -1981,7 +1976,7 @@ func (in *Memory) DeepCopy() *Memory { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MemoryAnalyze) DeepCopyInto(out *MemoryAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -2050,7 +2045,7 @@ func (in *NodeResourceSelectors) DeepCopy() *NodeResourceSelectors { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NodeResources) DeepCopyInto(out *NodeResources) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -2425,7 +2420,7 @@ func (in *RegistryImages) DeepCopy() *RegistryImages { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *RegistryImagesAnalyze) DeepCopyInto(out *RegistryImagesAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -2564,7 +2559,7 @@ func (in *SingleOutcome) DeepCopy() *SingleOutcome { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *StatefulsetStatus) DeepCopyInto(out *StatefulsetStatus) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -2591,7 +2586,7 @@ func (in *StatefulsetStatus) DeepCopy() *StatefulsetStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *StorageClass) DeepCopyInto(out *StorageClass) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -2787,7 +2782,7 @@ func (in *TCPConnect) DeepCopy() *TCPConnect { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TCPConnectAnalyze) DeepCopyInto(out *TCPConnectAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -2830,7 +2825,7 @@ func (in *TCPLoadBalancer) DeepCopy() *TCPLoadBalancer { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TCPLoadBalancerAnalyze) DeepCopyInto(out *TCPLoadBalancerAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -2873,7 +2868,7 @@ func (in *TCPPortStatus) DeepCopy() *TCPPortStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TCPPortStatusAnalyze) DeepCopyInto(out *TCPPortStatusAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -2900,7 +2895,7 @@ func (in *TCPPortStatusAnalyze) DeepCopy() *TCPPortStatusAnalyze { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TextAnalyze) DeepCopyInto(out *TextAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -2927,7 +2922,7 @@ func (in *TextAnalyze) DeepCopy() *TextAnalyze { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TimeAnalyze) DeepCopyInto(out *TimeAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta if in.Outcomes != nil { in, out := &in.Outcomes, &out.Outcomes *out = make([]*Outcome, len(*in)) @@ -2954,7 +2949,7 @@ func (in *TimeAnalyze) DeepCopy() *TimeAnalyze { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *WeaveReportAnalyze) DeepCopyInto(out *WeaveReportAnalyze) { *out = *in - in.AnalyzeMeta.DeepCopyInto(&out.AnalyzeMeta) + out.AnalyzeMeta = in.AnalyzeMeta } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WeaveReportAnalyze.