From 384bf9fe7cdd32d3b2f0cf633fd9969dbad28b53 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Tue, 30 Jun 2020 10:16:54 +0200
Subject: [PATCH] testserver: suffix structs with Server

---
 controllers/helmchart_controller_test.go      |  2 +-
 controllers/helmrepository_controller_test.go |  2 +-
 internal/testserver/helm.go                   | 20 +++++++++----------
 internal/testserver/http.go                   | 20 +++++++++----------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/controllers/helmchart_controller_test.go b/controllers/helmchart_controller_test.go
index cddc1158..c7bda866 100644
--- a/controllers/helmchart_controller_test.go
+++ b/controllers/helmchart_controller_test.go
@@ -46,7 +46,7 @@ var _ = Describe("HelmChartReconciler", func() {
 	Context("HelmChart", func() {
 		var (
 			namespace  *corev1.Namespace
-			helmServer *testserver.Helm
+			helmServer *testserver.HelmServer
 			err        error
 		)
 
diff --git a/controllers/helmrepository_controller_test.go b/controllers/helmrepository_controller_test.go
index 59335517..82ac77f8 100644
--- a/controllers/helmrepository_controller_test.go
+++ b/controllers/helmrepository_controller_test.go
@@ -45,7 +45,7 @@ var _ = Describe("HelmRepositoryReconciler", func() {
 	Context("HelmRepository", func() {
 		var (
 			namespace  *corev1.Namespace
-			helmServer *testserver.Helm
+			helmServer *testserver.HelmServer
 			err        error
 		)
 
diff --git a/internal/testserver/helm.go b/internal/testserver/helm.go
index 24b9ec16..89034987 100644
--- a/internal/testserver/helm.go
+++ b/internal/testserver/helm.go
@@ -25,21 +25,21 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-func NewTempHelmServer() (*Helm, error) {
+func NewTempHelmServer() (*HelmServer, error) {
 	server, err := NewTempHTTPServer()
 	if err != nil {
 		return nil, err
 	}
-	helm := &Helm{server}
+	helm := &HelmServer{server}
 	return helm, nil
 }
 
-type Helm struct {
-	*HTTP
+type HelmServer struct {
+	*HTTPServer
 }
 
-func (s *Helm) GenerateIndex() error {
-	index, err := repo.IndexDirectory(s.HTTP.docroot, s.HTTP.URL())
+func (s *HelmServer) GenerateIndex() error {
+	index, err := repo.IndexDirectory(s.HTTPServer.docroot, s.HTTPServer.URL())
 	if err != nil {
 		return err
 	}
@@ -47,17 +47,17 @@ func (s *Helm) GenerateIndex() error {
 	if err != nil {
 		return err
 	}
-	f := filepath.Join(s.HTTP.docroot, "index.yaml")
+	f := filepath.Join(s.HTTPServer.docroot, "index.yaml")
 	return ioutil.WriteFile(f, d, 0644)
 }
 
-func (s *Helm) PackageChart(path string) error {
+func (s *HelmServer) PackageChart(path string) error {
 	return s.PackageChartWithVersion(path, "")
 }
 
-func (s *Helm) PackageChartWithVersion(path, version string) error {
+func (s *HelmServer) PackageChartWithVersion(path, version string) error {
 	pkg := action.NewPackage()
-	pkg.Destination = s.HTTP.docroot
+	pkg.Destination = s.HTTPServer.docroot
 	pkg.Version = version
 	_, err := pkg.Run(path, nil)
 	return err
diff --git a/internal/testserver/http.go b/internal/testserver/http.go
index c24acedd..6bf3382e 100644
--- a/internal/testserver/http.go
+++ b/internal/testserver/http.go
@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 )
 
-func NewTempHTTPServer() (*HTTP, error) {
+func NewTempHTTPServer() (*HTTPServer, error) {
 	tmpDir, err := ioutil.TempDir("", "http-test-")
 	if err != nil {
 		return nil, err
@@ -34,28 +34,28 @@ func NewTempHTTPServer() (*HTTP, error) {
 	return srv, nil
 }
 
-func NewHTTPServer(docroot string) *HTTP {
+func NewHTTPServer(docroot string) *HTTPServer {
 	root, err := filepath.Abs(docroot)
 	if err != nil {
 		panic(err)
 	}
-	return &HTTP{
+	return &HTTPServer{
 		docroot: root,
 	}
 }
 
-type HTTP struct {
+type HTTPServer struct {
 	docroot    string
 	middleware func(http.Handler) http.Handler
 	server     *httptest.Server
 }
 
-func (s *HTTP) WithMiddleware(m func(handler http.Handler) http.Handler) *HTTP {
+func (s *HTTPServer) WithMiddleware(m func(handler http.Handler) http.Handler) *HTTPServer {
 	s.middleware = m
 	return s
 }
 
-func (s *HTTP) Start() {
+func (s *HTTPServer) Start() {
 	s.server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		handler := http.FileServer(http.Dir(s.docroot))
 		if s.middleware != nil {
@@ -66,7 +66,7 @@ func (s *HTTP) Start() {
 	}))
 }
 
-func (s *HTTP) StartTLS(cert, key, ca []byte) error {
+func (s *HTTPServer) StartTLS(cert, key, ca []byte) error {
 	s.server = httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		handler := http.FileServer(http.Dir(s.docroot))
 		if s.middleware != nil {
@@ -95,17 +95,17 @@ func (s *HTTP) StartTLS(cert, key, ca []byte) error {
 	return nil
 }
 
-func (s *HTTP) Stop() {
+func (s *HTTPServer) Stop() {
 	if s.server != nil {
 		s.server.Close()
 	}
 }
 
-func (s *HTTP) Root() string {
+func (s *HTTPServer) Root() string {
 	return s.docroot
 }
 
-func (s *HTTP) URL() string {
+func (s *HTTPServer) URL() string {
 	if s.server != nil {
 		return s.server.URL
 	}