From 109531e3aac6b600cadf9df763b3d74d1e3fc3a5 Mon Sep 17 00:00:00 2001 From: jatin-jangir <79351203+jatin-jangir@users.noreply.github.com> Date: Tue, 27 Jun 2023 19:00:01 +0530 Subject: [PATCH 1/2] added condition for empty object in kubedd.go --- kubedd/kubedd.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kubedd/kubedd.go b/kubedd/kubedd.go index 76ca06c..1349c13 100644 --- a/kubedd/kubedd.go +++ b/kubedd/kubedd.go @@ -128,8 +128,13 @@ func ValidateCluster(cluster *pkg.Cluster, conf *pkg.Config) ([]pkg.ValidationRe continue } //validationResult = isVersionSupported(validationResult, kubeC, conf) - validationResult = pkg.FilterValidationResults(validationResult, conf) - validationResults = append(validationResults, validationResult) + if validationResult != nil{ + validationResult = pkg.FilterValidationResults(validationResult, conf) + validationResults = append(validationResults, validationResult) + }else{ + fmt.Printf(annotations + " gives empty result while validating the json.") + continue + } } From 60c3e1c1668816b9cb91eb951db763308d3ef907 Mon Sep 17 00:00:00 2001 From: jatin-jangir <79351203+jatin-jangir@users.noreply.github.com> Date: Wed, 28 Jun 2023 17:08:01 +0530 Subject: [PATCH 2/2] added code for k8sobject --- kubedd/kubedd.go | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/kubedd/kubedd.go b/kubedd/kubedd.go index 1349c13..d16c50a 100644 --- a/kubedd/kubedd.go +++ b/kubedd/kubedd.go @@ -122,19 +122,16 @@ func ValidateCluster(cluster *pkg.Cluster, conf *pkg.Config) ([]pkg.ValidationRe } k8sObj = string(bt) } - validationResult, err := kubeC.ValidateJson(k8sObj, conf.TargetKubernetesVersion) - if err != nil { - fmt.Printf("err: %v\n", err) - continue - } - //validationResult = isVersionSupported(validationResult, kubeC, conf) - if validationResult != nil{ - validationResult = pkg.FilterValidationResults(validationResult, conf) - validationResults = append(validationResults, validationResult) - }else{ - fmt.Printf(annotations + " gives empty result while validating the json.") - continue - } + if len(k8sObj) > 0 { + validationResult, err := kubeC.ValidateJson(k8sObj, conf.TargetKubernetesVersion) + if err != nil { + fmt.Printf("err: %v\n", err) + continue + } + //validationResult = isVersionSupported(validationResult, kubeC, conf) + validationResult = pkg.FilterValidationResults(validationResult, conf) + validationResults = append(validationResults, validationResult) + } }