diff --git a/pkg/client/e2e.go b/pkg/client/e2e.go index ee08f4e3e..07746f377 100644 --- 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 b/pkg/client/results/e2e/consts.go similarity index 100% rename from pkg/results/e2e/consts.go rename to pkg/client/results/e2e/consts.go diff --git a/pkg/results/junit_utils.go b/pkg/client/results/junit_utils.go similarity index 100% rename from pkg/results/junit_utils.go rename to pkg/client/results/junit_utils.go diff --git a/pkg/results/reader.go b/pkg/client/results/reader.go similarity index 100% rename from pkg/results/reader.go rename to pkg/client/results/reader.go diff --git a/pkg/results/reader_test.go b/pkg/client/results/reader_test.go similarity index 99% rename from pkg/results/reader_test.go rename to pkg/client/results/reader_test.go index 58cb751e3..9bfe3c884 100644 --- a/pkg/results/reader_test.go +++ b/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 b/pkg/client/results/testdata/results-0.10.tar.gz similarity index 100% rename from pkg/results/test_data/results-0.10.tar.gz rename to pkg/client/results/testdata/results-0.10.tar.gz diff --git a/pkg/results/test_data/results-0.8.tar.gz b/pkg/client/results/testdata/results-0.8.tar.gz similarity index 100% rename from pkg/results/test_data/results-0.8.tar.gz rename to pkg/client/results/testdata/results-0.8.tar.gz diff --git a/pkg/results/test_data/results-0.9.tar.gz b/pkg/client/results/testdata/results-0.9.tar.gz similarity index 100% rename from pkg/results/test_data/results-0.9.tar.gz rename to pkg/client/results/testdata/results-0.9.tar.gz diff --git a/pkg/results/types.go b/pkg/client/results/types.go similarity index 100% rename from pkg/results/types.go rename to pkg/client/results/types.go