Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: support validator rules check -f config.yaml without all plugins defined #191

Merged
merged 3 commits into from
Aug 22, 2024
Merged

fix: support validator rules check -f config.yaml without all plugins defined #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e739d4
fix: add a plugin nil check in EnabledPluginsHaveRules func
ahmad-ibra Aug 22, 2024
7b3e172
fix: add a plugin nil check in executePlugins func
ahmad-ibra Aug 22, 2024
d400b6f
chore: make reviewable
ahmad-ibra Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions pkg/cmd/validator/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,7 @@ func configurePlugins(c *cfg.Config, vc *components.ValidatorConfig, tc *cfg.Tas
return nil
}

// nolint:gocyclo
func executePlugins(c *cfg.Config, vc *components.ValidatorConfig) error {
log.Header("Executing validator plugin(s)")

Expand All @@ -525,7 +526,7 @@ func executePlugins(c *cfg.Config, vc *components.ValidatorConfig) error {
ok := true
results := make([]*vapi.ValidationResult, 0)

if vc.AWSPlugin.Enabled {
if vc.AWSPlugin != nil && vc.AWSPlugin.Enabled {
v := &awsapi.AwsValidator{
ObjectMeta: metav1.ObjectMeta{
Name: "aws-validator",
Expand All @@ -544,7 +545,7 @@ func executePlugins(c *cfg.Config, vc *components.ValidatorConfig) error {
results = append(results, vr)
}

if vc.AzurePlugin.Enabled {
if vc.AzurePlugin != nil && vc.AzurePlugin.Enabled {
v := &azureapi.AzureValidator{
ObjectMeta: metav1.ObjectMeta{
Name: "azure-validator",
Expand All @@ -563,7 +564,7 @@ func executePlugins(c *cfg.Config, vc *components.ValidatorConfig) error {
results = append(results, vr)
}

if vc.MaasPlugin.Enabled {
if vc.MaasPlugin != nil && vc.MaasPlugin.Enabled {
v := &maasapi.MaasValidator{
ObjectMeta: metav1.ObjectMeta{
Name: "maas-validator",
Expand All @@ -582,7 +583,7 @@ func executePlugins(c *cfg.Config, vc *components.ValidatorConfig) error {
results = append(results, vr)
}

if vc.NetworkPlugin.Enabled {
if vc.NetworkPlugin != nil && vc.NetworkPlugin.Enabled {
v := &netapi.NetworkValidator{
ObjectMeta: metav1.ObjectMeta{
Name: "network-validator",
Expand All @@ -604,7 +605,7 @@ func executePlugins(c *cfg.Config, vc *components.ValidatorConfig) error {
results = append(results, vr)
}

if vc.OCIPlugin.Enabled {
if vc.OCIPlugin != nil && vc.OCIPlugin.Enabled {
v := &ociapi.OciValidator{
ObjectMeta: metav1.ObjectMeta{
Name: "oci-validator",
Expand All @@ -626,7 +627,7 @@ func executePlugins(c *cfg.Config, vc *components.ValidatorConfig) error {
results = append(results, vr)
}

if vc.VspherePlugin.Enabled {
if vc.VspherePlugin != nil && vc.VspherePlugin.Enabled {
v := &vsphereapi.VsphereValidator{
ObjectMeta: metav1.ObjectMeta{
Name: "vsphere-validator",
Expand Down
15 changes: 6 additions & 9 deletions pkg/components/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,25 +110,22 @@ func (c *ValidatorConfig) AnyPluginEnabled() bool {
func (c *ValidatorConfig) EnabledPluginsHaveRules() (bool, []string) {
var ok bool
invalidPlugins := []string{}
if c.AWSPlugin.Enabled && c.AWSPlugin.Validator.ResultCount() == 0 {
if c.AWSPlugin != nil && c.AWSPlugin.Enabled && c.AWSPlugin.Validator.ResultCount() == 0 {
invalidPlugins = append(invalidPlugins, c.AWSPlugin.Validator.PluginCode())
}
if c.AzurePlugin.Enabled && c.AzurePlugin.Validator.ResultCount() == 0 {
if c.AzurePlugin != nil && c.AzurePlugin.Enabled && c.AzurePlugin.Validator.ResultCount() == 0 {
invalidPlugins = append(invalidPlugins, c.AzurePlugin.Validator.PluginCode())
}
if c.MaasPlugin.Enabled && c.MaasPlugin.Validator.ResultCount() == 0 {
if c.MaasPlugin != nil && c.MaasPlugin.Enabled && c.MaasPlugin.Validator.ResultCount() == 0 {
invalidPlugins = append(invalidPlugins, c.MaasPlugin.Validator.PluginCode())
}
if c.MaasPlugin.Enabled && c.MaasPlugin.Validator.ResultCount() == 0 {
invalidPlugins = append(invalidPlugins, c.MaasPlugin.Validator.PluginCode())
}
if c.NetworkPlugin.Enabled && c.NetworkPlugin.Validator.ResultCount() == 0 {
if c.NetworkPlugin != nil && c.NetworkPlugin.Enabled && c.NetworkPlugin.Validator.ResultCount() == 0 {
invalidPlugins = append(invalidPlugins, c.NetworkPlugin.Validator.PluginCode())
}
if c.OCIPlugin.Enabled && c.OCIPlugin.Validator.ResultCount() == 0 {
if c.OCIPlugin != nil && c.OCIPlugin.Enabled && c.OCIPlugin.Validator.ResultCount() == 0 {
invalidPlugins = append(invalidPlugins, c.OCIPlugin.Validator.PluginCode())
}
if c.VspherePlugin.Enabled && c.VspherePlugin.Validator.ResultCount() == 0 {
if c.VspherePlugin != nil && c.VspherePlugin.Enabled && c.VspherePlugin.Validator.ResultCount() == 0 {
invalidPlugins = append(invalidPlugins, c.VspherePlugin.Validator.PluginCode())
}
if len(invalidPlugins) == 0 {
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package config

// ValidatorChartVersions is a map of validator component names to their respective versions
var ValidatorChartVersions = map[string]string{
Validator: "v0.1.6",
Validator: "v0.1.7",
ValidatorPluginAws: "v0.1.4",
ValidatorPluginAzure: "v0.0.17",
ValidatorPluginMaas: "v0.0.7",
ValidatorPluginNetwork: "v0.0.23",
ValidatorPluginOci: "v0.2.1",
ValidatorPluginVsphere: "v0.0.30",
ValidatorPluginVsphere: "v0.0.31",
}
4 changes: 2 additions & 2 deletions tests/integration/_validator/testcases/data/validator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ helmRelease:
chart:
name: validator
repository: validator
version: v0.1.6
version: v0.1.7
values: ""
helmReleaseSecret:
name: validator-helm-release-validator
Expand Down Expand Up @@ -232,7 +232,7 @@ vspherePlugin:
chart:
name: validator-plugin-vsphere
repository: validator-plugin-vsphere
version: v0.0.30
version: v0.0.31
values: ""
account:
insecure: true
Expand Down