From a57894962d8a2a5140d5999a036026d3a1b34907 Mon Sep 17 00:00:00 2001 From: Matias Manavella Date: Wed, 16 Sep 2020 18:04:46 -0300 Subject: [PATCH 1/2] ingres analyzer fixed --- pkg/analyze/ingress.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/analyze/ingress.go b/pkg/analyze/ingress.go index 605a9bb6..3bc06c0c 100644 --- a/pkg/analyze/ingress.go +++ b/pkg/analyze/ingress.go @@ -3,13 +3,14 @@ package analyzer import ( "encoding/json" "fmt" + "path" troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" ) func analyzeIngress(analyzer *troubleshootv1beta2.Ingress, getCollectedFileContents func(string) ([]byte, error)) (*AnalyzeResult, error) { - ingressData, err := getCollectedFileContents("cluster-resources/storage-classes.json") + ingressData, err := getCollectedFileContents(path.Join("cluster-resources", "ingress", fmt.Sprintf("%s.json", analyzer.Namespace))) if err != nil { return nil, err } From eb0f692aa070f62d89ed82bd95b569109c52a815 Mon Sep 17 00:00:00 2001 From: Matias Manavella Date: Wed, 16 Sep 2020 18:25:15 -0300 Subject: [PATCH 2/2] using filepath instead of path --- pkg/analyze/deployment_status.go | 4 ++-- pkg/analyze/ingress.go | 4 ++-- pkg/analyze/statefulset_status.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/analyze/deployment_status.go b/pkg/analyze/deployment_status.go index 5f2a5ab9..c013d8a4 100644 --- a/pkg/analyze/deployment_status.go +++ b/pkg/analyze/deployment_status.go @@ -3,7 +3,7 @@ package analyzer import ( "encoding/json" "fmt" - "path" + "path/filepath" "github.com/pkg/errors" troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2" @@ -11,7 +11,7 @@ import ( ) func analyzeDeploymentStatus(analyzer *troubleshootv1beta2.DeploymentStatus, getCollectedFileContents func(string) ([]byte, error)) (*AnalyzeResult, error) { - collected, err := getCollectedFileContents(path.Join("cluster-resources", "deployments", fmt.Sprintf("%s.json", analyzer.Namespace))) + collected, err := getCollectedFileContents(filepath.Join("cluster-resources", "deployments", fmt.Sprintf("%s.json", analyzer.Namespace))) if err != nil { return nil, errors.Wrap(err, "failed to read collected deployments from namespace") } diff --git a/pkg/analyze/ingress.go b/pkg/analyze/ingress.go index 3bc06c0c..4e349f8c 100644 --- a/pkg/analyze/ingress.go +++ b/pkg/analyze/ingress.go @@ -3,14 +3,14 @@ package analyzer import ( "encoding/json" "fmt" - "path" + "path/filepath" troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" ) func analyzeIngress(analyzer *troubleshootv1beta2.Ingress, getCollectedFileContents func(string) ([]byte, error)) (*AnalyzeResult, error) { - ingressData, err := getCollectedFileContents(path.Join("cluster-resources", "ingress", fmt.Sprintf("%s.json", analyzer.Namespace))) + ingressData, err := getCollectedFileContents(filepath.Join("cluster-resources", "ingress", fmt.Sprintf("%s.json", analyzer.Namespace))) if err != nil { return nil, err } diff --git a/pkg/analyze/statefulset_status.go b/pkg/analyze/statefulset_status.go index 98585490..6b56a1ec 100644 --- a/pkg/analyze/statefulset_status.go +++ b/pkg/analyze/statefulset_status.go @@ -3,7 +3,7 @@ package analyzer import ( "encoding/json" "fmt" - "path" + "path/filepath" "github.com/pkg/errors" troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2" @@ -11,7 +11,7 @@ import ( ) func analyzeStatefulsetStatus(analyzer *troubleshootv1beta2.StatefulsetStatus, getCollectedFileContents func(string) ([]byte, error)) (*AnalyzeResult, error) { - collected, err := getCollectedFileContents(path.Join("cluster-resources", "statefulsets", fmt.Sprintf("%s.json", analyzer.Namespace))) + collected, err := getCollectedFileContents(filepath.Join("cluster-resources", "statefulsets", fmt.Sprintf("%s.json", analyzer.Namespace))) if err != nil { return nil, errors.Wrap(err, "failed to read collected statefulsets from namespace") }