From 6de9d4a1b68177dc8725868646792f75b8fe7123 Mon Sep 17 00:00:00 2001 From: Murali Paluru Date: Tue, 17 Dec 2019 13:07:09 -0800 Subject: [PATCH 1/2] rename skip to overrideSkip --- apis/management.cattle.io/v3/cluster_scan_types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apis/management.cattle.io/v3/cluster_scan_types.go b/apis/management.cattle.io/v3/cluster_scan_types.go index d016853e..23f3196d 100644 --- a/apis/management.cattle.io/v3/cluster_scan_types.go +++ b/apis/management.cattle.io/v3/cluster_scan_types.go @@ -27,7 +27,7 @@ const ( type CisScanConfig struct { // IDs of the checks that need to be skipped in the final report - Skip string `json:"skip,omitempty"` + OverrideSkip []string `json:"overrideSkip"` // Override the CIS benchmark version to use for the scan (instead of latest) OverrideBenchmarkVersion string `json:"overrideBenchmarkVersion,omitempty"` // Internal flag for debugging master component of the scan From 75b4bddc2b73d5cb8c5a58c46137ed55c77e0784 Mon Sep 17 00:00:00 2001 From: Murali Paluru Date: Tue, 17 Dec 2019 13:07:22 -0800 Subject: [PATCH 2/2] go generate changes --- apis/management.cattle.io/v3/zz_generated_deepcopy.go | 7 ++++++- client/management/v3/zz_generated_cis_scan_config.go | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 8ab6e0f6..9712cd63 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -927,6 +927,11 @@ func (in *ChangePasswordInput) DeepCopy() *ChangePasswordInput { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CisScanConfig) DeepCopyInto(out *CisScanConfig) { *out = *in + if in.OverrideSkip != nil { + in, out := &in.OverrideSkip, &out.OverrideSkip + *out = make([]string, len(*in)) + copy(*out, *in) + } return } @@ -1919,7 +1924,7 @@ func (in *ClusterScanConfig) DeepCopyInto(out *ClusterScanConfig) { if in.CisScanConfig != nil { in, out := &in.CisScanConfig, &out.CisScanConfig *out = new(CisScanConfig) - **out = **in + (*in).DeepCopyInto(*out) } return } diff --git a/client/management/v3/zz_generated_cis_scan_config.go b/client/management/v3/zz_generated_cis_scan_config.go index 659aff96..9cce5a4e 100644 --- a/client/management/v3/zz_generated_cis_scan_config.go +++ b/client/management/v3/zz_generated_cis_scan_config.go @@ -5,12 +5,12 @@ const ( CisScanConfigFieldDebugMaster = "debugMaster" CisScanConfigFieldDebugWorker = "debugWorker" CisScanConfigFieldOverrideBenchmarkVersion = "overrideBenchmarkVersion" - CisScanConfigFieldSkip = "skip" + CisScanConfigFieldOverrideSkip = "overrideSkip" ) type CisScanConfig struct { - DebugMaster bool `json:"debugMaster,omitempty" yaml:"debugMaster,omitempty"` - DebugWorker bool `json:"debugWorker,omitempty" yaml:"debugWorker,omitempty"` - OverrideBenchmarkVersion string `json:"overrideBenchmarkVersion,omitempty" yaml:"overrideBenchmarkVersion,omitempty"` - Skip string `json:"skip,omitempty" yaml:"skip,omitempty"` + DebugMaster bool `json:"debugMaster,omitempty" yaml:"debugMaster,omitempty"` + DebugWorker bool `json:"debugWorker,omitempty" yaml:"debugWorker,omitempty"` + OverrideBenchmarkVersion string `json:"overrideBenchmarkVersion,omitempty" yaml:"overrideBenchmarkVersion,omitempty"` + OverrideSkip []string `json:"overrideSkip,omitempty" yaml:"overrideSkip,omitempty"` }