fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

testserver: suffix structs with Server

This commit is contained in:
Hidde Beydals 2020-06-30 10:16:54 +02:00
parent e4109eeae2
commit 384bf9fe7c
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/helmchart_controller_test.go
View File

@ -46,7 +46,7 @@ var _ = Describe("HelmChartReconciler", func() {
Context("HelmChart", func() { Context("HelmChart", func() {
var ( var (
namespace *corev1.Namespace namespace *corev1.Namespace
helmServer *testserver.Helm helmServer *testserver.HelmServer
err error err error
) )

2
controllers/helmrepository_controller_test.go
View File

@ -45,7 +45,7 @@ var _ = Describe("HelmRepositoryReconciler", func() {
Context("HelmRepository", func() { Context("HelmRepository", func() {
var ( var (
namespace *corev1.Namespace namespace *corev1.Namespace
helmServer *testserver.Helm helmServer *testserver.HelmServer
err error err error
) )

20
internal/testserver/helm.go
View File

@ -25,21 +25,21 @@ import (
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
) )
func NewTempHelmServer() (*Helm, error) { func NewTempHelmServer() (*HelmServer, error) {
server, err := NewTempHTTPServer() server, err := NewTempHTTPServer()
if err != nil { if err != nil {
return nil, err return nil, err
} }
helm := &Helm{server} helm := &HelmServer{server}
return helm, nil return helm, nil
} }
type Helm struct { type HelmServer struct {
*HTTP *HTTPServer
} }
func (s *Helm) GenerateIndex() error { func (s *HelmServer) GenerateIndex() error {
index, err := repo.IndexDirectory(s.HTTP.docroot, s.HTTP.URL()) index, err := repo.IndexDirectory(s.HTTPServer.docroot, s.HTTPServer.URL())
if err != nil { if err != nil {
return err return err
} }
@ -47,17 +47,17 @@ func (s *Helm) GenerateIndex() error {
if err != nil { if err != nil {
return err return err
} }
f := filepath.Join(s.HTTP.docroot, "index.yaml") f := filepath.Join(s.HTTPServer.docroot, "index.yaml")
return ioutil.WriteFile(f, d, 0644) return ioutil.WriteFile(f, d, 0644)
} }
func (s *Helm) PackageChart(path string) error { func (s *HelmServer) PackageChart(path string) error {
return s.PackageChartWithVersion(path, "") return s.PackageChartWithVersion(path, "")
} }
func (s *Helm) PackageChartWithVersion(path, version string) error { func (s *HelmServer) PackageChartWithVersion(path, version string) error {
pkg := action.NewPackage() pkg := action.NewPackage()
pkg.Destination = s.HTTP.docroot pkg.Destination = s.HTTPServer.docroot
pkg.Version = version pkg.Version = version
_, err := pkg.Run(path, nil) _, err := pkg.Run(path, nil)
return err return err

20
internal/testserver/http.go
View File

@ -25,7 +25,7 @@ import (
"path/filepath" "path/filepath"
) )
func NewTempHTTPServer() (*HTTP, error) { func NewTempHTTPServer() (*HTTPServer, error) {
tmpDir, err := ioutil.TempDir("", "http-test-") tmpDir, err := ioutil.TempDir("", "http-test-")
if err != nil { if err != nil {
return nil, err return nil, err
@ -34,28 +34,28 @@ func NewTempHTTPServer() (*HTTP, error) {
return srv, nil return srv, nil
} }
func NewHTTPServer(docroot string) *HTTP { func NewHTTPServer(docroot string) *HTTPServer {
root, err := filepath.Abs(docroot) root, err := filepath.Abs(docroot)
if err != nil { if err != nil {
panic(err) panic(err)
} }
return &HTTP{ return &HTTPServer{
docroot: root, docroot: root,
} }
} }
type HTTP struct { type HTTPServer struct {
docroot string docroot string
middleware func(http.Handler) http.Handler middleware func(http.Handler) http.Handler
server *httptest.Server 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 s.middleware = m
return s return s
} }
func (s *HTTP) Start() { func (s *HTTPServer) Start() {
s.server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { s.server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
handler := http.FileServer(http.Dir(s.docroot)) handler := http.FileServer(http.Dir(s.docroot))
if s.middleware != nil { 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) { s.server = httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
handler := http.FileServer(http.Dir(s.docroot)) handler := http.FileServer(http.Dir(s.docroot))
if s.middleware != nil { if s.middleware != nil {
@ -95,17 +95,17 @@ func (s *HTTP) StartTLS(cert, key, ca []byte) error {
return nil return nil
} }
func (s *HTTP) Stop() { func (s *HTTPServer) Stop() {
if s.server != nil { if s.server != nil {
s.server.Close() s.server.Close()
} }
} }
func (s *HTTP) Root() string { func (s *HTTPServer) Root() string {
return s.docroot return s.docroot
} }
func (s *HTTP) URL() string { func (s *HTTPServer) URL() string {
if s.server != nil { if s.server != nil {
return s.server.URL return s.server.URL
} }