Merge pull request vmware-tanzu#338 from chuckha/results

Move results client
chuckha · Mar 8, 2018 · 15ff670 · 15ff670
2 parents e0007f1 + 8eeaca6
commit 15ff670
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 4 deletions.
diff --git a/pkg/client/e2e.go b/pkg/client/e2e.go
@@ -22,8 +22,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/heptio/sonobuoy/pkg/results"
-	"github.com/heptio/sonobuoy/pkg/results/e2e"
+	"github.com/heptio/sonobuoy/pkg/client/results"
+	"github.com/heptio/sonobuoy/pkg/client/results/e2e"
 	"github.com/onsi/ginkgo/reporters"
 	"github.com/pkg/errors"
 )

diff --git a/pkg/results/e2e/consts.go → pkg/client/results/e2e/consts.go b/pkg/results/e2e/consts.go → pkg/client/results/e2e/consts.go
diff --git a/pkg/results/junit_utils.go → pkg/client/results/junit_utils.go b/pkg/results/junit_utils.go → pkg/client/results/junit_utils.go
diff --git a/pkg/results/reader.go → pkg/client/results/reader.go b/pkg/results/reader.go → pkg/client/results/reader.go
diff --git a/pkg/results/reader_test.go → pkg/client/results/reader_test.go b/pkg/results/reader_test.go → pkg/client/results/reader_test.go
@@ -28,7 +28,7 @@ import (
 
 	"k8s.io/api/core/v1"
 
-	"github.com/heptio/sonobuoy/pkg/results"
+	"github.com/heptio/sonobuoy/pkg/client/results"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	k8sver "k8s.io/apimachinery/pkg/version"
 )
@@ -39,7 +39,7 @@ type version struct {
 }
 
 func (v *version) path() string {
-	return fmt.Sprintf("test_data/results-%v.%v.tar.gz", v.major, v.minor)
+	return fmt.Sprintf("testdata/results-%v.%v.tar.gz", v.major, v.minor)
 }
 func (v *version) String() string {
 	return fmt.Sprintf("v%v.%v", v.major, v.minor)

diff --git a/pkg/results/test_data/results-0.10.tar.gz → ...ient/results/testdata/results-0.10.tar.gz b/pkg/results/test_data/results-0.10.tar.gz → ...ient/results/testdata/results-0.10.tar.gz
diff --git a/pkg/results/test_data/results-0.8.tar.gz → ...lient/results/testdata/results-0.8.tar.gz b/pkg/results/test_data/results-0.8.tar.gz → ...lient/results/testdata/results-0.8.tar.gz
diff --git a/pkg/results/test_data/results-0.9.tar.gz → ...lient/results/testdata/results-0.9.tar.gz b/pkg/results/test_data/results-0.9.tar.gz → ...lient/results/testdata/results-0.9.tar.gz
diff --git a/pkg/results/types.go → pkg/client/results/types.go b/pkg/results/types.go → pkg/client/results/types.go