Merge pull request #145 from replicatedhq/json-yaml-json-yaml

BoolString can only unmarshal as json
replicatedhq · Mar 6, 2020 · 4fca3ff · 4fca3ff
2 parents 62d12d8 + d81cff0
commit 4fca3ff
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/cmd/preflight/cli/run.go b/cmd/preflight/cli/run.go
@@ -19,7 +19,6 @@ import (
 	"github.com/replicatedhq/troubleshoot/pkg/collect"
 	"github.com/spf13/viper"
 	spin "github.com/tj/go-spin"
-	"gopkg.in/yaml.v2"
 )
 
 func runPreflights(v *viper.Viper, arg string) error {
@@ -59,7 +58,7 @@ func runPreflights(v *viper.Viper, arg string) error {
 	}
 
 	preflight := troubleshootv1beta1.Preflight{}
-	if err := yaml.Unmarshal([]byte(preflightContent), &preflight); err != nil {
+	if err := json.Unmarshal([]byte(preflightContent), &preflight); err != nil {
 		return errors.Wrapf(err, "failed to parse %s as a preflight", arg)
 	}
 

diff --git a/cmd/troubleshoot/cli/run.go b/cmd/troubleshoot/cli/run.go
@@ -21,7 +21,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 	spin "github.com/tj/go-spin"
-	"gopkg.in/yaml.v2"
 
 	troubleshootv1beta1 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta1"
 	"github.com/replicatedhq/troubleshoot/pkg/collect"
@@ -49,7 +48,7 @@ func runTroubleshoot(v *viper.Viper, arg string) error {
 	}
 
 	collector := troubleshootv1beta1.Collector{}
-	if err := yaml.Unmarshal(collectorContent, &collector); err != nil {
+	if err := json.Unmarshal(collectorContent, &collector); err != nil {
 		return errors.Wrapf(err, "failed to parse %s collectors", arg)
 	}
 

diff --git a/pkg/apis/troubleshoot/v1beta1/analyzer_shared_test.go b/pkg/apis/troubleshoot/v1beta1/analyzer_shared_test.go
@@ -1,12 +1,12 @@
 package v1beta1
 
 import (
+	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.undefinedlabs.com/scopeagent"
-	"gopkg.in/yaml.v2"
 )
 
 func TestAnalyze_Unmarshal(t *testing.T) {
@@ -49,7 +49,7 @@ func TestAnalyze_Unmarshal(t *testing.T) {
 			req := require.New(t)
 
 			a := Analyze{}
-			err := yaml.Unmarshal([]byte(test.spec), &a)
+			err := json.Unmarshal([]byte(test.spec), &a)
 			req.NoError(err)
 
 			assert.Equal(t, test.expectObject, a)

diff --git a/pkg/apis/troubleshoot/v1beta1/collector_shared.go b/pkg/apis/troubleshoot/v1beta1/collector_shared.go
@@ -11,7 +11,7 @@ import (
 type CollectorMeta struct {
 	CollectorName string `json:"collectorName,omitempty" yaml:"collectorName,omitempty"`
 	// +optional
-	Exclude multitype.BoolOrString `json:"exclude,omitmempty" yaml:"exclude,omitempty"`
+	Exclude multitype.BoolOrString `json:"exclude,omitempty" yaml:"exclude,omitempty"`
 }
 
 type ClusterInfo struct {

diff --git a/pkg/collect/collector.go b/pkg/collect/collector.go
@@ -1,12 +1,12 @@
 package collect
 
 import (
+	"encoding/json"
 	"strconv"
 
 	"github.com/pkg/errors"
 	"github.com/replicatedhq/kots/kotskinds/multitype"
 	troubleshootv1beta1 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta1"
-	"gopkg.in/yaml.v2"
 	authorizationv1 "k8s.io/api/authorization/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -194,7 +194,7 @@ func (cs Collectors) CheckRBAC() error {
 func ParseSpec(specContents string) (*troubleshootv1beta1.Collect, error) {
 	collect := troubleshootv1beta1.Collect{}
 
-	if err := yaml.Unmarshal([]byte(specContents), &collect); err != nil {
+	if err := json.Unmarshal([]byte(specContents), &collect); err != nil {
 		return nil, err
 	}